removed some unecessary code.

fixed warning

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

diff --git a/include/sieve/class_My_Tree.inc b/include/sieve/class_My_Tree.inc
index 369d26c3e0c4a40550a6d50ba066f148c299983f..0dd19a21eab158856cb90dc5615415054f0ff403 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -16,11 +16,6 @@ class My_Tree extends Tree
   var $mode_stack = array();
   var $pap             = array();
 
-  var $add_new          = FALSE;
-  var $add_new_id       = 0;
-  var $add_type         = "top";
-  var $add_element_type = "";
-  
   function execute()
   {
     return($this->dump());
@@ -30,8 +25,6 @@ class My_Tree extends Tree
    */
   function dump()
   {
-    error_reporting(E_ALL);
-
     /**************
      * Handle new elements 
      **************/

diff --git a/include/sieve/class_semantics.inc b/include/sieve/class_semantics.inc
index 6fa7c4b7d29ee49b5ac263acf3cb66057a68c99f..da6f6998b5eb57b4ec00ef393114e0adcfd71885 100644 (file)
--- a/include/sieve/class_semantics.inc
+++ b/include/sieve/class_semantics.inc
@@ -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_))
                {