diff options
| author | David Leadbeater | 2014-12-20 19:24:01 +0000 |
|---|---|---|
| committer | David Leadbeater | 2014-12-20 19:24:01 +0000 |
| commit | b2d3da3f73c00bf7a7e1dcd747358f34d35e6a1e (patch) | |
| tree | 6e35af6324509c3c14f999ef5b2a7251ec55db82 | |
| parent | 484d3ffda26556a2a8a2b75eb5d686bd97047109 (diff) | |
| parent | be44f72d3c04ebc933feb121d51b4556a441d36d (diff) | |
| download | scripts.irssi.org-b2d3da3f73c00bf7a7e1dcd747358f34d35e6a1e.tar.bz2 | |
Merge pull request #92 from tka1/gh-pages
Make localize.pl use utrace.de
| -rw-r--r-- | _data/scripts.yaml | 4 | ||||
| -rw-r--r-- | scripts/localize.pl | 21 |
2 files changed, 15 insertions, 10 deletions
diff --git a/_data/scripts.yaml b/_data/scripts.yaml index f40f798..56e3ec4 100644 --- a/_data/scripts.yaml +++ b/_data/scripts.yaml @@ -2180,12 +2180,12 @@ contact: "stefan@pico.ruhr.de" description: "Localizes users using traceroute, the localizer database or IP-Atlas" filename: "localize.pl" - modified: "2008-05-17 17:39:09" + modified: "2014-11-25 14:20:00" license: "GPLv2" modules: "LWP::UserAgent HTML::Entities Data::Dumper Socket" name: "localize" url: "" - version: "2003112301" + version: "2014112501" - authors: "Peder Stray" contact: "peder@ninja.no" diff --git a/scripts/localize.pl b/scripts/localize.pl index 8d00985..7aabe9f 100644 --- a/scripts/localize.pl +++ b/scripts/localize.pl @@ -52,11 +52,15 @@ # # 03.07.2002 # *switched to Data::Dumper +# +# 25.11.2014 +# Added utrace.de as a localizer +# http://www.utrace.de/ use strict; use vars qw($VERSION %IRSSI); -$VERSION = "2003112301"; +$VERSION = "2014112501"; %IRSSI = ( authors => "Stefan 'tommie' Tomanek", contact => "stefan\@pico.ruhr.de", @@ -186,16 +190,17 @@ $procs = 0; ); %ipdb = ( - d1localizer=>{ name=>'localizer', + # For utrace.de API documentation, see http://en.utrace.de/api.php + d1utrace=>{ name=>'utrace', active=>1, - url=>'http://jan.kneschke.de/projects/localizer/index.php?query=', - city=>'<tr><td><b>City<\/b><\/td><td>(.*?)<\/td>', - province=>'<tr><td><b>Province<\/b><\/td><td>(.*?)<\/td><td>', - country=>'<tr><td><b>Country<\/b><\/td><td>(.*?)<\/td>', - provider=>'<tr><td><b>\(Backbone-\)Provider<\/b><\/td><td>(.*?)<\/td>', + url=>'http://xml.utrace.de/?query=', + city=>'<region>(.*?)<\/region>', + province=>'<org>(.*?)<\/org>', + country=>'<countrycode>(.*?)<\/countrycode>', + provider=>'<isp>(.*?)<\/isp>', failure=>'request-limit-exceeded|Host not found'}, d2ipatlas=> { name=>'IP-Atlas', - active=>1, + active=>0, url=>'http://www.xpenguin.com/plot.php?address=', city=>'is located in (.*?),', province=>'is located in.*, (.*?) \(state\),', |