ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quotes, spaces. Also move setting redirect to to where we actually do the redirect so that actions can remove the redirect if there was an error to report.

This commit is contained in:
Isaac Connor 2021-03-21 09:19:21 -04:00
parent cc455e5d74
commit 284837d536
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/index.php
View File

@ -98,7 +98,7 @@ if ( isset($_GET['skin']) ) {
$skin = 'classic'; $skin = 'classic';
} }
if ( ! is_dir("skins/$skin") ) { if (!is_dir('skins/'.$skin) ) {
$skins = array_map('basename', glob('skins/*', GLOB_ONLYDIR)); $skins = array_map('basename', glob('skins/*', GLOB_ONLYDIR));
if ( !in_array($skin, $skins) ) { if ( !in_array($skin, $skins) ) {
@ -117,10 +117,10 @@ if ( isset($_GET['css']) ) {
$css = 'classic'; $css = 'classic';
} }
if ( !is_dir("skins/$skin/css/$css") ) { if (!is_dir("skins/$skin/css/$css")) {
$css_skins = array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)); $css_skins = array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR));
if ( count($css_skins) ) { if (count($css_skins)) {
if ( !in_array($css, $css_skins) ) { if (!in_array($css, $css_skins)) {
ZM\Error("Invalid skin css '$css' setting to " . $css_skins[0]); ZM\Error("Invalid skin css '$css' setting to " . $css_skins[0]);
$css = $css_skins[0]; $css = $css_skins[0];
} else { } else {
@ -137,7 +137,7 @@ define('ZM_SKIN_PATH', "skins/$skin");
define('ZM_SKIN_NAME', $skin); define('ZM_SKIN_NAME', $skin);
$skinBase = array(); // To allow for inheritance of skins $skinBase = array(); // To allow for inheritance of skins
if ( !file_exists(ZM_SKIN_PATH) ) if (!file_exists(ZM_SKIN_PATH))
ZM\Fatal("Invalid skin '$skin'"); ZM\Fatal("Invalid skin '$skin'");
$skinBase[] = $skin; $skinBase[] = $skin;
@ -183,9 +183,6 @@ $user = null;
if ( isset($_REQUEST['view']) ) if ( isset($_REQUEST['view']) )
$view = detaintPath($_REQUEST['view']); $view = detaintPath($_REQUEST['view']);
if ( isset($_REQUEST['redirect']) )
$redirect = '?view='.detaintPath($_REQUEST['redirect']);
# Add CSP Headers # Add CSP Headers
$cspNonce = bin2hex(zm_random_bytes(16)); $cspNonce = bin2hex(zm_random_bytes(16));
@ -265,6 +262,8 @@ if ( ZM_OPT_USE_AUTH and (!isset($user)) and ($view != 'login') and ($view != 'n
$request = null; $request = null;
} }
if ( isset($_REQUEST['redirect']) )
$redirect = '?view='.detaintPath($_REQUEST['redirect']);
if ( $redirect ) { if ( $redirect ) {
ZM\Debug("Redirecting to $redirect"); ZM\Debug("Redirecting to $redirect");