Updated html code generation.

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

diff --git a/include/sieve/class_My_Tree.inc b/include/sieve/class_My_Tree.inc
index 40f59fdf1a1666daa8ca4cab24f95affb3f30286..cb18851b9b8fca3224e9e9b27597d13b1aeb7ae8 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -146,7 +146,7 @@ class My_Tree extends Tree
     foreach($this->pap as $key => $obj){
 
       if(in_array(get_class($obj),array("sieve_if","sieve_elsif","sieve_vacation","sieve_comment","sieve_reject","sieve_fileinto","sieve_require","sieve_redirect"))){
-        #$this->pap[$key]->save_object();
+        $this->pap[$key]->save_object();
       }
 
       $once = TRUE;

diff --git a/include/sieve/class_sieveElement_If.inc b/include/sieve/class_sieveElement_If.inc
index 6d06ddf0bfa9a85d284c3d0ee6d877a11b6dafc2..e0c24f77bcc8d99ad88c74fb1da4c1d0f0efbcef 100644 (file)
--- a/include/sieve/class_sieveElement_If.inc
+++ b/include/sieve/class_sieveElement_If.inc
@@ -574,7 +574,7 @@ class sieve_if
             if(($key2 === "Inverse") && ($key2 == "Inverse")){
               continue;
             }
-            $parsed[$key][$key2] = $this->save_object_recursive($dat, ($id +1),$key2);
+            $parsed[$key][$key2] = $this->save_object_recursive($dat, ($id +1),$key2."-".$obj_id);
           }
           break ;
         } 
@@ -592,7 +592,7 @@ class sieve_if
             if(($key2 === "Inverse") && ($key2 == "Inverse")){
               continue;
             }
-            $parsed[$key][$key2] =  $this->save_object_recursive($dat, ($id + 1),$key2);
+            $parsed[$key][$key2] =  $this->save_object_recursive($dat, ($id + 1),$key2."-".$obj_id);
           }
           break ;
         } 
@@ -896,7 +896,7 @@ class sieve_if
             if(($key === "Inverse") && ($key == "Inverse")){
               continue;
             }
-            $Contents .=        $this->get_as_html($dat, ($id +1),$key);
+            $Contents .=        $this->get_as_html($dat, ($id +1),$key."-".$obj_id);
           }
           $smarty = get_smarty();
           $smarty->assign("Inverse",$Inverse);
@@ -918,7 +918,7 @@ class sieve_if
             if(($key === "Inverse") && ($key == "Inverse")){
               continue;
             }
-            $Contents .=        $this->get_as_html($dat, ($id +1),$key);
+            $Contents .=        $this->get_as_html($dat, ($id +1),$key."-".$obj_id);
           }
           $smarty = get_smarty();
           $smarty->assign("Inverse",$Inverse);

diff --git a/include/sieve/class_sieveElements.inc b/include/sieve/class_sieveElements.inc
index 870e380100c035acb9e57f44fc7a3f99a13a1941..3c133fdf128e10f4a4295de37fbbe3526e82a436 100644 (file)
--- a/include/sieve/class_sieveElements.inc
+++ b/include/sieve/class_sieveElements.inc
@@ -335,7 +335,7 @@ class sieve_fileinto
 
   function get_mail_boxes()
   {
-    return(array("not","impplemented/yet"));
+    return(array("not"=>"not","impplemented/yet"=>"impplemented/yet"));
   }
 }