Changeset 205

Timestamp:

09/16/07 16:25:43 (16 months ago)

Author:

jonas

Message:

 

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• includes/check_access.php (modified) (1 diff)
• includes/config.inc.default.php (modified) (2 diffs)
• includes/func.inc.php (modified) (1 diff)
• includes/sites/domain_view.php (modified) (1 diff)
• includes/sites/email_view.php (modified) (5 diffs)
• includes/sites/login.php (modified) (2 diffs)
• includes/sites/main.php (modified) (2 diffs)
• includes/sites/user_spam.php (modified) (2 diffs)
• sql_upgrades (modified) (1 diff)
• system_scripts/sa_learn.pl (modified) (1 diff)
• templates/domain_view.tpl (modified) (16 diffs)
• templates/email_view.tpl (modified) (2 diffs)
• templates/index_admin.tpl (modified) (1 diff)
• templates/index_sadmin.tpl (modified) (2 diffs)
• templates/user_spam.tpl (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+CpVES 0.10 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net>
+        o Improved: sa_learn.pl no longer debug output
+        o Added: display mailbox size per domain
 CpVES 0.09 2007-09-15 - Jonas Genannt - <jonas.genannt@brachium-system.net>
         o Improved: runScripts.sh create_fetchmail.pl should not run on trigger

trunk/includes/check_access.php

@@ -30 +30 @@
 if (isset($_SESSION['p_fetchmail']))   $smarty->assign('p_fetchmail',$_SESSION['p_fetchmail']);
 if (isset($_SESSION['p_autores_xheader']))   $smarty->assign('p_autores_xheader',$_SESSION['p_autores_xheader']);
+if (isset($_SESSION['p_spam_fwd']))   $smarty->assign('p_spam_fwd',$_SESSION['p_spam_fwd']);
 
 

trunk/includes/config.inc.default.php

@@ -49 +49 @@
 
 //IMAP Server:
-$config['imap_server'] = "swetlana.brachium-system.net";
+$config['imap_server'] = "mail.brachium-system.net";
 
 //Company Name:
@@ -84 +84 @@
          "autoresponder_send", "email_options","fetchmail",
          "mailarchive","mailfilter","spamassassin","spamassassin_learn","autoresponder_xheader");
-$config['cpves_version']="0.09";
+$config['cpves_version']="0.10-SVN";
 require_once(ROOT . '/includes/func.inc.php');
 ?>

trunk/includes/func.inc.php

@@ -207 +207 @@
                         $do="p_mlists";
                         break;
+                case 'spam_fwd':
+                        $do="p_spam_fwd";
+                        break;
                 default:
                         return false;

trunk/includes/sites/domain_view.php

@@ -200 +200 @@
         $result=&$db->query($sql);
         $data=$result->fetchrow(DB_FETCHMODE_ASSOC);
-        
         $smarty->assign('dnsname', $data['dnsname']);
-        $smarty->assign('p_imap', $data['p_imap']);
-        $smarty->assign('p_pop3', $data['p_pop3']);
-        $smarty->assign('p_webmail', $data['p_webmail']);
-        $smarty->assign('p_spamassassin', $data['p_spamassassin']);
-        $smarty->assign('p_sa_learn', $data['p_sa_learn']);
-        $smarty->assign('p_spam_del', $data['p_spam_del']);
-        $smarty->assign('p_mailarchive', $data['p_mailarchive']);
-        $smarty->assign('p_bogofilter', $data['p_bogofilter']);
-        $smarty->assign('p_sa_wb_listing', $data['p_sa_wb_listing']);
-        $smarty->assign('p_fetchmail', $data['p_fetchmail']);
-        $smarty->assign('p_webinterface', $data['p_webinterface']);
-        $smarty->assign('p_autores_xheader', $data['p_autores_xheader']);
-        $smarty->assign('p_check_polw', $data['p_check_polw']);
-        $smarty->assign('p_check_grey', $data['p_check_grey']);
-        $smarty->assign('p_mlists', $data['p_mlists']);
-
+        $smarty->assign('domain', $data);
         $smarty->assign('max_emails', $data['max_email']);
         $smarty->assign('max_fwd', $data['max_forward']);
-        $smarty->assign('dnote', $data['dnote']);
-        
+
 $smarty->assign('emails', get_forem_domain($_GET['did'],'users', $db));
 $smarty->assign('forwardings', get_forem_domain($_GET['did'],'forwardings', $db));

trunk/includes/sites/email_view.php

@@ -49 +49 @@
         $smarty->assign('if_check_polw', $data['p_check_polw']);
         $smarty->assign('if_check_grey', $data['p_check_grey']);
+        $smarty->assign('if_spam_fwd', $data['p_spam_fwd']);
         $sql=sprintf("SELECT passwd,cpasswd,email FROM users WHERE id='%s'",
                 $db->escapeSimple($_GET['id']));
@@ -467 +468 @@
                         {
                                 $spam_del=0;
+                        }
+                        if (isset($_POST['spam_fwd']) && $_POST['spam_fwd'] =="enable" && check_domain_feature($_GET['did'],'p_spam_fwd')) {
+                                $spam_fwd=1;
+                        }
+                        else
+                        {
+                                $spam_fwd=0;
                         }
                         if (isset($_POST['sa_learn']) && $_POST['sa_learn'] =="enable" && check_domain_feature($_GET['did'],'p_sa_learn')) {
@@ -542 +550 @@
                         if (!$error)
                         {
-                                $sql=sprintf("UPDATE users SET passwd='%s', full_name='%s',p_imap='%d', p_pop3='%d',p_webmail='%d',     cpasswd='%s', p_forwarding='%s',p_spamassassin='%s',p_mailarchive='%d',p_bogofilter='%d',p_spam_del='%d',p_sa_learn='%d',p_fetchmail='%d',p_webinterface='%d',p_autores_xheader='%d',p_check_polw='%d',p_check_grey='%d' WHERE id='%d' ",
+                                $sql=sprintf("UPDATE users SET passwd='%s', full_name='%s',p_imap='%d', p_pop3='%d',p_webmail='%d',     cpasswd='%s', p_forwarding='%s',p_spamassassin='%s',p_mailarchive='%d',p_bogofilter='%d',p_spam_del='%d',p_sa_learn='%d',p_fetchmail='%d',p_webinterface='%d',p_autores_xheader='%d',p_check_polw='%d',p_check_grey='%d',p_spam_fwd='%d' WHERE id='%d' ",
                                         $db->escapeSimple($cleartext),
                                         $db->escapeSimple($_POST['full_name']),
@@ -560 +568 @@
                                         $db->escapeSimple($check_polw),
                                         $db->escapeSimple($check_grey),
+                                        $db->escapeSimple($spam_fwd),
                                         $db->escapeSimple($_GET['id'])) ;
                                 $result=&$db->query($sql);
@@ -591 +600 @@
         $smarty->assign('if_check_polw_value',$edata['p_check_polw']);
         $smarty->assign('if_check_grey_value',$edata['p_check_grey']);
+        $smarty->assign('if_spam_fwd_value',$edata['p_spam_fwd']);
         if ( !empty($edata['move_spam']) && $edata['move_spam']!=NULL) {
                 $smarty->assign('sa_move_spam',$edata['move_spam'] );

trunk/includes/sites/login.php

@@ -31 +31 @@
 $_SESSION['p_fetchmail']='0';
 $_SESSION['p_autores_xheader']='0';
+$_SESSION['p_spam_fwd']='0';
 
 if (isset($_POST['email']) && isset($_POST['password']) && isset($_POST['login']) )
@@ -79 +80 @@
                         $_SESSION['p_fetchmail']=check_du_fetaure($_SESSION['uid'],$daten['domainid'],'p_fetchmail');
                         $_SESSION['p_autores_xheader']=check_du_fetaure($_SESSION['uid'],$daten['domainid'],'p_autores_xheader');
+                        $_SESSION['p_spam_fwd']=check_du_fetaure($_SESSION['uid'],$daten['domainid'],'p_spam_fwd');
                         $_SESSION['forwarding']=$daten['p_forwarding'];
                         $_SESSION['p_mailfilter']=$data_domain['p_mailfilter'];

trunk/includes/sites/main.php

@@ -73 +73 @@
                 $vaction=0;
         }
+        //display size of all mailboxes
+        $sql=sprintf("SELECT SUM( mb_size ) AS sum FROM `users`WHERE domainid='%d'",
+                $db->escapeSimple($row['id']));
+        $res_mb_size=&$db->query($sql);
+        $data_mb_size=$res_mb_size->fetchrow(DB_FETCHMODE_ASSOC);
         array_push($table_data, array(
          'dnsname' => $row['dnsname'],
@@ -82 +87 @@
          'dnote' => $row['dnote'],
          'vacation' => $vaction,
-         'vacation_infos' => $vaction_infos
+         'vacation_infos' => $vaction_infos,
+         'mb_size'        => $data_mb_size['sum']
          )
       );

trunk/includes/sites/user_spam.php

@@ -125 +125 @@
                 update_email_options($_SESSION['uid'],'del_known_spam','0',0);
         }
+        if (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);
+                        update_email_options($_SESSION['uid'],'spam_fwd_mail',$_POST['spam_fwd_mail'],0);
+                }
+                else {
+                        $smarty->assign('error_msg', 'y');
+                        $smarty->assign('if_error_forwardaddr_valid', 'y');
+                        update_email_options($_SESSION['uid'],'spam_fwd_active','0',0);
+                }
+        }
+        else {
+                update_email_options($_SESSION['uid'],'spam_fwd_active','0',0);
+        }
 
 
@@ -173 +187 @@
 $del_known_spam=get_email_options($_SESSION['uid'],"del_known_spam",0);
 $del_known_spam_value=get_email_options($_SESSION['uid'],"del_known_spam_value",'10.0');
+$spam_fwd_active=get_email_options($_SESSION['uid'], "spam_fwd_active",0);
+$spam_fwd_mail=get_email_options($_SESSION['uid'], 'spam_fwd_mail', '');
+$smarty->assign('spam_fwd_mail', $spam_fwd_mail);
+$smarty->assign('spam_fwd_active', $spam_fwd_active);
 $smarty->assign('bogofilter_active', $bogofilter);
 $smarty->assign('spamassassin_active', $spamassassin);

trunk/sql_upgrades

@@ -168 +168 @@
 
 ALTER TABLE `domains` ADD `p_mlists` TINYINT NOT NULL DEFAULT '0';
+
+
+Version 0.09 to 0.10
+ALTER TABLE `domains` ADD `p_spam_fwd` TINYINT( 1 ) NOT NULL DEFAULT '0';
+ALTER TABLE `users` ADD `p_spam_fwd` TINYINT( 1 ) NOT NULL DEFAULT '0';

trunk/system_scripts/sa_learn.pl

@@ -107 +107 @@
                 $bo_cmd = $find . " $path " . $find_opts .
                         " | " . $bogofilter . $bo_type;
-                print $bo_cmd . "\n\n";
                 system($bo_cmd);
                 system("chown -R ". $config{'vmail_user'} . " " . $config{'bogofilter_database'} );

trunk/templates/domain_view.tpl

@@ -141 +141 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_imap == 0  }
+ {if $domain.p_imap == 0  }
  <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=imap">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate IMAP.{/t}" /></a>
@@ -153 +153 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_pop3 == 0 }
+ {if $domain.p_pop3 == 0 }
   <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=pop3">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate POP3.{/t}" /></a>
@@ -165 +165 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_webmail ==  0 }
+ {if $domain.p_webmail ==  0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=webmail">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate webmail.{/t}" /></a>
@@ -178 +178 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_mlists ==  0 }
+ {if $domain.p_mlists ==  0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=mlists">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate mailinglists.{/t}" /></a>
@@ -192 +192 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_check_polw ==  0 }
+ {if $domain.p_check_polw ==  0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=check_polw">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate policyd-weight.{/t}" /></a>
@@ -206 +206 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_check_grey ==  0 }
+ {if $domain.p_check_grey ==  0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=check_grey">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate greylisting.{/t}" /></a>
@@ -219 +219 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_webinterface == 0  }
+ {if $domain.p_webinterface == 0  }
  <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=webinterface">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate CpVES webinterface.{/t}" /></a>
@@ -231 +231 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_autores_xheader == 0  }
+ {if $domain.p_autores_xheader == 0  }
  <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=autores_xheader">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate vacation X-Header feature.{/t}" /></a>
@@ -243 +243 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_fetchmail ==  0 }
+ {if $domain.p_fetchmail ==  0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=fetchmail">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate fetchmail{/t}:" /></a>
@@ -255 +255 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_spamassassin == 0 }
+ {if $domain.p_spamassassin == 0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=spamassassin">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate spamassassin.{/t}" /></a>
@@ -267 +267 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_sa_learn == 0 }
+ {if $domain.p_sa_learn == 0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=sa_learn">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate ham/spam learning.{/t}" /></a>
@@ -280 +280 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_spam_del == 0 }
+ {if $domain.p_spam_del == 0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=spam_del">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate delete spam.{/t}" /></a>
@@ -290 +290 @@
 
 <tr>
+ <td>{t}foward spam to another address{/t}:</td>
+ <td></td>
+ <td style="text-align:right;">
+ {if $domain.p_spam_fwd == 0 }
+   <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=spam_fwd">
+ <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate forward spam.{/t}" /></a>
+ {else}
+   <a href="?module=domain_view&#038;did={$did}&#038;fstate=0&#038;f=spam_fwd">
+ <img src="img/icons/button_ok.png" style="border:0px;" title="{t}deactivate forward spam.{/t}" /></a>
+ {/if}</td> 
+</tr>
+
+<tr>
  <td>{t}bogofilter{/t}:</td>
  <td></td>
  <td style="text-align:right;">
- {if $p_bogofilter == 0 }
+ {if $domain.p_bogofilter == 0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=bogofilter">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate bogofilter.{/t}" /></a>
@@ -306 +319 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_mailarchive == 0 }
+ {if $domain.p_mailarchive == 0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=mailarchive">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate archivemail.{/t}" /></a>
@@ -318 +331 @@
  <td></td>
  <td style="text-align:right;">
- {if $p_sa_wb_listing == 0 }
+ {if $domain.p_sa_wb_listing == 0 }
    <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=sa_wb_listing">
  <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate whitelisting.{/t}" /></a>
@@ -372 +385 @@
  <td colspan="4">
  <form action="?module=domain_view&#038;did={$did}" method="post">
- <input name="dnote" maxlength="30" value="{$dnote}" type="text"/></form>
+ <input name="dnote" maxlength="30" value="{$domain.dnote}" type="text"/></form>
  </td>
 </tr>
 {/if}
 
-{if ($if_spamassassin == 1 || ( $if_superadmin == '1' && $p_spamassassin == 1)) && $p_sa_wb_listing == 1 }
+{if ($if_spamassassin == 1 || ( $if_superadmin == '1' && $domain.p_spamassassin == 1)) && $domain.p_sa_wb_listing == 1 }
 <tr>
         <td colspan="4" class="domain_view"><h3>{t}spamfilter - whitelisting{/t}:</h3></td>

trunk/templates/email_view.tpl

@@ -156 +156 @@
 {/if}
 {if $if_spam_del == 1 }
+<tr>
         <td>{t}delete spam{/t}:</td>
         <td><select name="spam_del">
@@ -165 +166 @@
         {/if}
         </select></td>
+</tr>
+{/if}
+{if $if_spam_fwd == 1 }
+<tr>
+        <td>{t}forward spam to another address{/t}:</td>
+        <td><select name="spam_fwd">
+        <option value="enable">{t}yes{/t}</option>
+        {if $if_spam_fwd_value == 0}
+        <option value="disable" selected="selected">{t}no{/t}</option>
+        {else}
+        <option value="disable">{t}no{/t}</option>
+        {/if}
+        </select></td>
+</tr>
 {/if}
 {if $if_bogofilter == '1' }

trunk/templates/index_admin.tpl

@@ -1 +1 @@
 <table>
-  <tr>
-    <td>{t}domainname{/t}</td>
-    <td>{t}emailaddresses{/t}</td>
-    <td>{t}forwardings{/t}</td>
-
-  </tr>
-  {section name=row loop=$table_data}
-  <tr bgcolor="{cycle values="$color1,$color2"}">
-   <td style="padding-left:3px;">
-        <a href="?module=domain_view&#038;did={$table_data[row].id}">{$table_data[row].dnsname}</a></td>
-   <td style="text-align:right;">{$table_data[row].count_email}</td>
-   <td style="text-align:right;">{$table_data[row].count_forward}</td>
-  </tr>
-  
-  {/section}
+<tr>
+        <td>{t}domainname{/t}</td>
+        <td>{t}emailaddresses{/t}</td>
+        <td>{t}forwardings{/t}</td>
+        {if $config.display_mb_size == 1 }
+        <td>{t}size{/t}</td>
+        {/if}
+</tr>
+{section name=row loop=$table_data}
+<tr bgcolor="{cycle values="$color1,$color2"}">
+        <td style="padding-left:3px;">
+        <a href="?module=domain_view&#038;did={$table_data[row].id}">{$table_data[row].dnsname}</a></td>
+        <td style="text-align:right;">{$table_data[row].count_email}</td>
+        <td style="text-align:right;">{$table_data[row].count_forward}</td>
+        {if $config.display_mb_size == 1 }
+        <td>{$row.mb_size} MB</td>
+        {/if}
+</tr>
+{/section}
 </table>

trunk/templates/index_sadmin.tpl

@@ -4 +4 @@
                 <td>{t}emailaddresses{/t}</td>
                 <td>{t}fowardings{/t}</td>
+                {if $config.display_mb_size == 1 }
+                <td>{t}size{/t}</td>
+                {/if}
                 <td>{t}activate/deactivate{/t}</td>
                 <td>{t}delete{/t}</td>
@@ -21 +24 @@
                 <td>{$row.count_email}</td>
                 <td>{$row.count_forward}</td>
+                {if $config.display_mb_size == 1 }
+                <td>{$row.mb_size} MB</td>
+                {/if}
                 <td>
                         {if $row.access == "1" }

trunk/templates/user_spam.tpl

@@ -74 +74 @@
                 </td>
         <tr>
+        {if $p_spam_fwd == 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}
         {if $p_spam_del == 1}
         <tr>