Heimdal stuff not needed. It's too insecure to read m-keys by php.

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

diff --git a/include/sieve/class_scanner.inc b/include/sieve/class_scanner.inc
index 2a7fc37d2e77a0b7aec019bc1cdeeb4293a679d3..3e22bb1d0ee8c6a3a2aae7b6662fa35da5e54a50 100644 (file)
--- a/include/sieve/class_scanner.inc
+++ b/include/sieve/class_scanner.inc
@@ -58,6 +58,7 @@ class Scanner
                                }
                        }
                }
+
                array_push($this->tokens_, array(
                        'class' => 'script-end',
                        'text'  => 'script-end',
@@ -130,11 +131,10 @@ class Scanner
                'quoted-string'  =>  '"(?:\\[\\"]|[^\x00"])*"',
                'number'         =>  '[[:digit:]]+(?:[KMG])?(?=\b)',
                'comment'        =>  '(?:\/\*(?:[^\*]|\*(?=[^\/]))*\*\/|#[^\r\n]*\r?\n)',
-#              'multi-line'     =>  'text:[ \t]*(?:#[^\r\n]*)?\r?\n(\.[^\r\n]+\r?\n|[^\.]*\r?\n)*\.\r?\n',
-               'multi-line'     =>  'text:[^;]*',
+               'multi-line'     =>  'text:[ \t]*(?:#[^\r\n]*)?\r?\n(\.[^\r\n]+\r?\n|[^\.]*\r?\n)*\.\r?\n',
                'identifier'     =>  '[[:alpha:]_][[:alnum:]_]*(?=\b)',
                'unknown token'  =>  '[^ \r\n\t]+'
        );
 }
 
-?>
+?>
\ No newline at end of file