Merged revisions 2741-2788 from SVN stable branch.

tbrehm

2011-11-21 edf806b98d675a2037b019644aff76b7e8b7738c

 server/plugins-available/maildeliver_plugin.inc.php

@@ -101,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"]);