From: hickert Date: Tue, 27 Jul 2010 09:17:59 +0000 (+0000) Subject: Updated several service dialogs, fixed typos, string, html, post handling and more. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3765f87404bc6ab2975b8bd8cec66603d003990;p=gosa.git Updated several service dialogs, fixed typos, string, html, post handling and more. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19161 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/mail/admin/systems/services/virus/class_goVirusServer.inc b/gosa-plugins/mail/admin/systems/services/virus/class_goVirusServer.inc index 811617dc7..5ce86ef2f 100644 --- a/gosa-plugins/mail/admin/systems/services/virus/class_goVirusServer.inc +++ b/gosa-plugins/mail/admin/systems/services/virus/class_goVirusServer.inc @@ -1,254 +1,254 @@ DisplayName = _("Anti virus"); - - /* Get userinfo & acls */ - $this->ui = get_userinfo(); - - /* Get Flags */ - foreach($this->Flags as $flag){ - $var = "avFlags".$flag; - if(preg_match("/".$flag."/",$this->avFlags)){ - $this->$var = TRUE; - } + + /* This plugin only writes its objectClass */ + var $objectclasses = array("goVirusServer"); + var $attributes = array("avMaxThreads","avMaxDirectoryRecursions","avUser","avFlags","avArchiveMaxFileSize","avArchiveMaxRecursion", + "avArchiveMaxCompressionRatio","avDatabaseMirror","avChecksPerDay","avHttpProxyURL"); + var $StatusFlag = "avStatus"; + + /* This class can't be assigned twice so it conflicts with itsself */ + var $conflicts = array("goVirusServer"); + + var $DisplayName = ""; + var $dn = NULL; + var $cn = ""; + var $avStatus = ""; + + var $ui = NULL; + + var $Flags = array("D","S","A","E"); + + var $avFlags = "DS"; + var $avFlagsD = TRUE; + var $avFlagsS = TRUE; + var $avFlagsA = FALSE; + var $avFlagsE = FALSE; + + var $avMaxThreads = 5; + var $avMaxDirectoryRecursions = 4; + var $avArchiveMaxFileSize = 4000; + var $avArchiveMaxRecursion = 5; + var $avArchiveMaxCompressionRatio = 95; + var $avChecksPerDay = 12; + + var $avUser = ""; + var $avHttpProxyURL = ""; + var $avDatabaseMirror = ""; + var $view_logged =FALSE; + + function govirusserver(&$config,$dn, $parent= NULL) + { + /* Init class */ + goService::goService($config,$dn, $parent); + $this->DisplayName = _("Anti virus"); + + /* Get userinfo & acls */ + $this->ui = get_userinfo(); + + /* Get Flags */ + foreach($this->Flags as $flag){ + $var = "avFlags".$flag; + if(preg_match("/".$flag."/",$this->avFlags)){ + $this->$var = TRUE; + } + } } - } - function execute() - { - $smarty = get_smarty(); + 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); - } + if($this->is_account && !$this->view_logged){ + $this->view_logged = TRUE; + new log("view","server/".get_class($this),$this->dn); + } - /* Set acls */ - $tmp = $this->plInfo(); - foreach($tmp['plProvidedAcls'] as $name => $translation) { - $smarty->assign($name."ACL",$this->getacl($name)); - } + /* Set acls */ + $tmp = $this->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $translation) { + $smarty->assign($name."ACL",$this->getacl($name)); + } - $display = ""; - $smarty->assign("servtabs",FALSE); - $this->is_account = true; + $display = ""; + $smarty->assign("servtabs",FALSE); + $this->is_account = true; - /* Assign smarty vars */ - foreach($this->attributes as $attr){ - $smarty->assign($attr,$this->$attr); - } + /* Assign smarty vars */ + foreach($this->attributes as $attr){ + $smarty->assign($attr, set_post($this->$attr)); + } - /* Assign checkbox states */ - foreach($this->Flags as $Flag){ - $var = "avFlags".$Flag; - if($this->$var){ - $smarty->assign("avFlags".$Flag."CHK"," checked " ); - }else{ - $smarty->assign("avFlags".$Flag."CHK",""); - } - } + /* Assign checkbox states */ + foreach($this->Flags as $Flag){ + $var = "avFlags".$Flag; + if($this->$var){ + $smarty->assign("avFlags".$Flag."CHK"," checked " ); + }else{ + $smarty->assign("avFlags".$Flag."CHK",""); + } + } - /* Assign value for max thread select box */ - $tmp = array(); - for($i = 1 ; $i <= 20 ; $i ++){ - $tmp[$i] = $i; - } - $smarty->assign("ThreadValues",$tmp); + /* Assign value for max thread select box */ + $tmp = array(); + for($i = 1 ; $i <= 20 ; $i ++){ + $tmp[$i] = $i; + } + $smarty->assign("ThreadValues",$tmp); - if($this->avFlagsA){ - $smarty->assign("avFlagsAState" , "" ); - }else{ - $smarty->assign("avFlagsAState" , " disabled " ); + if($this->avFlagsA){ + $smarty->assign("avFlagsAState" , "" ); + }else{ + $smarty->assign("avFlagsAState" , " disabled " ); + } + + return($display.$smarty->fetch(get_template_path("goVirusServer.tpl",TRUE,dirname(__FILE__)))); } - return($display.$smarty->fetch(get_template_path("goVirusServer.tpl",TRUE,dirname(__FILE__)))); - } + function save() + { + if(!$this->is_account) return; + + /* Create Flags */ + $this->avFlags = ""; + foreach($this->Flags as $flag){ + $var = "avFlags".$flag; + if($this->$var){ + $this->avFlags .=$flag; + } + } - function save() - { - if(!$this->is_account) return; + plugin::save(); - /* Create Flags */ - $this->avFlags = ""; - foreach($this->Flags as $flag){ - $var = "avFlags".$flag; - if($this->$var){ - $this->avFlags .=$flag; - } - } + if(!$this->avFlagsA){ + $arr = array("avArchiveMaxFileSize","avArchiveMaxRecursion","avArchiveMaxCompressionRatio"); + foreach($arr as $attr){ + $this->attrs[$attr] = array(); + } + $this->attrs['avFlags'] = preg_replace("/E/","",$this->attrs['avFlags']); + } - plugin::save(); + /* Check if this is a new entry ... add/modify */ + $ldap = $this->config->get_ldap_link(); + $ldap->cat($this->dn,array("objectClass")); + if($ldap->count()){ + $ldap->cd($this->dn); + $ldap->modify($this->attrs); + }else{ + $ldap->cd($this->dn); + $ldap->add($this->attrs); + } + if($this->initially_was_account){ + $this->handle_post_events("modify"); + new log("modify","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + }else{ + $this->handle_post_events("add"); + new log("create","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + } - if(!$this->avFlagsA){ - $arr = array("avArchiveMaxFileSize","avArchiveMaxRecursion","avArchiveMaxCompressionRatio"); - foreach($arr as $attr){ - $this->attrs[$attr] = array(); - } - $this->attrs['avFlags'] = preg_replace("/E/","",$this->attrs['avFlags']); + if (!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); + } } - /* Check if this is a new entry ... add/modify */ - $ldap = $this->config->get_ldap_link(); - $ldap->cat($this->dn,array("objectClass")); - if($ldap->count()){ - $ldap->cd($this->dn); - $ldap->modify($this->attrs); - }else{ - $ldap->cd($this->dn); - $ldap->add($this->attrs); - } - if($this->initially_was_account){ - $this->handle_post_events("modify"); - new log("modify","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); - }else{ - $this->handle_post_events("add"); - new log("create","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); - } + function check() + { + $message = plugin::check(); + + $mustBeNumeric = array( + "avMaxDirectoryRecursions" =>_("Maximum directory recursions"), + "avMaxThreads" =>_("Maximum threads"), + "avArchiveMaxFileSize" =>_("Maximum file size"), + "avArchiveMaxRecursion" =>_("Maximum recursions"), + "avArchiveMaxCompressionRatio" =>_("Maximum compression ratio"), + "avChecksPerDay" =>_("Checks per day")); + + foreach($mustBeNumeric as $key => $trans){ + if(!is_numeric($this->$key)){ + $message[] = msgPool::invalid($trans,$this->$key,"/[0-9]/"); + } + } + + foreach(array("avUser"=>_("Database user"),"avHttpProxyURL"=>_("Http proxy URL"),"avDatabaseMirror"=>_("Database mirror")) as $attr => $name){ + if(!preg_match("/^[a-z0-9:_\-\.\/]*$/",$this->$attr)){ + $message[] = msgPool::invalid($name,$this->$attr,"/[a-z0-9:_\-\.\/]/"); + } + } - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); + return($message); } - } - - function check() - { - $message = plugin::check(); - - $mustBeNumeric = array( - "avMaxDirectoryRecursions" =>_("Maximum directory recursions"), - "avMaxThreads" =>_("Maximum threads"), - "avArchiveMaxFileSize" =>_("Maximum file size"), - "avArchiveMaxRecursion" =>_("Maximum recursions"), - "avArchiveMaxCompressionRatio" =>_("Maximum compression ratio"), - "avChecksPerDay" =>_("Checks per day")); - - foreach($mustBeNumeric as $key => $trans){ - if(!is_numeric($this->$key)){ - $message[] = msgPool::invalid($trans,$this->$key,"/[0-9]/"); - } + + + function save_object() + { + if(isset($_POST['goVirusServer'])){ + plugin::save_object(); + foreach($this->Flags as $flag){ + + $var = "avFlags".$flag; + if($this->acl_is_writeable($var)){ + if(isset($_POST[$var])){ + $this->$var = TRUE; + }else{ + $this->$var = FALSE; + } + } + } + } + } + + + /* For newer service management dialogs */ + function getListEntry() + { + $fields = goService::getListEntry(); +#$fields['AllowEdit'] = true; + $fields['Message'] = _("Anti virus"); + return($fields); } - foreach(array("avUser"=>_("Database user"),"avHttpProxyURL"=>_("Http proxy URL"),"avDatabaseMirror"=>_("Database mirror")) as $attr => $name){ - if(!preg_match("/^[a-z0-9:_\-\.\/]*$/",$this->$attr)){ - $message[] = msgPool::invalid($name,$this->$attr,"/[a-z0-9:_\-\.\/]/"); - } + + /* Return plugin informations for acl handling */ + static function plInfo() + { + return (array( + "plShortName" => _("Anti virus"), + "plDescription" => _("Anti virus")." ("._("Services").")", + "plSelfModify" => FALSE, + "plDepends" => array(), + "plPriority" => 96, + "plSection" => array("administration"), + "plCategory" => array("server"), + "plRequirements"=> array( + 'ldapSchema' => array('goVirusServer' => '>=2.7'), + 'onFailureDisablePlugin' => array(get_class()) + ), + "plProvidedAcls"=> array( + + "start" => _("Start"), + "stop" => _("Stop"), + "restart" => _("Restart"), + + "avFlagsD" =>_("Enable debugging"), + "avFlagsS" =>_("Enable mail scanning"), + "avFlagsA" =>_("Enable scanning of archives"), + "avFlagsE" =>_("Block encrypted archives"), + + "avMaxThreads" =>_("Maximum threads"), + "avMaxDirectoryRecursions" =>_("Maximum directory recursions"), + "avUser" =>_("Anti virus user"), + "avArchiveMaxFileSize" =>_("Maximum file size"), + "avArchiveMaxRecursion" =>_("Maximum recursions"), + "avArchiveMaxCompressionRatio" =>_("Maximum compression ratio"), + "avDatabaseMirror" =>_("Database mirror"), + "avChecksPerDay" =>_("Checks per day"), + "avHttpProxyURL" =>_("Http proxy URL")) + )); } - - return($message); - } - - - function save_object() - { - if(isset($_POST['goVirusServer'])){ - plugin::save_object(); - foreach($this->Flags as $flag){ - - $var = "avFlags".$flag; - if($this->acl_is_writeable($var)){ - if(isset($_POST[$var])){ - $this->$var = TRUE; - }else{ - $this->$var = FALSE; - } - } - } - } - } - - - /* For newer service management dialogs */ - function getListEntry() - { - $fields = goService::getListEntry(); - #$fields['AllowEdit'] = true; - $fields['Message'] = _("Anti virus"); - return($fields); - } - - - /* Return plugin informations for acl handling */ - static function plInfo() - { - return (array( - "plShortName" => _("Anti virus"), - "plDescription" => _("Anti virus")." ("._("Services").")", - "plSelfModify" => FALSE, - "plDepends" => array(), - "plPriority" => 96, - "plSection" => array("administration"), - "plCategory" => array("server"), - "plRequirements"=> array( - 'ldapSchema' => array('goVirusServer' => '>=2.7'), - 'onFailureDisablePlugin' => array(get_class()) - ), - "plProvidedAcls"=> array( - - "start" => _("Start"), - "stop" => _("Stop"), - "restart" => _("Restart"), - - "avFlagsD" =>_("Enable debugging"), - "avFlagsS" =>_("Enable mail scanning"), - "avFlagsA" =>_("Enable scanning of archives"), - "avFlagsE" =>_("Block encrypted archives"), - - "avMaxThreads" =>_("Maximum threads"), - "avMaxDirectoryRecursions" =>_("Maximum directory recursions"), - "avUser" =>_("Anti virus user"), - "avArchiveMaxFileSize" =>_("Maximum file size"), - "avArchiveMaxRecursion" =>_("Maximum recursions"), - "avArchiveMaxCompressionRatio" =>_("Maximum compression ratio"), - "avDatabaseMirror" =>_("Database mirror"), - "avChecksPerDay" =>_("Checks per day"), - "avHttpProxyURL" =>_("Http proxy URL")) - )); - } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>