lib/ext

Aleksander Machniak machniak at kolabsys.com
Tue Oct 23 20:00:17 CEST 2012


 lib/ext/Net/LDAP3.php |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 041d0cb270f18b067b50273bc73f54eea2a8d7f1
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Oct 23 19:59:45 2012 +0200

    Remove Log class usage (#1134)

diff --git a/lib/ext/Net/LDAP3.php b/lib/ext/Net/LDAP3.php
index 1f0321f..2980076 100644
--- a/lib/ext/Net/LDAP3.php
+++ b/lib/ext/Net/LDAP3.php
@@ -127,7 +127,6 @@ class Net_LDAP3
      */
     public function __construct($config = Array())
     {
-        Log::trace("Net_LDAP3 being constructed");
         if (!empty($config) && is_array($config)) {
             foreach ($config as $key => $value) {
                 if (!isset($this->config[$key]) || empty($this->config[$key])) {
@@ -258,7 +257,7 @@ class Net_LDAP3
                     }
                 }
             } else {
-                Log::warning("LDAP: No schema details exist for attribute $attribute (which is strange)");
+                $this->_warning("LDAP: No schema details exist for attribute $attribute (which is strange)");
             }
 
             // The relevant parts only, please
@@ -434,8 +433,6 @@ class Net_LDAP3
      */
     public function connect()
     {
-        Log::trace("Net_LDAP3 connecting");
-
         if (!function_exists('ldap_connect')) {
             new PEAR_Error("No ldap support in this PHP installation", 100);
             return FALSE;
@@ -1874,7 +1871,7 @@ class Net_LDAP3
             }
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
-                Log::warning("LDAP: Failed to rename $olddn to $newrdn,$new_parent");
+                $this->_warning("LDAP: Failed to rename $olddn to $newrdn,$new_parent");
                 return FALSE;
             }
         }
@@ -1889,7 +1886,7 @@ class Net_LDAP3
             }
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
-                Log::warning("LDAP: Failed to replace attributes on $subject_dn: " . json_encode($attributes['replace']));
+                $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . json_encode($attributes['replace']));
                 return FALSE;
             }
         }
@@ -1904,7 +1901,7 @@ class Net_LDAP3
             }
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
-                Log::warning("LDAP: Failed to delete attributes on $subject_dn: " . json_encode($attributes['del']));
+                $this->_warning("LDAP: Failed to delete attributes on $subject_dn: " . json_encode($attributes['del']));
                 return FALSE;
             }
         }
@@ -1920,7 +1917,7 @@ class Net_LDAP3
             }
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
-                Log::warning("LDAP: Failed to add attributes on $subject_dn: " . json_encode($attributes['add']));
+                $this->_warning("LDAP: Failed to add attributes on $subject_dn: " . json_encode($attributes['add']));
                 return FALSE;
             }
         }





More information about the commits mailing list