[#1] Use $this->parseRegistryInfo to try to retrieve the Registry Info

Author: kevinoo

src/Handlers/AbstractHandler.php

@@ -460,7 +460,7 @@ public static function generic_parser_b( array $rawdata, array $items=[], string
                 $r['registered'] = 'yes';
             }
 
-            $r = format_dates($r, $dateformat);
+            $r = static::formatDates($r, $dateformat);
         }
 
         return $r;
@@ -625,7 +625,7 @@ public static function getContacts($array, $extra_items = [], $has_org = false)
      * @param array $extra_items
      * @param bool  $has_org
      */
-    public static function getContact($array, $extra_items = [], bool $has_org=false): array
+    public static function getContact($array, $extra_items=[], bool $has_org=false): array
     {
         if (!is_array($array)) {
             return array();
@@ -792,7 +792,7 @@ protected function parseRegistryInfo(array $rawData): array
             'Registrar WHOIS Server:'        => 'whois',
         ];
 
-        $registryInfo = $this->generic_parser_b($rawData, $registryItems);
+        $registryInfo = static::generic_parser_b($rawData, $registryItems);
         unset($registryInfo['registered']);
 
         return $registryInfo;

src/Handlers/BeHandler.php

@@ -31,10 +31,11 @@ public function parse(array $data_str, string $query): array
         ];
 
         $rawData = $this->removeBlankLines($data_str['rawdata']);
-        $r       = [
-            'regrinfo' => $this->get_blocks($rawData, $items),
-            'regyinfo' => [
-                'referrer'  => 'http://www.domain-registry.nl',
+
+        $r = [
+            'regrinfo' => static::getBlocks($rawData, $items),
+            'regyinfo' => $this->parseRegistryInfo($rawData) ?? [
+                'referrer'  => 'https://www.domain-registry.nl',
                 'registrar' => 'DNS Belgium',
             ],
             'rawdata'  => $data_str['rawdata'],

src/Handlers/BhHandler.php

@@ -24,7 +24,8 @@ public function parse(array $data_str, string $query): array
         } else {
             $r['regrinfo']['registered'] = 'yes';
         }
-        $r['regyinfo'] = [
+
+        $r['regyinfo'] = $this->parseRegistryInfo($data_str['rawdata']) ?? [
             'referrer'  => 'http://www.nic.bh/',
             'registrar' => 'NIC-BH',
         ];

src/Handlers/BizHandler.php

@@ -16,8 +16,8 @@ public function parse(array $data_str, string $query): array
     {
         $r = [
             'regrinfo' => static::generic_parser_b($data_str['rawdata'], [], 'mdy'),
-            'regyinfo' => [
-                'referrer'  => 'http://www.neulevel.biz',
+            'regyinfo' => $this->parseRegistryInfo($data_str['rawdata']) ?? [
+                'referrer'  => 'https://www.neulevel.biz',
                 'registrar' => 'NEULEVEL',
             ],
             'rawdata'  => $data_str['rawdata'],

src/Handlers/BrHandler.php

@@ -63,9 +63,9 @@ public function parse(array $data_str, string $query): array
 
         $a = [
             'regrinfo' => $r,
-            'regyinfo' => [
+            'regyinfo' => $this->parseRegistryInfo($data_str['rawdata']) ?? [
                 'registrar' => 'BR-NIC',
-                'referrer'  => 'http://www.nic.br',
+                'referrer'  => 'https://www.nic.br',
             ],
             'rawdata'  => $data_str['rawdata'],
         ];

src/Handlers/CoopHandler.php

@@ -49,6 +49,11 @@ public function parse(array $data_str, string $query): array
         $blocks = AbstractHandler::getBlocks($data_str['rawdata'], $items);
 
         $r = [
+            'regrinfo' => [],
+            'regyinfo' => $this->parseRegistryInfo($data_str['rawdata']) ?? [
+                'referrer'  => 'https://www.nic.coop',
+                'registrar' => '.coop registry',
+            ],
             'rawdata' => $data_str['rawdata'],
         ];
 
@@ -77,11 +82,6 @@ public function parse(array $data_str, string $query): array
             $r['regrinfo']['registered'] = 'no';
         }
 
-        $r['regyinfo'] = $this->parseRegistryInfo($data_str['rawdata']) ?? [
-            'referrer'  => 'https://www.nic.coop',
-            'registrar' => '.coop registry',
-        ];
-
         return $r;
     }
 }

src/Handlers/CzHandler.php

@@ -36,17 +36,15 @@ public function parse(array $data_str, string $query): array
             'registrant' => 'owner',
         ];
 
-        $r             = [
+        $r = [
+            'regrinfo' => static::generic_parser_a($data_str['rawdata'], $translate, $contacts),
+            'regyinfo' => $this->parseRegistryInfo($data_str['rawdata']) ?? [
+                'referrer'  => 'https://www.nic.cz',
+                'registrar' => 'CZ-NIC',
+            ],
             'rawdata' => $data_str['rawdata'],
         ];
 
-        $r['regrinfo'] = static::generic_parser_a($data_str['rawdata'], $translate, $contacts, 'domain', 'dmy');
-
-        $r['regyinfo'] = [
-            'referrer'  => 'http://www.nic.cz',
-            'registrar' => 'CZ-NIC',
-        ];
-
         if ($data_str['rawdata'][0] === 'Your connection limit exceeded. Please slow down and try again later.') {
             $r['regrinfo']['registered'] = 'unknown';
         }

src/Handlers/DeHandler.php

@@ -37,10 +37,11 @@ public function parse(array $data_str, string $query): array
         ];
 
         $rawData = $this->removeBlankLines($data_str['rawdata']);
-        $r       = [
+
+        $r = [
             'rawdata'  => $data_str['rawdata'],
             'regrinfo' => static::easyParser($rawData, $items, 'ymd', $extra),
-            'regyinfo' => [
+            'regyinfo' => $this->parseRegistryInfo($rawData) ?? [
                 'registrar' => 'DENIC eG',
                 'referrer'  => 'https://www.denic.de/',
             ],

src/Handlers/DevHandler.php

@@ -15,11 +15,10 @@ class DevHandler extends AbstractHandler
 {
     public function parse(array $data_str, string $query): array
     {
-        $r = [
-            'regrinfo' => generic_parser_b($data_str['rawdata']),
+        return [
+            'regrinfo' => static::generic_parser_b($data_str['rawdata']),
+            'regyinfo' => $this->parseRegistryInfo($data_str['rawdata']),
             'rawdata'  => $data_str['rawdata'],
         ];
-
-        return $r;
     }
 }

src/Handlers/DkHandler.php

@@ -62,7 +62,7 @@ public function parse(array $data_str, string $query): array
 
         return [
             'regrinfo' => $reg,
-            'regyinfo' => [
+            'regyinfo' => $this->parseRegistryInfo($data_str['rawdata']) ?? [
                 'referrer' => 'https://www.dk-hostmaster.dk/',
                 'registrar' => 'DK Hostmaster'
             ],