X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servKolab.inc;h=4145f5525dd6e45a2e3ff96cc222b105d795b362;hb=fe503ccdeea34c0bdb10c77d55e6561728b55766;hp=8c7f5b3365104c279bb4019e69347f6103bd24b5;hpb=495126943eaeace96bf7e7fd8a0d730804317053;p=gosa.git
diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 8c7f5b336..4145f5525 100644
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -6,45 +6,44 @@ class servkolab extends plugin {
var $cli_description = "Some longer text\nfor help";
var $cli_parameters = array("eins"=>"Eins ist toll", "zwei"=>"Zwei ist noch besser");
- var $postfix_mydomain = "\$domain";//<<<<<<<<<<<<<
- var $postfix_mydestination = "\$domain";//<<<<<<<<<<<<<
- var $postfix_mynetworks = "127.0.0.1/8";//ok
- var $postfix_enable_virus_scan = "TRUE";//ok
+ var $postfix_mydomain = "";
+ var $postfix_mydestination = "";
+ var $postfix_mynetworks = "127.0.0.1/8";
+ var $postfix_enable_virus_scan = "TRUE";
var $postfix_relayhost = "";
var $postfix_mxrelayenabled = true;
- var $postfix_allow_unauthenticated = "false";
- var $cyrus_quotawarn = "80";//ok
- var $kolabFreeBusyFuture = "1";// ok
- var $cyrus_admins = "TRUE";//<<<<<<<<<<<<<<<<
- var $cyrus_imap = "TRUE";//ok
- var $cyrus_pop3 = "TRUE";//ok
- var $cyrus_imaps = "TRUE";//ok
- var $cyrus_pop3s = "TRUE";//ok
- var $cyrus_sieve = "TRUE";//ok
- var $apache_allow_unauthenticated_fb = "TRUE";//<<<<<<<<<<<<
- var $proftpd_ftp = "TRUE";//pk
- var $apache_http = "TRUE";//ok
+ var $postfix_allow_unauthenticated = "FALSE";
+ 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";
+ var $cyrus_pop3s = "TRUE";
+ var $cyrus_sieve = "TRUE";
+ var $apache_allow_unauthenticated_fb = "TRUE";
+ var $proftpd_ftp = "TRUE";
+ var $apache_http = "TRUE";
var $kolabHost = array();
- var $added = false;
- var $remove = false;
- var $changed = false;
- var $attributes = array("postfix_mydomain", "postfix_mydestination",
- "postfix_mynetworks", "postfix_enable_virus_scan","postfix_relayhost","postfix_allow_unauthenticated",
- "cyrus_admins", "cyrus_imap","kolabFreeBusyFuture",
- "cyrus_pop3", "cyrus_imaps", "cyrus_pop3s", "cyrus_sieve",
- "apache_allow_unauthenticated_fb", "proftpd_ftp",
- "apache_http", "cyrus_quotawarn", "kolabHost");
+ 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");
var $objectclasses = array("top", "kolab");
function servkolab($config, $dn = 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);
@@ -55,93 +54,87 @@ 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);
+
/* Is this Server a member of the Kolab extension or not ?*/
- if(in_array($this->hostname,$this->attrs['kolabHost'])) {
- $this->is_account=true;
- } else {
- $this->is_account=false;
+ if(isset($this->attrs['kolabHost'])) {
+ $this->kolabHost= $this->attrs['kolabHost'];
+ unset($this->kolabHost['count']);
+ }
+ $this->is_in_there = 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;
+ $this->initially_was_account = true;
+ }
}
+
+
+ /* Mhh */
+ if(in_array($this->hostname, $this->kolabHost)) {
+ $this->exactName=true;
+ } else {
+ $this->exactName=false;
+ }
+
+ /* Parse mynetworks */
+ 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()
{
- /* Fill templating stuff */
- $smarty = get_smarty();
- $display = "";
-
- $this->changed =true;
+ /* Call parent execute */
+ plugin::execute();
- /* Lets get all Host that are member of the Kolab extension, but don't catch count */
- if(is_array($this->attrs['kolabHost']))
- {
- unset($this->attrs['kolabHost']['count']);
- $this->kolabHost = $this->attrs['kolabHost'];
- }
- else
- {
- $this->attrs['kolabHost']=array();
- $this->kolabHost = $this->attrs['kolabHost'];
- }
+ /***************
+ Variable initialisation
+ ***************/
- /* Tell the script the dn, we are using */
- $this->kolabdn = "k=kolab,".$this->config->current['BASE'];
+ $smarty = get_smarty();
+ $display = "";
+ $ldap = $this->config->get_ldap_link();
+
- /* The Ldap link is needed to ask ldap some questions */
- $ldap = $this->config->get_ldap_link();
+ /* 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);
+
+
+ /***************
+ Handle Account is_account state
+ ***************/
+
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])) {
$this->is_account = !$this->is_account;
-
-
- /*if we flip to true, we'll have to create a new account, so lets do that*/
- if($this->is_account==true)
- {
- /* Only add the given Hostname to the existing hosts*/
- $this->kolabHost[]=$this->hostname;
- $this->attrs['kolabHost'][]=$this->hostname;
- }
- else
- {
- /* First we have to find the Host we want to delete, take the index and delete em*/
- foreach($this->kolabHost as $key=>$host)
- {
- /* Delete only if the Host is the in the array*/
- if($host == $this->hostname)
- {
- unset($this->kolabHost[$key]);
- unset($this->attrs['kolabHost'][$key]);
- }
- }
- /* We deletet an Entry so we must reorder the index of the array */
- $tmp = $this->kolabHost;
- $this->kolabHost=array();
- $this->attrs['kolabHost']=array();
-
- /* reorder reorder ...*/
- foreach($tmp as $host){
- $this->kolabHost[]=$host;
- $this->attrs['kolabHost'][]=$host;
- }
- /* Tell Save that we want to delete someone*/
- $this->remove = true;
- }
-
}
- /* Check Relayhost and if we have MX lookup enabled*/
- if(isset($this->postfix_relayhost[0]) && $this->postfix_relayhost[0]=="[")
- {
- $this->postfix_mxrelayenabled=false;
- $this->postfix_relayhost = str_replace("[","",$this->postfix_relayhost);
- $this->postfix_relayhost = str_replace("]","",$this->postfix_relayhost);
- }
- if($this->postfix_mxrelayenabled) {
- $smarty->assign("RelayMxSupportCheck"," checked ");
- } else {
- $smarty->assign("RelayMxSupportCheck","");
- }
+
/* Show tab dialog headers */
if ($this->is_account) {
/* call Add Acoount to add account */
@@ -152,28 +145,33 @@ 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)
{
$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)))
+ if (($this->$val != "FALSE") && !empty($this->$val)){
$smarty->assign($val."Check", "checked");
- else
+ } else {
$smarty->assign($val."Check", "");
+ }
}
- /* 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 */
@@ -183,19 +181,101 @@ class servkolab extends plugin {
function remove_from_parent()
{
+ /* 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'];
+
+ /* 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;
+ }
+
+ /* 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(), _("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($host != $this->hostname){
+ $hosts[]= $host;
+ }
+ }
+ $attrs= array('kolabHost' => $hosts);
+ $ldap->cd($this->dn);
+ $this->cleanup();
+ $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 */
+ $this->handle_post_events("remove");
}
function save_object()
{
- plugin::save_object();
+ if (isset($_POST['kolabtab'])){
+ plugin::save_object();
+
+ /* 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){
+ if (isset($_POST[$cb])){
+ $this->$cb= "TRUE";
+ } else {
+ $this->$cb= "FALSE";
+ }
+ }
+
+ /* Toggle relay check */
+ $this->postfix_mxrelayenabled= isset($_POST['RelayMxSupport']);
+ }
+
}
function check()
{
- error_reporting(E_ALL);
- $message = array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+
if(($this->kolabFreeBusyFuture=="")) {
$message[] = _("Future days in Free/Busy settings must be set.");
}elseif(!is_uid($this->kolabFreeBusyFuture) || $this->kolabFreeBusyFuture < 0){
@@ -210,16 +290,14 @@ class servkolab extends plugin {
$message[] = _("Future days must be a value.");
}
- if(empty($this->postfix_mynetworks))
- {
+ if(empty($this->postfix_mynetworks)) {
$message[] = _("No SMTP privileged networks set.");
}
- if(empty($this->postfix_relayhost))
- {
+ /*if(empty($this->postfix_relayhost)) {
$message[] = _("No SMTP smarthost/relayhost set.");
- }
-
+ }
+ */
return ($message);
}
@@ -228,172 +306,80 @@ class servkolab extends plugin {
/* Save to LDAP */
function save()
{
- if(!$this->changed) return;
-
/* Set ldap connection */
- $ldap = $this->config->get_ldap_link();
-
- /* Open current dn*/
- $ldap->cd($this->dn);
+ $ldap = $this->config->get_ldap_link();
-
- /* Setup Attributes to save */
- $newattrs = array();
+ /* Open current dn*/
+ $this->dn = "k=kolab,".$this->config->current['BASE'];
- /* Set vars with correct - _ - */
- foreach($this->attributes as $key) {
- $key2 = str_replace("_", "-", $key);
- $newattrs[$key2] = $this->$key;
+ /* Adapt relayhost */
+ $this->postfix_relayhost= preg_replace('/[\[\]]/', '', $this->postfix_relayhost);
+ if (!$this->postfix_mxrelayenabled && $this->postfix_relayhost != ""){
+ $this->postfix_relayhost= "[".$this->postfix_relayhost."]";
}
-
-
-
- /* Set bool vars */
- if ($newattrs['postfix-enable-virus-scan'] == 0)
- $newattrs['postfix-enable-virus-scan'] = "FALSE";
- else
- $newattrs['postfix-enable-virus-scan'] = "TRUE";
- if ($newattrs['cyrus-imap'] == 0)
- $newattrs['cyrus-imap'] = "FALSE";
- else
- $newattrs['cyrus-imap'] = "TRUE";
- if ($newattrs['cyrus-imaps'] == 0)
- $newattrs['cyrus-imaps'] = "FALSE";
- else
- $newattrs['cyrus-imaps'] = "TRUE";
- if ($newattrs['cyrus-pop3'] == 0)
- $newattrs['cyrus-pop3'] = "FALSE";
- else
- $newattrs['cyrus-pop3'] = "TRUE";
- if ($newattrs['cyrus-pop3s'] == 0)
- $newattrs['cyrus-pop3s'] = "FALSE";
- else
- $newattrs['cyrus-pop3s'] = "TRUE";
- if ($newattrs['cyrus-sieve'] == 0)
- $newattrs['cyrus-sieve'] = "FALSE";
- else
- $newattrs['cyrus-sieve'] = "TRUE";
- if ($newattrs['proftpd-ftp'] == 0)
- $newattrs['proftpd-ftp'] = "FALSE";
- else
- $newattrs['proftpd-ftp'] = "TRUE";
- if ($newattrs['apache-http'] == 0)
- $newattrs['apache-http'] = "FALSE";
- else
- $newattrs['apache-http'] = "TRUE";
- if ($newattrs['postfix-allow-unauthenticated'] == 0)
- $newattrs['postfix-allow-unauthenticated'] = "FALSE";
- else
- $newattrs['postfix-allow-unauthenticated'] = "TRUE";
- if ($newattrs['apache-allow-unauthenticated-fb'] == 0)
- $newattrs['apache-allow-unauthenticated-fb'] = "FALSE";
- else
- $newattrs['apache-allow-unauthenticated-fb'] = "TRUE";
-
-
- /* Reorder Host array, to get constant increasing index */
- $newattrs['kolabHost'] = array();
-
- /* Check Relayhost and if we have MX lookup enabled*/
- if(isset($_POST['RelayMxSupport']))
- $this->postfix_mxrelayenabled = true ;
- else
- $this->postfix_mxrelayenabled = false;
- if(!$this->postfix_mxrelayenabled)
- {
- $newattrs['postfix-relayhost']="[".$this->postfix_relayhost."]";
- }
- /* If we want to add someone or do only changes on the settings ...*/
- if(!$this->remove)
- {
- /* Get all Host known, that are member of the Kolab extension */
- $this->kolabHost = $this->attrs['kolabHost'];
-
- /* So, the Host is already member of the extension, so get all and do nothing */
- if(in_array($this->hostname,$this->kolabHost))
- {
- $newattrs['kolabHost']=$this->kolabHost;
- }
- /* So this is the first entry */
- elseif(empty($this->kolabHost))
- {
- /* Create an array an add the Host */
- $newattrs['kolabHost']=array();
- $newattrs['kolabHost'][]=$this->hostname;
- }
- /* Theres already an entry, but only in a string, */
- elseif(is_string($this->kolabHost))
- {
- $tmp = $this->kolabHost;
- $newattrs['kolabHost']=array();
- $newattrs['kolabHost'][]=$tmp;
- $newattrs['kolabHost'][]=$this->hostname;
- }
- /* Here we have already some entries */
- elseif(is_array($newattrs['kolabHost']))
- {
- /* Insert the new one*/
- foreach($this->kolabHost as $key=>$val) {
- if (is_int($key)) {
- $newattrs['kolabHost'][] = $val;
- }
+ /* 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;
}
- $newattrs['kolabHost'][]= $this->hostname;
}
}
- else
- {
- /* Here we want to delete an entry*/
- $newattrs['kolabHost']= $this->attrs['kolabHost'];
+ $this->kolabHost = $tmp;
+ }
+
+ /* Add ourselves to the list of kolabHost's if needed */
+ if (!in_array($this->cn,$this->kolabHost)){
+ $this->kolabHost[]= $this->cn;
+ }
+
+ /* Create mynetworks array by splitting the string with ; */
+ $tmp = split(";",$this->postfix_mynetworks);
+ $this->postfix_mynetworks = array();
+ foreach($tmp as $tm){
+ trim($tm);
+ if(!empty($tm)){
+ $this->postfix_mynetworks[]=$tm;
}
- /* Save as following object ! */
- $this->kolabdn = "k=kolab,".$this->config->current['BASE'];
+ }
+ $this->attrs['postfix_mynetworks']=$this->postfix_mynetworks;
- /* If we already have an object like this one,
- we only need to modify the entry
- */
+ /* Call parents save to prepare $this->attrs */
+ plugin::save();
- /* is this an empty extension, no host defined for it, than delet it */
- if(count($newattrs['kolabHost'])==0)
- {
- /* Delete the entry*/
- $ldap->cd ("k=kolab,".$this->config->current['BASE']);
- $ldap->rmdir("k=kolab,".$this->config->current['BASE']);
-
-
- }elseif ($ldap->dn_exists($this->kolabdn)) {
- /* Ok there is already an extension, so we only need to add the changes and the new Host, (if it was a new host)*/
- gosa_log("Modifying");
-
- /* unset all attributes we won't change*/
- unset($newattrs['cyrus-admins']);
- unset($newattrs['postfix-mydomain']);
- unset($newattrs['postfix-mydestination']);
-
- /* Update changes */
- $ldap->cd($this->kolabdn);
- $ldap->modify($newattrs);
+ /* Save or modify? */
+ $ldap->cat($this->dn, array('dn'));
+ if (!$ldap->fetch()){
+ $mode= "add";
} else {
+ $mode= "modify";
+ }
- /* We must create a new Entry */
- $newattrs['k'] = "kolab";
- $newattrs['uid'] = "freebusy";
- $newattrs['postfix-mydomain'] = "gonicus.de";
- $newattrs['postfix-mydestination'] = "\$mydomain";
- $newattrs['userPassword'] = "tester";
- $newattrs['objectClass'] = $this->objectclasses;
-
- /* For better reading / Objectclass was added at last */
- $newattrs = array_reverse ($newattrs);
-
- /* And add the entry*/
- $ldap->cd($this->kolabdn);
- $ldap->add($newattrs);
+ /* Do attribute conversion */
+ foreach ($this->attrs as $key => $value){
+ if (preg_match('/_/', $key)){
+ $old_key= $key;
+ $key= preg_replace('/_/', '-', $key);
+ $this->attrs[$key]= $value;
+ unset($this->attrs[$old_key]);
+ }
}
- /* show any errors */
- show_ldap_error($ldap->get_error());
-
+ /* 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(), _("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) {
@@ -402,9 +388,7 @@ class servkolab extends plugin {
} else {
$this->handle_post_events("add");
}
-
}
-
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: