X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fpersonal%2Fmail%2Fclass_mailAccount.inc;h=067cfdbb9f9048ebb3e1f6947771cbad62d8fcba;hb=71f60b45b1303369dfbb0156898fcca427eb524b;hp=19517a7be294753c746569dc93f5b7a5d0363958;hpb=a2842de39347ee62055c6e9b184bd3aae71f7d8d;p=gosa.git

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 19517a7be..067cfdbb9 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -185,7 +185,7 @@ class mailAccount extends plugin
 
     /* Do we represent a valid account? */
     if (!$this->is_account && $this->parent == NULL){
-      $display= "<img src=\"images/stop.png\" align=center>&nbsp;<b>".
+      $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
         _("This account has no mail extensions.")."</b>";
       $display.= back_to_main();
       return ($display);
@@ -429,9 +429,11 @@ class mailAccount extends plugin
           "gosaMailAlternateAddress", "gosaMailForwardingAddress",
           "gosaVacationMessage", "gosaMailDeliveryMode",
           "gosaMailMaxSize", "gosaSpamSortLevel", "gosaSpamMailbox") as $val){
+
       $smarty->assign("$val", $this->$val);
       $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
     }
+
     if (is_numeric($this->gosaMailQuota) && $this->gosaMailQuota != 0){
       $smarty->assign("quotausage", $this->quotaUsage * 100 / $this->gosaMailQuota);
       $smarty->assign("quotadefined", "true");
@@ -499,6 +501,36 @@ class mailAccount extends plugin
     $smarty->assign("custom_sieveACL", chkacl($this->acl, "custom_sieve"));	
     $smarty->assign("only_localACL", chkacl($this->acl, "only_local"));	
 
+    if(count($this->gosaMailAlternateAddress)){ 
+      $smarty->assign("SELECT_gosaMailAlternateAddress",true);
+    } else { 
+      $smarty->assign("SELECT_gosaMailAlternateAddress",false);
+    }
+
+    if(count($this->spambox)){
+      $smarty->assign("SELECT_spambox",true);
+    } else {
+      $smarty->assign("SELECT_spambox",false);
+    }
+
+    if(count($this->vacation)) {
+      $smarty->assign("SELECT_vacationtemplates",true);
+    } else {
+      $smarty->assign("SELECT_vacationtemplates",false);
+    }
+
+    if(count($this->gosaMailForwardingAddress)){
+      $smarty->assign("SELECT_gosaMailForwardingAddress",true);
+    } else {
+      $smarty->assign("SELECT_gosaMailForwardingAddress",false);
+    }
+
+    if(count($mailserver)){
+      $smarty->assign("SELECT_mailServers",true);
+    } else {
+      $smarty->assign("SELECT_mailServers",false);
+    }
+
     $display.= $smarty->fetch (get_template_path('generic.tpl', TRUE, dirname(__FILE__)));
     return ($display);
   }