![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods.inc b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
index 60764445e1094fce25051b0e75f3d5b0dcebcc9a..634cb2a7d370c19991e046268a7cc63063e4700b 100644 (file)
class mailMethod{
/* Allow modification of account_ids for existing mail accounts */
- protected $modifyableMail = TRUE;
+ protected $modifyableMail = TRUE;
+
+ /* Allow modification of the mail server attribute existing mail accounts */
+ protected $modifyableServer = TRUE;
/* Enforces same value for 'mail' as used for 'cn' */
protected $mailEqualsCN = FALSE;
protected $user_prefix = "user.";
protected $share_prefix = "share.";
+ /* Account ID creation */
+ protected $user_id = "__PREFIX____UATTRIB__";
+ protected $share_id = "__PREFIX____UATTRIB__";
+
/* Create accounts in cyrus style with '/' instead of '.' */
protected $cyrusUseSlashes= FALSE;
protected $error = "";
protected $parent = NULL;
protected $MailServer = "";
+
+ protected $acl_map = array(
+ "lrsw" => "read",
+ "lrswp" => "post",
+ "p" => "external post",
+ "lrswip" => "append",
+ "lrswipcd" => "write",
+ "lrswipcda"=> "admin",
+ " " => "none");
+
+ protected $acl_mapping = array();
/*! \brief Constructs the mail class
*/
if ($this->config->get_cfg_value("cyrusUseSlashes") == "true"){
$this->cyrusUseSlashes = TRUE;
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "cyrusUseSlashes: <b>Enabled</b>","");
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "","<b>MAIL:</b> cyrusUseSlashes: <b>Enabled</b>");
}else{
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "cyrusUseSlashes: <b>Disabled</b>","");
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "","<b>MAIL:</b> cyrusUseSlashes: <b>Disabled</b>");
}
/* Check if the mail account identification attribute
$this->uattrib = $new_uattrib;
}else{
@DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>".$new_uattrib."</b>",
- "Unsupported 'mailAttribute' in gosa configuration specified");
+ "<b>MAIL:</b> Unsupported 'mailAttribute' in gosa configuration specified");
msg_dialog::display(_("Configuration error"),
sprintf(_("The configured mail attribute '%s' is unsupported!"), $new_uattrib), ERROR_DIALOG);
}
}
+
+ /* Create ACL map */
+ foreach($this->acl_map as $acl => $name){
+ $this->acl_mapping[$acl] = _($name);
+ }
+
$this->build_account_id();
$this->initial_account_id = $this->account_id;
}
if(isset($this->parent->$source)){
$this->parent->$dest = $this->parent->$source;
}
+ if(isset($this->parent->attrs[$source][0])){
+ $this->parent->saved_attributes[$source] = $this->parent->attrs[$source][0];
+ }
}
}
public function connect()
{
$this->reset_error();
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"<b>Connect method</b>: ".get_class($this),"");
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"<b>Current server</b>: ".$this->MailServer,"");
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"","<b>MAIL: Connect method</b>: ".get_class($this));
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"","<b>MAIL: Current server</b>: ".$this->MailServer);
$this->connected = TRUE;
return(TRUE);
{
$this->reset_error();
if($this->is_connected()){
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"<b>Disconnect method</b>: ".get_class($this),"");
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"","<b>MAIL: Disconnect method</b>: ".get_class($this));
$this->connected =FALSE;
}
}
}
+ public function isModifyableServer()
+ {
+ return($this->modifyableServer);
+ }
+
+
/*! \brief Returns TRUE if the action caused an error.
@return Boolean TRUE on error else FALSE
*/
}
+ public function get_account_id()
+ {
+ $this->build_account_id();
+ return($this->account_id);
+ }
+
/*! \brief Create a new account id, like 'user/name@domain.com'.
*/
protected function build_account_id()
{
/* Build account identicator */
if($this->type == "user"){
- $str = $this->user_prefix;
+ $prefix = $this->user_prefix;
+ $acc_string = $this->user_id;
}else{
- $str = $this->share_prefix;
+ $prefix = $this->share_prefix;
+ $acc_string = $this->share_id;
}
+
+ /* Create account prefix and respect "cyrusUseSlashes"
+ Do not replace escaped dots for cyrusUseSlashes.
+ */
$uattrib = $this->uattrib;
if($this->cyrusUseSlashes){
- $str = preg_replace("/\./","/",$str);
+ $prefix = preg_replace('/([^\\\\])\./',"\\1/",$prefix);
+ }
+ $prefix = preg_replace("/\\\\([\.\/])/","\\1",$prefix);
+
+ $domain = $mailpart = "";
+ if(preg_match("/\@/",$this->parent->$uattrib)){
+ $mailpart = preg_replace("/\@.*$/","",$this->parent->$uattrib);
+ $domain = preg_replace("/^[^\@]*+\@(.*)$/","\\1",$this->parent->$uattrib);
}
- $str = trim(strtolower($str . $this->parent->$uattrib));
- if($this->account_id != $str){
- $this->account_id = $str;
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "accountID generated: <b>".$str."</b>","");
+
+ /* Create account_id
+ */
+ $from = array("/__CN__/","/__UID__/","/__PREFIX__/","/__UATTRIB__/","/__DOMAIN__/","/__MAILPART__/");
+ $to = array($this->parent->cn,$this->parent->uid,$prefix,$this->parent->$uattrib, $domain, $mailpart);
+
+ $acc_id = trim(strtolower(preg_replace($from,$to,$acc_string)));
+
+ if($this->account_id != $acc_id){
+ $this->account_id = $acc_id;
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"", "<b>MAIL:</b> AccountID generated: <b>".$acc_id."</b>");
}
}
}
/* Build account identicator */
- if($type == ""){
- $type = $this->type;
- }
- if($type == "user"){
- $str = $this->user_prefix;
+ if($this->type == "user"){
+ $prefix = $this->user_prefix;
+ $acc_string = $this->user_id;
}else{
- $str = $this->share_prefix;
- }
+ $prefix = $this->share_prefix;
+ $acc_string = $this->share_id;
+ }
+ /* Create account prefix and respect "cyrusUseSlashes"
+ Do not replace escaped dots for cyrusUseSlashes.
+ */
$uattrib = $this->uattrib;
if($this->cyrusUseSlashes){
- $str = preg_replace("/\./","/",$str);
+ $prefix = preg_replace('/([^\\\\])\./',"\\1/",$prefix);
}
+ $prefix = preg_replace("/\\\\([\.\/])/","\\1",$prefix);
+
+ $domain = $mailpart = "";
if(preg_match("/\@/",$this->parent->$uattrib)){
- list($mail,$domain) = split("\@",$this->parent->$uattrib);
- $str = trim(strtolower($str . $mail . $folder . "@" . $domain));
+ list($mailpart,$domain) = split("\@",$this->parent->$uattrib);
+ }
+
+ /* Create account_id
+ */
+ $from = array("/__CN__/","/__UID__/","/__PREFIX__/","/__UATTRIB__/","/__DOMAIN__/","/__MAILPART__/");
+ $to = array($this->parent->cn,$this->parent->uid,$prefix,$this->parent->$uattrib, $domain, $mailpart);
+
+ $acc_id = trim(strtolower(preg_replace($from,$to,$acc_string)));
+
+ if(preg_match("/\@/",$acc_id)){
+ list($mail,$domain) = split("\@",$acc_id);
+ $str = trim(strtolower($mail . $folder . "@" . $domain));
}else{
- $str = trim(strtolower($str . $this->parent->$uattrib));
+ $str = trim(strtolower($acc_id . $folder));
}
return($str) ;
}
$method= $this->config->get_cfg_value("mailmethod");
$cls = get_correct_class_name("mailMethod$method");
if(isset($methods[$cls])){
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "Selected mailMethod: <b>".$cls."</b>","");
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,"", "<b>MAIL:</b> Selected mailMethod: <b>".$cls."</b>");
$tmp = new $cls($this->config,$this->parent,$this->type);
$tmp->init();
return($tmp);
}else{
- @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "Invalid mailMethod defined <b>".$cls.
- "</b> falling back to <b>".get_class($this)."</b>","");
+ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "","<b>MAIL: Invalid mailMethod defined: <b>".$cls.
+ "</b> falling back to <b>".get_class($this)."</b>");
/* Print out configuration errors directly, we can't catch them everywhere.
*/
$this->reset_error();
@DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>".$this->account_id."</b>" ,
- "<b>Remove account</b> from server :".$this->MailServer);
+ "<b>MAIL: Remove account</b> from server :".$this->MailServer);
return(TRUE);
-
- /* No imap actions here, just updated shared folder membership
- */
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
- $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaMailAccount)(memberUid=".$account."))",array('dn','cn'));
- if(class_exists("grouptabs")){
- while($attrs = $ldap->fetch()){
- $tmp = new grouptabs($this->config, $this->config->data['TABS']['GROUPTABS'], $attrs['dn']);
- if(isset($tmp->by_object['mailgroup'])){
- $tmp->by_object['mailgroup']->members= $tmp->by_object['group']->memberUid;
- if(!$this->is_account){
- $tmp->by_object['mailgroup']->removeUserAcl($account);
- $tmp->by_object['mailgroup']->removeUserAcl($this->mail);
- }
- $tmp->by_object['mailgroup']->save();
- }
- }
- }
- return(TRUE);
}
*/
public function getMailDomains()
{
- return(array("gonicus.de","test.intranet.de"));
+ return(array("Unconfigured"));
}
*/
public function accountRemoveable(&$reason = ""){
return(TRUE);
-
- /* We are in administrational edit mode.
- Check tab configurations directly * /
-
- $
- if(isset($this->attrs)){
- $checkArray = array("kolabInvitationPolicy","unrestrictedMailSize", "calFBURL","kolabDelegate","kolabFreeBusyFuture");
- foreach($checkArray as $index){
- if(isset($this->attrs[$index])){
- return(true);
- }
- }
- }
- return(false);
-
- */
}
public function getAvailableFolderTypes()
{
$ret = array();
- $ret['CAT']['mail'] = _("Mail");
- $ret['CAT']['peter']= _("User");
- $ret['SUB_CAT']['mail']['a'] = "a";
- $ret['SUB_CAT']['mail']['b'] = "b";
- $ret['SUB_CAT']['peter']['tt'] = "tt";
- $ret['SUB_CAT']['peter']['dd'] = "dd";
- $ret['SUB_CAT']['peter']['did'] = "did";
+ $ret['CAT'][''] = _("None");
+ $ret['SUB_CAT'][''][''] = _("None");
return($ret);
}
*/
public function getFolderType($default)
{
- if($this->enableFolderTypes && $this->parent->attrs['kolabFolderType'][0]){
- list($cat,$sub) = split("\.",$this->parent->attrs['kolabFolderType'][0]);
- return(array("CAT" => $cat, "SUB_CAT" => $sub));
- }else{
- return($default);
- }
+ return($default);
}
*/
public function setFolderType($type)
{
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ($this->parent->dn);
- $ldap->modify(array("kolabFolderType" => $type['CAT'].".".$type['SUB_CAT']));
- echo "Move me to KOLAB";
+ return(TRUE) ;
}
*/
public function getFolderACLs($folder_acls)
{
+ /* Merge given ACL with acl mapping
+ This ensures that no ACL will accidentally overwritten by gosa.
+ */
+ foreach($folder_acls as $user => $acl){
+ if(!isset($this->acl_mapping[$acl])){
+ $this->acl_mapping[$acl] = $acl;
+ }
+ }
+
return($folder_acls);
}
*/
public function getAclTypes()
{
- $acls["lrsw"] = _("read");
- $acls["lrswp"] = _("post");
- $acls["p"] = _("external post");
- $acls["lrswip"] = _("append");
- $acls["lrswipcd"] = _("write");
- $acls["lrswipcda"]= _("admin");
- $acls[" "]= _("none");
- return($acls);
+ return( $this->acl_mapping);
}
public function folderTypesEnabled()
{
return($this->enableFolderTypes);
}
-
+
+ public function allow_remove(&$reason)
+ {
+ return(TRUE);
+ }
+
+
+ /*! \brief Returns the configured mailMethod
+ @return String the configured mail method or ""
+ */
+ static public function get_current_method($config)
+ {
+ global $class_mapping;
+ $method= $config->get_cfg_value("mailmethod");
+ $cls = get_correct_class_name("mailMethod$method");
+ foreach($class_mapping as $class => $path){
+ if($class == $cls){
+ return($class);
+ }
+ }
+ return("");
+ }
+
}