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

less warnings in CLI mode

Browse Source
This commit is contained in:
Michael Save 2012-03-14 15:38:28 +11:00
parent c8d1f1cdd4
commit e09dd8782e
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inc/config.php
View File

@ -635,7 +635,10 @@
// The root directory, including the trailing slash, for Tinyboard. // The root directory, including the trailing slash, for Tinyboard.
// examples: '/', 'http://boards.chan.org/', '/chan/' // examples: '/', 'http://boards.chan.org/', '/chan/'
$config['root'] = (str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) == '/' ? '/' : str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) . '/'); if(isset($_SERVER['REQUEST_URI']))
$config['root'] = (str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) == '/' ? '/' : str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) . '/');
else
$config['root'] = '/'; // CLI mode
// If for some reason the folders and static HTML index files aren't in the current working direcotry, // If for some reason the folders and static HTML index files aren't in the current working direcotry,
// enter the directory path here. Otherwise, keep it false. // enter the directory path here. Otherwise, keep it false.

40
inc/functions.php
View File

@ -45,24 +45,28 @@
$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']))
$config['referer_match'] = '/^' . if(isset($_SERVER['HTTP_HOST'])) {
(preg_match($config['url_regex'], $config['root']) ? '' : $config['referer_match'] = '/^' .
'https?:\/\/' . $_SERVER['HTTP_HOST']) . (preg_match($config['url_regex'], $config['root']) ? '' :
preg_quote($config['root'], '/') . 'https?:\/\/' . $_SERVER['HTTP_HOST']) .
'(' . preg_quote($config['root'], '/') .
str_replace('%s', '\w+', preg_quote($config['board_path'], '/')) . '(' .
'(' . str_replace('%s', '\w+', preg_quote($config['board_path'], '/')) .
preg_quote($config['file_index'], '/') . '|' . '(' .
str_replace('%d', '\d+', preg_quote($config['file_page'])) . preg_quote($config['file_index'], '/') . '|' .
')?' . str_replace('%d', '\d+', preg_quote($config['file_page'])) .
'|' . ')?' .
str_replace('%s', '\w+', preg_quote($config['board_path'], '/')) . '|' .
preg_quote($config['dir']['res'], '/') . str_replace('%s', '\w+', preg_quote($config['board_path'], '/')) .
str_replace('%d', '\d+', preg_quote($config['file_page'], '/')) . preg_quote($config['dir']['res'], '/') .
'|' . str_replace('%d', '\d+', preg_quote($config['file_page'], '/')) .
preg_quote($config['file_mod'], '/') . '\?\/.+' . '|' .
')([#?](.+)?)?$/i'; preg_quote($config['file_mod'], '/') . '\?\/.+' .
')([#?](.+)?)?$/i';
} else {
// CLI mode
$config['referer_match'] = '//';
}
if(!isset($config['cookies']['path'])) if(!isset($config['cookies']['path']))
$config['cookies']['path'] = &$config['root']; $config['cookies']['path'] = &$config['root'];