index 38d252302e4085fb0cf8824305a85bc4ecd56a09..ee1276a36ac3c1aba3c85281c0f2aa6b0bd2696b 100644 (file)
var $pap = array();
var $parent = NULL;
var $pap = array();
var $parent = NULL;
- function My_Tree(&$root,$parent)
- {
+ function My_Tree(&$root,$parent)
+ {
$this->parent = $parent;
$this->parent = $parent;
- $this->_construct($root);
- }
+ $this->_construct($root);
+ }
function execute()
{
function execute()
{
$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__)));
$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();
$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)){
foreach($this->pap as $key => $object){
if(is_object($object)){
- $end = $this->get_block_end($key,false);
+ $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:10px;'></div>";
+ $this->dump_ .= "<div class='container_'>";
+ }
if(isset($ends[$key])){
$this->dump_ .= $block_indent_stop;
}
if(isset($ends[$key])){
$this->dump_ .= $block_indent_stop;
}
$ends[$end] = $end;
$this->dump_ .= $block_indent_start;
}
$ends[$end] = $end;
$this->dump_ .= $block_indent_start;
}
+
+ if(isset($ends_complete_block[$key])){
+ $this->dump_ .= "</div>";
+ $this->dump_ .= "<div style='height:10px;'></div>";
+ }
}
}
}
}
function check()
{
function check()
{
- $msgs = array();
+ $msgs = array();
/* Some logical checks.
* like : only sieve_comment can appear before require.
*/
/* 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.
/* Ensure that there are no command before require
* - Get id of last require tag
* - Collect object types in from of this tag.
$msgs[] = $str;
print_red($str);;
}
$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);
}
}
$require_id = $key;
}
}
$require_id = $key;
}
}
-
+
/* No require found, add one */
if($require_id == -1){
$require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
/* No require found, add one */
if($require_id == -1){
$require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
}
$ret = preg_replace("/\"\"/","\"",$ret);
$ret = preg_replace("/\n/","\r\n",$ret);
}
$ret = preg_replace("/\"\"/","\"",$ret);
$ret = preg_replace("/\n/","\r\n",$ret);
-
+
return($ret);
}
return($ret);
}
$ret = array();
if($data[$id]['class'] == "left-bracket"){
while(isset($data[$id]) && $data[$id]['class'] != "right-bracket" && $id < count($data)){
$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'];
}
if($data[$id]['class'] == "quoted-string"){
$ret[] = $data[$id]['text'];
}
$str = trim(preg_replace("/\.$/","",$str));
$ret[] = $str;
}
$str = trim(preg_replace("/\.$/","",$str));
$ret[] = $str;
}
-
+
return(array("OFFSET" => $id, "STRINGS" => $ret));
}
return(array("OFFSET" => $id, "STRINGS" => $ret));
}