index eec29858a5dc324ed794c5adceead5466973fbd7..06d70a8c39e1a3203c2c030c6cd20978feba55ec 100644 (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_ .= "<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>";
+ }
}
}
/* 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]);