Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 server/plugins-available/maildeliver_plugin.inc.php

@@ -98,8 +98,9 @@
         $app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG);

         $sieve_file = $data["new"]["maildir"].'/.sieve';
         $sieve_file_isp = $data["new"]["maildir"].'/sieve/ispconfig.sieve';
         if(is_file($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);

         if(is_file($sieve_file_isp)) unlink($sieve_file_isp)  or $app->log("Unable to delete file: $sieve_file_isp", LOGLEVEL_WARN);
         $app->load('tpl');

         //* Select sieve filter file for dovecot version
@@ -130,13 +131,14 @@
         $tpl->setLoop('ccloop', $tmp_addresses_arr);

         // Custom filters
         $tpl->setVar('custom_mailfilter', $data["new"]["custom_mailfilter"]);
         if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
         $tpl->setVar('custom_mailfilter', str_replace("\r\n","\n",$data["new"]["custom_mailfilter"]));

         // Move junk
         $tpl->setVar('move_junk', $data["new"]["move_junk"]);

         // Check autoresponder dates
         if($data["new"]["autoresponder_start_date"] == '0000-00-00 00:00:00' && $data["new"]["autoresponder_end_date"] == '0000-00-00 00:00:00') {
         if((!$data['new']['autoresponder_start_date'] || $data["new"]["autoresponder_start_date"] == '0000-00-00 00:00:00') && (!$data['new']['autoresponder_end_date'] || $data["new"]["autoresponder_end_date"] == '0000-00-00 00:00:00')) {
            $tpl->setVar('autoresponder_date_limit', 0);
         } else {
            $tpl->setVar('autoresponder_date_limit', 1);
@@ -163,8 +165,8 @@
         $tpl->setVar('autoresponder_text', $data["new"]["autoresponder_text"]);

         //* Set alias addresses for autoresponder
         $sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
         $records = $app->db->queryAllRecords($sql);
         $sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = ?";
         $records = $app->db->queryAllRecords($sql, $data["new"]["email"]);

         $addresses = array();
         $addresses[] = $data["new"]["email"];
@@ -179,8 +181,8 @@
         $alias_addresses = array();

         $email_parts = explode('@', $data["new"]["email"]);
         $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = '@".$app->db->quote($email_parts[1])."'";
         $records = $app->db->queryAllRecords($sql);
         $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = ?";
         $records = $app->db->queryAllRecords($sql, '@'.$email_parts[1]);
         if(is_array($records) && count($records) > 0) {
            $app->log("Found " . count($records) . " records (aliasdomains).", LOGLEVEL_DEBUG);
            foreach($records as $rec) {
@@ -211,8 +213,24 @@

         $tpl->setVar('addresses', $address_str);

         file_put_contents($sieve_file, $tpl->grab());
         exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($sieve_file));
         if ( ! is_dir($data["new"]["maildir"].'/sieve/') ) {
            $app->system->mkdirpath($data["new"]["maildir"].'/sieve/', 0700, $mail_config['mailuser_name'], $mail_config['mailuser_group']);
         }

         file_put_contents($sieve_file_isp, $tpl->grab()) or $app->log("Unable to write sieve filter file", LOGLEVEL_WARN);
         if ( is_file($sieve_file_isp) ) {
            $app->system->chown($sieve_file_isp,$mail_config['mailuser_name'],false);
            $app->system->chgrp($sieve_file_isp,$mail_config['mailuser_group'],false);
         }
         chdir($data["new"]["maildir"]);
         //* create symlink to activate sieve script
         symlink("sieve/ispconfig.sieve", ".sieve")  or $app->log("Unable to create symlink to active sieve filter", LOGLEVEL_WARN);
         if (is_link(".sieve")) {
            $app->system->chown(".sieve",$mail_config['mailuser_name'],true);
            $app->system->chgrp(".sieve",$mail_config['mailuser_group'],true);
         }
         $app->system->chown($sieve_file,$mail_config['mailuser_name'],true);
         $app->system->chgrp($sieve_file,$mail_config['mailuser_group'],true);

         unset($tpl);

@@ -223,7 +241,9 @@
      global $app, $conf;

      $sieve_file = $data["old"]["maildir"].'/.sieve';
      $sieve_file_isp = $data["old"]["maildir"].'/sieve/ispconfig.sieve';
      if(is_file($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);
      if(is_file($sieve_file_isp)) unlink($sieve_file_isp)  or $app->log("Unable to delete file: $sieve_file_isp", LOGLEVEL_WARN);
   }