From 6f8b93fb46a02d7c2b059be94ed1d9c8b8b4081a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Wed, 14 Sep 2016 13:31:43 +0200
Subject: [PATCH 01/11] [bridges] removed since they just parse the site feed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/GuruMedBridge.php            | 32 --------------------------
 bridges/ZoneTelechargementBridge.php | 34 ----------------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 bridges/GuruMedBridge.php
 delete mode 100644 bridges/ZoneTelechargementBridge.php

diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
deleted file mode 100644
index 0c4bf2c2..00000000
--- a/bridges/GuruMedBridge.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-class GuruMedBridge extends BridgeAbstract{
-
-	const MAINTAINER = "qwertygc";
-	const NAME = "GuruMed";
-	const URI = "http://www.gurumed.org";
-	const DESCRIPTION = "Returns the 5 newest posts from Gurumed (full text)";
-
-	private function GurumedStripCDATA($string) {
-		$string = str_replace('<![CDATA[', '', $string);
-		$string = str_replace(']]>', '', $string);
-		return $string;
-	}
-
-	public function collectData(){
-      $html = $this->getSimpleHTMLDOM(self::URI.'feed')
-        or $this->returnServerError('Could not request Gurumed.');
-		$limit = 0;
-
-		foreach($html->find('item') as $element) {
-			if($limit < 5) {
-				$item = array();
-				$item['title'] = $this->GurumedStripCDATA($element->find('title', 0)->innertext);
-				$item['uri'] = $this->GurumedStripCDATA($element->find('guid', 0)->plaintext);
-				$item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-				$item['content'] = $this->GurumedStripCDATA(strip_tags($element->find('description', 0), '<p><a><br>'));
-				$this->items[] = $item;
-				$limit++;
-			}
-		}
-	}
-}
diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php
deleted file mode 100644
index ee547837..00000000
--- a/bridges/ZoneTelechargementBridge.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-class ZoneTelechargementBridge extends BridgeAbstract {
-
-    const MAINTAINER = 'ORelio';
-    const NAME = 'Zone Telechargement Bridge';
-    const URI = 'https://www.zone-telechargement.com/';
-    const DESCRIPTION = 'RSS proxy returning the newest releases.<br />You may specify a category found in RSS URLs, else main feed is selected.';
-
-    const PARAMETERS = array( array(
-        'category'=>array('name'=>'Category')
-    ));
-
-    public function collectData(){
-
-        function StripCDATA($string) {
-            $string = str_replace('<![CDATA[', '', $string);
-            $string = str_replace(']]>', '', $string);
-            return $string;
-        }
-
-        $url = $this->getURI().$this->getInput('category').'rss.xml';
-        $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request Zone Telechargement: '.$url);
-
-        foreach($html->find('item') as $element) {
-            $item = array();
-            $item['title'] = $element->find('title', 0)->plaintext;
-            $item['uri'] = str_replace('http://', 'https://', $element->find('guid', 0)->plaintext);
-            $item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-            $item['content'] = StripCDATA($element->find('description', 0)->innertext);
-            $this->items[] = $item;
-            $limit++;
-        }
-    }
-}

From 244516f0a29329f47c7eb9953b66b91cc218a5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Wed, 14 Sep 2016 13:32:34 +0200
Subject: [PATCH 02/11] [GizmodoFRBridge => GizmodoBridge] rename and make it a
 FeedExpander
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/GizmodoBridge.php   | 35 +++++++++++++++++++++++++++
 bridges/GizmodoFRBridge.php | 48 -------------------------------------
 2 files changed, 35 insertions(+), 48 deletions(-)
 create mode 100644 bridges/GizmodoBridge.php
 delete mode 100644 bridges/GizmodoFRBridge.php

diff --git a/bridges/GizmodoBridge.php b/bridges/GizmodoBridge.php
new file mode 100644
index 00000000..0fc80a53
--- /dev/null
+++ b/bridges/GizmodoBridge.php
@@ -0,0 +1,35 @@
+<?php
+class GizmodoBridge extends FeedExpander {
+
+	const MAINTAINER = "polopollo";
+	const NAME = "Gizmodo";
+	const URI = "http://gizmodo.com/";
+	const DESCRIPTION = "Returns the newest posts from Gizmodo (full text).";
+
+	protected function parseItem($item){
+		$item = parent::parseItem($item);
+
+		$articleHTMLContent = $this->getSimpleHTMLDOMCached($item['uri']);
+		if(!$articleHTMLContent){
+			$text = 'Could not load '.$item['uri'];
+		}else{
+			$text = $articleHTMLContent->find('div.entry-content', 0)->innertext;
+			foreach($articleHTMLContent->find('pagespeed_iframe') as $element) {
+				$text .= '<p>link to a iframe (could be a video): <a href="'.$element->src.'">'.$element->src.'</a></p><br>';
+			}
+
+			$text = strip_tags($text, '<p><b><a><blockquote><img><em>');
+		}
+
+		$item['content'] = $text;
+		return $item;
+	}
+
+	public function collectData(){
+		$this->collectExpandableDatas('http://feeds.gawker.com/gizmodo/full');
+	}
+
+	public function getCacheDuration(){
+		return 1800; // 30min
+	}
+}
diff --git a/bridges/GizmodoFRBridge.php b/bridges/GizmodoFRBridge.php
deleted file mode 100644
index e653130c..00000000
--- a/bridges/GizmodoFRBridge.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-class GizmodoFRBridge extends BridgeAbstract{
-
-	const MAINTAINER = "polopollo";
-	const NAME = "GizmodoFR";
-	const URI = "http://www.gizmodo.fr/";
-	const DESCRIPTION = "Returns the 15 newest posts from GizmodoFR (full text).";
-
-    public function collectData(){
-
-        function GizmodoFRExtractContent($url) {
-            $articleHTMLContent = $this->getSimpleHTMLDOM($url);
-            if(!$articleHTMLContent){
-              return 'Could not load '.$url;
-            }
-            $text = $articleHTMLContent->find('div.entry-thumbnail', 0)->innertext;
-            $text = $text.$articleHTMLContent->find('div.entry-excerpt', 0)->innertext;
-            $text = $text.$articleHTMLContent->find('div.entry-content', 0)->innertext;
-            foreach($articleHTMLContent->find('pagespeed_iframe') as $element) {
-                $text = $text.'<p>link to a iframe (could be a video): <a href="'.$element->src.'">'.$element->src.'</a></p><br>';
-            }
-
-            $text = strip_tags($text, '<p><b><a><blockquote><img><em>');
-            return $text;
-        }
-
-        $rssFeed = $this->getSimpleHTMLDOM(self::URI.'/feed')
-          or $this->returnServerError('Could not request '.self::URI.'/feed');
-    	$limit = 0;
-
-    	foreach($rssFeed->find('item') as $element) {
-            if($limit < 15) {
-                $item = array();
-                $item['title'] = $element->find('title', 0)->innertext;
-                $item['uri'] = $element->find('guid', 0)->plaintext;
-                $item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-                $item['content'] = GizmodoFRExtractContent($item['uri']);
-                $this->items[] = $item;
-                $limit++;
-            }
-    	}
-
-    }
-
-    public function getCacheDuration(){
-        return 1800; // 30min
-    }
-}

From 8f58c9f86bc7bbb384430e42f45228d5f75be3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Wed, 14 Sep 2016 13:33:38 +0200
Subject: [PATCH 03/11] [bridges] make them FeedExpander
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/ArstechnicaBridge.php    |  78 ++++++----------------
 bridges/KoreusBridge.php         |  36 +++-------
 bridges/NakedSecurityBridge.php  | 109 +++++++++++++++----------------
 bridges/NeuviemeArtBridge.php    |  89 ++++++++++++-------------
 bridges/Rue89Bridge.php          |  34 ++--------
 bridges/SiliconBridge.php        |  72 ++++++++------------
 bridges/WeLiveSecurityBridge.php |  78 +++++++++-------------
 7 files changed, 190 insertions(+), 306 deletions(-)

diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
index 2620715b..0146a42b 100644
--- a/bridges/ArstechnicaBridge.php
+++ b/bridges/ArstechnicaBridge.php
@@ -1,66 +1,30 @@
 <?php
-#ini_set('display_errors', 'On');
-#error_reporting(E_ALL);
-class ArstechnicaBridge extends BridgeAbstract {
+class ArstechnicaBridge extends FeedExpander {
 
-  const MAINTAINER = "prysme";
-  const NAME = "ArstechnicaBridge";
-  const URI = "http://arstechnica.com";
-  const DESCRIPTION = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
+	const MAINTAINER = "prysme";
+	const NAME = "ArstechnicaBridge";
+	const URI = "http://arstechnica.com";
+	const DESCRIPTION = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
 
-  function StripWithDelimiters($string, $start, $end) {
-    while (strpos($string, $start) !== false) {
-      $section_to_remove = substr($string, strpos($string, $start));
-      $section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
-      $string = str_replace($section_to_remove, '', $string);
-    } return $string;
-  }
+	protected function parseItem($item){
+		$item = parent::parseItem($item);
 
-  function StripCDATA($string) {
-    $string = str_replace('<![CDATA[', '', $string);
-    $string = str_replace(']]>', '', $string);
-    return $string;
-  }
+		$html = $this->getSimpleHTMLDOMCached($item['uri']);
+		if(!$html){
+			$item['content'] .= '<p>Requesting full article failed.</p>';
+		}else{
+			$item['content'] = $html->find('.article-guts', 0);
+		}
 
-  function ExtractContent($url) {
-    #echo $url;
-    $html2 = $this->getSimpleHTMLDOM($url);
+		return $item;
+	}
 
-    $text = $html2->find("section[id='article-guts']", 0);
-                        /*foreach ($text->find('<aside id="social-left">') as $node)
-                        { $node = NULL; }*/
-    $text = $this->StripWithDelimiters($text->innertext,'<aside id="social-left">','</aside>');
-    $text = $this->StripWithDelimiters($text,'<figcaption class="caption">','</figcaption>');
-    $text = $this->StripWithDelimiters($text,'<div class="gallery shortcode-gallery">','</div>');
-    //error_log("ICI", 0);
-    //error_log($text, 0);
+	public function collectData(){
+		$this->collectExpandableDatas('http://feeds.arstechnica.com/arstechnica/index/');
+	}
 
-    return $text;
-  }
-
-  public function collectData(){
-
-    $html = $this->getSimpleHTMLDOM('http://feeds.arstechnica.com/arstechnica/index') or $this->returnServerError('Could not request NextInpact.');
-    $limit = 0;
-
-    foreach($html->find('item') as $element) {
-      if($limit < 5) {
-        $item = array();
-        $item['title'] = $this->StripCDATA($element->find('title', 0)->innertext);
-        $item['uri'] = $this->StripCDATA($element->find('guid', 0)->plaintext);
-        $item['author'] = $this->StripCDATA($element->find('author', 0)->innertext);
-        $item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-        $item['content'] = $this->ExtractContent($item['uri']);
-        //$item['content'] = $item['uri'];
-        $this->items[] = $item;
-        $limit++;
-      }
-    }
-
-  }
-
-  public function getCacheDuration() {
-    return 7200; // 2h
-  }
+	public function getCacheDuration() {
+		return 7200; // 2h
+	}
 
 }
diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php
index f079bca6..de3893d8 100644
--- a/bridges/KoreusBridge.php
+++ b/bridges/KoreusBridge.php
@@ -1,38 +1,22 @@
 <?php
-class KoreusBridge extends BridgeAbstract{
+class KoreusBridge extends FeedExpander {
 
 	const MAINTAINER = "pit-fgfjiudghdf";
 	const NAME = "Koreus";
 	const URI = "http://www.koreus.com/";
-	const DESCRIPTION = "Returns the 5 newest posts from Koreus (full text)";
+	const DESCRIPTION = "Returns the newest posts from Koreus (full text)";
 
-	private function KoreusStripCDATA($string) {
-		$string = str_replace('<![CDATA[', '', $string);
-		$string = str_replace(']]>', '', $string);
-		return $string;
-	}
+	protected function parseItem($item) {
+		$item = parent::parseItem($item);
 
-	private function KoreusExtractContent($url) {
-		$html2 = $this->getSimpleHTMLDOM($url);
-		$text = $html2->find('p[class=itemText]', 0)->innertext;
-		$text = utf8_encode(preg_replace('/(Sur le m.+?)+$/i','',$text));
-		return $text;
+		$html = $this->getSimpleHTMLDOMCached($item['uri']);
+		$text = $html->find('p.itemText', 0)->innertext;
+		$item['content'] = utf8_encode($text);
+
+		return $item;
 	}
 
 	public function collectData(){
-		$html = $this->getSimpleHTMLDOM('http://feeds.feedburner.com/Koreus-articles') or $this->returnServerError('Could not request Koreus.');
-		$limit = 0;
-
-		foreach($html->find('item') as $element) {
-			if($limit < 5) {
-				$item = array();
-				$item['title'] = $this->KoreusStripCDATA($element->find('title', 0)->innertext);
-				$item['uri'] = $this->KoreusStripCDATA($element->find('guid', 0)->plaintext);
-				$item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-				$item['content'] = $this->KoreusExtractContent($item['uri']);
-				$this->items[] = $item;
-				$limit++;
-			}
-		}
+		$this->collectExpandableDatas('http://feeds.feedburner.com/Koreus-articles');
 	}
 }
diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php
index 893bc874..43607725 100644
--- a/bridges/NakedSecurityBridge.php
+++ b/bridges/NakedSecurityBridge.php
@@ -1,68 +1,61 @@
 <?php
-class NakedSecurityBridge extends BridgeAbstract {
+class NakedSecurityBridge extends FeedExpander {
 
-    const MAINTAINER = 'ORelio';
-    const NAME = 'Naked Security';
-    const URI = 'https://nakedsecurity.sophos.com/';
-    const DESCRIPTION = 'Returns the newest articles.';
+	const MAINTAINER = 'ORelio';
+	const NAME = 'Naked Security';
+	const URI = 'https://nakedsecurity.sophos.com/';
+	const DESCRIPTION = 'Returns the newest articles.';
 
-    public function collectData(){
+	private function StripRecursiveHTMLSection($string, $tag_name, $tag_start) {
+		$open_tag = '<'.$tag_name;
+		$close_tag = '</'.$tag_name.'>';
+		$close_tag_length = strlen($close_tag);
+		if (strpos($tag_start, $open_tag) === 0) {
+			while (strpos($string, $tag_start) !== false) {
+				$max_recursion = 100;
+				$section_to_remove = null;
+				$section_start = strpos($string, $tag_start);
+				$search_offset = $section_start;
+				do {
+					$max_recursion--;
+					$section_end = strpos($string, $close_tag, $search_offset);
+					$search_offset = $section_end + $close_tag_length;
+					$section_to_remove = substr($string, $section_start, $section_end - $section_start + $close_tag_length);
+					$open_tag_count = substr_count($section_to_remove, $open_tag);
+					$close_tag_count = substr_count($section_to_remove, $close_tag);
+				} while ($open_tag_count > $close_tag_count && $max_recursion > 0);
+				$string = str_replace($section_to_remove, '', $string);
+			}
+		}
+		return $string;
+	}
 
-        function StripRecursiveHTMLSection($string, $tag_name, $tag_start) {
-            $open_tag = '<'.$tag_name;
-            $close_tag = '</'.$tag_name.'>';
-            $close_tag_length = strlen($close_tag);
-            if (strpos($tag_start, $open_tag) === 0) {
-                while (strpos($string, $tag_start) !== false) {
-                    $max_recursion = 100;
-                    $section_to_remove = null;
-                    $section_start = strpos($string, $tag_start);
-                    $search_offset = $section_start;
-                    do {
-                        $max_recursion--;
-                        $section_end = strpos($string, $close_tag, $search_offset);
-                        $search_offset = $section_end + $close_tag_length;
-                        $section_to_remove = substr($string, $section_start, $section_end - $section_start + $close_tag_length);
-                        $open_tag_count = substr_count($section_to_remove, $open_tag);
-                        $close_tag_count = substr_count($section_to_remove, $close_tag);
-                    } while ($open_tag_count > $close_tag_count && $max_recursion > 0);
-                    $string = str_replace($section_to_remove, '', $string);
-                }
-            }
-            return $string;
-        }
 
-        $feedUrl = 'https://feeds.feedburner.com/nakedsecurity?format=xml';
-        $html = $this->getSimpleHTMLDOM($feedUrl) or $this->returnServerError('Could not request '.$this->getName().': '.$feedUrl);
-        $limit = 0;
+	protected function parseItem($item){
+		$item = parent::parseItem($item);
 
-        foreach ($html->find('item') as $element) {
-            if ($limit < 10) {
+		$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
+		if(!$article_html){
+			$item['content'] = 'Could not request '.$this->getName().': '.$item['uri'];
+			return $item;
+		}
 
-                //Retrieve article Uri and get that page
-                $article_uri = $element->find('guid', 0)->plaintext;
-                $article_html = $this->getSimpleHTMLDOM($article_uri) or $this->returnServerError('Could not request '.$this->getName().': '.$article_uri);
+		$article_image = $article_html->find('img.wp-post-image', 0)->src;
+		$article_content = $article_html->find('div.entry-content', 0)->innertext;
+		$article_content = $this->StripRecursiveHTMLSection($article_content , 'div', '<div class="entry-prefix"');
+		$article_content = $this->StripRecursiveHTMLSection($article_content , 'script', '<script');
+		$article_content = $this->StripRecursiveHTMLSection($article_content , 'aside', '<aside');
+		$article_content = '<p><img src="'.$article_image.'" /></p><p><b>'.$item['content'].'</b></p>'.$article_content;
 
-                //Build article contents from corresponding elements
-                $article_title = trim($element->find('title', 0)->plaintext);
-                $article_image = $article_html->find('img.wp-post-image', 0)->src;
-                $article_summary = strip_tags(html_entity_decode($element->find('description', 0)->plaintext));
-                $article_content = $article_html->find('div.entry-content', 0)->innertext;
-                $article_content = StripRecursiveHTMLSection($article_content , 'div', '<div class="entry-prefix"');
-                $article_content = StripRecursiveHTMLSection($article_content , 'script', '<script');
-                $article_content = StripRecursiveHTMLSection($article_content , 'aside', '<aside');
-                $article_content = '<p><img src="'.$article_image.'" /></p><p><b>'.$article_summary.'</b></p>'.$article_content;
+		$item['content'] = $article_content;
 
-                //Build and add final item
-                $item = array();
-                $item['uri'] = $article_uri;
-                $item['title'] = $article_title;
-                $item['author'] = $article_html->find('a[rel=author]', 0)->plaintext;
-                $item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-                $item['content'] = $article_content;
-                $this->items[] = $item;
-                $limit++;
-            }
-        }
-    }
+		return $item;
+
+	}
+
+	public function collectData(){
+
+		$feedUrl = 'https://feeds.feedburner.com/nakedsecurity?format=xml';
+		$this->collectExpandableDatas($feedUrl);
+	}
 }
diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php
index 6374cf09..16a4a2f3 100644
--- a/bridges/NeuviemeArtBridge.php
+++ b/bridges/NeuviemeArtBridge.php
@@ -1,54 +1,55 @@
 <?php
-class NeuviemeArtBridge extends BridgeAbstract {
+class NeuviemeArtBridge extends FeedExpander {
 
-    const MAINTAINER = "ORelio";
-    const NAME = '9ème Art Bridge';
-    const URI = "http://www.9emeart.fr/";
-    const DESCRIPTION = "Returns the newest articles.";
+	const MAINTAINER = "ORelio";
+	const NAME = '9ème Art Bridge';
+	const URI = "http://www.9emeart.fr/";
+	const DESCRIPTION = "Returns the newest articles.";
 
-    public function collectData(){
+	private function StripWithDelimiters($string, $start, $end) {
+		while (strpos($string, $start) !== false) {
+			$section_to_remove = substr($string, strpos($string, $start));
+			$section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
+			$string = str_replace($section_to_remove, '', $string);
+		} return $string;
+	}
 
-        function StripWithDelimiters($string, $start, $end) {
-            while (strpos($string, $start) !== false) {
-                $section_to_remove = substr($string, strpos($string, $start));
-                $section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
-                $string = str_replace($section_to_remove, '', $string);
-            } return $string;
-        }
+	protected function parseItem($item){
+		$item = parent::parseItem($item);
 
-        $feedUrl = self::URI.'9emeart.rss';
-        $html = $this->getSimpleHTMLDOM($feedUrl) or $this->returnServerError('Could not request 9eme Art: '.$feedUrl);
-        $limit = 0;
+		$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
+		if(!$article_html){
+			$item['content'] = 'Could not request 9eme Art: '.$item['uri'];
+			return $item;
+		}
 
-        foreach ($html->find('item') as $element) {
-            if ($limit < 5) {
+		$article_image = '';
+		foreach ($article_html->find('img.img_full') as $img){
+			if ($img->alt == $item['title']){
+				$article_image = self::URI.$img->src;
+				break;
+			}
+		}
 
-                //Retrieve article Uri and get that page
-                $article_uri = $element->find('guid', 0)->plaintext;
-                $article_html = $this->getSimpleHTMLDOM($article_uri) or $this->returnServerError('Could not request 9eme Art: '.$article_uri);
+		$article_content='';
+		if($article_image){
+			$article_content = '<p><img src="'.$article_image.'" /></p>';
+		}
+		$article_content .= str_replace(
+			'src="/', 'src="'.self::URI,
+			$article_html->find('div.newsGenerique_con', 0)->innertext
+		);
+		$article_content = $this->StripWithDelimiters($article_content, '<script', '</script>');
+		$article_content = $this->StripWithDelimiters($article_content, '<style', '</style>');
+		$article_content = $this->StripWithDelimiters($article_content, '<link', '>');
 
-                //Build article contents from corresponding elements
-                $article_title = trim($element->find('title', 0)->plaintext);
-                $article_image = $element->find('enclosure', 0)->url;
-                foreach ($article_html->find('img.img_full') as $img)
-                    if ($img->alt == $article_title)
-                        $article_image = self::URI.$img->src;
-                $article_content = '<p><img src="'.$article_image.'" /></p>'
-                    .str_replace('src="/', 'src="'.self::URI, $article_html->find('div.newsGenerique_con', 0)->innertext);
-                $article_content = StripWithDelimiters($article_content, '<script', '</script>');
-                $article_content = StripWithDelimiters($article_content, '<style', '</style>');
-                $article_content = StripWithDelimiters($article_content, '<link', '>');
+		$item['content'] = $article_content;
 
-                //Build and add final item
-                $item = array();
-                $item['uri'] = $article_uri;
-                $item['title'] = $article_title;
-                $item['author'] = $article_html->find('a[class=upp transition_fast upp]', 0)->plaintext;
-                $item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-                $item['content'] = $article_content;
-                $this->items[] = $item;
-                $limit++;
-            }
-        }
-    }
+		return $item;
+	}
+
+	public function collectData(){
+		$feedUrl = self::URI.'9emeart.rss';
+		$this->collectExpandableDatas($feedUrl);
+	}
 }
diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php
index ab18950a..ae08ec2a 100644
--- a/bridges/Rue89Bridge.php
+++ b/bridges/Rue89Bridge.php
@@ -1,42 +1,22 @@
 <?php
-class Rue89Bridge extends BridgeAbstract{
+class Rue89Bridge extends FeedExpander {
 
 	const MAINTAINER = "pit-fgfjiudghdf";
 	const NAME = "Rue89";
 	const URI = "http://rue89.nouvelobs.com/";
 	const DESCRIPTION = "Returns the 5 newest posts from Rue89 (full text)";
 
-	private function rue89getDatas($url){
+	protected function parseItem($item){
+		$item = parent::parseItem($item);
 
-		$url = "http://api.rue89.nouvelobs.com/export/mobile2/node/" . str_replace(" ", "", substr($url, -8)) . "/full";
+		$url = "http://api.rue89.nouvelobs.com/export/mobile2/node/" . str_replace(" ", "", substr($item['uri'], -8)) . "/full";
 		$datas = json_decode($this->getContents($url), true);
+		$item['content'] = $datas['node']['body'];
 
-		return $datas["node"];
-
+		return $item;
 	}
 
     public function collectData(){
-
-        $html = $this->getSimpleHTMLDOM('http://api.rue89.nouvelobs.com/feed') or $this->returnServerError('Could not request Rue89.');
-
-        $limit = 0;
-        foreach($html->find('item') as $element) {
-
-        	if($limit < 5) {
-
-				$datas = $this->rue89getDatas(str_replace('#commentaires', '', ($element->find('comments', 0)->plaintext)));
-
-				$item = array();
-				$item['title'] = $datas["title"];
-				$item['author'] = $datas["author"][0]["name"];
-				$item['timestamp'] = $datas["updated"];
-				$item['content'] = $datas["body"];
-				$item['uri'] = $datas["url"];
-
-				$this->items[] = $item;
-
-			}
-        }
-
+		$this->collectExpandableDatas('http://api.rue89.nouvelobs.com/feed');
     }
 }
diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php
index b4efc697..f48bffa8 100644
--- a/bridges/SiliconBridge.php
+++ b/bridges/SiliconBridge.php
@@ -1,61 +1,41 @@
 <?php
-class SiliconBridge extends BridgeAbstract {
+class SiliconBridge extends FeedExpander {
 
 	const MAINTAINER = "ORelio";
 	const NAME = 'Silicon Bridge';
 	const URI = 'http://www.silicon.fr/';
 	const DESCRIPTION = "Returns the newest articles.";
 
-    public function collectData(){
+	protected function parseItem($item){
+		$item = parent::parseItem($item);
 
-        function StripCDATA($string) {
-            $string = str_replace('<![CDATA[', '', $string);
-            $string = str_replace(']]>', '', $string);
-            return $string;
-        }
+		$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
+		if(!$article_html){
+			$item['content'] .= '<p>Could not request Silicon: '.$item['uri'].'</p>';
+			return $item;
+		}
 
-        $feedUrl = self::URI.'feed';
-        $html = $this->getSimpleHTMLDOM($feedUrl)
-          or $this->returnServerError('Could not request Silicon: '.$feedUrl);
-        $limit = 0;
+		$article_content = '<p><b>'.$article_html->find('div.entry-excerpt', 0)->plaintext.'</b></p>'
+			.$article_html->find('div.entry-content', 0)->innertext;
 
-        foreach($html->find('item') as $element) {
-            if($limit < 5) {
+		//Remove useless scripts left in the page
+		while (strpos($article_content, '<script') !== false) {
+			$script_section = substr($article_content, strpos($article_content, '<script'));
+			$script_section = substr($script_section, 0, strpos($script_section, '</script>') + 9);
+			$article_content = str_replace($script_section, '', $article_content);
+		}
 
-                //Retrieve article Uri and get that page
-                $article_uri = $element->innertext;
-                $article_uri = substr($article_uri, strpos($article_uri, '<link>') + 6);
-                $article_uri = substr($article_uri, 0, strpos($article_uri, '</link>'));
-                $article_html = $this->getSimpleHTMLDOM($article_uri)
-                  or $this->returnServerError('Could not request Silicon: '.$article_uri);
+		$item['content'] = $article_content;
 
-                //Build article contents from corresponding elements
-                $thumbnailUri = $element->find('enclosure', 0)->url;
-                $article_content = '<p><img src="'.$thumbnailUri.'" /></p>'
-                    .'<p><b>'.$article_html->find('div.entry-excerpt', 0)->plaintext.'</b></p>'
-                    .$article_html->find('div.entry-content', 0)->innertext;
+		return $item;
+	}
 
-                //Remove useless scripts left in the page
-                while (strpos($article_content, '<script') !== false) {
-                    $script_section = substr($article_content, strpos($article_content, '<script'));
-                    $script_section = substr($script_section, 0, strpos($script_section, '</script>') + 9);
-                    $article_content = str_replace($script_section, '', $article_content);
-                }
+	public function collectData(){
+		$feedUrl = self::URI.'feed';
+		$this->collectExpandableDatas($feedUrl);
+	}
 
-                //Build and add final item
-                $item = array();
-                $item['uri'] = $article_uri;
-                $item['title'] = StripCDATA($element->find('title', 0)->innertext);
-                $item['author'] = StripCDATA($element->find('dc:creator', 0)->innertext);
-                $item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-                $item['content'] = $article_content;
-                $this->items[] = $item;
-                $limit++;
-            }
-        }
-    }
-
-    public function getCacheDuration() {
-        return 1800; // 30 minutes
-    }
+	public function getCacheDuration() {
+		return 1800; // 30 minutes
+	}
 }
diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php
index 52fb74a1..9aa18c74 100644
--- a/bridges/WeLiveSecurityBridge.php
+++ b/bridges/WeLiveSecurityBridge.php
@@ -1,59 +1,41 @@
 <?php
-class WeLiveSecurityBridge extends BridgeAbstract {
+class WeLiveSecurityBridge extends FeedExpander {
 
-    const MAINTAINER = 'ORelio';
-    const NAME = 'We Live Security';
-    const URI = 'http://www.welivesecurity.com/';
-    const DESCRIPTION = 'Returns the newest articles.';
+	const MAINTAINER = 'ORelio';
+	const NAME = 'We Live Security';
+	const URI = 'http://www.welivesecurity.com/';
+	const DESCRIPTION = 'Returns the newest articles.';
 
-    public function collectData(){
+	private function StripWithDelimiters($string, $start, $end) {
+		while (strpos($string, $start) !== false) {
+			$section_to_remove = substr($string, strpos($string, $start));
+			$section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
+			$string = str_replace($section_to_remove, '', $string);
+		} return $string;
+	}
 
-        function ExtractFromDelimiters($string, $start, $end) {
-            if (strpos($string, $start) !== false) {
-                $section_retrieved = substr($string, strpos($string, $start) + strlen($start));
-                $section_retrieved = substr($section_retrieved, 0, strpos($section_retrieved, $end));
-                return $section_retrieved;
-            } return false;
-        }
 
-        function StripWithDelimiters($string, $start, $end) {
-            while (strpos($string, $start) !== false) {
-                $section_to_remove = substr($string, strpos($string, $start));
-                $section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
-                $string = str_replace($section_to_remove, '', $string);
-            } return $string;
-        }
+	protected function parseItem($item){
+		$item = parent::parseItem($item);
 
-        $feed = $this->getURI().'feed/';
-        $html = $this->getSimpleHTMLDOM($feed) or $this->returnServerError('Could not request '.$this->getName().': '.$feed);
-        $limit = 0;
+		$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
+		if(!$article_html){
+			$item['content'] .= '<p>Could not request '.$this->getName().': '.$item['uri'].'</p>';
+			return $item;
+		}
 
-        foreach ($html->find('item') as $element) {
-            if ($limit < 5) {
+		$article_content = $article_html->find('div.wlistingsingletext', 0)->innertext;
+		$article_content = $this->StripWithDelimiters($article_content, '<script', '</script>');
+		$article_content = '<p><b>'.$item['content'].'</b></p>'
+			.trim($article_content);
 
-                $article_image = $element->find('image', 0)->plaintext;
-                $article_url = ExtractFromDelimiters($element->innertext, '<link>', '</link>');
-                $article_summary = ExtractFromDelimiters($element->innertext, '<description><![CDATA[<p>', '</p>');
-                $article_html = $this->getContents($article_url) or $this->returnServerError('Could not request '.$this->getName().': '.$article_url);
-                if (substr($article_html, 0, 2) == "\x1f\x8b") //http://www.gzip.org/zlib/rfc-gzip.html#header-trailer -> GZip ID1
-                    $article_html = gzdecode($article_html);   //Response is GZipped even if we didn't accept GZip!? Let's decompress...
-                $article_html = str_get_html($article_html);   //Now we have our HTML data. But still, that's an important HTTP violation...
-                $article_content = $article_html->find('div.wlistingsingletext', 0)->innertext;
-                $article_content = StripWithDelimiters($article_content, '<script', '</script>');
-                $article_content = '<p><img src="'.$article_image.'" /></p>'
-                    .'<p><b>'.$article_summary.'</b></p>'
-                    .trim($article_content);
+		$item['content'] = $article_content;
 
-                $item = array();
-                $item['uri'] = $article_url;
-                $item['title'] = $element->find('title', 0)->plaintext;
-                $item['author'] = $article_html->find('a[rel=author]', 0)->plaintext;
-                $item['timestamp'] = strtotime($element->find('pubDate', 0)->plaintext);
-                $item['content'] = $article_content;
-                $this->items[] = $item;
-                $limit++;
+		return $item;
+	}
 
-            }
-        }
-    }
+	public function collectData(){
+		$feed = static::URI.'feed/';
+		$this->collectExpandableDatas($feed);
+	}
 }

From 2744c13735b483c0048fbcf0e2642c04ffc730ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Wed, 14 Sep 2016 13:36:44 +0200
Subject: [PATCH 04/11] [FeedExpander] fix feeds using guid tag as item uri
 provider
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 lib/FeedExpander.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/FeedExpander.php b/lib/FeedExpander.php
index 8de56a13..38b6ad03 100644
--- a/lib/FeedExpander.php
+++ b/lib/FeedExpander.php
@@ -151,6 +151,15 @@ abstract class FeedExpander extends BridgeAbstract {
 		$namespaces = $feedItem->getNamespaces(true);
 		if(isset($namespaces['dc'])) $dc = $feedItem->children($namespaces['dc']);
 
+		if(isset($feedItem->guid)){
+			foreach($feedItem->guid->attributes() as $attribute=>$value){
+				if($attribute === 'isPermaLink' && $value === "true"){
+					$item['uri'] = $feedItem->guid;
+					break;
+				}
+			}
+		}
+
 		if(isset($feedItem->pubDate)){
 			$item['timestamp'] = strtotime($feedItem->pubDate);
 		} elseif(isset($dc->date)){

From b5358d6ceaf2bfb9325164aee0924edb5323589b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Wed, 14 Sep 2016 23:01:54 +0200
Subject: [PATCH 05/11] [WordPressBridge] make it FeedExpander
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/WordPressBridge.php | 134 +++++++++---------------------------
 1 file changed, 34 insertions(+), 100 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 6c7d5f6d..114e6514 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -1,10 +1,7 @@
 <?php
 define('WORDPRESS_TYPE_ATOM', 1); // Content is of type ATOM
 define('WORDPRESS_TYPE_RSS', 2); // Content is of type RSS
-class WordPressBridge extends BridgeAbstract {
-
-	public $sitename; // Name of the site
-
+class WordPressBridge extends FeedExpander {
 	const MAINTAINER = "aledeg";
 	const NAME = "Wordpress Bridge";
 	const URI = "https://wordpress.org/";
@@ -17,112 +14,49 @@ class WordPressBridge extends BridgeAbstract {
 		)
 	));
 
-	// Replaces all 'link' tags with 'url' for simplehtmldom to actually find 'links' ('url')
-	private function ReplaceLinkTagsWithUrlTags($element){
-		// We need to fix the 'link' tag as simplehtmldom cannot parse it (just rename it and load back as dom)
-		$element_text = $element->outertext;
-		$element_text = str_replace('<link>', '<url>', $element_text);
-		$element_text = str_replace('</link>', '</url>', $element_text);
-		$element_text = str_replace('<link ', '<url ', $element_text);
-		return str_get_html($element_text);
-	}
-
-	private function StripCDATA($string) {
-		$string = str_replace('<![CDATA[', '', $string);
-		$string = str_replace(']]>', '', $string);
-		return $string;
-	}
-
-	private function ClearContent($content) {
+	private function clearContent($content) {
 		$content = preg_replace('/<script[^>]*>[^<]*<\/script>/', '', $content);
 		$content = preg_replace('/<div class="wpa".*/', '', $content);
 		$content = preg_replace('/<form.*\/form>/', '', $content);
 		return $content;
 	}
 
+	protected function parseItem($newItem){
+		$item=parent::parseItem($newItem);
+
+		$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
+
+		$article=null;
+		switch(true){
+		case !is_null($article_html->find('article',0)):
+			// most common content div
+			$article = $article_html->find('article', 0);
+			break;
+		case !is_null($article_html->find('.single-content',0)):
+			// another common content div
+			$article = $article_html->find('.single-content', 0);
+			break;
+		case !is_null($article_html->find('.post',0)):
+			// for old WordPress themes without HTML5
+			$article = $article_html->find('.post', 0);
+			break;
+		}
+
+		if(!is_null($article)){
+			$item['content'] = $this->clearContent($article->innertext);
+		}
+
+		return $item;
+	}
+
 	public function collectData(){
-
-		$html = $this->getSimpleHTMLDOM($this->getURI().'/feed/atom')
-				or $this->returnServerError("Could not request ".$this->getURI().'/feed/atom');
-
-		// Notice: We requested an ATOM feed, however some sites return RSS feeds instead!
-		if($html->find('entry')){
-				$type=WORDPRESS_TYPE_ATOM;
-		}else if($html->find('item')){
-				$type=WORDPRESS_TYPE_RSS;
-		}else{
-				$type=WORDPRESS_TYPE_ATOM; // Make ATOM default
+		if(substr($this->getInput(url),0,srlen('http'))!=='http'){
+			// just in case someone find a way to access local files by playing with the url
+			returnClientError('The url parameter must either refer to http or https protocol.');
 		}
 
-		if($type === WORDPRESS_TYPE_RSS)
-			$posts = $html->find('item');
-		else
-			$posts = $html->find('entry');
+		$this->collectExpandableDatas($this->getURI().'/feed/atom');
 
-		if(!empty($posts) ) {
-			$this->sitename = $html->find('title', 0)->plaintext;
-			$i=0;
-
-			foreach ($posts as $article) {
-				if($i < 3) {
-
-					$item = array();
-
-					$article = $this->ReplaceLinkTagsWithUrlTags($article);
-
-					if($type === WORDPRESS_TYPE_RSS){
-						$item['uri'] = $article->find('url', 0)->innertext; // 'link' => 'url'!
-						$item['title'] = $article->find('title', 0)->plaintext;
-						$item['author'] = trim($this->StripCDATA($article->find('dc:creator', 0)->innertext));
-						$item['timestamp'] = strtotime($article->find('pubDate', 0)->innertext);
-					} else {
-						$item['uri'] = $article->find('url', 0)->getAttribute('href'); // 'link' => 'url'!
-						$item['title'] = $this->StripCDATA($article->find('title', 0)->plaintext);
-						$item['author'] = trim($article->find('author', 0)->innertext);
-						$item['timestamp'] = strtotime($article->find('updated', 0)->innertext);
-					}
-
-					$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
-
-					// Attempt to find most common content div
-					if(!isset($item['content'])){
-						$article = $article_html->find('article', 0);
-						if(!empty($article)){
-							$item['content'] = $this->ClearContent($article->innertext);
-						}
-					}
-
-					// another common content div
-					if(!isset($item['content'])){
-						$article = $article_html->find('.single-content', 0);
-						if(!empty($article)){
-							$item['content'] = $this->ClearContent($article->innertext);
-						}
-					}
-
-					// for old WordPress themes without HTML5
-					if(!isset($item['content'])){
-						$article = $article_html->find('.post', 0);
-						if(!empty($article)){
-							$item['content'] = $this->ClearContent($article->innertext);
-						}
-					}
-
-					$this->items[] = $item;
-					$i++;
-				}
-			}
-		} else {
-			$this->returnServerError("Sorry, ".$this->getURI()." doesn't seem to be a Wordpress blog.");
-		}
-	}
-
-	public function getURI(){
-		return $this->getInput('url');
-	}
-
-	public function getName() {
-		return "{$this->sitename} - Wordpress Bridge";
 	}
 
 	public function getCacheDuration() {

From 4c3b80fca915267336efd0defc0e6eb761da9924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Thu, 15 Sep 2016 11:13:18 +0200
Subject: [PATCH 06/11] [WordPressBridge] fix fatal errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/WordPressBridge.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 114e6514..0e9fd43b 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -49,13 +49,18 @@ class WordPressBridge extends FeedExpander {
 		return $item;
 	}
 
+	public function getURI(){
+		$url = $this->getInput('url');
+		return $url;
+	}
+
 	public function collectData(){
-		if(substr($this->getInput(url),0,srlen('http'))!=='http'){
+		if(substr($this->getInput('url'),0,strlen('http'))!=='http'){
 			// just in case someone find a way to access local files by playing with the url
-			returnClientError('The url parameter must either refer to http or https protocol.');
+			$this->returnClientError('The url parameter must either refer to http or https protocol.');
 		}
 
-		$this->collectExpandableDatas($this->getURI().'/feed/atom');
+		$this->collectExpandableDatas($this->getURI().'/feed/atom/');
 
 	}
 

From ca0842ccf8f0c3990f3d55731d60a9921a573405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Thu, 15 Sep 2016 12:34:07 +0200
Subject: [PATCH 07/11] [FeedExpander] widen guid use as uri provider
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 lib/FeedExpander.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/FeedExpander.php b/lib/FeedExpander.php
index 38b6ad03..46caed15 100644
--- a/lib/FeedExpander.php
+++ b/lib/FeedExpander.php
@@ -153,7 +153,10 @@ abstract class FeedExpander extends BridgeAbstract {
 
 		if(isset($feedItem->guid)){
 			foreach($feedItem->guid->attributes() as $attribute=>$value){
-				if($attribute === 'isPermaLink' && $value === "true"){
+				if($attribute === 'isPermaLink' && (
+					$value === 'true' ||
+					filter_var($feedItem->guid,FILTER_VALIDATE_URL)
+				)){
 					$item['uri'] = $feedItem->guid;
 					break;
 				}

From b6245a90c8d4724155973eca7852f9e2830c50e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Thu, 15 Sep 2016 12:35:52 +0200
Subject: [PATCH 08/11] [WordPressBridge] allow other bridges to use it as a
 parent class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/WordPressBridge.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 0e9fd43b..cc3478c1 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -51,11 +51,14 @@ class WordPressBridge extends FeedExpander {
 
 	public function getURI(){
 		$url = $this->getInput('url');
+		if(empty($url)){
+			$url = static::URI;
+		}
 		return $url;
 	}
 
 	public function collectData(){
-		if(substr($this->getInput('url'),0,strlen('http'))!=='http'){
+		if($this->getInput('url') && substr($this->getInput('url'),0,strlen('http'))!=='http'){
 			// just in case someone find a way to access local files by playing with the url
 			$this->returnClientError('The url parameter must either refer to http or https protocol.');
 		}

From 43ac961284fb836319316b55eaea035cbb0eed60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Thu, 15 Sep 2016 12:36:24 +0200
Subject: [PATCH 09/11] [WordPressBridge] add another case of content
 extraction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/WordPressBridge.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index cc3478c1..87ff650a 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -36,6 +36,11 @@ class WordPressBridge extends FeedExpander {
 			// another common content div
 			$article = $article_html->find('.single-content', 0);
 			break;
+		case !is_null($article_html->find('.post-content',0)):
+			// another common content div
+			$article = $article_html->find('.post-content', 0);
+			break;
+
 		case !is_null($article_html->find('.post',0)):
 			// for old WordPress themes without HTML5
 			$article = $article_html->find('.post', 0);

From 3f64d2d65a747504992dda951aaa616827c0db04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Thu, 15 Sep 2016 12:40:26 +0200
Subject: [PATCH 10/11] [bridges] make them WordPressBridge derivatives
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The specific content filtering used in these bridges will need to
be reintegrated later as part of the bridge or as part of the
WordPressBridge if they are considered generic enough filters,
such as the already existing WordPressBridge <script> removal filter.

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/ArstechnicaBridge.php     | 27 +++-----------
 bridges/FreenewsBridge.php        | 21 +++--------
 bridges/LeJournalDuGeekBridge.php | 39 +++------------------
 bridges/NakedSecurityBridge.php   | 58 +++----------------------------
 bridges/NumeramaBridge.php        | 26 ++++----------
 bridges/SiliconBridge.php         | 34 +++---------------
 bridges/ZatazBridge.php           | 36 +++----------------
 7 files changed, 32 insertions(+), 209 deletions(-)

diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
index 0146a42b..0c90fc50 100644
--- a/bridges/ArstechnicaBridge.php
+++ b/bridges/ArstechnicaBridge.php
@@ -1,30 +1,11 @@
 <?php
-class ArstechnicaBridge extends FeedExpander {
+require_once('WordPressBridge.php');
+
+class ArstechnicaBridge extends WordPressBridge {
 
 	const MAINTAINER = "prysme";
 	const NAME = "ArstechnicaBridge";
 	const URI = "http://arstechnica.com";
 	const DESCRIPTION = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
-
-	protected function parseItem($item){
-		$item = parent::parseItem($item);
-
-		$html = $this->getSimpleHTMLDOMCached($item['uri']);
-		if(!$html){
-			$item['content'] .= '<p>Requesting full article failed.</p>';
-		}else{
-			$item['content'] = $html->find('.article-guts', 0);
-		}
-
-		return $item;
-	}
-
-	public function collectData(){
-		$this->collectExpandableDatas('http://feeds.arstechnica.com/arstechnica/index/');
-	}
-
-	public function getCacheDuration() {
-		return 7200; // 2h
-	}
-
+	const PARAMETERS = array();
 }
diff --git a/bridges/FreenewsBridge.php b/bridges/FreenewsBridge.php
index ab4d3d84..f56a0834 100644
--- a/bridges/FreenewsBridge.php
+++ b/bridges/FreenewsBridge.php
@@ -1,22 +1,11 @@
 <?php
-class FreenewsBridge extends FeedExpander {
+require_once('WordPressBridge.php');
+
+class FreenewsBridge extends WordPressBridge {
 
     const MAINTAINER = "mitsukarenai";
     const NAME = "Freenews";
     const URI = "http://freenews.fr";
-    const DESCRIPTION = "Un site d'actualité pour les freenautes (mais ne parlant pas que de la freebox). Ne rentrez pas d'id si vous voulez accéder aux actualités générales.";
-
-    public function collectData(){
-        parent::collectExpandableDatas('http://feeds.feedburner.com/Freenews-Freebox?format=xml');
-    }
-
-    protected function parseItem($newsItem) {
-        $item = parent::parseItem($newsItem);
-
-        $articlePage = $this->getSimpleHTMLDOMCached($item['uri']);
-        $content = $articlePage->find('.post-container', 0);
-        $item['content'] = $content->innertext;
-
-        return $item;
-    }
+    const DESCRIPTION = "Un site d'actualité pour les freenautes (mais ne parlant pas que de la freebox)";
+	const PARAMETERS = array();
 }
diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index a82d815a..0d6a2d11 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -1,42 +1,13 @@
 <?php
-class LeJournalDuGeekBridge extends FeedExpander {
+require_once('WordPressBridge.php');
+
+class LeJournalDuGeekBridge extends WordPressBridge{
 
 	const MAINTAINER = "polopollo";
 	const NAME = "journaldugeek.com (FR)";
 	const URI = "http://www.journaldugeek.com/";
-	const DESCRIPTION = "Returns the 5 newest posts from LeJournalDuGeek (full text).";
-
-	public function collectData(){
-		$this->collectExpandableDatas(self::URI . 'rss', 5);
-	}
-
-	protected function parseItem($newsItem){
-		$item = parent::parseItem($newsItem);
-		$item['content'] = $this->LeJournalDuGeekExtractContent($item['uri']);
-		return $item;
-	}
-
-	private function LeJournalDuGeekExtractContent($url) {
-		$articleHTMLContent = $this->getSimpleHTMLDOMCached($url);
-		$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 = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $text);
-		$text = strip_tags($text, '<p><b><a><blockquote><img><em><br/><br><ul><li>');
-		return $text;
-	}
+	const DESCRIPTION = "Returns the newest posts from LeJournalDuGeek (full text).";
+	const PARAMETERS = array();
 
 	public function getCacheDuration(){
 		return 1800; // 30min
diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php
index 43607725..ed2fb3d0 100644
--- a/bridges/NakedSecurityBridge.php
+++ b/bridges/NakedSecurityBridge.php
@@ -1,61 +1,11 @@
 <?php
-class NakedSecurityBridge extends FeedExpander {
+require_once('WordPressBridge.php');
+
+class NakedSecurityBridge extends WordPressBridge {
 
 	const MAINTAINER = 'ORelio';
 	const NAME = 'Naked Security';
 	const URI = 'https://nakedsecurity.sophos.com/';
 	const DESCRIPTION = 'Returns the newest articles.';
-
-	private function StripRecursiveHTMLSection($string, $tag_name, $tag_start) {
-		$open_tag = '<'.$tag_name;
-		$close_tag = '</'.$tag_name.'>';
-		$close_tag_length = strlen($close_tag);
-		if (strpos($tag_start, $open_tag) === 0) {
-			while (strpos($string, $tag_start) !== false) {
-				$max_recursion = 100;
-				$section_to_remove = null;
-				$section_start = strpos($string, $tag_start);
-				$search_offset = $section_start;
-				do {
-					$max_recursion--;
-					$section_end = strpos($string, $close_tag, $search_offset);
-					$search_offset = $section_end + $close_tag_length;
-					$section_to_remove = substr($string, $section_start, $section_end - $section_start + $close_tag_length);
-					$open_tag_count = substr_count($section_to_remove, $open_tag);
-					$close_tag_count = substr_count($section_to_remove, $close_tag);
-				} while ($open_tag_count > $close_tag_count && $max_recursion > 0);
-				$string = str_replace($section_to_remove, '', $string);
-			}
-		}
-		return $string;
-	}
-
-
-	protected function parseItem($item){
-		$item = parent::parseItem($item);
-
-		$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
-		if(!$article_html){
-			$item['content'] = 'Could not request '.$this->getName().': '.$item['uri'];
-			return $item;
-		}
-
-		$article_image = $article_html->find('img.wp-post-image', 0)->src;
-		$article_content = $article_html->find('div.entry-content', 0)->innertext;
-		$article_content = $this->StripRecursiveHTMLSection($article_content , 'div', '<div class="entry-prefix"');
-		$article_content = $this->StripRecursiveHTMLSection($article_content , 'script', '<script');
-		$article_content = $this->StripRecursiveHTMLSection($article_content , 'aside', '<aside');
-		$article_content = '<p><img src="'.$article_image.'" /></p><p><b>'.$item['content'].'</b></p>'.$article_content;
-
-		$item['content'] = $article_content;
-
-		return $item;
-
-	}
-
-	public function collectData(){
-
-		$feedUrl = 'https://feeds.feedburner.com/nakedsecurity?format=xml';
-		$this->collectExpandableDatas($feedUrl);
-	}
+	const PARAMETERS = array();
 }
diff --git a/bridges/NumeramaBridge.php b/bridges/NumeramaBridge.php
index 34296b5c..39d73409 100644
--- a/bridges/NumeramaBridge.php
+++ b/bridges/NumeramaBridge.php
@@ -1,29 +1,15 @@
 <?php
-class NumeramaBridge extends FeedExpander {
+require_once('WordPressBridge.php');
+
+class NumeramaBridge extends WordPressBridge {
 
     const MAINTAINER = 'mitsukarenai';
     const NAME = 'Numerama';
     const URI = 'http://www.numerama.com/';
-    const DESCRIPTION = 'Returns the 5 newest posts from Numerama (full text)';
-
-    public function collectData(){
-        $this->collectExpandableDatas(self::URI . 'feed/', 5);
-    }
-
-    protected function parseItem($newsItem){
-        $item = parent::parseItem($newsItem);
-        $item['content'] = $this->ExtractContent($item['uri']);
-        return $item;
-    }
-
-    private function ExtractContent($url){
-        $article_html = $this->getSimpleHTMLDOMCached('Could not request Numerama: '.$url);
-        $contents = $article_html->find('section[class=related-article]', 0)->innertext = ''; // remove related articles block
-        $contents = '<img alt="" style="max-width:300px;" src="'.$article_html->find('meta[property=og:image]', 0)->getAttribute('content').'">'; // add post picture
-        return  $contents . $article_html->find('article[class=post-content]', 0)->innertext; // extract the post
-    }
-
+    const DESCRIPTION = 'Returns the newest posts from Numerama (full text)';
+	const PARAMETERS = array();
     public function getCacheDuration() {
+
         return 1800; // 30min
     }
 }
diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php
index f48bffa8..90b96417 100644
--- a/bridges/SiliconBridge.php
+++ b/bridges/SiliconBridge.php
@@ -1,39 +1,13 @@
 <?php
-class SiliconBridge extends FeedExpander {
+require_once('WordPressBridge.php');
+
+class SiliconBridge extends WordPressBridge {
 
 	const MAINTAINER = "ORelio";
 	const NAME = 'Silicon Bridge';
 	const URI = 'http://www.silicon.fr/';
 	const DESCRIPTION = "Returns the newest articles.";
-
-	protected function parseItem($item){
-		$item = parent::parseItem($item);
-
-		$article_html = $this->getSimpleHTMLDOMCached($item['uri']);
-		if(!$article_html){
-			$item['content'] .= '<p>Could not request Silicon: '.$item['uri'].'</p>';
-			return $item;
-		}
-
-		$article_content = '<p><b>'.$article_html->find('div.entry-excerpt', 0)->plaintext.'</b></p>'
-			.$article_html->find('div.entry-content', 0)->innertext;
-
-		//Remove useless scripts left in the page
-		while (strpos($article_content, '<script') !== false) {
-			$script_section = substr($article_content, strpos($article_content, '<script'));
-			$script_section = substr($script_section, 0, strpos($script_section, '</script>') + 9);
-			$article_content = str_replace($script_section, '', $article_content);
-		}
-
-		$item['content'] = $article_content;
-
-		return $item;
-	}
-
-	public function collectData(){
-		$feedUrl = self::URI.'feed';
-		$this->collectExpandableDatas($feedUrl);
-	}
+	const PARAMETERS = array();
 
 	public function getCacheDuration() {
 		return 1800; // 30 minutes
diff --git a/bridges/ZatazBridge.php b/bridges/ZatazBridge.php
index b805d604..d1e08197 100644
--- a/bridges/ZatazBridge.php
+++ b/bridges/ZatazBridge.php
@@ -1,41 +1,13 @@
 <?php
-class ZatazBridge extends BridgeAbstract {
+require_once('WordPressBridge.php');
+
+class ZatazBridge extends WordPressBridge{
 
 	const MAINTAINER = "aledeg";
 	const NAME = 'Zataz Magazine';
 	const URI = 'http://www.zataz.com';
 	const DESCRIPTION = "ZATAZ Magazine - S'informer, c'est déjà se sécuriser";
-
-	public function collectData(){
-		$html = $this->getSimpleHTMLDOM(self::URI) or $this->returnServerError('Could not request ' . self::URI);
-
-		$recent_posts = $html->find('#recent-posts-3', 0)->find('ul', 0)->find('li');
-		foreach ($recent_posts as $article) {
-			if (count($this->items) < 5) {
-				$uri = $article->find('a', 0)->href;
-				$this->items[] = $this->getDetails($uri);
-			}
-		}
-	}
-
-	private function getDetails($uri) {
-		$html = $this->getSimpleHTMLDOM($uri) or exit;
-
-		$item = array();
-
-		$article = $html->find('.gdl-blog-full', 0);
-		$item['uri'] = $uri;
-		$item['title'] = $article->find('.blog-title', 0)->find('a', 0)->innertext;
-		$item['content'] = $article->find('.blog-content', 0)->innertext;
-		$item['timestamp'] = $this->getTimestampFromDate($article->find('.blog-date', 0)->find('a', 0)->href);
-		return $item;
-	}
-
-	private function getTimestampFromDate($uri) {
-		preg_match('/\d{4}\/\d{2}\/\d{2}/', $uri, $matches);
-		$date = new \DateTime($matches[0]);
-		return $date->format('U');
-	}
+	const PARAMETERS = array();
 
 	public function getCacheDuration() {
 		return 7200; // 2h

From 10ac8085804e11d8e6d43d4e75e6466dabf28967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Thu, 15 Sep 2016 13:14:24 +0200
Subject: [PATCH 11/11] [WordPressBridge] remove useless code and fix
 description
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/WordPressBridge.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 87ff650a..d686a98f 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -1,11 +1,9 @@
 <?php
-define('WORDPRESS_TYPE_ATOM', 1); // Content is of type ATOM
-define('WORDPRESS_TYPE_RSS', 2); // Content is of type RSS
 class WordPressBridge extends FeedExpander {
 	const MAINTAINER = "aledeg";
 	const NAME = "Wordpress Bridge";
 	const URI = "https://wordpress.org/";
-	const DESCRIPTION = "Returns the 3 newest full posts of a Wordpress blog";
+	const DESCRIPTION = "Returns the newest full posts of a Wordpress powered website";
 
 	const PARAMETERS = array( array(
 		'url'=>array(