index 229f668a238472d0482333f223fd17070fe23579..06d70a8c39e1a3203c2c030c6cd20978feba55ec 100644 (file)
$this->mode_stack = array();
$this->pap = array();
$this->doDump_(0, '', true);
+
+ /* Add left elements */
+ if(count($this->mode_stack)){
+ foreach($this->mode_stack as $element){
+ $this->handle_elements( $element,preg_replace("/[^0-9]/","",microtime()));
+ }
+ }
}
/* Create html results */
$this -> dump_ = "";
$ends = array();
+ $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_ .= "<div style='height:12px;'> </div>";
}
- $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_ .= "<div style='height:12px;'> </div>";
+ }
}
}
}
/* 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
/* Remove the object at the given position */
function remove_object($key_id)
{
+ if(count($this->pap) == 1){
+ print_red(_("Can't remove last element."));
+ 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;
/* 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
$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]);
if(!$include_self){
$key_id ++;
}
+ $include_self = FALSE;
$current_class = get_class($test[$key_id]);
if(in_array($current_class, $allowed_to_add_after)){
return($key_id);
}
$tmp2 = $part->get_sieve_script_part();
- if(get_class($part) == "sieve_reject"){
- $tmp.=$tmp2;
- }else{
-
- $tmp3 = split("\n",$tmp2);
- foreach($tmp3 as $str){
- $str2 = trim($str);
- #if(empty($str2)) continue;
+ $tmp3 = split("\n",$tmp2);
+ foreach($tmp3 as $str){
+ $str2 = trim($str);
+
+ /* 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(!preg_match("/Generated by GOsa - Gonicus System Administrator/",$tmp)){
- $tmp = "#Generated by GOsa - Gonicus System Administrator \n ".$tmp;
+# $tmp = "#Generated by GOsa - Gonicus System Administrator \n ".$tmp;
}
return($tmp);
}
{
$ret = array();
if($data[$id]['class'] == "left-bracket"){
- while($data[$id]['class'] != "right-bracket" && $id < count($data)){
+ while(isset($data[$id]) && $data[$id]['class'] != "right-bracket" && $id < count($data)){
if($data[$id]['class'] == "quoted-string"){
$ret[] = $data[$id]['text'];
}
+
$id ++;
}
}elseif($data[$id]['class'] == "quoted-string"){