SimpleMachines /
SMF2.1
@@ -20,8 +20,9 @@ discard block |
||
| 20 | 20 | // ><html dir="ltr"><head><title>Error!</title></head><body>Sorry, this installer requires PHP!<div style="display: none;"> |
| 21 | 21 | |
| 22 | 22 | // Let's pull in useful classes |
| 23 | -if (!defined('SMF')) |
|
| 23 | +if (!defined('SMF')) { |
|
| 24 | 24 | define('SMF', 1); |
| 25 | +} |
|
| 25 | 26 | |
| 26 | 27 | require_once('Sources/Class-Package.php'); |
| 27 | 28 | |
@@ -63,10 +64,11 @@ discard block |
||
| 63 | 64 | |
| 64 | 65 | list ($charcode) = pg_fetch_row($request); |
| 65 | 66 | |
| 66 | - if ($charcode == 'UTF8') |
|
| 67 | - return true; |
|
| 68 | - else |
|
| 69 | - return false; |
|
| 67 | + if ($charcode == 'UTF8') { |
|
| 68 | + return true; |
|
| 69 | + } else { |
|
| 70 | + return false; |
|
| 71 | + } |
|
| 70 | 72 | }, |
| 71 | 73 | 'utf8_version' => '8.0', |
| 72 | 74 | 'utf8_version_check' => '$request = pg_query(\'SELECT version()\'); list ($version) = pg_fetch_row($request); list($pgl, $version) = explode(" ", $version); return $version;', |
@@ -76,12 +78,14 @@ discard block |
||
| 76 | 78 | $value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value); |
| 77 | 79 | |
| 78 | 80 | // Is it reserved? |
| 79 | - if ($value == 'pg_') |
|
| 80 | - return $txt['error_db_prefix_reserved']; |
|
| 81 | + if ($value == 'pg_') { |
|
| 82 | + return $txt['error_db_prefix_reserved']; |
|
| 83 | + } |
|
| 81 | 84 | |
| 82 | 85 | // Is the prefix numeric? |
| 83 | - if (preg_match('~^\d~', $value)) |
|
| 84 | - return $txt['error_db_prefix_numeric']; |
|
| 86 | + if (preg_match('~^\d~', $value)) { |
|
| 87 | + return $txt['error_db_prefix_numeric']; |
|
| 88 | + } |
|
| 85 | 89 | |
| 86 | 90 | return true; |
| 87 | 91 | }, |
@@ -128,10 +132,11 @@ discard block |
||
| 128 | 132 | $incontext['skip'] = false; |
| 129 | 133 | |
| 130 | 134 | // Call the step and if it returns false that means pause! |
| 131 | - if (function_exists($step[2]) && $step[2]() === false) |
|
| 132 | - break; |
|
| 133 | - elseif (function_exists($step[2])) |
|
| 134 | - $incontext['current_step']++; |
|
| 135 | + if (function_exists($step[2]) && $step[2]() === false) { |
|
| 136 | + break; |
|
| 137 | + } elseif (function_exists($step[2])) { |
|
| 138 | + $incontext['current_step']++; |
|
| 139 | + } |
|
| 135 | 140 | |
| 136 | 141 | // No warnings pass on. |
| 137 | 142 | $incontext['warning'] = ''; |
@@ -147,8 +152,9 @@ discard block |
||
| 147 | 152 | global $databases; |
| 148 | 153 | |
| 149 | 154 | // Just so people using older versions of PHP aren't left in the cold. |
| 150 | - if (!isset($_SERVER['PHP_SELF'])) |
|
| 151 | - $_SERVER['PHP_SELF'] = isset($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']) ? $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'] : 'install.php'; |
|
| 155 | + if (!isset($_SERVER['PHP_SELF'])) { |
|
| 156 | + $_SERVER['PHP_SELF'] = isset($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']) ? $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'] : 'install.php'; |
|
| 157 | + } |
|
| 152 | 158 | |
| 153 | 159 | // Enable error reporting for fatal errors. |
| 154 | 160 | error_reporting(E_ERROR | E_PARSE); |
@@ -164,21 +170,23 @@ discard block |
||
| 164 | 170 | { |
| 165 | 171 | ob_start(); |
| 166 | 172 | |
| 167 | - if (ini_get('session.save_handler') == 'user') |
|
| 168 | - @ini_set('session.save_handler', 'files'); |
|
| 169 | - if (function_exists('session_start')) |
|
| 170 | - @session_start(); |
|
| 171 | - } |
|
| 172 | - else |
|
| 173 | + if (ini_get('session.save_handler') == 'user') { |
|
| 174 | + @ini_set('session.save_handler', 'files'); |
|
| 175 | + } |
|
| 176 | + if (function_exists('session_start')) { |
|
| 177 | + @session_start(); |
|
| 178 | + } |
|
| 179 | + } else |
|
| 173 | 180 | { |
| 174 | 181 | ob_start('ob_gzhandler'); |
| 175 | 182 | |
| 176 | - if (ini_get('session.save_handler') == 'user') |
|
| 177 | - @ini_set('session.save_handler', 'files'); |
|
| 183 | + if (ini_get('session.save_handler') == 'user') { |
|
| 184 | + @ini_set('session.save_handler', 'files'); |
|
| 185 | + } |
|
| 178 | 186 | session_start(); |
| 179 | 187 | |
| 180 | - if (!headers_sent()) |
|
| 181 | - echo '<!DOCTYPE html> |
|
| 188 | + if (!headers_sent()) { |
|
| 189 | + echo '<!DOCTYPE html> |
|
| 182 | 190 | <html> |
| 183 | 191 | <head> |
| 184 | 192 | <title>', htmlspecialchars($_GET['pass_string']), '</title> |
@@ -187,14 +195,16 @@ discard block |
||
| 187 | 195 | <strong>', htmlspecialchars($_GET['pass_string']), '</strong> |
| 188 | 196 | </body> |
| 189 | 197 | </html>'; |
| 198 | + } |
|
| 190 | 199 | exit; |
| 191 | 200 | } |
| 192 | 201 | |
| 193 | 202 | // Add slashes, as long as they aren't already being added. |
| 194 | - if (!function_exists('get_magic_quotes_gpc') || @get_magic_quotes_gpc() == 0) |
|
| 195 | - foreach ($_POST as $k => $v) |
|
| 203 | + if (!function_exists('get_magic_quotes_gpc') || @get_magic_quotes_gpc() == 0) { |
|
| 204 | + foreach ($_POST as $k => $v) |
|
| 196 | 205 | if (strpos($k, 'password') === false && strpos($k, 'db_passwd') === false) |
| 197 | 206 | $_POST[$k] = addslashes($v); |
| 207 | + } |
|
| 198 | 208 | |
| 199 | 209 | // This is really quite simple; if ?delete is on the URL, delete the installer... |
| 200 | 210 | if (isset($_GET['delete'])) |
@@ -215,8 +225,7 @@ discard block |
||
| 215 | 225 | $ftp->close(); |
| 216 | 226 | |
| 217 | 227 | unset($_SESSION['installer_temp_ftp']); |
| 218 | - } |
|
| 219 | - else |
|
| 228 | + } else |
|
| 220 | 229 | { |
| 221 | 230 | @unlink(__FILE__); |
| 222 | 231 | |
@@ -230,10 +239,11 @@ discard block |
||
| 230 | 239 | // Now just redirect to a blank.png... |
| 231 | 240 | $secure = false; |
| 232 | 241 | |
| 233 | - if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') |
|
| 234 | - $secure = true; |
|
| 235 | - elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') |
|
| 236 | - $secure = true; |
|
| 242 | + if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { |
|
| 243 | + $secure = true; |
|
| 244 | + } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') { |
|
| 245 | + $secure = true; |
|
| 246 | + } |
|
| 237 | 247 | |
| 238 | 248 | header('location: http' . ($secure ? 's' : '') . '://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']) . dirname($_SERVER['PHP_SELF']) . '/Themes/default/images/blank.png'); |
| 239 | 249 | exit; |
@@ -244,10 +254,11 @@ discard block |
||
| 244 | 254 | { |
| 245 | 255 | // Get PHP's default timezone, if set |
| 246 | 256 | $ini_tz = ini_get('date.timezone'); |
| 247 | - if (!empty($ini_tz)) |
|
| 248 | - $timezone_id = $ini_tz; |
|
| 249 | - else |
|
| 250 | - $timezone_id = ''; |
|
| 257 | + if (!empty($ini_tz)) { |
|
| 258 | + $timezone_id = $ini_tz; |
|
| 259 | + } else { |
|
| 260 | + $timezone_id = ''; |
|
| 261 | + } |
|
| 251 | 262 | |
| 252 | 263 | // If date.timezone is unset, invalid, or just plain weird, make a best guess |
| 253 | 264 | if (!in_array($timezone_id, timezone_identifiers_list())) |
@@ -277,8 +288,9 @@ discard block |
||
| 277 | 288 | $dir = dir(dirname(__FILE__) . '/Themes/default/languages'); |
| 278 | 289 | while ($entry = $dir->read()) |
| 279 | 290 | { |
| 280 | - if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php') |
|
| 281 | - $incontext['detected_languages'][$entry] = ucfirst(substr($entry, 8, strlen($entry) - 12)); |
|
| 291 | + if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php') { |
|
| 292 | + $incontext['detected_languages'][$entry] = ucfirst(substr($entry, 8, strlen($entry) - 12)); |
|
| 293 | + } |
|
| 282 | 294 | } |
| 283 | 295 | $dir->close(); |
| 284 | 296 | } |
@@ -313,10 +325,11 @@ discard block |
||
| 313 | 325 | } |
| 314 | 326 | |
| 315 | 327 | // Override the language file? |
| 316 | - if (isset($_GET['lang_file'])) |
|
| 317 | - $_SESSION['installer_temp_lang'] = $_GET['lang_file']; |
|
| 318 | - elseif (isset($GLOBALS['HTTP_GET_VARS']['lang_file'])) |
|
| 319 | - $_SESSION['installer_temp_lang'] = $GLOBALS['HTTP_GET_VARS']['lang_file']; |
|
| 328 | + if (isset($_GET['lang_file'])) { |
|
| 329 | + $_SESSION['installer_temp_lang'] = $_GET['lang_file']; |
|
| 330 | + } elseif (isset($GLOBALS['HTTP_GET_VARS']['lang_file'])) { |
|
| 331 | + $_SESSION['installer_temp_lang'] = $GLOBALS['HTTP_GET_VARS']['lang_file']; |
|
| 332 | + } |
|
| 320 | 333 | |
| 321 | 334 | // Make sure it exists, if it doesn't reset it. |
| 322 | 335 | if (!isset($_SESSION['installer_temp_lang']) || preg_match('~[^\\w_\\-.]~', $_SESSION['installer_temp_lang']) === 1 || !file_exists(dirname(__FILE__) . '/Themes/default/languages/' . $_SESSION['installer_temp_lang'])) |
@@ -325,8 +338,9 @@ discard block |
||
| 325 | 338 | list ($_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']); |
| 326 | 339 | |
| 327 | 340 | // If we have english and some other language, use the other language. We Americans hate english :P. |
| 328 | - if ($_SESSION['installer_temp_lang'] == 'Install.english.php' && count($incontext['detected_languages']) > 1) |
|
| 329 | - list (, $_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']); |
|
| 341 | + if ($_SESSION['installer_temp_lang'] == 'Install.english.php' && count($incontext['detected_languages']) > 1) { |
|
| 342 | + list (, $_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']); |
|
| 343 | + } |
|
| 330 | 344 | } |
| 331 | 345 | |
| 332 | 346 | // And now include the actual language file itself. |
@@ -343,15 +357,18 @@ discard block |
||
| 343 | 357 | global $db_prefix, $db_connection, $sourcedir, $smcFunc, $modSettings; |
| 344 | 358 | global $db_server, $db_passwd, $db_type, $db_name, $db_user, $db_persist; |
| 345 | 359 | |
| 346 | - if (empty($sourcedir)) |
|
| 347 | - $sourcedir = dirname(__FILE__) . '/Sources'; |
|
| 360 | + if (empty($sourcedir)) { |
|
| 361 | + $sourcedir = dirname(__FILE__) . '/Sources'; |
|
| 362 | + } |
|
| 348 | 363 | |
| 349 | 364 | // Need this to check whether we need the database password. |
| 350 | 365 | require(dirname(__FILE__) . '/Settings.php'); |
| 351 | - if (!defined('SMF')) |
|
| 352 | - define('SMF', 1); |
|
| 353 | - if (empty($smcFunc)) |
|
| 354 | - $smcFunc = array(); |
|
| 366 | + if (!defined('SMF')) { |
|
| 367 | + define('SMF', 1); |
|
| 368 | + } |
|
| 369 | + if (empty($smcFunc)) { |
|
| 370 | + $smcFunc = array(); |
|
| 371 | + } |
|
| 355 | 372 | |
| 356 | 373 | $modSettings['disableQueryCheck'] = true; |
| 357 | 374 | |
@@ -359,8 +376,9 @@ discard block |
||
| 359 | 376 | if (!$db_connection) |
| 360 | 377 | { |
| 361 | 378 | require_once($sourcedir . '/Subs-Db-' . $db_type . '.php'); |
| 362 | - if (version_compare(PHP_VERSION, '5', '<')) |
|
| 363 | - require_once($sourcedir . '/Subs-Compat.php'); |
|
| 379 | + if (version_compare(PHP_VERSION, '5', '<')) { |
|
| 380 | + require_once($sourcedir . '/Subs-Compat.php'); |
|
| 381 | + } |
|
| 364 | 382 | |
| 365 | 383 | $db_options = array('persist' => $db_persist); |
| 366 | 384 | $port = ''; |
@@ -371,19 +389,20 @@ discard block |
||
| 371 | 389 | if ($db_type == 'mysql') |
| 372 | 390 | { |
| 373 | 391 | $port = ((int) $_POST['db_port'] == ini_get($db_type . 'default_port')) ? '' : (int) $_POST['db_port']; |
| 374 | - } |
|
| 375 | - elseif ($db_type == 'postgresql') |
|
| 392 | + } elseif ($db_type == 'postgresql') |
|
| 376 | 393 | { |
| 377 | 394 | // PostgreSQL doesn't have a default port setting in php.ini, so just check against the default |
| 378 | 395 | $port = ((int) $_POST['db_port'] == 5432) ? '' : (int) $_POST['db_port']; |
| 379 | 396 | } |
| 380 | 397 | } |
| 381 | 398 | |
| 382 | - if (!empty($port)) |
|
| 383 | - $db_options['port'] = $port; |
|
| 399 | + if (!empty($port)) { |
|
| 400 | + $db_options['port'] = $port; |
|
| 401 | + } |
|
| 384 | 402 | |
| 385 | - if (!$db_connection) |
|
| 386 | - $db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options); |
|
| 403 | + if (!$db_connection) { |
|
| 404 | + $db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options); |
|
| 405 | + } |
|
| 387 | 406 | } |
| 388 | 407 | } |
| 389 | 408 | |
@@ -411,8 +430,9 @@ discard block |
||
| 411 | 430 | // @todo REMOVE THIS!! |
| 412 | 431 | else |
| 413 | 432 | { |
| 414 | - if (function_exists('doStep' . $_GET['step'])) |
|
| 415 | - call_user_func('doStep' . $_GET['step']); |
|
| 433 | + if (function_exists('doStep' . $_GET['step'])) { |
|
| 434 | + call_user_func('doStep' . $_GET['step']); |
|
| 435 | + } |
|
| 416 | 436 | } |
| 417 | 437 | // Show the footer. |
| 418 | 438 | template_install_below(); |
@@ -430,8 +450,9 @@ discard block |
||
| 430 | 450 | $incontext['sub_template'] = 'welcome_message'; |
| 431 | 451 | |
| 432 | 452 | // Done the submission? |
| 433 | - if (isset($_POST['contbutt'])) |
|
| 434 | - return true; |
|
| 453 | + if (isset($_POST['contbutt'])) { |
|
| 454 | + return true; |
|
| 455 | + } |
|
| 435 | 456 | |
| 436 | 457 | // See if we think they have already installed it? |
| 437 | 458 | if (is_readable(dirname(__FILE__) . '/Settings.php')) |
@@ -439,14 +460,17 @@ discard block |
||
| 439 | 460 | $probably_installed = 0; |
| 440 | 461 | foreach (file(dirname(__FILE__) . '/Settings.php') as $line) |
| 441 | 462 | { |
| 442 | - if (preg_match('~^\$db_passwd\s=\s\'([^\']+)\';$~', $line)) |
|
| 443 | - $probably_installed++; |
|
| 444 | - if (preg_match('~^\$boardurl\s=\s\'([^\']+)\';~', $line) && !preg_match('~^\$boardurl\s=\s\'http://127\.0\.0\.1/smf\';~', $line)) |
|
| 445 | - $probably_installed++; |
|
| 463 | + if (preg_match('~^\$db_passwd\s=\s\'([^\']+)\';$~', $line)) { |
|
| 464 | + $probably_installed++; |
|
| 465 | + } |
|
| 466 | + if (preg_match('~^\$boardurl\s=\s\'([^\']+)\';~', $line) && !preg_match('~^\$boardurl\s=\s\'http://127\.0\.0\.1/smf\';~', $line)) { |
|
| 467 | + $probably_installed++; |
|
| 468 | + } |
|
| 446 | 469 | } |
| 447 | 470 | |
| 448 | - if ($probably_installed == 2) |
|
| 449 | - $incontext['warning'] = $txt['error_already_installed']; |
|
| 471 | + if ($probably_installed == 2) { |
|
| 472 | + $incontext['warning'] = $txt['error_already_installed']; |
|
| 473 | + } |
|
| 450 | 474 | } |
| 451 | 475 | |
| 452 | 476 | // Is some database support even compiled in? |
@@ -461,45 +485,54 @@ discard block |
||
| 461 | 485 | $databases[$key]['supported'] = false; |
| 462 | 486 | $notFoundSQLFile = true; |
| 463 | 487 | $txt['error_db_script_missing'] = sprintf($txt['error_db_script_missing'], 'install_' . $GLOBALS['db_script_version'] . '_' . $type . '.sql'); |
| 488 | + } else { |
|
| 489 | + $incontext['supported_databases'][] = $db; |
|
| 464 | 490 | } |
| 465 | - else |
|
| 466 | - $incontext['supported_databases'][] = $db; |
|
| 467 | 491 | } |
| 468 | 492 | } |
| 469 | 493 | |
| 470 | 494 | // Check the PHP version. |
| 471 | - if ((!function_exists('version_compare') || version_compare($GLOBALS['required_php_version'], PHP_VERSION, '>='))) |
|
| 472 | - $error = 'error_php_too_low'; |
|
| 495 | + if ((!function_exists('version_compare') || version_compare($GLOBALS['required_php_version'], PHP_VERSION, '>='))) { |
|
| 496 | + $error = 'error_php_too_low'; |
|
| 497 | + } |
|
| 473 | 498 | // Make sure we have a supported database |
| 474 | - elseif (empty($incontext['supported_databases'])) |
|
| 475 | - $error = empty($notFoundSQLFile) ? 'error_db_missing' : 'error_db_script_missing'; |
|
| 499 | + elseif (empty($incontext['supported_databases'])) { |
|
| 500 | + $error = empty($notFoundSQLFile) ? 'error_db_missing' : 'error_db_script_missing'; |
|
| 501 | + } |
|
| 476 | 502 | // How about session support? Some crazy sysadmin remove it? |
| 477 | - elseif (!function_exists('session_start')) |
|
| 478 | - $error = 'error_session_missing'; |
|
| 503 | + elseif (!function_exists('session_start')) { |
|
| 504 | + $error = 'error_session_missing'; |
|
| 505 | + } |
|
| 479 | 506 | // Make sure they uploaded all the files. |
| 480 | - elseif (!file_exists(dirname(__FILE__) . '/index.php')) |
|
| 481 | - $error = 'error_missing_files'; |
|
| 507 | + elseif (!file_exists(dirname(__FILE__) . '/index.php')) { |
|
| 508 | + $error = 'error_missing_files'; |
|
| 509 | + } |
|
| 482 | 510 | // Very simple check on the session.save_path for Windows. |
| 483 | 511 | // @todo Move this down later if they don't use database-driven sessions? |
| 484 | - elseif (@ini_get('session.save_path') == '/tmp' && substr(__FILE__, 1, 2) == ':\\') |
|
| 485 | - $error = 'error_session_save_path'; |
|
| 512 | + elseif (@ini_get('session.save_path') == '/tmp' && substr(__FILE__, 1, 2) == ':\\') { |
|
| 513 | + $error = 'error_session_save_path'; |
|
| 514 | + } |
|
| 486 | 515 | |
| 487 | 516 | // Since each of the three messages would look the same, anyway... |
| 488 | - if (isset($error)) |
|
| 489 | - $incontext['error'] = $txt[$error]; |
|
| 517 | + if (isset($error)) { |
|
| 518 | + $incontext['error'] = $txt[$error]; |
|
| 519 | + } |
|
| 490 | 520 | |
| 491 | 521 | // Mod_security blocks everything that smells funny. Let SMF handle security. |
| 492 | - if (!fixModSecurity() && !isset($_GET['overmodsecurity'])) |
|
| 493 | - $incontext['error'] = $txt['error_mod_security'] . '<br><br><a href="' . $installurl . '?overmodsecurity=true">' . $txt['error_message_click'] . '</a> ' . $txt['error_message_bad_try_again']; |
|
| 522 | + if (!fixModSecurity() && !isset($_GET['overmodsecurity'])) { |
|
| 523 | + $incontext['error'] = $txt['error_mod_security'] . '<br><br><a href="' . $installurl . '?overmodsecurity=true">' . $txt['error_message_click'] . '</a> ' . $txt['error_message_bad_try_again']; |
|
| 524 | + } |
|
| 494 | 525 | |
| 495 | 526 | // Confirm mbstring is loaded... |
| 496 | - if (!extension_loaded('mbstring')) |
|
| 497 | - $incontext['error'] = $txt['install_no_mbstring']; |
|
| 527 | + if (!extension_loaded('mbstring')) { |
|
| 528 | + $incontext['error'] = $txt['install_no_mbstring']; |
|
| 529 | + } |
|
| 498 | 530 | |
| 499 | 531 | // Check for https stream support. |
| 500 | 532 | $supported_streams = stream_get_wrappers(); |
| 501 | - if (!in_array('https', $supported_streams)) |
|
| 502 | - $incontext['warning'] = $txt['install_no_https']; |
|
| 533 | + if (!in_array('https', $supported_streams)) { |
|
| 534 | + $incontext['warning'] = $txt['install_no_https']; |
|
| 535 | + } |
|
| 503 | 536 | |
| 504 | 537 | return false; |
| 505 | 538 | } |
@@ -524,12 +557,14 @@ discard block |
||
| 524 | 557 | 'Settings_bak.php', |
| 525 | 558 | ); |
| 526 | 559 | |
| 527 | - foreach ($incontext['detected_languages'] as $lang => $temp) |
|
| 528 | - $extra_files[] = 'Themes/default/languages/' . $lang; |
|
| 560 | + foreach ($incontext['detected_languages'] as $lang => $temp) { |
|
| 561 | + $extra_files[] = 'Themes/default/languages/' . $lang; |
|
| 562 | + } |
|
| 529 | 563 | |
| 530 | 564 | // With mod_security installed, we could attempt to fix it with .htaccess. |
| 531 | - if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules())) |
|
| 532 | - $writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.'; |
|
| 565 | + if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules())) { |
|
| 566 | + $writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.'; |
|
| 567 | + } |
|
| 533 | 568 | |
| 534 | 569 | $failed_files = array(); |
| 535 | 570 | |
@@ -541,20 +576,23 @@ discard block |
||
| 541 | 576 | foreach ($writable_files as $file) |
| 542 | 577 | { |
| 543 | 578 | // Some files won't exist, try to address up front |
| 544 | - if (!file_exists(dirname(__FILE__) . '/' . $file)) |
|
| 545 | - @touch(dirname(__FILE__) . '/' . $file); |
|
| 579 | + if (!file_exists(dirname(__FILE__) . '/' . $file)) { |
|
| 580 | + @touch(dirname(__FILE__) . '/' . $file); |
|
| 581 | + } |
|
| 546 | 582 | // NOW do the writable check... |
| 547 | 583 | if (!is_writable(dirname(__FILE__) . '/' . $file)) |
| 548 | 584 | { |
| 549 | 585 | @chmod(dirname(__FILE__) . '/' . $file, 0755); |
| 550 | 586 | |
| 551 | 587 | // Well, 755 hopefully worked... if not, try 777. |
| 552 | - if (!is_writable(dirname(__FILE__) . '/' . $file) && !@chmod(dirname(__FILE__) . '/' . $file, 0777)) |
|
| 553 | - $failed_files[] = $file; |
|
| 588 | + if (!is_writable(dirname(__FILE__) . '/' . $file) && !@chmod(dirname(__FILE__) . '/' . $file, 0777)) { |
|
| 589 | + $failed_files[] = $file; |
|
| 590 | + } |
|
| 554 | 591 | } |
| 555 | 592 | } |
| 556 | - foreach ($extra_files as $file) |
|
| 557 | - @chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777); |
|
| 593 | + foreach ($extra_files as $file) { |
|
| 594 | + @chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777); |
|
| 595 | + } |
|
| 558 | 596 | } |
| 559 | 597 | // Windows is trickier. Let's try opening for r+... |
| 560 | 598 | else |
@@ -564,30 +602,35 @@ discard block |
||
| 564 | 602 | foreach ($writable_files as $file) |
| 565 | 603 | { |
| 566 | 604 | // Folders can't be opened for write... but the index.php in them can ;) |
| 567 | - if (is_dir(dirname(__FILE__) . '/' . $file)) |
|
| 568 | - $file .= '/index.php'; |
|
| 605 | + if (is_dir(dirname(__FILE__) . '/' . $file)) { |
|
| 606 | + $file .= '/index.php'; |
|
| 607 | + } |
|
| 569 | 608 | |
| 570 | 609 | // Funny enough, chmod actually does do something on windows - it removes the read only attribute. |
| 571 | 610 | @chmod(dirname(__FILE__) . '/' . $file, 0777); |
| 572 | 611 | $fp = @fopen(dirname(__FILE__) . '/' . $file, 'r+'); |
| 573 | 612 | |
| 574 | 613 | // Hmm, okay, try just for write in that case... |
| 575 | - if (!is_resource($fp)) |
|
| 576 | - $fp = @fopen(dirname(__FILE__) . '/' . $file, 'w'); |
|
| 614 | + if (!is_resource($fp)) { |
|
| 615 | + $fp = @fopen(dirname(__FILE__) . '/' . $file, 'w'); |
|
| 616 | + } |
|
| 577 | 617 | |
| 578 | - if (!is_resource($fp)) |
|
| 579 | - $failed_files[] = $file; |
|
| 618 | + if (!is_resource($fp)) { |
|
| 619 | + $failed_files[] = $file; |
|
| 620 | + } |
|
| 580 | 621 | |
| 581 | 622 | @fclose($fp); |
| 582 | 623 | } |
| 583 | - foreach ($extra_files as $file) |
|
| 584 | - @chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777); |
|
| 624 | + foreach ($extra_files as $file) { |
|
| 625 | + @chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777); |
|
| 626 | + } |
|
| 585 | 627 | } |
| 586 | 628 | |
| 587 | 629 | $failure = count($failed_files) >= 1; |
| 588 | 630 | |
| 589 | - if (!isset($_SERVER)) |
|
| 590 | - return !$failure; |
|
| 631 | + if (!isset($_SERVER)) { |
|
| 632 | + return !$failure; |
|
| 633 | + } |
|
| 591 | 634 | |
| 592 | 635 | // Put the list into context. |
| 593 | 636 | $incontext['failed_files'] = $failed_files; |
@@ -635,19 +678,23 @@ discard block |
||
| 635 | 678 | |
| 636 | 679 | if (!isset($ftp) || $ftp->error !== false) |
| 637 | 680 | { |
| 638 | - if (!isset($ftp)) |
|
| 639 | - $ftp = new ftp_connection(null); |
|
| 681 | + if (!isset($ftp)) { |
|
| 682 | + $ftp = new ftp_connection(null); |
|
| 683 | + } |
|
| 640 | 684 | // Save the error so we can mess with listing... |
| 641 | - elseif ($ftp->error !== false && empty($incontext['ftp_errors']) && !empty($ftp->last_message)) |
|
| 642 | - $incontext['ftp_errors'][] = $ftp->last_message; |
|
| 685 | + elseif ($ftp->error !== false && empty($incontext['ftp_errors']) && !empty($ftp->last_message)) { |
|
| 686 | + $incontext['ftp_errors'][] = $ftp->last_message; |
|
| 687 | + } |
|
| 643 | 688 | |
| 644 | 689 | list ($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__)); |
| 645 | 690 | |
| 646 | - if (empty($_POST['ftp_path']) && $found_path) |
|
| 647 | - $_POST['ftp_path'] = $detect_path; |
|
| 691 | + if (empty($_POST['ftp_path']) && $found_path) { |
|
| 692 | + $_POST['ftp_path'] = $detect_path; |
|
| 693 | + } |
|
| 648 | 694 | |
| 649 | - if (!isset($_POST['ftp_username'])) |
|
| 650 | - $_POST['ftp_username'] = $username; |
|
| 695 | + if (!isset($_POST['ftp_username'])) { |
|
| 696 | + $_POST['ftp_username'] = $username; |
|
| 697 | + } |
|
| 651 | 698 | |
| 652 | 699 | // Set the username etc, into context. |
| 653 | 700 | $incontext['ftp'] = array( |
@@ -659,8 +706,7 @@ discard block |
||
| 659 | 706 | ); |
| 660 | 707 | |
| 661 | 708 | return false; |
| 662 | - } |
|
| 663 | - else |
|
| 709 | + } else |
|
| 664 | 710 | { |
| 665 | 711 | $_SESSION['installer_temp_ftp'] = array( |
| 666 | 712 | 'server' => $_POST['ftp_server'], |
@@ -674,10 +720,12 @@ discard block |
||
| 674 | 720 | |
| 675 | 721 | foreach ($failed_files as $file) |
| 676 | 722 | { |
| 677 | - if (!is_writable(dirname(__FILE__) . '/' . $file)) |
|
| 678 | - $ftp->chmod($file, 0755); |
|
| 679 | - if (!is_writable(dirname(__FILE__) . '/' . $file)) |
|
| 680 | - $ftp->chmod($file, 0777); |
|
| 723 | + if (!is_writable(dirname(__FILE__) . '/' . $file)) { |
|
| 724 | + $ftp->chmod($file, 0755); |
|
| 725 | + } |
|
| 726 | + if (!is_writable(dirname(__FILE__) . '/' . $file)) { |
|
| 727 | + $ftp->chmod($file, 0777); |
|
| 728 | + } |
|
| 681 | 729 | if (!is_writable(dirname(__FILE__) . '/' . $file)) |
| 682 | 730 | { |
| 683 | 731 | $failed_files_updated[] = $file; |
@@ -733,15 +781,17 @@ discard block |
||
| 733 | 781 | |
| 734 | 782 | if (!$foundOne) |
| 735 | 783 | { |
| 736 | - if (isset($db['default_host'])) |
|
| 737 | - $incontext['db']['server'] = ini_get($db['default_host']) or $incontext['db']['server'] = 'localhost'; |
|
| 784 | + if (isset($db['default_host'])) { |
|
| 785 | + $incontext['db']['server'] = ini_get($db['default_host']) or $incontext['db']['server'] = 'localhost'; |
|
| 786 | + } |
|
| 738 | 787 | if (isset($db['default_user'])) |
| 739 | 788 | { |
| 740 | 789 | $incontext['db']['user'] = ini_get($db['default_user']); |
| 741 | 790 | $incontext['db']['name'] = ini_get($db['default_user']); |
| 742 | 791 | } |
| 743 | - if (isset($db['default_password'])) |
|
| 744 | - $incontext['db']['pass'] = ini_get($db['default_password']); |
|
| 792 | + if (isset($db['default_password'])) { |
|
| 793 | + $incontext['db']['pass'] = ini_get($db['default_password']); |
|
| 794 | + } |
|
| 745 | 795 | |
| 746 | 796 | // For simplicity and less confusion, leave the port blank by default |
| 747 | 797 | $incontext['db']['port'] = ''; |
@@ -760,10 +810,10 @@ discard block |
||
| 760 | 810 | $incontext['db']['server'] = $_POST['db_server']; |
| 761 | 811 | $incontext['db']['prefix'] = $_POST['db_prefix']; |
| 762 | 812 | |
| 763 | - if (!empty($_POST['db_port'])) |
|
| 764 | - $incontext['db']['port'] = $_POST['db_port']; |
|
| 765 | - } |
|
| 766 | - else |
|
| 813 | + if (!empty($_POST['db_port'])) { |
|
| 814 | + $incontext['db']['port'] = $_POST['db_port']; |
|
| 815 | + } |
|
| 816 | + } else |
|
| 767 | 817 | { |
| 768 | 818 | $incontext['db']['prefix'] = 'smf_'; |
| 769 | 819 | } |
@@ -799,10 +849,11 @@ discard block |
||
| 799 | 849 | if (!empty($_POST['db_port'])) |
| 800 | 850 | { |
| 801 | 851 | // For MySQL, we can get the "default port" from PHP. PostgreSQL has no such option though. |
| 802 | - if (($db_type == 'mysql' || $db_type == 'mysqli') && $_POST['db_port'] != ini_get($db_type . '.default_port')) |
|
| 803 | - $vars['db_port'] = (int) $_POST['db_port']; |
|
| 804 | - elseif ($db_type == 'postgresql' && $_POST['db_port'] != 5432) |
|
| 805 | - $vars['db_port'] = (int) $_POST['db_port']; |
|
| 852 | + if (($db_type == 'mysql' || $db_type == 'mysqli') && $_POST['db_port'] != ini_get($db_type . '.default_port')) { |
|
| 853 | + $vars['db_port'] = (int) $_POST['db_port']; |
|
| 854 | + } elseif ($db_type == 'postgresql' && $_POST['db_port'] != 5432) { |
|
| 855 | + $vars['db_port'] = (int) $_POST['db_port']; |
|
| 856 | + } |
|
| 806 | 857 | } |
| 807 | 858 | |
| 808 | 859 | // God I hope it saved! |
@@ -815,8 +866,9 @@ discard block |
||
| 815 | 866 | // Make sure it works. |
| 816 | 867 | require(dirname(__FILE__) . '/Settings.php'); |
| 817 | 868 | |
| 818 | - if (empty($sourcedir)) |
|
| 819 | - $sourcedir = dirname(__FILE__) . '/Sources'; |
|
| 869 | + if (empty($sourcedir)) { |
|
| 870 | + $sourcedir = dirname(__FILE__) . '/Sources'; |
|
| 871 | + } |
|
| 820 | 872 | |
| 821 | 873 | // Better find the database file! |
| 822 | 874 | if (!file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php')) |
@@ -826,18 +878,21 @@ discard block |
||
| 826 | 878 | } |
| 827 | 879 | |
| 828 | 880 | // Now include it for database functions! |
| 829 | - if (!defined('SMF')) |
|
| 830 | - define('SMF', 1); |
|
| 881 | + if (!defined('SMF')) { |
|
| 882 | + define('SMF', 1); |
|
| 883 | + } |
|
| 831 | 884 | |
| 832 | 885 | $modSettings['disableQueryCheck'] = true; |
| 833 | - if (empty($smcFunc)) |
|
| 834 | - $smcFunc = array(); |
|
| 886 | + if (empty($smcFunc)) { |
|
| 887 | + $smcFunc = array(); |
|
| 888 | + } |
|
| 835 | 889 | |
| 836 | 890 | require_once($sourcedir . '/Subs-Db-' . $db_type . '.php'); |
| 837 | 891 | |
| 838 | 892 | // What - running PHP4? The shame! |
| 839 | - if (version_compare(PHP_VERSION, '5', '<')) |
|
| 840 | - require_once($sourcedir . '/Subs-Compat.php'); |
|
| 893 | + if (version_compare(PHP_VERSION, '5', '<')) { |
|
| 894 | + require_once($sourcedir . '/Subs-Compat.php'); |
|
| 895 | + } |
|
| 841 | 896 | |
| 842 | 897 | // Attempt a connection. |
| 843 | 898 | $needsDB = !empty($databases[$db_type]['always_has_db']); |
@@ -925,12 +980,14 @@ discard block |
||
| 925 | 980 | $incontext['page_title'] = $txt['install_settings']; |
| 926 | 981 | |
| 927 | 982 | // Let's see if we got the database type correct. |
| 928 | - if (isset($_POST['db_type'], $databases[$_POST['db_type']])) |
|
| 929 | - $db_type = $_POST['db_type']; |
|
| 983 | + if (isset($_POST['db_type'], $databases[$_POST['db_type']])) { |
|
| 984 | + $db_type = $_POST['db_type']; |
|
| 985 | + } |
|
| 930 | 986 | |
| 931 | 987 | // Else we'd better be able to get the connection. |
| 932 | - else |
|
| 933 | - load_database(); |
|
| 988 | + else { |
|
| 989 | + load_database(); |
|
| 990 | + } |
|
| 934 | 991 | |
| 935 | 992 | $db_type = isset($_POST['db_type']) ? $_POST['db_type'] : $db_type; |
| 936 | 993 | |
@@ -939,10 +996,11 @@ discard block |
||
| 939 | 996 | |
| 940 | 997 | $secure = false; |
| 941 | 998 | |
| 942 | - if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') |
|
| 943 | - $secure = true; |
|
| 944 | - elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') |
|
| 945 | - $secure = true; |
|
| 999 | + if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { |
|
| 1000 | + $secure = true; |
|
| 1001 | + } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') { |
|
| 1002 | + $secure = true; |
|
| 1003 | + } |
|
| 946 | 1004 | |
| 947 | 1005 | // Now, to put what we've learned together... and add a path. |
| 948 | 1006 | $incontext['detected_url'] = 'http' . ($secure ? 's' : '') . '://' . $host . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/')); |
@@ -974,18 +1032,21 @@ discard block |
||
| 974 | 1032 | // Submitting? |
| 975 | 1033 | if (isset($_POST['boardurl'])) |
| 976 | 1034 | { |
| 977 | - if (substr($_POST['boardurl'], -10) == '/index.php') |
|
| 978 | - $_POST['boardurl'] = substr($_POST['boardurl'], 0, -10); |
|
| 979 | - elseif (substr($_POST['boardurl'], -1) == '/') |
|
| 980 | - $_POST['boardurl'] = substr($_POST['boardurl'], 0, -1); |
|
| 981 | - if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') |
|
| 982 | - $_POST['boardurl'] = 'http://' . $_POST['boardurl']; |
|
| 1035 | + if (substr($_POST['boardurl'], -10) == '/index.php') { |
|
| 1036 | + $_POST['boardurl'] = substr($_POST['boardurl'], 0, -10); |
|
| 1037 | + } elseif (substr($_POST['boardurl'], -1) == '/') { |
|
| 1038 | + $_POST['boardurl'] = substr($_POST['boardurl'], 0, -1); |
|
| 1039 | + } |
|
| 1040 | + if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') { |
|
| 1041 | + $_POST['boardurl'] = 'http://' . $_POST['boardurl']; |
|
| 1042 | + } |
|
| 983 | 1043 | |
| 984 | 1044 | //Make sure boardurl is aligned with ssl setting |
| 985 | - if (empty($_POST['force_ssl'])) |
|
| 986 | - $_POST['boardurl'] = strtr($_POST['boardurl'], array('https://' => 'http://')); |
|
| 987 | - else |
|
| 988 | - $_POST['boardurl'] = strtr($_POST['boardurl'], array('http://' => 'https://')); |
|
| 1045 | + if (empty($_POST['force_ssl'])) { |
|
| 1046 | + $_POST['boardurl'] = strtr($_POST['boardurl'], array('https://' => 'http://')); |
|
| 1047 | + } else { |
|
| 1048 | + $_POST['boardurl'] = strtr($_POST['boardurl'], array('http://' => 'https://')); |
|
| 1049 | + } |
|
| 989 | 1050 | |
| 990 | 1051 | // Save these variables. |
| 991 | 1052 | $vars = array( |
@@ -1024,10 +1085,10 @@ discard block |
||
| 1024 | 1085 | { |
| 1025 | 1086 | $incontext['error'] = sprintf($txt['error_utf8_version'], $databases[$db_type]['utf8_version']); |
| 1026 | 1087 | return false; |
| 1027 | - } |
|
| 1028 | - else |
|
| 1029 | - // Set the character set here. |
|
| 1088 | + } else { |
|
| 1089 | + // Set the character set here. |
|
| 1030 | 1090 | updateSettingsFile(array('db_character_set' => 'utf8')); |
| 1091 | + } |
|
| 1031 | 1092 | } |
| 1032 | 1093 | |
| 1033 | 1094 | // Good, skip on. |
@@ -1047,8 +1108,9 @@ discard block |
||
| 1047 | 1108 | $incontext['continue'] = 1; |
| 1048 | 1109 | |
| 1049 | 1110 | // Already done? |
| 1050 | - if (isset($_POST['pop_done'])) |
|
| 1051 | - return true; |
|
| 1111 | + if (isset($_POST['pop_done'])) { |
|
| 1112 | + return true; |
|
| 1113 | + } |
|
| 1052 | 1114 | |
| 1053 | 1115 | // Reload settings. |
| 1054 | 1116 | require(dirname(__FILE__) . '/Settings.php'); |
@@ -1066,8 +1128,9 @@ discard block |
||
| 1066 | 1128 | $modSettings = array(); |
| 1067 | 1129 | if ($result !== false) |
| 1068 | 1130 | { |
| 1069 | - while ($row = $smcFunc['db_fetch_assoc']($result)) |
|
| 1070 | - $modSettings[$row['variable']] = $row['value']; |
|
| 1131 | + while ($row = $smcFunc['db_fetch_assoc']($result)) { |
|
| 1132 | + $modSettings[$row['variable']] = $row['value']; |
|
| 1133 | + } |
|
| 1071 | 1134 | $smcFunc['db_free_result']($result); |
| 1072 | 1135 | |
| 1073 | 1136 | // Do they match? If so, this is just a refresh so charge on! |
@@ -1080,20 +1143,22 @@ discard block |
||
| 1080 | 1143 | $modSettings['disableQueryCheck'] = true; |
| 1081 | 1144 | |
| 1082 | 1145 | // If doing UTF8, select it. PostgreSQL requires passing it as a string... |
| 1083 | - if (!empty($db_character_set) && $db_character_set == 'utf8' && !empty($databases[$db_type]['utf8_support'])) |
|
| 1084 | - $smcFunc['db_query']('', ' |
|
| 1146 | + if (!empty($db_character_set) && $db_character_set == 'utf8' && !empty($databases[$db_type]['utf8_support'])) { |
|
| 1147 | + $smcFunc['db_query']('', ' |
|
| 1085 | 1148 | SET NAMES {string:utf8}', |
| 1086 | 1149 | array( |
| 1087 | 1150 | 'db_error_skip' => true, |
| 1088 | 1151 | 'utf8' => 'utf8', |
| 1089 | 1152 | ) |
| 1090 | 1153 | ); |
| 1154 | + } |
|
| 1091 | 1155 | |
| 1092 | 1156 | // Windows likes to leave the trailing slash, which yields to C:\path\to\SMF\/attachments... |
| 1093 | - if (substr(__DIR__, -1) == '\\') |
|
| 1094 | - $attachdir = __DIR__ . 'attachments'; |
|
| 1095 | - else |
|
| 1096 | - $attachdir = __DIR__ . '/attachments'; |
|
| 1157 | + if (substr(__DIR__, -1) == '\\') { |
|
| 1158 | + $attachdir = __DIR__ . 'attachments'; |
|
| 1159 | + } else { |
|
| 1160 | + $attachdir = __DIR__ . '/attachments'; |
|
| 1161 | + } |
|
| 1097 | 1162 | |
| 1098 | 1163 | $replaces = array( |
| 1099 | 1164 | '{$db_prefix}' => $db_prefix, |
@@ -1110,8 +1175,9 @@ discard block |
||
| 1110 | 1175 | |
| 1111 | 1176 | foreach ($txt as $key => $value) |
| 1112 | 1177 | { |
| 1113 | - if (substr($key, 0, 8) == 'default_') |
|
| 1114 | - $replaces['{$' . $key . '}'] = $smcFunc['db_escape_string']($value); |
|
| 1178 | + if (substr($key, 0, 8) == 'default_') { |
|
| 1179 | + $replaces['{$' . $key . '}'] = $smcFunc['db_escape_string']($value); |
|
| 1180 | + } |
|
| 1115 | 1181 | } |
| 1116 | 1182 | $replaces['{$default_reserved_names}'] = strtr($replaces['{$default_reserved_names}'], array('\\\\n' => '\\n')); |
| 1117 | 1183 | |
@@ -1126,8 +1192,9 @@ discard block |
||
| 1126 | 1192 | |
| 1127 | 1193 | while ($row = $smcFunc['db_fetch_assoc']($get_engines)) |
| 1128 | 1194 | { |
| 1129 | - if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') |
|
| 1130 | - $engines[] = $row['Engine']; |
|
| 1195 | + if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') { |
|
| 1196 | + $engines[] = $row['Engine']; |
|
| 1197 | + } |
|
| 1131 | 1198 | } |
| 1132 | 1199 | |
| 1133 | 1200 | // Done with this now |
@@ -1151,8 +1218,7 @@ discard block |
||
| 1151 | 1218 | $replaces['START TRANSACTION;'] = ''; |
| 1152 | 1219 | $replaces['COMMIT;'] = ''; |
| 1153 | 1220 | } |
| 1154 | - } |
|
| 1155 | - else |
|
| 1221 | + } else |
|
| 1156 | 1222 | { |
| 1157 | 1223 | $has_innodb = false; |
| 1158 | 1224 | } |
@@ -1174,21 +1240,24 @@ discard block |
||
| 1174 | 1240 | foreach ($sql_lines as $count => $line) |
| 1175 | 1241 | { |
| 1176 | 1242 | // No comments allowed! |
| 1177 | - if (substr(trim($line), 0, 1) != '#') |
|
| 1178 | - $current_statement .= "\n" . rtrim($line); |
|
| 1243 | + if (substr(trim($line), 0, 1) != '#') { |
|
| 1244 | + $current_statement .= "\n" . rtrim($line); |
|
| 1245 | + } |
|
| 1179 | 1246 | |
| 1180 | 1247 | // Is this the end of the query string? |
| 1181 | - if (empty($current_statement) || (preg_match('~;[\s]*$~s', $line) == 0 && $count != count($sql_lines))) |
|
| 1182 | - continue; |
|
| 1248 | + if (empty($current_statement) || (preg_match('~;[\s]*$~s', $line) == 0 && $count != count($sql_lines))) { |
|
| 1249 | + continue; |
|
| 1250 | + } |
|
| 1183 | 1251 | |
| 1184 | 1252 | // Does this table already exist? If so, don't insert more data into it! |
| 1185 | 1253 | if (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) != 0 && in_array($match[1], $exists)) |
| 1186 | 1254 | { |
| 1187 | 1255 | preg_match_all('~\)[,;]~', $current_statement, $matches); |
| 1188 | - if (!empty($matches[0])) |
|
| 1189 | - $incontext['sql_results']['insert_dups'] += count($matches[0]); |
|
| 1190 | - else |
|
| 1191 | - $incontext['sql_results']['insert_dups']++; |
|
| 1256 | + if (!empty($matches[0])) { |
|
| 1257 | + $incontext['sql_results']['insert_dups'] += count($matches[0]); |
|
| 1258 | + } else { |
|
| 1259 | + $incontext['sql_results']['insert_dups']++; |
|
| 1260 | + } |
|
| 1192 | 1261 | |
| 1193 | 1262 | $current_statement = ''; |
| 1194 | 1263 | continue; |
@@ -1197,8 +1266,9 @@ discard block |
||
| 1197 | 1266 | if ($smcFunc['db_query']('', $current_statement, array('security_override' => true, 'db_error_skip' => true), $db_connection) === false) |
| 1198 | 1267 | { |
| 1199 | 1268 | // Use the appropriate function based on the DB type |
| 1200 | - if ($db_type == 'mysql' || $db_type == 'mysqli') |
|
| 1201 | - $db_errorno = $db_type . '_errno'; |
|
| 1269 | + if ($db_type == 'mysql' || $db_type == 'mysqli') { |
|
| 1270 | + $db_errorno = $db_type . '_errno'; |
|
| 1271 | + } |
|
| 1202 | 1272 | |
| 1203 | 1273 | // Error 1050: Table already exists! |
| 1204 | 1274 | // @todo Needs to be made better! |
@@ -1213,18 +1283,18 @@ discard block |
||
| 1213 | 1283 | // MySQLi requires a connection object. It's optional with MySQL and Postgres |
| 1214 | 1284 | $incontext['failures'][$count] = $smcFunc['db_error']($db_connection); |
| 1215 | 1285 | } |
| 1216 | - } |
|
| 1217 | - else |
|
| 1286 | + } else |
|
| 1218 | 1287 | { |
| 1219 | - if (preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1) |
|
| 1220 | - $incontext['sql_results']['tables']++; |
|
| 1221 | - elseif (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) == 1) |
|
| 1288 | + if (preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1) { |
|
| 1289 | + $incontext['sql_results']['tables']++; |
|
| 1290 | + } elseif (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) == 1) |
|
| 1222 | 1291 | { |
| 1223 | 1292 | preg_match_all('~\)[,;]~', $current_statement, $matches); |
| 1224 | - if (!empty($matches[0])) |
|
| 1225 | - $incontext['sql_results']['inserts'] += count($matches[0]); |
|
| 1226 | - else |
|
| 1227 | - $incontext['sql_results']['inserts']++; |
|
| 1293 | + if (!empty($matches[0])) { |
|
| 1294 | + $incontext['sql_results']['inserts'] += count($matches[0]); |
|
| 1295 | + } else { |
|
| 1296 | + $incontext['sql_results']['inserts']++; |
|
| 1297 | + } |
|
| 1228 | 1298 | } |
| 1229 | 1299 | } |
| 1230 | 1300 | |
@@ -1237,15 +1307,17 @@ discard block |
||
| 1237 | 1307 | // Sort out the context for the SQL. |
| 1238 | 1308 | foreach ($incontext['sql_results'] as $key => $number) |
| 1239 | 1309 | { |
| 1240 | - if ($number == 0) |
|
| 1241 | - unset($incontext['sql_results'][$key]); |
|
| 1242 | - else |
|
| 1243 | - $incontext['sql_results'][$key] = sprintf($txt['db_populate_' . $key], $number); |
|
| 1310 | + if ($number == 0) { |
|
| 1311 | + unset($incontext['sql_results'][$key]); |
|
| 1312 | + } else { |
|
| 1313 | + $incontext['sql_results'][$key] = sprintf($txt['db_populate_' . $key], $number); |
|
| 1314 | + } |
|
| 1244 | 1315 | } |
| 1245 | 1316 | |
| 1246 | 1317 | // Make sure UTF will be used globally. |
| 1247 | - if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8']))) |
|
| 1248 | - $newSettings[] = array('global_character_set', 'UTF-8'); |
|
| 1318 | + if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8']))) { |
|
| 1319 | + $newSettings[] = array('global_character_set', 'UTF-8'); |
|
| 1320 | + } |
|
| 1249 | 1321 | |
| 1250 | 1322 | // Auto-detect local & global cookie settings |
| 1251 | 1323 | $url_parts = parse_url($boardurl); |
@@ -1274,15 +1346,19 @@ discard block |
||
| 1274 | 1346 | |
| 1275 | 1347 | // Look for subfolder, if found, set localCookie |
| 1276 | 1348 | // Checking for len > 1 ensures you don't have just a slash... |
| 1277 | - if (!empty($url_parts['path']) && strlen($url_parts['path']) > 1) |
|
| 1278 | - $localCookies = '1'; |
|
| 1349 | + if (!empty($url_parts['path']) && strlen($url_parts['path']) > 1) { |
|
| 1350 | + $localCookies = '1'; |
|
| 1351 | + } |
|
| 1279 | 1352 | |
| 1280 | - if (isset($globalCookies)) |
|
| 1281 | - $newSettings[] = array('globalCookies', $globalCookies); |
|
| 1282 | - if (isset($globalCookiesDomain)) |
|
| 1283 | - $newSettings[] = array('globalCookiesDomain', $globalCookiesDomain); |
|
| 1284 | - if (isset($localCookies)) |
|
| 1285 | - $newSettings[] = array('localCookies', $localCookies); |
|
| 1353 | + if (isset($globalCookies)) { |
|
| 1354 | + $newSettings[] = array('globalCookies', $globalCookies); |
|
| 1355 | + } |
|
| 1356 | + if (isset($globalCookiesDomain)) { |
|
| 1357 | + $newSettings[] = array('globalCookiesDomain', $globalCookiesDomain); |
|
| 1358 | + } |
|
| 1359 | + if (isset($localCookies)) { |
|
| 1360 | + $newSettings[] = array('localCookies', $localCookies); |
|
| 1361 | + } |
|
| 1286 | 1362 | } |
| 1287 | 1363 | |
| 1288 | 1364 | // Are we allowing stat collection? |
@@ -1300,16 +1376,17 @@ discard block |
||
| 1300 | 1376 | fwrite($fp, $out); |
| 1301 | 1377 | |
| 1302 | 1378 | $return_data = ''; |
| 1303 | - while (!feof($fp)) |
|
| 1304 | - $return_data .= fgets($fp, 128); |
|
| 1379 | + while (!feof($fp)) { |
|
| 1380 | + $return_data .= fgets($fp, 128); |
|
| 1381 | + } |
|
| 1305 | 1382 | |
| 1306 | 1383 | fclose($fp); |
| 1307 | 1384 | |
| 1308 | 1385 | // Get the unique site ID. |
| 1309 | 1386 | preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID); |
| 1310 | 1387 | |
| 1311 | - if (!empty($ID[1])) |
|
| 1312 | - $smcFunc['db_insert']('replace', |
|
| 1388 | + if (!empty($ID[1])) { |
|
| 1389 | + $smcFunc['db_insert']('replace', |
|
| 1313 | 1390 | $db_prefix . 'settings', |
| 1314 | 1391 | array('variable' => 'string', 'value' => 'string'), |
| 1315 | 1392 | array( |
@@ -1318,11 +1395,12 @@ discard block |
||
| 1318 | 1395 | ), |
| 1319 | 1396 | array('variable') |
| 1320 | 1397 | ); |
| 1398 | + } |
|
| 1321 | 1399 | } |
| 1322 | 1400 | } |
| 1323 | 1401 | // Don't remove stat collection unless we unchecked the box for real, not from the loop. |
| 1324 | - elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats'])) |
|
| 1325 | - $smcFunc['db_query']('', ' |
|
| 1402 | + elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats'])) { |
|
| 1403 | + $smcFunc['db_query']('', ' |
|
| 1326 | 1404 | DELETE FROM {db_prefix}settings |
| 1327 | 1405 | WHERE variable = {string:enable_sm_stats}', |
| 1328 | 1406 | array( |
@@ -1330,20 +1408,23 @@ discard block |
||
| 1330 | 1408 | 'db_error_skip' => true, |
| 1331 | 1409 | ) |
| 1332 | 1410 | ); |
| 1411 | + } |
|
| 1333 | 1412 | |
| 1334 | 1413 | // Are we enabling SSL? |
| 1335 | - if (!empty($_POST['force_ssl'])) |
|
| 1336 | - $newSettings[] = array('force_ssl', 1); |
|
| 1414 | + if (!empty($_POST['force_ssl'])) { |
|
| 1415 | + $newSettings[] = array('force_ssl', 1); |
|
| 1416 | + } |
|
| 1337 | 1417 | |
| 1338 | 1418 | // Setting a timezone is required. |
| 1339 | 1419 | if (!isset($modSettings['default_timezone']) && function_exists('date_default_timezone_set')) |
| 1340 | 1420 | { |
| 1341 | 1421 | // Get PHP's default timezone, if set |
| 1342 | 1422 | $ini_tz = ini_get('date.timezone'); |
| 1343 | - if (!empty($ini_tz)) |
|
| 1344 | - $timezone_id = $ini_tz; |
|
| 1345 | - else |
|
| 1346 | - $timezone_id = ''; |
|
| 1423 | + if (!empty($ini_tz)) { |
|
| 1424 | + $timezone_id = $ini_tz; |
|
| 1425 | + } else { |
|
| 1426 | + $timezone_id = ''; |
|
| 1427 | + } |
|
| 1347 | 1428 | |
| 1348 | 1429 | // If date.timezone is unset, invalid, or just plain weird, make a best guess |
| 1349 | 1430 | if (!in_array($timezone_id, timezone_identifiers_list())) |
@@ -1352,8 +1433,9 @@ discard block |
||
| 1352 | 1433 | $timezone_id = timezone_name_from_abbr('', $server_offset, 0); |
| 1353 | 1434 | } |
| 1354 | 1435 | |
| 1355 | - if (date_default_timezone_set($timezone_id)) |
|
| 1356 | - $newSettings[] = array('default_timezone', $timezone_id); |
|
| 1436 | + if (date_default_timezone_set($timezone_id)) { |
|
| 1437 | + $newSettings[] = array('default_timezone', $timezone_id); |
|
| 1438 | + } |
|
| 1357 | 1439 | } |
| 1358 | 1440 | |
| 1359 | 1441 | if (!empty($newSettings)) |
@@ -1384,16 +1466,18 @@ discard block |
||
| 1384 | 1466 | } |
| 1385 | 1467 | |
| 1386 | 1468 | // MySQL specific stuff |
| 1387 | - if (substr($db_type, 0, 5) != 'mysql') |
|
| 1388 | - return false; |
|
| 1469 | + if (substr($db_type, 0, 5) != 'mysql') { |
|
| 1470 | + return false; |
|
| 1471 | + } |
|
| 1389 | 1472 | |
| 1390 | 1473 | // Find database user privileges. |
| 1391 | 1474 | $privs = array(); |
| 1392 | 1475 | $get_privs = $smcFunc['db_query']('', 'SHOW PRIVILEGES', array()); |
| 1393 | 1476 | while ($row = $smcFunc['db_fetch_assoc']($get_privs)) |
| 1394 | 1477 | { |
| 1395 | - if ($row['Privilege'] == 'Alter') |
|
| 1396 | - $privs[] = $row['Privilege']; |
|
| 1478 | + if ($row['Privilege'] == 'Alter') { |
|
| 1479 | + $privs[] = $row['Privilege']; |
|
| 1480 | + } |
|
| 1397 | 1481 | } |
| 1398 | 1482 | $smcFunc['db_free_result']($get_privs); |
| 1399 | 1483 | |
@@ -1423,8 +1507,9 @@ discard block |
||
| 1423 | 1507 | $incontext['continue'] = 1; |
| 1424 | 1508 | |
| 1425 | 1509 | // Skipping? |
| 1426 | - if (!empty($_POST['skip'])) |
|
| 1427 | - return true; |
|
| 1510 | + if (!empty($_POST['skip'])) { |
|
| 1511 | + return true; |
|
| 1512 | + } |
|
| 1428 | 1513 | |
| 1429 | 1514 | // Need this to check whether we need the database password. |
| 1430 | 1515 | require(dirname(__FILE__) . '/Settings.php'); |
@@ -1441,18 +1526,22 @@ discard block |
||
| 1441 | 1526 | // We need this to properly hash the password for Admin |
| 1442 | 1527 | $smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string) { |
| 1443 | 1528 | global $sourcedir; |
| 1444 | - if (function_exists('mb_strtolower')) |
|
| 1445 | - return mb_strtolower($string, 'UTF-8'); |
|
| 1529 | + if (function_exists('mb_strtolower')) { |
|
| 1530 | + return mb_strtolower($string, 'UTF-8'); |
|
| 1531 | + } |
|
| 1446 | 1532 | require_once($sourcedir . '/Subs-Charset.php'); |
| 1447 | 1533 | return utf8_strtolower($string); |
| 1448 | 1534 | }; |
| 1449 | 1535 | |
| 1450 | - if (!isset($_POST['username'])) |
|
| 1451 | - $_POST['username'] = ''; |
|
| 1452 | - if (!isset($_POST['email'])) |
|
| 1453 | - $_POST['email'] = ''; |
|
| 1454 | - if (!isset($_POST['server_email'])) |
|
| 1455 | - $_POST['server_email'] = ''; |
|
| 1536 | + if (!isset($_POST['username'])) { |
|
| 1537 | + $_POST['username'] = ''; |
|
| 1538 | + } |
|
| 1539 | + if (!isset($_POST['email'])) { |
|
| 1540 | + $_POST['email'] = ''; |
|
| 1541 | + } |
|
| 1542 | + if (!isset($_POST['server_email'])) { |
|
| 1543 | + $_POST['server_email'] = ''; |
|
| 1544 | + } |
|
| 1456 | 1545 | |
| 1457 | 1546 | $incontext['username'] = htmlspecialchars(stripslashes($_POST['username'])); |
| 1458 | 1547 | $incontext['email'] = htmlspecialchars(stripslashes($_POST['email'])); |
@@ -1471,8 +1560,9 @@ discard block |
||
| 1471 | 1560 | 'admin_group' => 1, |
| 1472 | 1561 | ) |
| 1473 | 1562 | ); |
| 1474 | - if ($smcFunc['db_num_rows']($request) != 0) |
|
| 1475 | - $incontext['skip'] = 1; |
|
| 1563 | + if ($smcFunc['db_num_rows']($request) != 0) { |
|
| 1564 | + $incontext['skip'] = 1; |
|
| 1565 | + } |
|
| 1476 | 1566 | $smcFunc['db_free_result']($request); |
| 1477 | 1567 | |
| 1478 | 1568 | // Trying to create an account? |
@@ -1503,8 +1593,9 @@ discard block |
||
| 1503 | 1593 | } |
| 1504 | 1594 | |
| 1505 | 1595 | // Update the webmaster's email? |
| 1506 | - if (!empty($_POST['server_email']) && (empty($webmaster_email) || $webmaster_email == '[email protected]')) |
|
| 1507 | - updateSettingsFile(array('webmaster_email' => $_POST['server_email'])); |
|
| 1596 | + if (!empty($_POST['server_email']) && (empty($webmaster_email) || $webmaster_email == '[email protected]')) { |
|
| 1597 | + updateSettingsFile(array('webmaster_email' => $_POST['server_email'])); |
|
| 1598 | + } |
|
| 1508 | 1599 | |
| 1509 | 1600 | // Work out whether we're going to have dodgy characters and remove them. |
| 1510 | 1601 | $invalid_characters = preg_match('~[<>&"\'=\\\]~', $_POST['username']) != 0; |
@@ -1527,32 +1618,27 @@ discard block |
||
| 1527 | 1618 | $smcFunc['db_free_result']($result); |
| 1528 | 1619 | |
| 1529 | 1620 | $incontext['account_existed'] = $txt['error_user_settings_taken']; |
| 1530 | - } |
|
| 1531 | - elseif ($_POST['username'] == '' || strlen($_POST['username']) > 25) |
|
| 1621 | + } elseif ($_POST['username'] == '' || strlen($_POST['username']) > 25) |
|
| 1532 | 1622 | { |
| 1533 | 1623 | // Try the previous step again. |
| 1534 | 1624 | $incontext['error'] = $_POST['username'] == '' ? $txt['error_username_left_empty'] : $txt['error_username_too_long']; |
| 1535 | 1625 | return false; |
| 1536 | - } |
|
| 1537 | - elseif ($invalid_characters || $_POST['username'] == '_' || $_POST['username'] == '|' || strpos($_POST['username'], '[code') !== false || strpos($_POST['username'], '[/code') !== false) |
|
| 1626 | + } elseif ($invalid_characters || $_POST['username'] == '_' || $_POST['username'] == '|' || strpos($_POST['username'], '[code') !== false || strpos($_POST['username'], '[/code') !== false) |
|
| 1538 | 1627 | { |
| 1539 | 1628 | // Try the previous step again. |
| 1540 | 1629 | $incontext['error'] = $txt['error_invalid_characters_username']; |
| 1541 | 1630 | return false; |
| 1542 | - } |
|
| 1543 | - elseif (empty($_POST['email']) || !filter_var(stripslashes($_POST['email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['email'])) > 255) |
|
| 1631 | + } elseif (empty($_POST['email']) || !filter_var(stripslashes($_POST['email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['email'])) > 255) |
|
| 1544 | 1632 | { |
| 1545 | 1633 | // One step back, this time fill out a proper admin email address. |
| 1546 | 1634 | $incontext['error'] = sprintf($txt['error_valid_admin_email_needed'], $_POST['username']); |
| 1547 | 1635 | return false; |
| 1548 | - } |
|
| 1549 | - elseif (empty($_POST['server_email']) || !filter_var(stripslashes($_POST['server_email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['server_email'])) > 255) |
|
| 1636 | + } elseif (empty($_POST['server_email']) || !filter_var(stripslashes($_POST['server_email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['server_email'])) > 255) |
|
| 1550 | 1637 | { |
| 1551 | 1638 | // One step back, this time fill out a proper admin email address. |
| 1552 | 1639 | $incontext['error'] = $txt['error_valid_server_email_needed']; |
| 1553 | 1640 | return false; |
| 1554 | - } |
|
| 1555 | - elseif ($_POST['username'] != '') |
|
| 1641 | + } elseif ($_POST['username'] != '') |
|
| 1556 | 1642 | { |
| 1557 | 1643 | $incontext['member_salt'] = substr(md5(mt_rand()), 0, 4); |
| 1558 | 1644 | |
@@ -1620,17 +1706,19 @@ discard block |
||
| 1620 | 1706 | reloadSettings(); |
| 1621 | 1707 | |
| 1622 | 1708 | // Bring a warning over. |
| 1623 | - if (!empty($incontext['account_existed'])) |
|
| 1624 | - $incontext['warning'] = $incontext['account_existed']; |
|
| 1709 | + if (!empty($incontext['account_existed'])) { |
|
| 1710 | + $incontext['warning'] = $incontext['account_existed']; |
|
| 1711 | + } |
|
| 1625 | 1712 | |
| 1626 | - if (!empty($db_character_set) && !empty($databases[$db_type]['utf8_support'])) |
|
| 1627 | - $smcFunc['db_query']('', ' |
|
| 1713 | + if (!empty($db_character_set) && !empty($databases[$db_type]['utf8_support'])) { |
|
| 1714 | + $smcFunc['db_query']('', ' |
|
| 1628 | 1715 | SET NAMES {string:db_character_set}', |
| 1629 | 1716 | array( |
| 1630 | 1717 | 'db_character_set' => $db_character_set, |
| 1631 | 1718 | 'db_error_skip' => true, |
| 1632 | 1719 | ) |
| 1633 | 1720 | ); |
| 1721 | + } |
|
| 1634 | 1722 | |
| 1635 | 1723 | // As track stats is by default enabled let's add some activity. |
| 1636 | 1724 | $smcFunc['db_insert']('ignore', |
@@ -1651,14 +1739,16 @@ discard block |
||
| 1651 | 1739 | // Only proceed if we can load the data. |
| 1652 | 1740 | if ($request) |
| 1653 | 1741 | { |
| 1654 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
| 1655 | - $modSettings[$row[0]] = $row[1]; |
|
| 1742 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
| 1743 | + $modSettings[$row[0]] = $row[1]; |
|
| 1744 | + } |
|
| 1656 | 1745 | $smcFunc['db_free_result']($request); |
| 1657 | 1746 | } |
| 1658 | 1747 | |
| 1659 | 1748 | // Automatically log them in ;) |
| 1660 | - if (isset($incontext['member_id']) && isset($incontext['member_salt'])) |
|
| 1661 | - setLoginCookie(3153600 * 60, $incontext['member_id'], hash_salt($_POST['password1'], $incontext['member_salt'])); |
|
| 1749 | + if (isset($incontext['member_id']) && isset($incontext['member_salt'])) { |
|
| 1750 | + setLoginCookie(3153600 * 60, $incontext['member_id'], hash_salt($_POST['password1'], $incontext['member_salt'])); |
|
| 1751 | + } |
|
| 1662 | 1752 | |
| 1663 | 1753 | $result = $smcFunc['db_query']('', ' |
| 1664 | 1754 | SELECT value |
@@ -1669,13 +1759,14 @@ discard block |
||
| 1669 | 1759 | 'db_error_skip' => true, |
| 1670 | 1760 | ) |
| 1671 | 1761 | ); |
| 1672 | - if ($smcFunc['db_num_rows']($result) != 0) |
|
| 1673 | - list ($db_sessions) = $smcFunc['db_fetch_row']($result); |
|
| 1762 | + if ($smcFunc['db_num_rows']($result) != 0) { |
|
| 1763 | + list ($db_sessions) = $smcFunc['db_fetch_row']($result); |
|
| 1764 | + } |
|
| 1674 | 1765 | $smcFunc['db_free_result']($result); |
| 1675 | 1766 | |
| 1676 | - if (empty($db_sessions)) |
|
| 1677 | - $_SESSION['admin_time'] = time(); |
|
| 1678 | - else |
|
| 1767 | + if (empty($db_sessions)) { |
|
| 1768 | + $_SESSION['admin_time'] = time(); |
|
| 1769 | + } else |
|
| 1679 | 1770 | { |
| 1680 | 1771 | $_SERVER['HTTP_USER_AGENT'] = substr($_SERVER['HTTP_USER_AGENT'], 0, 211); |
| 1681 | 1772 | |
@@ -1699,8 +1790,9 @@ discard block |
||
| 1699 | 1790 | $smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : |
| 1700 | 1791 | function($string){ |
| 1701 | 1792 | global $sourcedir; |
| 1702 | - if (function_exists('mb_strtolower')) |
|
| 1703 | - return mb_strtolower($string, 'UTF-8'); |
|
| 1793 | + if (function_exists('mb_strtolower')) { |
|
| 1794 | + return mb_strtolower($string, 'UTF-8'); |
|
| 1795 | + } |
|
| 1704 | 1796 | require_once($sourcedir . '/Subs-Charset.php'); |
| 1705 | 1797 | return utf8_strtolower($string); |
| 1706 | 1798 | }; |
@@ -1716,8 +1808,9 @@ discard block |
||
| 1716 | 1808 | ) |
| 1717 | 1809 | ); |
| 1718 | 1810 | $context['utf8'] = $db_character_set === 'utf8' || $txt['lang_character_set'] === 'UTF-8'; |
| 1719 | - if ($smcFunc['db_num_rows']($request) > 0) |
|
| 1720 | - updateStats('subject', 1, htmlspecialchars($txt['default_topic_subject'])); |
|
| 1811 | + if ($smcFunc['db_num_rows']($request) > 0) { |
|
| 1812 | + updateStats('subject', 1, htmlspecialchars($txt['default_topic_subject'])); |
|
| 1813 | + } |
|
| 1721 | 1814 | $smcFunc['db_free_result']($request); |
| 1722 | 1815 | |
| 1723 | 1816 | // Now is the perfect time to fetch the SM files. |
@@ -1736,8 +1829,9 @@ discard block |
||
| 1736 | 1829 | |
| 1737 | 1830 | // Check if we need some stupid MySQL fix. |
| 1738 | 1831 | $server_version = $smcFunc['db_server_info'](); |
| 1739 | - if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) |
|
| 1740 | - updateSettings(array('db_mysql_group_by_fix' => '1')); |
|
| 1832 | + if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) { |
|
| 1833 | + updateSettings(array('db_mysql_group_by_fix' => '1')); |
|
| 1834 | + } |
|
| 1741 | 1835 | |
| 1742 | 1836 | // Some final context for the template. |
| 1743 | 1837 | $incontext['dir_still_writable'] = is_writable(dirname(__FILE__)) && substr(__FILE__, 1, 2) != ':\\'; |
@@ -1757,8 +1851,9 @@ discard block |
||
| 1757 | 1851 | $settingsArray = file(dirname(__FILE__) . '/Settings.php'); |
| 1758 | 1852 | |
| 1759 | 1853 | // @todo Do we just want to read the file in clean, and split it this way always? |
| 1760 | - if (count($settingsArray) == 1) |
|
| 1761 | - $settingsArray = preg_split('~[\r\n]~', $settingsArray[0]); |
|
| 1854 | + if (count($settingsArray) == 1) { |
|
| 1855 | + $settingsArray = preg_split('~[\r\n]~', $settingsArray[0]); |
|
| 1856 | + } |
|
| 1762 | 1857 | |
| 1763 | 1858 | for ($i = 0, $n = count($settingsArray); $i < $n; $i++) |
| 1764 | 1859 | { |
@@ -1766,25 +1861,29 @@ discard block |
||
| 1766 | 1861 | if (trim($settingsArray[$i]) == 'if (file_exists(dirname(__FILE__) . \'/install.php\'))' && trim($settingsArray[$i + 1]) == '{' && trim($settingsArray[$i + 9]) == '}') |
| 1767 | 1862 | { |
| 1768 | 1863 | // Set the ten lines to nothing. |
| 1769 | - for ($j=0; $j < 10; $j++) |
|
| 1770 | - $settingsArray[$i++] = ''; |
|
| 1864 | + for ($j=0; $j < 10; $j++) { |
|
| 1865 | + $settingsArray[$i++] = ''; |
|
| 1866 | + } |
|
| 1771 | 1867 | |
| 1772 | 1868 | continue; |
| 1773 | 1869 | } |
| 1774 | 1870 | |
| 1775 | - if (trim($settingsArray[$i]) == '?' . '>') |
|
| 1776 | - $settingsArray[$i] = ''; |
|
| 1871 | + if (trim($settingsArray[$i]) == '?' . '>') { |
|
| 1872 | + $settingsArray[$i] = ''; |
|
| 1873 | + } |
|
| 1777 | 1874 | |
| 1778 | 1875 | // Don't trim or bother with it if it's not a variable. |
| 1779 | - if (substr($settingsArray[$i], 0, 1) != '$') |
|
| 1780 | - continue; |
|
| 1876 | + if (substr($settingsArray[$i], 0, 1) != '$') { |
|
| 1877 | + continue; |
|
| 1878 | + } |
|
| 1781 | 1879 | |
| 1782 | 1880 | $settingsArray[$i] = rtrim($settingsArray[$i]) . "\n"; |
| 1783 | 1881 | |
| 1784 | - foreach ($vars as $var => $val) |
|
| 1785 | - if (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0) |
|
| 1882 | + foreach ($vars as $var => $val) { |
|
| 1883 | + if (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0) |
|
| 1786 | 1884 | { |
| 1787 | 1885 | $comment = strstr($settingsArray[$i], '#'); |
| 1886 | + } |
|
| 1788 | 1887 | $settingsArray[$i] = '$' . $var . ' = \'' . $val . '\';' . ($comment != '' ? "\t\t" . $comment : "\n"); |
| 1789 | 1888 | unset($vars[$var]); |
| 1790 | 1889 | } |
@@ -1794,36 +1893,41 @@ discard block |
||
| 1794 | 1893 | if (!empty($vars)) |
| 1795 | 1894 | { |
| 1796 | 1895 | $settingsArray[$i++] = ''; |
| 1797 | - foreach ($vars as $var => $val) |
|
| 1798 | - $settingsArray[$i++] = '$' . $var . ' = \'' . $val . '\';' . "\n"; |
|
| 1896 | + foreach ($vars as $var => $val) { |
|
| 1897 | + $settingsArray[$i++] = '$' . $var . ' = \'' . $val . '\';' . "\n"; |
|
| 1898 | + } |
|
| 1799 | 1899 | } |
| 1800 | 1900 | |
| 1801 | 1901 | // Blank out the file - done to fix a oddity with some servers. |
| 1802 | 1902 | $fp = @fopen(dirname(__FILE__) . '/Settings.php', 'w'); |
| 1803 | - if (!$fp) |
|
| 1804 | - return false; |
|
| 1903 | + if (!$fp) { |
|
| 1904 | + return false; |
|
| 1905 | + } |
|
| 1805 | 1906 | fclose($fp); |
| 1806 | 1907 | |
| 1807 | 1908 | $fp = fopen(dirname(__FILE__) . '/Settings.php', 'r+'); |
| 1808 | 1909 | |
| 1809 | 1910 | // Gotta have one of these ;) |
| 1810 | - if (trim($settingsArray[0]) != '<?php') |
|
| 1811 | - fwrite($fp, "<?php\n"); |
|
| 1911 | + if (trim($settingsArray[0]) != '<?php') { |
|
| 1912 | + fwrite($fp, "<?php\n"); |
|
| 1913 | + } |
|
| 1812 | 1914 | |
| 1813 | 1915 | $lines = count($settingsArray); |
| 1814 | 1916 | for ($i = 0; $i < $lines - 1; $i++) |
| 1815 | 1917 | { |
| 1816 | 1918 | // Don't just write a bunch of blank lines. |
| 1817 | - if ($settingsArray[$i] != '' || @$settingsArray[$i - 1] != '') |
|
| 1818 | - fwrite($fp, strtr($settingsArray[$i], "\r", '')); |
|
| 1919 | + if ($settingsArray[$i] != '' || @$settingsArray[$i - 1] != '') { |
|
| 1920 | + fwrite($fp, strtr($settingsArray[$i], "\r", '')); |
|
| 1921 | + } |
|
| 1819 | 1922 | } |
| 1820 | 1923 | fwrite($fp, $settingsArray[$i] . '?' . '>'); |
| 1821 | 1924 | fclose($fp); |
| 1822 | 1925 | |
| 1823 | 1926 | // Even though on normal installations the filemtime should prevent this being used by the installer incorrectly |
| 1824 | 1927 | // it seems that there are times it might not. So let's MAKE it dump the cache. |
| 1825 | - if (function_exists('opcache_invalidate')) |
|
| 1826 | - opcache_invalidate(dirname(__FILE__) . '/Settings.php', true); |
|
| 1928 | + if (function_exists('opcache_invalidate')) { |
|
| 1929 | + opcache_invalidate(dirname(__FILE__) . '/Settings.php', true); |
|
| 1930 | + } |
|
| 1827 | 1931 | |
| 1828 | 1932 | return true; |
| 1829 | 1933 | } |
@@ -1833,10 +1937,11 @@ discard block |
||
| 1833 | 1937 | global $cachedir; |
| 1834 | 1938 | |
| 1835 | 1939 | // Write out the db_last_error file with the error timestamp |
| 1836 | - if (!empty($cachedir) && is_writable($cachedir)) |
|
| 1837 | - file_put_contents($cachedir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>'); |
|
| 1838 | - else |
|
| 1839 | - file_put_contents(dirname(__FILE__) . '/cache/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>'); |
|
| 1940 | + if (!empty($cachedir) && is_writable($cachedir)) { |
|
| 1941 | + file_put_contents($cachedir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>'); |
|
| 1942 | + } else { |
|
| 1943 | + file_put_contents(dirname(__FILE__) . '/cache/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>'); |
|
| 1944 | + } |
|
| 1840 | 1945 | |
| 1841 | 1946 | return true; |
| 1842 | 1947 | } |
@@ -1853,9 +1958,9 @@ discard block |
||
| 1853 | 1958 | SecFilterScanPOST Off |
| 1854 | 1959 | </IfModule>'; |
| 1855 | 1960 | |
| 1856 | - if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules())) |
|
| 1857 | - return true; |
|
| 1858 | - elseif (file_exists(dirname(__FILE__) . '/.htaccess') && is_writable(dirname(__FILE__) . '/.htaccess')) |
|
| 1961 | + if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules())) { |
|
| 1962 | + return true; |
|
| 1963 | + } elseif (file_exists(dirname(__FILE__) . '/.htaccess') && is_writable(dirname(__FILE__) . '/.htaccess')) |
|
| 1859 | 1964 | { |
| 1860 | 1965 | $current_htaccess = implode('', file(dirname(__FILE__) . '/.htaccess')); |
| 1861 | 1966 | |
@@ -1867,29 +1972,28 @@ discard block |
||
| 1867 | 1972 | fwrite($ht_handle, $htaccess_addition); |
| 1868 | 1973 | fclose($ht_handle); |
| 1869 | 1974 | return true; |
| 1975 | + } else { |
|
| 1976 | + return false; |
|
| 1870 | 1977 | } |
| 1871 | - else |
|
| 1872 | - return false; |
|
| 1978 | + } else { |
|
| 1979 | + return true; |
|
| 1873 | 1980 | } |
| 1874 | - else |
|
| 1875 | - return true; |
|
| 1876 | - } |
|
| 1877 | - elseif (file_exists(dirname(__FILE__) . '/.htaccess')) |
|
| 1878 | - return strpos(implode('', file(dirname(__FILE__) . '/.htaccess')), '<IfModule mod_security.c>') !== false; |
|
| 1879 | - elseif (is_writable(dirname(__FILE__))) |
|
| 1981 | + } elseif (file_exists(dirname(__FILE__) . '/.htaccess')) { |
|
| 1982 | + return strpos(implode('', file(dirname(__FILE__) . '/.htaccess')), '<IfModule mod_security.c>') !== false; |
|
| 1983 | + } elseif (is_writable(dirname(__FILE__))) |
|
| 1880 | 1984 | { |
| 1881 | 1985 | if ($ht_handle = fopen(dirname(__FILE__) . '/.htaccess', 'w')) |
| 1882 | 1986 | { |
| 1883 | 1987 | fwrite($ht_handle, $htaccess_addition); |
| 1884 | 1988 | fclose($ht_handle); |
| 1885 | 1989 | return true; |
| 1990 | + } else { |
|
| 1991 | + return false; |
|
| 1886 | 1992 | } |
| 1887 | - else |
|
| 1993 | + } else { |
|
| 1888 | 1994 | return false; |
| 1889 | 1995 | } |
| 1890 | - else |
|
| 1891 | - return false; |
|
| 1892 | -} |
|
| 1996 | + } |
|
| 1893 | 1997 | |
| 1894 | 1998 | function template_install_above() |
| 1895 | 1999 | { |
@@ -1927,9 +2031,10 @@ discard block |
||
| 1927 | 2031 | <label for="installer_language">', $txt['installer_language'], ':</label> |
| 1928 | 2032 | <select id="installer_language" name="lang_file" onchange="location.href = \'', $installurl, '?lang_file=\' + this.options[this.selectedIndex].value;">'; |
| 1929 | 2033 | |
| 1930 | - foreach ($incontext['detected_languages'] as $lang => $name) |
|
| 1931 | - echo ' |
|
| 2034 | + foreach ($incontext['detected_languages'] as $lang => $name) { |
|
| 2035 | + echo ' |
|
| 1932 | 2036 | <option', isset($_SESSION['installer_temp_lang']) && $_SESSION['installer_temp_lang'] == $lang ? ' selected' : '', ' value="', $lang, '">', $name, '</option>'; |
| 2037 | + } |
|
| 1933 | 2038 | |
| 1934 | 2039 | echo ' |
| 1935 | 2040 | </select> |
@@ -1949,9 +2054,10 @@ discard block |
||
| 1949 | 2054 | <h2>', $txt['upgrade_progress'], '</h2> |
| 1950 | 2055 | <ul>'; |
| 1951 | 2056 | |
| 1952 | - foreach ($incontext['steps'] as $num => $step) |
|
| 1953 | - echo ' |
|
| 2057 | + foreach ($incontext['steps'] as $num => $step) { |
|
| 2058 | + echo ' |
|
| 1954 | 2059 | <li class="', $num < $incontext['current_step'] ? 'stepdone' : ($num == $incontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>'; |
| 2060 | + } |
|
| 1955 | 2061 | |
| 1956 | 2062 | echo ' |
| 1957 | 2063 | </ul> |
@@ -1976,20 +2082,23 @@ discard block |
||
| 1976 | 2082 | echo ' |
| 1977 | 2083 | <div class="floatright">'; |
| 1978 | 2084 | |
| 1979 | - if (!empty($incontext['continue'])) |
|
| 1980 | - echo ' |
|
| 2085 | + if (!empty($incontext['continue'])) { |
|
| 2086 | + echo ' |
|
| 1981 | 2087 | <input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '" onclick="return submitThisOnce(this);" class="button" />'; |
| 1982 | - if (!empty($incontext['skip'])) |
|
| 1983 | - echo ' |
|
| 2088 | + } |
|
| 2089 | + if (!empty($incontext['skip'])) { |
|
| 2090 | + echo ' |
|
| 1984 | 2091 | <input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="return submitThisOnce(this);" class="button" />'; |
| 2092 | + } |
|
| 1985 | 2093 | echo ' |
| 1986 | 2094 | </div>'; |
| 1987 | 2095 | } |
| 1988 | 2096 | |
| 1989 | 2097 | // Show the closing form tag and other data only if not in the last step |
| 1990 | - if (count($incontext['steps']) - 1 !== (int) $incontext['current_step']) |
|
| 1991 | - echo ' |
|
| 2098 | + if (count($incontext['steps']) - 1 !== (int) $incontext['current_step']) { |
|
| 2099 | + echo ' |
|
| 1992 | 2100 | </form>'; |
| 2101 | + } |
|
| 1993 | 2102 | |
| 1994 | 2103 | echo ' |
| 1995 | 2104 | </div> |
@@ -2024,13 +2133,15 @@ discard block |
||
| 2024 | 2133 | </div>'; |
| 2025 | 2134 | |
| 2026 | 2135 | // Show the warnings, or not. |
| 2027 | - if (template_warning_divs()) |
|
| 2028 | - echo ' |
|
| 2136 | + if (template_warning_divs()) { |
|
| 2137 | + echo ' |
|
| 2029 | 2138 | <h3>', $txt['install_all_lovely'], '</h3>'; |
| 2139 | + } |
|
| 2030 | 2140 | |
| 2031 | 2141 | // Say we want the continue button! |
| 2032 | - if (empty($incontext['error'])) |
|
| 2033 | - $incontext['continue'] = 1; |
|
| 2142 | + if (empty($incontext['error'])) { |
|
| 2143 | + $incontext['continue'] = 1; |
|
| 2144 | + } |
|
| 2034 | 2145 | |
| 2035 | 2146 | // For the latest version stuff. |
| 2036 | 2147 | echo ' |
@@ -2064,8 +2175,8 @@ discard block |
||
| 2064 | 2175 | global $txt, $incontext; |
| 2065 | 2176 | |
| 2066 | 2177 | // Errors are very serious.. |
| 2067 | - if (!empty($incontext['error'])) |
|
| 2068 | - echo ' |
|
| 2178 | + if (!empty($incontext['error'])) { |
|
| 2179 | + echo ' |
|
| 2069 | 2180 | <div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;"> |
| 2070 | 2181 | <div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div> |
| 2071 | 2182 | <strong style="text-decoration: underline;">', $txt['upgrade_critical_error'], '</strong><br> |
@@ -2073,9 +2184,10 @@ discard block |
||
| 2073 | 2184 | ', $incontext['error'], ' |
| 2074 | 2185 | </div> |
| 2075 | 2186 | </div>'; |
| 2187 | + } |
|
| 2076 | 2188 | // A warning message? |
| 2077 | - elseif (!empty($incontext['warning'])) |
|
| 2078 | - echo ' |
|
| 2189 | + elseif (!empty($incontext['warning'])) { |
|
| 2190 | + echo ' |
|
| 2079 | 2191 | <div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;"> |
| 2080 | 2192 | <div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div> |
| 2081 | 2193 | <strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br> |
@@ -2083,6 +2195,7 @@ discard block |
||
| 2083 | 2195 | ', $incontext['warning'], ' |
| 2084 | 2196 | </div> |
| 2085 | 2197 | </div>'; |
| 2198 | + } |
|
| 2086 | 2199 | |
| 2087 | 2200 | return empty($incontext['error']) && empty($incontext['warning']); |
| 2088 | 2201 | } |
@@ -2098,27 +2211,30 @@ discard block |
||
| 2098 | 2211 | <li>', $incontext['failed_files']), '</li> |
| 2099 | 2212 | </ul>'; |
| 2100 | 2213 | |
| 2101 | - if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux') |
|
| 2102 | - echo ' |
|
| 2214 | + if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux') { |
|
| 2215 | + echo ' |
|
| 2103 | 2216 | <hr> |
| 2104 | 2217 | <p>', $txt['chmod_linux_info'], '</p> |
| 2105 | 2218 | <tt># chmod a+w ', implode(' ' . $incontext['detected_path'] . '/', $incontext['failed_files']), '</tt>'; |
| 2219 | + } |
|
| 2106 | 2220 | |
| 2107 | 2221 | // This is serious! |
| 2108 | - if (!template_warning_divs()) |
|
| 2109 | - return; |
|
| 2222 | + if (!template_warning_divs()) { |
|
| 2223 | + return; |
|
| 2224 | + } |
|
| 2110 | 2225 | |
| 2111 | 2226 | echo ' |
| 2112 | 2227 | <hr> |
| 2113 | 2228 | <p>', $txt['ftp_setup_info'], '</p>'; |
| 2114 | 2229 | |
| 2115 | - if (!empty($incontext['ftp_errors'])) |
|
| 2116 | - echo ' |
|
| 2230 | + if (!empty($incontext['ftp_errors'])) { |
|
| 2231 | + echo ' |
|
| 2117 | 2232 | <div class="error_message"> |
| 2118 | 2233 | ', $txt['error_ftp_no_connect'], '<br><br> |
| 2119 | 2234 | <code>', implode('<br>', $incontext['ftp_errors']), '</code> |
| 2120 | 2235 | </div> |
| 2121 | 2236 | <br>'; |
| 2237 | + } |
|
| 2122 | 2238 | |
| 2123 | 2239 | echo ' |
| 2124 | 2240 | <form action="', $incontext['form_url'], '" method="post"> |
@@ -2178,17 +2294,17 @@ discard block |
||
| 2178 | 2294 | <td> |
| 2179 | 2295 | <select name="db_type" id="db_type_input" onchange="toggleDBInput();">'; |
| 2180 | 2296 | |
| 2181 | - foreach ($incontext['supported_databases'] as $key => $db) |
|
| 2182 | - echo ' |
|
| 2297 | + foreach ($incontext['supported_databases'] as $key => $db) { |
|
| 2298 | + echo ' |
|
| 2183 | 2299 | <option value="', $key, '"', isset($_POST['db_type']) && $_POST['db_type'] == $key ? ' selected' : '', '>', $db['name'], '</option>'; |
| 2300 | + } |
|
| 2184 | 2301 | |
| 2185 | 2302 | echo ' |
| 2186 | 2303 | </select> |
| 2187 | 2304 | <div class="smalltext block">', $txt['db_settings_type_info'], '</div> |
| 2188 | 2305 | </td> |
| 2189 | 2306 | </tr>'; |
| 2190 | - } |
|
| 2191 | - else |
|
| 2307 | + } else |
|
| 2192 | 2308 | { |
| 2193 | 2309 | echo ' |
| 2194 | 2310 | <tr style="display: none;"> |
@@ -2381,9 +2497,10 @@ discard block |
||
| 2381 | 2497 | <div style="color: red;">', $txt['error_db_queries'], '</div> |
| 2382 | 2498 | <ul>'; |
| 2383 | 2499 | |
| 2384 | - foreach ($incontext['failures'] as $line => $fail) |
|
| 2385 | - echo ' |
|
| 2500 | + foreach ($incontext['failures'] as $line => $fail) { |
|
| 2501 | + echo ' |
|
| 2386 | 2502 | <li><strong>', $txt['error_db_queries_line'], $line + 1, ':</strong> ', nl2br(htmlspecialchars($fail)), '</li>'; |
| 2503 | + } |
|
| 2387 | 2504 | |
| 2388 | 2505 | echo ' |
| 2389 | 2506 | </ul>'; |
@@ -2444,15 +2561,16 @@ discard block |
||
| 2444 | 2561 | </tr> |
| 2445 | 2562 | </table>'; |
| 2446 | 2563 | |
| 2447 | - if ($incontext['require_db_confirm']) |
|
| 2448 | - echo ' |
|
| 2564 | + if ($incontext['require_db_confirm']) { |
|
| 2565 | + echo ' |
|
| 2449 | 2566 | <h2>', $txt['user_settings_database'], '</h2> |
| 2450 | 2567 | <p>', $txt['user_settings_database_info'], '</p> |
| 2451 | 2568 | |
| 2452 | 2569 | <div style="margin-bottom: 2ex; padding-', $txt['lang_rtl'] == false ? 'left' : 'right', ': 50px;"> |
| 2453 | 2570 | <input type="password" name="password3" size="30" /> |
| 2454 | 2571 | </div>'; |
| 2455 | -} |
|
| 2572 | + } |
|
| 2573 | + } |
|
| 2456 | 2574 | |
| 2457 | 2575 | // Tell them it's done, and to delete. |
| 2458 | 2576 | function template_delete_install() |
@@ -2465,14 +2583,15 @@ discard block |
||
| 2465 | 2583 | template_warning_divs(); |
| 2466 | 2584 | |
| 2467 | 2585 | // Install directory still writable? |
| 2468 | - if ($incontext['dir_still_writable']) |
|
| 2469 | - echo ' |
|
| 2586 | + if ($incontext['dir_still_writable']) { |
|
| 2587 | + echo ' |
|
| 2470 | 2588 | <em>', $txt['still_writable'], '</em><br> |
| 2471 | 2589 | <br>'; |
| 2590 | + } |
|
| 2472 | 2591 | |
| 2473 | 2592 | // Don't show the box if it's like 99% sure it won't work :P. |
| 2474 | - if ($incontext['probably_delete_install']) |
|
| 2475 | - echo ' |
|
| 2593 | + if ($incontext['probably_delete_install']) { |
|
| 2594 | + echo ' |
|
| 2476 | 2595 | <div style="margin: 1ex; font-weight: bold;"> |
| 2477 | 2596 | <label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete();" /> ', $txt['delete_installer'], !isset($_SESSION['installer_temp_ftp']) ? ' ' . $txt['delete_installer_maybe'] : '', '</label> |
| 2478 | 2597 | </div> |
@@ -2488,6 +2607,7 @@ discard block |
||
| 2488 | 2607 | } |
| 2489 | 2608 | </script> |
| 2490 | 2609 | <br>'; |
| 2610 | + } |
|
| 2491 | 2611 | |
| 2492 | 2612 | echo ' |
| 2493 | 2613 | ', sprintf($txt['go_to_your_forum'], $boardurl . '/index.php'), '<br> |
@@ -185,17 +185,21 @@ discard block |
||
| 185 | 185 | $tasksdir = $sourcedir . '/tasks'; |
| 186 | 186 | |
| 187 | 187 | # Make sure the paths are correct... at least try to fix them. |
| 188 | -if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt')) |
|
| 188 | +if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt')) { |
|
| 189 | 189 | $boarddir = dirname(__FILE__); |
| 190 | -if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources')) |
|
| 190 | +} |
|
| 191 | +if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources')) { |
|
| 191 | 192 | $sourcedir = $boarddir . '/Sources'; |
| 192 | -if (!file_exists($cachedir) && file_exists($boarddir . '/cache')) |
|
| 193 | +} |
|
| 194 | +if (!file_exists($cachedir) && file_exists($boarddir . '/cache')) { |
|
| 193 | 195 | $cachedir = $boarddir . '/cache'; |
| 196 | +} |
|
| 194 | 197 | |
| 195 | 198 | ########## Error-Catching ########## |
| 196 | 199 | # Note: You shouldn't touch these settings. |
| 197 | -if (file_exists((isset($cachedir) ? $cachedir : dirname(__FILE__)) . '/db_last_error.php')) |
|
| 200 | +if (file_exists((isset($cachedir) ? $cachedir : dirname(__FILE__)) . '/db_last_error.php')) { |
|
| 198 | 201 | include((isset($cachedir) ? $cachedir : dirname(__FILE__)) . '/db_last_error.php'); |
| 202 | +} |
|
| 199 | 203 | |
| 200 | 204 | if (!isset($db_last_error)) |
| 201 | 205 | { |
@@ -207,10 +211,11 @@ discard block |
||
| 207 | 211 | if (file_exists(dirname(__FILE__) . '/install.php')) |
| 208 | 212 | { |
| 209 | 213 | $secure = false; |
| 210 | - if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') |
|
| 211 | - $secure = true; |
|
| 212 | - elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') |
|
| 213 | - $secure = true; |
|
| 214 | + if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { |
|
| 215 | + $secure = true; |
|
| 216 | + } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') { |
|
| 217 | + $secure = true; |
|
| 218 | + } |
|
| 214 | 219 | |
| 215 | 220 | header('location: http' . ($secure ? 's' : '') . '://' . (empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST']) . (strtr(dirname($_SERVER['PHP_SELF']), '\\', '/') == '/' ? '' : strtr(dirname($_SERVER['PHP_SELF']), '\\', '/')) . '/install.php'); exit; |
| 216 | 221 | } |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
