From 2a02023c8a16a04aa3300dda391252f6c0cbb15d Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 20:11:25 +0200
Subject: [PATCH 1/4] 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/LeJournalDuGeekBridge.php | 59 +++++++++++++++----------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index 04de7a44..ad339239 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -7,47 +7,46 @@ class LeJournalDuGeekBridge extends BridgeAbstract{
 		$this->name = "journaldugeek.com (FR)";
 		$this->uri = "http://www.journaldugeek.com/";
 		$this->description = "Returns the 5 newest posts from LeJournalDuGeek (full text).";
-		$this->update = "2014-07-14";
+		$this->update = "2016-08-03";
 
 	}
 
+    function LeJournalDuGeekStripCDATA($string) {
+        $string = str_replace('<![CDATA[', '', $string);
+        $string = str_replace(']]>', '', $string);
+        return $string;
+    }
+
+    function LeJournalDuGeekExtractContent($url) {
+        $articleHTMLContent = $this->file_get_html($url);
+        $text = $text.$articleHTMLContent->find('div.post-content', 0)->innertext;
+        foreach($articleHTMLContent->find('a.more') as $element) {
+            if ($element->innertext == "Source") {
+                $text = $text.'<p><a href="'.$element->href.'">Source : '.$element->href.'</a></p>';
+                break;
+            }
+        }
+        foreach($articleHTMLContent->find('iframe') as $element) {
+            if (preg_match("/youtube/i", $element->src)) {
+                $text = $text.'// An IFRAME to Youtube was included in the article: <a href="'.$element->src.'">'.$element->src.'</a><br>';
+            }
+        }
+
+        $text = strip_tags($text, '<p><b><a><blockquote><img><em><br/><br><ul><li>');
+        return $text;
+    }
+
     public function collectData(array $param){
-
-        function LeJournalDuGeekStripCDATA($string) {
-            $string = str_replace('<![CDATA[', '', $string);
-            $string = str_replace(']]>', '', $string);
-            return $string;
-        }
-
-        function LeJournalDuGeekExtractContent($url) {
-            $articleHTMLContent = $this->file_get_html($url);
-            $text = $text.$articleHTMLContent->find('div.post-content', 0)->innertext;
-            foreach($articleHTMLContent->find('a.more') as $element) {
-                if ($element->innertext == "Source") {
-                    $text = $text.'<p><a href="'.$element->href.'">Source : '.$element->href.'</a></p>';
-                    break;
-                }
-            }
-            foreach($articleHTMLContent->find('iframe') as $element) {
-                if (preg_match("/youtube/i", $element->src)) {
-                    $text = $text.'// An IFRAME to Youtube was included in the article: <a href="'.$element->src.'">'.$element->src.'</a><br>';
-                }
-            }
-
-            $text = strip_tags($text, '<p><b><a><blockquote><img><em><br/><br><ul><li>');
-            return $text;
-        }
-
         $rssFeed = $this->file_get_html('http://www.journaldugeek.com/rss') or $this->returnError('Could not request http://www.journaldugeek.com/rss', 404);
     	$limit = 0;
 
     	foreach($rssFeed->find('item') as $element) {
             if($limit < 5) {
                 $item = new \Item();
-                $item->title = LeJournalDuGeekStripCDATA($element->find('title', 0)->innertext);
-                $item->uri = LeJournalDuGeekStripCDATA($element->find('guid', 0)->plaintext);
+                $item->title = $this->LeJournalDuGeekStripCDATA($element->find('title', 0)->innertext);
+                $item->uri = $this->LeJournalDuGeekStripCDATA($element->find('guid', 0)->plaintext);
                 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-                $item->content = LeJournalDuGeekExtractContent($item->uri);
+                $item->content = $this->LeJournalDuGeekExtractContent($item->uri);
                 $this->items[] = $item;
                 $limit++;
             }

From 83d7f138edba4fd93677de4083f7373a897ba09f Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 20:14:59 +0200
Subject: [PATCH 2/4] Fix indentation and remove empty lines

---
 bridges/LeJournalDuGeekBridge.php | 95 +++++++++++++++----------------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index ad339239..991f0143 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -2,67 +2,66 @@
 class LeJournalDuGeekBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "polopollo";
 		$this->name = "journaldugeek.com (FR)";
 		$this->uri = "http://www.journaldugeek.com/";
 		$this->description = "Returns the 5 newest posts from LeJournalDuGeek (full text).";
 		$this->update = "2016-08-03";
-
 	}
 
-    function LeJournalDuGeekStripCDATA($string) {
-        $string = str_replace('<![CDATA[', '', $string);
-        $string = str_replace(']]>', '', $string);
-        return $string;
-    }
+	function LeJournalDuGeekStripCDATA($string) {
+		$string = str_replace('<![CDATA[', '', $string);
+		$string = str_replace(']]>', '', $string);
+		return $string;
+	}
 
-    function LeJournalDuGeekExtractContent($url) {
-        $articleHTMLContent = $this->file_get_html($url);
-        $text = $text.$articleHTMLContent->find('div.post-content', 0)->innertext;
-        foreach($articleHTMLContent->find('a.more') as $element) {
-            if ($element->innertext == "Source") {
-                $text = $text.'<p><a href="'.$element->href.'">Source : '.$element->href.'</a></p>';
-                break;
-            }
-        }
-        foreach($articleHTMLContent->find('iframe') as $element) {
-            if (preg_match("/youtube/i", $element->src)) {
-                $text = $text.'// An IFRAME to Youtube was included in the article: <a href="'.$element->src.'">'.$element->src.'</a><br>';
-            }
-        }
+	function LeJournalDuGeekExtractContent($url) {
+		$articleHTMLContent = $this->file_get_html($url);
+		$text = $text.$articleHTMLContent->find('div.post-content', 0)->innertext;
 
-        $text = strip_tags($text, '<p><b><a><blockquote><img><em><br/><br><ul><li>');
-        return $text;
-    }
+		foreach($articleHTMLContent->find('a.more') as $element) {
+			if ($element->innertext == "Source") {
+				$text = $text . '<p><a href="' . $element->href . '">Source : ' . $element->href . '</a></p>';
+				break;
+			}
+		}
 
-    public function collectData(array $param){
-        $rssFeed = $this->file_get_html('http://www.journaldugeek.com/rss') or $this->returnError('Could not request http://www.journaldugeek.com/rss', 404);
-    	$limit = 0;
+		foreach($articleHTMLContent->find('iframe') as $element) {
+			if (preg_match("/youtube/i", $element->src)) {
+				$text = $text . '// An IFRAME to Youtube was included in the article: <a href="' . $element->src . '">' . $element->src . '</a><br>';
+			}
+		}
 
-    	foreach($rssFeed->find('item') as $element) {
-            if($limit < 5) {
-                $item = new \Item();
-                $item->title = $this->LeJournalDuGeekStripCDATA($element->find('title', 0)->innertext);
-                $item->uri = $this->LeJournalDuGeekStripCDATA($element->find('guid', 0)->plaintext);
-                $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-                $item->content = $this->LeJournalDuGeekExtractContent($item->uri);
-                $this->items[] = $item;
-                $limit++;
-            }
-    	}
+		$text = strip_tags($text, '<p><b><a><blockquote><img><em><br/><br><ul><li>');
+		return $text;
+	}
 
-    }
+	public function collectData(array $param){
+		$rssFeed = $this->file_get_html('http://www.journaldugeek.com/rss') or $this->returnError('Could not request http://www.journaldugeek.com/rss', 404);
+		$limit = 0;
 
-    public function getName(){
-        return 'LeJournalDuGeek';
-    }
+		foreach($rssFeed->find('item') as $element) {
+			if($limit < 5) {
+				$item = new \Item();
+				$item->title = $this->LeJournalDuGeekStripCDATA($element->find('title', 0)->innertext);
+				$item->uri = $this->LeJournalDuGeekStripCDATA($element->find('guid', 0)->plaintext);
+				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+				$item->content = $this->LeJournalDuGeekExtractContent($item->uri);
+				$this->items[] = $item;
+				$limit++;
+			}
+		}
+	}
 
-    public function getURI(){
-        return 'http://www.journaldugeek.com/';
-    }
+	public function getName(){
+		return 'LeJournalDuGeek';
+	}
 
-    public function getCacheDuration(){
-        return 1800; // 30min
-    }
+	public function getURI(){
+		return 'http://www.journaldugeek.com/';
+	}
+
+	public function getCacheDuration(){
+		return 1800; // 30min
+	}
 }

From da3127e31bf39c85c4c6f4cca806d4bb968be00c Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 20:32:26 +0200
Subject: [PATCH 3/4] Remove all script tags from content

---
 bridges/LeJournalDuGeekBridge.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index 991f0143..7157b7c6 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -32,6 +32,7 @@ class LeJournalDuGeekBridge extends BridgeAbstract{
 			}
 		}
 
+		$text = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $text);
 		$text = strip_tags($text, '<p><b><a><blockquote><img><em><br/><br><ul><li>');
 		return $text;
 	}

From 47f382ce3f6a1a800147474c264432d8663b281a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 20:34:30 +0200
Subject: [PATCH 4/4] Fix typo

---
 bridges/LeJournalDuGeekBridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index 7157b7c6..69f940ac 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -17,7 +17,7 @@ class LeJournalDuGeekBridge extends BridgeAbstract{
 
 	function LeJournalDuGeekExtractContent($url) {
 		$articleHTMLContent = $this->file_get_html($url);
-		$text = $text.$articleHTMLContent->find('div.post-content', 0)->innertext;
+		$text = $articleHTMLContent->find('div.post-content', 0)->innertext;
 
 		foreach($articleHTMLContent->find('a.more') as $element) {
 			if ($element->innertext == "Source") {