Fixed: FS#758 - disabling mail filter rules doesn't work

tbrehm

2009-06-21 11c8f36af084f676b60248ad4e6d15e99f8652b4

Fixed: FS#758 - disabling mail filter rules doesn't work 

 interface/web/mail/mail_user_filter_edit.php

@@ -114,7 +114,9 @@
        $content = '';
        $content .= '### BEGIN FILTER_ID:'.$this->id."\n";
        
        if($this->dataRecord["action"] == 'move') {
        if($this->dataRecord["active"] == 'y') {
		
            if($this->dataRecord["action"] == 'move') {
        
            $content .= "
`test -e ".'$DEFAULT/.'.$this->dataRecord["target"]."`
@@ -125,33 +127,35 @@
  `echo INBOX.".$this->dataRecord["target"]." >> ".'$DEFAULT'."/courierimapsubscribed`
}
";        
            }
		
            $content .= "if (/^".$this->dataRecord["source"].":";
		
            $searchterm = preg_quote($this->dataRecord["searchterm"]);
		
            if($this->dataRecord["op"] == 'contains') {
                $content .= ".*".$searchterm."/:h)\n";
            } elseif ($this->dataRecord["op"] == 'is') {
                $content .= $searchterm."$/:h)\n";
            } elseif ($this->dataRecord["op"] == 'begins') {
                $content .= $searchterm."/:h)\n";
            } elseif ($this->dataRecord["op"] == 'ends') {
                $content .= ".*".$searchterm."$/:h)\n";
            }
		
            $content .= "{\n";
            $content .= "exception {\n";
		
            if($this->dataRecord["action"] == 'move') {
                $content .= 'to $DEFAULT/.'.$this->dataRecord["target"]."/\n";
            } else {
                $content .= "to /dev/null\n";
            }
		
            $content .= "}\n";
            $content .= "}\n";
		
        }
		
        $content .= "if (/^".$this->dataRecord["source"].":";
		
        $searchterm = preg_quote($this->dataRecord["searchterm"]);
		
        if($this->dataRecord["op"] == 'contains') {
            $content .= ".*".$searchterm."/:h)\n";
        } elseif ($this->dataRecord["op"] == 'is') {
            $content .= $searchterm."$/:h)\n";
        } elseif ($this->dataRecord["op"] == 'begins') {
            $content .= $searchterm."/:h)\n";
        } elseif ($this->dataRecord["op"] == 'ends') {
            $content .= ".*".$searchterm."$/:h)\n";
        }
		
        $content .= "{\n";
        $content .= "exception {\n";
		
        if($this->dataRecord["action"] == 'move') {
            $content .= 'to $DEFAULT/.'.$this->dataRecord["target"]."/\n";
        } else {
            $content .= "to /dev/null\n";
        }
		
        $content .= "}\n";
        $content .= "}\n";
        
        $content .= '### END FILTER_ID:'.$this->id."\n";