Branch 'kolab-webadmin-3.1' - lib/Auth

[Aleksander Machniak]

 lib/Auth/LDAP.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2326618b3afabdc5b3506de9e2d5a7c46e3bb9f4
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Aug 25 21:14:26 2014 -0400

    Fix so LDAP internal debug is enabled only when debug_mode=trace (#3535)

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index d4b0fd9..262768c 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -43,7 +43,7 @@ class LDAP extends Net_LDAP3 {
         // Causes nesting levels to be too deep...?
         //$this->config_set('config_get_hook', array($this, "_config_get"));
 
-        $this->config_set("debug", true);
+        $this->config_set("debug", Log::mode() == Log::TRACE);
         $this->config_set("log_hook", array($this, "_log"));
 
         $this->config_set("config_root_dn", "cn=config");
@@ -1172,6 +1172,9 @@ class LDAP extends Net_LDAP3 {
                 Log::debug($str . $msg);
                 break;
             case LOG_ERR:
+            case LOG_ALERT:
+            case LOG_CRIT:
+            case LOG_EMERG:
                 Log::error($str . $msg);
                 break;
             case LOG_INFO:
@@ -1180,9 +1183,6 @@ class LDAP extends Net_LDAP3 {
             case LOG_WARNING:
                 Log::warning($str . $msg);
                 break;
-            case LOG_ALERT:
-            case LOG_CRIT:
-            case LOG_EMERG:
             case LOG_NOTICE:
             default:
                 Log::trace($str . $msg);