Code

Moved syslog plugin
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 21 Dec 2009 07:46:57 +0000 (07:46 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 21 Dec 2009 07:46:57 +0000 (07:46 +0000)
-

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

gosa-plugins/goto/admin/systems/services/syslog/class_goLogDBServer.inc [deleted file]
gosa-plugins/goto/admin/systems/services/syslog/class_goSyslogServer.inc [deleted file]
gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl [deleted file]
gosa-plugins/goto/admin/systems/services/syslog/goSyslogServer.tpl [deleted file]
gosa-plugins/log/admin/systems/services/syslog/class_goLogDBServer.inc [new file with mode: 0644]
gosa-plugins/log/admin/systems/services/syslog/class_goSyslogServer.inc [new file with mode: 0644]
gosa-plugins/log/admin/systems/services/syslog/goLogDBServer.tpl [new file with mode: 0644]
gosa-plugins/log/admin/systems/services/syslog/goSyslogServer.tpl [new file with mode: 0644]

diff --git a/gosa-plugins/goto/admin/systems/services/syslog/class_goLogDBServer.inc b/gosa-plugins/goto/admin/systems/services/syslog/class_goLogDBServer.inc
deleted file mode 100644 (file)
index 69a05f2..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-class goLogDBServer extends goService{
-       
-  var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports asterisk management.";
-  var $cli_description  = "Some longer text\nfor help";
-  var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
-  /* This plugin only writes its objectClass */
-  var $objectclasses    = array("goLogDBServer");
-  var $attributes       = array("goLogAdmin", "goLogPassword" , "gosaLogDB");
-  var $StatusFlag       = "goLogDBServerStatus";
-
-  /* This class can't be assigned twice so it conflicts with itsself */
-  var $conflicts        = array("goLogDBServer");
-
-  var $DisplayName      = "";
-  var $dn               = NULL;
-  var $acl;
-  var $cn                   = "";
-  var $goLogDBServerStatus  = "";
-  var $goLogAdmin           = "";
-  var $goLogPassword        = "";  
-  var $gosaLogDB            = "gomon";  
-  var $view_logged  =FALSE;
-
-
-  function goLogDBServer(&$config,$dn)
-  {
-    goService::goService($config,$dn);
-    $this->DisplayName = _("Syslog service database");
-  }
-
-
-  function execute()
-  { 
-    $smarty = get_smarty(); 
-
-    if($this->is_account && !$this->view_logged){
-      $this->view_logged = TRUE;
-      new log("view","server/".get_class($this),$this->dn);
-    }
-
-    $tmp = $this->plInfo();
-    foreach($tmp['plProvidedAcls'] as $name => $translation){
-      $smarty->assign($name."ACL",$this->getacl($name));
-    }
-
-    foreach($this->attributes as $attr){
-      $smarty->assign($attr,$this->$attr);
-    }
-    return($smarty->fetch(get_template_path("goLogDBServer.tpl",TRUE,dirname(__FILE__))));
-  }
-
-
-  function getListEntry()
-  {
-    $fields = goService::getListEntry();
-    $fields['Message']      = _("Syslog service database");
-    #$fields['AllowEdit']    = true;
-    return($fields);
-  }
-
-
-  function check()
-  { 
-    $message = plugin::check();
-    if (empty($this->goLogAdmin)){
-      $message[]= msgPool::required(_("User"));
-    }
-    if (empty($this->goLogPassword)){
-      $message[]= msgPool::required(_("Password"));
-    }
-    if (empty($this->gosaLogDB)){
-      $message[]= msgPool::required(_("Database"));
-    }
-    return($message);
-  }
-
-
-  function save_object()
-  {
-    if(isset($_POST['goLogDBServerPosted'])){
-      plugin::save_object();
-    }
-  } 
-
-  /* Return plugin informations for acl handling */
-  static function plInfo()
-  {
-    return (array(
-          "plShortName"   => _("Logging database"),
-          "plDescription" => _("Logging database")." ("._("Services").")",
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 97,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("server"),
-
-          "plProvidedAcls"=> array(
-            "start"         => _("Start"),
-            "stop"          => _("Stop"),
-            "restart"       => _("Restart"),
-            "goLogAdmin"    => _("Admin"),
-            "goLogPassword" => _("Password"),
-            "gosaLogDB"       => _("Database"))
-          ));
-  }
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/gosa-plugins/goto/admin/systems/services/syslog/class_goSyslogServer.inc b/gosa-plugins/goto/admin/systems/services/syslog/class_goSyslogServer.inc
deleted file mode 100644 (file)
index 8758ce2..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-class goSyslogServer extends goService{
-       
-  var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server has syslog server enabled.";
-  var $cli_description  = "Some longer text\nfor help";
-  var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
-  /* This plugin only writes its objectClass */
-  var $objectclasses    = array("goSyslogServer");
-  var $attributes       = array();
-  var $StatusFlag       = "goSyslogServerStatus";
-  /* This class can't be assigned twice so it conflicts with itsself */
-  var $conflicts        = array("goSyslogServer");
-
-  var $DisplayName      = "";
-  var $dn               = NULL;
-  var $acl;
-  var $cn                    = "";
-  var $goSyslogServerStatus  = "";
-  var $view_logged  =FALSE;
-  function goSyslogServer(&$config,$dn)
-  {
-    goService::goService($config,$dn);
-    $this->DisplayName = _("Syslog server");
-  }
-
-
-  function execute()
-  { 
-    if($this->is_account && !$this->view_logged){
-      $this->view_logged = TRUE;
-      new log("view","server/".get_class($this),$this->dn);
-    }
-
-
-    $smarty = get_smarty(); 
-    return($smarty->fetch(get_template_path("goSyslogServer.tpl",TRUE,dirname(__FILE__))));
-  }
-
-
-  function getListEntry()
-  {
-    $fields               = goService::getListEntry();
-    $fields['Message']    = _("Syslog server");
-    #$fields['AllowEdit']  = false;
-    return($fields);
-  }
-
-  function check()
-  { 
-    $message = plugin::check();
-    return($message);
-  }
-
-
-  function save_object()
-  {
-    plugin::save_object();
-  } 
-
-  /* Return plugin informations for acl handling */
-  static function plInfo()
-  {
-    return (array(
-          "plShortName"   => _("Logging service"),
-          "plDescription" => _("Logging service")." ("._("Services").")",
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 88,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("server"),
-
-          "plProvidedAcls"=> array()
-          ));
-  }
-
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl b/gosa-plugins/goto/admin/systems/services/syslog/goLogDBServer.tpl
deleted file mode 100644 (file)
index b2d5926..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Logging database information{/t}</h2>
-<table summary="">
-    <tr>
-     <td>{t}Database{/t}{$must}</td>
-     <td>
-{render acl=$gosaLogDBACL}
-       <input type="text" name="gosaLogDB" id="gosaLogDB" size=30 maxlength=60 value="{$gosaLogDB}">
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Logging DB user{/t}{$must}</td>
-     <td>
-{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=$goLogPasswordACL}
-       <input type="password" name="goLogPassword" id="goLogPassword" size=30 maxlength=60 value="{$goLogPassword}">
-{/render}
-     </td>
-    </tr>
-   </table>
-
-<p class='seperator'>&nbsp;</p>
-<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
-    <input type='submit' name='SaveService' value='{msgPool type=saveButton}'>
-    &nbsp;
-    <input type='submit' name='CancelService' value='{msgPool type=cancelButton}'>
-</div>
-<input type="hidden" name="goLogDBServerPosted" value="1">
diff --git a/gosa-plugins/goto/admin/systems/services/syslog/goSyslogServer.tpl b/gosa-plugins/goto/admin/systems/services/syslog/goSyslogServer.tpl
deleted file mode 100644 (file)
index 5fa1c63..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<h2>{t}Syslog Service{/t} {t}enabled{/t}</h2>
-
-<p class='seperator'>&nbsp;</p>
-<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
-    <input type='submit' name='SaveService' value='{msgPool type=saveButton}'>
-    &nbsp;
-    <input type='submit' name='CancelService' value='{msgPool type=cancelButton}'>
-</div>
-<input type="hidden" name="goCupsServerPosted" value="1">
diff --git a/gosa-plugins/log/admin/systems/services/syslog/class_goLogDBServer.inc b/gosa-plugins/log/admin/systems/services/syslog/class_goLogDBServer.inc
new file mode 100644 (file)
index 0000000..69a05f2
--- /dev/null
@@ -0,0 +1,111 @@
+<?php
+
+class goLogDBServer extends goService{
+       
+  var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports asterisk management.";
+  var $cli_description  = "Some longer text\nfor help";
+  var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
+
+  /* This plugin only writes its objectClass */
+  var $objectclasses    = array("goLogDBServer");
+  var $attributes       = array("goLogAdmin", "goLogPassword" , "gosaLogDB");
+  var $StatusFlag       = "goLogDBServerStatus";
+
+  /* This class can't be assigned twice so it conflicts with itsself */
+  var $conflicts        = array("goLogDBServer");
+
+  var $DisplayName      = "";
+  var $dn               = NULL;
+  var $acl;
+  var $cn                   = "";
+  var $goLogDBServerStatus  = "";
+  var $goLogAdmin           = "";
+  var $goLogPassword        = "";  
+  var $gosaLogDB            = "gomon";  
+  var $view_logged  =FALSE;
+
+
+  function goLogDBServer(&$config,$dn)
+  {
+    goService::goService($config,$dn);
+    $this->DisplayName = _("Syslog service database");
+  }
+
+
+  function execute()
+  { 
+    $smarty = get_smarty(); 
+
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      new log("view","server/".get_class($this),$this->dn);
+    }
+
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $name => $translation){
+      $smarty->assign($name."ACL",$this->getacl($name));
+    }
+
+    foreach($this->attributes as $attr){
+      $smarty->assign($attr,$this->$attr);
+    }
+    return($smarty->fetch(get_template_path("goLogDBServer.tpl",TRUE,dirname(__FILE__))));
+  }
+
+
+  function getListEntry()
+  {
+    $fields = goService::getListEntry();
+    $fields['Message']      = _("Syslog service database");
+    #$fields['AllowEdit']    = true;
+    return($fields);
+  }
+
+
+  function check()
+  { 
+    $message = plugin::check();
+    if (empty($this->goLogAdmin)){
+      $message[]= msgPool::required(_("User"));
+    }
+    if (empty($this->goLogPassword)){
+      $message[]= msgPool::required(_("Password"));
+    }
+    if (empty($this->gosaLogDB)){
+      $message[]= msgPool::required(_("Database"));
+    }
+    return($message);
+  }
+
+
+  function save_object()
+  {
+    if(isset($_POST['goLogDBServerPosted'])){
+      plugin::save_object();
+    }
+  } 
+
+  /* Return plugin informations for acl handling */
+  static function plInfo()
+  {
+    return (array(
+          "plShortName"   => _("Logging database"),
+          "plDescription" => _("Logging database")." ("._("Services").")",
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 97,
+          "plSection"     => array("administration"),
+          "plCategory"    => array("server"),
+
+          "plProvidedAcls"=> array(
+            "start"         => _("Start"),
+            "stop"          => _("Stop"),
+            "restart"       => _("Restart"),
+            "goLogAdmin"    => _("Admin"),
+            "goLogPassword" => _("Password"),
+            "gosaLogDB"       => _("Database"))
+          ));
+  }
+}
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>
diff --git a/gosa-plugins/log/admin/systems/services/syslog/class_goSyslogServer.inc b/gosa-plugins/log/admin/systems/services/syslog/class_goSyslogServer.inc
new file mode 100644 (file)
index 0000000..8758ce2
--- /dev/null
@@ -0,0 +1,83 @@
+<?php
+
+class goSyslogServer extends goService{
+       
+  var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server has syslog server enabled.";
+  var $cli_description  = "Some longer text\nfor help";
+  var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
+
+  /* This plugin only writes its objectClass */
+  var $objectclasses    = array("goSyslogServer");
+  var $attributes       = array();
+  var $StatusFlag       = "goSyslogServerStatus";
+  /* This class can't be assigned twice so it conflicts with itsself */
+  var $conflicts        = array("goSyslogServer");
+
+  var $DisplayName      = "";
+  var $dn               = NULL;
+  var $acl;
+  var $cn                    = "";
+  var $goSyslogServerStatus  = "";
+  var $view_logged  =FALSE;
+  function goSyslogServer(&$config,$dn)
+  {
+    goService::goService($config,$dn);
+    $this->DisplayName = _("Syslog server");
+  }
+
+
+  function execute()
+  { 
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      new log("view","server/".get_class($this),$this->dn);
+    }
+
+
+    $smarty = get_smarty(); 
+    return($smarty->fetch(get_template_path("goSyslogServer.tpl",TRUE,dirname(__FILE__))));
+  }
+
+
+  function getListEntry()
+  {
+    $fields               = goService::getListEntry();
+    $fields['Message']    = _("Syslog server");
+    #$fields['AllowEdit']  = false;
+    return($fields);
+  }
+
+  function check()
+  { 
+    $message = plugin::check();
+    return($message);
+  }
+
+
+  function save_object()
+  {
+    plugin::save_object();
+  } 
+
+  /* Return plugin informations for acl handling */
+  static function plInfo()
+  {
+    return (array(
+          "plShortName"   => _("Logging service"),
+          "plDescription" => _("Logging service")." ("._("Services").")",
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 88,
+          "plSection"     => array("administration"),
+          "plCategory"    => array("server"),
+
+          "plProvidedAcls"=> array()
+          ));
+  }
+
+
+}
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>
diff --git a/gosa-plugins/log/admin/systems/services/syslog/goLogDBServer.tpl b/gosa-plugins/log/admin/systems/services/syslog/goLogDBServer.tpl
new file mode 100644 (file)
index 0000000..b2d5926
--- /dev/null
@@ -0,0 +1,35 @@
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Logging database information{/t}</h2>
+<table summary="">
+    <tr>
+     <td>{t}Database{/t}{$must}</td>
+     <td>
+{render acl=$gosaLogDBACL}
+       <input type="text" name="gosaLogDB" id="gosaLogDB" size=30 maxlength=60 value="{$gosaLogDB}">
+{/render}
+     </td>
+    </tr>
+    <tr>
+     <td>{t}Logging DB user{/t}{$must}</td>
+     <td>
+{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=$goLogPasswordACL}
+       <input type="password" name="goLogPassword" id="goLogPassword" size=30 maxlength=60 value="{$goLogPassword}">
+{/render}
+     </td>
+    </tr>
+   </table>
+
+<p class='seperator'>&nbsp;</p>
+<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
+    <input type='submit' name='SaveService' value='{msgPool type=saveButton}'>
+    &nbsp;
+    <input type='submit' name='CancelService' value='{msgPool type=cancelButton}'>
+</div>
+<input type="hidden" name="goLogDBServerPosted" value="1">
diff --git a/gosa-plugins/log/admin/systems/services/syslog/goSyslogServer.tpl b/gosa-plugins/log/admin/systems/services/syslog/goSyslogServer.tpl
new file mode 100644 (file)
index 0000000..5fa1c63
--- /dev/null
@@ -0,0 +1,9 @@
+<h2>{t}Syslog Service{/t} {t}enabled{/t}</h2>
+
+<p class='seperator'>&nbsp;</p>
+<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
+    <input type='submit' name='SaveService' value='{msgPool type=saveButton}'>
+    &nbsp;
+    <input type='submit' name='CancelService' value='{msgPool type=cancelButton}'>
+</div>
+<input type="hidden" name="goCupsServerPosted" value="1">