kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

rearrange config processing a bit

Browse Source
This commit is contained in:
czaks 2015-02-27 21:16:03 +01:00
parent a93f168c79
commit bffe03e651
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
inc/functions.php
View File

@ -124,10 +124,6 @@ function loadConfig() {
init_locale($config['locale'], $error); init_locale($config['locale'], $error);
} }
if (!isset($__version))
$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
$config['version'] = $__version;
date_default_timezone_set($config['timezone']); date_default_timezone_set($config['timezone']);
if (!isset($config['global_message'])) if (!isset($config['global_message']))
@ -136,6 +132,7 @@ function loadConfig() {
if (!isset($config['post_url'])) if (!isset($config['post_url']))
$config['post_url'] = $config['root'] . $config['file_post']; $config['post_url'] = $config['root'] . $config['file_post'];
if (!isset($config['referer_match'])) if (!isset($config['referer_match']))
if (isset($_SERVER['HTTP_HOST'])) { if (isset($_SERVER['HTTP_HOST'])) {
$config['referer_match'] = '/^' . $config['referer_match'] = '/^' .
@ -206,19 +203,12 @@ function loadConfig() {
if (!isset($config['user_flags'])) if (!isset($config['user_flags']))
$config['user_flags'] = array(); $config['user_flags'] = array();
// Effectful config processing below:
if ($config['root_file']) { if ($config['root_file']) {
chdir($config['root_file']); chdir($config['root_file']);
} }
if ($config['verbose_errors']) {
set_error_handler('verbose_error_handler');
error_reporting(E_ALL);
ini_set('display_errors', true);
ini_set('html_errors', false);
} else {
ini_set('display_errors', false);
}
// Keep the original address to properly comply with other board configurations // Keep the original address to properly comply with other board configurations
if (!isset($__ip)) if (!isset($__ip))
$__ip = $_SERVER['REMOTE_ADDR']; $__ip = $_SERVER['REMOTE_ADDR'];
@ -227,11 +217,25 @@ function loadConfig() {
if (preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m)) if (preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m))
$_SERVER['REMOTE_ADDR'] = $m[2]; $_SERVER['REMOTE_ADDR'] = $m[2];
if (!isset($__version))
$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
$config['version'] = $__version;
if ($config['verbose_errors']) {
set_error_handler('verbose_error_handler');
error_reporting(E_ALL);
ini_set('display_errors', true);
ini_set('html_errors', false);
} else {
ini_set('display_errors', false);
}
if ($config['syslog']) if ($config['syslog'])
openlog('tinyboard', LOG_ODELAY, LOG_SYSLOG); // open a connection to sysem logger openlog('tinyboard', LOG_ODELAY, LOG_SYSLOG); // open a connection to sysem logger
if ($config['recaptcha']) if ($config['recaptcha'])
require_once 'inc/lib/recaptcha/recaptchalib.php'; require_once 'inc/lib/recaptcha/recaptchalib.php';
if ($config['cache']['enabled']) if ($config['cache']['enabled'])
require_once 'inc/cache.php'; require_once 'inc/cache.php';