index b71bd1725efe33519a0b1e730cc28f6ac8da3fcc..8ddafe2d46befaee65d94d2cb6be83d41b11dcf8 100644 (file)
<?php
-
-
/* This class is inherited from the original 'Tree'
* class written by Heiko Hund.
* It is partly rewritten to create a useable html interface
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()
{
return($this->dump());
}
+
/* Create a html interface for the current sieve filter
*/
function dump()
$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();
$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_ .= "<div style='height:10px;'></div>";
$this->dump_ .= "<div class='container_'>";
}
if(isset($ends[$key])){
if(isset($ends_complete_block[$key])){
$this->dump_ .= "</div>";
- $this->dump_ .= "<div style='height:12px;'> </div>";
+ $this->dump_ .= "<div style='height:10px;'></div>";
}
}
}
}
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."));
+ trigger_error("Can't remove element with object_id=".$key_id.", there is no object with this identifier. Remove aborted.");
return(false);
}
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.
$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;
}
}
-
+
/* No require found, add one */
if($require_id == -1){
$require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
$ret = preg_replace("/,$/","",trim($ret));
$ret = "[".$ret."]";
}
+ $ret = preg_replace("/\"\"/","\"",$ret);
}else{
$Multiline = preg_match("/\n/",$data);
$ret = "text: \r\n".$data."\r\n.\r\n";
}else{
$ret = "\"".$data."\"";
+ $ret = preg_replace("/\"\"/","\"",$ret);
}
}
- $ret = preg_replace("/\"\"/","\"",$ret);
$ret = preg_replace("/\n/","\r\n",$ret);
-
+
return($ret);
}
$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'];
+ $text = $data[$id]['text'];
+ $text= preg_replace("/^\"/","",$text);
+ $text= preg_replace("/\"$/","",$text);
+ $ret[] = $text;
}
$id ++;
}
}elseif($data[$id]['class'] == "quoted-string"){
- $ret[] = $data[$id]['text'];
+ $text = $data[$id]['text'];
+ $text= preg_replace("/^\"/","",$text);
+ $text= preg_replace("/\"$/","",$text);
+ $ret[] = $text;
}elseif($data[$id]['class'] == "number"){
$ret[] = $data[$id]['text'];
}elseif($data[$id]['class'] == "multi-line"){
$str = trim(preg_replace("/\.$/","",$str));
$ret[] = $str;
}
-
+
return(array("OFFSET" => $id, "STRINGS" => $ret));
}