Fixed broken logins
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1545 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
90a7a964e8
commit
107c930732
|
@ -86,21 +86,22 @@ $scales = array(
|
|||
"25" => "1/4x",
|
||||
);
|
||||
|
||||
if ( !isset($user) && ZM_OPT_USE_AUTH )
|
||||
{
|
||||
if ( ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER'] ) )
|
||||
{
|
||||
$view = "postlogin";
|
||||
$action = "login";
|
||||
$username = $_SERVER['REMOTE_USER'];
|
||||
}
|
||||
}
|
||||
|
||||
require_once( 'zm_funcs.php' );
|
||||
require_once( 'zm_actions.php' );
|
||||
|
||||
if ( !isset($user) )
|
||||
{
|
||||
if ( ZM_OPT_USE_AUTH )
|
||||
{
|
||||
if ( ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER'] ) )
|
||||
{
|
||||
$view = "postlogin";
|
||||
$action = "login";
|
||||
$username = $_SERVER['REMOTE_USER'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$view = "login";
|
||||
}
|
||||
}
|
||||
$view = "login";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -123,9 +124,6 @@ if ( !isset($view) )
|
|||
$view = "console";
|
||||
}
|
||||
|
||||
require_once( 'zm_funcs.php' );
|
||||
require_once( 'zm_actions.php' );
|
||||
|
||||
switch( $view )
|
||||
{
|
||||
case "login" :
|
||||
|
|
Loading…
Reference in New Issue