Updated sieve templates

[gosa.git] / include / sieve / class_semantics.inc

diff --git a/include/sieve/class_semantics.inc b/include/sieve/class_semantics.inc
index 44a376829a136d25652eb4f64cdc432965859929..1c00051c052bb1f477b3eead6c19f9433e7ce445 100644 (file)
--- a/include/sieve/class_semantics.inc
+++ b/include/sieve/class_semantics.inc
@@ -141,7 +141,7 @@ class Semantics
                                'valid_after' => $this->nonTestCommands_,
                                'arguments' => array(
                                        array('class' => 'string', 'occurrences' => '1', 'values' => array(
-                                               array('occurrences' => '1', 'regex' => '".*"', 'name' => 'reason')
+                                               array('occurrences' => '1', 'regex' => '("|).*("|)', 'name' => 'reason')
                                        ))
                                )
                        );
@@ -195,7 +195,7 @@ class Semantics
                                                array('occurrences' => '?', 'regex' => ':mime', 'name' => 'mime')
                                        )),
                                        array('class' => 'string', 'occurrences' => '1', 'values' => array(
-                                               array('occurrences' => '1', 'regex' => '".*"', 'name' => 'reason')
+                                               array('occurrences' => '1', 'regex' => '.*', 'name' => 'reason')
                                        ))
                                )
                        );
@@ -456,8 +456,8 @@ class Semantics
                // Check if command may appear here
                if (!ereg($this->s_['valid_after'], $prev))
                {
-                       $this->message = 'line '. $line .': "'. $this->command_ .'" may not appear after "'. $prev .'"';
-                       return false;
+#                      $this->message = 'line '. $line .': "'. $this->command_ .'" may not appear after "'. $prev .'"';
+#                      return false;
                }
 
                return true;
@@ -610,4 +610,4 @@ class Semantics
        }
 }
 
-?>
\ No newline at end of file
+?>