bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-10-31 18:12:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added exception handling for gui imap auth

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2018-09-09 14:35:18 +00:00
parent 4efe39b5f3
commit 1ea62b8446
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
webui/model/user/auth.php
View File

@@ -362,6 +362,7 @@ class ModelUserAuth extends Model {
private function checkLoginAgainstIMAP($imap_server = array(), $username = '', $password = '', $data = array()) {
$rc = 0;
$session = Registry::get('session');
$emails = array($username);
@@ -378,30 +379,33 @@ class ModelUserAuth extends Model {
$login = $a[0];
}
$imap = new Zend_Mail_Protocol_Imap($imap_server['IMAP_HOST'], $imap_server['IMAP_PORT'], $imap_server['IMAP_SSL']);
if($imap->login($login, $password)) {
$imap->logout();
try {
$imap = new Zend_Mail_Protocol_Imap($imap_server['IMAP_HOST'], $imap_server['IMAP_PORT'], $imap_server['IMAP_SSL']);
if($imap->login($login, $password)) {
$imap->logout();
$extra_emails = $this->model_user_user->get_email_addresses_from_groups($emails);
$emails = array_merge($emails, $extra_emails);
$extra_emails = $this->model_user_user->get_email_addresses_from_groups($emails);
$emails = array_merge($emails, $extra_emails);
$data['username'] = $username;
$data['email'] = $username;
$data['emails'] = $emails;
$data['role'] = 0;
$data['username'] = $username;
$data['email'] = $username;
$data['emails'] = $emails;
$data['role'] = 0;
$data = $this->fix_user_data($username, $username, $emails, 0);
$data = $this->fix_user_data($username, $username, $emails, 0);
$this->is_ga_code_needed($username);
$this->is_ga_code_needed($username);
$session->set("auth_data", $data);
$session->set("auth_data", $data);
$session->set("password", $password);
$session->set("password", $password);
return 1;
$rc = 1;
}
}
catch (Zend_Mail_Protocol_Exception $e) {}
return 0;
return $rc;
}