Ticket #1196: engine.patch

engine/ispcp-mbox-mngr

@@ -30 +30 @@
-#    http://isp-control.net
-#
-
+
-use FindBin;
-use lib "$FindBin::Bin/";
-require 'ispcp_common_code.pl';
@@ -274 +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'};
-
@@ -299 +310 @@
-
-    my $transport_backup_cfg = "$backup_dir/transport.$timestamp";
-
-
-    ($rs, $sys) = get_file($aliases_cfg);
-
-    return $rs if ($rs != 0);
@@ -316 +326 @@
-
-    return $rs if ($rs != 0);
-
-
-    do {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-($rs, $working) = get_file($transport_working_cfg);
+if ($mail_type =~ /^normal_mail.*/) {
-
-return $rs if ($rs != 0)
+       $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-    $rs = store_file($transport_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644)
+       $hash_key = "$mail_acc\@$dmn_name"
-
-        return $rs if ($rs != 0)
+               $hash_value = "$mail_acc\@$dmn_name$mail_forward_list,$mail_acc\@ispcp-arpl.$dmn_name"
-
-} if ($mail_type eq 'normal_mail');
+    } elsif ($mail_type =~ /^alias_mail.*/) {
-
-do {
+           $dmn_name = $main::als_id_name{$mail_sub_id};
-
-my $dmn_name = $main::als_id_name{$mail_sub_id}
+       $hash_key = "$mail_acc\@$dmn_name"
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-                $rs = del_mta_hash_value($aliases_working_cfg, $hash_key);
-
@@ -401 +394 @@
-
-        return $rs if ($rs != 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    do {
-
-$dmn_name = $main::domain_id_name{$mail_dmn_id}
+($hash_key, $hash_value, $dmn_name) = (undef, undef, undef)
-
-my $hash_key = "$mail_acc\@$dmn_name";
+if ($mail_type =~ /.*normal_forward.*/) {
-
-my $hash_value = undef
+       $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-($rs, $rdata) = get_mta_hash_value($aliases_working_cfg, $hash_key)
+       $hash_key = "$mail_acc\@$dmn_name"
-
-return $rs if ($rs != 0)
+       $hash_value = undef
-
-if ($rdata eq ''
+} elsif ($mail_type =~ /.*alias_forward.*/
-
-    $hash_value = "$mail_acc\@$dmn_name,$mail_acc\@ispcp-arpl.$dmn_name"
+       $dmn_name = $main::als_id_name{$mail_sub_id}
-
-} else {
+       $hash_key = "$mail_acc\@$dmn_name";
-
-    $hash_value = $rdata.",$mail_acc\@ispcp-arpl.$dmn_name"
+       $hash_value = undef
-
-        }
-
-        $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);
@@ -556 +462 @@
-
-        return $rs if ($rs != 0);
-
-
+normal_forward' || $mail_type eq '
-
-    do {
-        my $sub_pref = $main::sub_id_name{$mail_sub_id};
@@ -768 +674 @@
-
-    my ($rs, $rdata) = (undef, undef);
-
+    my ($hash_key, $hash_value, $dmn_name) = (undef, undef, undef);
+
+
-    my $mail_id = @$mbox_data[0];
-
-    my $mail_acc = @$mbox_data[1];
@@ -827 +736 @@
-
-    do {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    return $rs
+       $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-}
+       $hash_key = "$mail_acc\@$dmn_name";
-
+                } elsif ($mail_type =~ /^alias_mail.*/) {
-
-($rs, $working) = get_file($transport_working_cfg)
+       $dmn_name = $main::als_id_name{$mail_sub_id}
-
-return $rs if ($rs != 0)
+       $hash_key = "$mail_acc\@$dmn_name"
-
-
+
-
-    return $rs if ($rs != 0)
+       my $sub_pref = $main::sub_id_name{$mail_sub_id}
-
-    } if ($mail_type eq 'normal_mail')
+               $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-do {
+           my $sub_name = "$sub_pref.$dmn_name";
-
-
+
+
+
-
-
+
-
-        $rs = del_mta_hash_value($aliases_working_cfg, $hash_key);
-
@@ -913 +799 @@
-
-        return $rs if ($rs != 0);
-
-eq 'alias_mail'
+=~ /^normal_mail.*/ || $mail_type =~ /^alias_mail.*/ || $mail_type =~ /^subdom_mail.*/
-
-    do {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-            return $rs
+               $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-
+
-
+        } elsif ($mail_type =~ /^alias_forward.*/) {
-
-        ($rs, $working) = get_file($transport_working_cfg)
+               $dmn_name = $main::als_id_name{$mail_sub_id}
-
-        return $rs if ($rs != 0)
+               $hash_key = "$mail_acc\@$dmn_name"
-
-
+
-
-        return $rs if ($rs != 0)
+               my $sub_pref = $main::sub_id_name{$mail_sub_id}
-
-    } if ($mail_type eq 'subdom_mail')
+               $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-
+
-
-        my $dmn_name = $main::domain_id_name{$mail_dmn_id}
+               $hash_key = "$mail_acc\@$sub_name"
-
-        my $hash_key = "$mail_acc\@$dmn_name"
+               $dmn_name = $sub_name
-
+            }
-
-        ($rs, $rdata) = get_mta_hash_value($aliases_working_cfg, $hash_key);
-
@@ -1019 +877 @@
-
-        return $rs if ($rs != 0);
-
-eq 'normal_forward'
+=~ /^normal_forward.*/ || $mail_type =~ /^alias_forward.*/ || $mail_type =~ /^subdom_forward.*/
-
-do {
+$rs = sys_command("$cmd_postmap $transport_cfg");
-
-    my $dmn_name = $main::als_id_name{$mail_sub_id}
+return $rs if ($rs != 0)
-
-        my $hash_key = "$mail_acc\@$dmn_name";
-
+    push_el(\@main::el, 'mbox_del_mta_cfg_autorespond_data()', 'Ending...');
-
-    ($rs, $rdata) = get_mta_hash_value($aliases_working_cfg, $hash_key)
+return 0
-
-
+
-
+sub mbox_add_mta_cfg_data {
-
-    if ($rdata ne '') {
+my ($mbox_data) = @_;
-
-        $rdata =~ s/\,$mail_acc\@ispcp-arpl\.$dmn_name//gi
+push_el(\@main::el, 'mbox_add_mta_cfg_data()', 'Starting...')
-
-        $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $rdata);
+if (!defined($mbox_data) || $mbox_data eq '') {
-
-    return $rs if ($rs != 0
+push_el(\@main::el, 'mbox_add_mta_cfg_data()', 'ERROR: Undefined Input Data...'
-
-}
+return -1;
-
+    }
-
-    ($rs, $working) = get_file($aliases_working_cfg
+my ($rs, $rdata) = (undef, undef
-
-        return $rs if ($rs != 0
+       my ($hash_key, $hash_value) = (undef, undef
-
-        $rs = store_file($aliases_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-    return $rs if ($rs != 0)
+my $mail_id = @$mbox_data[0]
-
+    my $mail_acc = @$mbox_data[1];
-
-    $rs = mbox_check_last_transport_entry($mbox_data)
+my $mail_forward = @$mbox_data[3]
-
-    if ($rs == 0) {
+my $mail_dmn_id = @$mbox_data[4];
-
-        $rs = mbox_del_last_transport_entry($mbox_data)
+my $mail_type = @$mbox_data[5]
-
-        return $rs if ($rs != 0)
+my $mail_sub_id = @$mbox_data[6]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-    my $conf_dir = $main::cfg{'CONF_DIR'};
@@ -1230 +971 @@
-
-    do {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-return $rs if ($rs != 0)
+       my $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-if ($mail_autorespond ne '_no_') {
+       $hash_key = "$mail_acc\@$dmn_name";
-
-    $rs = mbox_add_mta_cfg_autorespond_data($mbox_data)
+       $hash_value = "$dmn_name/$mail_acc/"
-
-    return $rs if ($rs != 0);
+} elsif ($mail_type =~ /^alias_mail.*/) {
-
-
+
-
-            $rs = mbox_del_mta_cfg_autorespond_data($mbox_data)
+               $hash_key = "$mail_acc\@$dmn_name"
-
-            return $rs if ($rs != 0)
+               $hash_value = "$dmn_name/$mail_acc/"
-
-        $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_key);
+       } elsif ($mail_type =~ /^subdom_mail.*/) {
-
-           return $rs if ($rs != 0)
+               my $sub_pref = $main::sub_id_name{$mail_sub_id}
-
-               ($rs, $working) = get_file($aliases_working_cfg)
+               my $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-return $rs if ($rs != 0)
+my $sub_name = "$sub_pref.$dmn_name"
-
-           $rs = store_file($aliases_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644
+               push_el(\@main::el, 'mbox_add_mta_cfg_data()', "dbg: sub_pref: $sub_pref, dmn_name: $dmn_name, sub_name: $sub_name"
-
-               return $rs if ($rs != 0)
+               $hash_key = "$mail_acc\@$sub_name"
-
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-        $rs = set_mta_hash_value($mailboxes_working_cfg, $hash_key, $hash_value);
-
@@ -1296 +1015 @@
-
-        return $rs if ($rs != 0);
-
-ne '_no_'
+!= 0
-
-            $rs = mbox_add_mta_cfg_autorespond_data($mbox_data);
-
@@ -1308 +1027 @@
-
-            return $rs if ($rs != 0);
-
-$rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_key);
+if ($mail_type =~ /.*forward.*/) {
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-               ($rs, $working) = get_file($aliases_working_cfg
+               $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_value
-
-                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);
-
-        }
-
-    } if ($mail_type eq 'alias_mail');
-
-    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";
-
-        push_el(\@main::el, 'mbox_add_mta_cfg_data()', "dbg: sub_pref: $sub_pref, dmn_name: $dmn_name, sub_name: $sub_name");
-
-        my $hash_key = "$mail_acc\@$sub_name";
-
-        my $hash_value = "$sub_name/$mail_acc/";
-
-        $rs = set_mta_hash_value($mailboxes_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-        ($rs, $working) = get_file($mailboxes_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($mailboxes_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-        if ($mail_autorespond ne '_no_') {
-
-            $rs = mbox_add_mta_cfg_autorespond_data($mbox_data);
-
-            return $rs if ($rs != 0);
-
-        } else {
-
-            $rs = mbox_del_mta_cfg_autorespond_data($mbox_data);
-
-            return $rs if ($rs != 0);
-
-                $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_key);
-
-            return $rs if ($rs != 0);
-
-               
+               
-
-                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);
-
-        }
-
-    } if ($mail_type eq 'subdom_mail');
-
-    do {
-
-        my $dmn_name = $main::domain_id_name{$mail_dmn_id};
-
-        my $hash_key = "$mail_acc\@$dmn_name";
-
-        my $hash_value = "$dmn_name/$mail_acc/";
-
-        $rs = set_mta_hash_value($mailboxes_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
-
-        ($rs, $working) = get_file($mailboxes_working_cfg);
-
-        return $rs if ($rs != 0);
-
-        $rs = store_file($mailboxes_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644);
-
-        return $rs if ($rs != 0);
-
-        $hash_value = '';
-
-        $mail_forward = "$mail_forward\n";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+                return $rs if ($rs != 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-    do {
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+                $hash_key = "$mail_acc\@$dmn_name";
-
-($rs, $working) = get_file($aliases_working_cfg)
+       $hash_value = "$dmn_name/$mail_acc/"
-
-
+
-
+                my $dmn_name = $main::als_id_name{$mail_sub_id};
-
-    $rs = store_file($aliases_cfg, $working, $main::cfg{'ROOT_USER'}, $main::cfg{'ROOT_GROUP'}, 0644)
+       $hash_key = "$mail_acc\@$dmn_name"
-
-return $rs if ($rs != 0)
+       $hash_value = "$dmn_name/$mail_acc/"
-
-if ($mail_autorespond ne '_no_'
+} elsif ($mail_type =~ /.*subdom_forward.*/
-
-    $rs = mbox_add_mta_cfg_autorespond_data($mbox_data)
+       my $sub_pref = $main::sub_id_name{$mail_sub_id}
-
-            return $rs if ($rs != 0)
+               my $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-
+
-
-            $rs = mbox_del_mta_cfg_autorespond_data($mbox_data)
+               $hash_key = "$mail_acc\@$sub_name"
-
-            return $rs if ($rs != 0)
+               $hash_value = "$sub_name/$mail_acc/"
-
-        }
-
-    } 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 = "$sub_name/$mail_acc/";
-
-        $rs = set_mta_hash_value($mailboxes_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
@@ -1581 +1128 @@
-
-        }
-
-        #$hash_value = "$mail_acc\@$sub_name,".$hash_value;
-
-        $rs = set_mta_hash_value($aliases_working_cfg, $hash_key, $hash_value);
-
-        return $rs if ($rs != 0);
@@ -1597 +1142 @@
-
-        return $rs if ($rs != 0);
-
-_no_
+0
-
-            $rs = mbox_add_mta_cfg_autorespond_data($mbox_data);
-
@@ -1611 +1156 @@
-
-        }
-
-
+normal_forward' || $mail_type eq 'alias_forward' || $mail_type eq '
-
-    do {
-
@@ -1623 +1168 @@
-
-
-        # Let's first remove old catchall accounts (if any);
-
-
-        $rs = del_mta_hash_value($aliases_working_cfg, $hash_key);
-
-        return $rs if ($rs != 0);
@@ -1651 +1194 @@
-
-        return $rs if ($rs != 0);
-
-eq 'normal_catchall'
+=~ /.*normal_catchall.*/
-
-    do {
-
@@ -1663 +1206 @@
-
-
-        # Let's first remove old catchall accounts (if any);
-
-
-        $rs = del_mta_hash_value($aliases_working_cfg, $hash_key);
-
-        return $rs if ($rs != 0);
@@ -1691 +1232 @@
-
-        return $rs if ($rs != 0);
-
-eq 'alias_catchall'
+=~ /.*alias_catchall.*/
-
-    do { # add subdom_catchall
-
@@ -1733 +1274 @@
-
-        return $rs if ($rs != 0);
-
-eq 'subdom_catchall'
+=~ /.*subdom_catchall.*/
-
-    $rs = sys_command("$cmd_postmap $mailboxes_cfg");
-
@@ -1765 +1306 @@
-
-    my ($rs, $rdata) = (undef, undef);
-
+    my ($hash_key, $hash_value) = (undef, undef);
-
-    my $mail_id = @$mbox_data[0];
-
@@ -1796 +1338 @@
-
-    my ($sys, $working) = (undef, undef);
-
-gf
+fg
-
-    my $mailboxes_working_cfg = "$working_dir/mailboxes";
-
@@ -1828 +1370 @@
-
-    do {
-
-my $dmn_name = $main::domain_id_name{$mail_dmn_id};
+if ($mail_type =~ /^normal_mail.*/) {
-
-my $hash_key = "$mail_acc\@$dmn_name"
+       my $dmn_name = $main::domain_id_name{$mail_dmn_id}
-
-$rs = del_mta_hash_value($mailboxes_working_cfg, $hash_key)
+       $hash_key = "$mail_acc\@$dmn_name"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-