Heimdal stuff not needed. It's too insecure to read m-keys by php.

[gosa.git] / include / sieve / class_sieveElement_Vacation.inc

diff --git a/include/sieve/class_sieveElement_Vacation.inc b/include/sieve/class_sieveElement_Vacation.inc
index 477a7fe0ce2520c89d323f33c13e99101e80abae..43c7546377215877efee4065959c00d61d3a8980 100644 (file)
--- a/include/sieve/class_sieveElement_Vacation.inc
+++ b/include/sieve/class_sieveElement_Vacation.inc
@@ -27,10 +27,11 @@ class sieve_vacation
     $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];
@@ -57,7 +58,7 @@ class sieve_vacation
             }
           }
         }else{
-              $this->addresses[] = $data['ELEMENTS'][$i]['text'] ;
+              $this->addresses[] =  preg_replace("/\"/i","",$data['ELEMENTS'][$i]['text']);
         }
       }
 
@@ -105,7 +106,7 @@ class sieve_vacation
   {
     /* 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 */
@@ -119,7 +120,7 @@ class sieve_vacation
       $tmp = array();
       $tmp2 = split(",",$vr);
       foreach($tmp2 as $val){
-        $ad = trim(preg_replace("/\"/","",$val));
+        $ad = trim($val);
         if(!empty($ad)){
           $tmp[] = $ad;
         }
@@ -144,7 +145,7 @@ class sieve_vacation
       }
     }
     if($err){
-      $msgs[] = _("Alternative sender addresse must be valid email addresses.");
+      $msgs[] = _("Alternative sender address must be a valid email addresses.");
     }
     return($msgs);
   }