fapweb: managedb.php annotate

annotate managedb.php @ 616:36e614bf864f

Cosmetics.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 01 Nov 2014 03:49:08 +0200
parents	94b9bf155fdb
children	8444fe96120e

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";
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	5 require_once "dbdefs.inc.php";
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6
479 86ee2b42a995 Move CLI helper functions to msitegen, again. Matti Hamalainen <ccr@tnsp.org> parents: 426 diff changeset	7 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	8
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	9
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	10 $currVersion = -1;
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	11 $dbMetaData = array(
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	12 "dbVersion" => array(VT_INT, $dbVersion, "Database version"),
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	13 );
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	14
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	15 $sqlTables["dbmeta"] = array(
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	16 array("key" , "VARCHAR(32)", "PRIMARY KEY"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	17 array("vtype" , "INT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	18 array("vstr" , "VARCHAR(128)"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	19 array("vtext" , "TEXT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	20 array("vint" , "INT"),
206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	21 array("sdesc" , "VARCHAR(128)"),
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 );
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	24
88 784953d60ba5 More work on test data generation. Matti Hamalainen <ccr@tnsp.org> parents: 85 diff changeset	25
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 //
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	27 // Helper functions
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 //
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	29 function stCreateTables($dbh, $upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 global $sqlTables;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 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	33 foreach ($sqlTables as $name => $schemaData)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 echo " - '".$name."'\n";
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	36 stDBExecSQL($dbh, "DROP TABLE IF EXISTS ".$name);
576 0837f419fa3d Rename some functions. Matti Hamalainen <ccr@tnsp.org> parents: 565 diff changeset	37 if (!stDBCreateOneTable($dbh, $name, stDBGetTableSchema($dbh, $schemaData)) && !$upgrade)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 return FALSE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 return TRUE;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	44 function stUpgradeMap($type, $name)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	45 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	46 global $upgradeMappings, $currVersion, $dbVersion;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	47
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	48 $converted = FALSE;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	49 $tmpName = $name;
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	50
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	51 for ($ver = $currVersion; $ver <= $dbVersion; $ver++)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	52 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	53 if (isset($upgradeMappings[$ver]) &&
590 94b9bf155fdb Revert a completely broken change. :S Matti Hamalainen <ccr@tnsp.org> parents: 586 diff changeset	54 isset($upgradeMappings[$ver][$tmpName]) &&
94b9bf155fdb Revert a completely broken change. :S Matti Hamalainen <ccr@tnsp.org> parents: 586 diff changeset	55 isset($upgradeMappings[$ver][$tmpName][$type]))
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	56 {
590 94b9bf155fdb Revert a completely broken change. :S Matti Hamalainen <ccr@tnsp.org> parents: 586 diff changeset	57 $tmpName = $upgradeMappings[$ver][$tmpName][$type];
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	58 $converted = TRUE;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	59 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	60 }
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	61
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	62 if ($converted)
ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	63 return $tmpName;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	64 else
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	65 switch ($type)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	66 {
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	67 case "table": return $name;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	68 case "key": return $name;
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	69 default: die("Invalid upgrade type '".$type."'.\n");
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	70 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	71 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	72
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	73
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	74 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	75 {
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	76 echo ($upgrade ? "Adding settings to" : "Upgrading settings in")." '".$table."' table.";
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	77
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	78 $status = TRUE;
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	79 stDBBeginTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	80
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	81 foreach ($settings as $key => $data)
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 {
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	83 $sql = false;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	84
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	85 // Get setting type
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	86 switch ($data[0])
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 {
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 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	89 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	90 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	91 case VT_INT: $type = "%d"; $var = "vint"; break;
80 e51205f2bdd0 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	92 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	93 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	95 // Check if we are upgrading
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	96 if ($upgrade)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	97 {
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	98 // Map the key, in case the name has changed
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	99 $inKey = stUpgradeMap("key", $key);
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	100 $inTable = stUpgradeMap("table", $table);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	101
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	102 if (($res = stDBFetchSQL($inDB, stDBPrepareSQL($inDB, "SELECT * FROM ".$inTable." WHERE key=%s", $inKey))) !== FALSE)
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	103 {
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	104 // Yup, upgrade the data, if we can
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	105 if ($res["vtype"] != $data[0])
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	106 die("Oops! Data type of '".$key."' does not match in table '".$table.". DB upgrade failed.\n");
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	107
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	108 $sql = stDBPrepareSQL($outDB,
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	109 "INSERT INTO ".$table." (key,vtype,".$var.",sdesc) VALUES (%s,%d,".$type.",%s)",
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	110 $key, $data[0], $res[$var], $data[2]);
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	111 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	112 }
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	113
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	114 if ($sql === false)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	115 {
515 2fc7bd9e209f Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	116 // Normal insertion of default data
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	117 $sql = stDBPrepareSQL($outDB,
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	118 "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	119 $key, $data[0], $data[1], $data[2]);
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	120 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	121
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	122 if (stDBExecSQL($outDB, $sql) === FALSE)
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	123 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	124 $status = FALSE;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	125 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	126 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	127 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	128 echo "\n";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	129
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	130 stDBCommitTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	131 return $status;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	132 }
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	133
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	134
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	135 function stAddTestData($outDB)
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	136 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	137 global $siteTestData;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	138
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	139 echo "Adding test data.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	140
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	141 $status = TRUE;
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	142 stDBBeginTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	143
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	144 foreach ($siteTestData as $table => $data)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	145 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	146 echo " - ".$table."...\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	147 if (count($data) >= 3)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	148 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	149 for ($n = 2; $n < count($data); $n++)
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	150 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	151 $arr = array_merge(
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	152 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	153 $data[$n]);
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	154
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	155 $sql = call_user_func_array('stDBPrepareSQL', $arr);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	156 if (stDBExecSQL($outDB, $sql) === false)
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	157 {
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	158 $status = false;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	159 break;
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	160 }
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	161 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	162 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	163 else
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	164 {
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	165 echo " Invalid table / data definition.\n";
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	166 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	167 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	168
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	169 stDBCommitTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	170 return $status;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	171 }
50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	172
499 408effd4e9ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	173
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	174 function stGetSQLTypeParam($dbh, $def, $value)
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	175 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	176 switch (substr($def, 0, 3))
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	177 {
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	178 case "INT":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	179 return intval($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	180
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	181 case "VAR":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	182 case "TEX":
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	183 return $dbh->quote($value);
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	184
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	185 default: die("Unknown type ".$col[1].".\n");
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	186 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	187 }
a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	188
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	189
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	190 function stMigrateTables($inDB, $outDB, $upgrade, $excluded)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	191 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	192 global $sqlTables;
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	193
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	194 echo "Migrating tables...\n";
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	195 $status = TRUE;
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	196 $dbName = $outDB->getAttribute(PDO::ATTR_DRIVER_NAME);
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	197 stDBBeginTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	198
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	199 foreach ($sqlTables as $table => $schema)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	200 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	201 // Do not migrate excluded tables (or excluded tables with old names)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	202 $sequences = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	203 $inTable = $upgrade ? stUpgradeMap("table", $table) : $table;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	204 if (in_array($inTable, $excluded) \|\| in_array($table, $excluded))
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	205 continue;
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	206
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	207 // Process each row of the input table
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	208 echo " - '".$table."' ";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	209 foreach (stDBExecSQL($inDB, "SELECT * FROM ".$inTable) as $row)
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	210 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	211 // Convert to new schema, as needed
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	212 $avals = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	213 $acols = array();
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	214
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	215 foreach ($schema as $col)
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	216 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	217 // If input has schema column, add it to output
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	218 if (isset($row[$col[0]]))
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	219 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	220 $avals[] = stGetSQLTypeParam($outDB, $col[1], $row[$col[0]]);
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	221 $acols[] = $col[0];
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	222 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	223
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	224 // If the column should have autoincrement, add it to sequences
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	225 if (in_array("AUTOINCREMENT", $col))
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	226 $sequences[] = $col[0];
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	227 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	228
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	229 $sql = "INSERT INTO ".$table." (".implode(",", $acols).") VALUES (".implode(",", $avals).")";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	230 if (stDBExecSQL($outDB, $sql) === false)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	231 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	232 $status = FALSE;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	233 break;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	234 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	235 echo ".";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	236 }
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	237
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	238 // Perform some specialities here
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	239 switch ($dbName)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	240 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	241 case "pgsql":
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	242 // For PostgreSQL we need to update sequences
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	243 foreach ($sequences as $seq)
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	244 {
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	245 if (($max_id = stDBFetchSQLColumn($outDB, "SELECT MAX(".$seq.") FROM ".$table)) !== false &&
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	246 ($seq_id = stDBFetchSQLColumn($outDB, "SELECT nextval('".$table."_".$seq."_seq')")) !== false &&
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	247 ($seq_id <= $max_id))
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	248 {
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	249 echo "SEQFIX";
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	250 stDBExecSQL($outDB, "SELECT setval('".$table."_".$seq."_seq', ".$max_id.")");
540 ab08640b4302 Improve database upgrade code. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	251 }
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	252 }
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	253 break;
f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	254 }
504 a491865e0684 Implement tables migration. Matti Hamalainen <ccr@tnsp.org> parents: 503 diff changeset	255
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	256 echo "\n";
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	257 }
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	258
581 adc8f66f9c33 10L. Matti Hamalainen <ccr@tnsp.org> parents: 577 diff changeset	259 stDBCommitTransaction($outDB);
519 6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	260
6aa9356ead52 Improve migration. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	261 return $status;
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	262 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	263
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	264
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	265 function stSetDBPermissions($spec)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	266 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	267 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	268 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	269 $filename = substr($spec, 7);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	270 echo
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	271 "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	272 "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	273 "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	274 "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	275
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	276 if (chmod($filename, 0600) === FALSE)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	277 {
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	278 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	279 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	280 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	281 }
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	282
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	283
36 ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	284 //
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	285 // Main program starts
ace577c92a32 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	286 //
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 if ($argc < 2)
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 {
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	289 echo
529 ddbc84031a7b Rename createdb.php to managedb.php Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	290 "ManageDB - Manage FAPWeb SQL database\n".
565 ed2247111fdd Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	291 "(C) Copyright 2012-2014 ccr/TNSP\n".
482 e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	292 "\n".
e0fd4c7ae8fb Update commandline help, remove the commandline option for target database Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	293 "Usage: ".$argv[0]." <mode> [args]\n".
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 "Where mode is one of following:\n".
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	296 " 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	297 " 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	298 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	299 " 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	300 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	301 " 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	302 " 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	303 " 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	304 "\n".
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	305 " migrate <input_dbspec> <output_dbspec>\n".
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	306 " Like upgrade, but no version check. Creates\n".
664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	307 " 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	308 "\n";
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 exit;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311
541 e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	312 // Validate tables data
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	313 $errors = FALSE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	314 foreach ($sqlTables as $table => $data)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	315 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	316 if (strtolower($table) != $table)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	317 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	318 echo "Invalid table definition '".$table."', table name must be lower case.\n";
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	319 $errors = TRUE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	320 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	321
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	322 foreach ($data as $def)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	323 if (strtolower($def[0]) != $def[0])
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	324 {
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	325 echo "Invalid table definition '".$table."', column key '".$def[0]."' must be lower case.\n";
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	326 $errors = TRUE;
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	327 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	328 }
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	329
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	330 if ($errors)
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	331 die("Errors in table definitions.\n");
e5a088dd3a4b Validate current table schema before actions. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	332
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	334 // Act according to specified command
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	335 $addTestData = FALSE;
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	336 $upgrade = FALSE;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	337
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	338 switch (stCArgLC(1))
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 {
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	340 case "test":
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	341 $addTestData = TRUE;
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	342
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 case "new":
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	344 // Try to connect to database
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	345 if (($inSpec = stCArg(2)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	346 die("No PDO database spec specified.\n");
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	347
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	348 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	349 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	350
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	351 echo "Using database spec '".$inSpec."'.\n";
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	352
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	353 // Create tables, add defaults
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	354 if (stCreateTables($inDB, FALSE))
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	355 {
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	356 stAddSettings($inDB, $inDB, $dbMetaData, "dbmeta", FALSE);
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	357 stAddSettings($inDB, $inDB, $siteDefaults, "settings", FALSE);
542 8c1a53532be0 Rename various database tables and column names for better SQL compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 541 diff changeset	358 stAddSettings($inDB, $inDB, $siteDisplayVars, "display_vars", FALSE);
139 75cf14ee99a7 More work on party information system. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	359 }
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	360
489 aa65fe63072e Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	361 if ($addTestData)
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	362 stAddTestData($inDB);
85 50d6c69836a1 Add test data mode for database creation. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	363
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	364 stSetDBPermissions($inSpec);
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 break;
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	367 case "upgrade":
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	368 $upgrade = TRUE;
bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	369
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	370 case "migrate":
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	371 //
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	372 // Attempt to upgrade database
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	373 //
525 d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	374 if ($argc < 4)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	375 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	376
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	377 $inSpec = stCArg(2);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	378 $outSpec = stCArg(3);
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	379
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	380 if ($outSpec == $inSpec)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	381 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	382
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	383 echo "Using database spec '".$inSpec."'.\n";
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	384
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	385 if (($inDB = stConnectSQLDBSpec($inSpec)) === false)
d7302b3a479e Change database tool commandline a bit. Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	386 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	387
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	388 // Check the current version first ...
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	389 if (($currVersion = stGetDBMeta($inDB, "dbVersion")) === FALSE)
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	390 $currVersion = -1;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	391
516 664915ff8520 Add 'migrate' option. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	392 if ($currVersion == $dbVersion && stCArgLC(1) == "upgrade")
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	393 {
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	394 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	395 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	396 else
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	397 {
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	398 // 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	399 if (($outDB = stConnectSQLDBSpec($outSpec)) === false)
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	400 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	401
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	402 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	403 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	404
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	405 // Possibly bail out incompatible upgrades here
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	406
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	407 // Create tables
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	408 if (!stCreateTables($outDB, TRUE))
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	409 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	410
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	411 // Migrate data from setting tables ..
552 14078b65641c Fix migration. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	412 if (!stAddSettings($inDB, $outDB, $siteDefaults, "settings", TRUE))
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	413 exit;
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	414
552 14078b65641c Fix migration. Matti Hamalainen <ccr@tnsp.org> parents: 551 diff changeset	415 if (!stAddSettings($inDB, $outDB, $siteDisplayVars, "display_vars", TRUE))
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	416 exit;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	417
555 206196b610fd Move site specific things to dbdefs.inc.php Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	418 stAddSettings($inDB, $outDB, $dbMetaData, "dbmeta", TRUE);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	419
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	420 // Migrate other tables
551 bed441ced78e Improve migration and upgrade procedures. Matti Hamalainen <ccr@tnsp.org> parents: 549 diff changeset	421 if (!stMigrateTables($inDB, $outDB, $upgrade, array("settings", "display_vars", "dbmeta")))
503 3232f682f0d2 Change how table schemas are defined, in preparation for future database Matti Hamalainen <ccr@tnsp.org> parents: 502 diff changeset	422 exit;
553 f13e7a513db1 Fix sequences after database upgrade or migration. Matti Hamalainen <ccr@tnsp.org> parents: 552 diff changeset	423
616 36e614bf864f Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 590 diff changeset	424 // Set new database version
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	425 echo "Setting dbVersion.\n";
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	426 stSetDBMeta($outDB, "dbVersion", $dbVersion);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	427 echo "Upgrade complete.\n";
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	428
502 d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	429 stSetDBPermissions($inSpec);
d2a38070e18f Partially refactor database upgrading .. not finished yet, and the Matti Hamalainen <ccr@tnsp.org> parents: 500 diff changeset	430 stSetDBPermissions($outSpec);
199 dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	431 }
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	432 break;
dbc6f214b825 Work on a database upgrade function. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	433
27 b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	434 default:
b27204653615 Work on adding support for entry submission. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	435 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	436 break;
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 }
4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	439
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	440 //
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	441 // Clean up permissions
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	442 //
529 ddbc84031a7b Rename createdb.php to managedb.php Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	443 foreach (array("managedb.php") as $filename)
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	444 {
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	445 if (chmod($filename, 0700) === FALSE)
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	446 {
490 505f46b8bb14 Separate variable from string flow. Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	447 echo "ERROR! Could not set permissions for '".$filename."'!\n";
28 bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	448 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	449 }
bf567e6402bf Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	450
8 4c5f651aa107 Migrate certain settings to SQL database, cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451 ?>

Mercurial > hg > fapweb

annotate managedb.php @ 616:36e614bf864f