From bfc24f3794fa658b23215a430aafda050460d21b Mon Sep 17 00:00:00 2001
From: syrnon <yossisr@outlook.com>
Date: Wed, 3 Jul 2013 22:36:33 +0300
Subject: Update atom.php

---
 classes/feeditem/atom.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'classes/feeditem/atom.php')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index fa6b3a34c..c58d2a5ff 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -1,5 +1,13 @@
 <?php
 class FeedItem_Atom extends FeedItem_Common {
+
+   	 private $baseUrl;
+
+  	 function __construct($elem, $doc, $xpath, $baseUrl) {
+  	 	parent::__construct($elem, $doc, $xpath);
+		$this->baseUrl= $baseUrl;
+   	 }
+
 	function get_id() {
 		$id = $this->elem->getElementsByTagName("id")->item(0);
 
@@ -39,7 +47,7 @@ class FeedItem_Atom extends FeedItem_Common {
 					|| $link->getAttribute("rel") == "alternate"
 					|| $link->getAttribute("rel") == "standout")) {
 
-				return $link->getAttribute("href");
+				return $this->baseUrl.$link->getAttribute("href");
 			}
 		}
 	}
-- 
cgit v1.2.3


From b28b2ce9eb4265b7360f170ae7f706906fc6d1f9 Mon Sep 17 00:00:00 2001
From: syrnon <syrnon@outlook.com>
Date: Tue, 9 Jul 2013 17:29:25 +0300
Subject: calculating base locally

---
 classes/feeditem/atom.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'classes/feeditem/atom.php')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index c58d2a5ff..522ca633e 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -1,13 +1,6 @@
 <?php
 class FeedItem_Atom extends FeedItem_Common {
 
-   	 private $baseUrl;
-
-  	 function __construct($elem, $doc, $xpath, $baseUrl) {
-  	 	parent::__construct($elem, $doc, $xpath);
-		$this->baseUrl= $baseUrl;
-   	 }
-
 	function get_id() {
 		$id = $this->elem->getElementsByTagName("id")->item(0);
 
@@ -46,8 +39,8 @@ class FeedItem_Atom extends FeedItem_Common {
 				(!$link->hasAttribute("rel")
 					|| $link->getAttribute("rel") == "alternate"
 					|| $link->getAttribute("rel") == "standout")) {
-
-				return $this->baseUrl.$link->getAttribute("href");
+				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)",$link);
+				return $base.$link->getAttribute("href");
 			}
 		}
 	}
-- 
cgit v1.2.3


From 6aeb37d062d18519b0f36816f7bd56cb3358cf28 Mon Sep 17 00:00:00 2001
From: syrnon <syrnon@outlook.com>
Date: Tue, 9 Jul 2013 18:05:16 +0300
Subject: fixing the rel url to abs

---
 classes/feeditem/atom.php | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

(limited to 'classes/feeditem/atom.php')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 522ca633e..532c599cc 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -30,7 +30,36 @@ class FeedItem_Atom extends FeedItem_Common {
 			return strtotime($date->nodeValue);
 		}
 	}
-
+	
+	function rel2abs($rel, $base)
+	{
+	    /* return if already absolute URL */
+	    if (parse_url($rel, PHP_URL_SCHEME) != '') return $rel;
+	
+	    /* queries and anchors */
+	    if ($rel[0]=='#' || $rel[0]=='?') return $base.$rel;
+	
+	    /* parse base URL and convert to local variables:
+	       $scheme, $host, $path */
+	    extract(parse_url($base));
+	
+	    /* remove non-directory element from path */
+	    $path = preg_replace('#/[^/]*$#', '', $path);
+	
+	    /* destroy path if relative url points to root */
+	    if ($rel[0] == '/') $path = '';
+	
+	    /* dirty absolute URL */
+	    $abs = "$host$path/$rel";
+	
+	    /* replace '//' or '/./' or '/foo/../' with '/' */
+	    $re = array('#(/\.?/)#', '#/(?!\.\.)[^/]+/\.\./#');
+	    for($n=1; $n>0; $abs=preg_replace($re, '/', $abs, -1, $n)) {}
+
+	    /* absolute URL is ready! */
+	    return $scheme.'://'.$abs;
+	}
+	
 	function get_link() {
 		$links = $this->elem->getElementsByTagName("link");
 
@@ -40,7 +69,7 @@ class FeedItem_Atom extends FeedItem_Common {
 					|| $link->getAttribute("rel") == "alternate"
 					|| $link->getAttribute("rel") == "standout")) {
 				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)",$link);
-				return $base.$link->getAttribute("href");
+				return $this->rel2abs($link->getAttribute("href"), $base);
 			}
 		}
 	}
-- 
cgit v1.2.3