From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 8 Dec 2008 14:29:57 +0000 (+0000)
Subject: Do not replace escaped '\\.' or '\\/'  in cyrus account style
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=82e509b4f1c8fe25ccdeca0c95f40a19a2664b4f;p=gosa.git

Do not replace escaped '\\.' or '\\/'  in cyrus account style
-


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13184 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods.inc b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
index 60764445e..cbbfabb27 100644
--- a/gosa-plugins/mail/personal/mail/class_mail-methods.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
@@ -240,6 +240,12 @@ class mailMethod{
   }
 
 
+  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()
@@ -250,10 +256,12 @@ class mailMethod{
     }else{
       $str = $this->share_prefix;
     }
+
     $uattrib = $this->uattrib;
     if($this->cyrusUseSlashes){
-      $str = preg_replace("/\./","/",$str);
+      $str = preg_replace("/[^\\\\]\./","/",$str);
     }
+    $str = preg_replace("/\\\\([\.\/])/","\\1",$str);
     $str = trim(strtolower($str . $this->parent->$uattrib));
     if($this->account_id != $str){
       $this->account_id = $str;