Fixed logserver

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

diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index 47d132b199e95e55e486e586b6167907e6434994..a61d0b354d516dc1191dd7a5c3e5dab27982bbc4 100644 (file)
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -115,11 +115,11 @@ class goLogDBServer extends plugin{
   function check()
   { 
     $message = plugin::check();
-    if ($this->goLogAdmin == "" || preg_match("/ /", $this->goLogAdmin)){
-      $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), "goLogAdmin");
+    if (empty($this->goLogAdmin)){
+      $message[]= sprintf_("The attribute user is empty or contains invalid characters.");
     }
-    if ($this->goLogPassword == "" || preg_match("/ /", $this->goLogPassword)){
-      $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), "goLogPassword");
+    if (empty($this->goLogPassword)){
+      $message[]= sprintf_("The attribute password is empty or contains invalid characters.");
     }
     return($message);
   }

diff --git a/plugins/admin/systems/goLogDBServer.tpl b/plugins/admin/systems/goLogDBServer.tpl
index 9bf18aa9b5785968eb92a5ffd0b2dbefa96fc984..ea6405053d92ad50c73317223a4282454e196d42 100644 (file)
--- a/plugins/admin/systems/goLogDBServer.tpl
+++ b/plugins/admin/systems/goLogDBServer.tpl
@@ -1,11 +1,11 @@
 <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Logging database information{/t}</h2>
 <table summary="">
     <tr>
-     <td>{t}Logging DB user{/t}</td>
+     <td>{t}Logging DB user{/t}{$must}</td>
      <td><input name="goLogAdmin" id="goLogAdmin" size=30 maxlength=60 {$goLogAdminACL} value="{$goLogAdmin}"></td>
     </tr>
     <tr>
-     <td>{t}Password{/t}</td>
+     <td>{t}Password{/t}{$must}</td>
      <td><input type=password name="goLogPassword" id="goLogPassword" size=30 maxlength=60 {$goLogPasswordACL} value="{$goLogPassword}"></td>
     </tr>
    </table>