Changeset 2568

Timestamp:

01/31/10 19:36:45 (2 years ago)

Author:

benedikt

Message:

• Fixed #2086: DNS not working properly

Location:

trunk

Files:

• engine/ispcp-als-mngr (modified) (1 diff)
• engine/ispcp-alssub-mngr (modified) (1 diff)
• engine/ispcp-dmn-mngr (modified) (1 diff)
• engine/ispcp-rqst-mngr (modified) (4 diffs)
• engine/ispcp-sub-mngr (modified) (1 diff)
• gui/client/dns_edit.php (modified) (2 diffs)
• gui/include/ispcp-lib.php (modified) (1 diff)

trunk/engine/ispcp-als-mngr

@@ -3912 +3912 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
-
+        } elsif ($als_status eq 'dnschange'){
+                        # changing DNS
+                        $rs = als_change_named_data($entry);
+                        $timestamp = time();
+                        if ($rs == 0) {
+                                $sql = "update domain_aliasses set alias_status='ok' where alias_id = $als_id;";
+                        } else {
+                                my ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                                $msg =~ s/\'/\\\'/g;
+                                $sql = "update domain_aliasses set alias_status='$sub_name | $msg' where alias_id = $als_id;";
+                        }
+                        ($rs, $rdata) = doSQL($sql);
+                        return $rs if ($rs != 0);
         } elsif ($als_status eq 'delete') {
                 # Removing domains;

trunk/engine/ispcp-alssub-mngr

@@ -2804 +2804 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
-
+        } elsif ($sub_status eq 'dnschange') {    
+                $rs = alssub_change_named_data($entry);
+                $timestamp = time();
+                if ($rs == 0) {
+                        $sql = "update subdomain_alias set subdomain_alias_status='ok' where subdomain_alias_id = $sub_id;";
+                } else {
+                        my ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                        $msg =~ s/\'/\\\'/g;
+                        $sql = "update subdomain_alias set subdomain_alias_status='$sub_name | $msg' where subdomain_alias_id = $sub_id;";
+                }
+                ($rs, $rdata) = doSQL($sql);
+                return $rs if ($rs != 0);
         } elsif ($sub_status eq 'delete') {
 

trunk/engine/ispcp-dmn-mngr

@@ -4863 +4863 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
+        } elsif ($dmn_status eq 'dnschange'){
+                #modifiying DNS entry           
+                $rs = dmn_change_named_data($entry);
+                $timestamp = time();
+                if ($rs == 0) {
+                        $sql = "update domain set domain_status='ok' where domain_id = $dmn_id;";
+                } else {
+                        ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                        $msg =~ s/\'/\\\'/g;
+                        $sql = "update domain set domain_status='$sub_name | $msg' where domain_id = $dmn_id;";
+                }
+                ($rs, $rdata) = doSQL($sql);
+                return $rs if ($rs != 0);
         } elsif ($dmn_status eq 'delete') {
                 # Removing domains;

trunk/engine/ispcp-rqst-mngr

@@ -120 +120 @@
                                 $dmn_status eq "restore" ||
                                 $dmn_status eq "toenable" ||
-                                $dmn_status eq "todisable"
+                                $dmn_status eq "todisable" ||
+                                $dmn_status eq "dnschange"
                            ) {
 
@@ -176 +177 @@
         }
 
-        $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'ordered' order by mail_id";
+        $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'disabled' and status != 'ordered' order by mail_id";
 
         ($rs, $rdata) = doSQL($sql);
@@ -300 +301 @@
         }
 
-        $sql = "select alias_id, alias_name, alias_status from domain_aliasses where alias_status in ('toadd', 'change') order by alias_id";
+        $sql = "select alias_id, alias_name, alias_status from domain_aliasses where alias_status in ('toadd', 'change','dnschange') order by alias_id";
 
         ($rs, $rdata) = doSQL($sql);
@@ -371 +372 @@
                         my ($sub_id, $sub_name, $sub_status) = (@$row[0], @$row[1], @$row[2]);
 
-                        if ($sub_status eq "toadd" || $sub_status eq "change" || $sub_status eq "delete") {
+                        if ($sub_status eq "toadd" || $sub_status eq "change" || $sub_status eq "delete" || $sub_status eq "dnschange") {
 
                                 if (defined($main::engine_debug)) {

trunk/engine/ispcp-sub-mngr

@@ -2751 +2751 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
-
+                
+        } elsif ($sub_status eq 'dnschange'){
+                $rs = sub_change_named_data($entry);
+                $timestamp = time();
+                if ($rs == 0) {
+                        $sql = "update subdomain set subdomain_status='ok' where subdomain_id = $sub_id;";
+                } else {
+                        my ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                        $msg =~ s/\'/\\\'/g;
+                        $sql = "update subdomain set subdomain_status='$sub_name | $msg' where subdomain_id = $sub_id;";
+                }
+                ($rs, $rdata) = doSQL($sql);
+                return $rs if ($rs != 0);
         } elsif ($sub_status eq 'delete') {
 

trunk/gui/client/dns_edit.php

@@ -591 +591 @@
                                         `domain`.`domain_id` = ?
                         ";
-                        exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id));
+                        exec_query($sql, $query, array(Config::get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
                         $query = "
                                 UPDATE
@@ -600 +600 @@
                                 `subdomain`.`domain_id` = ?
                                 ";
-                        exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id));
+                        exec_query($sql, $query, array(Config::get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
                 } else {
                         $query = "

trunk/gui/include/ispcp-lib.php

@@ -91 +91 @@
 Config::set('ITEM_TODISABLED_STATUS', 'todisable');
 Config::set('ITEM_ORDERED_STATUS', 'ordered');
+Config::set('ITEM_DNSCHANGE_STATUS', 'dnschange');
 // SQL variables
 Config::set('MAX_SQL_DATABASE_LENGTH', 64);