![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 0dd19a21eab158856cb90dc5615415054f0ff403..229f668a238472d0482333f223fd17070fe23579 100644 (file)
var $mode_stack = array();
var $pap = array();
+ var $parent = NULL;
+
+ function My_Tree(&$root,$parent)
+ {
+ $this->parent = $parent;
+ $this->_construct($root);
+ }
function execute()
{
/* Create html results */
$smarty = get_smarty();
+ $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();
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;
+ }
$this->dump_ .= preg_replace("/>/",">\n",$object->execute());
+ if(isset($ends[$key])){
+ $this->dump_ .= $block_indent_stop;
+ }
}
}
/* Get node */
$node = $this->nodes_[$node_id];
+ /* Get last element class and type */
+ $last_class = "";
+ $last_type = "";
+ if(count($this->mode_stack)){
+ $key = key($this->mode_stack);
+ $tmp = array_reverse($this->mode_stack[$key]['ELEMENTS']);
+ $last_class = $tmp[key($tmp)]['class'];
+
+ if(isset($this->mode_stack[$key]['TYPE'])){
+ $last_type = $this->mode_stack[$key]['TYPE'];
+ }
+ }
+
/* This closes the last mode */
if($node['class'] == "block-start"){
$tmp = array_pop($this->mode_stack);
$this->handle_elements($tmp,$node_id);
- $this->handle_elements(array("TYPE" => "block_start"),$node_id);
+ $this->handle_elements(array("TYPE" => "block_start"),preg_replace("/[^0-9]/","",microtime()));
}
/* This closes the last mode */
if($node['class'] == "block-end"){
$tmp = array_pop($this->mode_stack);
$this->handle_elements($tmp,$node_id);
- $this->handle_elements(array("TYPE" => "block_end"),$node_id);
+ $this->handle_elements(array("TYPE" => "block_end"),preg_replace("/[^0-9]/","",microtime()));
}
/* Semicolon indicates a new command */
$this->handle_elements($tmp,$node_id);
}
- /* Handle comments */
- if($node['class'] == "comment"){
- $this->mode_stack[] = array("TYPE" => $node['class']);
- $rewoke_last = TRUE;
+ /* We can't handle comments within if tag right now */
+ if($last_type != "if"){
+
+ /* Comments require special attention.
+ * We do not want to create a single comment element
+ * foreach each "#comment" string found in the script.
+ * Sometimes comments are used like this
+ * # This is a comment
+ * # and it still is a comment
+ * # ...
+ * So we combine them to one single comment.
+ */
+ if($last_class != "comment" && $node['class'] == "comment"){
+ $tmp =array_pop($this->mode_stack);
+ $this->handle_elements($tmp,$node_id);
+ $this->mode_stack[] = array("TYPE" => $node['class']);
+ }
+
+ if($last_class == "comment" && $node['class'] != "comment"){
+ $tmp =array_pop($this->mode_stack);
+ $this->handle_elements($tmp,$node_id);
+ }
}
/* Handle identifiers */
- $identifiers = array("else","if","elsif","end","reject","redirect","vacation","keep","discard","comment","fileinto","require","stop");
+ $identifiers = array("else","if","elsif","end","reject","redirect","vacation","keep","discard","fileinto","require","stop");
if($node['class'] == "identifier" && in_array($node['text'],$identifiers)){
$this->mode_stack[] = array("TYPE" => $node['text']);
}
- /* Add current node to current command stack */
- end($this->mode_stack);
- $key = key($this->mode_stack);
- $this->mode_stack[$key]['ELEMENTS'][] = $node;
+ if(!($last_type == "if" && $node['class'] == "comment")){
+ /* Add current node to current command stack */
+ end($this->mode_stack);
+ $key = key($this->mode_stack);
+ $this->mode_stack[$key]['ELEMENTS'][] = $node;
+ }
/* Remove last mode from mode stack, cause it was only valid for a single line */
if($rewoke_last){
$class_name= "sieve_".$type ;
if(class_exists($class_name)){
- $this->pap[] = new $class_name($data,$id);
+ $this->pap[] = new $class_name($data,$id,$this);
}else{
echo "<font color='red'>Missing : ".$class_name."</font>"."<br>";
}
function remove_object($key_id)
{
$class = get_class($this->pap[$key_id]);
- if(in_array($class,array("sieve_if"))){
+ if(in_array($class,array("sieve_if","sieve_elsif","sieve_else"))){
$block_start= $key_id;
$block_end = $this->get_block_end($key_id);
+
for($i = $block_start ; $i <= $block_end ; $i ++ ){
unset($this->pap[$i]);
}
/* Only execute if this is a really a block element.
* Block elements is only sieve_if
*/
- if(in_array(get_class($this->pap[$start]),array("sieve_if"))){
+ if(in_array(get_class($this->pap[$start]),array("sieve_if","sieve_elsif","sieve_else"))){
$class = get_class($this->pap[$start]);
$next_class = get_class($this->pap[$start+1]);
}
$start ++;
$class = get_class($this->pap[$start]);
- $next_class = get_class($this->pap[$start+1]);
+
+ if(isset($this->pap[$start+1])){
+ $next_class = get_class($this->pap[$start+1]);
+ }else{
+ $next_class ="";
+ }
}
}
return($start);
* $key_id = Current position
* $direction = Forward or backward.
*/
- function _get_next_free_move_slot($key_id,$direction)
+ function _get_next_free_move_slot($key_id,$direction,$include_self = FALSE)
{
$last_class = "";
$current_class ="";
if(($key_id+1) == count($test)) {
return($key_id);
}
- $key_id ++;
+
+ if(!$include_self){
+ $key_id ++;
+ }
$current_class = get_class($test[$key_id]);
if(in_array($current_class, $allowed_to_add_after)){
return($key_id);
if($key_id == 0) {
return($key_id);
}
- $key_id --;
+ if(!$include_self){
+ $key_id --;
+ }
while($key_id >=0 ){
$current_class = get_class($test[$key_id]);
if(in_array($current_class, $allowed_to_add_before)){
$tmp3 = split("\n",$tmp2);
foreach($tmp3 as $str){
$str2 = trim($str);
- if(empty($str2)) continue;
+ #if(empty($str2)) continue;
$tmp.= $buffer.$str."\n";
}
}
return($tmp);
}
- function Add_Element()
- {
- $tmp = array("ELEMENTS" => array(array("class" => "qouted-string","text"=> "Bla bla, later more")));
- $this->pap[] = new sieve_comment($tmp,rand(1000,100000));
- }
-
function check()
{
$msgs = array();
}
return($msgs);
}
+
+
+ /* We are forced to add a new require.
+ * This function is called by the
+ * sieveElement_Classes->parent->add_require()
+ */
+ function add_require($str)
+ {
+ $require_id = -1;
+ foreach($this->pap as $key => $obj){
+ if(get_class($obj) == "sieve_require"){
+ $require_id = $key;
+ }
+ }
+
+ /* No require found, add one */
+ if($require_id == -1){
+ $require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
+ $require -> Add_Require($str);
+ $new = array();
+ $new[] = $require;
+ foreach($this->pap as $obj){
+ $new[] = $obj;
+ }
+ $this->pap = $new;
+ } else {
+ $this->pap[$require_id]->Add_Require($str);
+ }
+ }
}