beenull/phpWhois.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes to ip handler and APNIC ip handler

Browse source
This commit is contained in:
sparc 2007-05-04 09:36:42 +00:00
parent 071b052541
commit 48a3ff5d89
3 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Changes.md
View file

@ -1,3 +1,6 @@
2007/05/04
- fixes to ip handler and APNIC ip handler
2007/05/03 2007/05/03
- minox fix in whois.gtld.publicdomainregistry.php - minox fix in whois.gtld.publicdomainregistry.php
- removed unused handler whois.gtld.directi.php - removed unused handler whois.gtld.directi.php

27
src/whois.ip.apnic.php
View file

@ -53,14 +53,29 @@ class apnic_handler {
$r = generic_parser_a($data_str,$translate,$contacts,'network','Ymd'); $r = generic_parser_a($data_str,$translate,$contacts,'network','Ymd');
if (isset($r['network']['desc'][0])) if (isset($r['network']['desc']))
{ {
$r['owner']['organization'] = $r['network']['desc'][0]; if (is_array($r['network']['desc']))
unset($r['network']['desc'][0]); {
$r['owner']['organization'] = array_shift($r['network']['desc']);
$r['owner']['address'] = $r['network']['desc'];
}
else
$r['owner']['organization'] = $r['network']['desc'];
unset($r['network']['desc']);
} }
$r['owner']['address'] = $r['network']['desc'];
if (isset($r['network']['desc'])) unset($r['network']['desc']); if (isset($r['network']['address']))
if (isset($r['network']['address'])) unset($r['network']['address']); {
if (isset($r['owner']['address']))
$r['owner']['address'][] = $r['network']['address'];
else
$r['owner']['address'] = $r['network']['address'];
unset($r['network']['address']);
}
return $r; return $r;
} }

26
src/whois.ip.php
View file

@ -107,19 +107,14 @@ class ip_handler extends WhoisClient
case 'whois.apnic.net': case 'whois.apnic.net':
$rawdata = $this->GetRawData($query); $rawdata = $this->GetRawData($query);
if (empty($rawdata)) if (empty($rawdata)) break;
{
//$rawdata = $data['rawdata'];
break;
}
$result = $this->set_whois_info($result);
while (list($ln, $line) = each($rawdata)) while (list($ln, $line) = each($rawdata))
{ {
if (strstr($line, 'KRNIC whois server at whois.krnic.net') || if (strstr($line, 'KRNIC whois server at whois.krnic.net') ||
strstr($line, 'KRNIC-KR')) strstr($line, 'KRNIC-KR'))
{ {
$result = $this->set_whois_info($result);
$this->Query['server'] = 'whois.krnic.net'; $this->Query['server'] = 'whois.krnic.net';
$result['regyinfo']['registrar'] = 'Korea Network Information Center (KRNIC)'; $result['regyinfo']['registrar'] = 'Korea Network Information Center (KRNIC)';
$rawdata = $this->GetRawData($query); $rawdata = $this->GetRawData($query);
@ -155,6 +150,7 @@ class ip_handler extends WhoisClient
if ($newquery != '') if ($newquery != '')
{ {
$result = $this->set_whois_info($result);
$result['regyinfo']['netname'] = $newquery; $result['regyinfo']['netname'] = $newquery;
if (strstr($newquery, 'BRAZIL-BLK')) if (strstr($newquery, 'BRAZIL-BLK'))
@ -175,10 +171,7 @@ class ip_handler extends WhoisClient
case 'whois.lacnic.net': case 'whois.lacnic.net':
$rawdata = $this->GetRawData($query); $rawdata = $this->GetRawData($query);
if (empty($rawdata)) if (empty($rawdata)) break;
{
break;
}
while (list($ln, $line) = each($rawdata)) while (list($ln, $line) = each($rawdata))
{ {
@ -192,6 +185,7 @@ class ip_handler extends WhoisClient
if ($s != '') if ($s != '')
{ {
$result = $this->set_whois_info($result);
$this->Query['server'] = 'whois.registro.br'; $this->Query['server'] = 'whois.registro.br';
$result['regyinfo']['registrar'] = 'Comite Gestor da Internet do Brazil'; $result['regyinfo']['registrar'] = 'Comite Gestor da Internet do Brazil';
$rawdata = $this->GetRawData($query); $rawdata = $this->GetRawData($query);
@ -203,16 +197,13 @@ class ip_handler extends WhoisClient
case 'whois.ripe.net': case 'whois.ripe.net':
$rawdata = $this->GetRawData($query); $rawdata = $this->GetRawData($query);
if (empty($rawdata)) if (empty($rawdata)) break;
{
//$rawdata = $data['rawdata'];
break;
}
while (list($ln, $line) = each($rawdata)) while (list($ln, $line) = each($rawdata))
{ {
if (strstr($line, 'AFRINIC-NET-TRANSFERRED-')) if (strstr($line, 'AFRINIC-NET-TRANSFERRED-'))
{ {
$result = $this->set_whois_info($result);
$this->Query['server'] = 'whois.afrinic.net'; $this->Query['server'] = 'whois.afrinic.net';
$result['regyinfo']['registrar'] = 'African Network Information Center'; $result['regyinfo']['registrar'] = 'African Network Information Center';
$rawdata = $this->GetRawData($query); $rawdata = $this->GetRawData($query);
@ -223,9 +214,6 @@ class ip_handler extends WhoisClient
default: default:
$rawdata = $this->GetRawData($query); $rawdata = $this->GetRawData($query);
//if (empty($rawdata))
// $rawdata = $data['rawdata'];
} }
if (empty($rawdata)) if (empty($rawdata))