Code

Applied in_array strict patches from trunk
[gosa.git] / gosa-core / include / class_log.inc
index 24a64258027c895eb175f5e8dd7e36c82c53b6e0..6568778daf26807c5ee9576fe302679f78f78869 100644 (file)
@@ -30,8 +30,6 @@
  */
 class log {
 
-  var $LOG_TO_MYSQL = FALSE;
-  var $LOG_TO_SYSLOG= FALSE;
   var $config;
 
  /*! \brief logging constructor
@@ -52,11 +50,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,31 +74,21 @@ class log {
     $entry['changes']   = $changes;
     $entry['result']    = $result;
 
-    if($this->config->get_cfg_value("logging") == ""  && empty($entry['user'])){
+    if(!isset($this->config) && empty($entry['user'])){
       $entry['user']  = "unknown";
     }
+
     /* Check if all given values are valid */
+    global $config;
     $msgs = @log::check($entry);
     if(count($msgs)){
       foreach($msgs as $msg){
         trigger_error("Logging failed, reason was: ".$msg);
         msg_dialog::display(_("Internal error"), sprintf(_("Logging failed: %s"), $msg), ERROR_DIALOG);
       }
-      
     }else{
-
-      if ($this->conifg->get_cfg_value("logging") == ""){
+      if(is_object($config) && $config->boolValueIsTrue("core","logging")){
         $this->log_into_syslog($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);
-        }
       }
     }
   }
@@ -110,12 +98,12 @@ class log {
   {
     $msgs = array();
 
-    if(!isset($entry['action']) || !in_array($entry['action'],array("modify","create","remove","copy","snapshot","view","security","debug"))){
-      $msgs[] = sprintf(_("Invalid option '%s' specified!"), $entry['action']);
+    if(!isset($entry['action']) || !in_array_strict($entry['action'],array("modify","create","remove","copy","snapshot","view","security","debug"))){
+      $msgs[] = sprintf(_("Invalid option %s specified!"), bold($entry['action']));
     }
 
-    if(!isset($entry['objecttype']) || empty($entry['objecttype'])){
-      $msgs[] = _("Specified objectType is empty or invalid!");
+    if(!isset($entry['objecttype'])){
+      $msgs[] = _("Specified 'objectType' is empty or invalid!");
     }
   
     return($msgs);
@@ -125,126 +113,24 @@ 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']." ".$entry['changes']." : Result was ".$entry['result'];
-    gosa_log($str);
-  }
+    $str= "";
 
+    if(!empty($entry['action']))        $str .= "({$entry['action']}) ";
 
-  function disable_mysql_log($server,$error)
-  {
-    global $config;
-    msg_dialog::display(_("Error"), $error, ERROR_DIALOG);
-    msg_dialog::display(_("MySQL error"),sprintf(_("Logging to MySQL database will be disabled for server '%s'!"),$server), INFO_DIALOG);
-    unset($config->data['SERVERS']['LOGGING'][$server]) ;
-    $this->config = $config;
-  }
-
-
-  /* Log into configured logging databses.*/
-  function log_into_db($entry)
-  {
-    if(isset($this->config->data['SERVERS']['LOGGING'])){
-      $servers = $this->config->data['SERVERS']['LOGGING'];
-    }else{
-      return(FALSE);
+    // Add object and object type if set.
+    if(!empty($entry['object']) && !empty($entry['objecttype'])){
+        $str .= "{$entry['object']} of type {$entry['objecttype']} ";
+    }elseif(!empty($entry['object'])){
+        $str .= "{$entry['object']} ";
+    }elseif(!empty($entry['objecttype'])){
+        $str .= "{$entry['objecttype']} ";
     }
+    if(!empty($entry['changes'])) $str .= "{$entry['changes']} ";
+    if(!empty($entry['result']))  $str .= ": {$entry['result']} ";
 
-    /* Log into each configured server 
-     */
-    foreach($servers as $server_name => $server){
-
-      $error = "";
-   
-      /* Connect to the database 
-       */
-      $con = @mysql_pconnect($server_name,$server['USER'],$server['PWD']);
-      if(!$con){
-        $error = msgPool::dbconnect(_("MySQL logging"),mysql_error());
-        $this->disable_mysql_log($server_name,$error);
-        continue;
-      }
-
-      /* Check if the database is available 
-       */
-      $db = @mysql_select_db($server['DB'],$con);
-      if(!$db){
-        $error = msgPool::dbselect(_("MySQL logging"),mysql_error());
-        $this->disable_mysql_log($server_name,$error);
-        continue;
-      }
-
-      /* Check if our current location is already registerd 
-         in this case get its id.
-         If it wasn't registered yet, create it. 
-       */
-      $base = mysql_escape_string($this->config->current['BASE']);
-      $query= "SELECT id FROM gosa_locations WHERE location=\"".$base."\";";
-      $res  = mysql_query($query);  
-      if(!$res){
-        $error = msgPool::dbquery(_("MySQL logging"),mysql_error());
-        $this->disable_mysql_log($server_name,$error);
-        continue;
-      }
-
-      $location_id = -1;
-      while($attrs = mysql_fetch_assoc($res)){
-        $location_id = $attrs['id'];
-        break;
-      }
-
-      /* No location found that matches our location.
-         Create it.
-       */
-      if($location_id == -1){
-        $query = "INSERT INTO gosa_locations (location) VALUES ('".$base."');";
-        if(!mysql_query($query,$con)){
-          $error = msgPool::dbquery(_("MySQL logging"),mysql_error());
-          $this->disable_mysql_log($server_name,$error);
-          continue;
-        }
-
-        /* Try to detect the location again 
-         */ 
-        $query= "SELECT id FROM gosa_locations WHERE location=\"".$base."\";";
-        $res  = mysql_query($query);
-        $location_id = -1;
-        while($attrs = mysql_fetch_assoc($res)){
-          $location_id = $attrs['id'];
-          break;
-        }
-        if($location_id == -1){
-          $error = sprintf(_("Cannot add location to the database!")."<br><br>"._("Error").": %s",mysql_error($con));
-          $this->disable_mysql_log($server_name,$error);
-          continue;
-        }
-      }  
-
-      /* Create mysql syntax */
-      $query ="INSERT INTO gosa_log 
-        (timestamp,user,action,objecttype,object,changes,result,location_id)
-        VALUES 
-        (
-         \"".mysql_escape_string($entry['timestamp'])."\", 
-         \"".mysql_escape_string($entry['user'])."\", 
-         \"".mysql_escape_string($entry['action'])."\", 
-         \"".mysql_escape_string($entry['objecttype'])."\", 
-         \"".mysql_escape_string($entry['object'])."\", 
-         \"".mysql_escape_string($entry['changes'])."\", 
-         \"".mysql_escape_string($entry['result'])."\", 
-         \"".mysql_escape_string($location_id)."\" 
-        );
-      ";
-      $res = mysql_query($query,$con);
-      if(!$res){
-        $error = dbquery(_("MySQL logging"), mysql_error());
-        $this->disable_mysql_log($server_name,$error);
-        continue;
-      } 
-      if(is_resource($con)){
-        mysql_close($con);
-      }
-    }
+    gosa_log($str);
   }
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: