fapweb: msite.inc.php annotate

annotate msite.inc.php @ 702:c527b42a7857

Comments.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 10 Nov 2014 21:14:38 +0200
parents	d0418af28559
children	242cb053fbb2

rev	line source
0 8019b357cc03 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 <?
8019b357cc03 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 //
571 ce11ea112a65 Change the header blurb a bit. Matti Hamalainen <ccr@tnsp.org> parents: 570 diff changeset	3 // FAPWeb - Simple Web-based Demoparty Management System
33 5bf22431176c Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	4 // Generic and miscellaneous site support code
565 ed2247111fdd Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 558 diff changeset	5 // (C) Copyright 2012-2014 Tecnic Software productions (TNSP)
0 8019b357cc03 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 //
175 8df523e6326a User require_once instead of require. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	7 require_once "msitegen.inc.php";
51 7bdf89601ba0 Work on session stuff. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	8
184 1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	9 // Define modes of party information display system
410 298822ed0420 Change display mode constant values. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	10 define("SMODE_DISABLED", 0);
298822ed0420 Change display mode constant values. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	11 define("SMODE_ROTATE", 1);
298822ed0420 Change display mode constant values. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	12 define("SMODE_COMPO", 2);
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	13
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	14
184 1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	15 // Define sizes of database fields, see createdb.php
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	16 // and also the places where input is validated.
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	17 define("SET_LEN_USERNAME", 32);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	18 define("SET_LEN_GROUPS", 64);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	19 define("SET_LEN_ONELINER", 64);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	20 define("SET_LEN_EMAIL", 80);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	21
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	22 define("SET_LEN_NEWS_TITLE", 128);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	23 define("SET_LEN_NEWS_TEXT", 4096);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	24 define("SET_LEN_NEWS_AUTHOR", 64);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	25
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	26 define("SET_LEN_COMPO_NAME", 128);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	27 define("SET_LEN_COMPO_DESC", 4096);
533 f872843ae396 Add file path to compo data. Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	28 define("SET_LEN_COMPO_PATH", 128);
184 1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	29
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	30 define("SET_LEN_ENTRY_NAME", 64);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	31 define("SET_LEN_ENTRY_AUTHOR", 64);
526 e074775d853e Make filename field shorter. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	32 define("SET_LEN_ENTRY_FILENAME", 128);
506 d29166d97b46 Change some database field sizes. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	33 define("SET_LEN_ENTRY_INFO", 1024);
527 d6726a4883a6 Add "notes" field for entries, to contain notes private to organizers. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	34 define("SET_LEN_ENTRY_NOTES", 1024);
528 dd5c5577c495 Add preview file and file type fields for entry, for screenshots etc. Matti Hamalainen <ccr@tnsp.org> parents: 527 diff changeset	35 define("SET_LEN_ENTRY_PREVIEW_FILE", 128);
184 1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	36
506 d29166d97b46 Change some database field sizes. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	37 define("SET_LEN_DISP_SLIDE_TITLE", 64);
420 e9f6e242c4b9 Define some more SQL field lengths. Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	38 define("SET_LEN_DISP_SLIDE_TEXT", 4096);
e9f6e242c4b9 Define some more SQL field lengths. Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	39 define("SET_LEN_ROT_LIST_NAME", 128);
184 1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	40
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 491 diff changeset	41 define("SET_LEN_VOTEKEY", 64);
508 b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	42
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	43
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	44 //
702 c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	45 // Entry preview type (value)
508 b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	46 //
700 d0418af28559 Add EPREV_NONE define. Matti Hamalainen <ccr@tnsp.org> parents: 699 diff changeset	47 define("EPREV_NONE", 0); // No preview
528 dd5c5577c495 Add preview file and file type fields for entry, for screenshots etc. Matti Hamalainen <ccr@tnsp.org> parents: 527 diff changeset	48 define("EPREV_IMAGE", 1); // Preview is image (PNG, JPEG)
700 d0418af28559 Add EPREV_NONE define. Matti Hamalainen <ccr@tnsp.org> parents: 699 diff changeset	49 define("EPREV_AUDIO", 2); // Preview is audio (Vorbis, MP3)
528 dd5c5577c495 Add preview file and file type fields for entry, for screenshots etc. Matti Hamalainen <ccr@tnsp.org> parents: 527 diff changeset	50
702 c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	51 //
c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	52 // Entry flags (bitfield)
c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	53 //
508 b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	54 define("EFLAG_DISQUALIFIED", 1); // Entry is disqualified
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	55 define("EFLAG_PROBLEMS", 2); // Has some problems
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	56
690 bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	57 $entryFlagsList = array(
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	58 EFLAG_DISQUALIFIED => array("Disqualified", "img/disqualified.png"),
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	59 EFLAG_PROBLEMS => array("Has problems", "img/problems.png"),
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	60 );
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	61
508 b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	62
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	63 //
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	64 // Competition types
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	65 //
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	66 define("COMPO_NORMAL", 0); // Normal voting compo, points determine placement
3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	67 define("COMPO_POINTS", 1); // Assigned points, points determines placement (no voting)
508 b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	68 define("COMPO_ASSIGN", 2); // Assigned places (no voting)
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	69
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	70
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	71 $compoModeData = array(
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	72 COMPO_NORMAL => array("Normal",
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	73 "Normal voting compo.",
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	74 ),
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	75 COMPO_POINTS => array("Points",
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	76 "Assigned points (no voting).",
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	77 ),
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	78 COMPO_ASSIGN => array("Assigned",
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	79 "Assigned places (no points, no voting).",
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	80 ),
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	81 );
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	82
641 1a123c6c2241 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	83
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	84 //
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	85 // Different voting modes
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	86 //
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	87 define("VOTE_FREELY", 0);
274 81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	88 define("VOTE_ACTIVATE", 1);
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	89 define("VOTE_ASSIGN", 2);
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	90
274 81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	91 $voteModeData = array(
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	92 VOTE_FREELY => array("Freeform voting",
282 50e52dc43916 Add missing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 274 diff changeset	93 "Vote keys are not tied to attendees, and do not need to be activated. ".
274 81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	94 "Take one printed key slip, give it to attendee."
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	95 ),
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	96 VOTE_ACTIVATE => array("Key activation",
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	97 "Vote keys are not tied to attendees, but require manual activation. ".
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	98 "Take one printed key slip, find it by the index number in the list below, set to activated. ".
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	99 "Give key slip to attendee."
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	100 ),
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	101 VOTE_ASSIGN => array("Assigned keys",
307 c0d573a5de5b Add procedure description to assigned keys mode. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	102 "Votekeys are tied to attendees, activated by assigning the key to attendee. ".
c0d573a5de5b Add procedure description to assigned keys mode. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	103 "Take one printed key slip, find attendee in the list below, enter key ID number, assign, check. ".
c0d573a5de5b Add procedure description to assigned keys mode. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	104 "Give key slip to attendee."
274 81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	105 ),
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	106 );
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	107
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	108
535 88c048f3b9e1 Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	109 //
88c048f3b9e1 Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	110 // Party infromation system data/variables handling
88c048f3b9e1 Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	111 //
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	112 function stReloadDisplayVars()
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	113 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	114 global $displayVars, $displayVarsChanged;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	115
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	116 $displayVars = array();
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	117 $displayVarsChanged = array();
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	118
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	119 if (($res = stExecSQL("SELECT * FROM display_vars")) !== FALSE)
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	120 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	121 foreach ($res as $row)
354 1dd598221874 Simplify code by reusing functions from site module. Matti Hamalainen <ccr@tnsp.org> parents: 307 diff changeset	122 $displayVars[$row["key"]] = stGetSQLSettingData($row);
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	123 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	124 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	125
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	126
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	127 function stSaveDisplayVars()
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	128 {
144 c030c3cf0d80 More work on display system. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	129 global $db, $displayVars, $displayVarsChanged;
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	130
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	131 foreach (stExecSQL("SELECT * FROM display_vars") as $item)
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	132 if (isset($displayVarsChanged[$item["key"]]))
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	133 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	134 $val = $displayVars[$item["key"]];
354 1dd598221874 Simplify code by reusing functions from site module. Matti Hamalainen <ccr@tnsp.org> parents: 307 diff changeset	135 stExecSQL(
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	136 "UPDATE display_vars SET ".stGetSettingSQL($item, $val).
354 1dd598221874 Simplify code by reusing functions from site module. Matti Hamalainen <ccr@tnsp.org> parents: 307 diff changeset	137 " WHERE key=".$db->quote($item["key"]));
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	138 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	139 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	140
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	141
407 eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	142 function stDisplayUpdated()
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	143 {
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	144 stSetDisplayVar("lastUpdate", time());
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	145 }
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	146
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	147
454 ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	148 function stSetDisplayVarUpd($name, $value)
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	149 {
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	150 if (stGetDisplayVar($name) != $value)
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	151 {
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	152 stSetDisplayVar($name, $value);
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	153 stDisplayUpdated();
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	154 return TRUE;
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	155 }
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	156 else
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	157 return FALSE;
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	158 }
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	159
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	160
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	161 function stGetDisplayVar($name)
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	162 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	163 global $displayVars;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	164 if (isset($displayVars[$name]))
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	165 return $displayVars[$name];
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	166 else
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	167 die("No display var for '".$name."'.\n");
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	168 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	169
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	170
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	171 function stSetDisplayVar($name, $value)
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	172 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	173 global $displayVars, $displayVarsChanged;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	174 if (isset($displayVars[$name]))
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	175 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	176 $displayVars[$name] = $value;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	177 $displayVarsChanged[$name] = true;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	178 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	179 else
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	180 die("No display var for '".$name."'.\n");
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	181 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	182
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	183
484 c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	184 function stExecSQLCond($sql, $msg = FALSE)
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	185 {
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	186 global $db;
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	187 if (($res = stDBExecSQL($db, $sql)) !== FALSE)
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	188 {
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	189 if ($msg !== FALSE)
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	190 stSetStatus(200, $msg);
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	191 return $res;
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	192 }
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	193 else
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	194 {
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	195 stSetStatus(902, "Error in SQL execution.");
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	196 return FALSE;
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	197 }
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	198 }
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	199
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	200
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	201 function stPrintAttendee($item, $row, $tr, $full, $edit, $eclass = "")
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	202 {
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	203 $id = $item["id"];
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	204 $prefix = "at";
677 64d80a7f7e26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 674 diff changeset	205
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	206 if ($tr)
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	207 {
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	208 echo
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	209 " <tr class=\"".($row % 2 == 1 ? "rodd" : "reven").$eclass.
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	210 "\" id=\"attendee".$id."\" ".($full ? "onClick=\"activateAttendee(".$id.")\"" : "").">";
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	211 }
677 64d80a7f7e26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 674 diff changeset	212
71 d74fb8cf0062 Adjust attendee output again, we're separating vote keys from there once more. Durr. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	213 echo
679 cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	214 stGetTDFormTextInput($edit, 20, SET_LEN_USERNAME, "name", $id, $prefix, $item["name"]).
cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	215 stGetTDFormTextInput($edit, 20, SET_LEN_GROUPS, "groups", $id, $prefix, $item["groups"]).
71 d74fb8cf0062 Adjust attendee output again, we're separating vote keys from there once more. Durr. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	216 "<td class=\"regtime\">".date("d.m. H:i", $item["regtime"])."</td>".
679 cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	217 stGetTDFormTextInput($edit, 30, SET_LEN_ONELINER, "oneliner", $id, $prefix, $item["oneliner"], "autocomplete=\"off\"");
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	218
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	219 if ($full)
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	220 {
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	221 echo
679 cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	222 stGetTDFormTextInput($edit, 20, SET_LEN_EMAIL, "email", $id, $prefix, $item["email"], "autocomplete=\"off\"");
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	223
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	224 if ($edit)
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	225 {
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	226 echo
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	227 "<td>".
680 c9b96a7b9dc4 Add new helper function and use it. Matti Hamalainen <ccr@tnsp.org> parents: 679 diff changeset	228 stGetFormButtonElement($prefix."upd".$id, "","", "Upd", "updateAttendee(".$id.")").
c9b96a7b9dc4 Add new helper function and use it. Matti Hamalainen <ccr@tnsp.org> parents: 679 diff changeset	229 stGetFormButtonElement($prefix."del".$id, "","", "Del", "deleteAttendee(".$id.")").
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	230 "</td>";
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	231 }
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	232 else
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	233 echo "<td></td>";
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	234 }
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	235
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	236 if ($tr)
674 3e37a29468bf Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 665 diff changeset	237 echo "</tr>\n";
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	238 }
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	239
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	240
222 b236b4d8d7a9 Remove useless code. Matti Hamalainen <ccr@tnsp.org> parents: 207 diff changeset	241 function stPrintNewsItem($item)
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	242 {
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	243 echo
592 642df17214f6 Improve news item DOM IDs. Matti Hamalainen <ccr@tnsp.org> parents: 585 diff changeset	244 "<div class=\"newsItem\" id=\"news".$item["id"]."\">\n".
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	245 " <h2>".chentities($item["title"])."</h2>\n".
592 642df17214f6 Improve news item DOM IDs. Matti Hamalainen <ccr@tnsp.org> parents: 585 diff changeset	246 " <div class=\"newsText\">".dhentities($item["text"])."</div>\n".
593 3cceb9f13762 And some more tweaking. Matti Hamalainen <ccr@tnsp.org> parents: 592 diff changeset	247 " <div class=\"newsAuthor\"><span class=\"newsSig\">-- ".chentities($item["author"])."</span>".
3cceb9f13762 And some more tweaking. Matti Hamalainen <ccr@tnsp.org> parents: 592 diff changeset	248 "<span class=\"newsDate\">".date("d M Y / H:i", $item["utime"])."</span></div>\n".
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	249 "</div>\n";
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	250 }
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	251
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	252
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	253 function stGenerateUserKey()
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	254 {
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	255 global $db;
99 2169c3177f47 Limit the vote key character space even more. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	256 $keyChars = "abdefghjkmnpqrstwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	257
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	258 while (TRUE)
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	259 {
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	260 // Generate one randomized keycode
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	261 $key = "";
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	262 for ($n = 0; $n < stGetSetting("userKeyLength"); $n++)
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	263 $key .= $keyChars[rand() % strlen($keyChars)];
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	264
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	265 // Check if it already exists, to avoid duplicates
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	266 // We need custom query code here, because stFetchSQLColumn()
30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	267 // won't work due to it returning FALSE in error cases.
87 3da47d3e6a3c Remove a function, etc. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	268 $sql = stPrepareSQL("SELECT * FROM votekeys WHERE key=%s", $key);
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	269 if (($res = @$db->query($sql)) !== FALSE)
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	270 {
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	271 // Did we get results?
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	272 if ($res->fetchColumn() === FALSE)
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	273 {
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	274 // Nope, return key
30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	275 return $key;
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	276 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	277 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	278 else
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	279 {
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	280 stLogSQLError($sql);
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	281 return FALSE;
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	282 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	283 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	284 }
66 230aacc22cb4 Move some functions to site lib. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	285
230aacc22cb4 Move some functions to site lib. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	286
103 c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	287 function stCheckRegistrationAvailable()
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	288 {
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	289 global $maxAttendeesHard, $maxAttendeesSoft, $numAttendees;
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	290
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	291 $maxAttendeesHard = stGetSetting("maxAttendeesHard");
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	292 $maxAttendeesSoft = stGetSetting("maxAttendeesSoft");
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	293 if (($numAttendees = stFetchSQLColumn("SELECT COUNT(*) FROM attendees")) === FALSE)
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	294 $numAttendees = 0;
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	295
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	296 return stChkSetting("allowRegister") && ($maxAttendeesHard <= 0 \|\| $numAttendees < $maxAttendeesHard);
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	297 }
135 eecac02579c4 Move stChop() to site module and rename it to stStrChop(). Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	298
eecac02579c4 Move stChop() to site module and rename it to stStrChop(). Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	299
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	300 function stValidateRequestUserData($admin, $id = FALSE)
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	301 {
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	302 $res = TRUE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	303 $chk = 0;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	304
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	305 if (stChkRequestItem("name", $name,
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	306 array(CHK_ISGT, VT_STR, 0, "Handle / name not given."),
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	307 array(CHK_LTEQ, VT_STR, SET_LEN_USERNAME, "Handle / name is too long, should be less than ".SET_LEN_USERNAME." characters.")))
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	308 $chk++;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	309 else
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	310 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	311
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	312 if (stChkRequestItem("groups", $groups,
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	313 array(CHK_LTEQ, VT_STR, SET_LEN_GROUPS, "Groups are too long, should be less than ".SET_LEN_GROUPS." characters.")))
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	314 $chk++;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	315 else
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	316 $res = FALSE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	317
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	318 if (!stChkRequestItem("oneliner", $oneliner,
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	319 array(CHK_LTEQ, VT_STR, SET_LEN_ONELINER, "Oneliner is too long, should be less than ".SET_LEN_ONELINER." characters.")))
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	320 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	321
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	322 $email = stGetRequestItem("email");
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	323 if (!$admin && stGetSetting("requireEMail") && strlen($email) < 4)
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	324 {
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	325 stError("E-mail address not given, or it is too short.");
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	326 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	327 }
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	328
605 f928b0a6e1af Better validation for e-mail addresses. Matti Hamalainen <ccr@tnsp.org> parents: 598 diff changeset	329 if (strlen($email) > 0 && preg_match("/^[a-z0-9][a-z0-9\+\-\.\%_]*@[a-z0-9.-]+\.[a-z]{2,4}$/i", $email) != 1)
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	330 {
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	331 stError("E-mail address not in proper format.");
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	332 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	333 }
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	334
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	335 if (strlen($email) > SET_LEN_EMAIL)
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	336 {
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	337 stError("E-mail address too long, max ".SET_LEN_EMAIL." characters.");
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	338 $res = FALSE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	339 }
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	340
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	341 // Check if another user already exists
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	342 if ($chk >= 2)
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	343 {
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	344 if ($id !== false)
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	345 // By another ID, if we are updating an entry
647 60b51ab059da Oops, forgot an AND from one SQL clause. Matti Hamalainen <ccr@tnsp.org> parents: 646 diff changeset	346 $sql = stPrepareSQL("SELECT * FROM attendees WHERE id<>%d AND name=%s AND groups=%s", $id, $name, $groups);
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	347 else
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	348 // Or just exists, if adding
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	349 $sql = stPrepareSQL("SELECT * FROM attendees WHERE name=%s AND groups=%s", $name, $groups);
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	350
648 9e4b8df65879 Oops, fix a 10L. Matti Hamalainen <ccr@tnsp.org> parents: 647 diff changeset	351 if (($data = stFetchSQL($sql)) !== false)
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	352 {
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	353 stError("Someone with the same name and groups is already registered.");
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	354 $res = FALSE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	355 }
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	356 }
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	357 return $res;
648 9e4b8df65879 Oops, fix a 10L. Matti Hamalainen <ccr@tnsp.org> parents: 647 diff changeset	358
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	359 }
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	360
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	361
679 cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	362 function stGetTDFormTextInput($edit, $size, $len, $name, $id, $prefix, $value, $extra = "")
437 cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	363 {
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	364 return
637 a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	365 "<td class=\"".$name."\">".
a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	366 ($edit ? stGetFormTextInput($size, $len, $name, $id, $prefix, $value, $extra) : chentities($value)).
a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	367 "</td>";
437 cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	368 }
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	369
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	370
637 a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	371 function stPrintFormTextInput($text1, $text2, $size, $len, $name, $extra="")
437 cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	372 {
637 a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	373 echo " <tr><th>".chentities($text1)."</th><td>".
a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	374 stGetFormTextInput($size, $len, $name, "", "", stGetRequestItem($name), $extra).
a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	375 "</td><td>".chentities($text2)."</td></tr>\n";
437 cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	376 }
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	377
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	378
637 a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	379 function stPrintFormHiddenInput($name, $value)
437 cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	380 {
637 a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	381 echo " ".stGetFormHiddenInput($name, $value)."\n";
437 cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	382 }
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	383
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	384
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	385 function stConvSwitchMode(&$str, &$mode, $newMode)
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	386 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	387 if ($newMode != $mode)
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	388 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	389 if ($mode != "")
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	390 $str .= "\n</".$mode.">\n";
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	391
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	392 $mode = $newMode;
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	393
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	394 if ($mode != "")
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	395 $str .= "<".$mode.">\n";
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	396 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	397 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	398
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	399
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	400 function stConvertCommonDesc($desc, $chent)
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	401 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	402 $str = "";
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	403 $mode = "";
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	404
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	405 foreach (explode("\n", $desc) as $line)
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	406 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	407 if (preg_match("/^\s\s\*(.+)$/", $line, $m))
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	408 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	409 stConvSwitchMode($str, $mode, "ol");
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	410 $str .= "<li>".($chent ? chentities($m[1]) : $m[1])."</li>\n";
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	411 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	412 else
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	413 if (preg_match("/^\s-\s(.+)$/", $line, $m))
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	414 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	415 stConvSwitchMode($str, $mode, "ul");
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	416 $str .= "<li>".($chent ? chentities($m[1]) : $m[1])."</li>\n";
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	417 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	418 else
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	419 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	420 stConvSwitchMode($str, $mode, "p");
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	421 $str .= ($chent ? chentities($line) : $line);
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	422 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	423 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	424
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	425 stConvSwitchMode($str, $mode, "");
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	426
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	427 return $str;
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	428 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	429
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	430
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	431 function stGetNumberSuffix($val)
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	432 {
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	433 switch ($val)
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	434 {
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	435 case 1: return "st";
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	436 case 2: return "nd";
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	437 case 3: return "rd";
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	438 case 4: case 5: case 6:
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	439 case 7: case 8: case 9: return "th";
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	440 default: return "th";
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	441 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	442 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	443
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	444
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	445 function stGetCompoResultsSQL($mode, $compo)
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	446 {
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	447 //
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	448 // Act based on competition type
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	449 //
640 c78e11aa3162 Rename a database field, so that it does not conflict with AJAX request item Matti Hamalainen <ccr@tnsp.org> parents: 637 diff changeset	450 switch ($compo["ctype"])
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	451 {
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	452 case COMPO_NORMAL:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	453 //
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	454 // "Normal" competition, where results are somehow
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	455 // based on points / voting.
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	456 //
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	457 switch ($mode)
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	458 {
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	459 case VOTE_FREELY:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	460 $sql =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	461 "SELECT entries.*,SUM(votes.value) AS votesum ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	462 "FROM entries ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	463 "LEFT JOIN votes ON votes.entry_id=entries.id";
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	464 break;
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	465
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	466 case VOTE_ACTIVATE:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	467 $sql =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	468 "SELECT entries.*, ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	469 "(SELECT SUM(votes.value) FROM votes ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	470 "LEFT JOIN votekeys ON votes.key_id=votekeys.id ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	471 "WHERE votes.entry_id=entries.id AND votekeys.active<>0) ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	472 "AS votesum ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	473 "FROM entries";
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	474 break;
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	475
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	476 case VOTE_ASSIGN:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	477 $sql =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	478 "SELECT entries.*, ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	479 "(SELECT SUM(votes.value) FROM votes ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	480 "LEFT JOIN votekeys ON votes.key_id=votekeys.id ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	481 "LEFT JOIN attendees ON votekeys.id=attendees.key_id ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	482 "WHERE votes.entry_id=entries.id AND attendees.key_id<>0) ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	483 "AS votesum ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	484 "FROM entries";
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	485 break;
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	486 }
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	487
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	488 $extra =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	489 "GROUP BY entries.id ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	490 "ORDER BY votesum DESC";
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	491 break;
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	492
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	493 case COMPO_POINTS:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	494 //
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	495 // Points ..
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	496 //
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	497 $sql = "SELECT entries.* FROM entries";
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	498 $extra = "ORDER BY entries.evalue DESC";
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	499 break;
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	500
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	501 case COMPO_ASSIGN:
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	502 //
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	503 // Ascending
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	504 //
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	505 $sql = "SELECT entries.* FROM entries";
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	506 $extra = "ORDER BY entries.evalue ASC";
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	507 break;
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	508 }
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	509
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	510 return $sql." ".
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	511 "WHERE entries.compo_id=".$compo["id"]." ".
570 27c64c5ad1a8 Remove the now useless stStrKludge() function and its use. Matti Hamalainen <ccr@tnsp.org> parents: 568 diff changeset	512 "AND (entries.flags & ".EFLAG_DISQUALIFIED.")=0 ".
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	513 $extra;
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	514 }
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	515
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	516
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	517 function stGetCompoResultLine($html, $entry, $points, $showAuthor)
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	518 {
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	519 $name = stStrChopPad($entry["name"], 30);
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	520 $author = stStrChopPad($entry["author"], 30);
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	521
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	522 $out = sprintf(" %s", $html ? chentities($name) : $name);
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	523
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	524 if ($showAuthor)
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	525 $out .= sprintf(" by %s", $html ? chentities($author) : $author);
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	526
698 3f322be347d6 Fix the results display. Matti Hamalainen <ccr@tnsp.org> parents: 697 diff changeset	527 if ($points !== FALSE)
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	528 $out .= sprintf(" (%d pts)", $points);
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	529
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	530 return $out."\n";
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	531 }
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	532
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	533
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	534 function stGetCompoResultsASCIIStr($html)
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	535 {
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	536 $sql = "SELECT * FROM compos WHERE visible<>0 ORDER BY name DESC";
3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	537 if (($res = stExecSQL($sql)) === false)
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	538 return "";
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	539
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	540 $voteKeyMode = stGetSetting("voteKeyMode");
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	541 $out = "";
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	542
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	543 // For each compo that has been set visible
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	544 foreach ($res as $compo)
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	545 {
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	546 // Check if there are any entries for it
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	547 $sql =
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	548 "SELECT COUNT(*) FROM entries ".
598 ba84d8e35d6b Do not count entries that have been flagged as disqualified. Matti Hamalainen <ccr@tnsp.org> parents: 593 diff changeset	549 "WHERE compo_id=".$compo["id"]." ".
ba84d8e35d6b Do not count entries that have been flagged as disqualified. Matti Hamalainen <ccr@tnsp.org> parents: 593 diff changeset	550 "AND (entries.flags & ".EFLAG_DISQUALIFIED.")=0";
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	551
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	552 if (($nentries = stFetchSQLColumn($sql)) !== FALSE && $nentries > 0)
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	553 {
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	554 // Get voting results by mode
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	555 $sql = stGetCompoResultsSQL($voteKeyMode, $compo);
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	556
697 215813020256 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 695 diff changeset	557 // Output compo title / header
512 998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	558 if ($html)
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	559 {
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	560 $out .=
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	561 "<pre>\n".
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	562 "<b> ".chentities($compo["name"])." </b>\n".
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	563 str_repeat("=", strlen($compo["name"]) + 2)."-- - .\n\n";
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	564 }
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	565 else
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	566 {
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	567 $out .=
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	568 " ".$compo["name"]."\n".
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	569 str_repeat("=", strlen($compo["name"]) + 2)."-- - .\n\n";
998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	570 }
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	571
697 215813020256 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 695 diff changeset	572 // List results for this compo
215813020256 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 695 diff changeset	573 $prev = FALSE;
215813020256 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 695 diff changeset	574 $index = 0;
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	575 foreach (stExecSQL($sql) as $entry)
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	576 {
697 215813020256 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 695 diff changeset	577 // Act based on compo type
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	578 switch ($compo["ctype"])
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	579 {
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	580 case COMPO_NORMAL:
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	581 if ($entry["votesum"] !== $prev)
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	582 {
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	583 $index++;
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	584 $out .= sprintf("%3d%s.", $index, stGetNumberSuffix($index));
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	585 }
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	586 else
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	587 $out .= " -''-";
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	588
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	589 $out .= stGetCompoResultLine($html, $entry, $entry["votesum"], TRUE);
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	590
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	591 $prev = $entry["votesum"];
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	592 break;
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	593
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	594 case COMPO_POINTS:
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	595 case COMPO_ASSIGN:
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	596 if ($entry["evalue"] !== $prev)
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	597 {
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	598 $index++;
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	599 $out .= sprintf("%3d%s.", $index, stGetNumberSuffix($index));
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	600 }
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	601 else
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	602 $out .= " -''-";
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	603
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	604 $out .= stGetCompoResultLine($html, $entry,
698 3f322be347d6 Fix the results display. Matti Hamalainen <ccr@tnsp.org> parents: 697 diff changeset	605 ($compo["ctype"] == COMPO_POINTS) ? $entry["evalue"] : FALSE,
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	606 $compo["show_authors"]);
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	607
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	608 $prev = $entry["evalue"];
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	609 break;
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	610 }
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	611 }
512 998a09b332f1 Add plain text printable results visible for admins. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	612 $out .= "\n\n".($html ? "</pre>\n" : "");
511 6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	613 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	614 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	615
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	616 return $out;
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	617 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	618
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	619
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	620
459 36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	621 function stNormalizeListSlideOrder($list_id)
36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	622 {
36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	623 }
36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	624
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	625
585 cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	626 // Get link helper function
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	627 function stGetMainPageLink($id, $name, $show = TRUE)
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	628 {
699 9a948144dcc9 Various cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 698 diff changeset	629 global $pageName;
585 cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	630 if ($show)
699 9a948144dcc9 Various cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 698 diff changeset	631 return " <a class=\"".($id == $pageName ? "active" : "inactive")."\" href=\"".$id."\">".$name."</a>\n";
585 cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	632 else
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	633 return "";
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	634 }
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	635
0 8019b357cc03 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 ?>

Mercurial > hg > fapweb

annotate msite.inc.php @ 702:c527b42a7857