Fixed new script status

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

diff --git a/include/sieve/class_semantics.inc b/include/sieve/class_semantics.inc
index e37d5c6313541234afa95c7d207867dbcef42ea4..da6f6998b5eb57b4ec00ef393114e0adcfd71885 100644 (file)
--- a/include/sieve/class_semantics.inc
+++ b/include/sieve/class_semantics.inc
@@ -163,7 +163,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')
                                        ))
                                )
                        );
@@ -457,11 +457,16 @@ class Semantics
 
        function validToken($class, &$text, &$line)
        {
+               global $requires_;
+
+               if(!is_array($requires_)){
+                       $requires_ = array();
+               }
+
                $name = $class . ($class != $text ? " $text" : '');
 
                // Check if the command needs to be required
                // TODO: move this to somewhere more appropriate
-               global $requires_;
                if (isset($this->s_['requires']) &&
                    !in_array('"'.$this->s_['requires'].'"', $requires_))
                {
@@ -479,6 +484,7 @@ class Semantics
                $arg = &$this->s_['arguments'][0];
                foreach ($arg['values'] as $val)
                {
+
                        if (preg_match('/^'. $val['regex'] .'$/m', $text))
                        {
                                // Check if the argument value needs a 'require'