fapweb: createdb.php annotate

annotate createdb.php @ 499:408effd4e9ea

Cosmetics.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 07 Dec 2013 16:51:23 +0200
parents	505f46b8bb14
children	89e2a0ac7c7c

rev	line source
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 #!/usr/bin/php
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 <?
175 8df523e6326a User require_once instead of require. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	3 require_once "mconfig.inc.php";
8df523e6326a User require_once instead of require. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	4 require_once "msite.inc.php";
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5
479 86ee2b42a995 Move CLI helper functions to msitegen, again. Matti Hamalainen <ccr@tnsp.org> parents: 426 diff changeset	6 stCheckCLIExec();
50 184a4188555c Move CLI helper functions to createdb.php, as they are now only used there. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	7
426 249631e194c8 Bump db version again. Matti Hamalainen <ccr@tnsp.org> parents: 425 diff changeset	8 $dbVersion = 10;
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	9
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	10 $dbMeta = array(
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	11 "dbVersion" => array(VT_INT, $dbVersion, "Database version"),
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	12 );
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	13
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
499 408effd4e9ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	15 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 // The defaults we put in
499 408effd4e9ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	17 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 $siteDefaults = array(
268 feed47a72df4 Update some setting descriptions. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	19 "maxAttendeesHard" => array(VT_INT, 60, "Maximum attendees (HARD limit, <= 0 means no limit)"),
feed47a72df4 Update some setting descriptions. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	20 "maxAttendeesSoft" => array(VT_INT, 50, "Maximum attendees (soft limit, <= 0 means no limit)"),
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21
158 96aae4beb558 Clean up some references to entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 150 diff changeset	22 "userTimeout" => array(VT_INT, 120, "User pages (voting) timeout in minutes"),
32 36392d1d6b5f Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	23 "admTimeout" => array(VT_INT, 15, "Administration interface timeout in minutes"),
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	24
62 101cde58b267 Add a new setting for ASCII vs. HTML table output for compo results. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	25 "showAdmin" => array(VT_BOOL, false, "Always show administration interface link on the menu"),
119 99e7569c9f4f Change the default of some boolean settings. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	26 "showAttendees" => array(VT_BOOL, true, "Show attendees list"),
11 c10bf196390f Improve database initialization script. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	27 "allowRegister" => array(VT_BOOL, false, "Enable event registration"),
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	28 "allowVoting" => array(VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"),
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	29
11 c10bf196390f Improve database initialization script. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	30 "showResults" => array(VT_BOOL, false, "Enable results page"),
62 101cde58b267 Add a new setting for ASCII vs. HTML table output for compo results. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	31 "showResultsASCII" => array(VT_BOOL, true, "Show results as ASCII instead of HTML table"),
119 99e7569c9f4f Change the default of some boolean settings. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	32 "showResAuthors" => array(VT_BOOL, true, "Show entry authors on results page"),
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	34 "requireEMail" => array(VT_BOOL, false, "Require e-mail address in registrations"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	35
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	36 "showNews" => array(VT_BOOL, true, "Enable News link on main menu"),
5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	37 "showNewsOnAbout" => array(VT_BOOL, true, "Show latest news item on About page"),
5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	38
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	39 "registerInfoText" => array(VT_TEXT, "<p>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	40 Only your <b>handle</b> and the answer to the botcheck are strictly required.
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	41 If you plan on joining the IRC channel
63 922b5192b2ff Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	42 (<a href=\"irc://#fap2013@ircnet\">#fap2013 @ IRCNet</a>) or staying up to date by other means,
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	43 <b>e-mail</b> is not required either.
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	44 </p>", "Registration page info text"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	45
182 e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	46 "registerPostText" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	47 <h1>Registration successful</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	48 <p>Now go make a demo about it!</p>",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	49 "Successful post-registration note text"),
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	50
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	51 "registerLimitExceeded" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	52 <h1>Sorry, registration disabled!</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	53 <p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	54 Registration to the event is not available at this time due to
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	55 number of attendees limit having been reached. <b>:(</b>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	56 </p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	57 ",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	58 "Registration attendee limit exceeded note text"),
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	59
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	60 "registerNotEnabled" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	61 <h1>Sorry, registration disabled!</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	62 <p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	63 Registration to the event is not enabled at this time.
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	64 </p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	65 ",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	66 "Registration not enabled note text"),
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	67
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	68 "registerPostNoEmail" => array(VT_TEXT, "
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	69 <h2>By the way ...</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	70 <p>As you did not specify an e-mail contact address, you'll have to get updates
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	71 and information about the location (if you don't already know it) by
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	72 some other means (IRC, for example.)</p>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	73 ", "No e-mail address registration note"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	74
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	75 "eventDescription" => array(VT_TEXT, "
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	76 <h1>Event program & schedule</h1>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	77 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	78 <li><b>Aegis</b> of DSS and FAG will be performing a DJ gig.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	79 <li>.. and possible additional live acts. More info to come.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	80 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	81
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	82 <h2>Friday 30.11.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	83 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	84 <li><b>18:00</b> - <i>Doors open</i>.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	85 <li><b>22:00</b> - DJ set by Aegis.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	86 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	87
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	88 <h2>Saturday 1.12.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	89 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	90 <li><b>14:00</b> - Deadline for remote entries.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	91 <li><b>18:00</b> - Deadline for the entries delivered on location.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	92 <li><b>20:00</b> - Competitions start.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	93 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	94
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	95 Competition schedule and voting deadline will depend on number of entries.
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	96
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	97 <h2>Sunday 2.12.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	98 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	99 <li><b>12:00</b> - Party over?</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	100 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	101 ", "Event general description / timetables etc."),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	102
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	103
14 e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	104 "compoDescription" => array(VT_TEXT, "
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	105 <h1>General</h1>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	106 <p class=\"notice\">
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	107 YOU <b>MUST</b> HAVE AT LEAST ONE ENTRY TO COMPETITIONS IF YOU COME TO THE PARTY.
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	108 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	109
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	110 <p class=\"note\">
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	111 If there are enough entries, then AGA/OCS/ECS demos will be run in separate compos.
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	112 <br />
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	113 Remote entries are welcome!
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	114 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	115
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	116 <p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	117 The compo machine will be an <b>A1200 with an 060/50 and lots of
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	118 RAM</b>. An <b>A500 1.3 512k/512k</b> will also be available if your
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	119 prod is not AGA compatible.
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	120 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	121
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	122 <h1>Compos</h1>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	123 ", "Compo general description"),
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	124
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	125
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	126 "siteInfoText" => array(VT_TEXT, "
150 4b91002a9900 Fix default header image link. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	127 <a href=\"about\">
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	128 <img src=\"img/fapsm.png\" alt=\"Finnish Amiga Party 2013\" class=\"logo\" /></a>
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	129 <div id=\"date\">
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	130 5.-8.12.2013<br />
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	131 Helsinki, Finland<br />
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	132 @ old location<br />
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	133 <span class=\"notice\">Entry 15 EUR + prod</span>
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	134 </div>", "Site header text"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	135
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	136
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	137 "newsHeader" => array(VT_TEXT, "", "News page header text"),
5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	138
5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	139
5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	140 "aboutDescription" => array(VT_TEXT, "
9 fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	141 <div style=\"text-align: center;\">
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	142 <img src=\"img/fap.png\" alt=\"FAP\" />
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	143 <p>
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	144 Pure Amiga demoscene party, all traditional Amiga compos and purely Amiga-oriented program.
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	145 <br />
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	146 <span class=\"notice\">
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	147 YOU <b>MUST</b> HAVE AT LEAST ONE ENTRY TO COMPETITIONS IF YOU COME TO THE PARTY.
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	148 </span>
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	149 </p>
11 c10bf196390f Improve database initialization script. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	150 </div>",
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	151 "About page text"),
29 4b5a176805e2 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	152
224 0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	153 "voteFinishedText" => array(VT_TEXT, "
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	154 <h1>Yay, you have voted!</h1>
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	155 <p>Now go FAP some more! And make a demo about it.</p>",
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	156 "Message shown after successful voting."),
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	157
104 c7b1eb993240 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	158 "siteMenuHeader" => array(VT_TEXT, "<div>13.FAP:> <span class=\"mblink\">■</span></div>", "Site menu header text"),
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	159 "siteMenuFooter" => array(VT_TEXT, "", "Site menu footer text"),
106 324f3a415237 Add extra HTML + sponsors box to layout. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	160 "siteExtraHTML" => array(VT_TEXT, "<div id=\"sponsors\">Gentle Eye</div>", "Extra global HTML code (f.e. sponsors box)"),
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 $sqlTables = array(
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	164 "dbmeta" => "key VARCHAR(32) PRIMARY KEY, vtype INT, vstr VARCHAR(128), vtext TEXT, vint INT, desc VARCHAR(128)",
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	165
73 c70c2650f790 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	166 "settings" => "key VARCHAR(32) PRIMARY KEY, vtype INT, vstr VARCHAR(128), vtext TEXT, vint INT, desc VARCHAR(128)",
185 449b2862cc75 Use field sizes in database creation. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	167 "news" => "id INTEGER PRIMARY KEY AUTOINCREMENT, utime INT, title VARCHAR(".SET_LEN_NEWS_TITLE."), text VARCHAR(".SET_LEN_NEWS_TEXT."), author VARCHAR(".SET_LEN_NEWS_AUTHOR."), persist INT DEFAULT 0",
449b2862cc75 Use field sizes in database creation. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	168 "compos" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(".SET_LEN_COMPO_NAME."), description VARCHAR(".SET_LEN_COMPO_DESC."), visible INT DEFAULT 0, voting INT DEFAULT 0, showAuthors INT DEFAULT 0",
449b2862cc75 Use field sizes in database creation. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	169 "entries" => "id INTEGER PRIMARY KEY AUTOINCREMENT, show_id INT DEFAULT 0, name VARCHAR(".SET_LEN_ENTRY_NAME."), author VARCHAR(".SET_LEN_ENTRY_AUTHOR."), compo_id INT DEFAULT NULL, filename VARCHAR(".SET_LEN_ENTRY_FILENAME.") DEFAULT NULL, info VARCHAR(".SET_LEN_ENTRY_INFO.") DEFAULT NULL",
73 c70c2650f790 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	170
185 449b2862cc75 Use field sizes in database creation. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	171 "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(".SET_LEN_USERNAME."), groups VARCHAR(".SET_LEN_GROUPS."), oneliner VARCHAR(".SET_LEN_ONELINER."), email VARCHAR(".SET_LEN_EMAIL."), key_id INT DEFAULT NULL",
73 c70c2650f790 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	172
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	173 "votekeys" => "id INTEGER PRIMARY KEY AUTOINCREMENT, key VARCHAR(64), active INT DEFAULT 0",
301 e13be68e73a7 Layout of the votes table has changed, so add an upgrade path. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	174 "votes" => "id INTEGER PRIMARY KEY AUTOINCREMENT, entry_id INT DEFAULT NULL, key_id INT DEFAULT NULL, value INT DEFAULT 0",
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	175
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	176 "displayVars" => "key VARCHAR(32) PRIMARY KEY, vtype INT, vstr VARCHAR(128), vtext TEXT, vint INT, desc VARCHAR(128)",
420 e9f6e242c4b9 Define some more SQL field lengths. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	177 "displaySlides" => "id INTEGER PRIMARY KEY AUTOINCREMENT, title VARCHAR(".SET_LEN_DISP_SLIDE_TITLE."), text VARCHAR(".SET_LEN_DISP_SLIDE_TEXT.")",
e9f6e242c4b9 Define some more SQL field lengths. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	178 "rotationListData" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(".SET_LEN_ROT_LIST_NAME.")",
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	179 "rotationListSlides" => "id INTEGER PRIMARY KEY AUTOINCREMENT, list_id INT DEFAULT 0, slide_id INT DEFAULT 0, order_num INT DEFAULT 0",
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	180 );
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	181
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	182 $siteDisplayVars = array(
148 6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	183 "showMode" => array(VT_INT, 0, "Currently active display mode"),
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	184 "rotateDuration" => array(VT_INT, 15, "Slide rotation time per slide (seconds)"),
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	185
393 14cdbeb331b6 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	186 "tempDuration" => array(VT_INT, 5, "Temporary slide display time (minutes)"),
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	187 "tempSlide" => array(VT_INT, 0, "Temporary slide ID"),
148 6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	188
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	189 "compoID" => array(VT_INT, 0, "Compo ID of current compo"),
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	190 "compoPrevEntry" => array(VT_INT, 0, "Previously shown compo entry"),
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	191 "compoCurrEntry" => array(VT_INT, 0, "Current / next compo entry to be shown"),
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	192
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	193 // Not user-manageable
145 66b485431cac Change how slides are updated. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	194 "tempSlideSet" => array(VT_BOOL, false, "Temporary slide set"),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	195
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	196 "activeSlideMode" => array(VT_INT, 0, "Current active slide display mode"),
20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	197 "activeSlide" => array(VT_INT, 0, "Current active slide"),
20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	198 "activeSlideExpire" => array(VT_INT, 0, "Expiration timestamp of current slide"),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	199
142 d2e9285b69ad More work on the party info system. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	200 "rotateList" => array(VT_INT, 0, "Current rotation list ID"),
d2e9285b69ad More work on the party info system. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	201 "rotateListIndex" => array(VT_INT, 0, "Current index in rotation list"),
145 66b485431cac Change how slides are updated. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	202
66b485431cac Change how slides are updated. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	203 "lastUpdate" => array(VT_INT, 0, "Timestamp of last slide update"),
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	206 $siteTestData = array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	207 "news" => array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	208 "utime,title,text,author",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	209 time().",%s,%s,%s",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	210 array("Today's news", "We. Are. Back.", "orgaz"),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	211 array("Good news, everybody!", "...", "The Professor"),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	212 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	213
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	214 "votekeys" => array(
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	215 "key",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	216 "%s",
120 2c594958050e Make test vote keys "testN" where N >= 1 Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	217 array("test1"),
2c594958050e Make test vote keys "testN" where N >= 1 Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	218 array("test2"),
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	219 array("7jjnqt5z"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	220 array("c7jcfk1G"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	221 ),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	222
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	223 "attendees" => array(
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	224 "regtime,name,groups,oneliner,email",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	225 "%d,%s,%s,%s,%s",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	226 array(time()-0, "man with no alias", "supergroup", "foo-bar", "c@supergroup.com"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	227 array(time()-15, "man with alias", "supergroup", "hi!", "c@supergroup.com"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	228 array(time()-30, "alias with a man", "supergroup", "mega super kewl rulets", "x@microsoft.com"),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	229 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	230
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	231 "compos" => array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	232 "name,description,visible,voting",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	233 "%s,%s,1,1",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	234 array("Graphics", "Anything in standard resolutions."),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	235 array("Protracker music", "Standard 4-channel Protracker MOD music."),
170 dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	236 array("4k intro", "4k intro competition"),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	237 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	238
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	239 "entries" => array(
170 dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	240 "name,author,compo_id,filename,info",
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	241 "%s,%s,%d,%s,%s",
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	242 array("Donkey Dong", "electric/extend", 1, "donkey.lbm", "amigaaaah!"),
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	243 array("Your kondom", "ccr/TNSP", 1, "kondom.lbm", "oh my god, it's full of cocks!"),
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	244 array("Penis song", "reed/flt", 2, "penis.mod", "laulu rakkaudelle"),
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	245 array("jenkka", "aegis", 2, "jenkka.mod", ""),
220 db433a1d22b4 Fix test data creation. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	246 array("Fungiform 2", "mfx", 3, "mfx-fungiform2.lzh", "OCS-only"),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	247 ),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	248
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	249 "displaySlides" => array(
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	250 "title,text",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	251 "%s,%s",
414 523dc3e9a3bf Jep. Matti Hamalainen <ccr@tnsp.org> parents: 394 diff changeset	252 array("Next Up 4k", "<h1>Next up: 4k intro</h1><h2>4k intro compo is about to begin</h2>... in about 10 minutes."),
142 d2e9285b69ad More work on the party info system. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	253 array("Astu to infodesk", "<b>Astu</b> - please come to info desk!"),
d2e9285b69ad More work on the party info system. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	254 array("Gentle Eye mainos", "<b>Buy Amiga stuff!</b><br />Gentle Eye Oy is selling Amiga-related stuff near organizer desk!"),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	255 ),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	256
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	257 "rotationListData" => array(
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	258 "name",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	259 "%s",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	260 array("Main rotation"),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	261 array("Next Up"),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	262 ),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	263
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	264 "rotationListSlides" => array(
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	265 "list_id,slide_id",
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	266 "%d,%d",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	267 array(1,2),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	268 array(1,3),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	269 array(2,1),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	270 ),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	271 );
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	273
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 //
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	275 // Helper functions
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276 //
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	277 function stCreateOneTable($name, $schema)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	278 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	279 return (stExecSQL("CREATE TABLE IF NOT EXISTS ".$name." (".$schema.")") !== FALSE) ? TRUE : FALSE;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	280 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	281
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	282
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	283 function stCreateTables($upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285 global $sqlTables;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286 echo "Creating tables...\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 foreach ($sqlTables as $name => $schema)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 echo " - '".$name."'\n";
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	290 if (!stCreateOneTable($name, $schema) && !upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 return FALSE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293 return TRUE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	297 function stAddSettings($settings, $table, $upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298 {
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	299 echo ($upgrade ? "Adding settings to" : "Upgrading settings in")." '".$table."' table.";
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	300
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	301 foreach ($settings as $key => $data)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 {
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	303 switch ($data[0])
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 case VT_TEXT: $type = "%s"; $var = "vtext"; break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 case VT_STR: $type = "%s"; $var = "vstr"; break;
72 63a6caf59e5c Fix creation of boolean settings, and add '%b' formatter into stPrepareSQL(). Matti Hamalainen <ccr@tnsp.org> parents: 67 diff changeset	307 case VT_BOOL: $type = "%b"; $var = "vint"; break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308 case VT_INT: $type = "%d"; $var = "vint"; break;
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	309 default: die("Invalid type in default settings '".$key."', type=".$data[0]."\n");
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	312 if ($upgrade && ($res = stFetchSQL(stPrepareSQL("SELECT * FROM ".$table." WHERE key=%s", $key))) !== FALSE)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	313 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	314 echo ".";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	315
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	316 if ($res["vtype"] != $data[0])
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	317 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	318 die("Oops! Data type of '".$key."' does not match in table '".$table.". DB upgrade failed.\n");
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	319 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	320
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	321 $sql = stPrepareSQL(
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	322 "UPDATE ".$table." SET desc=%s WHERE key=%s",
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	323 $data[2], $key);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	324 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	325 else
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	326 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	327 echo "+";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	328 $sql = stPrepareSQL(
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	329 "INSERT INTO ".$table." (key,vtype,".$var.",desc) VALUES (%s,%d,".$type.",%s)",
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	330 $key, $data[0], $data[1], $data[2]);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	331 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	332
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	333 if (stExecSQL($sql) === FALSE)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	334 return FALSE;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	335 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	336 echo "\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	337 return TRUE;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	338 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	339
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	340
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	341 function stRenameSettings($mapping, $table)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	342 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	343 echo "Upgrading '".$table."' table.\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	344
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	345 foreach ($mapping as $from => $to)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	346 {
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347 $sql = stPrepareSQL(
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	348 "UPDATE ".$table." SET key=%s WHERE key=%s",
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	349 $to, $from);
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	350
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 stExecSQL($sql);
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	356 function stAddTestData()
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	357 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	358 global $siteTestData;
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	359 echo "Adding test data.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	360
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	361 foreach ($siteTestData as $table => $data)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	362 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	363 echo " - ".$table."...\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	364 if (count($data) >= 3)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	365 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	366 for ($n = 2; $n < count($data); $n++)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	367 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	368 $arr = array_merge(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	369 array("INSERT INTO ".$table." (".$data[0].") VALUES (".$data[1].")"),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	370 $data[$n]);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	371
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	372 $sql = call_user_func_array('stPrepareSQL', $arr);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	373 stExecSQL($sql);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	374 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	375 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	376 else
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	377 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	378 echo " Invalid table / data definition.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	379 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	380 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	381 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	382
499 408effd4e9ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	383
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	384 //
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	385 // Main program starts
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	386 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387 if ($argc < 2)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388 {
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	389 echo
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	390 "CreateDB - Manage FAPWeb SQL database\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	391 "(C) Copyright 2012-2013 ccr/TNSP\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	392 "\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	393 "Usage: ".$argv[0]." <mode> [args]\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 "Where mode is one of following:\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 "\n".
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	396 " new Create a new database with given PDO spec\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 " or default to the one in mconfig.inc.php\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 "\n".
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	399 " test Like new, but add initial test data.\n".
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	400 "\n".
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	401 " upgrade [dbspec] Upgrade current database, if possible.\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 "\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 exit;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	407 if (!isset($siteSettings["voteKeyMode"]) \|\| $siteSettings["voteKeyMode"] < 0)
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	408 {
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	409 echo
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	410 "FATAL ERROR! VoteKeyMode not set in site settings! This setting ".
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	411 "MUST be defined and should not be changed after database creation.\n";
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	412 exit;
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	413 }
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	414
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415
81 491c03e3a2bc Comments. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	416 // Try to connect to database
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	417 $spec = $siteSettings["sqlDB"];
479 86ee2b42a995 Move CLI helper functions to msitegen, again. Matti Hamalainen <ccr@tnsp.org> parents: 426 diff changeset	418 if (!stCLIConnectSQLDB($spec))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 die("Could not connect to SQL database '".$spec."'.\n");
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 echo "Using database spec '".$spec."'.\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	423
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	424 // Act according to specified command
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	425 $addTestData = FALSE;
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	426 switch (stCArgLC(1))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 {
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	428 case "test":
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	429 $addTestData = TRUE;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	430
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431 case "new":
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	432 if (stCreateTables(FALSE))
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	433 {
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	434 stAddSettings($dbMeta, "dbmeta", FALSE);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	435 stAddSettings($siteDefaults, "settings", FALSE);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	436 stAddSettings($siteDisplayVars, "displayVars", FALSE);
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	437 }
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	438
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	439 stAddTestData();
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	440 if ($addTestData)
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	441
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	442 if (substr($spec, 0, 7) == "sqlite:")
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	443 {
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	444 $filename = substr($spec, 7);
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	445 echo "NOTICE! It seems you have SQLite database in use, changing permission ".
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	446 "of the target file '".$filename."' to 0600, for security. You may have to ".
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	447 "loosen up that for the things to actually work, but be careful. Having your ".
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	448 "database world-readable in the web is NOT good.\n";
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	449
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	450 if (chmod($filename, 0600) === FALSE)
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	451 {
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	452 echo "ERROR! Could not set permissions!\n";
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	453 }
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	454 }
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455 break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	456
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	457 case "upgrade":
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	458 if (($currVersion = stGetDBMeta("dbVersion")) === FALSE)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	459 $currVersion = -1;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	460
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	461 if ($currVersion == $dbVersion)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	462 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	463 echo "Database is already version ".$dbVersion.", no upgrading needed.\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	464 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	465 else
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	466 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	467 echo "Database at version ".$currVersion.", upgrading to ".$dbVersion."\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	468 // Possibly bail out incompatible upgrades here
301 e13be68e73a7 Layout of the votes table has changed, so add an upgrade path. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	469 if ($currVersion < 6)
e13be68e73a7 Layout of the votes table has changed, so add an upgrade path. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	470 stExecSQL("DROP TABLE votes");
355 4ced04d29858 Database format change. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	471
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	472 if ($currVersion < 9)
876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	473 {
876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	474 stExecSQL("DROP TABLE displayVars");
355 4ced04d29858 Database format change. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	475 stExecSQL("DROP TABLE displayListSlides");
425 e9f374334efd Oops, 100L. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	476 stExecSQL("DROP TABLE displayListData");
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	477 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	478
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	479 // Create tables
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	480 if (!stCreateTables(TRUE))
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	481 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	482
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	483 // Do renames etc. here
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	484
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	485 // Do upgrading of setting descs
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	486 if (!stAddSettings($siteDefaults, "settings", TRUE))
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	487 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	488
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	489 if (!stAddSettings($siteDisplayVars, "displayVars", TRUE))
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	490 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	491
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	492 stAddSettings($dbMeta, "dbmeta", TRUE);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	493
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	494 stSetDBMeta("dbVersion", $dbVersion);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	495 echo "Upgrade complete.\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	496 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	497 break;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	498
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	499 default:
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	500 echo "ERROR! Invalid operation mode '".stCArg(1)."'.\n";
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	501 break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	504
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	505 //
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	506 // Clean up permissions
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	507 //
67 23eba98e1575 Remove keygen.php from permission cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	508 foreach (array("createdb.php") as $filename)
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	509 {
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	510 if (chmod($filename, 0700) === FALSE)
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	511 {
490 505f46b8bb14 Separate variable from string flow. Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	512 echo "ERROR! Could not set permissions for '".$filename."'!\n";
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	513 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	514 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	515
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 ?>

Mercurial > hg > fapweb

annotate createdb.php @ 499:408effd4e9ea