X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servKolab.inc;h=a2d36d1a96dcb27210a3a1dcfa32acb3ef21a339;hb=350c9658be7d52b43728f753149f703c893cdeb4;hp=ba733edf5a42eeda429aad425f1f01e52b0a1e5d;hpb=07e6492263fef837908f515518bd362b433a44ce;p=gosa.git diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc index ba733edf5..a2d36d1a9 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -1,13 +1,10 @@ "Eins ist toll", "zwei"=>"Zwei ist noch besser"); var $postfix_mydomain = ""; var $postfix_mydestination = ""; + var $cyrus_admins = ""; var $postfix_mynetworks = "127.0.0.1/8"; var $postfix_enable_virus_scan = "TRUE"; var $postfix_relayhost = ""; @@ -16,7 +13,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"; @@ -26,21 +22,21 @@ class servkolab extends plugin { var $proftpd_ftp = "TRUE"; var $apache_http = "TRUE"; var $kolabHost = array(); - var $is_in_there = false; - var $exactName = false; + var $orig_cn = ""; + var $attributes = array("postfix_mydomain", "postfix_mydestination", "proftpd_ftp", "k", - "postfix_mynetworks", "postfix_enable_virus_scan", "postfix_relayhost", "apache_http", - "postfix_allow_unauthenticated", "cyrus_admins", "cyrus_imap","kolabFreeBusyFuture", - "cyrus_pop3", "cyrus_imaps", "cyrus_pop3s", "cyrus_sieve", "apache_allow_unauthenticated_fb", - "cyrus_quotawarn"); + "postfix_mynetworks", "postfix_enable_virus_scan", "postfix_relayhost", "apache_http", + "postfix_allow_unauthenticated", "cyrus_admins", "cyrus_imap","kolabFreeBusyFuture", + "cyrus_pop3", "cyrus_imaps", "cyrus_pop3s", "cyrus_sieve", "apache_allow_unauthenticated_fb", + "cyrus_quotawarn"); var $objectclasses = array("top", "kolab"); - 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); - $this->dn = "k=kolab,".$config->current['BASE']; - + $this->hostname = preg_replace('/^cn=([^,]+),.*$/', '\1', $dn); + $this->dn = "k=kolab,".$config->current['BASE']; + /* Load variables, if given*/ plugin::plugin($config, $this->dn); @@ -51,59 +47,59 @@ class servkolab extends plugin { $this->$val = $this->attrs["$name"][0]; } } - + /* Toggle relayhost */ - $this->postfix_mxrelayenabled= preg_match('/^\[/', $this->postfix_relayhost); - $this->postfix_relayhost = preg_replace("/[\[\]]/","",$this->postfix_relayhost); + $this->postfix_mxrelayenabled = preg_match('/^\[/', $this->postfix_relayhost); + $this->postfix_relayhost = preg_replace("/[\[\]]/","",$this->postfix_relayhost); /* Is this Server a member of the Kolab extension or not ?*/ if(isset($this->attrs['kolabHost'])) { $this->kolabHost= $this->attrs['kolabHost']; unset($this->kolabHost['count']); } - - - $this->is_in_there=false; - $this->is_account=false; + $this->is_account = false; + $this->initially_was_account = false; foreach($this->kolabHost as $host){ - if(preg_match("/".$this->hostname.".*/i",$host)){ - $this->is_account=true; - $this->is_in_there=true; + if($this->hostname == $host){ + $this->is_account = true; + $this->initially_was_account = true; } } - - if(in_array($this->hostname, $this->kolabHost)) { - $this->exactName=true; - } else { - $this->exactName=false; - } - if(isset($this->attrs['postfix-mynetworks'])){ - if(is_array($this->attrs['postfix-mynetworks'])){ - unset($this->attrs['postfix-mynetworks']['count']); - $tmp=""; - foreach($this->attrs['postfix-mynetworks'] as $tm){ - $tmp.=$tm.";"; - } - $this->postfix_mynetworks = $tmp; - } - }else{ - $this->postfix_mynetworks=""; - } + } function execute() { - /* Call parent execute */ - plugin::execute(); + /* Call parent execute */ + plugin::execute(); + + /*************** + Variable initialisation + ***************/ + + $smarty = get_smarty(); + $display = ""; + $ldap = $this->config->get_ldap_link(); + - /* Fill templating stuff */ - $smarty = get_smarty(); - $display = ""; + /* Assemble free/busy string */ + $edit = sprintf('', + $this->kolabFreeBusyFuture, + chkacl($this->acl, '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')); + $quotastr = sprintf(_("Warn users when using more than %s%% of their mail quota"), $edit); - /* The Ldap link is needed to ask ldap some questions */ - $ldap = $this->config->get_ldap_link(); + /*************** + Handle Account is_account state + ***************/ + /* Do we need to flip is_account state? */ if (isset($_POST['modify_state'])) { $this->is_account = !$this->is_account; @@ -119,13 +115,18 @@ class servkolab extends plugin { return ($display); } + + /*************** + Assign informations to smarty + ***************/ + /* Set relayhost and if we have MX lookup enabled*/ if($this->postfix_mxrelayenabled) { $smarty->assign("RelayMxSupportCheck"," checked "); } else { $smarty->assign("RelayMxSupportCheck",""); } - + /* Initialize all attributes, that were submitted */ foreach($this->attributes as $val) { @@ -140,16 +141,7 @@ class servkolab extends plugin { } } - /* Assemble free/busy string */ - $edit= sprintf('', - $this->kolabFreeBusyFuture, chkacl($this->acl, 'kolabFreeBusyFuture')); - $fbfuture= sprintf(_("Include data from %s days in the past when creating free/busy lists"), $edit); $smarty->assign("fbfuture", $fbfuture); - - /* Assemble quota string */ - $edit= sprintf('', - $this->cyrus_quotawarn, chkacl($this->acl, 'cyrus_quotawarn')); - $quotastr= sprintf(_("Warn users when using more than %s%% of their mail quota"), $edit); $smarty->assign("quotastr", $quotastr); /* Load Template */ @@ -159,36 +151,65 @@ class servkolab extends plugin { function remove_from_parent() { - $ldap= $this->config->get_ldap_link(); + /* Only walk through following code, if this host + was a member of the kolab hosts, else skip this */ + if(!$this->initially_was_account){ + return; + } + + /* !!! Don't use "cn" in this function + hostname -> the initial name of the host + cn -> is the new name of the host, in case that it was renamed. + */ + + $ldap = $this->config->get_ldap_link(); $this->dn = "k=kolab,".$this->config->current['BASE']; - if (count($this->kolabHost) == 0){ + /* We can't simply remove the whole entry, it is possible that there are + some other hosts assigned to this object. + So, first of all check if we are the last host entry within the host + : Remove k=kolab entry + if we aren't alone, only remove host name from hosts entry and save */ + /* Are we alone? Remove complete entry... */ + + /* Check if we are definitly in kolabHosts */ + if(!in_array_ics($this->hostname,$this->kolabHost)) { return; } - /* Are we alone? Remove complete entry... */ + /* Integration check, not translatet because they can't pop up at all, only for debug */ + if(count($this->kolabHost) == 0){ + print_red("Server - Kolab tab : This is not possible, we can't remove an account which doesn't exists."); + return; + } + if(!isset($this->hostname) || (empty($this->hostname))){ + print_red("The required attribute hostname seams to empty."); + } + + /* Our hostname is in kolabHosts and there is a only one entry + = we are the last host entry, delete k=kolab entry */ if (count($this->kolabHost) == 1){ /* Remove complete entry */ $ldap->rmdir ($this->dn); - show_ldap_error($ldap->get_error()); - + show_ldap_error($ldap->get_error(), _("Removing kolab host entry failed")); + gosa_log("k=kolab entry removed, ".$this->hostname." was the last kolabHost entry."); + } else { /* Only modify kolabHost */ $hosts= array(); foreach ($this->kolabHost as $host){ - - if (isset($this->cn)&&($host != $this->cn)){ + if($host != $this->hostname){ $hosts[]= $host; } } $attrs= array('kolabHost' => $hosts); $ldap->cd($this->dn); $this->cleanup(); -$ldap->modify ($attrs); - - show_ldap_error($ldap->get_error()); + $ldap->modify ($attrs); + show_ldap_error($ldap->get_error(), _("Removing server from kolab object failed")); + gosa_log("Removing ".$this->hostname." from list of kolabHosts"); } /* Optionally execute a command after we're done */ @@ -203,9 +224,9 @@ $ldap->modify ($attrs); /* Save checkboxes */ foreach (array( "postfix_enable_virus_scan", "postfix_allow_unauthenticated", - "cyrus_admins", "cyrus_imap", "cyrus_pop3", "cyrus_imaps", - "cyrus_pop3s", "cyrus_sieve", "apache_allow_unauthenticated_fb", - "proftpd_ftp", "apache_http") as $cb){ + "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 { @@ -245,8 +266,8 @@ $ldap->modify ($attrs); /*if(empty($this->postfix_relayhost)) { $message[] = _("No SMTP smarthost/relayhost set."); - } - */ + } + */ return ($message); } @@ -256,40 +277,40 @@ $ldap->modify ($attrs); function save() { /* Set ldap connection */ - $ldap = $this->config->get_ldap_link(); - + $ldap = $this->config->get_ldap_link(); + /* Open current dn*/ - $this->dn = "k=kolab,".$this->config->current['BASE']; - + $this->dn = "k=kolab,".$this->config->current['BASE']; + /* Adapt relayhost */ $this->postfix_relayhost= preg_replace('/[\[\]]/', '', $this->postfix_relayhost); if (!$this->postfix_mxrelayenabled && $this->postfix_relayhost != ""){ $this->postfix_relayhost= "[".$this->postfix_relayhost."]"; } + /* Check if this server was renamed, in this case we have to remove old cn first*/ + if($this->hostname != $this->cn){ + $tmp = array(); + if(in_array_ics($this->hostname,$this->kolabHost)){ + foreach($this->kolabHost as $host){ + if($host != $this->hostname){ + $tmp[] = $host; + } + } + $this->kolabHost = $tmp; + } + } + /* Add ourselves to the list of kolabHost's if needed */ - if ((!$this->is_in_there)){ + if (!in_array_ics($this->cn,$this->kolabHost)){ $this->kolabHost[]= $this->cn; } - - - - $tmp = split(";",$this->postfix_mynetworks); - $this->postfix_mynetworks = array(); - foreach($tmp as $tm){ - trim($tm); - if(!empty($tm)){ - $this->postfix_mynetworks[]=$tm; - } - } - - $this->attrs['postfix_mynetworks']=$this->postfix_mynetworks; /* Call parents save to prepare $this->attrs */ plugin::save(); /* Save or modify? */ - $ldap->cat($this->dn); + $ldap->cat($this->dn, array('dn')); if (!$ldap->fetch()){ $mode= "add"; } else { @@ -305,31 +326,24 @@ $ldap->modify ($attrs); unset($this->attrs[$old_key]); } } - /* Add kolab hosts */ $this->attrs['kolabHost']= $this->kolabHost; - - if(($this->is_in_there)&&(!$this->exactName)){ - unset($this->attrs['kolabHost']); - } /* Perform LDAP action */ $ldap->cd($this->dn); $this->cleanup();; $ldap->$mode($this->attrs); - show_ldap_error($ldap->get_error()); - + show_ldap_error($ldap->get_error(), _("Saving server to kolab object failed")); + /* 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"); } - } - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: