fapweb: createdb.php annotate

annotate createdb.php @ 479:86ee2b42a995

Move CLI helper functions to msitegen, again.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 07 Dec 2013 10:40:22 +0200
parents	249631e194c8
children	e0fd4c7ae8fb

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
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 // The defaults we put in
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 $siteDefaults = array(
268 feed47a72df4 Update some setting descriptions. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	17 "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	18 "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	19
158 96aae4beb558 Clean up some references to entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 150 diff changeset	20 "userTimeout" => array(VT_INT, 120, "User pages (voting) timeout in minutes"),
32 36392d1d6b5f Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	21 "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	22
62 101cde58b267 Add a new setting for ASCII vs. HTML table output for compo results. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	23 "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	24 "showAttendees" => array(VT_BOOL, true, "Show attendees list"),
11 c10bf196390f Improve database initialization script. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	25 "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	26 "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	27
11 c10bf196390f Improve database initialization script. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	28 "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	29 "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	30 "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	31
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	32 "requireEMail" => array(VT_BOOL, false, "Require e-mail address in registrations"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	33
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	34 "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	35 "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	36
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	37 "registerInfoText" => array(VT_TEXT, "<p>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	38 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	39 If you plan on joining the IRC channel
63 922b5192b2ff Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	40 (<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	41 <b>e-mail</b> is not required either.
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	42 </p>", "Registration page info text"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	43
182 e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	44 "registerPostText" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	45 <h1>Registration successful</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	46 <p>Now go make a demo about it!</p>",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	47 "Successful post-registration note text"),
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	48
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	49 "registerLimitExceeded" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	50 <h1>Sorry, registration disabled!</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	51 <p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	52 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	53 number of attendees limit having been reached. <b>:(</b>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	54 </p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	55 ",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	56 "Registration attendee limit exceeded note text"),
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 "registerNotEnabled" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	59 <h1>Sorry, registration disabled!</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	60 <p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	61 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	62 </p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	63 ",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	64 "Registration not enabled note text"),
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	65
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	66 "registerPostNoEmail" => array(VT_TEXT, "
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	67 <h2>By the way ...</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	68 <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	69 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	70 some other means (IRC, for example.)</p>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	71 ", "No e-mail address registration note"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	72
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	73 "eventDescription" => array(VT_TEXT, "
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	74 <h1>Event program & schedule</h1>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	75 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	76 <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	77 <li>.. and possible additional live acts. More info to come.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	78 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	79
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	80 <h2>Friday 30.11.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	81 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	82 <li><b>18:00</b> - <i>Doors open</i>.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	83 <li><b>22:00</b> - DJ set by Aegis.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	84 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	85
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	86 <h2>Saturday 1.12.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	87 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	88 <li><b>14:00</b> - Deadline for remote entries.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	89 <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	90 <li><b>20:00</b> - Competitions start.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	91 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	92
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	93 Competition schedule and voting deadline will depend on number of entries.
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 <h2>Sunday 2.12.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	96 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	97 <li><b>12:00</b> - Party over?</li>
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 ", "Event general description / timetables etc."),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	100
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	101
14 e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	102 "compoDescription" => array(VT_TEXT, "
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	103 <h1>General</h1>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	104 <p class=\"notice\">
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	105 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	106 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	107
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	108 <p class=\"note\">
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	109 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	110 <br />
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	111 Remote entries are welcome!
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	112 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	113
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 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	116 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	117 prod is not AGA compatible.
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	118 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	119
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	120 <h1>Compos</h1>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	121 ", "Compo general description"),
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	122
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	123
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	124 "siteInfoText" => array(VT_TEXT, "
150 4b91002a9900 Fix default header image link. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	125 <a href=\"about\">
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	126 <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	127 <div id=\"date\">
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	128 5.-8.12.2013<br />
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	129 Helsinki, Finland<br />
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	130 @ old location<br />
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	131 <span class=\"notice\">Entry 15 EUR + prod</span>
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	132 </div>", "Site header text"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	133
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	134
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	135 "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	136
5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	137
5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	138 "aboutDescription" => array(VT_TEXT, "
9 fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	139 <div style=\"text-align: center;\">
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	140 <img src=\"img/fap.png\" alt=\"FAP\" />
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	141 <p>
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	142 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	143 <br />
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	144 <span class=\"notice\">
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	145 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	146 </span>
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	147 </p>
11 c10bf196390f Improve database initialization script. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	148 </div>",
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	149 "About page text"),
29 4b5a176805e2 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	150
224 0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	151 "voteFinishedText" => array(VT_TEXT, "
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	152 <h1>Yay, you have voted!</h1>
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	153 <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	154 "Message shown after successful voting."),
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	155
104 c7b1eb993240 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	156 "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	157 "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	158 "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	159 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 $sqlTables = array(
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	162 "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	163
73 c70c2650f790 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	164 "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	165 "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	166 "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	167 "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	168
185 449b2862cc75 Use field sizes in database creation. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	169 "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	170
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	171 "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	172 "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	173
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	174 "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	175 "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	176 "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	177 "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	178 );
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	179
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	180 $siteDisplayVars = array(
148 6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	181 "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	182 "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	183
393 14cdbeb331b6 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	184 "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	185 "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	186
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	187 "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	188 "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	189 "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	190
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	191 // Not user-manageable
145 66b485431cac Change how slides are updated. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	192 "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	193
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	194 "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	195 "activeSlide" => array(VT_INT, 0, "Current active slide"),
20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	196 "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	197
142 d2e9285b69ad More work on the party info system. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	198 "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	199 "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	200
66b485431cac Change how slides are updated. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	201 "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	202 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	204 $siteTestData = array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	205 "news" => array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	206 "utime,title,text,author",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	207 time().",%s,%s,%s",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	208 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	209 array("Good news, everybody!", "...", "The Professor"),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	210 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	211
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	212 "votekeys" => array(
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	213 "key",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	214 "%s",
120 2c594958050e Make test vote keys "testN" where N >= 1 Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	215 array("test1"),
2c594958050e Make test vote keys "testN" where N >= 1 Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	216 array("test2"),
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	217 array("7jjnqt5z"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	218 array("c7jcfk1G"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	219 ),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	220
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	221 "attendees" => array(
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	222 "regtime,name,groups,oneliner,email",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	223 "%d,%s,%s,%s,%s",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	224 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	225 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	226 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	227 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	228
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	229 "compos" => array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	230 "name,description,visible,voting",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	231 "%s,%s,1,1",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	232 array("Graphics", "Anything in standard resolutions."),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	233 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	234 array("4k intro", "4k intro competition"),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	235 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	236
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	237 "entries" => array(
170 dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	238 "name,author,compo_id,filename,info",
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	239 "%s,%s,%d,%s,%s",
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	240 array("Donkey Dong", "electric/extend", 1, "donkey.lbm", "amigaaaah!"),
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	241 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	242 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	243 array("jenkka", "aegis", 2, "jenkka.mod", ""),
220 db433a1d22b4 Fix test data creation. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	244 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	245 ),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	246
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	247 "displaySlides" => array(
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	248 "title,text",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	249 "%s,%s",
414 523dc3e9a3bf Jep. Matti Hamalainen <ccr@tnsp.org> parents: 394 diff changeset	250 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	251 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	252 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	253 ),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	254
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	255 "rotationListData" => array(
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	256 "name",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	257 "%s",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	258 array("Main rotation"),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	259 array("Next Up"),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	260 ),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	261
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	262 "rotationListSlides" => array(
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	263 "list_id,slide_id",
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	264 "%d,%d",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	265 array(1,2),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	266 array(1,3),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	267 array(2,1),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	268 ),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	269 );
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	271
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272 //
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	273 // Helper functions
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 //
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	275 function stCreateOneTable($name, $schema)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	276 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	277 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	278 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	279
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 function stCreateTables($upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283 global $sqlTables;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 echo "Creating tables...\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285 foreach ($sqlTables as $name => $schema)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 echo " - '".$name."'\n";
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	288 if (!stCreateOneTable($name, $schema) && !upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 return FALSE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 return TRUE;
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
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	295 function stAddSettings($settings, $table, $upgrade)
8 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 echo ($upgrade ? "Adding settings to" : "Upgrading settings in")." '".$table."' table.";
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	298
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	299 foreach ($settings as $key => $data)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 {
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	301 switch ($data[0])
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 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	304 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	305 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	306 case VT_INT: $type = "%d"; $var = "vint"; break;
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	307 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	308 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	310 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	311 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	312 echo ".";
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 if ($res["vtype"] != $data[0])
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 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	317 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	318
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	319 $sql = stPrepareSQL(
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	320 "UPDATE ".$table." SET desc=%s WHERE key=%s",
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	321 $data[2], $key);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	322 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	323 else
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 echo "+";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	326 $sql = stPrepareSQL(
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	327 "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	328 $key, $data[0], $data[1], $data[2]);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	329 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	330
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	331 if (stExecSQL($sql) === FALSE)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	332 return FALSE;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	333 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	334 echo "\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	335 return TRUE;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	336 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	337
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 function stRenameSettings($mapping, $table)
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 echo "Upgrading '".$table."' table.\n";
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 foreach ($mapping as $from => $to)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	344 {
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 $sql = stPrepareSQL(
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	346 "UPDATE ".$table." SET key=%s WHERE key=%s",
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	347 $to, $from);
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	348
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 stExecSQL($sql);
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 }
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
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	354 function stAddTestData()
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	355 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	356 global $siteTestData;
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	357 echo "Adding test data.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	358
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	359 foreach ($siteTestData as $table => $data)
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 echo " - ".$table."...\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	362 if (count($data) >= 3)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	363 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	364 for ($n = 2; $n < count($data); $n++)
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 $arr = array_merge(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	367 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	368 $data[$n]);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	369
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	370 $sql = call_user_func_array('stPrepareSQL', $arr);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	371 stExecSQL($sql);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	372 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	373 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	374 else
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 echo " Invalid table / data definition.\n";
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 }
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
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	381 //
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	382 // Main program starts
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	383 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 if ($argc < 2)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 echo "Usage: ".$argv[0]." <mode> [args]\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387 "Where mode is one of following:\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388 "\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 " new [dbspec] Create a new database with given PDO spec\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 " 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	391 "\n".
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	392 " test [dbspec] 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	393 "\n".
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	394 " 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	395 "\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 exit;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399
94 6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	400 if (!isset($siteSettings["voteKeyMode"]) \|\| $siteSettings["voteKeyMode"] < 0)
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	401 {
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	402 echo
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	403 "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	404 "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	405 exit;
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	406 }
6edd7d623eab Start adding votekey modes code. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	407
81 491c03e3a2bc Comments. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	408 // Check if database spec provided, if not use default
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	409 if (($spec = stCArg(2)) === FALSE)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 $spec = $siteSettings["sqlDB"];
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412
81 491c03e3a2bc Comments. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	413 // Try to connect to database
479 86ee2b42a995 Move CLI helper functions to msitegen, again. Matti Hamalainen <ccr@tnsp.org> parents: 426 diff changeset	414 if (!stCLIConnectSQLDB($spec))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 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	416
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 echo "Using database spec '".$spec."'.\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	419
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	420 // Act according to specified command
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	421 $addData = FALSE;
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	422 switch (stCArgLC(1))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 {
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	424 case "test":
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	425 $addData = TRUE;
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	426
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 case "new":
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	428 if (stCreateTables(FALSE))
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	429 {
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	430 stAddSettings($dbMeta, "dbmeta", FALSE);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	431 stAddSettings($siteDefaults, "settings", FALSE);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	432 stAddSettings($siteDisplayVars, "displayVars", FALSE);
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	433 }
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	434
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	435 if ($addData)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	436 stAddTestData();
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	437
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	438 if (substr($spec, 0, 7) == "sqlite:")
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	439 {
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	440 $filename = substr($spec, 7);
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	441 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	442 "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	443 "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	444 "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	445
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	446 if (chmod($filename, 0600) === FALSE)
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	447 {
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	448 echo "ERROR! Could not set permissions!\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 }
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451 break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	453 case "upgrade":
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	454 if (($currVersion = stGetDBMeta("dbVersion")) === FALSE)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	455 $currVersion = -1;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	456
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	457 if ($currVersion == $dbVersion)
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	458 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	459 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	460 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	461 else
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 at version ".$currVersion.", upgrading to ".$dbVersion."\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	464 // 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	465 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	466 stExecSQL("DROP TABLE votes");
355 4ced04d29858 Database format change. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	467
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	468 if ($currVersion < 9)
876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	469 {
876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	470 stExecSQL("DROP TABLE displayVars");
355 4ced04d29858 Database format change. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	471 stExecSQL("DROP TABLE displayListSlides");
425 e9f374334efd Oops, 100L. Matti Hamalainen <ccr@tnsp.org> parents: 420 diff changeset	472 stExecSQL("DROP TABLE displayListData");
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	473 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	474
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	475 // Create tables
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	476 if (!stCreateTables(TRUE))
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	477 exit;
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 // Do renames etc. here
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	480
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	481 // Do upgrading of setting descs
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	482 if (!stAddSettings($siteDefaults, "settings", TRUE))
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	483 exit;
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 if (!stAddSettings($siteDisplayVars, "displayVars", TRUE))
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	486 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	487
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	488 stAddSettings($dbMeta, "dbmeta", TRUE);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	489
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	490 stSetDBMeta("dbVersion", $dbVersion);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	491 echo "Upgrade complete.\n";
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	492 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	493 break;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	494
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	495 default:
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	496 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	497 break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	500
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	501 //
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	502 // Clean up permissions
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	503 //
67 23eba98e1575 Remove keygen.php from permission cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	504 foreach (array("createdb.php") as $filename)
28 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 if (chmod($filename, 0700) === FALSE)
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	507 {
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	508 echo "ERROR! Could not set permissions for '$filename'!\n";
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 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	511
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 ?>

Mercurial > hg > fapweb

annotate createdb.php @ 479:86ee2b42a995