From c581461790de0e8df75fd34f28d11286b5198aac Mon Sep 17 00:00:00 2001 From: Raymond Muilwijk Date: Wed, 10 Aug 2016 14:16:49 +0200 Subject: [PATCH 1/7] Fix Arin ReferralServer reset. --- Templates/Arin.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Templates/Arin.php b/Templates/Arin.php index 31c30a3..2fd0ad8 100644 --- a/Templates/Arin.php +++ b/Templates/Arin.php @@ -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(); } } From 8e2d87cebfc5523b5abe80c438e3c5d8c358272a Mon Sep 17 00:00:00 2001 From: Raymond Muilwijk Date: Wed, 10 Aug 2016 15:21:50 +0200 Subject: [PATCH 2/7] Issue #44 Network section nulled --- Result/Result.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Result/Result.php b/Result/Result.php index 3e7c3b6..38e92e5 100644 --- a/Result/Result.php +++ b/Result/Result.php @@ -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 @@ -575,4 +575,4 @@ public function mergeFrom(Result $result) $this->$prop = $result->$prop; } } -} \ No newline at end of file +} From 66d0d589034a63fc8b215f0a1155b4e5314860fa Mon Sep 17 00:00:00 2001 From: Raymond Muilwijk Date: Wed, 10 Aug 2016 15:32:02 +0200 Subject: [PATCH 3/7] Add network descriptions --- Templates/Ripe.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Templates/Ripe.php b/Templates/Ripe.php index 9cb2e03..efab3ed 100644 --- a/Templates/Ripe.php +++ b/Templates/Ripe.php @@ -57,6 +57,7 @@ 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', '/^mnt-by:(?>[\x20\t]*)(.+)$/im' => 'network:maintainer', '/^status:(?>[\x20\t]*)(.+)$/im' => 'status', '/^org:(?>[\x20\t]*)(.+)$/im' => 'network:contacts:owner', @@ -73,4 +74,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')); -} \ No newline at end of file +} From c9ef10def3669f3f488fd5cbda95e8bcb1d6786a Mon Sep 17 00:00:00 2001 From: Raymond Muilwijk Date: Wed, 10 Aug 2016 20:32:19 +0200 Subject: [PATCH 4/7] Add Country to the network --- Templates/Ripe.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Templates/Ripe.php b/Templates/Ripe.php index efab3ed..91b6942 100644 --- a/Templates/Ripe.php +++ b/Templates/Ripe.php @@ -58,6 +58,7 @@ class Ripe extends Regex '/^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', From 00f3d06eea817e781682394e40483c9cdc667513 Mon Sep 17 00:00:00 2001 From: Raymond Muilwijk Date: Thu, 3 Nov 2016 10:42:00 +0100 Subject: [PATCH 5/7] Do not call an explicit trigger_error. --- Result/Result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Result/Result.php b/Result/Result.php index 38e92e5..4c0eac0 100644 --- a/Result/Result.php +++ b/Result/Result.php @@ -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(); } From b2214afe2ba20de55b295d41e0abc683e5115487 Mon Sep 17 00:00:00 2001 From: Raymond Muilwijk Date: Mon, 17 May 2021 15:10:18 +0200 Subject: [PATCH 6/7] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 741cceb..63af743 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "license": "Apache-2.0", "require": { "novutec/DomainParser": ">=2.0.0", - "symfony/yaml": "~2.7" + "symfony/yaml": "^2" }, "autoload": { "psr-4": { From 8c681b81dd24b62ad203efde419240bce150bb10 Mon Sep 17 00:00:00 2001 From: Raymond Muilwijk Date: Mon, 17 May 2021 15:12:51 +0200 Subject: [PATCH 7/7] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 63af743..c8884a2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "license": "Apache-2.0", "require": { "novutec/DomainParser": ">=2.0.0", - "symfony/yaml": "^2" + "symfony/yaml": "~3.4" }, "autoload": { "psr-4": {