Updated comment handling

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

diff --git a/include/sieve/class_My_Parser.inc b/include/sieve/class_My_Parser.inc
index a45d24e83aa2455afb316ad7878c72eea7e82ff9..912422360f1cedd5cc95741e3c2ff4375ed6fa2d 100644 (file)
--- a/include/sieve/class_My_Parser.inc
+++ b/include/sieve/class_My_Parser.inc
@@ -7,44 +7,27 @@ define("SIEVE_INDENT_TAB","  ");
  */
 class My_Parser extends Parser 
 {
+       var $parent = NULL;
 
-       function execute()
+       function My_Parser($parent)
        {
+               $this->parent = $parent;
+       }
 
-
-               /* Add Element requested */
-               if(isset($_POST['Add_Element'])){
-                       $this->tree_->Add_Element();
-                       echo "Move this into Management";
-               }
-
-               /* Create dump of current sieve script */
-               if(isset($_POST['Save_Copy'])){
-                       echo "Move this into Management";
-               
-                       /* force download dialog */
-                       header("Content-type: application/tiff\n");
-                       if (preg_match('/MSIE 5.5/', $HTTP_USER_AGENT) ||
-                                       preg_match('/MSIE 6.0/', $HTTP_USER_AGENT)) {
-                               header('Content-Disposition: filename="dump.txt"');
-                       } else {
-                               header('Content-Disposition: attachment; filename="dump.txt"');
-                       }
-                       header("Content-transfer-encoding: binary\n");
-                       header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-                       header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-                       header("Cache-Control: no-cache");
-                       header("Pragma: no-cache");
-                       header("Cache-Control: post-check=0, pre-check=0");
-                       echo $this->get_sieve_script(); 
-                       exit(); 
-               }
-       
+       function execute()
+       {
                $ret = $this->dumpParseTree();
                return($ret);
        }
        
 
+       /* Check if there are errors, collect them and return them */
+       function check()
+       {
+               return($this->tree_->check());
+       }
+       
+
        /* Initiate parser, but use some other 
      *  classes, that are rewritten.
      */
@@ -52,7 +35,7 @@ class My_Parser extends Parser
        {
         $this->status_text = "incomplete";
         $this->script_ = $script;
-        $this->tree_ = new My_Tree(@Scanner::scriptStart());
+        $this->tree_ = new My_Tree(@Scanner::scriptStart(),$this);
         $this->tree_->setDumpFunc(array(&$this, 'dumpToken_'));
         $this->scanner_ = new Scanner($this->script_);
         $this->scanner_->setCommentFunc(array($this, 'comment_'));
@@ -93,5 +76,11 @@ class My_Parser extends Parser
                }
                return strval($token);
        }
+
+
+       function dumpParseTree()
+       {
+               return $this->tree_->execute();
+       }
 }
 ?>