Tweaks to phishing algorithm

diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
index 6bf1b1e..b42051a 100644 (file)
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
@@ -256,8 +256,16 @@ class Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Base
 
         /* Check for case where text is just the domain name. */
         if (!isset($text_url['host'])) {
-            if (!isset($text_url['path']) ||
-                !preg_match("/^[^\.\s\/]+(?:\.[^\.\s]+)+$/", $text_url['path'])) {
+            if (!isset($text_url['path'])) {
+                return false;
+            }
+
+            /* Path info may include path, so remove that. */
+            if (($pos = strpos($text_url['path'], '/')) !== false) {
+                $text_url['path'] = substr($text_url['path'], 0, $pos);
+            }
+
+            if (!preg_match("/^[^\.\s\/]+(?:\.[^\.\s]+)+$/", $text_url['path'])) {
                 return false;
             }