yanglc
/
OneManager-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slash in using theme

pull/128/head
qkqpttgf 2020-09-13 13:21:02 +08:00 committed by GitHub
parent 91d118d567
commit efc2d0d0f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common.php
View File

@ -1834,7 +1834,9 @@ function EnvOpt($needUpdate = 0)
</td> </td>
</tr>'; </tr>';
} elseif ($key=='theme') { } elseif ($key=='theme') {
$theme_arr = scandir(__DIR__.'/theme'); $slash = '/';
if (strpos(__DIR__, ':')) $slash = '\\';
$theme_arr = scandir(__DIR__ . $slash . 'theme');
$html .= ' $html .= '
<tr> <tr>
<td><label>' . $key . '</label></td> <td><label>' . $key . '</label></td>
@ -1989,6 +1991,9 @@ function render_list($path = '', $files = '')
global $exts; global $exts;
global $constStr; global $constStr;
$slash = '/';
if (strpos(__DIR__, ':')) $slash = '\\';
if (isset($files['children']['index.html']) && !$_SERVER['admin']) { if (isset($files['children']['index.html']) && !$_SERVER['admin']) {
$htmlcontent = fetch_files(spurlencode(path_format(urldecode($path) . '/index.html'),'/'))['content']; $htmlcontent = fetch_files(spurlencode(path_format(urldecode($path) . '/index.html'),'/'))['content'];
return output($htmlcontent['body'], $htmlcontent['stat']); return output($htmlcontent['body'], $htmlcontent['stat']);
@ -2041,22 +2046,22 @@ function render_list($path = '', $files = '')
//$authinfo = $path . '<br><pre>' . json_encode($files, JSON_PRETTY_PRINT) . '</pre>'; //$authinfo = $path . '<br><pre>' . json_encode($files, JSON_PRETTY_PRINT) . '</pre>';
if (isset($_COOKIE['theme'])&&$_COOKIE['theme']!='') $theme = $_COOKIE['theme']; 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=='' ) { if ( $theme=='' ) {
$tmp = getConfig('customTheme'); $tmp = getConfig('customTheme');
if ( $tmp!='' ) $theme = $tmp; if ( $tmp!='' ) $theme = $tmp;
} }
if ( $theme=='' ) { if ( $theme=='' ) {
$theme = getConfig('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') { if (substr($theme,-4)=='.php') {
@ob_start(); @ob_start();
include 'theme/'.$theme; include 'theme/'.$theme;
$html = ob_get_clean(); $html = ob_get_clean();
} else { } else {
if (file_exists(__DIR__.'/theme/'.$theme)) { if (file_exists(__DIR__ . $slash .'theme' . $slash . $theme)) {
$file_path = __DIR__.'/theme/'.$theme; $file_path = __DIR__ . $slash .'theme' . $slash . $theme;
$html = file_get_contents($file_path); $html = file_get_contents($file_path);
} else { } else {
if (!($html = getcache('customTheme'))) { if (!($html = getcache('customTheme'))) {
@ -2860,7 +2865,7 @@ function render_list($path = '', $files = '')
} }
if ($_SERVER['admin']||!getConfig('disableChangeTheme')) { if ($_SERVER['admin']||!getConfig('disableChangeTheme')) {
$theme_arr = scandir(__DIR__.'/theme'); $theme_arr = scandir(__DIR__ . $slash . 'theme');
$html .= ' $html .= '
<div style="position: fixed;right: 10px;bottom: 10px;/*color: rgba(247,247,249,0);*/"> <div style="position: fixed;right: 10px;bottom: 10px;/*color: rgba(247,247,249,0);*/">
<select name="theme" onchange="changetheme(this.options[this.options.selectedIndex].value)"> <select name="theme" onchange="changetheme(this.options[this.options.selectedIndex].value)">