X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_log.inc;h=af687c39e605b2c64bcdc03cd0d0f0bc9ed97470;hb=b6ceb3ba053010e9a0559d2569e29c229bafeeaa;hp=2a9810f38e4845f909253886fa6aff2ef14f1b22;hpb=393402bd6f7875b422726b00aad7c69bdaca55e7;p=gosa.git

diff --git a/include/class_log.inc b/include/class_log.inc
index 2a9810f38..af687c39e 100644
--- a/include/class_log.inc
+++ b/include/class_log.inc
@@ -31,7 +31,7 @@ class log {
 
   var $LOG_TO_MYSQL = FALSE;
   var $LOG_TO_SYSLOG= FALSE;
-  
+  var $config;
 
  /*! \brief logging constructor
 
@@ -45,8 +45,20 @@ class log {
    */
   function log($action,$objecttype,$object,$changes_array = array(),$result = TRUE)
   {
-    global $config;
-    $ui   = get_userinfo(); 
+    if(!is_array($changes_array)){
+      trigger_error("log(string,string,string,array(),bool). Forth parameter must be an array.");
+      $changes_array = array();
+    }
+
+    $entry = array(); 
+    if(!isset($_SESSION['config'])){
+      $entry['user']= "unkown";
+    }else{
+
+      $this->config = &$_SESSION['config'];
+      $ui           = get_userinfo(); 
+      $entry['user']= @$ui->dn;
+    }
 
     /* Create string out of changes */
     $changes  ="";
@@ -56,29 +68,38 @@ class log {
     $changes = preg_replace("/,$/","",$changes );
     
     /* Create data object */
-    $entry = array(); 
     $entry['timestamp'] = time();
-    $entry['user']      = $ui->dn;
     $entry['action']    = $action;
     $entry['objecttype']= $objecttype;
     $entry['object']    = $object;
     $entry['changes']   = $changes;
     $entry['result']    = $result;
+
+    if(!isset($this->config->current['LOGGING']) && empty($entry['user'])){
+      $entry['user']  = "unknown";
+    }
  
     /* Check if all given values are valid */
     $msgs = @log::check($entry);
     if(count($msgs)){
       foreach($msgs as $msg){
         trigger_error("Logging failed, reason was: ".$msg);
+        print_red("Logging failed, reason was: ".$msg); 
       }
+      
     }else{
 
-      /* Start logging for configured methods */
-      if(isset($this->config->current['LOGGING']) && preg_match("/(^|,)syslog(,|$)/i",$this->config->current['LOGGING'])){
-        @log::log_into_syslog($entry);
-      }
-      if(isset($this->config->current['LOGGING']) && preg_match("/(^|,)mysql(,|$)/i",$this->config->current['LOGGING'])){
-        @log::log_into_db($entry);
+      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'])){
+          $this->log_into_syslog($entry);
+        }
+        if(isset($this->config->current['LOGGING']) && preg_match("/(^|,)mysql(,|$)/i",$this->config->current['LOGGING'])){
+          $this->log_into_db($entry);
+        }
       }
     }
   }
@@ -87,11 +108,11 @@ class log {
   function check($entry = array())
   {
     $msgs = array();
-    if(!isset($entry['user']) || empty($entry['user'])){
-      $msgs[] = "Currently active user is empty.";
-    }
+  #  if(!isset($entry['user']) || empty($entry['user'])){
+  #    $msgs[] = "Currently active user is empty.";
+  #  }
 
-    if(!isset($entry['action']) || !in_array($entry['action'],array("modify","create","remove","copy","snapshot"))){
+    if(!isset($entry['action']) || !in_array($entry['action'],array("modify","create","remove","copy","snapshot","view","security","debug"))){
       $msgs[] = "Invalid option specified '".$entry['action']."'";
     }
 
@@ -106,7 +127,7 @@ class log {
   /* This function is used to into the systems syslog */
   function log_into_syslog($entry)
   {
-    $str = $entry['user']." ".$entry['action']." ".$entry['object']." from type ".$entry['objecttype']." ".$data." : Result was ".$entry['result'];
+    $str = $entry['user']." ".$entry['action']." ".$entry['object']." from type ".$entry['objecttype']." ".$entry['changes']." : Result was ".$entry['result'];
     gosa_log($str);
   }
 
@@ -122,14 +143,14 @@ class log {
     }
 
     foreach($servers as $server_name => $server){
-  
-      $con = mysql_pconnect($server['SERVER'],$server['USER'],$server['PWD']);
+ 
+      $con = @mysql_pconnect($server_name,$server['USER'],$server['PWD']);
       if(!$con){
-        print_red(sprintf(_("Could not connect to logging server %s."),$server['SERVER']));
+        print_red(sprintf(_("Could not connect to logging server %s."),$server_name));
       }else{
         $db = mysql_select_db($server['DB'],$con);
         if(!$db){
-          print_red(sprintf(_("Could not select database %s on server %s. Server ssys :%s"),$server['DB'],$server['SERVER'],mysql_error($con)));
+          @print_red(sprintf(_("Could not select database %s on server %s. Server says :%s"),$server['DB'],$server['SERVER'],mysql_error($con)));
         }else{
 
           /* Create mysql syntax */
@@ -152,6 +173,7 @@ class log {
             
           } 
         }
+        mysql_close($con);
       }
     }
   }