Changeset 1286

Timestamp:

07/21/08 11:18:05 (4 months ago)

Author:

scitech

Message:

Fixed #1434: rootkit.log.php. Fixed: Subdomains and aliases emails were not removed when reseller/admin remove parent domain

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/ispcp-rqst-mngr (modified) (2 diffs)
• trunk/gui/admin/rootkit_log.php (modified) (1 diff)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-07-21 Daniel Andreca
+        - GUI:
+                * Fixed #1434: rootkit.log.php
+        - ENGINE:
+                * Subdomains and aliases emails were not removed when reseller/admin remove parent domain
-
-2008-07-20 Daniel Andreca

trunk/engine/ispcp-rqst-mngr

@@ -184 +184 @@
-    }
-
+    $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'ordered' order by mail_id";
+
+    ($rs, $rdata) = doSQL($sql);
+
+    my $mail_count = @$rdata;
+
+    if ($mail_count > 0) {
+
+        foreach (@$rdata) {
+
+            my $row = $_;
+
+            my ($mail_id, $mail_acc, $mail_status) = (@$row[0], @$row[1], @$row[2]);
+
+            if ($mail_status eq "toadd" || $mail_status eq "change" || $mail_status eq "delete") {
+
+                if (defined($main::engine_debug)) {
+
+                    push_el(\@main::el, 'mngr_engine()', "processing $mail_id, $mail_acc, $mail_status.");
+
+                }
+
+            }
+
+            $rs = sys_command("$main::ispcp_mbox_mngr $mail_id 1>>$main::ispcp_mbox_mngr_stdout 2>>$main::ispcp_mbox_mngr_stderr");
+
+            if ($rs != 0) {
+
+                if (-e $main::ispcp_mbox_mngr_el) {
+
+                    my $rs1 = undef;
+
+                    pop_el(\@main::el); # removing 'sys_command()' error message;
+
+                    ($rs1, $rdata) = get_el_error($main::ispcp_mbox_mngr_el);
+
+                    return $rs1 if ($rs1 != 0);
+
+                    push_el(\@main::el, $main::ispcp_mbox_mngr, $rdata);
+
+                }
+
+                if (!defined($main::engine_debug)) {
+
+                    del_file($main::ispcp_mbox_mngr_stdout); del_file($main::ispcp_mbox_mngr_stderr);
+
+                }
+
+                return $rs;
+
+            }
+
+            if (!defined($main::engine_debug)) {
+
+                del_file($main::ispcp_mbox_mngr_stdout); del_file($main::ispcp_mbox_mngr_stderr);
+
+            }
+
+        }
+
+    }
+
-    $sql = "select subdomain_id, subdomain_name, subdomain_status from subdomain where subdomain_status != 'ok' order by subdomain_id";
-
@@ -302 +364 @@
-                }
-
-
-            }
-
-        }
-
-    }
-
-    $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'ordered' order by mail_id";
-
-    ($rs, $rdata) = doSQL($sql);
-
-    my $mail_count = @$rdata;
-
-    if ($mail_count > 0) {
-
-        foreach (@$rdata) {
-
-            my $row = $_;
-
-            my ($mail_id, $mail_acc, $mail_status) = (@$row[0], @$row[1], @$row[2]);
-
-            if ($mail_status eq "toadd" || $mail_status eq "change" || $mail_status eq "delete") {
-
-                if (defined($main::engine_debug)) {
-
-                    push_el(\@main::el, 'mngr_engine()', "processing $mail_id, $mail_acc, $mail_status.");
-
-                }
-
-            }
-
-            $rs = sys_command("$main::ispcp_mbox_mngr $mail_id 1>$main::ispcp_mbox_mngr_stdout 2>$main::ispcp_mbox_mngr_stderr");
-
-            if ($rs != 0) {
-
-                if (-e $main::ispcp_mbox_mngr_el) {
-
-                    my $rs1 = undef;
-
-                    pop_el(\@main::el); # removing 'sys_command()' error message;
-
-                    ($rs1, $rdata) = get_el_error($main::ispcp_mbox_mngr_el);
-
-                    return $rs1 if ($rs1 != 0);
-
-                    push_el(\@main::el, $main::ispcp_mbox_mngr, $rdata);
-
-                }
-
-                if (!defined($main::engine_debug)) {
-
-                    del_file($main::ispcp_mbox_mngr_stdout); del_file($main::ispcp_mbox_mngr_stderr);
-
-                }
-
-                return $rs;
-
-            }
-
-            if (!defined($main::engine_debug)) {
-
-                del_file($main::ispcp_mbox_mngr_stdout); del_file($main::ispcp_mbox_mngr_stderr);
-
-            }

trunk/gui/admin/rootkit_log.php

@@ -54 +54 @@
-        $contents = '';
-
-
+ && filesize($filename)>0
-                $handle = fopen($filename, 'r');
-