index 3774ef0db044968b8a2622685ef01fb2e866dbac..0d718b2e517746c7cd7e9c94868d815887e09fb3 100644 (file)
var $mode_stack = array();
var $pap = array();
- var $add_new = FALSE;
- var $add_new_id = 0;
- var $add_type = "top";
- var $add_element_type = "";
+ function execute()
+ {
+ return($this->dump());
+ }
/* Create a html interface for the current sieve filter
*/
function dump()
{
- error_reporting(E_ALL);
-
/**************
* Handle new elements
**************/
- if($this->add_new){
-
- $element_types= array(
- "sieve_keep" => _("Keep"),
- "sieve_comment" => _("Comment"),
- "sieve_fileinto" => _("File into"),
- "sieve_keep" => _("Keep"),
- "sieve_discard" => _("Discard"),
- "sieve_redirect" => _("Redirect"),
- "sieve_reject" => _("Reject"),
- "sieve_require" => _("Require"),
- "sieve_stop" => _("Stop"),
- "sieve_vacation" => _("Vacation message"),
- "sieve_if" => _("If"));
-
-
- /* Element selected */
- if(isset($_POST['element_type']) && isset($element_types[$_POST['element_type']])){
- $this->add_element_type = $_POST['element_type'];
- }
-
- /* Create new element and add it at the selected position */
- if(isset($_POST['select_new_element_type'])){
-
- $ele = new $this->add_element_type(NULL, preg_replace("/[^0-9]/","",microtime()));
- $start = $end = array();
- $found = false;
-
- /* Add above current element*/
- if($this->add_type == "top"){
- foreach($this->pap as $key => $obj){
- if($obj->object_id == $this->add_new_id){
- $found = true;
- }
- if(!$found){
- $start[] = $obj;
- }else{
- $end[] = $obj;
- }
- }
- }else{
- /* Add below current element */
- foreach($this->pap as $key => $obj){
- if(!$found){
- $start[] = $obj;
- }else{
- $end[] = $obj;
- }
- if($obj->object_id == $this->add_new_id){
- $found = true;
- }
- }
- }
-
- /* Only add, if current element could be located */
- if($found){
- $new = array();
- foreach($start as $obj){
- $new[] = $obj;
- }
- $new[] = $ele;
- foreach($end as $obj){
- $new[] = $obj;
- }
- $this->pap = $new;
- $this->add_new = FALSE;
- }else{
- print_red(_("Something went wrong while adding a new entry."));
- }
- }
-
- }
-
- /* Only display select dialog if it is necessary */
- if($this->add_new){
- $smarty = get_smarty();
- $smarty->assign("element_types",$element_types );
- $smarty->assign("element_type",$this->add_element_type);
- $str = $smarty->fetch(get_template_path("templates/add_element.tpl",TRUE,dirname(__FILE__)));
- return($str);
- }
-
/* Only parse the tokens once */
if(!count($this->pap)){
$this->dump_ = "";
}
}
- /* Create html results */
- $smarty = get_smarty();
- $smarty->assign("Contents",$this->dump_);
- $ret = $smarty->fetch(get_template_path("templates/edit_frame_base.tpl",TRUE,dirname(__FILE__)));
- return ($ret);
+ return($this->dump_);
}
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->pap[$key]->save_object();
}
}
-
- $once = TRUE;
- foreach($_POST as $name => $value){
-
- if(isset($obj->object_id) && preg_match("/^Remove_Object_".$obj->object_id."_/",$name) && $once){
- $once = FALSE;
- $this->remove_object($key);
- }
- if(isset($obj->object_id) && preg_match("/^Move_Up_Object_".$obj->object_id."_/",$name) && $once){
- $this->move_up_down($key,"up");
- $once = FALSE;
- }
- if(isset($obj->object_id) && preg_match("/^Move_Down_Object_".$obj->object_id."_/",$name) && $once){
- $this->move_up_down($key,"down");
- $once = FALSE;
- }
- if(isset($obj->object_id) && preg_match("/^Add_Object_Top_".$obj->object_id."_/",$name) && $once){
- $this->add_new_object($obj->object_id,"top");
- $once = FALSE;
- }
- if(isset($obj->object_id) && preg_match("/^Add_Object_Bottom_".$obj->object_id."_/",$name) && $once){
- $this->add_new_object($obj->object_id,"bottom");
- $once = FALSE;
- }
- }
}
}
- /* Add a new object at the given position */
- function add_new_object($id,$top_bottom = "bottom")
- {
- $this->add_new = TRUE;
- $this->add_new_id = $id;
- $this->add_type = $top_bottom;
- }
-
-
/* Remove the object at the given position */
function remove_object($key_id)
{
"sieve_keep",
"sieve_require",
"sieve_comment",
+ "sieve_vacation",
"sieve_stop",
"sieve_reject",
"sieve_fileinto",
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();
- foreach($this->pap as $obj){
+ /* 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.
+ * - Check if there are tags collected that are not allowed
+ */
+ $last_found_at = -1;
+ $objs = array();
+ foreach($this->pap as $key => $obj){
+ if(get_class($obj) == "sieve_require"){
+ $last_found_at = $key;
+ }
+ }
+ foreach($this->pap as $key => $obj){
+ if($key == $last_found_at) break;
+ if(!in_array(get_class($obj),array("sieve_comment","sieve_require"))){
+ $objs[] = get_class($obj);
+ }
+ }
+ if(count($objs) && $last_found_at != -1){
+ $str = _("Require must be the first command in the script.");
+ $msgs[] = $str;
+ print_red($str);;
+ }
+
+ foreach($this->pap as $obj){
$o_msgs = $obj->check();
foreach($o_msgs as $o_msg){
$msgs[] = $o_msg;
/* Create valid sieve string/string-list
* out of a given array
*/
-function sieve_create_strings($data)
+function sieve_create_strings($data,$force_string = FALSE)
{
$ret = "";
if(is_array($data)){
$Multiline = preg_match("/\n/",$data);
$data = preg_replace("/\r/","",$data);;
- if($Multiline){
+ if($Multiline && !$force_string){
$ret = "text: \r\n".$data."\r\n.\r\n";
}else{
$ret = "\"".$data."\"";
$ret[] = $data[$id]['text'];
}elseif($data[$id]['class'] == "number"){
$ret[] = $data[$id]['text'];
+ }elseif($data[$id]['class'] == "multi-line"){
+ $str = trim(preg_replace("/^text:/","",$data[$id]['text']));
+ $str = trim(preg_replace("/\.$/","",$str));
+ $ret[] = $str;
}
+
return(array("OFFSET" => $id, "STRINGS" => $ret));
}