Readded basic sieve settings.

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

diff --git a/include/sieve/class_My_Parser.inc b/include/sieve/class_My_Parser.inc
index 197d94ab2922e6a44032f344e1249c3d5cebcb32..691faf43e0ed342224067e82bcc9f69676258247 100644 (file)
--- a/include/sieve/class_My_Parser.inc
+++ b/include/sieve/class_My_Parser.inc
@@ -36,6 +36,8 @@ class My_Parser extends Parser
      */
        function parse($script) 
        {
+               $script = preg_replace("/^###GOSA/","",$script);
+
                $this->registeredExtensions_ = array();
         $this->status_text = "incomplete";
         $this->script_ = $script;
@@ -57,7 +59,7 @@ class My_Parser extends Parser
        
        function get_sieve_script()
        {
-               return($this->tree_->get_sieve_script());
+               return("###GOSA\n".$this->tree_->get_sieve_script());
        }               
 
        

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index b54791716c08b3452e5625cbc9f718ac533790d2..8112406bd8772bd567c9464a1d7e825660e2c1a6 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -774,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,
@@ -785,7 +785,6 @@ class mailAccount extends plugin
                 $this->gosaSpamSortLevel,
                 $this->gosaVacationMessage);
           }
-          */
         }
       }
     }

diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index cae4ef6a9c15afdd2083d3e5d537309eaed91576..1116201be02a4235592e3163f3f55635dbc9613b 100644 (file)
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -85,7 +85,6 @@
   </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%">
@@ -201,7 +200,6 @@
 </table>
 
 <input type="hidden" name="mailTab" value="mailTab">
--->
 
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">