Merge pull request #13 from pcastelovigo/main

minor bugs: string as array,  link ip inside url

Author: kevinoo

example/example.php

@@ -85,11 +85,12 @@
                 exit(serialize($result));
 
         default:
-            if (!empty($result['rawdata'])) {
-                $winfo .= '<pre>' . implode($result['rawdata'], "\n") . '</pre>';
+            if (!empty($result['rawdata']) && is_array($result['rawdata'])) {
+                $winfo .= '<pre>' . implode("\n", $result['rawdata']) . '</pre>';
             } else {
-                $winfo = implode($whois->query['errstr'], "\n<br></br>");
+                $winfo = implode("\n<br></br>", (array)$whois->query['errstr']);
             }
+            break;
     }
 
 }

src/Utils.php

@@ -128,7 +128,10 @@ function ($matches) {
                 $link = $_SERVER['PHP_SELF'] . '?' . $params;
             }
 
-            $out = preg_replace($ip_regex, '<a href="' . $link . '">$0</a>', $out);
+            if (strpos($out, '<a href=') === false) {
+                $out = preg_replace($ip_regex, '<a href="' . $link . '">$0</a>', $out);
+            }
+
 
             if (isset($result['regrinfo']['domain']['nserver'])) {
                 $nserver = $result['regrinfo']['domain']['nserver'];