Changeset 207 for branches/awmn/includes/pages/ranges/ranges_search.php

Timestamp:

10/03/2009 02:39:59 PM (3 years ago)

Author:

Acinonyx

Message:

[awmn] Fix undefined offset errors, replace correct_ip* functions with ip_to_ranges

File:

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

branches/awmn/includes/pages/ranges/ranges_search.php

@@ -43 +43 @@
                 $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 = $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 ($form_search_ranges->data[0]['value'] != '') {
+                        $where .= "(";
+                        $s_ranges = ip_to_ranges($form_search_ranges->data[0]['value']);
+                        foreach ($s_ranges as $s_range) {
+                                $where .= "(ip_ranges.ip_start BETWEEN ".ip2long($s_range['min'])." AND ".ip2long($s_range['max']).") OR ";
+                        }
+                        $where = substr($where, 0, -4).") AND ";
+                }
                 if ($where!='') $where = substr($where, 0, -5);
                 $table_ip_ranges->db_data(
@@ -79 +81 @@
                 $this->tpl['link_ranges_search'] = makelink(array("page" => "ranges", "subpage" => "search"));
                 $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']);
-                $this->tpl['form_search_ranges'] = $construct->form($form_search_ranges, __FILE__);
+                $this->tpl['form_search_ranges'] = $construct->form($this->form_search_ranges(), __FILE__);
                 $this->tpl['table_ranges'] = $construct->table($this->table_ip_ranges(), __FILE__);
                 return template($this->tpl, __FILE__);