summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-18 13:16:04 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-18 13:16:04 +0000
commitb2d8ceed44f684ba749023351a97c002f1e622fc (patch)
tree0a5326f40622a01d0cdf17dc1c6e99a158abb5cd
parent01f6079fedf2c6f6530c4b08388ce3fda9476684 (diff)
- Handle ldap_public misconfiguration
git-svn-id: https://svn.roundcube.net/trunk@5793 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcmail.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index abfb498bc..65877378f 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -489,7 +489,11 @@ class rcmail
if ($ldap_config) {
$ldap_config = (array) $ldap_config;
- foreach ($ldap_config as $id => $prop)
+ foreach ($ldap_config as $id => $prop) {
+ // handle misconfiguration
+ if (empty($prop) || !is_array($prop)) {
+ continue;
+ }
$list[$id] = array(
'id' => $id,
'name' => $prop['name'],
@@ -498,6 +502,7 @@ class rcmail
'hidden' => $prop['hidden'],
'autocomplete' => in_array($id, $autocomplete)
);
+ }
}
$plugin = $this->plugins->exec_hook('addressbooks_list', array('sources' => $list));