summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/config.php28
-rw-r--r--inc/functions.php9
2 files changed, 9 insertions, 28 deletions
diff --git a/inc/config.php b/inc/config.php
index 29d0d807..b3c2597a 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -303,32 +303,4 @@
// Always act as if they had typed "noko" in the email field no mattter what
$config['always_noko'] = false;
-
- $config['url_match'] = '/^' .
- (preg_match($config['url_regex'], $config['root']) ? '' :
- (@$_SERVER['HTTPS']?'https':'http') .
- ':\/\/'.$_SERVER['HTTP_HOST']) .
- preg_quote($config['root'], '/') .
- '(' .
- str_replace('%s', '\w{1,8}', preg_quote($config['board_path'], '/')) .
- '|' .
- str_replace('%s', '\w{1,8}', preg_quote($config['board_path'], '/')) .
- preg_quote($config['file_index'], '/') .
- '|' .
- str_replace('%s', '\w{1,8}', preg_quote($config['board_path'], '/')) .
- str_replace('%d', '\d+', preg_quote($config['file_page'], '/')) .
- '|' .
- preg_quote($config['file_mod'], '/') .
- '\?\/.+' .
- ')$/i';
-
- if($config['root_file']) {
- chdir($config['root_file']);
- }
-
- if($config['verbose_errors']) {
- error_reporting(E_ALL);
- ini_set('display_errors', 1);
- }
-
?> \ No newline at end of file
diff --git a/inc/functions.php b/inc/functions.php
index 0c760ae6..af16d5c3 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -42,6 +42,15 @@
$config['image_deleted'] = $config['dir']['static'] . 'deleted.png';
if(!isset($config['image_zip']))
$config['image_zip'] = $config['dir']['static'] . 'zip.png';
+
+ if($config['root_file']) {
+ chdir($config['root_file']);
+ }
+
+ if($config['verbose_errors']) {
+ error_reporting(E_ALL);
+ ini_set('display_errors', 1);
+ }
}
function sprintf3($str, $vars, $delim = '%') {