added custom func support to ldap auth as well

This commit is contained in:
SJ 2015-06-23 15:46:04 +02:00
parent b992eb467d
commit 3668fcbb0f
2 changed files with 22 additions and 13 deletions

View File

@ -55,24 +55,27 @@ class ControllerLoginLogin extends Controller {
else { else {
$data = $session->get("auth_data"); $data = $session->get("auth_data");
$this->model_user_auth->apply_user_auth_session($data);
$session->remove("auth_data");
$this->model_user_prefs->get_user_preferences($session->get('username')); if(isset($data['username'])) {
$this->model_user_auth->apply_user_auth_session($data);
$session->remove("auth_data");
if(ENABLE_SAAS == 1) { $this->model_user_prefs->get_user_preferences($session->get('username'));
$this->model_saas_customer->online($session->get('email'));
}
LOGGER('logged in'); if(ENABLE_SAAS == 1) {
$this->model_saas_customer->online($session->get('email'));
}
if(isAdminUser() == 1) { LOGGER('logged in');
header("Location: " . SITE_URL . "index.php?route=health/health");
if(isAdminUser() == 1) {
header("Location: " . SITE_URL . "index.php?route=health/health");
exit;
}
header("Location: " . SITE_URL . "search.php");
exit; exit;
} }
header("Location: " . SITE_URL . "search.php");
exit;
} }
} }
else { else {

View File

@ -41,7 +41,13 @@ class ModelUserAuth extends Model {
if(ENABLE_LDAP_AUTH == 1) { if(ENABLE_LDAP_AUTH == 1) {
$ok = $this->checkLoginAgainstLDAP($username, $password, $data); $ok = $this->checkLoginAgainstLDAP($username, $password, $data);
if($ok == 1) { return $ok; } if($ok == 1) {
if(CUSTOM_EMAIL_QUERY_FUNCTION && function_exists(CUSTOM_EMAIL_QUERY_FUNCTION)) {
call_user_func(CUSTOM_EMAIL_QUERY_FUNCTION, $username);
}
return $ok;
}
} }
if(ENABLE_IMAP_AUTH == 1) { if(ENABLE_IMAP_AUTH == 1) {