Applied in_array strict patches from trunk

[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 13a128a74e0d8dfff262ed0f6976447e872aaae9..6568778daf26807c5ee9576fe302679f78f78869 100644 (file)
--- a/gosa-core/include/class_log.inc
+++ b/gosa-core/include/class_log.inc
@@ -87,7 +87,7 @@ class log {
         msg_dialog::display(_("Internal error"), sprintf(_("Logging failed: %s"), $msg), ERROR_DIALOG);
       }
     }else{
-      if(is_object($config) && preg_match("/true/i",$config->get_cfg_value("logging",""))){
+      if(is_object($config) && $config->boolValueIsTrue("core","logging")){
         $this->log_into_syslog($entry);
       }
     }
@@ -98,11 +98,11 @@ class log {
   {
     $msgs = array();
 
-    if(!isset($entry['action']) || !in_array($entry['action'],array("modify","create","remove","copy","snapshot","view","security","debug"))){
+    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'])){
+    if(!isset($entry['objecttype'])){
       $msgs[] = _("Specified 'objectType' is empty or invalid!");
     }
   
@@ -114,11 +114,20 @@ class log {
   function log_into_syslog($entry)
   {
     $str= "";
-    if (empty($entry['object']) && empty($entry['changes'])) {
-      $str = "(".$entry['action'].") ".$entry['objecttype'].": ".$entry['result'];
-    } else {
-      $str = "(".$entry['action'].") ".$entry['object']." of type ".$entry['objecttype']." ".$entry['changes'].": ".$entry['result'];
+
+    if(!empty($entry['action']))        $str .= "({$entry['action']}) ";
+
+    // 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']} ";
+
     gosa_log($str);
   }