index 8525ee32dd5356ae531927789cf301a6b6754549..361fa3f916518e1ee9567a1958e66a42104095b3 100644 (file)
$this -> dump_ = "";
$ends = array();
+ if(!count($this->pap)){
+# $this->pap[] = new sieve_comment(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
+ }
foreach($this->pap as $key => $object){
if(is_object($object)){
$end = $this->get_block_end($key);
/* 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);
}
- /* 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){
/* 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;
+ }
+
$class = get_class($this->pap[$key_id]);
if(in_array($class,array("sieve_if","sieve_elsif","sieve_else"))){
$block_start= $key_id;
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;
- $tmp.= $buffer.$str."\n";
- }
+ $tmp3 = split("\n",$tmp2);
+ foreach($tmp3 as $str){
+ $str2 = trim($str);
+ $tmp.= $buffer.$str."\n";
}
if(get_class($part) == "sieve_block_start"){
$buffer .= SIEVE_INDENT_TAB;
}
}
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"){