Changeset 131 for trunk

Timestamp:

01/10/2006 06:51:05 AM (6 years ago)

Author:

Winner

Message:

Add: Suffix top level domain name on dns zones forms.
Bug fix: Top level domain name is being duplicated at dns zones hostmaster form.
Fix: Popup balloon on google maps.

Location:

trunk

Files:

• includes/pages/hostmaster/hostmaster_dnszone.php (modified) (1 diff)
• includes/pages/mynodes/mynodes_dnszone.php (modified) (2 diffs)
• templates/basic/includes/pages/gmap/gmap_js.tpl (modified) (1 diff)
• templates/basic/includes/pages/gmap/gmap_pickup_js.tpl (modified) (1 diff)

trunk/includes/pages/hostmaster/hostmaster_dnszone.php

@@ -186 +186 @@
 
         function output_onpost_form_zone() {
-                global $construct, $main, $db;
+                global $construct, $main, $db, $vars;
+                if (substr($_POST['dns_zones__name'], -strlen($vars['dns']['root_zone'])-1) == ".".$vars['dns']['root_zone']) {
+                        $_POST['dns_zones__name'] = substr($_POST['dns_zones__name'], 0, -strlen($vars['dns']['root_zone'])-1);
+                }
                 $form_zone = $this->form_zone();
                 $ret = TRUE;

trunk/includes/pages/mynodes/mynodes_dnszone.php

@@ -47 +47 @@
                                 $form_zone->data[0]['value'] = $db->get('name_ns', 'nodes', "id = '".get('node')."'");
                                 $form_zone->data[0]['value'] = $form_zone->data[0]['value'][0]['name_ns'];
+                                $form_zone->data[0]['value'] .= ".".$vars['dns']['root_zone'];
                         }
                 }
@@ -63 +64 @@
 
         function output_onpost_form_zone() {
-                global $construct, $main, $db;
+                global $construct, $main, $db, $vars;
+                if (substr($_POST['dns_zones__name'], -strlen($vars['dns']['root_zone'])-1) == ".".$vars['dns']['root_zone']) {
+                        $_POST['dns_zones__name'] = substr($_POST['dns_zones__name'], 0, -strlen($vars['dns']['root_zone'])-1);
+                }
                 $form_zone = $this->form_zone();
                 $ret = TRUE;

trunk/templates/basic/includes/pages/gmap/gmap_js.tpl

@@ -265 +265 @@
                         icon = icon_image[icon_scale];
                         icon_s = icon_image[0];
-                        var html = "<div style=\"white-space: nowrap; text-align:left; font-size:12px;font-weight:bold;\"><img src=\"" + icon_s.image + "\" alt=\"\" />" + node_name + " (#" + node_id + ")</div><br />" +
-                                                "<div style=\"white-space: nowrap; text-align:left; font-size:10px;\">" +
+                        var html = "<div style=\"padding-right: 15px; white-space: nowrap; text-align:left; font-size:12px;font-weight:bold;\"><img src=\"" + icon_s.image + "\" alt=\"\" />" + node_name + " (#" + node_id + ")</div><br />" +
+                                                "<div style=\"padding-right: 15px; white-space: nowrap; text-align:left; font-size:10px;\">" +
                                                 node_area + "<br />" +
                                                 "{/literal}{$lang.links}{literal}: " + (parseInt(node_p2p) + parseInt(node_client_on_ap)) + " (+" + node_aps + " {/literal}{$lang.aps}{literal})" + "<br />" +

trunk/templates/basic/includes/pages/gmap/gmap_pickup_js.tpl

@@ -48 +48 @@
             marker = new GMarker(point);
             marker_point = point;
-                var html = '<div align="left">{/literal}{$lang.db.nodes__latitude}{literal}: ' + (Math.round(marker_point.y * 100000)/100000) + '<br />' + '{/literal}{$lang.db.nodes__longitude}{literal}: ' + (Math.round(marker_point.x * 100000)/100000) + '<br /><br />' + '<a href="" onclick="window.opener.pickup_value(window.opener.document.{/literal}{$object_lat|escape:"quotes"}{literal}, Math.round(marker_point.y * 100000) / 100000); window.opener.pickup_value(window.opener.document.{/literal}{$object_lon|escape:"quotes"}{literal}, Math.round(marker_point.x * 100000)/100000); window.close(); return false;">{/literal}{$lang.select_the_coordinates}{literal}</a></div>';
+                var html = '<div style="padding-right: 15px; white-space: nowrap; text-align:left; font-size:10px;">{/literal}{$lang.db.nodes__latitude}{literal}: ' + (Math.round(marker_point.y * 100000)/100000) + '<br />' + '{/literal}{$lang.db.nodes__longitude}{literal}: ' + (Math.round(marker_point.x * 100000)/100000) + '<br /><br />' + '<a href="" onclick="window.opener.pickup_value(window.opener.document.{/literal}{$object_lat|escape:"quotes"}{literal}, Math.round(marker_point.y * 100000) / 100000); window.opener.pickup_value(window.opener.document.{/literal}{$object_lon|escape:"quotes"}{literal}, Math.round(marker_point.x * 100000)/100000); window.close(); return false;">{/literal}{$lang.select_the_coordinates}{literal}</a></div>';
             map.addOverlay(marker);
             marker.openInfoWindowHtml(html);