diff --git a/public_html/deployment/classes/user.class.php b/public_html/deployment/classes/user.class.php index 756b6ae9efa712f02f0fb60c13297a8d23fffe00..e8d0afe61eca50a16a37337cd9c0ec96ed1e5d3f 100644 --- a/public_html/deployment/classes/user.class.php +++ b/public_html/deployment/classes/user.class.php @@ -137,7 +137,7 @@ class user { */ public function authenticate(){ global $aConfig, $aParams; - print_r($aConfig); + //print_r($aConfig); if(!array_key_exists('auth', $aConfig) || !count($aConfig['auth']) || !array_key_exists('user', $aParams)){ return false; } @@ -161,8 +161,8 @@ class user { if ($oUserAuth && $oUserAuth->authenticate($sUser, $sPassword)){ // set a session - it must correspondent with _autoDetectUser() - $_SESSION["PHP_AUTH_USER"]=$sUser; - $this->setUser(''); + // $_SESSION["PHP_AUTH_USER"]=$sUser; + $this->setUser($sUser); return true; } } @@ -181,12 +181,14 @@ class user { /** * set an authenticated user and get its roles + * @param string $sUser optional: set a given username */ public function setUser($sUser=false){ if($sUser!==false){ $this->_sUsername=$sUser; $_SESSION["PHP_AUTH_USER"]=$sUser; } else { + // check user from basic auth or cli $this->_sUsername=$this->_autoDetectUser(); } $this->_getUserGroups();