Changeset 149

Timestamp:

03/01/2006 04:59:17 AM (6 years ago)

Author:

Winner

Message:

Fix: DNS zone nameservers ordering on dns zones form update.
Fix: DNS zone nameservers ordering on dns poller tool.

Location:

trunk

Files:

• includes/pages/mynodes/mynodes_dnszone.php (modified) (1 diff)
• tools/dnszones-poller/dnszones-poller.php (modified) (2 diffs)

trunk/includes/pages/mynodes/mynodes_dnszone.php

@@ -51 +51 @@
                 }
 
-                $form_zone->db_data_pickup("dns_zones_nameservers.nameserver_id", "dns_nameservers", $db->get('dns_nameservers.id AS value, CONCAT(dns_nameservers.name, ".", nodes.name_ns, ".", "'.$vars['dns']['ns_zone'].'") AS output', "dns_zones_nameservers, dns_nameservers, nodes", "dns_nameservers.node_id = nodes.id AND dns_nameservers.id = dns_zones_nameservers.nameserver_id AND dns_zones_nameservers.zone_id = '".get('zone')."'"), TRUE);
+                $form_zone->db_data_pickup(
+                                        "dns_zones_nameservers.nameserver_id",
+                                        "dns_nameservers",
+                                        $db->get('dns_nameservers.id AS value, ' .
+                                                        'CONCAT(dns_nameservers.name, ".", nodes.name_ns, ".", "'.$vars['dns']['ns_zone'].'") AS output', 
+                                                        "dns_zones_nameservers, dns_nameservers, nodes", 
+                                                        "dns_nameservers.node_id = nodes.id AND dns_nameservers.id = dns_zones_nameservers.nameserver_id AND dns_zones_nameservers.zone_id = '".get('zone')."'",
+                                                        "",
+                                                        "dns_zones_nameservers.id ASC")
+                                        , TRUE);
                 return $form_zone;
         }

trunk/tools/dnszones-poller/dnszones-poller.php

@@ -48 +48 @@
                           INNER JOIN nodes ON dns_nameservers.node_id = nodes.id
                           WHERE dns_nameservers.status = 'active' AND dns_zones.type = 'forward' AND dns_zones.status = 'active'
-                          ORDER BY dns_zones.name ASC";
+                          ORDER BY dns_zones.name ASC, dns_zones_nameservers.id ASC";
         $q = mysql_query($query, $mysql_link);
         echo mysql_error();
@@ -92 +92 @@
                           INNER JOIN nodes ON dns_nameservers.node_id = nodes.id
                           WHERE dns_nameservers.status = 'active' AND dns_zones.type = 'reverse' AND dns_zones.status = 'active'
-                          ORDER BY dns_zones.name ASC";
+                          ORDER BY dns_zones.name ASC, dns_zones_nameservers.id ASC";
         $q = mysql_query($query, $mysql_link);
         echo mysql_error();