Skip to content

Refactor SQL query for country lookup by IP #1897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denphi wants to merge 1 commit into
base: 2.4-main
Choose a base branch
from
Open

Refactor SQL query for country lookup by IP #1897

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/libraries/Hubzero/Geocode/Geocode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,10 @@ public static function ipcountry($ip='')

// Convert the dotted quad IP address to long:
$n_ip = ip2long($ip);

$sql = "SELECT LOWER(countrySHORT) FROM ipcountry WHERE ipFROM <= " . $gdb->quote($n_ip) . " AND ipTO >= " . $gdb->quote($n_ip);
$sql = "SELECT LOWER(countrySHORT) FROM ipcountry"
. " INNER JOIN (SELECT MAX(ipFROM) AS start FROM ipcountry"
. " WHERE ipFROM <= " . $gdb->quote($n_ip) . ") s ON (ipFROM = s.start)"
. " WHERE ipTO >= " . $gdb->quote($n_ip);
$gdb->setQuery($sql);
$country = stripslashes($gdb->loadResult());
}
Expand Down