Limit for autocompleter, sort autocompletition results

[gosa.git] / gosa-core / include / class_log.inc

diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc
index fa4482e6b3b97ad794f8abde63e86ee546fb8179..4b846e5722e26f1811178f9ba6aac370a5a51eb7 100644 (file)
--- a/gosa-core/include/class_log.inc
+++ b/gosa-core/include/class_log.inc
@@ -52,11 +52,11 @@ class log {
     }
 
     $entry = array(); 
-    if(!session::is_set('config')){
+    if(!session::global_is_set('config')){
       $entry['user']= "unkown";
     }else{
 
-      $this->config = session::get('config');
+      $this->config = session::global_get('config');
       $ui           = get_userinfo(); 
       $entry['user']= @$ui->dn;
     }
@@ -76,7 +76,7 @@ class log {
     $entry['changes']   = $changes;
     $entry['result']    = $result;
 
-    if(!isset($this->config->current['LOGGING']) && empty($entry['user'])){
+    if(!isset($this->config) || ( $this->config->get_cfg_value("logging") == ""  && empty($entry['user']))){
       $entry['user']  = "unknown";
     }
  
@@ -90,16 +90,18 @@ class log {
       
     }else{
 
-      if(!isset($this->config->current['LOGGING'])){
-        $this->log_into_syslog($entry);
-      }else{
-
-        /* Start logging for configured methods */
-        if(isset($this->config->current['LOGGING']) && preg_match("/(^|,)syslog(,|$)/i",$this->config->current['LOGGING'])){
+      if (isset ($this->config)){
+        if ($this->config->get_cfg_value("logging") == ""){
           $this->log_into_syslog($entry);
-        }
-        if(isset($this->config->current['LOGGING']) && preg_match("/(^|,)mysql(,|$)/i",$this->config->current['LOGGING'])){
-          $this->log_into_db($entry);
+        }else{
+
+          /* Start logging for configured methods */
+          if(preg_match("/(^|,)syslog(,|$)/i",$this->config->get_cfg_value("logging"))){
+            $this->log_into_syslog($entry);
+          }
+          if(preg_match("/(^|,)mysql(,|$)/i",$this->config->get_cfg_value("logging"))){
+            $this->log_into_db($entry);
+          }
         }
       }
     }