From efc2d0d0f596a680d6a961baec6ddad61ac2711e Mon Sep 17 00:00:00 2001 From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com> Date: Sun, 13 Sep 2020 13:21:02 +0800 Subject: [PATCH] slash in using theme --- common.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/common.php b/common.php index 2e284f7..a0a2f57 100644 --- a/common.php +++ b/common.php @@ -1834,7 +1834,9 @@ function EnvOpt($needUpdate = 0) '; } elseif ($key=='theme') { - $theme_arr = scandir(__DIR__.'/theme'); + $slash = '/'; + if (strpos(__DIR__, ':')) $slash = '\\'; + $theme_arr = scandir(__DIR__ . $slash . 'theme'); $html .= ' @@ -1989,6 +1991,9 @@ function render_list($path = '', $files = '') global $exts; global $constStr; + $slash = '/'; + if (strpos(__DIR__, ':')) $slash = '\\'; + if (isset($files['children']['index.html']) && !$_SERVER['admin']) { $htmlcontent = fetch_files(spurlencode(path_format(urldecode($path) . '/index.html'),'/'))['content']; return output($htmlcontent['body'], $htmlcontent['stat']); @@ -2041,22 +2046,22 @@ function render_list($path = '', $files = '') //$authinfo = $path . '
' . json_encode($files, JSON_PRETTY_PRINT) . '
'; if (isset($_COOKIE['theme'])&&$_COOKIE['theme']!='') $theme = $_COOKIE['theme']; - if ( !file_exists(__DIR__.'/theme/'.$theme) ) $theme = ''; + if ( !file_exists(__DIR__ . $slash .'theme' . $slash . $theme) ) $theme = ''; if ( $theme=='' ) { $tmp = getConfig('customTheme'); if ( $tmp!='' ) $theme = $tmp; } if ( $theme=='' ) { $theme = getConfig('theme'); - if ( $theme=='' || !file_exists(__DIR__.'/theme/'.$theme) ) $theme = 'classic.html'; + if ( $theme=='' || !file_exists(__DIR__ . $slash .'theme' . $slash . $theme) ) $theme = 'classic.html'; } if (substr($theme,-4)=='.php') { @ob_start(); include 'theme/'.$theme; $html = ob_get_clean(); } else { - if (file_exists(__DIR__.'/theme/'.$theme)) { - $file_path = __DIR__.'/theme/'.$theme; + if (file_exists(__DIR__ . $slash .'theme' . $slash . $theme)) { + $file_path = __DIR__ . $slash .'theme' . $slash . $theme; $html = file_get_contents($file_path); } else { if (!($html = getcache('customTheme'))) { @@ -2860,7 +2865,7 @@ function render_list($path = '', $files = '') } if ($_SERVER['admin']||!getConfig('disableChangeTheme')) { - $theme_arr = scandir(__DIR__.'/theme'); + $theme_arr = scandir(__DIR__ . $slash . 'theme'); $html .= '