Glpi server fixes

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

diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index ce7569dfeb53b94043b8e0e65b324334d71cd556..83970daad2db4610a538d2d3ce2956f001ba9074 100644 (file)
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -116,10 +116,11 @@ class goGlpiServer extends plugin{
   function check()
   { 
     $message = plugin::check();
-    foreach(array("goGlpiAdmin","goGlpiDatabase") as $attr){
-      if(empty($this->$attr)){
-        $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), $attr);
-      }
+    if(empty($this->goGlpiAdmin)){
+      $message[]= _("The attribute user is empty or contains invalid characters.");
+    }
+    if(empty($this->goGlpiDatabase)){
+      $message[]= _("The attribute database is empty or contains invalid characters.");
     }
     return($message);
   }

diff --git a/plugins/admin/systems/goGlpiServer.tpl b/plugins/admin/systems/goGlpiServer.tpl
index 2cdec6554dec6b8c20012a62fd7006b6e8630695..94af7027a9a09b9049cef3fa7500e98a79c5f36d 100644 (file)
--- a/plugins/admin/systems/goGlpiServer.tpl
+++ b/plugins/admin/systems/goGlpiServer.tpl
@@ -1,7 +1,7 @@
 <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}GLPI 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="goGlpiAdmin" id="goGlpiAdmin" size=30 maxlength=60 {$goGlpiAdminACL}
 value="{$goGlpiAdmin}"></td>
     </tr>
@@ -11,7 +11,7 @@ value="{$goGlpiAdmin}"></td>
 value="{$goGlpiPassword}"></td>
     </tr>
     <tr>
-     <td>{t}Database{/t}</td>
+     <td>{t}Database{/t}{$must}</td>
      <td><input name="goGlpiDatabase" id="goGlpiDatabase" size=30 maxlength=60 {$goGlpiDatabaseACL}
 value="{$goGlpiDatabase}"></td>
     </tr>