Cleanup logging messages

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14599 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc
index fbdbb371c72b953e34a4b1dd78325e6fdb5c4c86..33e58523a94abddb8a76b4cd4bf8edc1fcc187d9 100644 (file)
--- a/gosa-core/include/class_log.inc
+++ b/gosa-core/include/class_log.inc
@@ -127,7 +127,12 @@ 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'];
+    $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'];
+    }
     gosa_log($str);
   }
 

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index aa28014a03cd8ab43c6e8719b85949cbd380c4f4..d9a82de75ba20be2d811564f4e2ff67a9380bf0a 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -309,14 +309,14 @@ function gosa_log ($message)
   global $ui;
 
   /* Preset to something reasonable */
-  $username= " unauthenticated";
+  $username= "[unauthenticated]";
 
   /* Replace username if object is present */
   if (isset($ui)){
     if ($ui->username != ""){
       $username= "[$ui->username]";
     } else {
-      $username= "unknown";
+      $username= "[unknown]";
     }
   }