From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 19 Mar 2007 11:05:40 +0000 (+0000)
Subject: Hide sieve settings from generic dialog.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c5089b88b2a221f7013dd9793622aea886545ab7;p=gosa.git

Hide sieve settings from generic dialog.
Don't save gosa.script -->  save();


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

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 11298822d..b54791716 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -236,7 +236,6 @@ class mailAccount extends plugin
       $mailserver[]= $key;
     }
 
-
     /* 
      * Sieve Management 
      */
@@ -775,7 +774,7 @@ class mailAccount extends plugin
         /* Ensure that this is an existing account */
         if($this->initially_was_account){
 
-          /* Write sieve information only if not in C mode */
+          /* Write sieve information only if not in C mode * /
           if (!is_integer(strpos($this->gosaMailDeliveryMode, "C"))){
             $method->configureFilter($this->$id,
                 $this->gosaMailDeliveryMode,
@@ -786,6 +785,7 @@ class mailAccount extends plugin
                 $this->gosaSpamSortLevel,
                 $this->gosaVacationMessage);
           }
+          */
         }
       }
     }
diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index 0b79ae57c..cae4ef6a9 100644
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -1,6 +1,7 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="0" border="0">
  <tr>
   <td style="width:50%; vertical-align:top;">
+
    <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Generic{/t}</h2>
    <table summary="">
     <tr>
@@ -45,19 +46,14 @@
 {/render}
      </td>
     </tr>
-	<tr>
-	 <td>	
-		<input type='submit' name='sieveManagement' value='{t}Sieve Management{/t}'>
-	 </td>
-	</tr>
-   </table>
+	</table>
   </td>
 
-  <td style="border-left:1px solid #A0A0A0">
-   &nbsp;
-  </td>
 
-  <td style="vertical-align:top;">
+  <td style="border-left:1px solid #A0A0A0;vertical-align:top;">
+	&nbsp;
+  </td>
+	<td>	
    <h2><img class="center" alt="" align="middle" src="images/alternatemail.png" /><label for="alternates_list"> {t}Alternative addresses{/t}</label></h2>
 {render acl=$gosaMailAlternateAddressACL}
    <select id="alternates_list" style="width:100%;height:100px;" name="alternates_list[]" size="15" multiple 
@@ -81,8 +77,15 @@
 </table>
 
 <p class="seperator">&nbsp;</p>
-
 <h2><img class="center" alt="" align="middle" src="images/envelope.png" />&nbsp;{t}Mail options{/t}</h2>
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+ <tr>
+  <td>	
+   <input type='submit' name='sieveManagement' value='{t}Sieve Management{/t}'>
+  </td>
+ </tr>
+</table>
+<!--
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr style="padding-bottom:0px;">
   <td style="width:50%">
@@ -173,7 +176,6 @@
   </td>
  </tr>
 </table>
-
 <p class="seperator">&nbsp;</p>
 
 <h2><img class="center" alt="" align="middle" src="images/false.png" />&nbsp;{t}Advanced mail options{/t}</h2>
@@ -199,6 +201,7 @@
 </table>
 
 <input type="hidden" name="mailTab" value="mailTab">
+-->
 
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">