Updated phoneAccount.

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

diff --git a/include/sieve/class_My_Tree.inc b/include/sieve/class_My_Tree.inc
index 99a076f3a7f0d263035c1a58c57a6aa821670714..d7686d3a29e3f8a44fe38d350c4549a4147597fe 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -247,7 +247,7 @@ class My_Tree extends Tree
     }
 
     if(!isset($this->pap[$key_id])){
-      trigger_error(_("Can't remove element with object_id=".$key_id.", there is no object with this identifier. Remove aborted."));
+      trigger_error("Can't remove element with object_id=".$key_id.", there is no object with this identifier. Remove aborted.");
       return(false);
     }
 
@@ -674,28 +674,36 @@ class My_Tree extends Tree
    *  This function is called by the 
    *  sieveElement_Classes->parent->add_require()  
    */ 
-  function add_require($str)
+  function add_require($str, $force = FALSE)
   {
-    $require_id = -1;
-    foreach($this->pap as $key => $obj){
-      if(get_class($obj) == "sieve_require"){
-        $require_id = $key;
+    if(!is_php4() || $force){
+      $require_id = -1;
+      foreach($this->pap as $key => $obj){
+        if(get_class($obj) == "sieve_require"){
+          $require_id = $key;
+        }
       }
-    }
 
-    /* No require found, add one */
-    if($require_id == -1){
-      $require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
-      $require -> Add_Require($str);
-      $new = array();
-      $new[] = $require;
-      foreach($this->pap as $obj){
-        $new[] = $obj;
+      /* No require found, add one */
+      if($require_id == -1){
+        $require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
+        $require -> Add_Require($str);
+        $new = array();
+        $new[] = $require;
+        foreach($this->pap as $obj){
+          $new[] = $obj;
+        }
+        $this->pap = $new;
+      } else { 
+        $this->pap[$require_id]->Add_Require($str); 
+      } 
+
+    }else{
+      if(!isset($_SESSION['add_require'])){
+        $_SESSION['add_require'] =array();
       }
-      $this->pap = $new;
-    } else { 
-      $this->pap[$require_id]->Add_Require($str);
-    } 
+      $_SESSION['add_require'][] = $str;
+    }
   }
 }
 
@@ -722,7 +730,7 @@ function sieve_create_strings($data,$force_string = FALSE)
       $ret = preg_replace("/,$/","",trim($ret));
       $ret = "[".$ret."]";
     }
-      $ret = preg_replace("/\"\"/","\"",$ret);
+#      $ret = preg_replace("/\"\"/","\"",$ret);
   }else{
 
     $Multiline = preg_match("/\n/",$data);