mirror of
https://github.com/vichan-devel/vichan.git
synced 2024-11-24 07:30:10 +01:00
Moved messy $config initialization from inc/config.php to inc/functions.php.
This commit is contained in:
parent
4afd2c7cb2
commit
66b08bafef
@ -20,33 +20,8 @@
|
||||
* 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
|
||||
|
@ -25,6 +25,13 @@
|
||||
if(!isset($_SERVER['REMOTE_ADDR']))
|
||||
$_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';
|
||||
if (file_exists('inc/instance-config.php')) {
|
||||
require 'inc/instance-config.php';
|
||||
|
Loading…
Reference in New Issue
Block a user