fapweb: createdb.php annotate

annotate createdb.php @ 525:d7302b3a479e

Change database tool commandline a bit.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 10 Dec 2013 17:45:42 +0200
parents	6aa9356ead52
children	d6726a4883a6

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
506 d29166d97b46 Change some database field sizes. Matti Hamalainen <ccr@tnsp.org> parents: 505 diff changeset	8 $dbVersion = 11;
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 //
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	16 // Site settings and 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"),
119 99e7569c9f4f Change the default of some boolean settings. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	31 "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	32
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	33 "requireEMail" => array(VT_BOOL, false, "Require e-mail address in registrations"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	34
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	35 "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	36 "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	37
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	38 "registerInfoText" => array(VT_TEXT, "<p>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	39 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	40 If you plan on joining the IRC channel
63 922b5192b2ff Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	41 (<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	42 <b>e-mail</b> is not required either.
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	43 </p>", "Registration page info text"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	44
182 e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	45 "registerPostText" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	46 <h1>Registration successful</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	47 <p>Now go make a demo about it!</p>",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	48 "Successful post-registration note text"),
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	49
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	50 "registerLimitExceeded" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	51 <h1>Sorry, registration disabled!</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	52 <p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	53 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	54 number of attendees limit having been reached. <b>:(</b>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	55 </p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	56 ",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	57 "Registration attendee limit exceeded note text"),
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	58
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	59 "registerNotEnabled" => array(VT_TEXT, "
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	60 <h1>Sorry, registration disabled!</h1>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	61 <p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	62 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	63 </p>
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	64 ",
e227e6a3d46b Move some texts to settings. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	65 "Registration not enabled note text"),
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	66
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	67 "registerPostNoEmail" => array(VT_TEXT, "
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	68 <h2>By the way ...</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	69 <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	70 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	71 some other means (IRC, for example.)</p>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	72 ", "No e-mail address registration note"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	73
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	74 "eventDescription" => array(VT_TEXT, "
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	75 <h1>Event program & schedule</h1>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	76 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	77 <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	78 <li>.. and possible additional live acts. More info to come.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	79 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	80
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	81 <h2>Friday 30.11.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	82 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	83 <li><b>18:00</b> - <i>Doors open</i>.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	84 <li><b>22:00</b> - DJ set by Aegis.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	85 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	86
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	87 <h2>Saturday 1.12.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	88 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	89 <li><b>14:00</b> - Deadline for remote entries.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	90 <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	91 <li><b>20:00</b> - Competitions start.</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	92 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	93
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	94 Competition schedule and voting deadline will depend on number of entries.
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	95
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	96 <h2>Sunday 2.12.</h2>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	97 <ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	98 <li><b>12:00</b> - Party over?</li>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	99 </ul>
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	100 ", "Event general description / timetables etc."),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	101
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	102
14 e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	103 "compoDescription" => array(VT_TEXT, "
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	104 <h1>General</h1>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	105 <p class=\"notice\">
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	106 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	107 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	108
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	109 <p class=\"note\">
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	110 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	111 <br />
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	112 Remote entries are welcome!
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	113 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	114
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	115 <p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	116 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	117 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	118 prod is not AGA compatible.
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	119 </p>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	120
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	121 <h1>Compos</h1>
e36c4d2b09c4 Fix settings to work, clean up the code, etc. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	122 ", "Compo general description"),
16 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
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	125 "siteInfoText" => array(VT_TEXT, "
150 4b91002a9900 Fix default header image link. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	126 <a href=\"about\">
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	127 <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	128 <div id=\"date\">
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	129 5.-8.12.2013<br />
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	130 Helsinki, Finland<br />
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	131 @ old location<br />
47 73123e322133 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	132 <span class=\"notice\">Entry 15 EUR + prod</span>
16 6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	133 </div>", "Site header text"),
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	134
6da681d1f62a Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 14 diff changeset	135
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	136 "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	137
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 "aboutDescription" => array(VT_TEXT, "
9 fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	140 <div style=\"text-align: center;\">
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	141 <img src=\"img/fap.png\" alt=\"FAP\" />
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	142 <p>
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	143 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	144 <br />
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	145 <span class=\"notice\">
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	146 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	147 </span>
fa9b66f596bb More work on settings storage. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	148 </p>
11 c10bf196390f Improve database initialization script. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	149 </div>",
123 5837b9333964 Add new "about" page, and setting for default page. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	150 "About page text"),
29 4b5a176805e2 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	151
224 0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	152 "voteFinishedText" => array(VT_TEXT, "
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	153 <h1>Yay, you have voted!</h1>
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	154 <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	155 "Message shown after successful voting."),
0daedbef5678 Add informational text setting for "voted" situations. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	156
104 c7b1eb993240 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	157 "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	158 "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	159 "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	160 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	162
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	163 //
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	164 //
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	165 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 $sqlTables = array(
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	167 // Database metadata
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	168 "dbmeta" => array(
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	169 array("key" , "VARCHAR(32)", "PRIMARY KEY"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	170 array("vtype" , "INT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	171 array("vstr" , "VARCHAR(128)"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	172 array("vtext" , "TEXT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	173 array("vint" , "INT"),
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	174 array("sdesc" , "VARCHAR(128)"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	175 ),
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	176
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	177 // Site settings
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	178 "settings" => array(
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	179 array("key" , "VARCHAR(32)", "PRIMARY KEY"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	180 array("vtype" , "INT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	181 array("vstr" , "VARCHAR(128)"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	182 array("vtext" , "TEXT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	183 array("vint" , "INT"),
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	184 array("sdesc" , "VARCHAR(128)"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	185 ),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	186
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	187 "news" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	188 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	189 array("utime" , "INT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	190 array("title" , "VARCHAR(".SET_LEN_NEWS_TITLE.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	191 array("text" , "VARCHAR(".SET_LEN_NEWS_TEXT.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	192 array("author" , "VARCHAR(".SET_LEN_NEWS_AUTHOR.")"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	193 array("persist" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	194 ),
73 c70c2650f790 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	195
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	196 "compos" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	197 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	198 array("name" , "VARCHAR(".SET_LEN_COMPO_NAME.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	199 array("description" , "VARCHAR(".SET_LEN_COMPO_DESC.")"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	200 array("visible" , "INT", "DEFAULT 0"),
f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	201 array("voting" , "INT", "DEFAULT 0"),
f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	202 array("showAuthors" , "INT", "DEFAULT 0"),
f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	203 array("type" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	204 ),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	205
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	206 "entries" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	207 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	208 array("show_id" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	209 array("name" , "VARCHAR(".SET_LEN_ENTRY_NAME.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	210 array("author" , "VARCHAR(".SET_LEN_ENTRY_AUTHOR.")"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	211 array("compo_id" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	212 array("filename" , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	213 array("info" , "VARCHAR(".SET_LEN_ENTRY_INFO.")", "DEFAULT NULL"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	214 array("flags" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	215 ),
73 c70c2650f790 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	216
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	217 "attendees" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	218 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	219 array("regtime" , "INT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	220 array("name" , "VARCHAR(".SET_LEN_USERNAME.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	221 array("groups" , "VARCHAR(".SET_LEN_GROUPS.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	222 array("oneliner" , "VARCHAR(".SET_LEN_ONELINER.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	223 array("email" , "VARCHAR(".SET_LEN_EMAIL.")"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	224 array("key_id" , "INT", "DEFAULT NULL"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	225 ),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	226
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	227 "votekeys" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	228 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	229 array("key" , "VARCHAR(".SET_LEN_VOTEKEY.")"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	230 array("active" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	231 ),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	232
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	233 "votes" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	234 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	235 array("entry_id" , "INT", "DEFAULT NULL"),
f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	236 array("key_id" , "INT", "DEFAULT 0"),
f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	237 array("value" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	238 ),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	239
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	240
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	241 // Party information system tables
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	242 "displayVars" => array(
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	243 array("key" , "VARCHAR(32)", "PRIMARY KEY"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	244 array("vtype" , "INT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	245 array("vstr" , "VARCHAR(128)"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	246 array("vtext" , "TEXT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	247 array("vint" , "INT"),
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	248 array("sdesc" , "VARCHAR(128)"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	249 ),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	250
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	251 "displaySlides" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	252 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	253 array("title" , "VARCHAR(".SET_LEN_DISP_SLIDE_TITLE.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	254 array("text" , "VARCHAR(".SET_LEN_DISP_SLIDE_TEXT.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	255 ),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	256
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	257 "rotationListData" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	258 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	259 array("name" , "VARCHAR(".SET_LEN_ROT_LIST_NAME.")"),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	260 ),
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	261
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	262 "rotationListSlides" => array(
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	263 array("id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
505 f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	264 array("list_id" , "INT", "DEFAULT 0"),
f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	265 array("slide_id" , "INT", "DEFAULT 0"),
f66aa0cdb666 Rename some SQL table schema types (s/INTEGER/INT/) Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	266 array("order_num" , "INT", "DEFAULT 0"),
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	267 ),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	268 );
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	269
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	270
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	271 //
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	272 // Party information system settings / data
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	273 //
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	274 $siteDisplayVars = array(
148 6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	275 "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	276 "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	277
393 14cdbeb331b6 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	278 "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	279 "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	280
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	281 "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	282 "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	283 "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	284
6d4325451570 And some more work on the info system. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	285 // Not user-manageable
145 66b485431cac Change how slides are updated. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	286 "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	287
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	288 "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	289 "activeSlide" => array(VT_INT, 0, "Current active slide"),
20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	290 "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	291
142 d2e9285b69ad More work on the party info system. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	292 "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	293 "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	294
66b485431cac Change how slides are updated. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	295 "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	296 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	298
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	299 //
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	300 // Some premade test data
2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	301 //
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	302 $siteTestData = array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	303 "news" => array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	304 "utime,title,text,author",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	305 time().",%s,%s,%s",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	306 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	307 array("Good news, everybody!", "...", "The Professor"),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	308 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	309
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	310 "votekeys" => array(
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	311 "key",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	312 "%s",
120 2c594958050e Make test vote keys "testN" where N >= 1 Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	313 array("test1"),
2c594958050e Make test vote keys "testN" where N >= 1 Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	314 array("test2"),
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	315 array("7jjnqt5z"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	316 array("c7jcfk1G"),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	317 ),
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	318
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	319 "attendees" => array(
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	320 "regtime,name,groups,oneliner,email",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	321 "%d,%s,%s,%s,%s",
784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	322 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	323 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	324 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	325 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	326
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	327 "compos" => array(
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	328 "name,description,visible,voting",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	329 "%s,%s,1,1",
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	330 array("Graphics", "Anything in standard resolutions."),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	331 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	332 array("4k intro", "4k intro competition"),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	333 ),
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	334
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	335 "entries" => array(
170 dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	336 "name,author,compo_id,filename,info",
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	337 "%s,%s,%d,%s,%s",
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	338 array("Donkey Dong", "electric/extend", 1, "donkey.lbm", "amigaaaah!"),
dffededcdd92 Add info field to entries. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	339 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	340 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	341 array("jenkka", "aegis", 2, "jenkka.mod", ""),
220 db433a1d22b4 Fix test data creation. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	342 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	343 ),
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	344
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	345 "displaySlides" => array(
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	346 "title,text",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	347 "%s,%s",
414 523dc3e9a3bf Jep. Matti Hamalainen <ccr@tnsp.org> parents: 394 diff changeset	348 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	349 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	350 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	351 ),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	352
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	353 "rotationListData" => array(
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	354 "name",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	355 "%s",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	356 array("Main rotation"),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	357 array("Next Up"),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	358 ),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	359
416 876846d8ed5b Rename some database things. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	360 "rotationListSlides" => array(
140 20ca8edfb01a Rename some settings and variables. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	361 "list_id,slide_id",
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	362 "%d,%d",
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	363 array(1,2),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	364 array(1,3),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	365 array(2,1),
75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	366 ),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	367 );
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	369
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370 //
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	371 // Helper functions
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372 //
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	373 function stGetTableSchema($dbh, $data)
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	374 {
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	375 $res = array();
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	376 $driver = $dbh->getAttribute(PDO::ATTR_DRIVER_NAME);
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	377
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	378 foreach ($data as $col)
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	379 {
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	380 $tmp = array();
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	381
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	382 switch ($driver)
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	383 {
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	384 case "pgsql":
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	385 foreach ($col as $elem)
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	386 {
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	387 if ($elem != "AUTOINCREMENT")
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	388 $tmp[] = $elem;
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	389 }
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	390 break;
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	391
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	392 case "sqlite":
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	393 case "mysql":
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	394 $tmp = $col;
518 af2f39a1dd79 Oops, had a missing semicolon .. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	395 break;
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	396
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	397 default:
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	398 die("Don't know how to handle PDO driver '".$driver."' yet.\n");
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	399 }
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	400
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	401 $res[] = implode(" ", $tmp);
fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	402 }
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	403
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	404 return implode(", ", $res);
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	405 }
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	406
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	407
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	408 function stCreateOneTable($dbh, $name, $schema)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	409 {
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	410 return (stDBExecSQL($dbh, "CREATE TABLE IF NOT EXISTS ".$name." (".$schema.")") !== FALSE) ? TRUE : FALSE;
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	411 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	412
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	413
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	414 function stCreateTables($dbh, $upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 global $sqlTables;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 echo "Creating tables...\n";
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	418 foreach ($sqlTables as $name => $schemaData)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420 echo " - '".$name."'\n";
517 fcfd8e28a083 Start making database migration to PostgreSQL work. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	421 if (!stCreateOneTable($dbh, $name, stGetTableSchema($dbh, $schemaData)) && !$upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 return FALSE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424 return TRUE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	428 $upgradeMappings = array(
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	429 // "" => array("key" => "", value => ""),
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	430 );
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	431
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	432
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	433 function stUpgradeMap($type, $name, $value = FALSE)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	434 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	435 global $upgradeMappings;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	436
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	437 if (isset($upgradeMappings[$name]))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	438 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	439 if (isset($upgradeMappings[$name][$type]))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	440 {
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	441 // XXX TODO ..
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	442 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	443 else
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	444 die("Upgrade failed due to missing or invalid upgrade definition: ".$type." ".$name." from version X to Y.\n");
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	445 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	446 else
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	447 switch ($type)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	448 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	449 case "key": return $name;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	450 case "value": return $value;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	451 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	452 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	453
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	454
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	455 function stAddSettings($inDB, $outDB, $settings, $table, $upgrade)
8 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 echo ($upgrade ? "Adding settings to" : "Upgrading settings in")." '".$table."' table.";
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	458
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	459 $status = TRUE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	460 stDBExecSQL($outDB, "BEGIN TRANSACTION");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	461
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	462 foreach ($settings as $key => $data)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 {
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	464 // Get setting type
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	465 switch ($data[0])
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467 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	468 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	469 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	470 case VT_INT: $type = "%d"; $var = "vint"; break;
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	471 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	472 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	473
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	474 // Map the key, in case the name has changed
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	475 $inKey = stUpgradeMap("key", $key);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	476
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	477 // Check if we are upgrading
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	478 if ($upgrade && ($res = stDBFetchSQL($inDB, stDBPrepareSQL($inDB, "SELECT * FROM ".$table." WHERE key=%s", $inKey))) !== FALSE)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	479 {
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	480 // Yup, upgrade the data, if we can
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	481 echo ".";
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 if ($res["vtype"] != $data[0])
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	484 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	485
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	486 $sql = stDBPrepareSQL($outDB,
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	487 "INSERT INTO ".$table." (key,vtype,".$var.",sdesc) VALUES (%s,%d,".$type.",%s)",
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	488 $key, $data[0], stUpgradeMap("value", $key, $res[$var]), $data[2]);
199 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 else
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	491 {
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	492 // Normal insertion of default data
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	493 echo "+";
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	494 $sql = stDBPrepareSQL($outDB,
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	495 "INSERT INTO ".$table." (key,vtype,".$var.",sdesc) VALUES (%s,%d,".$type.",%s)",
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	496 $key, $data[0], $data[1], $data[2]);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	497 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	498
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	499 if (stDBExecSQL($outDB, $sql) === FALSE)
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	500 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	501 $status = FALSE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	502 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	503 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	504 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	505 echo "\n";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	506
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	507 stDBExecSQL($outDB, "COMMIT");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	508 return $status;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	509 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	510
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	511
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	512 function stAddTestData($outDB)
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	513 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	514 global $siteTestData;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	515
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	516 echo "Adding test data.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	517
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	518 $status = TRUE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	519 stDBExecSQL($outDB, "BEGIN TRANSACTION");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	520
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	521 foreach ($siteTestData as $table => $data)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	522 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	523 echo " - ".$table."...\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	524 if (count($data) >= 3)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	525 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	526 for ($n = 2; $n < count($data); $n++)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	527 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	528 $arr = array_merge(
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	529 array($outDB, "INSERT INTO ".$table." (".$data[0].") VALUES (".$data[1].")"),
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	530 $data[$n]);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	531
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	532 $sql = call_user_func_array('stDBPrepareSQL', $arr);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	533 if (stDBExecSQL($outDB, $sql) === false)
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	534 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	535 $status = false;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	536 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	537 }
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	538 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	539 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	540 else
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	541 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	542 echo " Invalid table / data definition.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	543 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	544 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	545
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	546 stDBExecSQL($outDB, "COMMIT");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	547 return $status;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	548 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	549
499 408effd4e9ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	550
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	551 function stGetSQLTypeParam($dbh, $def, $value)
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	552 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	553 switch (substr($def, 0, 3))
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	554 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	555 case "INT":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	556 return intval($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	557
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	558 case "VAR":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	559 case "TEX":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	560 return $dbh->quote($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	561
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	562 default: die("Unknown type ".$col[1].".\n");
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	563 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	564 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	565
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	566
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	567 function stMigrateTables($inDB, $outDB, $excluded)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	568 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	569 global $sqlTables;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	570
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	571 echo "Migrating tables...\n";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	572 $status = TRUE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	573 stDBExecSQL($outDB, "BEGIN TRANSACTION");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	574
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	575 foreach ($sqlTables as $name => $schema)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	576 if (!in_array($name, $excluded))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	577 {
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	578 echo " - '".$name."' ";
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	579
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	580 foreach (stDBExecSQL($inDB, "SELECT * FROM ".$name) as $row)
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	581 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	582 $avals = array();
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	583 $acols = array();
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	584
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	585 foreach ($schema as $col)
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	586 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	587 if (isset($row[$col[0]]))
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	588 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	589 $avals[] = stGetSQLTypeParam($outDB, $col[1], $row[$col[0]]);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	590 $acols[] = $col[0];
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	591 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	592 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	593
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	594 $sql = "INSERT INTO ".$name." (".implode(",", $acols).") VALUES (".implode(",", $avals).")";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	595 if (stDBExecSQL($outDB, $sql) === false)
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	596 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	597 $status = FALSE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	598 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	599 }
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	600 echo ".";
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	601 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	602 echo "\n";
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	603 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	604
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	605 stDBExecSQL($outDB, "COMMIT");
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	606
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	607 return $status;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	608 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	609
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	610
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	611 function stSetDBPermissions($spec)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	612 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	613 if (substr($spec, 0, 7) == "sqlite:")
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	614 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	615 $filename = substr($spec, 7);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	616 echo
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	617 "NOTICE! It seems you have SQLite database in use, changing permission ".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	618 "of the target file '".$filename."' to 0600, for security. You may have to ".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	619 "loosen up that for the things to actually work, but be careful. Having your ".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	620 "database world-readable in the web is NOT good.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	621
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	622 if (chmod($filename, 0600) === FALSE)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	623 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	624 echo "ERROR! Could not set permissions of '".$filename."!\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	625 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	626 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	627 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	628
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	629
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	630 //
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	631 // Main program starts
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	632 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633 if ($argc < 2)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	634 {
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	635 echo
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	636 "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	637 "(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	638 "\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	639 "Usage: ".$argv[0]." <mode> [args]\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	640 "Where mode is one of following:\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	642 " new <dbspec> 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	643 " 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	644 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	645 " 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	646 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	647 " upgrade <input_dbspec> <output_dbspec>\n".
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	648 " Upgrade current database, if possible.\n".
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	649 " Output to new database (DO NOT USE SAME as current!)\n".
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	650 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	651 " migrate <input_dbspec> <output_dbspec>\n".
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	652 " Like upgrade, but no version check. Creates\n".
664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	653 " a copy of the database to the output spec.\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654 "\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 exit;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	659 // Act according to specified command
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	660 $addTestData = FALSE;
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	661 switch (stCArgLC(1))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 {
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	663 case "test":
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	664 $addTestData = TRUE;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	665
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 case "new":
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	667 // Try to connect to database
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	668 if (($inSpec = stCArg(2)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	669 die("No PDO database spec specified.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	670
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	671 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	672 die("Could not connect to SQL database '".$inSpec."'.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	673
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	674 echo "Using database spec '".$inSpec."'.\n";
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	675
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	676 // Create tables, add defaults
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	677 if (stCreateTables($inDB, FALSE))
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	678 {
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	679 stAddSettings($inDB, $inDB, $dbMeta, "dbmeta", FALSE);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	680 stAddSettings($inDB, $inDB, $siteDefaults, "settings", FALSE);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	681 stAddSettings($inDB, $inDB, $siteDisplayVars, "displayVars", FALSE);
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	682 }
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	683
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	684 if ($addTestData)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	685 stAddTestData($inDB);
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	686
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	687 stSetDBPermissions($inSpec);
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	690 case "upgrade":
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	691 case "migrate":
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	692 //
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	693 // Attempt to upgrade database
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	694 //
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	695 if ($argc < 4)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	696 die("Usage: ".$argv[0]." upgrade <input_dbspec> <output_dbspec>\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	697
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	698 $inSpec = stCArg(2);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	699 $outSpec = stCArg(3);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	700
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	701 if ($outSpec == $inSpec)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	702 die("The input and output databases CAN NOT BE SAME.\nBe VERY CAREFUL to not accidentally specify same db!\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	703
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	704 echo "Using database spec '".$inSpec."'.\n";
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	705
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	706 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	707 die("Could not connect to SQL database '".$inSpec."'.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	708
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	709 // Check the current version first ...
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	710 if (($currVersion = stGetDBMeta($inDB, "dbVersion")) === FALSE)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	711 $currVersion = -1;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	712
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	713 if ($currVersion == $dbVersion && stCArgLC(1) == "upgrade")
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	714 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	715 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	716 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	717 else
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	718 {
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	719 // Okay, we shall create an upgraded version ..
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	720 if (($outDB = stConnectSQLDBSpec($outSpec)) === false)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	721 die("Could not connect to SQL database '".$outSpec."'.\n");
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	722
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	723 echo "Database at version ".$currVersion.", upgrading to ".$dbVersion."\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	724 echo "Using OUTPUT database spec '".$outSpec."'.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	725
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	726 // Possibly bail out incompatible upgrades here
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	727
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	728 // Create tables
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	729 if (!stCreateTables($outDB, TRUE))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	730 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	731
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	732 // Migrate data from setting tables ..
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	733 if (!stAddSettings($inDB, $outDB, $siteDefaults, "settings", TRUE))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	734 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	735
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	736 if (!stAddSettings($inDB, $outDB, $siteDisplayVars, "displayVars", TRUE))
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	737 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	738
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	739 stAddSettings($inDB, $outDB, $dbMeta, "dbmeta", TRUE);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	740
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	741 // Migrate other tables
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	742 if (!stMigrateTables($inDB, $outDB, array("settings", "displayVars", "dbmeta")))
3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	743 exit;
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	744
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	745 echo "Setting dbVersion.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	746 stSetDBMeta($outDB, "dbVersion", $dbVersion);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	747 echo "Upgrade complete.\n";
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	748
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	749 stSetDBPermissions($inSpec);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	750 stSetDBPermissions($outSpec);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	751 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	752 break;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	753
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	754 default:
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	755 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	756 break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	757 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	759
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	760 //
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	761 // Clean up permissions
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	762 //
67 23eba98e1575 Remove keygen.php from permission cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	763 foreach (array("createdb.php") as $filename)
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	764 {
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	765 if (chmod($filename, 0700) === FALSE)
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	766 {
490 505f46b8bb14 Separate variable from string flow. Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	767 echo "ERROR! Could not set permissions for '".$filename."'!\n";
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	768 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	769 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	770
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771 ?>

Mercurial > hg > fapweb

annotate createdb.php @ 525:d7302b3a479e