From 745f0d6e32e1db6660bfaf634df8cc90329aaf21 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Sat, 5 Nov 2005 16:19:33 +0000
Subject: [PATCH] Fixed logins.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1548 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_xhtml.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/web/zm_xhtml.php b/web/zm_xhtml.php
index 3846e60cb..5bc6b391a 100644
--- a/web/zm_xhtml.php
+++ b/web/zm_xhtml.php
@@ -89,30 +89,28 @@ $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";
 }
 elseif ( !isset($view) )
 {
 	$view = "console";
 }
 
-require_once( 'zm_funcs.php' );
-require_once( 'zm_actions.php' );
-
 switch( $view )
 {
 	case "login" :
@@ -127,6 +125,7 @@ switch( $view )
 	case "events" :
 	case "filter" :
 	case "event" :
+	case "eventdetails" :
 	case "frame" :
 	case "frames" :
 	case "monitor" :