bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 07:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

imap auth fix

Browse Source
This commit is contained in:
SJ 2015-01-15 23:29:48 +01:00
parent ef67c1f561
commit e48db5b8b7
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webui/config.php
View File

@ -25,6 +25,8 @@ $config['BRANDING_FAVICON'] = '/view/theme/default/assets/ico/favicon.png';
$config['SUPPORT_LINK'] = ''; $config['SUPPORT_LINK'] = '';
$config['TITLE_PREFIX'] = ''; $config['TITLE_PREFIX'] = '';
$config['CUSTOM_EMAIL_QUERY_FUNCTION'] = '';
$config['BOOTSTRAP_THEME'] = '-cosmo'; $config['BOOTSTRAP_THEME'] = '-cosmo';
$config['DEFAULT_LANG'] = 'en'; $config['DEFAULT_LANG'] = 'en';
@ -100,6 +102,8 @@ $config['LDAP_MAIL_ATTR'] = 'proxyAddresses';
// enable single sign-on (disabled by default) // enable single sign-on (disabled by default)
$config['ENABLE_SSO_LOGIN'] = 0; $config['ENABLE_SSO_LOGIN'] = 0;
$config['STRIP_DOMAIN_NAME_FROM_USERNAME'] = 0;
// enable authentication against an imap server (disabled by default) // enable authentication against an imap server (disabled by default)
$config['ENABLE_IMAP_AUTH'] = 0; $config['ENABLE_IMAP_AUTH'] = 0;

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

@ -16,13 +16,27 @@ class ModelUserAuth extends Model {
if(ENABLE_IMAP_AUTH == 1) { if(ENABLE_IMAP_AUTH == 1) {
require 'Zend/Mail/Protocol/Imap.php'; require 'Zend/Mail/Protocol/Imap.php';
$ok = $this->checkLoginAgainstIMAP($username, $password); $ok = $this->checkLoginAgainstIMAP($username, $password);
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_POP3_AUTH == 1) { if(ENABLE_POP3_AUTH == 1) {
require 'Zend/Mail/Protocol/Pop3.php'; require 'Zend/Mail/Protocol/Pop3.php';
$ok = $this->checkLoginAgainstPOP3($username, $password); $ok = $this->checkLoginAgainstPOP3($username, $password);
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;
}
} }
// fallback local auth // fallback local auth
@ -56,7 +70,14 @@ class ModelUserAuth extends Model {
$session->set("realname", $query->row['realname']); $session->set("realname", $query->row['realname']);
$session->set("auditdomains", $this->model_user_user->get_users_all_domains($query->row['uid'])); $session->set("auditdomains", $this->model_user_user->get_users_all_domains($query->row['uid']));
$session->set("emails", $this->model_user_user->get_users_all_email_addresses($query->row['uid']));
if(CUSTOM_EMAIL_QUERY_FUNCTION && function_exists(CUSTOM_EMAIL_QUERY_FUNCTION)) {
call_user_func(CUSTOM_EMAIL_QUERY_FUNCTION, $username);
}
else {
$session->set("emails", $this->model_user_user->get_users_all_email_addresses($query->row['uid']));
}
$session->set("folders", $this->model_folder_folder->get_all_folder_ids($query->row['uid'])); $session->set("folders", $this->model_folder_folder->get_all_folder_ids($query->row['uid']));
$session->set("extra_folders", $this->model_folder_folder->get_all_extra_folder_ids($query->row['uid'])); $session->set("extra_folders", $this->model_folder_folder->get_all_extra_folder_ids($query->row['uid']));
@ -307,8 +328,15 @@ class ModelUserAuth extends Model {
if(!strchr($username, '@')) { return 0; } if(!strchr($username, '@')) { return 0; }
$login = $username;
if(STRIP_DOMAIN_NAME_FROM_USERNAME == 1) {
$a = explode("@", $username);
$login = $a[0];
}
$imap = new Zend_Mail_Protocol_Imap(IMAP_HOST, IMAP_PORT, IMAP_SSL); $imap = new Zend_Mail_Protocol_Imap(IMAP_HOST, IMAP_PORT, IMAP_SSL);
if($imap->login($username, $password)) { if($imap->login($login, $password)) {
$imap->logout(); $imap->logout();
$extra_emails = $this->model_user_user->get_email_addresses_from_groups($emails); $extra_emails = $this->model_user_user->get_email_addresses_from_groups($emails);