Skip to content
Snippets Groups Projects
Commit 0c4fd6b0 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

update user authenticate()

parent 91f418ee
No related branches found
No related tags found
1 merge request!62V2.0
...@@ -145,7 +145,6 @@ class user { ...@@ -145,7 +145,6 @@ class user {
*/ */
public function authenticate(){ public function authenticate(){
global $aConfig, $aParams; global $aConfig, $aParams;
//print_r($aConfig);
if(!isset($aConfig['auth']) || !is_array($aConfig['auth']) || !count($aConfig['auth']) || !isset($aParams['user'])){ if(!isset($aConfig['auth']) || !is_array($aConfig['auth']) || !count($aConfig['auth']) || !isset($aParams['user'])){
return false; return false;
} }
...@@ -173,6 +172,10 @@ class user { ...@@ -173,6 +172,10 @@ class user {
$this->setUser($sUser); $this->setUser($sUser);
return true; return true;
} }
// if authentication fails then continue and try next method
if(!$oUserAuth){
echo "DEBUG: ERROR oUserAuth waasn't initialized for [$sAuthMethod].<br>";
}
} }
return false; return false;
} }
...@@ -241,14 +244,14 @@ class user { ...@@ -241,14 +244,14 @@ class user {
} }
/** /**
* get a flat array with roles of the current user * get a flat array with roles of the current user
* @return string * @return array
*/ */
public function getUserGroups(){ public function getUserGroups(){
return $this->_aUserGroups; return $this->_aUserGroups;
} }
/** /**
* get a flat array with roles of the current user * get a flat array with roles of the current user
* @return string * @return array
*/ */
public function getUserPermission(){ public function getUserPermission(){
return $this->_aUserPermmissions; return $this->_aUserPermmissions;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment