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

Fixed logins. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1548 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-11-05 16:19:33 +00:00
parent c1fc4fa473
commit 745f0d6e32
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/zm_xhtml.php
View File

@ -89,9 +89,7 @@ $scales = array(
"25" => "1/4x", "25" => "1/4x",
); );
if ( !isset($user) ) if ( !isset($user) && ZM_OPT_USE_AUTH )
{
if ( ZM_OPT_USE_AUTH )
{ {
if ( ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER'] ) ) if ( ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER'] ) )
{ {
@ -99,20 +97,20 @@ if ( !isset($user) )
$action = "login"; $action = "login";
$username = $_SERVER['REMOTE_USER']; $username = $_SERVER['REMOTE_USER'];
} }
else }
require_once( 'zm_funcs.php' );
require_once( 'zm_actions.php' );
if ( !isset($user) )
{ {
$view = "login"; $view = "login";
} }
}
}
elseif ( !isset($view) ) elseif ( !isset($view) )
{ {
$view = "console"; $view = "console";
} }
require_once( 'zm_funcs.php' );
require_once( 'zm_actions.php' );
switch( $view ) switch( $view )
{ {
case "login" : case "login" :
@ -127,6 +125,7 @@ switch( $view )
case "events" : case "events" :
case "filter" : case "filter" :
case "event" : case "event" :
case "eventdetails" :
case "frame" : case "frame" :
case "frames" : case "frames" :
case "monitor" : case "monitor" :