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

group fix

Browse Source
This commit is contained in:
SJ 2015-03-10 16:22:19 +01:00
parent 1bc91cbf79
commit cfa47280ce
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webui/model/group/group.php
View File

@ -178,16 +178,20 @@ class ModelGroupGroup extends Model {
public function get_emails_by_string($s = '', $page = 0, $page_len = PAGE_LEN) {
$emails = array();
$username_prefix = '';
$from = (int)$page * (int)$page_len;
if(strlen($s) < 1) { return array(); }
if(ENABLE_LDAP_AUTH == 1) {
if(LDAP_MAIL_ATTR == 'proxyAddresses') { $username_prefix = 'smtp:'; }
$ldap = new LDAP(LDAP_HOST, LDAP_HELPER_DN, LDAP_HELPER_PASSWORD);
if($ldap->is_bind_ok()) {
$query = $ldap->query(LDAP_BASE_DN, "(&(objectClass=" . LDAP_ACCOUNT_OBJECTCLASS . ")(" . LDAP_MAIL_ATTR . "=" . $s . "*))", array());
$query = $ldap->query(LDAP_BASE_DN, "(&(objectClass=" . LDAP_ACCOUNT_OBJECTCLASS . ")(" . LDAP_MAIL_ATTR . "=" . $username_prefix . $s . "*))", array());
if(isset($query->rows)) {
$emails = $this->model_user_auth->get_email_array_from_ldap_attr($query->rows);

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

@ -105,6 +105,9 @@ class ModelUserAuth extends Model {
$data['emails'] = $this->model_user_user->get_users_all_email_addresses($query->row['uid']);
}
$extra_emails = $this->model_user_user->get_email_addresses_from_groups($data['emails']);
$data['emails'] = array_merge($data['emails'], $extra_emails);
$data['folders'] = $this->model_folder_folder->get_all_folder_ids($query->row['uid']);
$data['extra_folders'] = $this->model_folder_folder->get_all_extra_folder_ids($query->row['uid']);