Added severity/facility translation

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

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
index 4c7ed5bc6358949b6fc490251f719a84f89df9a3..cffc65c7ab32e027f9507d191ce283d8f59ffbbe 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
@@ -115,7 +115,7 @@ class rsyslog extends plugin
     }else{
       $priorities = array('all' => _("All"));
       foreach($this->servers[$this->selected_server]['Priorities'] as $id => $name){
     }else{
       $priorities = array('all' => _("All"));
       foreach($this->servers[$this->selected_server]['Priorities'] as $id => $name){

-        $priorities[$id] = $name;
+        $priorities[$id] = $this->severity2string($name);

       }
     }
 
       }
     }
 


@@ -226,6 +226,8 @@ class rsyslog extends plugin
         $res = mysql_query($query, $link);
         if($res){
           while($attrs = @mysql_fetch_assoc($res)){
         $res = mysql_query($query, $link);
         if($res){
           while($attrs = @mysql_fetch_assoc($res)){

+            $attrs['Facility']= $this->facility2string($attrs['Facility']);
+            $attrs['Priority']= $this->severity2string($attrs['Priority']);

             $result['entries'][] = $attrs;
           }
           $this->servers[$name]['status'] = "ok";
             $result['entries'][] = $attrs;
           }
           $this->servers[$name]['status'] = "ok";


@@ -293,6 +295,63 @@ class rsyslog extends plugin
       $this->sort_value=$sort_value; 
     } 
   }
       $this->sort_value=$sort_value; 
     } 
   }

+
+
+  function severity2string($severity)
+  {
+    $map= array( 0 => _("Emergency"),
+                 1 => _("Alert"),
+                 2 => _("Critical"),
+                 3 => _("Error"),
+                 4 => _("Warning"),
+                 5 => _("Notice"),
+                 6 => _("Informational"),
+                 7 => _("Debug") );
+
+    if (isset($map[$severity])) {
+      return $map[$severity];
+    }
+
+    return sprintf(_("Unknown (%s)"), $severity);
+  }
+
+
+  function facility2string($facility)
+  {
+    $map= array( 0 => _("Kernel"),
+                 1 => _("User level"),
+                 2 => _("Mail system"),
+                 3 => _("System daemon"),
+                 4 => _("Security"),
+                 5 => _("Internal"),
+                 6 => _("Printing"),
+                 7 => _("News"),
+                 8 => _("UUCP"),
+                 9 => _("Cron"),
+                10 => _("Security"),
+                11 => _("FTP"),
+                12 => _("NTP"),
+                13 => _("Log audit"),
+                14 => _("Log alert"),
+                15 => _("Clock"),
+                16 => _("Local0"),
+                17 => _("Local1"),
+                18 => _("Local2"),
+                19 => _("Local3"),
+                20 => _("Local4"),
+                21 => _("Local5"),
+                22 => _("Local6"),
+                23 => _("Local7") );
+
+    if (isset($map[$facility])) {
+      return $map[$facility];
+    }
+
+    return sprintf(_("Unknown (%s)"), $facility);
+  }
+
+
+

 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
index 1971c1fe49b6a70b2677c94bff0c4a20354ce532..1f9b6fa68ad0b6398e28c3e6d205640f9e22c437 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
+++ b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
@@ -20,7 +20,7 @@
         {/foreach}
       </select>
     </td>
         {/foreach}
       </select>
     </td>

-    <td><img src="images/small_warning.png" alt="" class="center">&nbsp;{t}Priority{/t}:</td>
+    <td><img src="images/small_warning.png" alt="" class="center">&nbsp;{t}Severity{/t}:</td>

     <td>   
       <select name='selected_priority' onChange='document.mainform.submit();'>
         {html_options values=$priorities options=$priorities selected=$selected_priority}
     <td>   
       <select name='selected_priority' onChange='document.mainform.submit();'>
         {html_options values=$priorities options=$priorities selected=$selected_priority}