X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servKolab.inc;h=3b666fd43bbae9848f4ebb8cfcc630909d4d4c81;hb=7a6a428eb1c6534e448094d51bc6a542fe832bb9;hp=c1e33222359f83e5d53b9e87fd89076d95105b0f;hpb=58d6e44f72edec202688de242f4b38e384b6a35e;p=gosa.git diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc index c1e332223..3b666fd43 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -1,12 +1,15 @@ "Eins ist toll", "zwei"=>"Zwei ist noch besser"); var $postfix_mydomain = ""; + var $cyrus_admins = ""; var $postfix_mydestination = ""; var $postfix_mynetworks = "127.0.0.1/8"; var $postfix_enable_virus_scan = "TRUE"; @@ -16,7 +19,6 @@ class servkolab extends plugin { var $cyrus_quotawarn = "80"; var $kolabFreeBusyFuture = "1"; var $k = "kolab"; - var $cyrus_admins = "TRUE"; var $cyrus_imap = "TRUE"; var $cyrus_pop3 = "TRUE"; var $cyrus_imaps = "TRUE"; @@ -40,7 +42,7 @@ class servkolab extends plugin { var $DisplayName = "Kolab mail service"; var $StatusFlag = ""; - function servkolab($config, $dn = NULL) + function servkolab($config, $dn = NULL, $parent= NULL) { /* Setting the hostname and tell this Plugin that we are the kolab extension*/ $this->hostname = preg_replace('/^cn=([^,]+),.*$/', '\1', $dn); @@ -75,6 +77,9 @@ class servkolab extends plugin { } } + if($this->is_account){ + @log::log("view","server/".get_class($this),$this->dn); + } } @@ -93,33 +98,35 @@ class servkolab extends plugin { /* Assemble free/busy string */ - $edit = sprintf('', - $this->kolabFreeBusyFuture, - chkacl($this->acl, 'kolabFreeBusyFuture')); + $edit = sprintf('', + $this->kolabFreeBusyFuture); $fbfuture = sprintf(_("Include data from %s days in the past when creating free/busy lists"), $edit); /* Assemble quota string */ - $edit = sprintf('', - $this->cyrus_quotawarn, - chkacl($this->acl, 'cyrus_quotawarn')); + $edit = sprintf('', + $this->cyrus_quotawarn); $quotastr = sprintf(_("Warn users when using more than %s%% of their mail quota"), $edit); /*************** Assign informations to smarty ***************/ - /* Set relayhost and if we have MX lookup enabled*/ + /* Set relayhost and if we have MX lookup enabled*/ if($this->postfix_mxrelayenabled) { $smarty->assign("RelayMxSupportCheck"," checked "); } else { $smarty->assign("RelayMxSupportCheck",""); } + /* Set acls */ + $tmp = $this->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $translation){ + $smarty->assign($name."ACL",$this->getacl($name)); + } + /* Initialize all attributes, that were submitted */ foreach($this->attributes as $val) { - $smarty->assign($val."ACL",chkacl($this->acl,str_replace("_","-",$val))); - /* Tell smarty which variables we are useing */ $smarty->assign($val, $this->$val); if (($this->$val != "FALSE") && !empty($this->$val)){ @@ -208,6 +215,8 @@ class servkolab extends plugin { gosa_log("Removing ".$this->hostname." from list of kolabHosts"); } + @log::log("remove","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + /* Optionally execute a command after we're done */ $this->handle_post_events("remove"); } @@ -218,20 +227,32 @@ class servkolab extends plugin { if (isset($_POST['kolabtab'])){ plugin::save_object(); + + foreach($this->attributes as $attr){ + if(($this->acl_is_writeable(preg_replace("/_/","",$attr))) && (isset($_POST[$attr]))){ + $this->$attr = $_POST[$attr]; + } + } + /* Save checkboxes */ foreach (array( "postfix_enable_virus_scan", "postfix_allow_unauthenticated", - "cyrus_admins", "cyrus_imap", "cyrus_pop3", "cyrus_imaps", + "cyrus_imap", "cyrus_pop3", "cyrus_imaps", "cyrus_pop3s", "cyrus_sieve", "apache_allow_unauthenticated_fb", "proftpd_ftp", "apache_http") as $cb){ - if (isset($_POST[$cb])){ - $this->$cb= "TRUE"; - } else { - $this->$cb= "FALSE"; + + if($this->acl_is_writeable(preg_replace("/_/","",$cb))){ + if (isset($_POST[$cb])){ + $this->$cb= "TRUE"; + } else { + $this->$cb= "FALSE"; + } } } - /* Toggle relay check */ - $this->postfix_mxrelayenabled= isset($_POST['RelayMxSupport']); + /* Toggell relay check */ + if($this->acl_is_writeable("postfixmxrelayenabled")){ + $this->postfix_mxrelayenabled= isset($_POST['RelayMxSupport']); + } } } @@ -280,7 +301,7 @@ class servkolab extends plugin { /* Adapt relayhost */ $this->postfix_relayhost= preg_replace('/[\[\]]/', '', $this->postfix_relayhost); - if (!$this->postfix_mxrelayenabled && $this->postfix_relayhost != ""){ + if ($this->postfix_mxrelayenabled && $this->postfix_relayhost != ""){ $this->postfix_relayhost= "[".$this->postfix_relayhost."]"; } @@ -329,12 +350,19 @@ class servkolab extends plugin { $ldap->cd($this->dn); $this->cleanup();; $ldap->$mode($this->attrs); + + if($mode == "add"){ + @log::log("create","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + }else{ + @log::log("modify","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + } + show_ldap_error($ldap->get_error(), sprintf(_("Saving system server/kolab with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ if ($this->initially_was_account == $this->is_account) { if ($this->is_modified) { - $this->handle_post_events("mofify"); + $this->handle_post_events("modify"); } } else { $this->handle_post_events("add"); @@ -344,96 +372,44 @@ class servkolab extends plugin { function getListEntry() { - $this->updateStatusState(); - $flag = $this->StatusFlag; - if(empty($flag)){ - $fields['Status'] = ""; - }else{ - $fields['Status'] = $this->$flag; - } + $fields = goService::getListEntry(); $fields['Message'] = _("Kolab mail service"); - $fields['AllowStart'] = true; - $fields['AllowStop'] = true; - $fields['AllowRestart'] = true; - $fields['AllowRemove'] = true; $fields['AllowEdit'] = true; return($fields); } - /* Directly save new status flag */ - function setStatus($value) - { - return; - - if($value == "none") return; - if(!$this->initially_was_account) return; - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->dn); - $ldap->cat($this->dn,array("objectClass")); - if($ldap->count()){ - - $tmp = $ldap->fetch(); - for($i = 0; $i < $tmp['objectClass']['count']; $i ++){ - $attrs['objectClass'][] = $tmp['objectClass'][$i]; - } - $flag = $this->StatusFlag; - $attrs[$flag] = $value; - $this->$flag = $value; - $ldap->modify($attrs); - show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for system server/kolab with dn '%s' failed."),$this->dn)); - $this->action_hook(); - } - } - - - /* Get updates for status flag */ - function updateStatusState() - { - if(empty($this->StatusFlag)) return; - - $attrs = array(); - $flag = $this->StatusFlag; - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->cn); - $ldap->cat($this->dn,array($flag)); - if($ldap->count()){ - $attrs = $ldap->fetch(); - } - if(isset($attrs[$flag][0])){ - $this->$flag = $attrs[$flag][0]; - } - } - - /* Return plugin informations for acl handling */ function plInfo() { return (array( "plShortName" => _("Kolab"), - "plDescription" => _("Kolab service"), + "plDescription" => _("Kolab mail service")." ("._("Services").")", "plSelfModify" => FALSE, "plDepends" => array(), - "plPriority" => 0, + "plPriority" => 85, "plSection" => array("administration"), "plCategory" => array("server"), "plProvidedAcls"=> array( - "postfix_mydomain" => _("Postfix mydomain") , - "postfix_mydestination" => _("My destination") , - "proftpd_ftp" => _("FTP FreeBusy service") , - "postfix_mynetworks" => _("SMTP privileged networks") , - "postfix_enable_virus_scan" => _("Enable virus scan") , - "postfix_relayhost" => _("Relayhost") , - "apache_http" => _("HTTP FreeBusy service") , - "postfix_allow_unauthenticated" => _("Accept Internet Mail") , - "cyrus_imap" => _("IMAP service") , - "kolabFreeBusyFuture" => _("kolabFreeBusyFuture") , - "cyrus_pop3" => _("POP3 service") , - "cyrus_imaps" => _("IMAP/SSL service") , - "cyrus_pop3s" => _("POP3/SSL service") , - "cyrus_sieve" => _("Sieve service") , - "cyrus_quotawarn" => _("Quota settings")) + "postfixmydomain" => _("Postfix mydomain") , + "postfixmydestination" => _("My destination") , + "cyrusadmins" => _("Cyrus admins") , + "proftpdftp" => _("FTP FreeBusy service") , + "postfixmynetworks" => _("SMTP privileged networks") , + "postfixenablevirusscan" => _("Enable virus scan") , + "postfixrelayhost" => _("Relayhost") , + "postfixmxrelayenabled" => _("Enable MX lookup for relayhost"), + "apachehttp" => _("HTTP FreeBusy service") , + "apacheallowunauthenticatedfb" => _("Allow unauthenticated free busy"), + "postfixallowunauthenticated" => _("Accept Internet Mail") , + "cyrusimap" => _("IMAP service") , + "kolabFreeBusyFuture" => _("kolabFreeBusyFuture") , + "cyruspop3" => _("POP3 service") , + "cyrusimaps" => _("IMAP/SSL service") , + "cyruspop3s" => _("POP3/SSL service") , + "cyrussieve" => _("Sieve service") , + "cyrusquotawarn" => _("Quota settings")) )); } }