fapweb: msite.inc.php annotate

annotate msite.inc.php @ 781:6e9e42005701

Cleanups, fixes.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 20 Nov 2014 16:35:30 +0200
parents	f8d09e0de027
children	7735f97b2bbf

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);
716 e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	21 define("SET_LEN_REGHOST", 128);
184 1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	22
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_TITLE", 128);
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_TEXT", 4096);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	25 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	26
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_NAME", 128);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	28 define("SET_LEN_COMPO_DESC", 4096);
533 f872843ae396 Add file path to compo data. Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	29 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	30
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_NAME", 64);
1b30c2107e5b Add function for validating input with different definable conditions. Use Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	32 define("SET_LEN_ENTRY_AUTHOR", 64);
526 e074775d853e Make filename field shorter. Matti Hamalainen <ccr@tnsp.org> parents: 512 diff changeset	33 define("SET_LEN_ENTRY_FILENAME", 128);
506 d29166d97b46 Change some database field sizes. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	34 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	35 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	36 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	37
506 d29166d97b46 Change some database field sizes. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	38 define("SET_LEN_DISP_SLIDE_TITLE", 64);
420 e9f6e242c4b9 Define some more SQL field lengths. Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	39 define("SET_LEN_DISP_SLIDE_TEXT", 4096);
e9f6e242c4b9 Define some more SQL field lengths. Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	40 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	41
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 491 diff changeset	42 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	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
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	45 //
702 c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	46 // 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	47 //
700 d0418af28559 Add EPREV_NONE define. Matti Hamalainen <ccr@tnsp.org> parents: 699 diff changeset	48 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	49 define("EPREV_IMAGE", 1); // Preview is image (PNG, JPEG)
700 d0418af28559 Add EPREV_NONE define. Matti Hamalainen <ccr@tnsp.org> parents: 699 diff changeset	50 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	51
703 242cb053fbb2 Add array/list of preview types and descriptions for them. Matti Hamalainen <ccr@tnsp.org> parents: 702 diff changeset	52 $previewTypeList = array(
752 c714140541d5 Add more data to previewTypeList array and implement array index argument in Matti Hamalainen <ccr@tnsp.org> parents: 746 diff changeset	53 EPREV_NONE => array("No previews" , "Default"),
c714140541d5 Add more data to previewTypeList array and implement array index argument in Matti Hamalainen <ccr@tnsp.org> parents: 746 diff changeset	54 EPREV_IMAGE => array("Image file" , "Image"),
c714140541d5 Add more data to previewTypeList array and implement array index argument in Matti Hamalainen <ccr@tnsp.org> parents: 746 diff changeset	55 EPREV_AUDIO => array("Audio file" , "Audio"),
703 242cb053fbb2 Add array/list of preview types and descriptions for them. Matti Hamalainen <ccr@tnsp.org> parents: 702 diff changeset	56 );
242cb053fbb2 Add array/list of preview types and descriptions for them. Matti Hamalainen <ccr@tnsp.org> parents: 702 diff changeset	57
242cb053fbb2 Add array/list of preview types and descriptions for them. Matti Hamalainen <ccr@tnsp.org> parents: 702 diff changeset	58
702 c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	59 //
c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 diff changeset	60 // Entry flags (bitfield)
c527b42a7857 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 700 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 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	63 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	64
690 bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	65 $entryFlagsList = array(
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	66 EFLAG_DISQUALIFIED => array("Disqualified", "img/disqualified.png"),
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	67 EFLAG_PROBLEMS => array("Has problems", "img/problems.png"),
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	68 );
bad79296eb34 Cleanups, rename variables. Matti Hamalainen <ccr@tnsp.org> parents: 680 diff changeset	69
508 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 //
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	72 // 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	73 //
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	74 define("COMPO_NORMAL", 0); // Normal voting compo, points determine placement
3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	75 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	76 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	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
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	79 $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	80 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	81 "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	82 ),
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	83 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	84 "Assigned points (no voting).",
745 7ac6d1fdc078 Add two new fields to compoModeData. Matti Hamalainen <ccr@tnsp.org> parents: 742 diff changeset	85 "Points",
508 b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	86 ),
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	87 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	88 "Assigned places (no points, no voting).",
745 7ac6d1fdc078 Add two new fields to compoModeData. Matti Hamalainen <ccr@tnsp.org> parents: 742 diff changeset	89 "Place",
508 b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	90 ),
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	91 );
b6fe46c86ff3 Add definitions for entry flags and compo types. Not used yet (though the Matti Hamalainen <ccr@tnsp.org> parents: 506 diff changeset	92
641 1a123c6c2241 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 640 diff changeset	93
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	94 //
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	95 // Different voting modes
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	96 //
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	97 define("VOTE_FREELY", 0);
274 81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	98 define("VOTE_ACTIVATE", 1);
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	99 define("VOTE_ASSIGN", 2);
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	100
274 81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	101 $voteModeData = array(
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	102 VOTE_FREELY => array("Freeform voting",
282 50e52dc43916 Add missing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 274 diff changeset	103 "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	104 "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	105 ),
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	106 VOTE_ACTIVATE => array("Key activation",
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	107 "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	108 "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	109 "Give key slip to attendee."
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	110 ),
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	111 VOTE_ASSIGN => array("Assigned keys",
307 c0d573a5de5b Add procedure description to assigned keys mode. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	112 "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	113 "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	114 "Give key slip to attendee."
274 81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	115 ),
81507072f25d Add explanations of the different voting modes. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	116 );
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	117
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	118
535 88c048f3b9e1 Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	119 //
88c048f3b9e1 Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	120 // Party infromation system data/variables handling
88c048f3b9e1 Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	121 //
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	122 function stReloadDisplayVars()
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 global $displayVars, $displayVarsChanged;
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 $displayVars = array();
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	127 $displayVarsChanged = array();
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	128
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	129 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	130 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	131 foreach ($res as $row)
354 1dd598221874 Simplify code by reusing functions from site module. Matti Hamalainen <ccr@tnsp.org> parents: 307 diff changeset	132 $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	133 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	134 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	135
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	136
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	137 function stSaveDisplayVars()
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	138 {
144 c030c3cf0d80 More work on display system. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	139 global $db, $displayVars, $displayVarsChanged;
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	140
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	141 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	142 if (isset($displayVarsChanged[$item["key"]]))
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	143 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	144 $val = $displayVars[$item["key"]];
354 1dd598221874 Simplify code by reusing functions from site module. Matti Hamalainen <ccr@tnsp.org> parents: 307 diff changeset	145 stExecSQL(
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 535 diff changeset	146 "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	147 " 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	148 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	149 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	150
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	151
407 eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	152 function stDisplayUpdated()
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	153 {
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	154 stSetDisplayVar("lastUpdate", time());
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	155 }
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	156
eaea1ae2bc3d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 396 diff changeset	157
454 ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	158 function stSetDisplayVarUpd($name, $value)
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 if (stGetDisplayVar($name) != $value)
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	161 {
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	162 stSetDisplayVar($name, $value);
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	163 stDisplayUpdated();
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	164 return TRUE;
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	165 }
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	166 else
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	167 return FALSE;
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	168 }
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	169
ea7fc4e9f602 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	170
143 20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	171 function stGetDisplayVar($name)
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;
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 return $displayVars[$name];
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	176 else
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	177 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	178 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	179
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	180
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	181 function stSetDisplayVar($name, $value)
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 global $displayVars, $displayVarsChanged;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	184 if (isset($displayVars[$name]))
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	185 {
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	186 $displayVars[$name] = $value;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	187 $displayVarsChanged[$name] = true;
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	188 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	189 else
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	190 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	191 }
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	192
20893a5442b7 Move some functions to site module, and use them. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	193
484 c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	194 function stExecSQLCond($sql, $msg = FALSE)
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	195 {
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	196 global $db;
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	197 if (($res = stDBExecSQL($db, $sql)) !== FALSE)
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 if ($msg !== FALSE)
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	200 stSetStatus(200, $msg);
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	201 return $res;
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	202 }
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	203 else
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	204 {
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	205 stSetStatus(902, "Error in SQL execution.");
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	206 return FALSE;
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	207 }
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	208 }
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	209
c8591a8fadbc Move stExecSQLCond() to site module. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	210
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	211 function stPrintAttendee($item, $row, $tr, $full, $edit, $eclass = "")
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	212 {
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	213 $id = $item["id"];
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	214 $prefix = "at";
677 64d80a7f7e26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 674 diff changeset	215
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	216 if ($tr)
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	217 {
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	218 echo
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	219 " <tr class=\"".($row % 2 == 1 ? "rodd" : "reven").$eclass.
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	220 "\" id=\"attendee".$id."\" ".($full ? "onClick=\"activateAttendee(".$id.")\"" : "").">";
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	221 }
677 64d80a7f7e26 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 674 diff changeset	222
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	223 echo
679 cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	224 stGetTDFormTextInput($edit, 20, SET_LEN_USERNAME, "name", $id, $prefix, $item["name"]).
cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	225 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	226 "<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	227 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	228
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	229 if ($full)
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	230 {
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	231 echo
716 e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	232 stGetTDFormTextInput($edit, 15, SET_LEN_EMAIL, "email", $id, $prefix, $item["email"], "autocomplete=\"off\"").
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	233 stGetTDFormTextInput($edit, 15, SET_LEN_REGHOST, "reghost", $id, $prefix, $item["reghost"], "autocomplete=\"off\"");
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	234
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	235 if ($edit)
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	236 {
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	237 echo
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	238 "<td>".
680 c9b96a7b9dc4 Add new helper function and use it. Matti Hamalainen <ccr@tnsp.org> parents: 679 diff changeset	239 stGetFormButtonElement($prefix."upd".$id, "","", "Upd", "updateAttendee(".$id.")").
c9b96a7b9dc4 Add new helper function and use it. Matti Hamalainen <ccr@tnsp.org> parents: 679 diff changeset	240 stGetFormButtonElement($prefix."del".$id, "","", "Del", "deleteAttendee(".$id.")").
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	241 "</td>";
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	242 }
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	243 else
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	244 echo "<td></td>";
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	245 }
205 77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	246
77d33161f8be More work on admin interface. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	247 if ($tr)
674 3e37a29468bf Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 665 diff changeset	248 echo "</tr>\n";
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	249 }
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	250
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	251
222 b236b4d8d7a9 Remove useless code. Matti Hamalainen <ccr@tnsp.org> parents: 207 diff changeset	252 function stPrintNewsItem($item)
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	253 {
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	254 echo
592 642df17214f6 Improve news item DOM IDs. Matti Hamalainen <ccr@tnsp.org> parents: 585 diff changeset	255 "<div class=\"newsItem\" id=\"news".$item["id"]."\">\n".
37 238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	256 " <h2>".chentities($item["title"])."</h2>\n".
592 642df17214f6 Improve news item DOM IDs. Matti Hamalainen <ccr@tnsp.org> parents: 585 diff changeset	257 " <div class=\"newsText\">".dhentities($item["text"])."</div>\n".
593 3cceb9f13762 And some more tweaking. Matti Hamalainen <ccr@tnsp.org> parents: 592 diff changeset	258 " <div class=\"newsAuthor\"><span class=\"newsSig\">-- ".chentities($item["author"])."</span>".
3cceb9f13762 And some more tweaking. Matti Hamalainen <ccr@tnsp.org> parents: 592 diff changeset	259 "<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	260 "</div>\n";
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	261 }
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	262
238c73840b61 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	263
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	264 function stGenerateUserKey()
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	265 {
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	266 global $db;
99 2169c3177f47 Limit the vote key character space even more. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	267 $keyChars = "abdefghjkmnpqrstwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	268
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	269 while (TRUE)
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 // Generate one randomized keycode
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	272 $key = "";
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	273 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	274 $key .= $keyChars[rand() % strlen($keyChars)];
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	275
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	276 // 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	277 // 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	278 // 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	279 $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	280 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	281 {
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	282 // Did we get results?
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	283 if ($res->fetchColumn() === FALSE)
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	284 {
69 30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	285 // Nope, return key
30a4420e85ab stGenerateUserKey() simply returns a generated key now (string) or FALSE if Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	286 return $key;
65 72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	287 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	288 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	289 else
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	290 {
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	291 stLogSQLError($sql);
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	292 return FALSE;
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	293 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	294 }
72b22729ae7e Add function for generating vote keys into site lib. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	295 }
66 230aacc22cb4 Move some functions to site lib. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	296
230aacc22cb4 Move some functions to site lib. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	297
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	298 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	299 {
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	300 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	301
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	302 $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	303 $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	304 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	305 $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	306
c6b9041078ec Add hard limit option for attendees, and add feature of using "0" to disable Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	307 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	308 }
135 eecac02579c4 Move stChop() to site module and rename it to stStrChop(). Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	309
eecac02579c4 Move stChop() to site module and rename it to stStrChop(). Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	310
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	311 function stValidateRequestUserData($admin, $id = FALSE)
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	312 {
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	313 $res = TRUE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	314 $chk = 0;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	315
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	316 if (stChkRequestItem("name", $name,
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	317 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	318 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	319 $chk++;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	320 else
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	321 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	322
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	323 if (stChkRequestItem("groups", $groups,
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	324 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	325 $chk++;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	326 else
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	327 $res = FALSE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	328
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	329 if (!stChkRequestItem("oneliner", $oneliner,
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	330 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	331 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	332
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	333 $email = stGetRequestItem("email");
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	334 if (!$admin && stGetSetting("requireEMail") && strlen($email) < 4)
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	335 {
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	336 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	337 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	338 }
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	339
605 f928b0a6e1af Better validation for e-mail addresses. Matti Hamalainen <ccr@tnsp.org> parents: 598 diff changeset	340 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	341 {
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	342 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	343 $res = FALSE;
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	344 }
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	345
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	346 if (strlen($email) > SET_LEN_EMAIL)
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	347 {
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	348 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	349 $res = FALSE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	350 }
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	351
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	352 // Check if another user already exists
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	353 if ($chk >= 2)
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	354 {
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	355 if ($id !== false)
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	356 // 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	357 $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	358 else
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	359 // Or just exists, if adding
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	360 $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	361
648 9e4b8df65879 Oops, fix a 10L. Matti Hamalainen <ccr@tnsp.org> parents: 647 diff changeset	362 if (($data = stFetchSQL($sql)) !== false)
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	363 {
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	364 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	365 $res = FALSE;
2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	366 }
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	367 }
646 2eeca16e9c96 Improve attendee adding/updating data validation. Matti Hamalainen <ccr@tnsp.org> parents: 641 diff changeset	368 return $res;
648 9e4b8df65879 Oops, fix a 10L. Matti Hamalainen <ccr@tnsp.org> parents: 647 diff changeset	369
207 e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	370 }
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	371
e31c42a9b574 Slowly work on input validation. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	372
679 cbb66cb60930 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 677 diff changeset	373 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	374 {
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	375 return
637 a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	376 "<td class=\"".$name."\">".
a376521c7bd1 Move some code around, for more appropriate placement in the modules. Matti Hamalainen <ccr@tnsp.org> parents: 623 diff changeset	377 ($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	378 "</td>";
437 cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	379 }
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	380
cefa64c8be63 Move some functions to msite. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	381
746 8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	382 function stGetEditFormTextInput($mode, $title, $size, $len, $name, $id, $prefix, $value, $extra = "")
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	383 {
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	384 return
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	385 "<div class=\"editControl\"><span class=\"editControlTitle\">".chentities($title)."</span>".
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	386 ($mode ? stGetFormTextInput($size, $len, $name, $id, $prefix, $value, $extra) : chentities($value)).
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	387 "</div>";
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	388 }
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	389
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	390
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	391 function stGetEditFormTextArea($mode, $title, $rows, $cols, $name, $id, $prefix, $value, $extra = "")
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	392 {
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	393 return
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	394 "<div class=\"editControl\"><span class=\"editControlTitle\">".chentities($title)."</span>".
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	395 stGetFormTextArea($rows, $cols, $name, $id, $prefix, $value, ($mode ? "" : " disabled=\"disabled\" ").$extra).
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	396 "</div>";
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	397 }
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	398
8fe56276fa4f Add new helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	399
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	400 function stConvSwitchMode(&$str, &$mode, $newMode)
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 if ($newMode != $mode)
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	403 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	404 if ($mode != "")
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	405 $str .= "\n</".$mode.">\n";
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 $mode = $newMode;
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 if ($mode != "")
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	410 $str .= "<".$mode.">\n";
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 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	413
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	414
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	415 function stConvertCommonDesc($desc, $chent)
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	416 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	417 $str = "";
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	418 $mode = "";
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 foreach (explode("\n", $desc) as $line)
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	421 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	422 if (preg_match("/^\s\s\*(.+)$/", $line, $m))
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 stConvSwitchMode($str, $mode, "ol");
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	425 $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	426 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	427 else
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	428 if (preg_match("/^\s-\s(.+)$/", $line, $m))
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 stConvSwitchMode($str, $mode, "ul");
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	431 $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	432 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	433 else
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	434 {
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	435 stConvSwitchMode($str, $mode, "p");
491 c360fb50221c Add entity handling to stConvertCommonDesc(). Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	436 $str .= ($chent ? chentities($line) : $line);
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	437 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	438 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	439
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	440 stConvSwitchMode($str, $mode, "");
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	441
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	442 return $str;
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	443 }
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	444
532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	445
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	446 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	447 {
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	448 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	449 {
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	450 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	451 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	452 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	453 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	454 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	455 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	456 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	457 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	458
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	459
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	460 function stGetCompoResultsSQL($mode, $compo)
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	461 {
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	462 //
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	463 // Act based on competition type
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	464 //
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	465 switch ($compo["ctype"])
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	466 {
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	467 case COMPO_NORMAL:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	468 //
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	469 // "Normal" competition, where results are somehow
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	470 // based on points / voting.
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	471 //
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	472 switch ($mode)
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	473 {
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	474 case VOTE_FREELY:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	475 $sql =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	476 "SELECT entries.*,SUM(votes.value) AS votesum ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	477 "FROM entries ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	478 "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	479 break;
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	480
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	481 case VOTE_ACTIVATE:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	482 $sql =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	483 "SELECT entries.*, ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	484 "(SELECT SUM(votes.value) FROM votes ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	485 "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	486 "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	487 "AS votesum ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	488 "FROM entries";
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	489 break;
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	490
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	491 case VOTE_ASSIGN:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	492 $sql =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	493 "SELECT entries.*, ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	494 "(SELECT SUM(votes.value) FROM votes ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	495 "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	496 "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	497 "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	498 "AS votesum ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	499 "FROM entries";
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	500 break;
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	501 }
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	502
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	503 $extra =
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	504 "GROUP BY entries.id ".
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	505 "ORDER BY votesum DESC";
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	506 break;
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	507
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	508 case COMPO_POINTS:
8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	509 //
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	510 // Points ..
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	511 //
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	512 $sql = "SELECT entries.*,entries.evalue AS votesum FROM entries";
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	513 $extra = "ORDER BY entries.evalue DESC";
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	514 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	515
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	516 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	517 //
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	518 // Ascending
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	519 //
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	520 $sql = "SELECT entries.*,entries.evalue AS votesum FROM entries";
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	521 $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	522 break;
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	523 }
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	524
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	525 return $sql." ".
606 3d2b70fbeb78 Slight cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	526 "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	527 "AND (entries.flags & ".EFLAG_DISQUALIFIED.")=0 ".
623 8e6331d7870d Some work on compo type handling. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	528 $extra;
531 ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	529 }
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	530
ec30ad303bd1 Modularize. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	531
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	532 function stGetCompoResults()
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	533 {
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	534 $voteKeyMode = stGetSetting("voteKeyMode");
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	535 $out = array();
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	536 $sql = "SELECT * FROM compos WHERE visible<>0 ORDER BY name DESC";
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	537 if (($res = stExecSQL($sql)) === false)
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	538 return $out;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	539
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	540 // For each compo that has been set visible
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	541 foreach ($res as $compo)
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	542 {
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	543 // Check if there are any entries for it
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	544 $sql =
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	545 "SELECT COUNT(*) FROM entries ".
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	546 "WHERE compo_id=".$compo["id"]." ".
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	547 "AND (entries.flags & ".EFLAG_DISQUALIFIED.")=0";
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	548
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	549 if (($nentries = stFetchSQLColumn($sql)) !== FALSE && $nentries > 0)
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	550 {
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	551 // Get voting results by mode
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	552 $sql = stGetCompoResultsSQL($voteKeyMode, $compo);
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	553
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	554 $out[$compo["id"]] = $compo;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	555 $out[$compo["id"]]["results"] = array();
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	556 $prev = FALSE;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	557 $index = 0;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	558
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	559 foreach (stExecSQL($sql) as $entry)
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	560 {
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	561 if ($entry["votesum"] !== $prev)
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	562 $index++;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	563
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	564 $entry["position"] = $index;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	565 $out[$compo["id"]]["results"][] = $entry;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	566
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	567 $prev = $entry["votesum"];
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	568 }
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	569 }
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	570 }
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	571
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	572 return $out;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	573 }
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	574
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	575
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	576 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	577 {
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	578 $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	579 $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	580
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	581 $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	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 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	584 $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	585
698 3f322be347d6 Fix the results display. Matti Hamalainen <ccr@tnsp.org> parents: 697 diff changeset	586 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	587 $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	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 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	590 }
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	591
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	592
dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	593 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	594 {
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	595 $out = "";
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	596 foreach (stGetCompoResults() as $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	597 {
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	598 // Output compo title / header
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	599 if ($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	600 {
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	601 $out .=
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	602 "<pre>\n".
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	603 "<b> ".chentities($compo["name"])." </b>\n".
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	604 str_repeat("=", strlen($compo["name"]) + 2)."-- - .\n\n";
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	605 }
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	606 else
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	607 {
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	608 $out .=
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	609 " ".$compo["name"]."\n".
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	610 str_repeat("=", strlen($compo["name"]) + 2)."-- - .\n\n";
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	611 }
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	612
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	613 // List results for this compo
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	614 $prev = FALSE;
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	615 foreach ($compo["results"] as $entry)
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	616 {
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	617 if ($entry["position"] !== $prev)
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	618 $out .= sprintf("%3d%s.", $entry["position"], stGetNumberSuffix($entry["position"]));
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	619 else
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	620 $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	621
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	622 $out .= stGetCompoResultLine($html, $entry,
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	623 ($compo["ctype"] != COMPO_ASSIGN) ? $entry["votesum"] : FALSE,
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	624 ($compo["ctype"] != COMPO_NORMAL) ? $compo["show_authors"] : 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	625
724 fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	626 $prev = $entry["position"];
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	627 }
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	628 $out .= "\n\n".($html ? "</pre>\n" : "");
fd84eb4d8b74 Refactor compo results code for modularity. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	629 }
695 dff9b125f774 Work on results printing and remove "show authors" option as it is rather Matti Hamalainen <ccr@tnsp.org> parents: 690 diff changeset	630
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	631 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	632 }
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	633
6fe66ea0e954 Move most of the results code to site module, remove the support for HTML Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	634
459 36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	635 function stNormalizeListSlideOrder($list_id)
36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	636 {
36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	637 }
36835ef53346 Moar! Matti Hamalainen <ccr@tnsp.org> parents: 454 diff changeset	638
488 532cebd9c9f2 Move some functions to site module. Matti Hamalainen <ccr@tnsp.org> parents: 484 diff changeset	639
716 e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	640 function stGetAttendeeRegistrationSQL()
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	641 {
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	642 return stPrepareSQL(
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	643 "INSERT INTO attendees (regtime,name,groups,oneliner,email,reghost) VALUES (%d,%S,%S,%S,%S,%s)",
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	644 time(), "name", "groups", "oneliner", "email", $_SERVER["REMOTE_ADDR"]);
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	645 }
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	646
e7fbcf4190e6 Add registration host. Matti Hamalainen <ccr@tnsp.org> parents: 703 diff changeset	647
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	648 function stMakePath($isURL, $repExt, $components)
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	649 {
780 f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	650 $res = array();
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	651
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	652 // If this is URL, the first component is passed as is
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	653 if ($isURL)
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	654 {
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	655 $res[] = array_shift($components);
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	656 $first = FALSE;
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	657 }
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	658 else
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	659 $first = TRUE;
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	660
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	661 // Handle each path component
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	662 foreach ($components as $subComponent)
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	663 {
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	664 foreach (explode("/", $subComponent) as $item)
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	665 {
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	666 if ($item == "..")
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	667 array_pop($res);
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	668 else
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	669 if ($item != "." && ($item != "" \|\| $first))
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	670 $res[] = preg_replace("/[^a-zA-Z0-9\,\.\/_-]/", "_", $item);
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	671
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	672 $first = FALSE;
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	673 }
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	674 }
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	675
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	676 if ($repExt !== FALSE && ($tmp = array_pop($res)) !== false)
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	677 {
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	678 if (($spos = strrpos($tmp, ".")) !== FALSE)
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	679 $tmp = substr($tmp, 0, $spos).$repExt;
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	680 else
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	681 $tmp .= $repExt;
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	682
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	683 $res[] = $tmp;
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	684 }
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	685
f8d09e0de027 Properly implement stMakePath() replacing the stub function. Matti Hamalainen <ccr@tnsp.org> parents: 774 diff changeset	686 return implode("/", $res);
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	687 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	688
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	689
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	690 function stGetEntryPreviewData($compo, $entry, $probePreview, $fullData)
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	691 {
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	692 $res = array();
742 66e415b69c75 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 734 diff changeset	693 $entryPath = stGetSetting("entryPath");
66e415b69c75 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 734 diff changeset	694 $previewPath = stGetSetting("previewPath");
66e415b69c75 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 734 diff changeset	695 $previewURL = stGetSetting("previewURL");
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	696 $thumbDir = stGetSetting("thumbnailSubDir");
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	697
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	698 $filename = $entry["filename"];
6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	699
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	700 // Data for the actual entry file
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	701 $res["previewType"] = ($entry["preview_type"] != EPREV_NONE) ? $entry["preview_type"] : $compo["preview_type"];
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	702 $res["entryFile"] = stMakePath(FALSE, FALSE, array($entryPath, $compo["cpath"], $filename));
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	703 if ($fullData)
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	704 {
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	705 $res["entrySize"] = @filesize($res["entryFile"]);
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	706 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	707
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	708 // Based on preview type, set some basics
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	709 switch ($res["previewType"])
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	710 {
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	711 case EPREV_IMAGE:
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	712 $res["fileBase"] = stMakePath(FALSE, "_sshot", array($filename));
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	713 $res["preferType"] = "PNG";
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	714 $fileTypeList = array(
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	715 "PNG" => array(".png", ".PNG"),
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	716 "GIF" => array(".gif", ".GIF"),
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	717 "JPEG" => array(".jpg", ".JPG"),
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	718 );
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	719 break;
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	720
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	721 case EPREV_AUDIO:
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	722 $res["fileBase"] = stMakePath(FALSE, "_sample", array($filename));
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	723 $res["preferType"] = "PNG";
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	724 $fileTypeList = array(
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	725 "MP3" => array(".mp3", ".MP3"),
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	726 "OGG" => array(".ogg", ".OGG", ".oga", ".OGA"),
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	727 );
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	728 break;
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	729
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	730 default:
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	731 return FALSE;
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	732 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	733
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	734 // Find the preview file(s)
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	735 foreach ($fileTypeList as $fileType => $fileExts)
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	736 {
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	737 foreach ($fileExts as $fext)
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	738 {
742 66e415b69c75 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 734 diff changeset	739 $filename = stMakePath(FALSE, $fext, array($previewPath, $compo["cpath"], $res["fileBase"]));
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	740 if ($probePreview == FALSE \|\| file_exists($filename))
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	741 {
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	742 $res["previewFileType"] = $fileType;
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	743 $res["previewPath"] = $filename;
742 66e415b69c75 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 734 diff changeset	744 $res["previewURL"] = stMakePath(TRUE, $fext, array($previewURL, $compo["cpath"], $res["fileBase"]));
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	745
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	746 if ($res["previewType"] == EPREV_IMAGE)
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	747 {
781 6e9e42005701 Cleanups, fixes. Matti Hamalainen <ccr@tnsp.org> parents: 780 diff changeset	748 $res["thumbPath"] = stMakePath(FALSE, $fext, array($previewPath, $compo["cpath"], $thumbDir, $res["fileBase"]));
742 66e415b69c75 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 734 diff changeset	749 $res["thumbURL"] = stMakePath(TRUE, $fext, array($previewURL, $compo["cpath"], $thumbDir, $res["fileBase"]));
721 69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	750 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	751
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	752 if ($fullData)
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	753 {
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	754 $res["previewSize"] = @filesize($res["previewPath"]);
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	755 $res["thumbSize"] = @filesize($res["thumbPath"]);
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	756 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	757
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	758 return $res;
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	759 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	760 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	761 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	762
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	763 return FALSE;
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	764 }
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	765
69a829f687a9 Preliminary work for entry previews. Matti Hamalainen <ccr@tnsp.org> parents: 716 diff changeset	766
774 d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	767 function stPrintPreviewElements($compo, $entry)
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	768 {
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	769 if (($pdata = stGetEntryPreviewData($compo, $entry, FALSE, TRUE)) === FALSE)
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	770 return FALSE;
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	771
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	772 switch ($pdata["previewType"])
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	773 {
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	774 case EPREV_IMAGE:
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	775 if ($pdata["previewSize"] === FALSE \|\| $pdata["thumbSize"] === FALSE)
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	776 {
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	777 echo
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	778 "<img class=\"imagePreview\" src=\"img/nopreview_tn.png\" alt=\"Preview\" />";
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	779 }
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	780 else
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	781 {
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	782 echo
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	783 "<a href=\"".ihentities($pdata["previewURL"]).
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	784 "\" onClick=\"jsShowPreviewImage('".ihentities($pdata["previewURL"])."')\">".
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	785 "<img class=\"imagePreview\" src=\"".ihentities($pdata["thumbURL"]).
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	786 "\" alt=\"Preview\" /></a>";
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	787 }
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	788 break;
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	789
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	790 case EPREV_AUDIO:
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	791 if ($pdata["previewSize"] !== FALSE)
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	792 {
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	793 echo
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	794 "<audio controls class=\"audioPreview\">".
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	795 "<source src=\"".ihentities($pdata["previewURL"])."\" type=\"audio/mpeg\">-".
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	796 "</audio>";
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	797 }
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	798 break;
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	799 }
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	800
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	801 return TRUE;
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	802 }
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	803
d6668b73bb01 Modularize preview HTML stuff into a function stPrintPreviewElements(). Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	804
585 cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	805 // Get link helper function
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	806 function stGetMainPageLink($id, $name, $show = TRUE)
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	807 {
699 9a948144dcc9 Various cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 698 diff changeset	808 global $pageName;
585 cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	809 if ($show)
699 9a948144dcc9 Various cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 698 diff changeset	810 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	811 else
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	812 return "";
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	813 }
cec36fd24d21 Clean up the menu and HTML somewhat. Matti Hamalainen <ccr@tnsp.org> parents: 571 diff changeset	814
0 8019b357cc03 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	815 ?>

Mercurial > hg > fapweb

annotate msite.inc.php @ 781:6e9e42005701