Changeset 154 for trunk/includes/pages/ranges/ranges_search.php

Timestamp:

03/09/2006 08:07:26 AM (6 years ago)

Author:

cirrus

Message:

Add: google suggest-like search input. Closes #93
Add: show_map=no option to not display the map. Closes #47

File:

• trunk/includes/pages/ranges/ranges_search.php (modified) (2 diffs)

trunk/includes/pages/ranges/ranges_search.php

@@ -42 +42 @@
                 $where = $form_search_ranges->db_data_where(array('ip' => 'exclude'));
                 $table_ip_ranges = new table(array('TABLE_NAME' => 'table_ip_ranges', 'FORM_NAME' => 'table_ip_ranges'));
-                $s_ip = correct_ip($form_search_ranges->data[0]['value']);
-                $where = ($where !=''?"(".$where.") AND ":"").
-                                ($s_ip !=''?"ip_ranges.ip_start <= ".ip2long($s_ip)." AND ip_ranges.ip_end >= ".ip2long($s_ip)." AND ":"");
+                $s_ip = $form_search_ranges->data[0]['value'];
+                $where = ($where !=''?"(".$where.") AND ":"");
+                if ($s_ip !='') $where .= '(ip_ranges.ip_start >= '.ip2long(correct_ip_min($s_ip, TRUE, 1)).' AND ip_ranges.ip_start <= '.ip2long(correct_ip_max($s_ip, TRUE, 1)).") OR ".
+                                                '(ip_ranges.ip_start >= '.ip2long(correct_ip_min($s_ip, TRUE, 2)).' AND ip_ranges.ip_start <= '.ip2long(correct_ip_max($s_ip, TRUE, 2)).") OR ".
+                                                '(ip_ranges.ip_start >= '.ip2long(correct_ip_min($s_ip, TRUE, 3)).' AND ip_ranges.ip_start <= '.ip2long(correct_ip_max($s_ip, TRUE, 3)).") AND ";
+                //$where = 
+                //              ($s_ip !=''?"ip_ranges.ip_start <= ".ip2long($s_ip)." AND ip_ranges.ip_end >= ".ip2long($s_ip)." AND ":"");
                 if ($where!='') $where = substr($where, 0, -5);
                 $table_ip_ranges->db_data(
@@ -74 +78 @@
                 $this->tpl['link_ranges_allocation'] = makelink(array("page" => "ranges", "subpage" => "allocation"));
                 $form_search_ranges = $this->form_search_ranges();
-                if ($form_search_ranges->data[0]['value'] != '') $form_search_ranges->data[0]['value'] = correct_ip($form_search_ranges->data[0]['value']);
+                //if ($form_search_ranges->data[0]['value'] != '') $form_search_ranges->data[0]['value'] = correct_ip($form_search_ranges->data[0]['value']);
                 $this->tpl['form_search_ranges'] = $construct->form($form_search_ranges, __FILE__);
                 $this->tpl['table_ranges'] = $construct->table($this->table_ip_ranges(), __FILE__);