From f01835508614938c2cf0382b82ea62c2c4dedd16 Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 28 Jan 2010 11:27:16 +0000 Subject: - add file/line definitions to raise_error() calls git-svn-id: https://svn.roundcube.net/trunk@3231 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_ldap.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'roundcubemail/program/include/rcube_ldap.php') diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php index 286bbff53..2b2bec280 100644 --- a/roundcubemail/program/include/rcube_ldap.php +++ b/roundcubemail/program/include/rcube_ldap.php @@ -84,7 +84,9 @@ class rcube_ldap extends rcube_addressbook global $RCMAIL; if (!function_exists('ldap_connect')) - raise_error(array('code' => 100, 'type' => 'ldap', 'message' => "No ldap support in this installation of PHP"), true); + raise_error(array('code' => 100, 'type' => 'ldap', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "No ldap support in this installation of PHP"), true); if (is_resource($this->conn)) return true; @@ -140,7 +142,9 @@ class rcube_ldap extends rcube_addressbook $this->ready = $this->bind($this->prop['bind_dn'], $this->prop['bind_pass']); } else - raise_error(array('code' => 100, 'type' => 'ldap', 'message' => "Could not connect to any LDAP server, tried $host:{$this->prop[port]} last"), true); + raise_error(array('code' => 100, 'type' => 'ldap', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Could not connect to any LDAP server, last tried $host:{$this->prop[port]}"), true); // See if the directory is writeable. if ($this->prop['writable']) { @@ -173,8 +177,8 @@ class rcube_ldap extends rcube_addressbook $this->_debug("S: ".ldap_error($this->conn)); raise_error(array( - 'code' => ldap_errno($this->conn), - 'type' => 'ldap', + 'code' => ldap_errno($this->conn), 'type' => 'ldap', + 'file' => __FILE__, 'line' => __LINE__, 'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)), true); -- cgit v1.2.3