Reverted changes made on Log DB Service

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

diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index e091c1c1ea4086bbb240f10ac177f1bf28edd98d..31ad8e8dc5f4246fe1f47eb21dff888a5c25995c 100644 (file)
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -9,7 +9,7 @@ class goLogDBServer extends goService{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goLogDBServer");
-  var $attributes       = array("goLogDBServerUser", "goLogDBServerPassword", "goLogDB" );
+  var $attributes       = array("goLogAdmin", "goLogPassword");
   var $StatusFlag       = "goLogDBServerStatus";
 
   /* This class can't be assigned twice so it conflicts with itsself */
@@ -20,9 +20,8 @@ class goLogDBServer extends goService{
   var $acl;
   var $cn                   = "";
   var $goLogDBServerStatus  = "";
-  var $goLogDBServerUser   = "";
-  var $goLogDBServerPassword= "";  
-  var $goLogDB              = "gosa_log";  
+  var $goLogAdmin           = "";
+  var $goLogPassword        = "";  
 
 
   function goLogDBServer($config,$dn)
@@ -60,15 +59,12 @@ class goLogDBServer extends goService{
   function check()
   { 
     $message = plugin::check();
-    if (empty($this->goLogDBServerUser)){
+    if (empty($this->goLogAdmin)){
       $message[]= sprintf_("The attribute user is empty or contains invalid characters.");
     }
-    if (empty($this->goLogDBServerPassword)){
+    if (empty($this->goLogPassword)){
       $message[]= sprintf_("The attribute password is empty or contains invalid characters.");
     }
-    if (empty($this->goLogDB)){
-      $message[]= sprintf_("The attribute database is empty or contains invalid characters.");
-    }
     return($message);
   }
 
@@ -96,9 +92,8 @@ class goLogDBServer extends goService{
             "start"         => _("Start"),
             "stop"          => _("Stop"),
             "restart"       => _("Restart"),
-            "goLogDBServerUser"    => _("User"),
-            "goLogDBServerPassword" => _("Password"),
-            "goLogDB"       => _("Database"))
+            "goLogAdmin"    => _("Admin"),
+            "goLogPassword" => _("Password"))
           ));
   }
 }

diff --git a/plugins/admin/systems/goLogDBServer.tpl b/plugins/admin/systems/goLogDBServer.tpl
index a16d6f1c6ded1da4e69a4b6966ffc348df44ce66..8395070295b3b24ce6a52e29ae15fe51645928f5 100644 (file)
--- a/plugins/admin/systems/goLogDBServer.tpl
+++ b/plugins/admin/systems/goLogDBServer.tpl
@@ -3,24 +3,16 @@
     <tr>
      <td>{t}Logging DB user{/t}{$must}</td>
      <td>
-{render acl=$goLogDBServerUserACL}
-       <input name="goLogDBServerUser" id="goLogDBServerUser" size=30 maxlength=60 value="{$goLogDBServerUser}">
+{render acl=$goLogAdminACL}
+       <input name="goLogAdmin" id="goLogAdmin" size=30 maxlength=60 value="{$goLogAdmin}">
 {/render}
      </td>
     </tr>
     <tr>
      <td>{t}Password{/t}{$must}</td>
      <td>
-{render acl=$goLogDBServerPasswordACL}
-       <input type="password" name="goLogDBServerPassword" id="goLogDBServerPassword" size=30 maxlength=60 value="{$goLogDBServerPassword}">
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Database{/t}{$must}</td>
-     <td>
-{render acl=$goLogDBACL}
-       <input type="text" name="goLogDB" id="goLogDB" size=30 maxlength=60 value="{$goLogDB}">
+{render acl=$goLogPasswordACL}
+       <input type=password name="goLogPassword" id="goLogPassword" size=30 maxlength=60 value="{$goLogPassword}">
 {/render}
      </td>
     </tr>