Changeset 207 for branches/awmn/includes/pages/search/search_suggest.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/search/search_suggest.php (modified) (2 diffs)

branches/awmn/includes/pages/search/search_suggest.php

@@ -4 +4 @@
 *
 * Copyright (C) 2006 John Kolovos <cirrus@awmn.net>
+* Copyright (C) 2009 Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -56 +57 @@
                         }
                 } elseif (is_ip($q, FALSE)) {
-                        $where = '(ip_ranges.ip_start >= '.ip2long(correct_ip_min($q, TRUE, 1)).' AND ip_ranges.ip_start <= '.ip2long(correct_ip_max($q, TRUE, 1)).") OR ".
-                                                '(ip_ranges.ip_start >= '.ip2long(correct_ip_min($q, TRUE, 2)).' AND ip_ranges.ip_start <= '.ip2long(correct_ip_max($q, TRUE, 2)).") OR ".
-                                                '(ip_ranges.ip_start >= '.ip2long(correct_ip_min($q, TRUE, 3)).' AND ip_ranges.ip_start <= '.ip2long(correct_ip_max($q, TRUE, 3)).")";
+                        $where = "(";
+                        $s_ranges = ip_to_ranges($q,FALSE);
+                        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).")";
                         $this->tpl['ip_search'] = $db->get(
                                                                                 'ip_ranges.ip_start, nodes.id',