diff --git a/include/sieve/class_sieveElement_Vacation.inc b/include/sieve/class_sieveElement_Vacation.inc
index 9bb4a41b4ef1c8a8fad1ccb26fcfecb6a1bf64b9..43c7546377215877efee4065959c00d61d3a8980 100644 (file)
$known_attrs = array(":days",":subject",":from",":mime",":handle");
/* skip if empty */
- if(($data == NULL) || !is_array($data)) return;
+ if(($data === NULL) || !is_array($data)) return;
/* Walk through elements */
- for($i = 0 ; $i < count($data['ELEMENTS']) ; $i ++){
+ $p= count($data['ELEMENTS']);
+ for ($i= 0; $i < $p; $i++){
/* get current element */
$node = $data['ELEMENTS'][$i];
}
}
}else{
- $this->addresses[] = $data['ELEMENTS'][$i]['text'] ;
+ $this->addresses[] = preg_replace("/\"/i","",$data['ELEMENTS'][$i]['text']);
}
}
foreach($strs as $str){
$data .= $str;
}
- $this->reason = $data;//preg_replace("/\"/","",$data);
+ $this->reason = $data;
}
}
}
if($this->mime){
$str.= ":mime ".sieve_create_strings($this->mime);
}
- $str .= "\n ".sieve_create_strings($this->reason);
+
+ /* Append reason and ensure that this will be
+ * handled as multiline text element
+ * by adding a "\n" new line
+ */
+ $str .= "\n ".sieve_create_strings($this->reason."\n");
return($str." ; \n");
}
{
/* Get release date */
if(isset($_POST['vacation_release_'.$this->object_id])){
- $this->days = $_POST['vacation_release_'.$this->object_id];
+ $this->days = stripslashes($_POST['vacation_release_'.$this->object_id]);
}
/* Check if we want to toggle the expert mode */
$tmp = array();
$tmp2 = split(",",$vr);
foreach($tmp2 as $val){
- $ad = trim(preg_replace("/\"/","",$val));
+ $ad = trim($val);
if(!empty($ad)){
- $tmp[] = "\"".$ad."\"";
+ $tmp[] = $ad;
}
}
$this->addresses = $tmp;
/* Get reason */
if(isset($_POST['vacation_reason_'.$this->object_id])){
$vr = stripslashes ($_POST['vacation_reason_'.$this->object_id]);
- $this->reason = "\"".trim(preg_replace("/\"/","",$vr))."\"";
+ $this->reason = trim($vr);
}
}
$msgs = array();
$err = FALSE;
foreach($this->addresses as $addr){
- if(!is_email(preg_replace("/\"/","",$addr))){
+ if(!is_email($addr)){
$err = true;
}
}
if($err){
- $msgs[] = _("Alternative sender addresse must be valid email addresses.");
+ $msgs[] = _("Alternative sender address must be a valid email addresses.");
}
return($msgs);
}