From 1afdf9cef7355fb0e1bc01ebca3e2837593ef745 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 21:19:00 +0200
Subject: [PATCH 1/3] Change all nested functions to member functions

This fixes error "Using $this when not in object context"

Nested functions are not part of the object and therefore don't have
access to the object instance $this!
---
 bridges/NextInpactBridge.php | 45 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index e229c68..0306edf 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -11,37 +11,36 @@ class NextInpactBridge extends BridgeAbstract {
 
 	}
 
+	function StripCDATA($string) {
+		$string = str_replace('<![CDATA[', '', $string);
+		$string = str_replace(']]>', '', $string);
+		return $string;
+	}
+
+	function ExtractContent($url) {
+		$html2 = $this->file_get_html($url);
+		$text = '<p><em>'.$html2->find('span.sub_title', 0)->innertext.'</em></p>'
+			.'<p><img src="'.$html2->find('div.container_main_image_article', 0)->find('img.dedicated',0)->src.'" alt="-" /></p>'
+			.'<div>'.$html2->find('div[itemprop=articleBody]', 0)->innertext.'</div>';
+		$premium_article = $html2->find('h2.title_reserve_article', 0);
+		if (is_object($premium_article))
+			$text = $text.'<p><em>'.$premium_article->innertext.'</em></p>';
+		return $text;
+	}
+
 	public function collectData(array $param) {
-
-		function StripCDATA($string) {
-			$string = str_replace('<![CDATA[', '', $string);
-			$string = str_replace(']]>', '', $string);
-			return $string;
-		}
-
-		function ExtractContent($url) {
-			$html2 = $this->file_get_html($url);
-			$text = '<p><em>'.$html2->find('span.sub_title', 0)->innertext.'</em></p>'
-				.'<p><img src="'.$html2->find('div.container_main_image_article', 0)->find('img.dedicated',0)->src.'" alt="-" /></p>'
-				.'<div>'.$html2->find('div[itemprop=articleBody]', 0)->innertext.'</div>';
-			$premium_article = $html2->find('h2.title_reserve_article', 0);
-			if (is_object($premium_article))
-				$text = $text.'<p><em>'.$premium_article->innertext.'</em></p>';
-			return $text;
-		}
-
 		$html = $this->file_get_html('http://www.nextinpact.com/rss/news.xml') or $this->returnError('Could not request NextInpact.', 404);
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
 		 if($limit < 3) {
 				$item = new \Item();
-				$item->title = StripCDATA($element->find('title', 0)->innertext);
-				$item->uri = StripCDATA($element->find('guid', 0)->plaintext);
-				$item->thumbnailUri = StripCDATA($element->find('enclosure', 0)->url);
-				$item->author = StripCDATA($element->find('author', 0)->innertext);
+				$item->title = $this->StripCDATA($element->find('title', 0)->innertext);
+				$item->uri = $this->StripCDATA($element->find('guid', 0)->plaintext);
+				$item->thumbnailUri = $this->StripCDATA($element->find('enclosure', 0)->url);
+				$item->author = $this->StripCDATA($element->find('author', 0)->innertext);
 				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-				$item->content = ExtractContent($item->uri);
+				$item->content = $this->ExtractContent($item->uri);
 				$this->items[] = $item;
 				$limit++;
 			}

From 58322137d321a157e6ae038e3ccd52365e400283 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 21:26:00 +0200
Subject: [PATCH 2/3] Fix author tag in source ('author' -> 'creator')

---
 bridges/NextInpactBridge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index 0306edf..bd6665b 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -7,7 +7,7 @@ class NextInpactBridge extends BridgeAbstract {
 		$this->name = "NextInpact Bridge";
 		$this->uri = "http://www.nextinpact.com/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2015-10-23";
+		$this->update = "2016-08-03";
 
 	}
 
@@ -38,7 +38,7 @@ class NextInpactBridge extends BridgeAbstract {
 				$item->title = $this->StripCDATA($element->find('title', 0)->innertext);
 				$item->uri = $this->StripCDATA($element->find('guid', 0)->plaintext);
 				$item->thumbnailUri = $this->StripCDATA($element->find('enclosure', 0)->url);
-				$item->author = $this->StripCDATA($element->find('author', 0)->innertext);
+				$item->author = $this->StripCDATA($element->find('creator', 0)->innertext);
 				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
 				$item->content = $this->ExtractContent($item->uri);
 				$this->items[] = $item;

From b889b51a9e407c3efd150c4c571611433d2a3a58 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 21:26:53 +0200
Subject: [PATCH 3/3] Fix indentation and remove empty lines

---
 bridges/NextInpactBridge.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index bd6665b..e4597e5 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -2,13 +2,11 @@
 class NextInpactBridge extends BridgeAbstract {
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "qwertygc";
 		$this->name = "NextInpact Bridge";
 		$this->uri = "http://www.nextinpact.com/";
 		$this->description = "Returns the newest articles.";
 		$this->update = "2016-08-03";
-
 	}
 
 	function StripCDATA($string) {
@@ -45,8 +43,7 @@ class NextInpactBridge extends BridgeAbstract {
 				$limit++;
 			}
 		}
-
-    }
+	}
 
 	public function getName() {
 		return 'Nextinpact Bridge';
@@ -58,6 +55,5 @@ class NextInpactBridge extends BridgeAbstract {
 
 	public function getCacheDuration() {
 		return 3600; // 1 hour
-		// return 0;
 	}
 }