Changeset 208

Timestamp:

09/18/07 08:48:29 (16 months ago)

Author:

jonas

Message:

fwd spam/list_view

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• includes/sites/email_view.php (modified) (3 diffs)
• includes/sites/list_view.php (modified) (1 diff)
• templates/email_view.tpl (modified) (2 diffs)

trunk/ChangeLog

@@ -2 +2 @@
         o Improved: sa_learn.pl no longer debug output
         o Improved: move_spam does not display INBOX
+        o Improved: list_view add new address (check if valid)
         o Added: display mailbox size per domain
         o Added: forward spam to another mailbox (frontend + backend) (#29)
+        o Added: admin could remove move_spam option per user
+        o Added: admin could set forward spam option
         o Fixed: superadmin web_lang to short (#35)
 CpVES 0.09 2007-09-15 - Jonas Genannt - <jonas.genannt@brachium-system.net>

trunk/includes/sites/email_view.php

@@ -55 +55 @@
         $edata=$result->fetchrow(DB_FETCHMODE_ASSOC);
         
-        
+        //remove move spam option:
+        if (isset($_GET['move_spam']) && $_GET['move_spam']=='del') {
+                $sql=sprintf("UPDATE users SET move_spam=NULL WHERE id='%d'",
+                        $db->escapeSimple($_GET['id']));
+                $result=&$db->query($sql);
+                //reset filter
+                $sql=sprintf("UPDATE mailfilter SET active='0' WHERE email='%d' AND type='move_spam'",
+                        $db->escapeSimple($_GET['id']));
+                $result=&$db->query($sql);
+        }
         /* save spamassassin begin */
         if (isset($_POST['save_option']))
-{
+        {
         if (isset($_POST['spamassasin_active']) && is_numeric($_POST['spamassasin_active']))
         {
@@ -136 +145 @@
                 update_email_options($_GET['id'],'del_known_spam','0',0);
         }
+
+        // spam forwarding option
+        $sql=sprintf("SELECT move_spam FROM users WHERE id='%s'",
+        $db->escapeSimple($_GET['id']));
+        $result=&$db->query($sql);
+        $move_spam=$result->fetchrow(DB_FETCHMODE_ASSOC);
+        if (isset($_POST['spam_fwd_active']) && $_POST['spam_fwd_active']==1  && $move_spam['move_spam']!=NULL) {
+                $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($_GET['id'],'spam_fwd_active','1',0);
+                        update_email_options($_GET['id'],'spam_fwd_mail',$_POST['spam_fwd_mail'],0);
+                }
+                else {
+                        $smarty->assign('error_msg', 'y');
+                        $smarty->assign('if_error_forwardaddr_valid', 'y');
+                        update_email_options($_GET['id'],'spam_fwd_active','0',0);
+                }
+        }
+        else {
+                update_email_options($_GET['id'],'spam_fwd_active','0',0);
+        }
+
+
         }
         /* save spamassassin end */
@@ -628 +663 @@
         $del_known_spam=get_email_options($_GET['id'],"del_known_spam",0);
         $del_known_spam_value=get_email_options($_GET['id'],"del_known_spam_value",'10.0');
-        
+        $spam_fwd_active=get_email_options($_GET['id'], "spam_fwd_active",0);
+        $spam_fwd_mail=get_email_options($_GET['id'], 'spam_fwd_mail', '');
+        
+        $smarty->assign('spam_fwd_mail', $spam_fwd_mail);
+        $smarty->assign('spam_fwd_active', $spam_fwd_active);
         $smarty->assign('spamassassin_active', $spamassassin);
         $smarty->assign('bogofilter_active', $bogofilter);

trunk/includes/sites/list_view.php

@@ -53 +53 @@
 
         //hinzufugen:
-        if (isset($_POST['submit_add']) && ! empty($_POST['add_address']))
+        if (isset($_POST['submit_add']) && !Validate::email($_POST['add_address'])) {
+                $smarty->assign('error_msg' ,'y');
+                $smarty->assign('if_email_valid','y');
+        }
+        elseif (isset($_POST['submit_add']) && ! empty($_POST['add_address']))
         {
                 $sql = sprintf("SELECT COUNT(*) AS num FROM list_recp WHERE id = %d AND recp = '%s'",

trunk/templates/email_view.tpl

@@ -540 +540 @@
                 
         </select><br/>
-        <input type="text" name="del_known_spam_value" id="del_known_spam_value" value="{$del_known_spam_value}"/>
-        <br/>
+        <input type="text" name="del_known_spam_value" id="del_known_spam_value" value="{$del_known_spam_value}"/></td>
+</tr>
+{if $if_spam_fwd_value == 1}
+        <tr>
+                <td valign="top">{t}forward known spam{/t}:</td>
+                <td>{if $spam_fwd_active == 0}<input type="radio" name="spam_fwd_active" value="0" checked="checked"/>{t}no{/t} <input type="radio" name="spam_fwd_active" value="1"/>{t}yes{/t}{else}<input type="radio" name="spam_fwd_active" value="0" />{t}no{/t} <input type="radio" name="spam_fwd_active" checked="checked" value="1"/>{t}yes{/t}{/if}<br/>
+                <input type="text" name="spam_fwd_mail" value="{$spam_fwd_mail}"/>
+                </td>
+        </tr>
+{/if}
+
+<tr>
+        <td></td>
+        <td><br/>
         {if $del_known_spam != 1}
         <script type="text/javascript">
@@ -563 +575 @@
         <td>{t}move known spam{/t}:</td>
         <td>{if $sa_move_spam == '0'}{t}not active{/t}{else}
-        INBOX/{$sa_move_spam}
+        INBOX/{$sa_move_spam} <small>[ <a href="?module=email_view&#038;id={$id}&#038;did={$did}&#038;move_spam=del">{t}do not move known spam{/t}</a> ]</small>
         {/if}
         </td>