diff --git a/webui/language/de/messages.php b/webui/language/de/messages.php
index 276dec2..bb748a8 100644
--- a/webui/language/de/messages.php
+++ b/webui/language/de/messages.php
@@ -479,5 +479,6 @@
$_['text_cumulative_counts'] = "Cumulative counts";
$_['text_message_disposition'] = "Message Disposition";
+$_['text_assigned_email_addresses'] = "Assigned email addresses";
?>
diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php
index 8047e7b..03faae7 100644
--- a/webui/language/en/messages.php
+++ b/webui/language/en/messages.php
@@ -26,6 +26,7 @@
$_['text_archive_size_before_compression'] = "Archive size before compression";
$_['text_archived_messages'] = "Archived messages";
$_['text_archiving_rules'] = "Archiving rules";
+$_['text_assigned_email_addresses'] = "Assigned email addresses";
$_['text_attachment'] = "Attachment";
$_['text_attachment_name'] = "Attachment name";
$_['text_attachment_size'] = "Attachment size";
diff --git a/webui/language/es/messages.php b/webui/language/es/messages.php
index 3fde3ed..efc9b6b 100644
--- a/webui/language/es/messages.php
+++ b/webui/language/es/messages.php
@@ -478,5 +478,6 @@
$_['text_cumulative_counts'] = "Cumulative counts";
$_['text_message_disposition'] = "Message Disposition";
+$_['text_assigned_email_addresses'] = "Assigned email addresses";
?>
diff --git a/webui/language/hu/messages.iso-8859-2.php b/webui/language/hu/messages.iso-8859-2.php
index a4daf97..114fc7c 100644
--- a/webui/language/hu/messages.iso-8859-2.php
+++ b/webui/language/hu/messages.iso-8859-2.php
@@ -26,6 +26,7 @@
$_['text_archive_size_before_compression'] = "Arch�vum m�ret t�m�r�t�s n�lk�l";
$_['text_archived_messages'] = "Archiv�lt levelek";
$_['text_archiving_rules'] = "Archiv�l�si szab�lyok";
+$_['text_assigned_email_addresses'] = "Extra email c�mek";
$_['text_attachment'] = "Mell�klet";
$_['text_attachment_name'] = "Mell�klet n�v";
$_['text_attachment_size'] = "Mell�klet m�ret";
diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php
index 18fb0e6..351916b 100644
--- a/webui/language/hu/messages.php
+++ b/webui/language/hu/messages.php
@@ -26,6 +26,7 @@
$_['text_archive_size_before_compression'] = "Archívum méret tömörítés nélkül";
$_['text_archived_messages'] = "Archivált levelek";
$_['text_archiving_rules'] = "Archiválási szabályok";
+$_['text_assigned_email_addresses'] = "Extra email címek";
$_['text_attachment'] = "Melléklet";
$_['text_attachment_name'] = "Melléklet név";
$_['text_attachment_size'] = "Melléklet méret";
diff --git a/webui/language/pt/messages.php b/webui/language/pt/messages.php
index 17dbb35..f3351e7 100644
--- a/webui/language/pt/messages.php
+++ b/webui/language/pt/messages.php
@@ -468,5 +468,6 @@
$_['text_cumulative_counts'] = "Cumulative counts";
$_['text_message_disposition'] = "Message Disposition";
+$_['text_assigned_email_addresses'] = "Assigned email addresses";
?>
diff --git a/webui/language/ru/messages.php b/webui/language/ru/messages.php
index bf77224..67ef977 100644
--- a/webui/language/ru/messages.php
+++ b/webui/language/ru/messages.php
@@ -476,4 +476,6 @@
$_['text_customer_delete_confirm_message'] = 'Вы хотите уделить потребителя';
$_['text_with_selected'] = 'С выделенным';
+$_['text_assigned_email_addresses'] = "Assigned email addresses";
+
?>
diff --git a/webui/language/tr/messages.php b/webui/language/tr/messages.php
index 1520572..2002008 100644
--- a/webui/language/tr/messages.php
+++ b/webui/language/tr/messages.php
@@ -476,5 +476,6 @@
$_['text_cumulative_counts'] = "Cumulative counts";
$_['text_message_disposition'] = "Message Disposition";
+$_['text_assigned_email_addresses'] = "Assigned email addresses";
?>
diff --git a/webui/model/user/auth.php b/webui/model/user/auth.php
index a7c9410..c5cae64 100644
--- a/webui/model/user/auth.php
+++ b/webui/model/user/auth.php
@@ -201,7 +201,7 @@
$data = array();
foreach($e as $a) {
- syslog(LOG_INFO, "checking ldap entry dn: " . $a['dn'] . ", cn: " . $a['cn']);
+ //syslog(LOG_INFO, "checking ldap entry dn: " . $a['dn'] . ", cn: " . $a['cn']);
foreach (array("mail", "mailalternateaddress", "proxyaddresses", "zimbraMailForwardingAddress", "member", "memberOfGroup") as $mailattr) {
if(isset($a[$mailattr])) {
@@ -209,7 +209,7 @@
if(is_array($a[$mailattr])) {
for($i = 0; $i < $a[$mailattr]['count']; $i++) {
- syslog(LOG_INFO, "checking entry: " . $a[$mailattr][$i]);
+ //syslog(LOG_INFO, "checking entry: " . $a[$mailattr][$i]);
$a[$mailattr][$i] = strtolower($a[$mailattr][$i]);
@@ -225,7 +225,7 @@
}
}
else {
- syslog(LOG_INFO, "checking entry #2: " . $a[$mailattr]);
+ //syslog(LOG_INFO, "checking entry #2: " . $a[$mailattr]);
$email = strtolower(preg_replace("/^([\w]+)\:/i", "", $a[$mailattr]));
if(validemail($email) && !in_array($email, $data)) { array_push($data, $email); }
@@ -383,7 +383,11 @@
return 0;
}
- $query = $ldap->query(LDAP_BASE_DN, "(|(&(objectClass=user)(proxyAddresses=smtp:$username))(&(objectClass=group)(member=$username))(&(objectClass=group)(member=" . stripslashes($a['dn']) . ")))", array());
+ $ldap_mail_attr = LDAP_MAIL_ATTR;
+ if(LDAP_MAIL_ATTR == 'proxyAddresses') { $ldap_mail_attr = 'proxyAddresses=smtp:'; }
+
+ $query = $ldap->query(LDAP_BASE_DN, "(|(&(objectClass=user)(" . $ldap_mail_attr . "=$username))(&(objectClass=group)(member=$username))(&(objectClass=group)(member=" . stripslashes($a['dn']) . ")))", array());
+
$emails = $this->get_email_array_from_ldap_attr($query->rows);
diff --git a/webui/model/user/user.php b/webui/model/user/user.php
index e4bf1d8..36bff47 100644
--- a/webui/model/user/user.php
+++ b/webui/model/user/user.php
@@ -76,8 +76,11 @@
public function get_email_addresses_from_groups($emails = array()) {
$data = array();
+ $q = str_repeat("?,", count($emails));
- $query = $this->db->query("SELECT g.email FROM `" . TABLE_GROUP_EMAIL . "` g WHERE g.id IN (SELECT u.id FROM `" . TABLE_GROUP_USER . "` u WHERE u.email IN (?))", $emails);
+ $q = substr($q, 0, strlen($q)-1);
+
+ $query = $this->db->query("SELECT g.email FROM `" . TABLE_GROUP_EMAIL . "` g WHERE g.id IN (SELECT u.id FROM `" . TABLE_GROUP_USER . "` u WHERE u.email IN ($q))", $emails);
if(isset($query->rows)) {
foreach ($query->rows as $q) {
diff --git a/webui/system/helper/detectmobilebrowser.php b/webui/system/helper/detectmobilebrowser.php
index 76dd57a..b4026c0 100644
--- a/webui/system/helper/detectmobilebrowser.php
+++ b/webui/system/helper/detectmobilebrowser.php
@@ -4,7 +4,8 @@
if(!isset($_SERVER['HTTP_USER_AGENT'])) { define('OUTLOOK', 0); return 0; }
- if(strstr($_SERVER['HTTP_USER_AGENT'], "Microsoft Outlook")) { define('OUTLOOK', 1); } else { define('OUTLOOK', 0); }
+ //if(strstr($_SERVER['HTTP_USER_AGENT'], "Microsoft Outlook")) { define('OUTLOOK', 1); } else { define('OUTLOOK', 0); }
+ define('OUTLOOK', 0);
if(preg_match('/(android|ipad|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$_SERVER['HTTP_USER_AGENT'])||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($_SERVER['HTTP_USER_AGENT'],0,4))) { return 1; }
diff --git a/webui/view/theme/default/templates/common/layout-search.tpl b/webui/view/theme/default/templates/common/layout-search.tpl
index 9e36c65..a23249d 100644
--- a/webui/view/theme/default/templates/common/layout-search.tpl
+++ b/webui/view/theme/default/templates/common/layout-search.tpl
@@ -10,7 +10,7 @@
-
+
diff --git a/webui/view/theme/default/templates/health/worker.tpl b/webui/view/theme/default/templates/health/worker.tpl
index 0f1a3ca..3f0b221 100644
--- a/webui/view/theme/default/templates/health/worker.tpl
+++ b/webui/view/theme/default/templates/health/worker.tpl
@@ -4,7 +4,7 @@