Skip to content
This repository was archived by the owner on Mar 13, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions Result/Result.php
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public function addItem($target, $value, $append = false)
// But normally causes a fatal error, so unless we manually trigger an error first,
// all stacktrace information is lost
if (($this->lastId === -1) || ($this->lastHandle === null)) {
trigger_error("Unexpected values for lastHandle / lastId", E_USER_WARNING);
return;
}
$this->contacts->{$this->lastHandle}[$this->lastId] = new Contact();
}
Expand Down Expand Up @@ -501,7 +501,7 @@ public function cleanUp($config, $dateformat)
}

if (isset($this->network->contacts) && sizeof($this->network->contacts) === 1) {
$this->network = null;
unset($this->network->contacts);
}

// format dates
Expand Down Expand Up @@ -575,4 +575,4 @@ public function mergeFrom(Result $result)
$this->$prop = $result->$prop;
}
}
}
}
5 changes: 3 additions & 2 deletions Templates/Arin.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,11 @@ public function postProcess(&$WhoisParser)
}

if (isset($Result->referral_server) && $Result->referral_server != '') {
$Result->reset();
$mapping = $Config->get($Result->referral_server);
$referral_server = str_replace('whois://', '', $Result->referral_server);
$mapping = $Config->get($referral_server);
$template = str_replace('whois://', '', $mapping['template']);
$Config->setCurrent($Config->get($template));
$Result->reset();
$WhoisParser->call();
}
}
Expand Down
4 changes: 3 additions & 1 deletion Templates/Ripe.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class Ripe extends Regex
'/^inetnum:(?>[\x20\t]*)(.+)$/im' => 'network:inetnum',
'/^inet6num:(?>[\x20\t]*)(.+)$/im' => 'network:inetnum',
'/^netname:(?>[\x20\t]*)(.+)$/im' => 'network:name',
'/^descr:(?>[\x20\t]*)(.+)$/im' => 'network:descr',
'/^country:(?>[\x20\t]*)(.+)$/im' => 'network:country',
'/^mnt-by:(?>[\x20\t]*)(.+)$/im' => 'network:maintainer',
'/^status:(?>[\x20\t]*)(.+)$/im' => 'status',
'/^org:(?>[\x20\t]*)(.+)$/im' => 'network:contacts:owner',
Expand All @@ -73,4 +75,4 @@ class Ripe extends Regex
'/^abuse-mailbox:(?>[\x20\t]*)(.+)$/im' => 'contacts:email',
'/^phone:(?>[\x20\t]*)(.+)$/im' => 'contacts:phone',
'/^fax-no:(?>[\x20\t]*)(.+)$/im' => 'contacts:fax'));
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "Apache-2.0",
"require": {
"novutec/DomainParser": ">=2.0.0",
"symfony/yaml": "~2.7"
"symfony/yaml": "~3.4"
},
"autoload": {
"psr-4": {
Expand Down