Changeset 171

Timestamp:

09/02/07 22:52:10 (16 months ago)

Author:

jonas

Message:

added: mailbox size

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• includes/config.inc.default.php (modified) (1 diff)
• includes/func.inc.php (modified) (1 diff)
• includes/sites/domain_view.php (modified) (2 diffs)
• includes/sites/main.php (modified) (1 diff)
• sql_upgrades (modified) (1 diff)
• system_scripts/create_mailbox_size.pl (added)
• system_scripts/create_mailboxes.pl (modified) (3 diffs)
• system_scripts/create_mailfilters.pl (modified) (3 diffs)
• templates/domain_view.tpl (modified) (1 diff)
• templates/success_messages.tpl (modified) (1 diff)
• templates/user_index.tpl (modified) (1 diff)

trunk/ChangeLog

@@ -2 +2 @@
         o Added: autoresponder.pl: special X-Header vacation disable
         o Added: special X-Header vacation to email user/admin frontend
+        o Added: pidfile for create_mailboxes.pl
+        o Added: pidfile for create_mailfilters.pl
+        o Added: script for calculate the mailbox size
+        o Added: new config value for "display mailbox size"
+        o Added: domain_view.tpl mailbox size
+        o Improved: removed reload to domain show on save emailaddress
         o Fixed: autoresponder.pl. UTF-8 problems in body
 CpVES 0.05 2007-08-31 - Jonas Genannt - <jonas.genannt@brachium-system.net>

trunk/includes/config.inc.default.php

@@ -45 +45 @@
 $config['max_passwd_len']=15;
 
+//display the size of the mailboxes
+$config['display_mb_size']=1;
+
 //IMAP Server:
 $config['imap_server'] = "swetlana.brachium-system.net";

trunk/includes/func.inc.php

@@ -22 +22 @@
 $smarty->assign('webmail_link',$config['webmail_link']);
 $smarty->assign('mailgraph_link',$config['mailgraph_link']);
+$smarty->assign('display_mb_size',$config['display_mb_size']);
 /*
 mailfilter prios:

trunk/includes/sites/domain_view.php

@@ -218 +218 @@
 
 //FIXME: deleted email addresses!!!
-$sql=sprintf("SELECT email,id,access FROM users WHERE domainid='%s' AND enew!='0' ORDER BY email",
+$sql=sprintf("SELECT email,id,access,mb_size FROM users WHERE domainid='%s' AND enew!='0' ORDER BY email",
         $db->escapeSimple($_GET['did']));
 $result=&$db->query($sql);
@@ -237 +237 @@
         'email' =>$data['email'],
         'access' =>$data['access'],
+        'mb_size' =>$data['mb_size'],
         'autoresponder' => $autoresponder) );
 } //ENDE WHILE eMails

trunk/includes/sites/main.php

@@ -114 +114 @@
         $smarty->assign('full_name', $_SESSION['full_name']);
         $smarty->assign('email', $_SESSION['email']);
+        
+        if ($config['display_mb_size'] == 1) {
+        $sql=sprintf("SELECT mb_size FROM users WHERE id='%d'",
+                $db->escapeSimple($_SESSION['uid']));
+        $result=& $db->query($sql);
+        $row = $result->fetchrow(DB_FETCHMODE_ASSOC);
+        $smarty->assign('mb_size', $row['mb_size']);
+        }
+        
 }
 $smarty->assign('table_data', $table_data);

trunk/sql_upgrades

@@ -135 +135 @@
 ALTER TABLE `domains` ADD `p_autores_xheader` TINYINT( 1 ) NOT NULL DEFAULT '0';
 ALTER TABLE `users` ADD `p_autores_xheader` TINYINT( 1 ) NOT NULL DEFAULT '0';
-
+ALTER TABLE `users` ADD `mb_size` INT NOT NULL DEFAULT '0';

trunk/system_scripts/create_mailboxes.pl

@@ -20 +20 @@
 use DBI;
 use Config::General;
+use Proc::PID::File;
 
 my $conf = new Config::General("/etc/cpves/mail_config.conf");
@@ -31 +32 @@
 $config{'vmail_home'} = "/home/vmail" unless defined $config{'vmail_home'};
 $config{'vmail_safe'} = "/home/vmail_backup" unless defined $config{'vmail_safe'};
+$config{'vmail_user'} = "vmail" unless defined $config{'vmail_user'};
 
 if (! -d $config{'vmail_home'})
@@ -37 +39 @@
         exit(1);
 }
-
+chomp (my $user = `id -un`);
+die "Already running!" if Proc::PID::File->running('dir' => '/tmp/' );
+die ("Error: Please run $0 as mailbox owner!") unless ($user eq $config{'vmail_user'});
 
 my $dsn = "DBI:mysql:database=".$config{'db_name'}.";host=". $config{'db_host'};

trunk/system_scripts/create_mailfilters.pl

@@ -20 +20 @@
 use Fcntl;
 use Config::General;
+use Proc::PID::File;
 
 my $conf = new Config::General("/etc/cpves/mail_config.conf");
@@ -35 +36 @@
 $config{'sa_wb_listing'} = "/etc/mail-admin/sa_wb_listing.pl" unless defined $config{'sa_wb_listing'};
 $config{'reformail'} = "/usr/bin/reformail" unless defined $config{'reformail'};
+$config{'vmail_user'} = "vmail" unless defined $config{'vmail_user'};
 
 my $sa_wblist = sprintf("exception {\nif ( /^From:\\s*(.*)/ )\n{\nADDR=getaddr(\$MATCH1)\nWHITELIST=`%s DID EMAILID \$ADDR`\nif (\$WHITELIST eq 0)\n{\nxfilter \"%s -A'X-CpVES: Whitelist'\"\n}\n}\n}\n", $config{'sa_wb_listing'}, $config{'reformail'} );
@@ -43 +45 @@
         exit(1);
 }
-
+chomp (my $user = `id -un`);
+die "Already running!" if Proc::PID::File->running('dir' => '/tmp/' );
+die ("Error: Please run $0 as mailbox owner!") unless ($user eq $config{'vmail_user'});
 
 my $dsn = "DBI:mysql:database=".$config{'db_name'}.";host=". $config{'db_host'};

trunk/templates/domain_view.tpl

@@ -25 +25 @@
  <td style="width:300px;">{if $row.autoresponder eq "1"}<img src="img/icons/autoresponder.png" title="{t}vacation active!{/t}" />{/if}
  <a href="?module=email_view&#038;id={$row.id}&amp;did={$did}">{$row.email}</a></td>
+
+{if $display_mb_size == 1}
+<td style="width:250px;"> </td>
+<td style="text-align:left;width:50px;">{$row.mb_size} M</td>
+{else}
  <td style="width:300px;"> </td>
+{/if}
  <td style="text-align:right;vertical-align:middle;">
  {if $row.access == '1' }

trunk/templates/success_messages.tpl

@@ -15 +15 @@
 {elseif $if_email_data_saved == 'y'}
 {t}saved emailaddress.{/t}
-<meta http-equiv="refresh" content="1; URL=?module=domain_view&#038;did={$did}">
 {elseif $if_list_created == 'y'}
 Mailingliste wurde erfolgreich angelegt.

trunk/templates/user_index.tpl

@@ -17 +17 @@
 <br/><br/>
 {/if}
+{if  $display_mb_size == 1}
+{t 1=$mb_size}Your current mailbox size is %1 M.{/t}
+{/if}
+