From: cajus Date: Mon, 26 Feb 2007 09:12:40 +0000 (+0000) Subject: * Added new mail method X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a0ad3203452b7cdc376eb53a5ed54826e89a28a4;p=gosa.git * Added new mail method * Fixed mac address saving git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5733 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/Changelog b/Changelog index 21890a61d..8cc2d4b72 100644 --- a/Changelog +++ b/Changelog @@ -6,6 +6,12 @@ GOsa2 changelog - Added the possiblility to choose a RDN style for DN's when a CN is already in use - Fixed a problem with cut'n paste for groups and ogroups + - Added new mail method "golab" which has some tweaks against + the standard kolab mode + - Fixed object tagging for workstation/printer assignement + - Fixed undefined index in FAI package lists + - Fixed copy'n paste for groups and object groups + - Enabled non ASCII characters in vacation messages * gosa 2.5.8 - Fixed problem with winstations shown in user list. diff --git a/include/class_mail-methods-golab.inc b/include/class_mail-methods-golab.inc new file mode 100644 index 000000000..0991b8ef7 --- /dev/null +++ b/include/class_mail-methods-golab.inc @@ -0,0 +1,262 @@ + "alias", + "gosaMailQuota" => "cyrus-userquota", + "gosaMailServer" => "kolabHomeServer"); + + function mailMethodGolab($config) + { + $this->config= $config->data['SERVERS']['IMAP']; + } + + function updateMailbox($folder) + { + } + + function setQuota($folder, $gosaMailQuota) + { + return (TRUE); + } + + /* Get quota and divide it by 1024, because in gosa we display in MB + but we get Kb */ + function getQuota($folder) + { + $result= array('quotaUsage' => '', 'gosaMailQuota' => ''); + + /* Only use lower case folder names, if folder name is like "@domain.com" */ + if(preg_match("/@/",$folder)){ + $folder = strtolower($folder); + } + + error_reporting(0); + + /* Load quota settings */ + $quota_value = @imap_get_quota($this->mbox, $folder); + if(is_array($quota_value)) { + if (isset($quota_value["STORAGE"]) && is_array($quota_value["STORAGE"])){ + /* use for PHP >= 4.3 */ + $result['quotaUsage']= (int) ($quota_value["STORAGE"]['usage'] / 1024); + $result['gosaMailQuota']= (int) ($quota_value["STORAGE"]['limit'] / 1024); + } else { + /* backward icompatible */ + $result['quotaUsage']= (int) ($quota_value['usage'] / 1024); + $result['gosaMailQuota']= (int) ($quota_value['limit'] / 1024); + } + }elseif(!$quota_value){ + return(false); + } + + error_reporting(E_ALL); + + return ($result); + } + + + function fixAttributesOnLoad(&$mailObject) + { + /* Kolab shared folder names are like ' shared.uid@server.de ' + So overwrite uid to match these folder names. Else we can't read quota settings etc. + #FIXME is there a better way to detect if it is 'shared.' or 'shared+' or 'kolab+shared.' or what ever ?*/ + if(get_class($mailObject) == "mailgroup"){ + $mailObject->uid = $mailObject->uid."@".preg_replace("/^.*@/","",$mailObject->mail); + } + + /* Convert attributes and objectClasses */ + foreach ($this->attribute_map as $dest => $source){ + /* Hickert 11.11.05 : Alternate email addresses were saved, but not displayed again. + if (isset($mailObject->attrs[$source])){ + $mailObject->attrs[$dest]= $mailObject->attrs[$source]; + unset ($mailObject->attrs[$source]); + */ + + if (isset($mailObject->attrs[$source])){ + unset($mailObject->attrs[$source]['count']); + $mailObject->attrs[$dest]= $mailObject->attrs[$source]; + $mailObject->$dest= $mailObject->attrs[$source]; + + unset ($mailObject->$dest['count']); + unset ($mailObject->attrs[$source]); + } + } + + /* Adjust server name if needed */ + foreach ($mailObject->config->data['SERVERS']['IMAP'] as $srv => $dummy){ + if (preg_match("%".$mailObject->attrs['gosaMailServer'][0]."$%", $srv)){ + $mailObject->attrs['gosaMailServer']= array(0 => $srv, "count" => 1); + break; + } + } + } + + + function fixAttributesOnStore(&$mailObject) + { + global $config; + + /* If quota is empty, remove quota restrictions by setting quota to 0 */ + if(isset($mailObject->gosaMailQuota) && (empty($mailObject->gosaMailQuota))){ + $mailObject->attrs['gosaMailQuota'] = 0; + } + + /* Convert attributes and objectClasses */ + foreach ($this->attribute_map as $source => $dest){ + if (isset($mailObject->attrs[$source])){ + $mailObject->attrs[$dest]= $mailObject->attrs[$source]; + unset ($mailObject->attrs[$source]); + } + } + $objectclasses= array(); + foreach ($mailObject->attrs['objectClass'] as $oc){ + if ($oc != 'kolabInetOrgPerson' && $oc != 'kolabSharedFolder'){ + $objectclasses[]= $oc; + } + } + $mailObject->attrs['objectClass']= $objectclasses; + if (in_array("posixGroup", $mailObject->attrs['objectClass'])){ + + /* Add kolabSharedFoleder Class */ + $mailObject->attrs['objectClass'][]= 'kolabSharedFolder'; + + /* Work on acl attribute */ + $new_acl= array(); + foreach ($mailObject->attrs['acl'] as $uacl){ + + /* Get user=(mail) & acls */ + list($user, $acl) = split(" ", $uacl); + + /* Add al users which have seperated acls + %members% are all users in this group, + which have the standard group acl + */ + if ($user != "%members%"){ + $new_acl[$user]= $uacl; + } else { + + /* All groupmembers will be added */ + $ldap = $config->get_ldap_link(); + $ldap->cd($config->current['BASE']); + foreach ($mailObject->members as $member){ + + /* Get user mail address .... */ + $ldap->search("(&(objectClass=person)(|(uid=".$member.")(mail=".$member.")))",array("mail")); + $res = $ldap->fetch(); + + /* Default mail address is set to uid - + So if there is no mail address defined the uid is added + */ + $mail = $member; + + /* Use mail address if it is available */ + if(isset($res['mail'][0])){ + $mail = $res['mail'][0]; + } + + /* only append this mail/permission string to acl, + if there arn't already some (special) configs for this user */ + $found =false; + foreach($mailObject->imapacl as $mailA => $acl){ + if(strtolower(trim($mailA))==strtolower(trim($mail))){ + $found = true; + } + } + + /* Skipp user, with no email adress too */ + if($member == $mail){ + $found = true; + } + + /* Append new user acl */ + if(!$found){ + $new_acl[$member]= "$mail $acl"; + } + + /* Old line */ + // $new_acl[$member]= "$member $acl"; + } + } + } + + /* Save shared folder target */ + $mailObject->attrs['gosaSharedFolderTarget']= "kolab+".$mailObject->mail; + + /* Kolab shared folder names are like ' shared.uid@server.de ' + So overwrite uid to match these folder names. Else we can't read quota settings etc. + #FIXME is there a better way to detect if it is 'shared.' or 'shared+' or 'kolab+shared.' or what ever ?*/ + $mailObject->uid = $mailObject->uid."@".preg_replace("/^.*@/","",$mailObject->mail); + + /* Assign new acls */ + $mailObject->attrs['acl']= array(); + foreach ($new_acl as $key => $value){ + $mailObject->attrs['acl'][]= $value; + } + } else { + $mailObject->attrs['objectClass'][]= 'kolabInetOrgPerson'; + } + + /* Remove imap:// tagging */ + $mailObject->attrs['kolabHomeServer']= preg_replace('%imap://%', '', $mailObject->attrs['kolabHomeServer']); + $mailObject->attrs['gosaMailServer']= $mailObject->attrs['kolabHomeServer']; + $mailObject->attrs['kolabDeleteFlag']= array(); + } + + function fixAttributesOnRemove(&$mailObject) + { + /* Add attribute for object deletion and remove GOsa specific + values from entry. */ + foreach($this->attribute_map as $kolabAttr){ + $mailObject->attrs[$kolabAttr] = array(); + } + + /* Only add kolab delete Flag in case of an user.mailAccount */ + if(!in_array("posixGroup", $mailObject->attrs['objectClass'])){ + $mailObject->attrs['kolabDeleteFlag']= preg_replace('%imap://%', '', $mailObject->gosaMailServer); + }else{ + /* Kolab shared folder names are like ' shared.uid@server.de ' + So overwrite uid to match these folder names. Else we can't read quota settings etc. + #FIXME is there a better way to detect if it is 'shared.' or 'shared+' or 'kolab+shared.' or what ever ?*/ + $mailObject->uid = $mailObject->uid."@".preg_replace("/^.*@/","",$mailObject->mail); + + } + } + + + function deleteMailbox($folder) + { + /* Remove shared folders and skip removing users. + KolabD is not able to remove shared folders yet, so we do it instead */ + if(!(preg_match("/^user\//",$folder))){ + return mailMethodCyrus::deleteMailbox($folder); + } + return (TRUE); + } +} + +// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: +?> diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index 48e4388b4..f75985244 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -195,7 +195,7 @@ class mailgroup extends plugin /* Load permissions */ $tmp = array(); - if(preg_match("/kolab/i",$this->mmethod)){ + if(preg_match("/olab/i",$this->mmethod)){ $ldap = $this->config->get_ldap_link(); if (isset($this->attrs['acl'])){ @@ -606,7 +606,7 @@ class mailgroup extends plugin /* Added these ObjectClass and Attributes, because they were not removed correctly, only in case of kolab ... */ - if(isset($this->config->current['MAILMETHOD'])&&preg_match("/kolab/i",$this->config->current['MAILMETHOD'])){ + if(isset($this->config->current['MAILMETHOD'])&&preg_match("/olab/i",$this->config->current['MAILMETHOD'])){ $this->attributes[]="acl"; $this->objectclasses[] = "kolabSharedFolder"; } @@ -736,7 +736,7 @@ I: Only insider delivery */ $this->attrs['gosaMailForwardingAddress'] = $this->gosaMailForwardingAddress; $this->attrs['gosaSharedFolderTarget'] = "share+".$this->uid; - if(preg_match("/kolab/i",$this->mmethod)){ + if(preg_match("/olab/i",$this->mmethod)){ /* Save acl's */ $this->attrs['acl']= array(); foreach ($this->imapacl as $user => $acl){ @@ -765,7 +765,7 @@ I: Only insider delivery */ } /* Only do IMAP actions if we are not a template */ - if(preg_match("/kolab/i",$this->mmethod)){ + if(preg_match("/olab/i",$this->mmethod)){ if (empty($this->gosaMailServer)||is_array($this->gosaMailServer)){ if(isset($this->attrs['gosaMailServer'][0])){ $this->gosaMailServer = $this->attrs['gosaMailServer'][0]; @@ -778,7 +778,7 @@ I: Only insider delivery */ $memberacl= $this->imapacl['%members%']; foreach ($this->members as $user){ - if(preg_match("/kolab/i",$this->mmethod)){ + if(preg_match("/olab/i",$this->mmethod)){ $ldap->cd($this->config->current['BASE']); $ldap->search("(&(objectClass=person)(|(mail=".$user.")(uid=".$user.")))",array("mail")); $at = $ldap->fetch(); diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 483ca2262..84c07304e 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -681,6 +681,7 @@ class printgeneric extends plugin if($this->BelongsTo == "Workstation"){ $this->dn= preg_replace("/ou=workstations,/","ou=printers,",$this->dn); + $this->macAddress = $this->parent->by_object['workgeneric']->netConfigDNS->macAddress; } if(!$this->is_account) return; diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc index 93662308d..d4d239903 100644 --- a/plugins/personal/mail/class_mailAccount.inc +++ b/plugins/personal/mail/class_mailAccount.inc @@ -1045,7 +1045,7 @@ class mailAccount extends plugin { if (isset($this->config->current['MAILMETHOD'])){ $method= $this->config->current['MAILMETHOD']; - if(preg_match("/kolab/i",$method)){ + if(preg_match("/olab/i",$method)){ $ldap = $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); $ldap->cat($this->dn);