Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,309...

tbrehm

2012-05-10 e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0

 server/plugins-available/maildeliver_plugin.inc.php

@@ -86,6 +86,7 @@
      // Write the custom mailfilter script, if mailfilter recipe has changed
      if($data["old"]["custom_mailfilter"] != $data["new"]["custom_mailfilter"]
            or $data["old"]["move_junk"] != $data["new"]["move_junk"]
            or $data["old"]["autoresponder_subject"] != $data["new"]["autoresponder_subject"] 
            or $data["old"]["autoresponder_text"] != $data["new"]["autoresponder_text"] 
            or $data["old"]["autoresponder"] != $data["new"]["autoresponder"]
            or (isset($data["new"]["email"]) and $data["old"]["email"] != $data["new"]["email"])
@@ -100,9 +101,23 @@
         if(is_file($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file",LOGLEVEL_WARN);
            
         $app->load('tpl');
		
			
         //* Select sieve filter file for dovecot version
         exec('dovecot --version',$tmp);
         if(substr($tmp[0],0,3) == '1.0') {
            $filter_file_template = "sieve_filter.master";
         } elseif(substr($tmp[0],0,3) == '1.2') {
            $filter_file_template = "sieve_filter_1.2.master";
         } elseif(substr($tmp[0],0,1) == '2') {
            $filter_file_template = "sieve_filter_1.2.master";
         } else {
            $filter_file_template = "sieve_filter.master";
         }
         unset($tmp);
			
         //* Create new filter file based on template
         $tpl = new tpl();
         $tpl->newTemplate("sieve_filter.master");
         $tpl->newTemplate($filter_file_template);
         
         // cc Field
         $tpl->setVar('cc',$data["new"]["cc"]);
@@ -112,10 +127,23 @@
            
         // Move junk
         $tpl->setVar('move_junk',$data["new"]["move_junk"]);
				

         // Set autoresponder start date
         $data["new"]["autoresponder_start_date"] = str_replace (" ", "T", $data["new"]["autoresponder_start_date"]);
         $tpl->setVar('start_date',$data["new"]["autoresponder_start_date"]);

         // Set autoresponder end date
         $data["new"]["autoresponder_end_date"] = str_replace (" ", "T", $data["new"]["autoresponder_end_date"]);
         $tpl->setVar('end_date',$data["new"]["autoresponder_end_date"]);

         // Autoresponder
         $tpl->setVar('autoresponder',$data["new"]["autoresponder"]);
			

         // Autoresponder Subject			
         $data["new"]["autoresponder_subject"] = str_replace("\"","'",$data["new"]["autoresponder_subject"]); 
         $tpl->setVar('autoresponder_subject',$data["new"]["autoresponder_subject"]);

         // Autoresponder Text
         $data["new"]["autoresponder_text"] = str_replace("\"","'",$data["new"]["autoresponder_text"]); 
         $tpl->setVar('autoresponder_text',$data["new"]["autoresponder_text"]);
         
@@ -123,8 +151,8 @@
         $sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
         $records = $app->db->queryAllRecords($sql);
         $addresses = '';
         if(is_array($records)) {
            $addresses .= ':addresses [';
         if(is_array($records) && count($records) > 0) {
            $addresses .= ':addresses ["'.$data["new"]["email"].'",';
            foreach($records as $rec) {
               $addresses .= '"'.$rec['source'].'",';
            }