Fixed: FS#1642 - Adding new content filters breaks header_checks, body_chec...

tbrehm

2011-06-08 3cdb9a8fdc13ceb9de7a32b6fd989b76bafb45af

 server/plugins-available/maildrop_plugin.inc.php

@@ -60,6 +60,7 @@
      Register for the events
      */
      
      $app->plugins->registerEvent('mail_user_insert','maildrop_plugin','update');
      $app->plugins->registerEvent('mail_user_update','maildrop_plugin','update');
      $app->plugins->registerEvent('mail_user_delete','maildrop_plugin','delete');
      
@@ -165,13 +166,16 @@
         }
      }
         
         // 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"]["cc"] != $data["new"]["cc"]) {
      // 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"]["cc"] != $data["new"]["cc"]) {
            
            $app->log("Mailfilter config has been changed",LOGLEVEL_DEBUG);
            if(trim($data["new"]["custom_mailfilter"]) != '' or $data["new"]["move_junk"] != 'n') {
            if(trim($data["new"]["custom_mailfilter"]) != '' 
               or $data["new"]["move_junk"] != 'n' 
               or $data["new"]["cc"] != '') {
					
               // Delete the old filter recipe
               $email_parts = explode("@",$data["old"]["email"]);
               $file = $this->mailfilter_config_dir.'/'.$email_parts[1].'/'.$email_parts[0].'/.mailfilter';
@@ -189,6 +193,7 @@
               
               if($data["new"]["cc"] != '') {
                  $mailfilter_content .= "cc \"!".$data["new"]["cc"]."\"\n";
                  $app->log("Added CC address ".$data["new"]["cc"].' to mailfilter file.',LOGLEVEL_DEBUG);
               }
               
               if($data["new"]["move_junk"] == 'y') {
@@ -211,7 +216,6 @@
               if(is_file($file)) unlink($file)  or $app->log("Unable to delete file: $file",LOGLEVEL_WARN);
               $app->log("Deleting custom Mailfiter".$file,LOGLEVEL_DEBUG);
            }
         //}
      }
   }