Some fixes

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

diff --git a/plugins/admin/systems/class_goSpamServer.inc b/plugins/admin/systems/class_goSpamServer.inc
index 055496bf8bafb945fdb438285b39b5081671ff9a..de52e20647409e4e0f55782360cabb15eb53cc96 100644 (file)
--- a/plugins/admin/systems/class_goSpamServer.inc
+++ b/plugins/admin/systems/class_goSpamServer.inc
@@ -1,7 +1,12 @@
 <?php
 
-class goSpamServer extends plugin{
-       
+class gospamserver extends plugin{
+
+  /* CLI vars */
+  var $cli_summary= "Manage server base objects";
+  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("goSpamServer");
   var $attributes       = array("saRewriteHeader","saTrustedNetworks","saRequiredScore","saFlags","saRule");
@@ -35,7 +40,7 @@ class goSpamServer extends plugin{
   var $ui               = NULL;
   var $acl              = NULL;
 
-  function goSpamServer($config,$dn)
+  function gospamserver($config,$dn)
   {
     /* Init class */
     plugin::plugin($config,$dn);
@@ -293,6 +298,12 @@ class goSpamServer extends plugin{
   function check()
   { 
     $message = plugin::check();
+
+    /* Check if required score is numeric */
+    if(!is_numeric($this->saRequiredScore)){
+      $message[] = _("Required score must be a numeric value.");
+    }
+
     return($message);
   }
   
@@ -300,7 +311,10 @@ class goSpamServer extends plugin{
   function save_object()
   {
     if(isset($_POST['goSpamServer'])){
+
       plugin::save_object();
+
+      /* Check flags */
       foreach($this->Flags as $flag){
         $var = "saFlags".$flag;
         if(isset($_POST[$var])){

diff --git a/plugins/admin/systems/class_goSpamServerRule.inc b/plugins/admin/systems/class_goSpamServerRule.inc
index 4883ba99fa46ddc4866987b6b42806d7d73c38dd..178269534bc3d159d37e6fa2290a0951ce15e588 100644 (file)
--- a/plugins/admin/systems/class_goSpamServerRule.inc
+++ b/plugins/admin/systems/class_goSpamServerRule.inc
@@ -27,6 +27,11 @@ class goSpamServerRule extends plugin {
        function save_object()
        {
                plugin::save_object();
+               foreach($this->attributes as $attr){
+                       if(isset($_POST[$attr])){
+                               $this->$attr = $_POST[$attr];
+                       }
+               }
        }
 
 
@@ -45,5 +50,5 @@ class goSpamServerRule extends plugin {
                return($messages);
        }
 }
-
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/admin/systems/class_goVirusServer.inc b/plugins/admin/systems/class_goVirusServer.inc
index 273fba3ce389a68849db32ba884592ca16bce716..3cd2469cfb04bb4ae12efedd2ff2ba1965c491d8 100644 (file)
--- a/plugins/admin/systems/class_goVirusServer.inc
+++ b/plugins/admin/systems/class_goVirusServer.inc
@@ -1,6 +1,6 @@
 <?php
 
-class goVirusServer extends plugin{
+class govirusserver extends plugin{
        
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goVirusServer");
@@ -39,7 +39,7 @@ class goVirusServer extends plugin{
   var $avHttpProxyURL               = "";
   var $avDatabaseMirror             = "";
 
-  function goVirusServer($config,$dn)
+  function gvirusserver($config,$dn)
   {
     /* Init class */
     plugin::plugin($config,$dn);