Changeset 207

Timestamp:

09/17/07 23:01:20 (16 months ago)

Author:

jonas

Message:

done fwd spam (#29)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• includes/sites/user_spam.php (modified) (2 diffs)
• system_scripts/create_mailfilters.pl (modified) (1 diff)
• templates/error_messages.tpl (modified) (1 diff)
• templates/user_spam.tpl (modified) (1 diff)

trunk/ChangeLog

@@ -1 +1 @@
 CpVES 0.10 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net>
         o Improved: sa_learn.pl no longer debug output
+        o Improved: move_spam does not display INBOX
         o Added: display mailbox size per domain
+        o Added: forward spam to another mailbox (frontend + backend) (#29)
         o Fixed: superadmin web_lang to short (#35)
 CpVES 0.09 2007-09-15 - Jonas Genannt - <jonas.genannt@brachium-system.net>

trunk/includes/sites/user_spam.php

@@ -79 +79 @@
         }
         //save move_spam 
-        if ($_POST['move_spam']==0) {
+        if (isset($_POST['spam_fwd_active']) && $_POST['spam_fwd_active']==1 && $_POST['move_spam']==1) {
+                $smarty->assign('error_msg', 'y');
+                $smarty->assign('move_spam_active_and_spam_fwd', 1);
+        }
+        elseif ($_POST['move_spam']==0) {
                 $sql=sprintf("UPDATE users SET move_spam=NULL WHERE id='%d'",
                         $db->escapeSimple($_SESSION['uid']));
@@ -125 +129 @@
                 update_email_options($_SESSION['uid'],'del_known_spam','0',0);
         }
-        if (isset($_POST['spam_fwd_active']) && $_POST['spam_fwd_active']==1 ) {
+        
+        if (isset($_POST['spam_fwd_active']) && $_POST['spam_fwd_active']==1  && $_POST['move_spam']==1) {
+                $smarty->assign('error_msg', 'y');
+                $smarty->assign('move_spam_active_and_spam_fwd', 1);
+        }
+        elseif (isset($_POST['spam_fwd_active']) && $_POST['spam_fwd_active']==1 ) {
                 if (Validate::email($_POST['spam_fwd_mail'])) {
                         update_email_options($_SESSION['uid'],'spam_fwd_active','1',0);

trunk/system_scripts/create_mailfilters.pl

@@ -206 +206 @@
                                         $del_known_spam_value);
                                 }
+                                if (get_email_option($id,'spam_fwd_active','0') eq "1") {
+                                        $mailfilter = sprintf("%s\nexception {\nif (/^X-Spam-Flag: Yes/ || /^X-Bogosity: Spam, tests=bogofilter/)\n  to \"!%s\"\n}\n",
+                                                $mailfilter,
+                                                get_email_option($id,'spam_fwd_mail',''));
+                                }
                         }
                         if ( $type eq "autoresponder") {

trunk/templates/error_messages.tpl

@@ -87 +87 @@
 {elseif $ml_email_there == 'y'}
 {t}email address is already on the list!{/t}
+{elseif $move_spam_active_and_spam_fwd == 1}
+{t}move known spam and forward known spam is active!{/t}<br/>
+{t}You could either use move or forward option!{/t}
 {/if}

trunk/templates/user_spam.tpl

@@ -61 +61 @@
                                 <option value="{$row.name}" selected="selected">{$row.name_display}</option> 
                                 {/if}
-                        {else}
+                        {elseif $row.type!='inbox'}
                                 {if $row.type == 'spam'}
                                 <option style="font-weight:bold;" value="{$row.name}">{$row.name_display}</option>