@@ -19,10 +19,10 @@ |
||
| 19 | 19 | |
| 20 | 20 | if (!defined('IS_VALID_PHPMYFAQ')) { |
| 21 | 21 | $protocol = 'http'; |
| 22 | - if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
| 22 | + if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
| 23 | 23 | $protocol = 'https'; |
| 24 | 24 | } |
| 25 | - header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME'])); |
|
| 25 | + header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])); |
|
| 26 | 26 | exit(); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -19,10 +19,10 @@ |
||
| 19 | 19 | |
| 20 | 20 | if (!defined('IS_VALID_PHPMYFAQ')) { |
| 21 | 21 | $protocol = 'http'; |
| 22 | - if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
| 22 | + if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
| 23 | 23 | $protocol = 'https'; |
| 24 | 24 | } |
| 25 | - header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME'])); |
|
| 25 | + header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])); |
|
| 26 | 26 | exit(); |
| 27 | 27 | } |
| 28 | 28 | ?> |
@@ -19,10 +19,10 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | if (!defined('IS_VALID_PHPMYFAQ')) { |
| 21 | 21 | $protocol = 'http'; |
| 22 | - if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
| 22 | + if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
| 23 | 23 | $protocol = 'https'; |
| 24 | 24 | } |
| 25 | - header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME'])); |
|
| 25 | + header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])); |
|
| 26 | 26 | exit(); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | if (isset($_FILES['userfile']) && 0 == $_FILES['userfile']['error']) { |
| 42 | 42 | |
| 43 | - $ok = 1; |
|
| 43 | + $ok = 1; |
|
| 44 | 44 | $finfo = new finfo(FILEINFO_MIME_ENCODING); |
| 45 | 45 | if ('utf-8' == $finfo->file($_FILES['userfile']['tmp_name'])) { |
| 46 | 46 | print 'This file is not UTF_8 encoded.'; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $handle = fopen($_FILES['userfile']['tmp_name'], 'r'); |
| 50 | 50 | $dat = fgets($handle, 65536); |
| 51 | 51 | $versionFound = PMF_String::substr($dat, 0, 9); |
| 52 | - $versionExpected = '-- pmf' . substr($faqConfig->get('main.currentVersion'), 0, 3); |
|
| 52 | + $versionExpected = '-- pmf'.substr($faqConfig->get('main.currentVersion'), 0, 3); |
|
| 53 | 53 | |
| 54 | 54 | if ($versionFound != $versionExpected) { |
| 55 | 55 | printf('%s (Version check failure: "%s" found, "%s" expected)', |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | if (PMF_String::substr($dat, 0, $backup_prefix_pattern_len) == $backup_prefix_pattern) { |
| 80 | 80 | $table_prefix = trim(PMF_String::substr($dat, $backup_prefix_pattern_len)); |
| 81 | 81 | } |
| 82 | - if ( (PMF_String::substr($dat, 0, 2) != '--') && ($dat != '') ) { |
|
| 82 | + if ((PMF_String::substr($dat, 0, 2) != '--') && ($dat != '')) { |
|
| 83 | 83 | $mquery[] = trim(PMF_String::substr($dat, 0, -1)); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | PRIMARY KEY (id))"; |
| 65 | 65 | |
| 66 | 66 | //faqattachment |
| 67 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment ( |
|
| 67 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment ( |
|
| 68 | 68 | id INTEGER NOT NULL, |
| 69 | 69 | record_id INTEGER NOT NULL, |
| 70 | 70 | record_lang VARCHAR(5) NOT NULL, |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | PRIMARY KEY (id))"; |
| 79 | 79 | |
| 80 | 80 | //faqattachment file |
| 81 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment_file ( |
|
| 81 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment_file ( |
|
| 82 | 82 | virtual_hash CHAR(32) NOT NULL, |
| 83 | 83 | contents BLOB NOT NULL, |
| 84 | 84 | PRIMARY KEY (virtual_hash))"; |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | )"; |
| 241 | 241 | |
| 242 | 242 | //faqinstances |
| 243 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances ( |
|
| 243 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances ( |
|
| 244 | 244 | id INT(11) NOT NULL, |
| 245 | 245 | url VARCHAR(255) NOT NULL, |
| 246 | 246 | instance VARCHAR(255) NOT NULL, |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 66 | 66 | |
| 67 | 67 | //faqattachment |
| 68 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment ( |
|
| 68 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment ( |
|
| 69 | 69 | id int(11) NOT NULL, |
| 70 | 70 | record_id int(11) NOT NULL, |
| 71 | 71 | record_lang varchar(5) NOT NULL, |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 80 | 80 | |
| 81 | 81 | //faqattachment file |
| 82 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment_file ( |
|
| 82 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment_file ( |
|
| 83 | 83 | virtual_hash char(32) NOT NULL, |
| 84 | 84 | contents blob NOT NULL, |
| 85 | 85 | PRIMARY KEY (virtual_hash)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | PRIMARY KEY (group_id, right_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 239 | 239 | |
| 240 | 240 | //faqinstances |
| 241 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances ( |
|
| 241 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances ( |
|
| 242 | 242 | id INT(11) NOT NULL, |
| 243 | 243 | url VARCHAR(255) NOT NULL, |
| 244 | 244 | instance VARCHAR(255) NOT NULL, |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 249 | 249 | |
| 250 | 250 | //faqinstances_config |
| 251 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances_config ( |
|
| 251 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances_config ( |
|
| 252 | 252 | instance_id INT(11) NOT NULL, |
| 253 | 253 | config_name VARCHAR(255) NOT NULL default '', |
| 254 | 254 | config_value VARCHAR(255) DEFAULT NULL, |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | PRIMARY KEY (id))"; |
| 65 | 65 | |
| 66 | 66 | //faqattachment |
| 67 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment ( |
|
| 67 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment ( |
|
| 68 | 68 | id INTEGER NOT NULL, |
| 69 | 69 | record_id INTEGER NOT NULL, |
| 70 | 70 | record_lang VARCHAR(5) NOT NULL, |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | PRIMARY KEY (id))"; |
| 79 | 79 | |
| 80 | 80 | //faqattachment file |
| 81 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment_file ( |
|
| 81 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment_file ( |
|
| 82 | 82 | virtual_hash CHAR(32) NOT NULL, |
| 83 | 83 | contents BLOB NOT NULL, |
| 84 | 84 | PRIMARY KEY (virtual_hash))"; |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | )"; |
| 241 | 241 | |
| 242 | 242 | //faqinstances |
| 243 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances ( |
|
| 243 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances ( |
|
| 244 | 244 | id INT(11) NOT NULL, |
| 245 | 245 | url VARCHAR(255) NOT NULL, |
| 246 | 246 | instance VARCHAR(255) NOT NULL, |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | PRIMARY KEY (id))"; |
| 73 | 73 | |
| 74 | 74 | //faqattachment |
| 75 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment ( |
|
| 75 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment ( |
|
| 76 | 76 | id INTEGER NOT NULL, |
| 77 | 77 | record_id INTEGER NOT NULL, |
| 78 | 78 | record_lang VARCHAR(5) NOT NULL, |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | PRIMARY KEY (id))"; |
| 87 | 87 | |
| 88 | 88 | //faqattachment file |
| 89 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment_file ( |
|
| 89 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment_file ( |
|
| 90 | 90 | virtual_hash CHAR(32) NOT NULL, |
| 91 | 91 | contents TEXT NOT NULL, |
| 92 | 92 | PRIMARY KEY (virtual_hash))"; |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | )"; |
| 244 | 244 | |
| 245 | 245 | //faqinstances |
| 246 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances ( |
|
| 246 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances ( |
|
| 247 | 247 | id INT NOT NULL, |
| 248 | 248 | url VARCHAR(255) NOT NULL, |
| 249 | 249 | instance VARCHAR(255) NOT NULL, |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 66 | 66 | |
| 67 | 67 | //faqattachment |
| 68 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment ( |
|
| 68 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment ( |
|
| 69 | 69 | id int(11) NOT NULL, |
| 70 | 70 | record_id int(11) NOT NULL, |
| 71 | 71 | record_lang varchar(5) NOT NULL, |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 80 | 80 | |
| 81 | 81 | //faqattachment file |
| 82 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment_file ( |
|
| 82 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment_file ( |
|
| 83 | 83 | virtual_hash char(32) NOT NULL, |
| 84 | 84 | contents blob NOT NULL, |
| 85 | 85 | PRIMARY KEY (virtual_hash)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | PRIMARY KEY (group_id, right_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 239 | 239 | |
| 240 | 240 | //faqinstances |
| 241 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances ( |
|
| 241 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances ( |
|
| 242 | 242 | id INT(11) NOT NULL, |
| 243 | 243 | url VARCHAR(255) NOT NULL, |
| 244 | 244 | instance VARCHAR(255) NOT NULL, |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; |
| 249 | 249 | |
| 250 | 250 | //faqinstances_config |
| 251 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances_config ( |
|
| 251 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances_config ( |
|
| 252 | 252 | instance_id INT(11) NOT NULL, |
| 253 | 253 | config_name VARCHAR(255) NOT NULL default '', |
| 254 | 254 | config_value VARCHAR(255) DEFAULT NULL, |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | )"; |
| 241 | 241 | |
| 242 | 242 | //faqinstances |
| 243 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqinstances ( |
|
| 243 | +$query[] = "CREATE TABLE ".$sqltblpre."faqinstances ( |
|
| 244 | 244 | id SERIAL NOT NULL, |
| 245 | 245 | url VARCHAR(255) NOT NULL, |
| 246 | 246 | instance VARCHAR(255) NOT NULL, |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | PRIMARY KEY (id))"; |
| 379 | 379 | |
| 380 | 380 | //faqattachment |
| 381 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment ( |
|
| 381 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment ( |
|
| 382 | 382 | id SERIAL NOT NULL, |
| 383 | 383 | record_id int4 NOT NULL, |
| 384 | 384 | record_lang varchar(5) NOT NULL, |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | PRIMARY KEY (id))"; |
| 393 | 393 | |
| 394 | 394 | //faqattachment file |
| 395 | -$query[] = "CREATE TABLE " . $sqltblpre . "faqattachment_file ( |
|
| 395 | +$query[] = "CREATE TABLE ".$sqltblpre."faqattachment_file ( |
|
| 396 | 396 | virtual_hash char(32) NOT NULL, |
| 397 | 397 | contents bytea, |
| 398 | 398 | PRIMARY KEY (virtual_hash))"; |