summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-08-18 17:21:03 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-08-18 17:21:03 +0200
commit028734b25cfa2ee30a129710db0440617f9f3095 (patch)
tree28a6f364c2d1172a4fae19526fd379870a51a120 /program/lib
parent96f084e9cf30fe714efd4ffd5ac6216b4d773d74 (diff)
Make LDAP errors available to the application
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_ldap.php20
-rw-r--r--program/lib/Roundcube/rcube_ldap_generic.php26
2 files changed, 37 insertions, 9 deletions
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 274616a1f..6805c4902 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -906,7 +906,6 @@ class rcube_ldap extends rcube_addressbook
return $this->result;
}
-
/**
* Get a specific contact record
*
@@ -948,6 +947,23 @@ class rcube_ldap extends rcube_addressbook
return $assoc ? $res : $this->result;
}
+ /**
+ * Returns the last error occurred (e.g. when updating/inserting failed)
+ *
+ * @return array Hash array with the following fields: type, message
+ */
+ function get_error()
+ {
+ $err = $this->error;
+
+ // check ldap connection for errors
+ if (!$err && $this->ldap->get_error()) {
+ $err = array(self::ERROR_SEARCH, $this->ldap->get_error());
+ }
+
+ return $err;
+ }
+
/**
* Check the given data before saving.
@@ -1609,7 +1625,7 @@ class rcube_ldap extends rcube_addressbook
if ($search) {
foreach ($group_cache as $group) {
- if ($this->compare_search_value('name', $group['name'], $search, $mode)) {
+ if ($this->compare_search_value('name', $group['name'], mb_strtolower($search), $mode)) {
$groups[] = $group;
}
}
diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php
index 9823dbb66..a76ad6d06 100644
--- a/program/lib/Roundcube/rcube_ldap_generic.php
+++ b/program/lib/Roundcube/rcube_ldap_generic.php
@@ -32,6 +32,7 @@ class rcube_ldap_generic extends Net_LDAP3
/** private properties */
protected $cache = null;
protected $attributes = array('dn');
+ protected $error;
function __construct($config = null)
{
@@ -88,12 +89,23 @@ class rcube_ldap_generic extends Net_LDAP3
case LOG_ERR:
case LOG_WARNING:
+ $this->error = $msg;
rcube::raise_error($msg, true, false);
break;
}
}
/**
+ * Returns the last LDAP error occurred
+ *
+ * @return mixed Error message string or null if no error occured
+ */
+ function get_error()
+ {
+ return $this->error;
+ }
+
+ /**
* @deprecated
*/
public function set_debug($dbg = true)
@@ -151,7 +163,7 @@ class rcube_ldap_generic extends Net_LDAP3
$this->_debug("C: Replace $dn: ".print_r($entry, true));
if (!ldap_mod_replace($this->conn, $dn, $entry)) {
- $this->_debug("S: ".ldap_error($this->conn));
+ $this->_error("ldap_mod_replace() failed with " . ldap_error($this->conn));
return false;
}
@@ -169,7 +181,7 @@ class rcube_ldap_generic extends Net_LDAP3
$this->_debug("C: Add $dn: ".print_r($entry, true));
if (!ldap_mod_add($this->conn, $dn, $entry)) {
- $this->_debug("S: ".ldap_error($this->conn));
+ $this->_error("ldap_mod_add() failed with " . ldap_error($this->conn));
return false;
}
@@ -187,7 +199,7 @@ class rcube_ldap_generic extends Net_LDAP3
$this->_debug("C: Delete $dn: ".print_r($entry, true));
if (!ldap_mod_del($this->conn, $dn, $entry)) {
- $this->_debug("S: ".ldap_error($this->conn));
+ $this->_error("ldap_mod_del() failed with " . ldap_error($this->conn));
return false;
}
@@ -205,7 +217,7 @@ class rcube_ldap_generic extends Net_LDAP3
$this->_debug("C: Rename $dn to $newrdn");
if (!ldap_rename($this->conn, $dn, $newrdn, $newparent, $deleteoldrdn)) {
- $this->_debug("S: ".ldap_error($this->conn));
+ $this->_error("ldap_rename() failed with " . ldap_error($this->conn));
return false;
}
@@ -228,7 +240,7 @@ class rcube_ldap_generic extends Net_LDAP3
$list = ldap_get_entries($this->conn, $result);
if ($list === false) {
- $this->_debug("S: ".ldap_error($this->conn));
+ $this->_error("ldap_get_entries() failed with " . ldap_error($this->conn));
return array();
}
@@ -238,7 +250,7 @@ class rcube_ldap_generic extends Net_LDAP3
$this->_debug("S: $count record(s)");
}
else {
- $this->_debug("S: ".ldap_error($this->conn));
+ $this->_error("ldap_list() failed with " . ldap_error($this->conn));
}
return $list;
@@ -257,7 +269,7 @@ class rcube_ldap_generic extends Net_LDAP3
if ($this->conn && $dn) {
$result = @ldap_read($this->conn, $dn, $filter, $attributes, 0, (int)$this->config['sizelimit'], (int)$this->config['timelimit']);
if ($result === false) {
- $this->_debug("S: ".ldap_error($this->conn));
+ $this->_error("ldap_read() failed with " . ldap_error($this->conn));
return false;
}