Browse files

Arg .. so much for quick hacks ... this code is so messy it's

a hassle to hack ... going back to the way it was originally, with
just a more informative error message instead.
  • Loading branch information...
1 parent 0bdce31 commit bc0750aaaec4a91245e161295471a74d44622038 moodler committed Oct 9, 2002
Showing with 10 additions and 8 deletions.
  1. +10 −8 lib/ipatlas/plot.inc
View
18 lib/ipatlas/plot.inc
@@ -48,13 +48,11 @@ function s10_rfc_1918_ip($in) {
function stuffanalyze($stuff) {
-$badstuff = array("bad", "bad", "bad", "bad", "bad");
-
-$stuff2[0] = array_values(preg_grep ("/CITY:/", $stuff)) or return $badstuff;
-$stuff2[1] = array_values(preg_grep ("/STATE:/", $stuff)) or return $badstuff;
-$stuff2[2] = array_values(preg_grep ("/COUNTRY:/", $stuff)) or return $badstuff;
-$stuff2[3] = array_values(preg_grep ("/LAT:/", $stuff)) or return $badstuff;
-$stuff2[4] = array_values(preg_grep ("/LONG:/", $stuff)) or return $badstuff;
+$stuff2[0] = array_values(preg_grep ("/CITY:/", $stuff)) or die("Sorry, but the lookup for this IP address failed! (CITY)");
+$stuff2[1] = array_values(preg_grep ("/STATE:/", $stuff)) or die("Sorry, but the lookup for this IP address failed! (STATE)");
+$stuff2[2] = array_values(preg_grep ("/COUNTRY:/", $stuff)) or die("Sorry, but the lookup for this IP address failed! (COUNTRY)");
+$stuff2[3] = array_values(preg_grep ("/LAT:/", $stuff)) or die("Sorry, but the lookup for this IP address failed! (LAT)");
+$stuff2[4] = array_values(preg_grep ("/LONG:/", $stuff)) or die("Sorry, but the lookup for this IP address failed! (LONG)");
// all the stuff2 values are actually arrays, making the following code look like crap
@@ -70,10 +68,14 @@ for ($count = 0; $count < count($stuff2); $count++) {
} else {
// if no data was found
- return $badstuff;
+ $stuff2 = array("bad", "bad", "bad", "bad", "bad");
}
+$count = 0;
+
+ return $stuff2;
+
}
function getlatdata($ip) {

0 comments on commit bc0750a

Please sign in to comment.