diff --git a/include/sieve/class_sieveElement_Vacation.inc b/include/sieve/class_sieveElement_Vacation.inc
index ec3250d4842c526a10c69678ea111c037f010c51..477a7fe0ce2520c89d323f33c13e99101e80abae 100644 (file)
var $from = "";
var $mime = "";
var $handle = "";
- var $reason = "";
+ var $reason = "\"I am not available, currently.\"";
var $addresses= array();
var $object_id= -1;
var $Expert = FALSE;
+ var $parent = NULL;
- function sieve_vacation($data,$object_id)
+ function sieve_vacation($data,$object_id,$parent)
{
+ $this->parent = $parent;
+ $this->object_id = $object_id;
+ $this->parent->add_require("vacation");
+
/* Usage: vacation [":days" number] [":subject" string]
[":from" string] [":addresses" string-list]
[":mime"] [":handle" string] <reason: string> */
$known_attrs = array(":days",":subject",":from",":mime",":handle");
/* skip if empty */
- if($data == NULL) return;
+ if(($data == NULL) || !is_array($data)) return;
/* Walk through elements */
for($i = 0 ; $i < count($data['ELEMENTS']) ; $i ++){
}
/* Add the vacation message */
- if($node['class'] == "quoted-string"){
- $this->reason = $node['text'];
+ if(in_array($node['class'],array("quoted-string","multi-line"))){
+
+ $tmp = sieve_get_strings($data['ELEMENTS'],$i);
+ $strs= $tmp['STRINGS'];
+
+ $data = "";
+ foreach($strs as $str){
+ $data .= $str;
+ }
+ $this->reason = $data;
}
}
}
if($this->days){
$str.= ":days ".$this->days;
}
- $str .= ":addresses ".sieve_create_strings($this->addresses);
- if($this->subject){
- $str.= ":subject ".sieve_create_strings($this->subject);
+
+ if(count($this->addresses)){
+ $str .= ":addresses ".sieve_create_strings($this->addresses);
+ if($this->subject){
+ $str.= ":subject ".sieve_create_strings($this->subject);
+ }
}
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");
}
$tmp = array();
$tmp2 = split(",",$vr);
foreach($tmp2 as $val){
- $tmp[] = "\"".trim(preg_replace("/\"/","",$val))."\"";
+ $ad = trim(preg_replace("/\"/","",$val));
+ if(!empty($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);
}
}
function check()
{
- return(array()) ;
+ $msgs = array();
+ $err = FALSE;
+ foreach($this->addresses as $addr){
+ if(!is_email($addr)){
+ $err = true;
+ }
+ }
+ if($err){
+ $msgs[] = _("Alternative sender addresse must be valid email addresses.");
+ }
+ return($msgs);
}
function execute()
$Addresses = preg_replace("/,$/","",trim($Addresses));
$smarty = get_smarty();
+ $smarty->assign("LastError",$this->check());
+ $smarty->assign("LastErrorCnt",count($this->check()));
$smarty->assign("Reason",$this->reason);
$smarty->assign("Addresses",$Addresses);
$smarty->assign("Subject",$this->subject);
$object_container = $smarty->fetch(get_template_path("templates/object_container.tpl",TRUE,dirname(__FILE__)));
$object= $smarty->fetch(get_template_path("templates/element_vacation.tpl",TRUE,dirname(__FILE__)));
- $str = preg_replace("/%%OBJECT_CONTENT%%/",$object,$object_container);
+ $str = preg_replace("/%%OBJECT_CONTENT%%/",addcslashes($object,"\\"),$object_container);
return($str);
}
}