From 9e4246d9571481fe7b80227b1e23dc013771c5af Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 16 Nov 2014 14:04:53 +0100
Subject: Code improvements and fixes (mostly unused variables and methods)

---
 program/lib/Roundcube/rcube_ldap.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'program/lib/Roundcube/rcube_ldap.php')

diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 6805c4902..9d7e6b836 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -64,7 +64,6 @@ class rcube_ldap extends rcube_addressbook
 
     private $base_dn        = '';
     private $groups_base_dn = '';
-    private $group_url;
     private $group_data;
     private $group_search_cache;
     private $cache;
@@ -775,7 +774,7 @@ class rcube_ldap extends rcube_addressbook
 
             // get all entries of this page and post-filter those that really match the query
             $search = mb_strtolower($value);
-            foreach ($ldap_data as $i => $entry) {
+            foreach ($ldap_data as $entry) {
                 $rec = $this->_ldap2result($entry);
                 foreach ($fields as $f) {
                     foreach ((array)$rec[$f] as $val) {
@@ -1531,7 +1530,6 @@ class rcube_ldap extends rcube_addressbook
         return $ldap_data;
     }
 
-
     /**
      * Returns unified attribute name (resolving aliases)
      */
@@ -1562,17 +1560,6 @@ class rcube_ldap extends rcube_addressbook
         return count(array_intersect(array_keys($this->group_types), $classes)) > 0;
     }
 
-    /**
-     * Prints debug info to the log
-     */
-    private function _debug($str)
-    {
-        if ($this->debug) {
-            rcube::write_log('ldap', $str);
-        }
-    }
-
-
     /**
      * Activate/deactivate debug mode
      *
@@ -1587,7 +1574,6 @@ class rcube_ldap extends rcube_addressbook
         }
     }
 
-
     /**
      * Setter for the current group
      */
@@ -1990,7 +1976,7 @@ class rcube_ldap extends rcube_addressbook
         $filter = strtr("(|(member=$contact_dn)(uniqueMember=$contact_dn)$add_filter)", array('\\' => '\\\\'));
 
         $ldap_data = $this->ldap->search($base_dn, $filter, 'sub', array('dn', $name_attr));
-        if ($res === false) {
+        if ($ldap_data === false) {
             return array();
         }
 
-- 
cgit v1.2.3