From 3a113899ed06b24056a5ec070ece447b1ad0c71e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 26 Jun 2017 14:29:45 -0400 Subject: [PATCH] whitespace and braces fixing --- web/index.php | 148 ++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 82 deletions(-) diff --git a/web/index.php b/web/index.php index 0b0c4f45e..5ccf79d66 100644 --- a/web/index.php +++ b/web/index.php @@ -21,29 +21,26 @@ error_reporting( E_ALL ); $debug = false; -if ( $debug ) -{ - // Use these for debugging, though not both at once! - phpinfo( INFO_VARIABLES ); - //error_reporting( E_ALL ); +if ( $debug ) { + // Use these for debugging, though not both at once! + phpinfo( INFO_VARIABLES ); + //error_reporting( E_ALL ); } // Use new style autoglobals where possible -if ( version_compare( phpversion(), "4.1.0", "<") ) -{ - $_SESSION = &$HTTP_SESSION_VARS; - $_SERVER = &$HTTP_SERVER_VARS; +if ( version_compare( phpversion(), '4.1.0', '<') ) { + $_SESSION = &$HTTP_SESSION_VARS; + $_SERVER = &$HTTP_SERVER_VARS; } // Useful debugging lines for mobile devices -if ( false ) -{ - ob_start(); - phpinfo( INFO_VARIABLES ); - $fp = fopen( "/tmp/env.html", "w" ); - fwrite( $fp, ob_get_contents() ); - fclose( $fp ); - ob_end_clean(); +if ( false ) { + ob_start(); + phpinfo( INFO_VARIABLES ); + $fp = fopen( '/tmp/env.html', 'w' ); + fwrite( $fp, ob_get_contents() ); + fclose( $fp ); + ob_end_clean(); } require_once( 'includes/config.php' ); @@ -53,26 +50,23 @@ require_once( 'includes/Storage.php' ); require_once( 'includes/Event.php' ); require_once( 'includes/Monitor.php' ); -if ( isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on' ) -{ - $protocol = 'https'; +if ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ) { + $protocol = 'https'; +} else { + $protocol = 'http'; } -else -{ - $protocol = 'http'; -} -define( "ZM_BASE_PROTOCOL", $protocol ); +define( 'ZM_BASE_PROTOCOL', $protocol ); // Absolute URL's are unnecessary and break compatibility with reverse proxies // define( "ZM_BASE_URL", $protocol.'://'.$_SERVER['HTTP_HOST'] ); // Use relative URL's instead -define( "ZM_BASE_URL", "" ); +define( 'ZM_BASE_URL', '' ); // Check time zone is set if (!ini_get('date.timezone') || !date_default_timezone_set(ini_get('date.timezone'))) { - date_default_timezone_set('UTC'); - Fatal( "ZoneMinder is not installed properly: php's date.timezone is not set to a valid timezone" ); + date_default_timezone_set('UTC'); + Fatal( "ZoneMinder is not installed properly: php's date.timezone is not set to a valid timezone" ); } if ( isset($_GET['skin']) ) @@ -82,7 +76,7 @@ elseif ( isset($_COOKIE['zmSkin']) ) elseif ( defined('ZM_SKIN_DEFAULT') ) $skin = ZM_SKIN_DEFAULT; else - $skin = "classic"; + $skin = 'classic'; $skins = array_map( 'basename', glob('skins/*',GLOB_ONLYDIR) ); if ( ! in_array( $skin, $skins ) ) { @@ -97,7 +91,7 @@ elseif ( isset($_COOKIE['zmCSS']) ) elseif (defined('ZM_CSS_DEFAULT')) $css = ZM_CSS_DEFAULT; else - $css = "classic"; + $css = 'classic'; $css_skins = array_map( 'basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR) ); if ( ! in_array( $css, $css_skins ) ) { @@ -105,9 +99,9 @@ if ( ! in_array( $css, $css_skins ) ) { $css = $css_skins[0]; } -define( "ZM_BASE_PATH", dirname( $_SERVER['REQUEST_URI'] ) ); -define( "ZM_SKIN_NAME", $skin ); -define( "ZM_SKIN_PATH", "skins/$skin" ); +define( 'ZM_BASE_PATH', dirname( $_SERVER['REQUEST_URI'] ) ); +define( 'ZM_SKIN_NAME', $skin ); +define( 'ZM_SKIN_PATH', "skins/$skin" ); $skinBase = array(); // To allow for inheritance of skins if ( !file_exists( ZM_SKIN_PATH ) ) @@ -117,26 +111,25 @@ $skinBase[] = $skin; $currentCookieParams = session_get_cookie_params(); Logger::Debug('Setting cookie parameters to lifetime('.$currentCookieParams['lifetime'].') path('.$currentCookieParams['path'].') domain ('.$currentCookieParams['domain'].') secure('.$currentCookieParams['secure'].') httpOnly(1)'); session_set_cookie_params( - $currentCookieParams["lifetime"], - $currentCookieParams["path"], - $currentCookieParams["domain"], - $currentCookieParams["secure"], + $currentCookieParams['lifetime'], + $currentCookieParams['path'], + $currentCookieParams['domain'], + $currentCookieParams['secure'], true ); -ini_set( "session.name", "ZMSESSID" ); +ini_set( 'session.name', 'ZMSESSID' ); session_start(); -if ( !isset($_SESSION['skin']) || isset($_REQUEST['skin']) || !isset($_COOKIE['zmSkin']) || $_COOKIE['zmSkin'] != $skin ) -{ +if ( !isset($_SESSION['skin']) || isset($_REQUEST['skin']) || !isset($_COOKIE['zmSkin']) || $_COOKIE['zmSkin'] != $skin ) { $_SESSION['skin'] = $skin; - setcookie( "zmSkin", $skin, time()+3600*24*30*12*10 ); + setcookie( 'zmSkin', $skin, time()+3600*24*30*12*10 ); } if ( !isset($_SESSION['css']) || isset($_REQUEST['css']) || !isset($_COOKIE['zmCSS']) || $_COOKIE['zmCSS'] != $css ) { $_SESSION['css'] = $css; - setcookie( "zmCSS", $css, time()+3600*24*30*12*10 ); + setcookie( 'zmCSS', $css, time()+3600*24*30*12*10 ); } if ( ZM_OPT_USE_AUTH ) @@ -154,8 +147,7 @@ require_once( 'includes/functions.php' ); CORSHeaders(); // Check for valid content dirs -if ( !is_writable(ZM_DIR_EVENTS) || !is_writable(ZM_DIR_IMAGES) ) -{ +if ( !is_writable(ZM_DIR_EVENTS) || !is_writable(ZM_DIR_IMAGES) ) { Error( "Cannot write to content dirs('".ZM_DIR_EVENTS."','".ZM_DIR_IMAGES."'). Check that these exist and are owned by the web account user"); } @@ -178,57 +170,49 @@ isset($action) || $action = NULL; if ( ZM_ENABLE_CSRF_MAGIC && $action != 'login' && $action != 'view_video' ) { require_once( 'includes/csrf/csrf-magic.php' ); - Logger::Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\""); - csrf_check(); + Logger::Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\""); + csrf_check(); } require_once( 'includes/actions.php' ); # If I put this here, it protects all views and popups, but it has to go after actions.php because actions.php does the actual logging in. if ( ZM_OPT_USE_AUTH && ! isset($user) && $view != 'login' ) { - $view = 'login'; + $view = 'login'; } # Only one request can open the session file at a time, so let's close the session here to improve concurrency. # Any file/page that uses the session must re-open it. session_write_close(); -if ( isset( $_REQUEST['request'] ) ) -{ - foreach ( getSkinIncludes( 'ajax/'.$request.'.php', true, true ) as $includeFile ) - { - if ( !file_exists( $includeFile ) ) - Fatal( "Request '$request' does not exist" ); +if ( isset( $_REQUEST['request'] ) ) { + foreach ( getSkinIncludes( 'ajax/'.$request.'.php', true, true ) as $includeFile ) { + if ( !file_exists( $includeFile ) ) + Fatal( "Request '$request' does not exist" ); + require_once $includeFile; + } + return; +} else { + if ( $includeFiles = getSkinIncludes( 'views/'.$view.'.php', true, true ) ) { + foreach ( $includeFiles as $includeFile ) { + if ( !file_exists( $includeFile ) ) + Fatal( "View '$view' does not exist" ); + require_once $includeFile; + } + // If the view overrides $view to 'error', and the user is not logged in, then the + // issue is probably resolvable by logging in, so provide the opportunity to do so. + // The login view should handle redirecting to the correct location afterward. + if ( $view == 'error' && !isset($user) ) { + $view = 'login'; + foreach ( getSkinIncludes( 'views/login.php', true, true ) as $includeFile ) require_once $includeFile; } - return; -} -else -{ - if ( $includeFiles = getSkinIncludes( 'views/'.$view.'.php', true, true ) ) - { - foreach ( $includeFiles as $includeFile ) - { - if ( !file_exists( $includeFile ) ) - Fatal( "View '$view' does not exist" ); - require_once $includeFile; - } - // If the view overrides $view to 'error', and the user is not logged in, then the - // issue is probably resolvable by logging in, so provide the opportunity to do so. - // The login view should handle redirecting to the correct location afterward. - if ( $view == 'error' && !isset($user) ) - { - $view = 'login'; - foreach ( getSkinIncludes( 'views/login.php', true, true ) as $includeFile ) - require_once $includeFile; - } - } - // If the view is missing or the view still returned error with the user logged in, - // then it is not recoverable. - if ( !$includeFiles || $view == 'error' ) - { - foreach ( getSkinIncludes( 'views/error.php', true, true ) as $includeFile ) - require_once $includeFile; - } + } + // If the view is missing or the view still returned error with the user logged in, + // then it is not recoverable. + if ( !$includeFiles || $view == 'error' ) { + foreach ( getSkinIncludes( 'views/error.php', true, true ) as $includeFile ) + require_once $includeFile; + } } ?>