w3c

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

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 19517a7be294753c746569dc93f5b7a5d0363958..fd6541c078637d936f6abb6031bd2eeece0c48c7 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -429,9 +429,16 @@ 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 +506,44 @@ class mailAccount extends plugin
     $smarty->assign("custom_sieveACL", chkacl($this->acl, "custom_sieve"));    
     $smarty->assign("only_localACL", chkacl($this->acl, "only_local"));        
 
+  if(isset($this->gosaMailAlternateAddress)&&($this->gosaMailAlternateAddress))  
+      $smarty->assign("SELECT_gosaMailAlternateAddress",true);
+  else 
+      $smarty->assign("SELECT_gosaMailAlternateAddress",false);
+
+  if(isset($this->spamlevel)&&($this->spamlevel))
+      $smarty->assign("SELECT_spamlevel",true);
+  else
+      $smarty->assign("SELECT_spamlevel",false);
+
+  if(isset($this->spambox)&&($this->spambox))
+      $smarty->assign("SELECT_spambox",true);
+  else
+      $smarty->assign("SELECT_spambox",false);
+
+  if(isset($this->vacationtemplates)&&($this->vacationtemplates))
+      $smarty->assign("SELECT_vacationtemplates",true);
+  else
+      $smarty->assign("SELECT_vacationtemplates",false);
+
+  if(isset($this->gosaMailForwardingAddress)&&($this->gosaMailForwardingAddress))
+      $smarty->assign("SELECT_gosaMailForwardingAddress",true);
+  else
+      $smarty->assign("SELECT_gosaMailForwardingAddress",false);
+
+  if(isset($this->mailServers)&&($this->mailServers))
+      $smarty->assign("SELECT_mailServers",true);
+  else
+      $smarty->assign("SELECT_mailServers",false);
+
+
+
+
+
+
+
+
+
     $display.= $smarty->fetch (get_template_path('generic.tpl', TRUE, dirname(__FILE__)));
     return ($display);
   }

diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index 6f092f9113809db834062c2ee7b4ba5a722dc18e..6fe8a0d6b724759fd7357dd07ab6c09547ccf6f7 100644 (file)
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -11,7 +11,7 @@
      <td>{t}Server{/t}</td>
      <td>
       <select size="1" name="gosaMailServer" {$gosaMailServerACL} title="{t}Specify the mail server where the user will be hosted on{/t}">
-               {if $mailServers ==""}
+               {if $SELECT_mailServers}
                    {html_options values=$mailServers output=$mailServers selected=$gosaMailServer}
                {else}
                        <option>
@@ -51,7 +51,7 @@
    <h2><img alt="" align="middle" src="images/alternatemail.png"> {t}Alternative addresses{/t}</h2>
    <select style="width:350px; height:100px;" name="alternates_list[]" size=15
         multiple title="{t}List of alternative mail addresses{/t}">
-        {if $gosaMailAlternateAddress ==""}
+        {if $SELECT_gosaMailAlternateAddress}
             {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
         {else}
             <option>
@@ -87,16 +87,15 @@
    <input type=checkbox name="use_spam_filter" value="1" {$use_spam_filter}
        {$gosaSpamSortLevelACL} title="{t}Select if you want to filter this mails through spamassassin{/t}"> {t}Move mails tagged with spam level greater than{/t}
    <select size="1" name="gosaSpamSortLevel" {$gosaSpamSortLevelACL} title="{t}Choose spam level - smaller values are more sensitive{/t}">
-        {if $spamlevel ==""}
+        {if $SELECT_spamlevel}
             {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
         {else}
             <option>
         {/if}
- {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
    </select>
    {t}to folder{/t}
    <select size="1" name="gosaSpamMailbox" {$gosaSpamMailboxACL}>
-        {if $spambox ==""}
+        {if $SELECT_spambox}
                {html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
                {else}
             <option>
@@ -119,7 +118,7 @@
    <br>
    {if $show_templates eq "true"}
    <select name="vacation_template">
-        {if $vacationtemplates ==""}
+        {if $SELECT_vacationtemplates }
                {html_options options=$vacationtemplates selected=$template}
                {else}
             <option>
@@ -135,7 +134,7 @@
     <b>{t}Forward messages to{/t}</b>
    </p>
    <select style="width:350px; height:100px;" name="forwarder_list[]" size=15 multiple>
-        {if $gosaMailForwardingAddress ==""}
+        {if $SELECT_gosaMailForwardingAddress}
                        {html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}        
                {else}
             <option>

diff --git a/plugins/personal/mail/mail_locals.tpl b/plugins/personal/mail/mail_locals.tpl
index 046b2d9c3771f31af1c6adf8df500dbc6b0e8ffb..9a649df4a500dc2244fcca91b62b9ff566d62c5d 100644 (file)
--- a/plugins/personal/mail/mail_locals.tpl
+++ b/plugins/personal/mail/mail_locals.tpl
@@ -9,11 +9,7 @@
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
      <select style="width:500px; margin-top:4px; height:450px;" name="local_list[]" size=15" multiple>
-        {if $mailusers ==""}
                {html_options options=$mailusers}
-               {else}
-            <option>
-        {/if}
      </select>
     </p>
    </div>
@@ -32,11 +28,7 @@ t}Filters{/t}</b></p>
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
     <table width="100%"><tr><td width="50%"><img src="{$tree_image}" align=center>&nbsp;{t}Display addresses of department{/t}</td>
     <td><select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
-        {if $deplist ==""}
                {html_options options=$deplist selected=$depselect}
-               {else}
-            <option>
-        {/if}
     </select></td></tr></table>
     </p>
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">