Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-28 01:10:51 +01:00
Code Releases Wiki Activity

Moved messy $config initialization from inc/config.php to inc/functions.php.

Browse Source
This commit is contained in:
Michael Save 2012-03-21 12:00:00 +11:00
parent 4afd2c7cb2
commit 66b08bafef
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
inc/config.php
View File

@ -20,33 +20,8 @@
* More information: http://tinyboard.org/wiki/index.php?title=Config * More information: http://tinyboard.org/wiki/index.php?title=Config
* *
*/ */
/* Ignore this */
$config = Array(
'db' => Array(),
'cache' => Array(),
'cookies' => Array(),
'error' => Array(),
'dir' => Array(),
'mod' => Array(),
'spam' => Array(),
'flood_filters' => Array(),
'wordfilters' => Array(),
'custom_capcode' => Array(),
'custom_tripcode' => Array(),
'dnsbl' => Array(),
'dnsbl_exceptions' => Array(),
'remote' => Array(),
'allowed_ext' => Array(),
'allowed_ext_files' => Array(),
'file_icons' => Array(),
'footer' => Array(),
'stylesheets' => Array(),
'additional_javascript' => Array(),
'markup' => Array()
);
/* End ignore */
/* /*
* ======================= * =======================
* General/misc settings * General/misc settings

7
inc/functions.php
View File

@ -25,6 +25,13 @@
if(!isset($_SERVER['REMOTE_ADDR'])) if(!isset($_SERVER['REMOTE_ADDR']))
$_SERVER['REMOTE_ADDR'] = '0.0.0.0'; $_SERVER['REMOTE_ADDR'] = '0.0.0.0';
$arrays = Array('db', 'cache', 'cookies', 'error', 'dir', 'mod', 'spam', 'flood_filters', 'wordfilters', 'custom_capcode', 'custom_tripcode', 'dnsbl', 'dnsbl_exceptions', 'remote', 'allowed_ext', 'allowed_ext_files', 'file_icons', 'footer', 'stylesheets', 'additional_javascript', 'markup');
$config = Array();
foreach($arrays as $key) {
$config[$key] = Array();
}
require 'inc/config.php'; require 'inc/config.php';
if (file_exists('inc/instance-config.php')) { if (file_exists('inc/instance-config.php')) {
require 'inc/instance-config.php'; require 'inc/instance-config.php';