Changeset 245 for trunk/tools/dnszones-poller/dnszones-poller.php

Timestamp:

06/22/2011 08:18:46 PM (11 months ago)

Author:

sque

Message:

Merge branches/awmn 221:235
[awmn] Allow users to delete zones and nameservers without making a request to hostmaster
[awmn] Untaint sprintf
[awmn] Don't change to php script dir
[awmn] Add support to dump list of stealth nameservers
[awmn] Add active peers search fields to hostmaster's ranges page
[awmn] Redirect errors to stderr
[awmn] Don't explicitly set owner to 'N' (#146)
[awmn] Restrict ip ranges to valid b-classes (0-255)
[awmn] Escape HTML special characters
[awmn] Use appropriate entities for < and > HTML special characters
[awmn] Add missing 'alt' attribute for 'img' element
[awmn] Close 'td' and 'tr' elements properly
[awmn] Escape HTML special characters in services URLs
[awmn] Remove end of line carriage returns

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/dnszones-poller/dnszones-poller.php (modified) (3 diffs)

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

@@ -31 +31 @@
         
         ## NAMESERVERS
-        $query = "SELECT dns_nameservers.name AS ns_num, nodes.name_ns AS name_ns
+        $query = "SELECT dns_nameservers.name AS ns_num, dns_nameservers.ip AS ns_ip, nodes.name_ns AS name_ns
                           FROM dns_nameservers
                           INNER JOIN nodes ON nodes.id = dns_nameservers.node_id
@@ -38 +38 @@
         $q = mysql_query($query, $mysql_link);
         while ($ret = mysql_fetch_assoc($q)) {
-                $replace['NAMESERVERS'] .= " NS ".$ret['ns_num'].".".$ret['name_ns'].$conf['ns_domain']."\n";
+                $replace['NAMESERVERS'] .= $conf['notify']?
+                        long2ip($ret['ns_ip']).";\n":
+                        " NS ".$ret['ns_num'].".".$ret['name_ns'].$conf['ns_domain']."\n";
         }
         
@@ -96 +98 @@
         echo mysql_error();
         while ($ret = mysql_fetch_assoc($q)) {
-                $replace['ZONES'] .= $ret['zone_name']." NS ".$ret['ns_num'].".".$ret['name_ns'].$conf['ns_domain']."\n";
+                $replace['ZONES'] .= $ret['zone_name'].". NS ".$ret['ns_num'].".".$ret['name_ns'].$conf['ns_domain']."\n";
         }