X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fsieve%2Fclass_My_Tree.inc;h=ee1276a36ac3c1aba3c85281c0f2aa6b0bd2696b;hb=4ef5a0ec2c799536446dd29d5d828488cc14608f;hp=d935a20aa8f1245225fc950eba7dddf21aa87e43;hpb=c6423696375f1fbf156b761dc49e0fac7fe99753;p=gosa.git
diff --git a/include/sieve/class_My_Tree.inc b/include/sieve/class_My_Tree.inc
index d935a20aa..ee1276a36 100644
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -17,11 +17,11 @@ class My_Tree extends Tree
var $pap = array();
var $parent = NULL;
- function My_Tree(&$root,$parent)
- {
+ function My_Tree(&$root,$parent)
+ {
$this->parent = $parent;
- $this->_construct($root);
- }
+ $this->_construct($root);
+ }
function execute()
{
@@ -56,26 +56,34 @@ class My_Tree extends Tree
$block_indent_start = $smarty->fetch(get_template_path("templates/block_indent_start.tpl",TRUE,dirname(__FILE__)));
$block_indent_stop = $smarty->fetch(get_template_path("templates/block_indent_stop.tpl",TRUE,dirname(__FILE__)));
-
-
$this -> dump_ = "";
$ends = array();
- if(!count($this->pap)){
-# $this->pap[] = new sieve_comment(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
- }
+ $ends_complete_block = array();
+
foreach($this->pap as $key => $object){
if(is_object($object)){
- $end = $this->get_block_end($key);
- if($end != $key && get_class($object) == "sieve_if") {
- $ends[$end] = $end;
- $this->dump_ .= $block_indent_start;
+ $end = $this->get_block_end($key,false);
+ $end2 = $this->get_block_end($key);
+ if($end != $key && in_array(get_class($object),array("sieve_if"))){
+ $ends_complete_block[$end2] = $end2;
+ $this->dump_ .= "
";
+ $this->dump_ .= "";
}
- $this->dump_ .= preg_replace("/>/",">\n",$object->execute());
if(isset($ends[$key])){
$this->dump_ .= $block_indent_stop;
}
+ $this->dump_ .= preg_replace("/>/",">\n",$object->execute());
+ if($end != $key && in_array(get_class($object),array("sieve_if","sieve_else","sieve_elsif"))) {
+ $ends[$end] = $end;
+ $this->dump_ .= $block_indent_start;
+ }
+
+ if(isset($ends_complete_block[$key])){
+ $this->dump_ .= "
";
+ $this->dump_ .= "";
+ }
}
}
@@ -131,7 +139,7 @@ class My_Tree extends Tree
}
/* We can't handle comments within if tag right now */
- if($last_type != "if"){
+ if(!in_array_ics($last_type,array("if","elsif"))){
/* Comments require special attention.
* We do not want to create a single comment element
@@ -238,6 +246,11 @@ class My_Tree extends Tree
return;
}
+ 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."));
+ return(false);
+ }
+
$class = get_class($this->pap[$key_id]);
if(in_array($class,array("sieve_if","sieve_elsif","sieve_else"))){
$block_start= $key_id;
@@ -375,7 +388,7 @@ class My_Tree extends Tree
/* This function returns the id of the element
* where the current block ends
*/
- function get_block_end($start)
+ function get_block_end($start,$complete = TRUE)
{
/* Only execute if this is a really a block element.
* Block elements is only sieve_if
@@ -398,12 +411,22 @@ class My_Tree extends Tree
$block_depth --;
}
- if( $block_depth == 0 &&
- $class == "sieve_block_end" &&
- !in_array($next_class,array("sieve_else","sieve_elsif"))){
- $end = TRUE;
- $start --;
+ if($complete){
+ if( $block_depth == 0 &&
+ $class == "sieve_block_end" &&
+ !in_array($next_class,array("sieve_else","sieve_elsif"))){
+ $end = TRUE;
+ $start --;
+ }
+ }else{
+
+ if( $block_depth == 0 &&
+ $class == "sieve_block_end" ){
+ $end = TRUE;
+ $start --;
+ }
}
+
$start ++;
$class = get_class($this->pap[$start]);
@@ -581,7 +604,18 @@ class My_Tree extends Tree
$tmp3 = split("\n",$tmp2);
foreach($tmp3 as $str){
$str2 = trim($str);
- $tmp.= $buffer.$str."\n";
+
+ /* If the current line only contains an '.'
+ * we must skip the line indent.
+ * The text: statement uses a single '.' to mark the text end.
+ * This '.' must be the only char in the current line, no
+ * whitespaces are allowed here.
+ */
+ if($str2 == "."){
+ $tmp.=$str."\n";
+ }else{
+ $tmp.= $buffer.$str."\n";
+ }
}
if(get_class($part) == "sieve_block_start"){
$buffer .= SIEVE_INDENT_TAB;
@@ -596,12 +630,12 @@ class My_Tree extends Tree
function check()
{
- $msgs = array();
+ $msgs = array();
/* Some logical checks.
* like : only sieve_comment can appear before require.
*/
-
+
/* Ensure that there are no command before require
* - Get id of last require tag
* - Collect object types in from of this tag.
@@ -625,14 +659,14 @@ class My_Tree extends Tree
$msgs[] = $str;
print_red($str);;
}
-
- foreach($this->pap as $obj){
- $o_msgs = $obj->check();
- foreach($o_msgs as $o_msg){
- $msgs[] = $o_msg;
- }
- }
- return($msgs);
+
+ foreach($this->pap as $obj){
+ $o_msgs = $obj->check();
+ foreach($o_msgs as $o_msg){
+ $msgs[] = $o_msg;
+ }
+ }
+ return($msgs);
}
@@ -648,7 +682,7 @@ class My_Tree extends Tree
$require_id = $key;
}
}
-
+
/* No require found, add one */
if($require_id == -1){
$require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
@@ -701,7 +735,7 @@ function sieve_create_strings($data,$force_string = FALSE)
}
$ret = preg_replace("/\"\"/","\"",$ret);
$ret = preg_replace("/\n/","\r\n",$ret);
-
+
return($ret);
}
@@ -717,7 +751,7 @@ function sieve_get_strings($data,$id)
$ret = array();
if($data[$id]['class'] == "left-bracket"){
while(isset($data[$id]) && $data[$id]['class'] != "right-bracket" && $id < count($data)){
-
+
if($data[$id]['class'] == "quoted-string"){
$ret[] = $data[$id]['text'];
}
@@ -733,7 +767,7 @@ function sieve_get_strings($data,$id)
$str = trim(preg_replace("/\.$/","",$str));
$ret[] = $str;
}
-
+
return(array("OFFSET" => $id, "STRINGS" => $ret));
}