Changeset 1641

Timestamp:

11/27/06 17:16:45 (23 months ago)

Author:

mbonetti

Message:

Applied Dwayne C. Litzenberger's patch to better handler feed discovery on
relative URLs. (Thanks, Dwayne!)

Location:

trunk/gregarius

Files:

• extlib/README.uri_util (added)
• extlib/uri_util.php (added)
• util.php (modified) (2 diffs)

trunk/gregarius/util.php

@@ -717 +717 @@
  */
 function extractFeeds($url) {
+    rss_require('extlib/uri_util.php');
     $cnt = getUrl($url);
     $ret = array ();
@@ -732 +733 @@
                     $val = trim($match2[2]);
                     // make sure we have absolute URI's
-                    if (($attr == "href") && strcasecmp(substr($val, 0, 4), "http") != 0) {
-                        // Check to see if the relative url starts with "//"
-                        if(substr($val,0,2) == "//") {
-                            $val = preg_replace('/\/\/.*/', $val, $url);
-                        } else {
-                            $urlParts = parse_url($url);
-                            if ($urlParts && is_array($urlParts) && strlen($val)) {
-                                if ($val[0] != '/') {
-                                    $val = '/'.$val;
-                                }
-                                $val = $urlParts['scheme'] . '://'
-                                       .$urlParts['host'] . $val;
-                            } else {
-                                $val = ($url.$val);
-                            }
-                        }
+                    if ($attr == "href") {
+                        $val = absolute_uri($val, $url);
                     }
                     $tmp[$attr] = $val;