From fec72f05d0403e284bab19ebf1b41f73126c6378 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 25 Mar 2014 18:48:20 -0500 Subject: [PATCH 1/2] fix eyezm authentication issue --- web/skins/xml/skin.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/skins/xml/skin.php b/web/skins/xml/skin.php index d797c7b08..25b0b2330 100644 --- a/web/skins/xml/skin.php +++ b/web/skins/xml/skin.php @@ -28,12 +28,13 @@ foreach ( getSkinIncludes( 'includes/functions.php' ) as $includeFile ) require_once $includeFile; if ( empty($view) ) - $view = 'console'; + $view = isset($user)?'console':'login'; -if ( !isset($user) && ZM_OPT_USE_AUTH ) +if ( !isset($user) && ZM_OPT_USE_AUTH && ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER']) ) { - echo "Invalid Login"; - exit; + $view = "postlogin"; + $action = "login"; + $_REQUEST['username'] = $_SERVER['REMOTE_USER']; } /* Get version info from client */ updateClientVer(); From 5c8c00c1ab2fead98e6a9a706a0dbae58ab06774 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 7 Jul 2014 17:48:33 -0500 Subject: [PATCH 2/2] Fix double login issue with eyezm --- web/skins/xml/skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/xml/skin.php b/web/skins/xml/skin.php index 25b0b2330..c88718c4e 100644 --- a/web/skins/xml/skin.php +++ b/web/skins/xml/skin.php @@ -28,7 +28,7 @@ foreach ( getSkinIncludes( 'includes/functions.php' ) as $includeFile ) require_once $includeFile; if ( empty($view) ) - $view = isset($user)?'console':'login'; + $view = 'console'; if ( !isset($user) && ZM_OPT_USE_AUTH && ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER']) ) {