X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servKolab.inc;h=a2d36d1a96dcb27210a3a1dcfa32acb3ef21a339;hb=350c9658be7d52b43728f753149f703c893cdeb4;hp=4c562fffba4035cec9e44cbc0e25d39c0d6fed40;hpb=ea78c57170af49f6c7f10ad16c69ffdc83a3ab36;p=gosa.git
diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 4c562fffb..a2d36d1a9 100644
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -1,43 +1,43 @@
"Eins ist toll", "zwei"=>"Zwei ist noch besser");
- var $postfix_mydomain = "\$domain";
- var $postfix_mydestination = "\$domain";
+ var $postfix_mydomain = "";
+ var $postfix_mydestination = "";
+ var $cyrus_admins = "";
var $postfix_mynetworks = "127.0.0.1/8";
var $postfix_enable_virus_scan = "TRUE";
- var $cyrus_quotawarn = "999";//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";//doing now
+ var $postfix_relayhost = "";
+ var $postfix_mxrelayenabled = true;
+ var $postfix_allow_unauthenticated = "FALSE";
+ var $cyrus_quotawarn = "80";
+ var $kolabFreeBusyFuture = "1";
+ var $k = "kolab";
+ 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 $postfix_relayhost = "";
- var $added = false;
- var $remove = false;
- var $attributes = array("postfix_mydomain", "postfix_mydestination",
- "postfix_mynetworks", "postfix_enable_virus_scan","postfix_relayhost",
- "cyrus_admins", "cyrus_imap",
- "cyrus_pop3", "cyrus_imaps", "cyrus_pop3s", "cyrus_sieve",
- "apache_allow_unauthenticated_fb", "proftpd_ftp",
- "apache_http", "cyrus_quotawarn", "kolabHost");
+ 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)
+ function servkolab($config, $dn = NULL, $parent= NULL)
{
- $this->hostname= preg_replace('/^cn=([^,]+),.*$/', '\1', $dn);
- $this->dn = "k=kolab,".$config->current['BASE'];
-
+ /* 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'];
+
+ /* Load variables, if given*/
plugin::plugin($config, $this->dn);
/* Copy needed attributes */
@@ -47,68 +47,64 @@ class servkolab extends plugin {
$this->$val = $this->attrs["$name"][0];
}
}
-
- if(in_array($this->hostname,$this->attrs['kolabHost']))
- {
- $this->is_account=true;
+
+ /* 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(isset($this->attrs['kolabHost'])) {
+ $this->kolabHost= $this->attrs['kolabHost'];
+ unset($this->kolabHost['count']);
}
- else
- {
- $this->is_account=false;
+ $this->is_account = false;
+ $this->initially_was_account = false;
+ foreach($this->kolabHost as $host){
+ if($this->hostname == $host){
+ $this->is_account = true;
+ $this->initially_was_account = true;
+ }
}
+
}
function execute()
{
- /* Fill templating stuff */
- $smarty = get_smarty();
- $display = "";
+ /* Call parent execute */
+ plugin::execute();
+
+ /***************
+ Variable initialisation
+ ***************/
+
+ $smarty = get_smarty();
+ $display = "";
+ $ldap = $this->config->get_ldap_link();
- unset($this->attrs['kolabHost']['count']);
- $this->kolabHost = $this->attrs['kolabHost'];
+ /* 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);
- /* Tell the script the dn, we are using */
- $this->kolabdn = "k=kolab,".$this->config->current['BASE'];
- $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;
-
- if($this->is_account==true)
- {
- $this->kolabHost[]=$this->hostname;
- $this->attrs['kolabHost'][]=$this->hostname;
- }
- else
- {
- foreach($this->kolabHost as $key=>$host)
- {
- if($host == $this->hostname)
- {
- unset($this->kolabHost[$key]);
- unset($this->attrs['kolabHost'][$key]);
- }
- }
- $tmp = $this->kolabHost;
- $this->kolabHost=array();
- $this->attrs['kolabHost']=array();
- foreach($tmp as $host){
- $this->kolabHost[]=$host;
- $this->attrs['kolabHost'][]=$host;
- }
- $this->remove = true;
- }
-
}
-
- print_a($this);
-
/* Show tab dialog headers */
if ($this->is_account) {
/* call Add Acoount to add account */
@@ -119,29 +115,35 @@ 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)
{
- /* If theres a button pressed, we need to check all attributes */
- if ((isset($_POST['NewHost'])) || (isset($_POST['DelHost'])))
- {
- /* Set var to value or to zero */
- if (isset($_POST[$val]))
- {
-
- $this->$val = $_POST[$val];
- } else {
- $this->$val = 0;
- }
- }
+ $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", "");
+ }
}
+ $smarty->assign("fbfuture", $fbfuture);
+ $smarty->assign("quotastr", $quotastr);
+
/* Load Template */
$display.=$smarty->fetch(get_template_path('servkolab.tpl', TRUE));
return ($display);
@@ -149,26 +151,123 @@ 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_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()
{
- $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){
+ $message[] = _("Future days in Free/Busy settings must be a positive value.");
+ }
if(!is_int((int)($this->cyrus_quotawarn))) {
- $message[] = "The given Quota settings value must be a number";
- }elseif(!(($this->cyrus_quotawarn<=100)&&($this->cyrus_quotawarn>=1))){
- $message[] = "Please choose a value between 1 and 100 for Quota settings";
+ $message[] = _("The given Quota settings value must be a number.");
+ }elseif(!(($this->cyrus_quotawarn<=100)&&($this->cyrus_quotawarn>=0))){
+ $message[] = _("Please choose a value between 1 and 100 for Quota settings.");
+ }elseif(strcasecmp($this->cyrus_quotawarn,(int)$this->cyrus_quotawarn)){
+ $message[] = _("Future days must be a value.");
}
-
+
+ if(empty($this->postfix_mynetworks)) {
+ $message[] = _("No SMTP privileged networks set.");
+ }
+
+ /*if(empty($this->postfix_relayhost)) {
+ $message[] = _("No SMTP smarthost/relayhost set.");
+ }
+ */
return ($message);
}
@@ -178,159 +277,73 @@ class servkolab extends plugin {
function save()
{
/* Set ldap connection */
- $ldap = $this->config->get_ldap_link();
- $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['apache-allow-unauthenticated-fb'] == 0)
- $newattrs['apache-allow-unauthenticated-fb'] = "FALSE";
- else
- $newattrs['apache-allow-unauthenticated-fb'] = "TRUE";
-
-
- if(empty($newattrs['postfix-relayhost'])) unset( $newattrs['postfix-relayhost']);
-
- /* Reorder Host array, to get constant increasing index */
- $newattrs['kolabHost'] = array();
-
- if(!$this->remove)
- {
- $this->kolabHost = $this->attrs['kolabHost'];
-
- if(in_array($this->hostname,$this->kolabHost))
- {
- $newattrs['kolabHost']=$this->kolabHost;
- }
- elseif(empty($this->kolabHost))
- {
- print "empty";
- $newattrs['kolabHost']=array();
- $newattrs['kolabHost'][]=$this->hostname;
- }
- elseif(is_string($this->kolabHost))
- {
- print "string";
- $tmp = $this->kolabHost;
- $newattrs['kolabHost']=array();
- $newattrs['kolabHost'][]=$tmp;
- $newattrs['kolabHost'][]=$this->hostname;
- }
- elseif(is_array($newattrs['kolabHost']))
- {
- print "array";
- 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;
}
+ $this->kolabHost = $tmp;
}
- else
- {
- $newattrs['kolabHost']= $this->attrs['kolabHost'];
- }
- /* Save as following object ! */
- $this->kolabdn = "k=kolab,".$this->config->current['BASE'];
+ }
- /* If we already have an object like this one,
- we only need to modify the entry
- */
+ /* Add ourselves to the list of kolabHost's if needed */
+ if (!in_array_ics($this->cn,$this->kolabHost)){
+ $this->kolabHost[]= $this->cn;
+ }
- if(count($newattrs['kolabHost'])==0)
- {
- $ldap->cd ("k=kolab,".$this->config->current['BASE']);
- print "Deleting";
- $ldap->rmdir("k=kolab,".$this->config->current['BASE']);
-
- }elseif ($ldap->dn_exists($this->kolabdn)) {
- gosa_log("Modifying");
-
- /* unset all attributes we won't change*/
- unset($newattrs['cyrus-admins']);
- unset($newattrs['postfix-mydomain']);
- unset($newattrs['postfix-mydestination']);
-
+ /* Call parents save to prepare $this->attrs */
+ plugin::save();
- $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;
-
- gosa_log("Adding");
-
- $newattrs = array_reverse ($newattrs);
-
- $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]);
+ }
}
-
- print_a($newattrs);
- /* show any errors */
- show_ldap_error($ldap->get_error());
-
+ /* Add kolab hosts */
+ $this->attrs['kolabHost']= $this->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) {
- $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: