From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 10 Dec 2008 08:35:35 +0000 (+0000)
Subject: Updated mail Account-
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=252b1091d14d2ca16cd20fecdbe82a248f382aea;p=gosa.git

Updated mail Account-


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

diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index d5b87ef2e..42e68ba2e 100644
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -365,7 +365,8 @@ class mailAccount extends plugin
      ****************/
     $smarty = get_smarty();
     $smarty->assign("initially_was_account", $this->initially_was_account);
-    $smarty->assign("isModifyableMail", $this->mailMethod->isModifyableMail());
+    $smarty->assign("isModifyableMail"  , $this->mailMethod->isModifyableMail());
+    $smarty->assign("isModifyableServer", $this->mailMethod->isModifyableServer());
     $smarty->assign("mailEqualsCN", $this->mailMethod->mailEqualsCN());
 
     $SkipWrite = (!isset($this->parent) || !$this->parent) && !session::is_set('edit');
@@ -496,9 +497,14 @@ class mailAccount extends plugin
     if (isset($_POST['mailTab'])){
 
       /* Save ldap attributes */
-      $mail = $this->mail;
+      $mail   = $this->mail;
+      $server = $this->gosaMailServer;
       plugin::save_object();
 
+      if(!$this->mailMethod->isModifyableServer() && $this->initially_was_account)){
+        $this->gosaMailServer = $server;
+      }
+
       if(!$this->mailMethod->isModifyableMail() && $this->initially_was_account){
         $this->mail = $mail;
       }else{
diff --git a/gosa-plugins/mail/personal/mail/generic.tpl b/gosa-plugins/mail/personal/mail/generic.tpl
index 928909ecf..82fedc4d8 100644
--- a/gosa-plugins/mail/personal/mail/generic.tpl
+++ b/gosa-plugins/mail/personal/mail/generic.tpl
@@ -29,7 +29,7 @@
     <tr>
      <td><label for="gosaMailServer">{t}Server{/t}</label></td>
      <td>
-     {if !$isModifyableMail && $initially_was_account}
+     {if !$isModifyableServer && $initially_was_account}
         <input disabled size=30 value="{$gosaMailServer}">
      {else}