URL_MATCH when ROOT is a full URL

This commit is contained in:
Savetheinternet 2010-12-18 04:12:37 +11:00
parent 53b32ce8a5
commit 323fe4e61c

View File

@ -220,16 +220,19 @@
define('ALWAYS_NOKO', false, true); define('ALWAYS_NOKO', false, true);
define('URL_MATCH', '/^' . define('URL_MATCH', '/^' .
(@$_SERVER['HTTPS']?'https':'http').':\/\/'.$_SERVER['HTTP_HOST'] . preg_quote(ROOT, '/') . (preg_match(URL_REGEX, ROOT) ? '' :
'(' . (@$_SERVER['HTTPS']?'https':'http') .
str_replace('%s', '\w{1,8}', preg_quote(BOARD_PATH, '/')) . ':\/\/'.$_SERVER['HTTP_HOST']) .
'|' . preg_quote(ROOT, '/') .
str_replace('%s', '\w{1,8}', preg_quote(BOARD_PATH, '/')) . '(' .
preg_quote(FILE_INDEX, '/') . str_replace('%s', '\w{1,8}', preg_quote(BOARD_PATH, '/')) .
'|' . '|' .
str_replace('%s', '\w{1,8}', preg_quote(BOARD_PATH, '/')) . str_replace('%s', '\w{1,8}', preg_quote(BOARD_PATH, '/')) .
str_replace('%d', '\d+', preg_quote(FILE_PAGE, '/')) . preg_quote(FILE_INDEX, '/') .
')$/', true); '|' .
str_replace('%s', '\w{1,8}', preg_quote(BOARD_PATH, '/')) .
str_replace('%d', '\d+', preg_quote(FILE_PAGE, '/')) .
')$/i', true);
if(ROOT_FILE) { if(ROOT_FILE) {
chdir(ROOT_FILE); chdir(ROOT_FILE);