Updated rSyslog addon - we do not use a new objectClass, we use the old one

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14961 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 4f51dfe7d4dd4e65f3b2f850e21f74804ad3dc2c..5f92a45a2c83a233b838be406448fc38f977ae5c 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
@@ -32,16 +32,16 @@ class rsyslog extends plugin
     // Get list of rsyslog servers 
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->config->current['BASE']);
-    $ldap->search("objectClass=rSyslogServer",array("cn","rSyslogUser","rSyslogDatabase","rSyslogPassword"));
+    $ldap->search("objectClass=gosaLogServer",array("cn","goLogDBUser","goLogDB","goLogDBPassword"));
     while($attrs = $ldap->fetch()){
       if(empty($this->selected_server)) $this->selected_server = $attrs['cn'][0];
       $s = array('cn' => $attrs['cn'][0], 'dn' => $attrs['dn'], 'Password' => '', 'status' => 'ok');
-      $s['User'] = $attrs['rSyslogUser'][0]; 
-      $s['Database'] = $attrs['rSyslogDatabase'][0]; 
+      $s['User'] = $attrs['goLogDBUser'][0]; 
+      $s['Database'] = $attrs['goLogDB'][0]; 
       $s['Hosts'] = array();
       $s['Priorities'] = array();
       $s['ACL'] = "";
-      if(isset($attrs['rSyslogPassword'])) $s['Password'] = $attrs['rSyslogPassword'][0];
+      if(isset($attrs['goLogDBPassword'])) $s['Password'] = $attrs['goLogDBPassword'][0];
       $this->servers[$attrs['cn'][0]] = $s;
     }
 

diff --git a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
index df263902cfe47c739ca597f12ec522a7b325cf12..c8bb4132a8a0ac4fe18c3662abd940b51f084fe3 100644 (file)
--- a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
+++ b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
@@ -3,20 +3,20 @@
 class rSyslogServer extends goService{
        
   /* This plugin only writes its objectClass */
-  var $objectclasses    = array("rSyslogServer");
-  var $attributes       = array("rSyslogDatabase","rSyslogUser","rSyslogPassword");
+  var $objectclasses    = array("gosaLogServer");
+  var $attributes       = array("goLogDB","goLogDBUser","goLogDBPassword");
   var $StatusFlag       = "";
 
   /* This class can't be assigned twice so it conflicts with itsself */
-  var $conflicts        = array("rSyslogServer");
+  var $conflicts        = array("gosaLogServer");
 
   var $DisplayName      = "";
   var $dn               = NULL;
   var $acl;
   var $cn                 = "";
-  var $rSyslogDatabase    = "Syslog";
-  var $rSyslogUser        = "rsyslog";
-  var $rSyslogPassword    = "";  
+  var $goLogDB    = "Syslog";
+  var $goLogDBUser        = "rsyslog";
+  var $goLogDBPassword    = "";  
   var $view_logged  =FALSE;
 
 
@@ -63,13 +63,13 @@ class rSyslogServer extends goService{
   function check()
   { 
     $message = plugin::check();
-    if (empty($this->rSyslogUser)){
+    if (empty($this->goLogDBUser)){
       $message[]= msgPool::required(_("User"));
     }
-    if (empty($this->rSyslogPassword)){
+    if (empty($this->goLogDBPassword)){
       $message[]= msgPool::required(_("Password"));
     }
-    if (empty($this->rSyslogDatabase)){
+    if (empty($this->goLogDB)){
       $message[]= msgPool::required(_("Database"));
     }
     return($message);
@@ -96,9 +96,9 @@ class rSyslogServer extends goService{
           "plCategory"    => array("server"),
 
           "plProvidedAcls"=> array(
-            "rSyslogDatabase" => _("Database"),
-            "rSyslogUser"     => _("User"),
-            "rSyslogPassword" => _("Password"), 
+            "goLogDB" => _("Database"),
+            "goLogDBUser"     => _("User"),
+            "goLogDBPassword" => _("Password"), 
             "viewEntries"     => _("Allow view of entries on this server")) 
           ));
   }

diff --git a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl
index b4f1c4679354a8938f00e26cf1bf8575a6cd6de9..194e14e70f67b745b71698b0cd4881aadd250939 100644 (file)
--- a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl
+++ b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl
@@ -3,24 +3,24 @@
     <tr>
      <td>{t}Database{/t}{$must}</td>
      <td>
-{render acl=$rSyslogDatabaseACL}
-       <input name="rSyslogDatabase" id="rSyslogDatabase" size=30 maxlength=60 value="{$rSyslogDatabase}">
+{render acl=$goLogDBACL}
+       <input name="goLogDB" id="goLogDB" size=30 maxlength=60 value="{$goLogDB}">
 {/render}
      </td>
     </tr>
     <tr>
      <td>{t}Database user{/t}{$must}</td>
      <td>
-{render acl=$rSyslogUserACL}
-       <input name="rSyslogUser" id="rSyslogUser" size=30 maxlength=60 value="{$rSyslogUser}">
+{render acl=$goLogDBUserACL}
+       <input name="goLogDBUser" id="goLogDBUser" size=30 maxlength=60 value="{$goLogDBUser}">
 {/render}
      </td>
     </tr>
     <tr>
      <td>{t}Password{/t}{$must}</td>
      <td>
-{render acl=$rSyslogPasswordACL}
-       <input type="password" name="rSyslogPassword" id="rSyslogPassword" size=30 maxlength=60 value="{$rSyslogPassword}">
+{render acl=$goLogDBPasswordACL}
+       <input type="password" name="goLogDBPassword" id="goLogDBPassword" size=30 maxlength=60 value="{$goLogDBPassword}">
 {/render}
      </td>
     </tr>