diff --git a/include/sieve/class_sieveElement_Require.inc b/include/sieve/class_sieveElement_Require.inc
index dffbf375b0762c0b221154072083f3da47ff8345..a9b68903439c090bafe1459c80d575df01d269b3 100644 (file)
{
var $data = array();
var $object_id = -1;
-
- function sieve_require($data,$object_id)
+ var $parent = NULL;
+ var $skip_save_object =FALSE;
+
+ function sieve_require($data,$object_id,$parent)
{
+ $this->parent = $parent;
$this->object_id = $object_id;
- foreach($data['ELEMENTS'] as $node ){
- if(in_array($node['class'],array("quoted-string","text"))){
- $this->data[] = preg_replace("/\"/","",$node['text']);
+ if($data !== NULL){
+
+ for($i = 0 ; $i < count($data['ELEMENTS']) ; $i++){
+ $tmp = sieve_get_strings($data['ELEMENTS'],$i);
+ $i = $i + $tmp['OFFSET'];
+ foreach($tmp['STRINGS'] as $str){
+ $this->data[]= $str;
+ }
}
}
}
+
+ /* Add a new require statement and ensure
+ * that it is not specified twice
+ */
+ function Add_Require($str)
+ {
+ $current = array();
+ foreach($this->data as $dat){
+ $current[] = $dat;
+ }
+ if(!in_array($str,$current)){
+ $this->data[] = $str;
+ }
+ $this->data = array_unique($this->data);
+ $this->skip_save_object = TRUE;
+ }
+
function save_object()
{
+ if($this->skip_save_object){
+ $this->skip_save_object = FALSE;
+ return;
+ }
+
/* Get the values should check for, they are seperated by , */
if(isset($_POST['require_'.$this->object_id])){
$vls = stripslashes($_POST['require_'.$this->object_id]);
$tmp2 = split(",",$vls);
foreach($tmp2 as $val){
- $val = trim(preg_replace("/\"/","",$val));
+ $val = trim($val);
if(empty($val)) continue;
- $tmp[] = "\"".$val."\"";
+ $tmp[] = $val;
}
$this->data = $tmp;
}
function get_sieve_script_part()
{
+ if(count($this->data)){
$tmp = sieve_create_strings($this->data);
return("require ".$tmp.";\n");
+ }else{
+ return("");
+ }
}
function execute()
$smarty->assign("LastError",$tmp);
$smarty->assign("LastErrorCnt",count($tmp));
$smarty->assign("ID", $this->object_id);
- $object_container = $smarty->fetch(get_template_path("templates/object_container_clear.tpl",TRUE,dirname(__FILE__)));
+ $object_container = $smarty->fetch(get_template_path("templates/object_container.tpl",TRUE,dirname(__FILE__)));
$object= $smarty->fetch(get_template_path("templates/element_require.tpl",TRUE,dirname(__FILE__)));
- $str = preg_replace("/%%OBJECT_CONTENT%%/",$object,$object_container);
+ $str = preg_replace("/%%OBJECT_CONTENT%%/",addcslashes($object,"\\"),$object_container);
return($str);
}
}