Fixed issue #7049: Webserver authentication not working when external…

… access control is used
LimeSurvey · Feb 15, 2013 · 645ea65 · 645ea65
1 parent 24a2676
commit 645ea65
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/application/core/UserIdentity.php b/application/core/UserIdentity.php
@@ -67,10 +67,13 @@ public function authenticate($sOneTimePassword='')
                 $this->errorCode = self::ERROR_NONE;
             }
         }
-        elseif(Yii::app()->getConfig("auth_webserver") === true && (isset($_SERVER['PHP_AUTH_USER'])||isset($_SERVER['LOGON_USER']))) // normal login through webserver authentication        
+        elseif(Yii::app()->getConfig("auth_webserver") === true && (isset($_SERVER['PHP_AUTH_USER'])||isset($_SERVER['LOGON_USER']) ||isset($_SERVER['REMOTE_USER']))) // normal login through webserver authentication        
         {
             if (isset($_SERVER['PHP_AUTH_USER'])) {
                 $sUser=$_SERVER['PHP_AUTH_USER'];
+            }
+            elseif (isset($_SERVER['REMOTE_USER'])) {
+                $sUser=$_SERVER['REMOTE_USER'];
             } else {
                 $sUser = $_SERVER['LOGON_USER'];
                 $sUser = substr($sUser, strrpos($sUser, "\\")+1);