Changeset 1124

Timestamp:

04/24/2008 11:21:18 AM (2 months ago)

Author:

rats

Message:

Fixed #1148: DNS serial is not updated more than once a day when changing sub domains
Fixed #1196: New mail account/forward and auto responder handling

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/ispcp-mbox-mngr (modified) (30 diffs)
• trunk/engine/ispcp-sub-mngr (modified) (1 diff)
• trunk/engine/messager/ispcp-arpl-msgr (modified) (3 diffs)
• trunk/gui/client/add_mail_acc.php (modified) (4 diffs)
• trunk/gui/client/delete_mail_acc.php (modified) (2 diffs)
• trunk/gui/client/disable_mail_arsp.php (modified) (2 diffs)
• trunk/gui/client/edit_mail_acc.php (modified) (8 diffs)
• trunk/gui/client/edit_mail_arsp.php (modified) (3 diffs)
• trunk/gui/client/email_accounts.php (modified) (7 diffs)
• trunk/gui/client/enable_mail_arsp.php (modified) (2 diffs)
• trunk/gui/include/database-update-functions.php (modified) (1 diff)
• trunk/gui/themes/omega_original/client/add_mail_acc.tpl (modified) (3 diffs)
• trunk/language-files/pl_PL.po (modified) (136 diffs)
• trunk/language-files/polish/polish (modified) (64 diffs)

trunk/CHANGELOG

@@ -2 +2 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+2008-04-24 Benedikt Heintel
+        - GUI:
+                * Fixed #1196: New mail account/forward and auto responder handling
+        - ENGINE:
+                * Fixed #1148: DNS serial is not updated more than once a day when changing sub domains
+                * Fixed #1196: New mail account/forward and auto responder handling
+
-2008-04-14 Jochen Manz
-        - CONFIGS:
-    
+
-        - SETUP:
-                * Fixed #1204: wrong configs-Path in Makefile.ubuntu (Install doesn't work)

trunk/engine/ispcp-mbox-mngr

@@ -275 +275 @@
-    my $mail_autorespond = @$mbox_data[8];
-
+        my $mail_forward_list = undef;
+
+        # create a mail forward list
+
+    if ($mail_forward ne '_no_') {
+
+        $mail_forward_list = ',' . $mail_forward;
+
+    }
+
-
-    my $conf_dir = $main::cfg{'CONF_DIR'};
@@ -300 +310 @@
-    my $transport_backup_cfg = "$backup_dir/transport.$timestamp";
-
-
-    ($rs, $sys) = get_file($aliases_cfg);
-
@@ -317 +326 @@
-    return $rs if ($rs != 0);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        my $dmn_name = $main::domain_id_name{$mail_dmn_id};
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_value);
@@ -334 +493 @@
-        return $rs if ($rs != 0);
-
+
-        ($rs, $working) = get_file($aliases_working_cfg);
-
@@ -343 +503 @@
-
-
-dmn
+sub
-
-        $hash_value = "ispcp-arpl:";
@@ -359 +519 @@
-        return $rs if ($rs != 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        ($rs, $working) = get_file($aliases_working_cfg);
@@ -386 +776 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        ($rs, $working) = get_file($transport_working_cfg);
@@ -402 +799 @@
-        return $rs if ($rs != 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        ($rs, $working) = get_file($aliases_working_cfg);
@@ -433 +854 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        ($rs, $working) = get_file($transport_working_cfg);
@@ -449 +877 @@
-        return $rs if ($rs != 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        } else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        }
-
-        $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-
-        ($rs, $working) = get_file($aliases_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($aliases_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-
-        $hash_key = "ispcp-arpl.$dmn_name";
-
-        $hash_value = "ispcp-arpl:";
-
-        $rs = set_mta_hash_value($transport_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-        ($rs, $working) = get_file($transport_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($transport_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-    } if ($mail_type eq 'normal_forward');
-
-    do {
-
-        my $dmn_name = $main::als_id_name{$mail_sub_id};
-
-        my $hash_key = "$mail_acc\@$dmn_name";
-
-        my $hash_value = undef;
-
-        ($rs, $rdata) = get_mta_hash_value($aliases_working_cfg, $hash_key);
-
-        return $rs if ($rs != 0);
-
-        if ($rdata eq '') {
-
-            $hash_value = "$mail_acc\@$dmn_name,$mail_acc\@ispcp-arpl.$dmn_name";
-
-        } else {
-
-            $hash_value = $rdata.",$mail_acc\@ispcp-arpl.$dmn_name";
-
-        }
-
-        $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-
-        ($rs, $working) = get_file($aliases_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($aliases_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-
-        $hash_key = "ispcp-arpl.$dmn_name";
-
-        $hash_value = "ispcp-arpl:";
-
-        $rs = set_mta_hash_value($transport_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-        ($rs, $working) = get_file($transport_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($transport_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-    } if ($mail_type eq 'alias_forward');
-
-    do {
-        my $sub_pref = $main::sub_id_name{$mail_sub_id};
-
-        my $dmn_name = $main::domain_id_name{$mail_dmn_id};
-
-        my $sub_name = "$sub_pref.$dmn_name";
-
-        my $hash_key = "$mail_acc\@$sub_name";
-
-        my $hash_value = undef;
-
-        ($rs, $rdata) = get_mta_hash_value($aliases_working_cfg, $hash_key);
-
-        return $rs if ($rs != 0);
-
-        if ($rdata eq '') {
-
-            $hash_value = "$mail_acc\@$sub_name,$mail_acc\@ispcp-arpl.$sub_name";
-
-        } else {
-
-            $hash_value = $rdata.",$mail_acc\@ispcp-arpl.$sub_name";
-
-        }
-
-        $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-
-        ($rs, $working) = get_file($aliases_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($aliases_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-
-        $hash_key = "ispcp-arpl.$sub_name";
-
-        $hash_value = "ispcp-arpl:";
-
-        $rs = set_mta_hash_value($transport_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-        ($rs, $working) = get_file($transport_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($transport_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-    } if ($mail_type eq 'subdom_forward');
-
-    $rs = sys_command("$cmd_postmap $transport_cfg");
-
-    return $rs if ($rs != 0);
-
-    push_el(\@main::el, 'mbox_add_mta_cfg_autorespond_data()', 'Ending...');
-
-    return 0;
-
-}
-
-sub mbox_check_last_transport_entry {
-
-    my ($mbox_data) = @_;
-
-    push_el(\@main::el, 'mbox_check_last_transport_entry()', 'Starting...');
-
-    if (!defined($mbox_data) || $mbox_data eq '') {
-
-        push_el(\@main::el, 'mbox_check_last_transport_entry()', 'ERROR: Undefined Input Data...');
-
-        return -1;
-
-    }
-
-    my ($rs, $rows, $sql) = (undef, undef, undef);
-
-    my $mail_dmn_id = @$mbox_data[4];
-
-    my $mail_sub_id = @$mbox_data[6];
-
-    my $mail_type = @$mbox_data[5];
-
-    if ($mail_type eq 'alias_mail' || $mail_type eq 'alias_forward') {
-
-        $sql = "select count(mail_id) as cnt from mail_users where (status = 'ok' or status = 'change') and mail_auto_respond != '_no_' and domain_id = $mail_dmn_id and sub_id = $mail_sub_id and mail_type != 'normal_catchall' and mail_type != 'alias_catchall';";
-
-    } else {
-
-        $sql = "select count(mail_id) as cnt from mail_users where (status = 'ok' or status = 'change') and mail_auto_respond != '_no_' and domain_id = $mail_dmn_id and mail_type != 'normal_catchall' and mail_type != 'alias_catchall';";
-
-    }
-
-    ($rs, $rows) = doSQL($sql);
-
-    return $rs if ($rs != 0);
-
-    $rs = @$rows[0];
-
-    push_el(\@main::el, 'mbox_check_last_transport_entry()', 'Ending...');
-
-    return @$rs[0];
-
-}
-
-sub mbox_del_last_transport_entry {
-
-    my ($mbox_data) = @_;
-
-    push_el(\@main::el, 'mbox_del_last_transport_entry()', 'Starting...');
-
-    if (!defined($mbox_data) || $mbox_data eq '') {
-
-        push_el(\@main::el, 'mbox_del_last_transport_entry()', 'ERROR: Undefined Input Data...');
-
-        return -1;
-
-    }
-
-    my ($rs, $rdata) = (undef, undef);
-
-
-    my $mail_dmn_id = @$mbox_data[4];
-
-    my $mail_sub_id = @$mbox_data[6];
-
-    my $mail_type = @$mbox_data[5];
-
-    my $dmn_name = $main::domain_id_name{$mail_dmn_id};
-
-
-    my $conf_dir = $main::cfg{'CONF_DIR'};
-
-    my $working_dir = "$conf_dir/postfix/working";
-
-    my $transport_working_cfg = "$working_dir/transport";
-
-
-    my $hash_key = "ispcp-arpl.$dmn_name";
-
-    if ($mail_type eq 'alias_mail' || $mail_type eq 'alias_forward') {
-
-        my $als_name = $main::als_id_name{$mail_sub_id};
-
-        $hash_key = "ispcp-arpl.$als_name";
-
-    }
-
-
-    $rs = del_mta_hash_value($transport_working_cfg, $hash_key);
-
-    return $rs if ($rs != 0);
-
-
-    if ($mail_type ne 'alias_mail' && $mail_type ne 'alias_forward') {
-
-        my ($sub_key, $sub_value) = (undef, undef);
-
-        foreach $sub_key (keys %main::sub_id_parentid) {
-
-            $sub_value = $main::sub_id_parentid{$sub_key};
-
-            if ($sub_value == $mail_dmn_id) {
-
-                # We've got one ;). It must be removed;
-
-                my $sub_pref = $main::sub_id_name{$sub_key};
-
-                my $sub_name = "$sub_pref.$dmn_name";
-
-                $hash_key = "ispcp-arpl.$sub_name";
-
-                $rs = del_mta_hash_value($transport_working_cfg, $hash_key);
-
-                return $rs if ($rs != 0);
-
-            }
-
-        }
-
-    }
-
-    push_el(\@main::el, 'mbox_del_last_transport_entry()', 'Ending...');
-
-    return 0;
-
-}
-
-sub mbox_del_mta_cfg_autorespond_data {
-
-    my ($mbox_data) = @_;
-
-    push_el(\@main::el, 'mbox_del_mta_cfg_autorespond_data()', 'Starting...');
-
-    if (!defined($mbox_data) || $mbox_data eq '') {
-
-        push_el(\@main::el, 'mbox_del_mta_cfg_autorespond_data()', 'ERROR: Undefined Input Data...');
-
-        return -1;
-
-    }
-
-    my ($rs, $rdata) = (undef, undef);
-
-    my $mail_id = @$mbox_data[0];
-
-    my $mail_acc = @$mbox_data[1];
-
-    my $mail_forward = @$mbox_data[3];
-
-    my $mail_dmn_id = @$mbox_data[4];
-
-    my $mail_type = @$mbox_data[5];
-
-    my $mail_sub_id = @$mbox_data[6];
-
-    my $mail_autorespond = @$mbox_data[8];
-
-
-    my $conf_dir = $main::cfg{'CONF_DIR'};
-
-    my $cmd_postmap = $main::cfg{'CMD_POSTMAP'};
-
-    my $working_dir = "$conf_dir/pos