Changeset 1231

Timestamp:

06/19/08 14:25:16 (2 months ago)

Author:

zothos

Message:

Fixed #1355 and Mail traffic accounting

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/traffic/ispcp-vrl-traff (modified) (4 diffs)
• trunk/gui/client/add_mail_acc.php (modified) (2 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-06-19 Jochen Manz
+        - GUI:
+                * Fixed #1355: You can't create a mail alias account if the user part already exists as a subdomain mail account
+        - ENGINE:
+                * Fixed Mail traffic accounting
-
-2008-06-17 Benedikt Heintel

trunk/engine/traffic/ispcp-vrl-traff

@@ -317 +317 @@
-        my $smtp_from_domain = undef;
-        my $smtp_to_domain = undef;
+        my ($query, $rows) = (undef, undef);
+        my $extra_size = undef;
+        my $recipient_address = undef;
+        my %forwarders_table;
-
-    ($rs, $rlog) = gen_log_file($main::cfg{'MAIL_TRAFF_LOG'}, $main::cfg{'TRAFF_LOG_DIR'}, $main::cfg{'LOG_DIR'});
@@ -341 +345 @@
-                if(exists  $main::cfg{'MAIL_LOG_INC_AMAVIS'} && $main::cfg{'MAIL_LOG_INC_AMAVIS'}) {
-                        # Logs including AMAVIS/SPAMASSASSIN/CLAMAV entries
-substr(\$3, index(\$3, \"@\")+1, length(\$3)),substr(\$4, index(\$4, \"@\")+1, length(\$4))
+\$3,\$4
-                } else {
-                        # Logs not including AMAVIS/SPAMASSASSIN/CLAMAV entries
-substr(\$3, index(\$3, \"@\")+1, length(\$3)),substr(\$4, index(\$4, \"@\")+1, length(\$4))
+\$3,\$4
-                }
-
@@ -362 +366 @@
-        }
-
+                #
+                # Build address forwarding recipients table
+                #
+                my $query = <<"SQLEND";
+                        SELECT
+                                concat( mail_acc, '\@', domain_name ) AS mail_from, domain_name, mail_forward
+                        FROM
+                                mail_users
+                        LEFT JOIN
+                                domain
+                        USING 
+                                ( domain_id )
+                        WHERE 
+                                mail_type LIKE '%normal_forward'
+                UNION
+                        SELECT 
+                                concat( mail_acc, '\@', subdomain_name, '.', domain_name ) AS mail_from, domain_name, mail_forward
+                        FROM 
+                                mail_users
+                        LEFT JOIN 
+                                domain
+                        USING
+                                ( domain_id )
+                        LEFT JOIN 
+                                subdomain
+                        USING
+                                ( domain_id )
+                        WHERE
+                                mail_type LIKE '%subdom_forward'
+                UNION
+                        SELECT 
+                                concat( mail_acc, '\@', alias_name ) AS mail_from, domain_name, mail_forward
+                        FROM 
+                                mail_users
+                        LEFT JOIN
+                                domain
+                        USING
+                                ( domain_id )
+                        LEFT JOIN
+                                domain_aliasses
+                        USING
+                                ( domain_id )
+                        WHERE 
+                                mail_type LIKE '%alias_forward'
+SQLEND
+                
+                ($rs, $rows) = doSQL($query);
+                return $rs if ($rs != 0);
+                foreach (@$rows) {
+                        $forwarders_table{@$_[0]} = (@$_[2] =~ tr/,//)+1;
+                }
+
-        while (<F>) {
-
-            my $line = $_;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-                                if($smtp_from_domain =~ /(.*)(\.)(.*\.)(.*)$/ && !exists $main::smtp_traffic{$smtp_from_domain}) {
@@ -379 +438 @@
-                                }
-
+                                # Add extra size to account forwardings
+                                if (exists($forwarders_table{$recipient_address})) {
+                                        $extra_size = $forwarders_table{$recipient_address} * $traffic_size;
+                                        $main::smtp_traffic{$smtp_to_domain} += $extra_size;
+                                        push_el(\@main::el, 'collect_mail_traffic()', $recipient_address . ' extra size: ' . $extra_size);
+                                }
+
-                if(exists $main::smtp_traffic{$smtp_from_domain}) {
-                        $main::smtp_traffic{$smtp_from_domain} += $traffic_size;
-
-
+
+
+
-                        $main::smtp_traffic{$smtp_to_domain} += $traffic_size;
+                                        push_el(\@main::el, 'collect_mail_traffic()', "Current traffic count for domain " . $smtp_to_domain . ':' . $main::smtp_traffic{$smtp_to_domain});
-                }
-

trunk/gui/client/add_mail_acc.php

@@ -310 +310 @@
-                        $mail_forward = implode(',', $mail_accs);
-                }
-
-
+
+
+
-
-                $check_acc_query = <<<SQL_QUERY
@@ -324 +325 @@
-                                AND
-                                `sub_id` = ?
+                                AND
+                                LEFT (`mail_type`, LOCATE('_', `mail_type`)-1) = ?
-SQL_QUERY;
-
-
+, $t_
-    }
-