bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-11-04 01:42:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

added customisation to imap authentication

Browse Source
This commit is contained in:
SJ
2015-11-26 14:59:40 +01:00
parent aefd7ccba4
commit d88b419624
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webui/config.php
View File

@@ -25,6 +25,7 @@ $config['BRANDING_FAVICON'] = '/view/theme/default/assets/ico/favicon.png';
$config['SUPPORT_LINK'] = '';
$config['TITLE_PREFIX'] = '';
$config['CUSTOM_PRE_AUTH_FUNCTION'] = '';
$config['CUSTOM_EMAIL_QUERY_FUNCTION'] = '';
$config['BOOTSTRAP_THEME'] = '-cosmo';

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

@@ -23,6 +23,8 @@ class ModelUserAuth extends Model {
$session = Registry::get('session');
$ok = 0;
$imap_server = array();
$data = array();
$data['username'] = '';
@@ -37,6 +39,11 @@ class ModelUserAuth extends Model {
if($username == '' || $password == '') { return 0; }
if(CUSTOM_PRE_AUTH_FUNCTION && function_exists(CUSTOM_PRE_AUTH_FUNCTION)) {
call_user_func(CUSTOM_PRE_AUTH_FUNCTION, $username);
}
if(ENABLE_LDAP_AUTH == 1) {
$ok = $this->checkLoginAgainstLDAP($username, $password, $data);
if($ok == 1) {
@@ -50,7 +57,12 @@ class ModelUserAuth extends Model {
if(ENABLE_IMAP_AUTH == 1) {
require 'Zend/Mail/Protocol/Imap.php';
$ok = $this->checkLoginAgainstIMAP($username, $password, $data);
if(!isset($imap_server['IMAP_HOST'])) { $imap_server['IMAP_HOST'] = IMAP_HOST;
if(!isset($imap_server['IMAP_PORT'])) { $imap_server['IMAP_PORT'] = IMAP_PORT;
if(!isset($imap_server['IMAP_SSL'])) { $imap_server['IMAP_SSL'] = IMAP_SSL;
$ok = $this->checkLoginAgainstIMAP($imap_server, $username, $password, $data);
if($ok == 1) {
if(CUSTOM_EMAIL_QUERY_FUNCTION && function_exists(CUSTOM_EMAIL_QUERY_FUNCTION)) {
@@ -336,7 +348,7 @@ class ModelUserAuth extends Model {
}
private function checkLoginAgainstIMAP($username = '', $password = '', $data = array()) {
private function checkLoginAgainstIMAP($imap_server = array(), $username = '', $password = '', $data = array()) {
$session = Registry::get('session');
$emails = array($username);
@@ -349,7 +361,7 @@ class ModelUserAuth extends Model {
$login = $a[0];
}
$imap = new Zend_Mail_Protocol_Imap(IMAP_HOST, IMAP_PORT, IMAP_SSL);
$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();