From 94289511e151dd7d1421635807f977cb9a165449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 3 Jul 2016 19:04:32 +0200
Subject: [PATCH 001/149] [GithubIssueBridge] fix parameters
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/GithubIssueBridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php
index eaf4d9d..4c56cf0 100644
--- a/bridges/GithubIssueBridge.php
+++ b/bridges/GithubIssueBridge.php
@@ -14,7 +14,7 @@ class GithubIssueBridge extends BridgeAbstract{
     $this->description = 'Returns the comments of a github project issue';
     $this->update = '2016-06-25';
 
-    $this->parameters=
+    $this->parameters[]=
       '[
          {
            "name" : "User name",

From 80651273b3cc841d5a3776e14a82884f1971a93b Mon Sep 17 00:00:00 2001
From: ORelio <oreliogitantispam.l0gin@spamgourmet.com>
Date: Tue, 26 Jul 2016 21:19:39 +0200
Subject: [PATCH 002/149] [ZDNet] Auto-insert image

---
 bridges/ZDNetBridge.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 4267b98..79924aa 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -6,8 +6,8 @@ class ZDNetBridge extends BridgeAbstract {
         $this->maintainer = 'ORelio';
         $this->name = $this->getName();
         $this->uri = $this->getURI();
-        $this->description = 'Returns the newest articles.';
-        $this->update = '2016-07-18';
+        $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
+        $this->update = '2016-07-20';
 
         $this->parameters[] =
         // http://www.zdnet.com/zdnet.opml
@@ -261,7 +261,7 @@ class ZDNetBridge extends BridgeAbstract {
                 $thumbnail = $article->find('meta[itemprop=image]', 0);
                 if (is_object($thumbnail))
                     $thumbnail = $thumbnail->content;
-                else $thumbnail = 'http://zdnet1.cbsistatic.com/fly/bundles/zdnetcss/images/logos/logo-192x192.png';
+                else $thumbnail = '';
 
                 $contents = $article->find('article', 0)->innertext;
                 foreach (array(
@@ -277,8 +277,17 @@ class ZDNetBridge extends BridgeAbstract {
                 }
                 $contents = StripWithDelimiters($contents, '<script', '</script>');
                 $contents = StripWithDelimiters($contents, '<meta itemprop="image"', '>');
-                $contents = StripWithDelimiters($contents, '<section class="sharethrough-top', '</section>');
-                $contents = '<p><b>'.$article_subtitle.'</b></p>'.trim($contents);
+                $contents = trim(StripWithDelimiters($contents, '<section class="sharethrough-top', '</section>'));
+                $content_img = strpos($contents, '<img');         //Look for first image
+                if (($content_img !== false && $content_img < 512) || $thumbnail == '')
+                    $content_img = ''; //Image already present on article beginning or no thumbnail
+                else $content_img = '<p><img src="'.$thumbnail.'" /></p>'; //Include thumbnail
+                $contents = $content_img
+                    .'<p><b>'.$article_subtitle.'</b></p>'
+                    .$contents;
+
+                if ($thumbnail == '')
+                    $thumbnail = 'http://zdnet1.cbsistatic.com/fly/bundles/zdnetcss/images/logos/logo-192x192.png';
 
                 $item = new \Item();
                 $item->author = $author;
@@ -303,6 +312,6 @@ class ZDNetBridge extends BridgeAbstract {
     }
 
     public function getCacheDuration() {
-        return 3600;
+        return 3600; //1 hour
     }
-}
\ No newline at end of file
+}

From dfc4e8aaac78278dadc1198d142628a995491f96 Mon Sep 17 00:00:00 2001
From: ORelio <oreliogitantispam.l0gin@spamgourmet.com>
Date: Tue, 26 Jul 2016 21:20:13 +0200
Subject: [PATCH 003/149] [Nextgov] New bridge. USA tech news.

---
 bridges/NextgovBridge.php | 110 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 bridges/NextgovBridge.php

diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
new file mode 100644
index 0000000..eac7aa1
--- /dev/null
+++ b/bridges/NextgovBridge.php
@@ -0,0 +1,110 @@
+<?php
+class NextgovBridge extends BridgeAbstract {
+
+    public function loadMetadatas() {
+
+        $this->maintainer = 'ORelio';
+        $this->name = $this->getName();
+        $this->uri = $this->getURI();
+        $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.';
+        $this->update = '2016-07-20';
+
+        $this->parameters[] =
+        '[
+            {
+                "name" : "Category",
+                "type" : "list",
+                "identifier" : "category",
+                "values" :
+                [
+                    { "name" : "All", "value" : "all" },
+                    { "name" : "Technology News", "value" : "technology-news" },
+                    { "name" : "CIO Briefing", "value" : "cio-briefing" },
+                    { "name" : "Emerging Tech", "value" : "emerging-tech" },
+                    { "name" : "Cloud", "value" : "cloud-computing" },
+                    { "name" : "Cybersecurity", "value" : "cybersecurity" },
+                    { "name" : "Mobile", "value" : "mobile" },
+                    { "name" : "Health", "value" : "health" },
+                    { "name" : "Defense", "value" : "defense" },
+                    { "name" : "Big Data", "value" : "big-data" }
+                ]
+            }
+        ]';
+
+    }
+
+    public function collectData(array $param) {
+
+        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;
+        }
+
+        $category = $param['category'];
+        if (empty($category))
+            $category = 'all';
+        if ($category !== preg_replace('/[^a-z-]+/', '', $category) || strlen($category > 32))
+            $this->returnError('Invalid "category" parameter.', 400);
+        $url = $this->getURI().'rss/'.$category.'/';
+        $html = $this->file_get_html($url) or $this->returnError('Could not request Nextgov: '.$url, 500);
+        $limit = 0;
+
+        foreach ($html->find('item') as $element) {
+            if ($limit < 10) {
+
+                $article_url = ExtractFromDelimiters($element->innertext, '<link>', '</link>');
+                $article_author = ExtractFromDelimiters($element->innertext, 'dc/elements/1.1/">', '</dc:creator>');
+                $article_title = $element->find('title', 0)->plaintext;
+                $article_subtitle = $element->find('description', 0)->plaintext;
+                $article_timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+                $article_thumbnail = ExtractFromDelimiters($element->innertext, '<media:content url="', '"');
+                $article = $this->file_get_html($article_url) or $this->returnError('Could not request Nextgov: '.$article_url, 500);
+
+                $contents = $article->find('div.wysiwyg', 0)->innertext;
+                $contents = StripWithDelimiters($contents, '<div class="ad-container">', '</div>');
+                $contents = StripWithDelimiters($contents, '<div', '</div>'); //ad outer div
+                $contents = StripWithDelimiters($contents, '<script', '</script>');
+                $contents = ($article_thumbnail == '' ? '' : '<p><img src="'.$article_thumbnail.'" /></p>')
+                    .'<p><b>'.$article_subtitle.'</b></p>'
+                    .trim($contents);
+
+                if ($article_thumbnail == '')
+                    $article_thumbnail = 'http://cdn.nextgov.com/nextgov/images/logo.png';
+
+                $item = new \Item();
+                $item->uri = $article_url;
+                $item->title = $article_title;
+                $item->author = $article_author;
+                $item->thumbnailUri = $article_thumbnail;
+                $item->timestamp = $article_timestamp;
+                $item->content = $contents;
+                $this->items[] = $item;
+                $limit++;
+            }
+        }
+
+    }
+
+    public function getName() {
+        return 'Nextgov Bridge';
+    }
+
+    public function getURI() {
+        return 'https://www.nextgov.com/';
+    }
+
+    public function getCacheDuration() {
+        return 3600; //1 hour
+    }
+}
\ No newline at end of file

From 48883a9cc4b339a8a97f2e7c97aae78e9c1ac55a Mon Sep 17 00:00:00 2001
From: ORelio <oreliogitantispam.l0gin@spamgourmet.com>
Date: Tue, 26 Jul 2016 21:20:43 +0200
Subject: [PATCH 004/149] [TheHackerNews] New bridge. Security news.

---
 bridges/TheHackerNewsBridge.php | 90 +++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 bridges/TheHackerNewsBridge.php

diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php
new file mode 100644
index 0000000..4081b93
--- /dev/null
+++ b/bridges/TheHackerNewsBridge.php
@@ -0,0 +1,90 @@
+<?php
+class TheHackerNewsBridge extends BridgeAbstract {
+
+    public function loadMetadatas() {
+
+        $this->maintainer = 'ORelio';
+        $this->name = $this->getName();
+        $this->uri = $this->getURI();
+        $this->description = 'Cyber Security, Hacking, Technology News.';
+        $this->update = '2016-07-22';
+
+    }
+
+    public function collectData(array $param) {
+
+        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 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;
+        }
+
+        $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request TheHackerNews: '.$this->getURI(), 500);
+        $limit = 0;
+
+        foreach ($html->find('article') as $element) {
+            if ($limit < 5) {
+
+                $article_url = $element->find('a.entry-title', 0)->href;
+                $article_author = trim($element->find('span.vcard', 0)->plaintext);
+                $article_title = $element->find('a.entry-title', 0)->plaintext;
+                $article_timestamp = strtotime($element->find('span.updated', 0)->plaintext);
+                $article_thumbnail = $element->find('img', 0)->src;
+                $article = $this->file_get_html($article_url) or $this->returnError('Could not request TheHackerNews: '.$article_url, 500);
+
+                $contents = $article->find('div.articlebodyonly', 0)->innertext;
+                $contents = StripRecursiveHTMLSection($contents, 'div', '<div class=\'clear\'');
+                $contents = StripWithDelimiters($contents, '<script', '</script>');
+
+                $item = new \Item();
+                $item->uri = $article_url;
+                $item->title = $article_title;
+                $item->author = $article_author;
+                $item->thumbnailUri = $article_thumbnail;
+                $item->timestamp = $article_timestamp;
+                $item->content = trim($contents);
+                $this->items[] = $item;
+                $limit++;
+            }
+        }
+
+    }
+
+    public function getName() {
+        return 'The Hacker News Bridge';
+    }
+
+    public function getURI() {
+        return 'https://thehackernews.com/';
+    }
+
+    public function getCacheDuration() {
+        return 3600; //1 hour
+    }
+}
\ No newline at end of file

From f72cde7fa12095270b8c18f3d0c19ed5367004f1 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Fri, 29 Jul 2016 08:23:03 +0200
Subject: [PATCH 005/149] =?UTF-8?q?RTBFBridge:=20exclude=20"=C3=80=20voir?=
 =?UTF-8?q?=20aussi"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php
index c82041b..3b2a890 100644
--- a/bridges/RTBFBridge.php
+++ b/bridges/RTBFBridge.php
@@ -26,7 +26,7 @@ class RTBFBridge extends BridgeAbstract {
 		if (isset($param['c'])) {
 			$html = $this->file_get_html('http://www.rtbf.be/auvio/emissions/detail?id='.$param['c']) or $this->returnError('Could not request RTBF.', 404);
 
-			foreach($html->find('.rtbf-media-grid article') as $element) {
+			foreach($html->find('section[id!=widget-ml-avoiraussi-] .rtbf-media-grid article') as $element) {
 				if($count < $limit) {
 					$item = new \Item();
 					$item->id = $element->getAttribute('data-id');

From 74b6dd37f93facb2a8a83e13cf0fdf28ecbba870 Mon Sep 17 00:00:00 2001
From: Damien Calesse <madeinjb@gmail.com>
Date: Sat, 30 Jul 2016 16:16:02 +0200
Subject: [PATCH 006/149] Add Sens Critique Bridge

Get the movies, series, video games, books and musics news.
---
 bridges/SensCritiqueBridge.php | 146 +++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 bridges/SensCritiqueBridge.php

diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
new file mode 100644
index 0000000..c1aaa93
--- /dev/null
+++ b/bridges/SensCritiqueBridge.php
@@ -0,0 +1,146 @@
+<?php
+class SensCritiqueBridge extends BridgeAbstract {
+
+	private $request;
+
+  public function loadMetadatas() {
+		$this->maintainer = "kranack";
+		$this->name = "Sens Critique";
+		$this->uri = "http://www.senscritique.com";
+		$this->description = "Sens Critique news";
+		$this->update = "2016-07-29";
+
+		$this->parameters[] =
+		'[
+			{
+				"name" : "Movies",
+				"identifier" : "m",
+				"type": "checkbox"
+			},
+			{
+				"name" : "Series",
+				"identifier" : "s",
+				"type": "checkbox"
+			},
+			{
+				"name" : "Video Games",
+				"identifier" : "g",
+				"type": "checkbox"
+			},
+			{
+				"name" : "Books",
+				"identifier" : "b",
+				"type": "checkbox"
+			},
+			{
+				"name" : "BD",
+				"identifier" : "bd",
+				"type": "checkbox"
+			},
+			{
+				"name" : "Music",
+				"identifier" : "mu",
+				"type": "checkbox"
+			}
+		]';
+	}
+
+	public function collectData(array $param) {
+		if ((isset($param['m']) && $param['m'])) {
+			$this->collectMoviesData();
+		} else if ((isset($param['s']) && $param['s'])) {
+			$this->collectSeriesData();
+		} else if ((isset($param['g']) && $param['g'])) {
+			$this->collectGamesData();
+		} else if ((isset($param['b']) && $param['b'])) {
+			$this->collectBooksData();
+		} else if ((isset($param['bd']) && $param['bd'])) {
+			$this->collectBDsData();
+		} else if ((isset($param['mu']) && $param['mu'])) {
+			$this->collectMusicsData();
+		} else {
+			$this->returnError('You must choose a category', 400);
+		}
+  }
+
+	public function collectMoviesData() {
+		$html = '';
+    $html = $this->file_get_html('http://www.senscritique.com/films/cette-semaine') or $this->returnError('No results for this query.', 404);
+		$list = $html->find('ul.elpr-list', 0);
+
+		$this->extractDataFromList($list);
+	}
+
+	public function collectSeriesData() {
+		$html = '';
+		$html = $this->file_get_html('http://www.senscritique.com/series/actualite') or $this->returnError('No results for this query.', 404);
+		$list = $html->find('ul.elpr-list', 0);
+
+		$this->extractDataFromList($list);
+	}
+
+	public function collectGamesData() {
+		$html = '';
+		$html = $this->file_get_html('http://www.senscritique.com/jeuxvideo/actualite') or $this->returnError('No results for this query.', 404);
+		$list = $html->find('ul.elpr-list', 0);
+
+		$this->extractDataFromList($list);
+	}
+
+	public function collectBooksData() {
+		$html = '';
+		$html = $this->file_get_html('http://www.senscritique.com/livres/actualite') or $this->returnError('No results for this query.', 404);
+		$list = $html->find('ul.elpr-list', 0);
+
+		$this->extractDataFromList($list);
+	}
+
+	public function collectBDsData() {
+		$html = '';
+		$html = $this->file_get_html('http://www.senscritique.com/bd/actualite') or $this->returnError('No results for this query.', 404);
+		$list = $html->find('ul.elpr-list', 0);
+
+		$this->extractDataFromList($list);
+	}
+
+	public function collectMusicsData() {
+		$html = '';
+		$html = $this->file_get_html('http://www.senscritique.com/musique/actualite') or $this->returnError('No results for this query.', 404);
+		$list = $html->find('ul.elpr-list', 0);
+
+		$this->extractDataFromList($list);
+	}
+
+	public function extractDataFromList($list) {
+		if ($list === null) {
+			$this->returnError('Cannot extract data from list', 400);
+		}
+
+		foreach ($list->find('li') as $movie) {
+		    $item = new \Item();
+		    $item->name = htmlspecialchars_decode($movie->find('.elco-title a', 0)->plaintext, ENT_QUOTES) . ' ' . $movie->find('.elco-date', 0)->plaintext;
+		    $item->title = $movie->find('.elco-title a', 0)->plaintext . ' ' . $movie->find('.elco-date', 0)->plaintext;
+		    $item->content = '<em>' . $movie->find('.elco-original-title', 0)->plaintext . '</em><br><br>' .
+												 $movie->find('.elco-baseline', 0)->plaintext . '<br>' .
+												 $movie->find('.elco-baseline', 1)->plaintext . '<br><br>' .
+												 $movie->find('.elco-description', 0)->plaintext . '<br><br>' .
+												 trim($movie->find('.erra-ratings .erra-global', 0)->plaintext) . ' / 10';
+		    $item->id = $this->getURI() . $movie->find('.elco-title a', 0)->href;
+		    $item->uri = $this->getURI() . $movie->find('.elco-title a', 0)->href;
+		    $this->items[] = $item;
+		}
+	}
+
+	public function getName() {
+		return $this->name;
+	}
+
+	public function getURI() {
+		return (trim($this->uri) === "") ? "http://www.senscritique.com" : $this->uri;
+	}
+
+	public function getCacheDuration(){
+		return 0; // 1 hour
+	}
+
+}

From 9b579c7cd444d7248c9cffb749d3a3eec8e3e06c Mon Sep 17 00:00:00 2001
From: Damien Calesse <madeinjb@gmail.com>
Date: Sat, 30 Jul 2016 18:19:36 +0200
Subject: [PATCH 007/149] Change Cache Duration

Up to 6 hours
---
 bridges/SensCritiqueBridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index c1aaa93..cfd9e1c 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -140,7 +140,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 	}
 
 	public function getCacheDuration(){
-		return 0; // 1 hour
+		return 21600; // 6 hours
 	}
 
 }

From d60a822bc21ea45e3567e2028a6d2b53dea7c0c4 Mon Sep 17 00:00:00 2001
From: Damien Calesse <madeinjb@gmail.com>
Date: Sat, 30 Jul 2016 19:24:06 +0200
Subject: [PATCH 008/149] Update Flickr Bridge

Fix the bridge (Flickr update?)

I get the pictures titles with the API (slowing down the bridge). If you
have any suggestions to replace them, feel free to change it.
---
 bridges/FlickrExploreBridge.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php
index 9d83f27..524d9d9 100644
--- a/bridges/FlickrExploreBridge.php
+++ b/bridges/FlickrExploreBridge.php
@@ -5,21 +5,34 @@ class FlickrExploreBridge extends BridgeAbstract{
 
 		$this->maintainer = "sebsauvage";
 		$this->name = "Flickr Explore";
-		$this->uri = "http://www.flickr.com/explore";
+		$this->uri = "https://www.flickr.com/explore";
 		$this->description = "Returns the latest interesting images from Flickr";
-		$this->update = "2014-05-25";
+		$this->update = "2016-07-30";
 
 	}
 
     public function collectData(array $param){
-        $html = $this->file_get_html('http://www.flickr.com/explore') or $this->returnError('Could not request Flickr.', 404);
-    
-        foreach($html->find('span.photo_container') as $element) {
+        $html = $this->file_get_html('https://www.flickr.com/explore') or $this->returnError('Could not request Flickr.', 404);
+
+        foreach($html->find('.photo-list-photo-view') as $element) {
+						// Get the styles
+						$style = explode(';', $element->style);
+						// Get the background-image style
+						$backgroundImage = explode(':', end($style));
+						// URI type : url(//cX.staticflickr.com/X/XXXXX/XXXXXXXXX.jpg)
+						$imageURI = trim(str_replace(['url(', ')'], '', end($backgroundImage)));
+						// Get the image ID
+						$imageURIs = explode('_', basename($imageURI));
+						$imageID = reset($imageURIs);
+
+						// Get the image JSON via Flickr API
+						$imageJSON = json_decode(file_get_contents('https://api.flickr.com/services/rest/?method=flickr.photos.getInfo&api_key=103b574d49bd51f0e18bfe907da44a0f&photo_id='.$imageID.'&format=json&nojsoncallback=1')) or $this->returnError('Could not request Flickr.', 404); // FIXME: Request time too long...
+
             $item = new \Item();
-            $item->uri = 'http://flickr.com'.$element->find('a',0)->href;
-            $item->thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src');
+            $item->uri = 'https://flickr.com/photo.gne?id='.$imageID;
+            $item->thumbnailUri = $imageURI;
             $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>'; // FIXME: Filter javascript ?
-            $item->title = $element->find('a',0)->title;
+            $item->title = $imageJSON->photo->title->_content;
             $this->items[] = $item;
         }
     }
@@ -29,7 +42,7 @@ class FlickrExploreBridge extends BridgeAbstract{
     }
 
     public function getURI(){
-        return 'http://www.flickr.com/explore';
+        return 'https://www.flickr.com/explore';
     }
 
     public function getCacheDuration(){

From fb595484b5e646726b7458774b47fe4ac43d6398 Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Mon, 1 Aug 2016 02:06:59 +0200
Subject: [PATCH 009/149] Remove duplicate: FuturaSciencesw

---
 bridges/FSBridge.php | 56 --------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 bridges/FSBridge.php

diff --git a/bridges/FSBridge.php b/bridges/FSBridge.php
deleted file mode 100644
index 0071a74..0000000
--- a/bridges/FSBridge.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-class FSBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "qwertygc";
-		$this->name = "Futurasciences";
-		$this->uri = "http://www.futura-sciences.com";
-		$this->description = "Returns the 5 newest posts from FS (full text)";
-		$this->update = "03/11/2015";
-
-	}
-
-    public function collectData(array $param){
-
-    function FS_StripCDATA($string) {
-    	$string = str_replace('<![CDATA[', '', $string);
-    	$string = str_replace(']]>', '', $string);
-    	return $string;
-    }
-    function FS_ExtractContent($url) {
-	$html2 = $this->file_get_html($url);
-	$text = $html2->find('div.fiche-actualite', 0)->innertext;
-	$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
-	return $text;
-    }
-        $html = $this->file_get_html('http://www.futura-sciences.com/rss/actualites.xml') or $this->returnError('Could not request Futura Sciences.', 404);
-	$limit = 0;
-
-	foreach($html->find('item') as $element) {
-	 if($limit < 5) {
-	 $item = new \Item();
-	 $item->title = FS_StripCDATA($element->find('title', 0)->innertext);
-	 $item->uri = FS_StripCDATA($element->find('guid', 0)->plaintext);
-	 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-	 $item->content = FS_ExtractContent($item->uri);
-	 $this->items[] = $item;
-	 $limit++;
-	 }
-	}
-    
-    }
-
-    public function getName(){
-        return 'Futura Sciences';
-    }
-
-    public function getURI(){
-        return 'http://www.futura-sciences.com/';
-    }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-        // return 0; // 1 hour
-    }
-}

From b37877bc746fc2bd793585600413692cf0412faa Mon Sep 17 00:00:00 2001
From: prysme01 <prysme01@users.noreply.github.com>
Date: Mon, 1 Aug 2016 15:18:32 +0200
Subject: [PATCH 010/149] very basic support of ArsTechnica

---
 bridges/ArstechnicaBridge.php | 81 +++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 bridges/ArstechnicaBridge.php

diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
new file mode 100644
index 0000000..80c8086
--- /dev/null
+++ b/bridges/ArstechnicaBridge.php
@@ -0,0 +1,81 @@
+<?php
+#ini_set('display_errors', 'On');
+#error_reporting(E_ALL);
+class ArstechnicaBridge extends BridgeAbstract {
+
+        public function loadMetadatas() {
+
+                $this->maintainer = "prysme";
+                $this->name = "ArstechnicaBridge";
+                $this->uri = "http://arstechnica.com";
+                $this->description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
+                $this->update = "01/08/2016";
+
+        }
+
+        public function collectData(array $param) {
+          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 StripCDATA($string) {
+                        $string = str_replace('<![CDATA[', '', $string);
+                        $string = str_replace(']]>', '', $string);
+                        return $string;
+                }
+
+                function ExtractContent($url) {
+                  #echo $url;
+                        $html2 = file_get_html($url);
+
+                        $text = $html2->find("section[id='article-guts']", 0);
+                        $text = StripWithDelimiters($text->innertext,'<aside id="social-left">','</aside>');
+                        $text = StripWithDelimiters($text,'<div class="caption-credit">','</div>');
+                        $text = StripWithDelimiters($text,'<div class="gallery shortcode-gallery">','</div>');
+                        $text = StripWithDelimiters($text,'<div class="lSAction">','</div>');
+                        $text = StripWithDelimiters($text,'<figcaption ','</figcaption>');
+                        $text = StripWithDelimiters($text,'<li data-thumb','</li>');
+                        //$text = strip_tags($text->innertext, '<p>');
+                        #print_r("ICI");
+                        #print_r($text);
+                        #print_r("FIN");
+                        return $text;
+                }
+
+                $html = $this->file_get_html('http://feeds.arstechnica.com/arstechnica/index') or $this->returnError('Could not request NextInpact.', 404);
+                $limit = 0;
+
+                foreach($html->find('item') as $element) {
+                 if($limit < 5) {
+                                $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->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+                                $item->content = ExtractContent($item->uri);
+                                //$item->content = $item->uri;
+                                $this->items[] = $item;
+                                $limit++;
+                        }
+                }
+
+}
+
+
+        public function getName() {
+                return 'ArsTechnica';
+        }
+
+        public function getCacheDuration() {
+                return 0; // 2h
+        }
+
+        public function getURI() {
+                return "http://arstechnica.com";
+        }
+
+}

From e3cf486ac56452efc989d475ab299499e94ac80c Mon Sep 17 00:00:00 2001
From: prysme01 <prysme01@users.noreply.github.com>
Date: Mon, 1 Aug 2016 16:16:18 +0200
Subject: [PATCH 011/149] Better tag handling

---
 bridges/ArstechnicaBridge.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
index 80c8086..f9a7398 100644
--- a/bridges/ArstechnicaBridge.php
+++ b/bridges/ArstechnicaBridge.php
@@ -32,16 +32,14 @@ class ArstechnicaBridge extends BridgeAbstract {
                         $html2 = file_get_html($url);
 
                         $text = $html2->find("section[id='article-guts']", 0);
+                        /*foreach ($text->find('<aside id="social-left">') as $node)
+                            { $node = NULL; }*/
                         $text = StripWithDelimiters($text->innertext,'<aside id="social-left">','</aside>');
-                        $text = StripWithDelimiters($text,'<div class="caption-credit">','</div>');
+                        $text = StripWithDelimiters($text,'<figcaption class="caption">','</figcaption>');
                         $text = StripWithDelimiters($text,'<div class="gallery shortcode-gallery">','</div>');
-                        $text = StripWithDelimiters($text,'<div class="lSAction">','</div>');
-                        $text = StripWithDelimiters($text,'<figcaption ','</figcaption>');
-                        $text = StripWithDelimiters($text,'<li data-thumb','</li>');
-                        //$text = strip_tags($text->innertext, '<p>');
-                        #print_r("ICI");
-                        #print_r($text);
-                        #print_r("FIN");
+                        //error_log("ICI", 0);
+                        //error_log($text, 0);
+
                         return $text;
                 }
 
@@ -71,7 +69,7 @@ class ArstechnicaBridge extends BridgeAbstract {
         }
 
         public function getCacheDuration() {
-                return 0; // 2h
+                return 7200; // 2h
         }
 
         public function getURI() {

From 9d41c83c02cc13a77dfbabb2f88bc828f0de8099 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 11:24:24 +0200
Subject: [PATCH 012/149] Remove nested function BastaExtractContent

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

The nested function BastaExtractContent was attempting to access $this
even though the function is declared as nested function within a class
function and not as a class function itself. Thus BastaExtractContent
had no access to the object instance $this.
---
 bridges/BastaBridge.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php
index 01f7611..ff2b26a 100644
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -7,19 +7,12 @@ class BastaBridge extends BridgeAbstract{
 			$this->name = "Bastamag Bridge";
 			$this->uri = "http://www.bastamag.net/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "2014-05-25";
+			$this->update = "2016-08-02";
 
 		}
 
 
         public function collectData(array $param){
-
-			
-		function BastaExtractContent($url) {
-		$html2 = $this->file_get_html($url);
-		$text = $html2->find('div.texte', 0)->innertext;
-		return $text;
-		}
 		$html = $this->file_get_html('http://www.bastamag.net/spip.php?page=backend') or $this->returnError('Could not request Bastamag.', 404);
 		$limit = 0;
 
@@ -29,7 +22,7 @@ class BastaBridge extends BridgeAbstract{
 		 $item->title = $element->find('title', 0)->innertext;
 		 $item->uri = $element->find('guid', 0)->plaintext;
 		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = BastaExtractContent($item->uri);
+		 $item->content = $this->file_get_html($item->uri)->find('div.texte', 0)->innertext;
 		 $this->items[] = $item;
 		 $limit++;
 		 }

From 371a52e2b94e5333758013dc4251b6fbc21900fc Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 11:28:11 +0200
Subject: [PATCH 013/149] Fix indentation and remove unnecessary lines

---
 bridges/BastaBridge.php | 63 +++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php
index ff2b26a..53d1017 100644
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -1,45 +1,40 @@
 <?php
 class BastaBridge extends BridgeAbstract{
-
-    	public function loadMetadatas() {
-
-			$this->maintainer = "qwertygc";
-			$this->name = "Bastamag Bridge";
-			$this->uri = "http://www.bastamag.net/";
-			$this->description = "Returns the newest articles.";
-			$this->update = "2016-08-02";
-
-		}
-
-
-        public function collectData(array $param){
+	public function loadMetadatas() {
+		$this->maintainer = "qwertygc";
+		$this->name = "Bastamag Bridge";
+		$this->uri = "http://www.bastamag.net/";
+		$this->description = "Returns the newest articles.";
+		$this->update = "2016-08-02";
+	}
+	
+	public function collectData(array $param){
 		$html = $this->file_get_html('http://www.bastamag.net/spip.php?page=backend') or $this->returnError('Could not request Bastamag.', 404);
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
-		 if($limit < 10) {
-		 $item = new \Item();
-		 $item->title = $element->find('title', 0)->innertext;
-		 $item->uri = $element->find('guid', 0)->plaintext;
-		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = $this->file_get_html($item->uri)->find('div.texte', 0)->innertext;
-		 $this->items[] = $item;
-		 $limit++;
-		 }
+			if($limit < 10) {
+			$item = new \Item();
+			$item->title = $element->find('title', 0)->innertext;
+			$item->uri = $element->find('guid', 0)->plaintext;
+			$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+			$item->content = $this->file_get_html($item->uri)->find('div.texte', 0)->innertext;
+			$this->items[] = $item;
+			$limit++;
+			}
 		}
-    
-    }
+	}
 
-    public function getName(){
-        return 'Bastamag Bridge';
-    }
+	public function getName(){
+		return 'Bastamag Bridge';
+	}
 
-    public function getURI(){
-        return 'http://bastamag.net/';
-    }
+	public function getURI(){
+		return 'http://bastamag.net/';
+	}
 
-    public function getCacheDuration(){
-        return 3600*2; // 2 hours
-        // return 0; // 2 hours
-    }
+	public function getCacheDuration(){
+		return 3600*2; // 2 hours
+	}
 }
+?>
\ No newline at end of file

From 5189741c7b01e26e8a38a95fdcf702afbf7ed52f Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 11:31:17 +0200
Subject: [PATCH 014/149] Fix tag name for timestamp

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

diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php
index 53d1017..0dd0252 100644
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -17,7 +17,7 @@ class BastaBridge extends BridgeAbstract{
 			$item = new \Item();
 			$item->title = $element->find('title', 0)->innertext;
 			$item->uri = $element->find('guid', 0)->plaintext;
-			$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+			$item->timestamp = strtotime($element->find('dc:date', 0)->plaintext);
 			$item->content = $this->file_get_html($item->uri)->find('div.texte', 0)->innertext;
 			$this->items[] = $item;
 			$limit++;

From 4a001f3594d3e94aa40d01b04545d83934d6f063 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 12:27:44 +0200
Subject: [PATCH 015/149] Replace relative image paths with absolute URL

Images from their own servers are linked relatively via 'local/...' we
must replace this for images to point to the correct destination.
---
 bridges/BastaBridge.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php
index 0dd0252..acdcd67 100644
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -9,18 +9,23 @@ class BastaBridge extends BridgeAbstract{
 	}
 	
 	public function collectData(array $param){
+		// Replaces all relative image URLs by absolute URLs. Relative URLs always start with 'local/'!
+		function ReplaceImageUrl($content){
+			return preg_replace('/src=["\']{1}([^"\']+)/ims', 'src=\'http://www.bastamag.net/$1\'', $content);
+		}
+		
 		$html = $this->file_get_html('http://www.bastamag.net/spip.php?page=backend') or $this->returnError('Could not request Bastamag.', 404);
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
 			if($limit < 10) {
-			$item = new \Item();
-			$item->title = $element->find('title', 0)->innertext;
-			$item->uri = $element->find('guid', 0)->plaintext;
-			$item->timestamp = strtotime($element->find('dc:date', 0)->plaintext);
-			$item->content = $this->file_get_html($item->uri)->find('div.texte', 0)->innertext;
-			$this->items[] = $item;
-			$limit++;
+				$item = new \Item();
+				$item->title = $element->find('title', 0)->innertext;
+				$item->uri = $element->find('guid', 0)->plaintext;
+				$item->timestamp = strtotime($element->find('dc:date', 0)->plaintext);
+				$item->content = ReplaceImageUrl($this->file_get_html($item->uri)->find('div.texte', 0)->innertext);
+				$this->items[] = $item;
+				$limit++;
 			}
 		}
 	}

From 1e33b7c2ec7bb5c12fd04b96ab86a39cd6e9ecdc Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 13:25:49 +0200
Subject: [PATCH 016/149] Make CADExtractContent a member function

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/CADBridge.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php
index 7857282..6fac253 100644
--- a/bridges/CADBridge.php
+++ b/bridges/CADBridge.php
@@ -7,21 +7,10 @@ class CADBridge extends BridgeAbstract{
 			$this->name = "CAD Bridge";
 			$this->uri = "http://www.cad-comic.com/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "2015-04-03";
+			$this->update = "2016-08-02";
 
 		}
-
-        public function collectData(array $param){
-
-		function CADUrl($string) {
-		 $html2 = explode("\"", $string);
-		 $string = $html2[1];
-		 if (substr($string,0,4) != 'http')
-		   return 'notanurl';
-		 return $string;
-		}
-	
-		function CADExtractContent($url) {
+				function CADExtractContent($url) {
 		$html3 = $this->file_get_html($url);
 		$htmlpart = explode("/", $url);
 		if ($htmlpart[3] == 'cad')
@@ -36,6 +25,18 @@ class CADBridge extends BridgeAbstract{
 		return '<img src="'.$img.'"/>';
 		}
 
+        public function collectData(array $param){
+
+		function CADUrl($string) {
+		 $html2 = explode("\"", $string);
+		 $string = $html2[1];
+		 if (substr($string,0,4) != 'http')
+		   return 'notanurl';
+		 return $string;
+		}
+	
+
+
 		$html = $this->file_get_html('http://cdn2.cad-comic.com/rss.xml') or $this->returnError('Could not request CAD.', 404);
 		$limit = 0;
 		foreach($html->find('item') as $element) {
@@ -45,7 +46,7 @@ class CADBridge extends BridgeAbstract{
 		 $item->uri = CADUrl($element->find('description', 0)->innertext);
 		 if ($item->uri != 'notanurl') {
 		   $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		   $item->content = CADExtractContent($item->uri);
+		   $item->content = $this->CADExtractContent($item->uri);
 		   $this->items[] = $item;
 		   $limit++;
 		  }

From 01bdda5e19c8b45d0e0e9655dc77082c5e8185ca Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 13:37:18 +0200
Subject: [PATCH 017/149] Fix indentation and remove unnecessary lines

---
 bridges/CADBridge.php | 87 ++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php
index 6fac253..bdb7ab3 100644
--- a/bridges/CADBridge.php
+++ b/bridges/CADBridge.php
@@ -1,70 +1,65 @@
 <?php
 class CADBridge extends BridgeAbstract{
+	public function loadMetadatas() {
+		$this->maintainer = "nyutag";
+		$this->name = "CAD Bridge";
+		$this->uri = "http://www.cad-comic.com/";
+		$this->description = "Returns the newest articles.";
+		$this->update = "2016-08-02";
+	}
 
-	   	public function loadMetadatas() {
-
-			$this->maintainer = "nyutag";
-			$this->name = "CAD Bridge";
-			$this->uri = "http://www.cad-comic.com/";
-			$this->description = "Returns the newest articles.";
-			$this->update = "2016-08-02";
-
-		}
-				function CADExtractContent($url) {
+	function CADExtractContent($url) {
 		$html3 = $this->file_get_html($url);
 		$htmlpart = explode("/", $url);
 		if ($htmlpart[3] == 'cad')
-		  preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/cad-\S*png/", $html3, $url2);
+			preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/cad-\S*png/", $html3, $url2);
 		if ($htmlpart[3] == 'sillies')
-		  preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/sillies-\S*gif/", $html3, $url2);
+			preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/sillies-\S*gif/", $html3, $url2);
 		$img = implode ($url2[0]);
 		$html3->clear();
 		unset ($html3);
 		if ($img == '')
-		  return 'Daily comic not realease yet';
+			return 'Daily comic not realease yet';
 		return '<img src="'.$img.'"/>';
-		}
-
-        public function collectData(array $param){
+	}
 
+	public function collectData(array $param){
 		function CADUrl($string) {
-		 $html2 = explode("\"", $string);
-		 $string = $html2[1];
-		 if (substr($string,0,4) != 'http')
-		   return 'notanurl';
-		 return $string;
+			$html2 = explode("\"", $string);
+			$string = $html2[1];
+			if (substr($string,0,4) != 'http')
+				return 'notanurl';
+			return $string;
 		}
-	
-
 
 		$html = $this->file_get_html('http://cdn2.cad-comic.com/rss.xml') or $this->returnError('Could not request CAD.', 404);
 		$limit = 0;
+
 		foreach($html->find('item') as $element) {
-		 if($limit < 5) {
-		 $item = new \Item();
-		 $item->title = $element->find('title', 0)->innertext;
-		 $item->uri = CADUrl($element->find('description', 0)->innertext);
-		 if ($item->uri != 'notanurl') {
-		   $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		   $item->content = $this->CADExtractContent($item->uri);
-		   $this->items[] = $item;
-		   $limit++;
-		  }
-		 }
+			if($limit < 5) {
+				$item = new \Item();
+				$item->title = $element->find('title', 0)->innertext;
+				$item->uri = CADUrl($element->find('description', 0)->innertext);
+				if ($item->uri != 'notanurl') {
+					$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+					$item->content = $this->CADExtractContent($item->uri);
+					$this->items[] = $item;
+					$limit++;
+				}
+			}
 		}
-    
-    }
+	}
 
-    public function getName(){
-        return 'CAD Bridge';
-    }
+	public function getName(){
+		return 'CAD Bridge';
+	}
 
-    public function getURI(){
-        return 'http://www.cad-comic.com/';
-    }
+	public function getURI(){
+		return 'http://www.cad-comic.com/';
+	}
 
-    public function getCacheDuration(){
-        return 3600*2; // 2 hours
-//	return 0;
-    }
+	public function getCacheDuration(){
+		return 3600*2; // 2 hours
+	}
 }
+?>
\ No newline at end of file

From fa7a053c65ac707bd977ccbc4231064d5c20a9df Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Tue, 2 Aug 2016 13:45:12 +0200
Subject: [PATCH 018/149] Fix GitlabCommitsBridge.

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

diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php
index 3361ef4..df04d63 100644
--- a/bridges/GitlabCommitsBridge.php
+++ b/bridges/GitlabCommitsBridge.php
@@ -14,7 +14,7 @@ class GitlabCommitsBridge extends BridgeAbstract{
     $this->description = 'Returns the commits of a project hosted on a gitlab instance';
     $this->update = '2016-06-19';
 
-    $this->parameters=
+    $this->parameters[] =
       '[
          {
             "name" : "Base URI",
@@ -27,7 +27,7 @@ class GitlabCommitsBridge extends BridgeAbstract{
          {
             "name" : "Project name",
             "identifier" : "p"
-         }
+         },
          {
             "name" : "Project branch",
             "identifier" : "b"

From d0c932c149811474608569e551ac458bdbdc7b0c Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 14:07:40 +0200
Subject: [PATCH 019/149] Handle failing requests

Disabling https support results in a failed request which is now handled
as if there is no data at all.
---
 bridges/CADBridge.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php
index bdb7ab3..3405d26 100644
--- a/bridges/CADBridge.php
+++ b/bridges/CADBridge.php
@@ -10,6 +10,11 @@ class CADBridge extends BridgeAbstract{
 
 	function CADExtractContent($url) {
 		$html3 = $this->file_get_html($url);
+
+		// The request might fail due to missing https support or wrong URL
+		if($html3 == false)
+			return 'Daily comic not released yet';
+
 		$htmlpart = explode("/", $url);
 		if ($htmlpart[3] == 'cad')
 			preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/cad-\S*png/", $html3, $url2);
@@ -19,7 +24,7 @@ class CADBridge extends BridgeAbstract{
 		$html3->clear();
 		unset ($html3);
 		if ($img == '')
-			return 'Daily comic not realease yet';
+			return 'Daily comic not released yet';
 		return '<img src="'.$img.'"/>';
 	}
 

From ea4586d8b34cb96daaca7067760828d90d043505 Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Tue, 2 Aug 2016 14:11:28 +0200
Subject: [PATCH 020/149] Fix CoinDeskBridge

---
 bridges/CoinDeskBridge.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bridges/CoinDeskBridge.php b/bridges/CoinDeskBridge.php
index 2ca88d1..4f9e865 100644
--- a/bridges/CoinDeskBridge.php
+++ b/bridges/CoinDeskBridge.php
@@ -1,5 +1,5 @@
 <?php
-class CoinDeskBridge extends BridgeAbstract{
+class CoinDeskBridge extends BridgeAbstract {
 
 	public function loadMetadatas() {
 
@@ -11,7 +11,7 @@ class CoinDeskBridge extends BridgeAbstract{
 
 	}
 
-    public function collectData(array $param){
+    public function collectData(array $param) {
 
     function CoinDeskStripCDATA($string) {
     	$string = str_replace('<![CDATA[', '', $string);
@@ -19,12 +19,14 @@ class CoinDeskBridge extends BridgeAbstract{
     	return $string;
     }
     function CoinDeskExtractContent($url) {
-	$html2 = $this->file_get_html($url);
-	$text = $html2->find('div.single-content', 0)->innertext;
-	$text = strip_tags($text, '<p><a><img>');
-	return $text;
+		//FIXME: We need to change the $this->file_get_html to a static
+		$html2 = file_get_html($url);
+		$text = $html2->find('div.single-content', 0)->innertext;
+		$text = strip_tags($text, '<p><a><img>');
+		return $text;
     }
-        $html = $this->file_get_html('http://www.coindesk.com/feed/atom/') or $this->returnError('Could not request CoinDesk.', 404);
+
+    $html = $this->file_get_html('http://www.coindesk.com/feed/atom/') or $this->returnError('Could not request CoinDesk.', 404);
 	$limit = 0;
 
 	foreach($html->find('entry') as $element) {

From a32044893afbd30b14b794bda0bedbd7e0b2b109 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 14:13:22 +0200
Subject: [PATCH 021/149] Replace if-statements with switch statement

The previous implementation would fail if $htmlpart[3] was neither 'cad'
nor 'sillies'. Now the default text will be returned.
---
 bridges/CADBridge.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php
index 3405d26..90b338c 100644
--- a/bridges/CADBridge.php
+++ b/bridges/CADBridge.php
@@ -16,10 +16,18 @@ class CADBridge extends BridgeAbstract{
 			return 'Daily comic not released yet';
 
 		$htmlpart = explode("/", $url);
-		if ($htmlpart[3] == 'cad')
-			preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/cad-\S*png/", $html3, $url2);
-		if ($htmlpart[3] == 'sillies')
-			preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/sillies-\S*gif/", $html3, $url2);
+
+		switch ($htmlpart[3]){
+			case 'cad':
+				preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/cad-\S*png/", $html3, $url2);
+				break;
+			case 'sillies':
+				preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/sillies-\S*gif/", $html3, $url2);
+				break;
+			default:
+				return 'Daily comic not released yet';
+		}
+
 		$img = implode ($url2[0]);
 		$html3->clear();
 		unset ($html3);

From c75622135eb606603b725869aa8c1426cc296eb7 Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Tue, 2 Aug 2016 14:24:54 +0200
Subject: [PATCH 022/149] [DailymotionBridge] fix

---
 bridges/ArstechnicaBridge.php | 158 +++++++++++++++++-----------------
 bridges/DailymotionBridge.php |   6 +-
 2 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
index f9a7398..de26ee1 100644
--- a/bridges/ArstechnicaBridge.php
+++ b/bridges/ArstechnicaBridge.php
@@ -1,79 +1,79 @@
-<?php
-#ini_set('display_errors', 'On');
-#error_reporting(E_ALL);
-class ArstechnicaBridge extends BridgeAbstract {
-
-        public function loadMetadatas() {
-
-                $this->maintainer = "prysme";
-                $this->name = "ArstechnicaBridge";
-                $this->uri = "http://arstechnica.com";
-                $this->description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
-                $this->update = "01/08/2016";
-
-        }
-
-        public function collectData(array $param) {
-          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 StripCDATA($string) {
-                        $string = str_replace('<![CDATA[', '', $string);
-                        $string = str_replace(']]>', '', $string);
-                        return $string;
-                }
-
-                function ExtractContent($url) {
-                  #echo $url;
-                        $html2 = file_get_html($url);
-
-                        $text = $html2->find("section[id='article-guts']", 0);
-                        /*foreach ($text->find('<aside id="social-left">') as $node)
-                            { $node = NULL; }*/
-                        $text = StripWithDelimiters($text->innertext,'<aside id="social-left">','</aside>');
-                        $text = StripWithDelimiters($text,'<figcaption class="caption">','</figcaption>');
-                        $text = StripWithDelimiters($text,'<div class="gallery shortcode-gallery">','</div>');
-                        //error_log("ICI", 0);
-                        //error_log($text, 0);
-
-                        return $text;
-                }
-
-                $html = $this->file_get_html('http://feeds.arstechnica.com/arstechnica/index') or $this->returnError('Could not request NextInpact.', 404);
-                $limit = 0;
-
-                foreach($html->find('item') as $element) {
-                 if($limit < 5) {
-                                $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->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-                                $item->content = ExtractContent($item->uri);
-                                //$item->content = $item->uri;
-                                $this->items[] = $item;
-                                $limit++;
-                        }
-                }
-
-}
-
-
-        public function getName() {
-                return 'ArsTechnica';
-        }
-
-        public function getCacheDuration() {
-                return 7200; // 2h
-        }
-
-        public function getURI() {
-                return "http://arstechnica.com";
-        }
-
-}
+<?php
+#ini_set('display_errors', 'On');
+#error_reporting(E_ALL);
+class ArstechnicaBridge extends BridgeAbstract {
+
+        public function loadMetadatas() {
+
+                $this->maintainer = "prysme";
+                $this->name = "ArstechnicaBridge";
+                $this->uri = "http://arstechnica.com";
+                $this->description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
+                $this->update = "01/08/2016";
+
+        }
+
+        public function collectData(array $param) {
+          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 StripCDATA($string) {
+                        $string = str_replace('<![CDATA[', '', $string);
+                        $string = str_replace(']]>', '', $string);
+                        return $string;
+                }
+
+                function ExtractContent($url) {
+                  #echo $url;
+                        $html2 = file_get_html($url);
+
+                        $text = $html2->find("section[id='article-guts']", 0);
+                        /*foreach ($text->find('<aside id="social-left">') as $node)
+                            { $node = NULL; }*/
+                        $text = StripWithDelimiters($text->innertext,'<aside id="social-left">','</aside>');
+                        $text = StripWithDelimiters($text,'<figcaption class="caption">','</figcaption>');
+                        $text = StripWithDelimiters($text,'<div class="gallery shortcode-gallery">','</div>');
+                        //error_log("ICI", 0);
+                        //error_log($text, 0);
+
+                        return $text;
+                }
+
+                $html = $this->file_get_html('http://feeds.arstechnica.com/arstechnica/index') or $this->returnError('Could not request NextInpact.', 404);
+                $limit = 0;
+
+                foreach($html->find('item') as $element) {
+                 if($limit < 5) {
+                                $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->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+                                $item->content = ExtractContent($item->uri);
+                                //$item->content = $item->uri;
+                                $this->items[] = $item;
+                                $limit++;
+                        }
+                }
+
+}
+
+
+        public function getName() {
+                return 'ArsTechnica';
+        }
+
+        public function getCacheDuration() {
+                return 7200; // 2h
+        }
+
+        public function getURI() {
+                return "http://arstechnica.com";
+        }
+
+}
diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php
index c8bc429..2e834ab 100644
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -9,7 +9,7 @@ class DailymotionBridge extends BridgeAbstract{
 		$this->name = "Dailymotion Bridge";
 		$this->uri = "https://www.dailymotion.com/";
 		$this->description = "Returns the 5 newest videos by username/playlist or search";
-		$this->update = "2014-11-18";
+		$this->update = "2016-08-02";
 
 		$this->parameters["By username"] =
 		'[
@@ -24,7 +24,7 @@ class DailymotionBridge extends BridgeAbstract{
 			{
 				"name" : "playlist id",
 				"identifier" : "p",
-				"type" : "number"
+				"type" : "text"
 			}
 		]';
 
@@ -47,7 +47,7 @@ class DailymotionBridge extends BridgeAbstract{
 
 		function getMetadata($id) {
 			$metadata=array();
-			$html2 = $this->file_get_html('http://www.dailymotion.com/video/'.$id) or $this->returnError('Could not request Dailymotion.', 404);
+			$html2 = file_get_html('http://www.dailymotion.com/video/'.$id) or $this->returnError('Could not request Dailymotion.', 404);
 			$metadata['title'] = $html2->find('meta[property=og:title]', 0)->getAttribute('content');
 			$metadata['timestamp'] = strtotime($html2->find('meta[property=video:release_date]', 0)->getAttribute('content') );
 			$metadata['thumbnailUri'] = $html2->find('meta[property=og:image]', 0)->getAttribute('content');

From 5fb27b2aa6e99d2616a04d8e55d627709d0ed826 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 14:41:54 +0200
Subject: [PATCH 023/149] Make CommonDreamsExtractContent member function

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/CommonDreamsBridge.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php
index 6f55b63..6eaca6a 100644
--- a/bridges/CommonDreamsBridge.php
+++ b/bridges/CommonDreamsBridge.php
@@ -7,10 +7,18 @@ class CommonDreamsBridge extends BridgeAbstract{
 			$this->name = "CommonDreams Bridge";
 			$this->uri = "http://www.commondreams.org/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "2015-04-03";
+			$this->update = "2016-08-02";
 
 		}
 
+		function CommonDreamsExtractContent($url) {
+		$html3 = $this->file_get_html($url);
+		$text = $html3->find('div[class=field--type-text-with-summary]', 0)->innertext;
+		$html3->clear();
+		unset ($html3);
+		return $text;
+		}
+
         public function collectData(array $param){
 
 		function CommonDreamsUrl($string) {
@@ -18,14 +26,6 @@ class CommonDreamsBridge extends BridgeAbstract{
 		 $string = $html2[2] . "/node/" . $html2[0];
 		 return $string;
 		}
-	
-		function CommonDreamsExtractContent($url) {
-		$html3 = $this->file_get_html($url);
-		$text = $html3->find('div[class=field--type-text-with-summary]', 0)->innertext;
-		$html3->clear();
-		unset ($html3);
-		return $text;
-		}
 
 		$html = $this->file_get_html('http://www.commondreams.org/rss.xml') or $this->returnError('Could not request CommonDreams.', 404);
 		$limit = 0;
@@ -35,7 +35,7 @@ class CommonDreamsBridge extends BridgeAbstract{
 		 $item->title = $element->find('title', 0)->innertext;
 		 $item->uri = CommonDreamsUrl($element->find('guid', 0)->innertext);
 		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = CommonDreamsExtractContent($item->uri);
+		 $item->content = $this->CommonDreamsExtractContent($item->uri);
 		 $this->items[] = $item;
 		 $limit++;
 		 }

From cb7d4773101356b43a960e3fd993798bfa55356c Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 14:43:59 +0200
Subject: [PATCH 024/149] Fix indentation and remove unnecessary lines

---
 bridges/CommonDreamsBridge.php | 68 ++++++++++++++++------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php
index 6eaca6a..cf4b589 100644
--- a/bridges/CommonDreamsBridge.php
+++ b/bridges/CommonDreamsBridge.php
@@ -1,58 +1,54 @@
 <?php
 class CommonDreamsBridge extends BridgeAbstract{
 
-	   	public function loadMetadatas() {
+	public function loadMetadatas() {
+		$this->maintainer = "nyutag";
+		$this->name = "CommonDreams Bridge";
+		$this->uri = "http://www.commondreams.org/";
+		$this->description = "Returns the newest articles.";
+		$this->update = "2016-08-02";
+	}
 
-			$this->maintainer = "nyutag";
-			$this->name = "CommonDreams Bridge";
-			$this->uri = "http://www.commondreams.org/";
-			$this->description = "Returns the newest articles.";
-			$this->update = "2016-08-02";
-
-		}
-
-		function CommonDreamsExtractContent($url) {
+	function CommonDreamsExtractContent($url) {
 		$html3 = $this->file_get_html($url);
 		$text = $html3->find('div[class=field--type-text-with-summary]', 0)->innertext;
 		$html3->clear();
 		unset ($html3);
 		return $text;
-		}
+	}
 
-        public function collectData(array $param){
+	public function collectData(array $param){
 
 		function CommonDreamsUrl($string) {
-		 $html2 = explode(" ", $string);
-		 $string = $html2[2] . "/node/" . $html2[0];
-		 return $string;
+			$html2 = explode(" ", $string);
+			$string = $html2[2] . "/node/" . $html2[0];
+			return $string;
 		}
 
 		$html = $this->file_get_html('http://www.commondreams.org/rss.xml') or $this->returnError('Could not request CommonDreams.', 404);
 		$limit = 0;
 		foreach($html->find('item') as $element) {
-		 if($limit < 4) {
-		 $item = new \Item();
-		 $item->title = $element->find('title', 0)->innertext;
-		 $item->uri = CommonDreamsUrl($element->find('guid', 0)->innertext);
-		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = $this->CommonDreamsExtractContent($item->uri);
-		 $this->items[] = $item;
-		 $limit++;
-		 }
+			if($limit < 4) {
+				$item = new \Item();
+				$item->title = $element->find('title', 0)->innertext;
+				$item->uri = CommonDreamsUrl($element->find('guid', 0)->innertext);
+				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+				$item->content = $this->CommonDreamsExtractContent($item->uri);
+				$this->items[] = $item;
+				$limit++;
+			}
 		}
-    
-    }
+	}
 
-    public function getName(){
-        return 'CommonDreams Bridge';
-    }
+	public function getName(){
+		return 'CommonDreams Bridge';
+	}
 
-    public function getURI(){
-        return 'http://www.commondreams.org/';
-    }
+	public function getURI(){
+		return 'http://www.commondreams.org/';
+	}
 
-    public function getCacheDuration(){
-        return 3600; // 1 hours
-//	return 0;
-    }
+	public function getCacheDuration(){
+		return 3600; // 1 hours
+	}
 }

From 0631e9d835abe62f367083ea705f1bdd69605956 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 15:31:55 +0200
Subject: [PATCH 025/149] Make ExtractContent a member function

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/DauphineLibereBridge.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index f33c21c..27f84d7 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -7,7 +7,7 @@ class DauphineLibereBridge extends BridgeAbstract{
 			$this->name = "DauphineLibereBridge Bridge";
 			$this->uri = "http://www.ledauphine.com/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "05/11/2015";
+			$this->update = "2016-08-02";
 
 
 			$this->parameters[] =
@@ -82,16 +82,15 @@ class DauphineLibereBridge extends BridgeAbstract{
 			]';
 		}
 
-
-        public function collectData(array $param){
-
-			
 		function ExtractContent($url) {
 		$html2 = $this->file_get_html($url);
 		$text = $html2->find('div.column', 0)->innertext;
 		$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
 		return $text;
 		}
+
+        public function collectData(array $param){
+
 		if (isset($param['u'])) { /* user timeline mode */
 			$this->request = $param['u'];
 			$html = $this->file_get_html('http://www.ledauphine.com/'.$this->request.'/rss') or $this->returnError('Could not request DauphineLibere.', 404);
@@ -107,7 +106,7 @@ class DauphineLibereBridge extends BridgeAbstract{
 		 $item->title = $element->find('title', 0)->innertext;
 		 $item->uri = $element->find('guid', 0)->plaintext;
 		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = ExtractContent($item->uri);
+		 $item->content = $this->ExtractContent($item->uri);
 		 $this->items[] = $item;
 		 $limit++;
 		 }

From 4420906a7a06d4283a16e3778e4a053a2874dbb5 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 15:40:07 +0200
Subject: [PATCH 026/149] Fix indentation and remove unnecessary lines

---
 bridges/DauphineLibereBridge.php | 204 +++++++++++++++----------------
 1 file changed, 101 insertions(+), 103 deletions(-)

diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index 27f84d7..03c35c6 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -1,95 +1,94 @@
 <?php
-class DauphineLibereBridge extends BridgeAbstract{
+class DauphineLibereBridge extends BridgeAbstract {
 
-    	public function loadMetadatas() {
+	public function loadMetadatas() {
 
-			$this->maintainer = "qwertygc";
-			$this->name = "DauphineLibereBridge Bridge";
-			$this->uri = "http://www.ledauphine.com/";
-			$this->description = "Returns the newest articles.";
-			$this->update = "2016-08-02";
+		$this->maintainer = "qwertygc";
+		$this->name = "DauphineLibereBridge Bridge";
+		$this->uri = "http://www.ledauphine.com/";
+		$this->description = "Returns the newest articles.";
+		$this->update = "2016-08-02";
 
+		$this->parameters[] =
+		'[
+			{
+				"name" : "Catégorie de l\'article",
+				"identifier" : "u",
+				"type" : "list",
+				"values" : [
+					{
+						"name" : "À la une",
+						"value" : ""
+					},
+					{
+						"name" : "France Monde",
+						"value" : "france-monde"
+					},
+					{
+						"name" : "Faits Divers",
+						"value" : "faits-divers"
+					},
+					{
+						"name" : "Économie et Finance",
+						"value" : "economie-et-finance"
+					},
+					{
+						"name" : "Politique",
+						"value" : "politique"
+					},
+					{
+						"name" : "Sport",
+						"value" : "sport"
+					},
+					{
+						"name" : "Ain",
+						"value" : "ain"
+					},
+					{
+						"name" : "Alpes-de-Haute-Provence",
+						"value" : "haute-provence"
+					},
+					{
+						"name" : "Hautes-Alpes",
+						"value" : "hautes-alpes"
+					},
+					{
+						"name" : "Ardèche",
+						"value" : "ardeche"
+					},
+					{
+						"name" : "Drôme",
+						"value" : "drome"
+					},
+					{
+						"name" : "Isère Sud",
+						"value" : "isere-sud"
+					},
+					{
+						"name" : "Savoie",
+						"value" : "savoie"
+					},
+					{
+						"name" : "Haute-Savoie",
+						"value" : "haute-savoie"
+					},
+					{
+						"name" : "Vaucluse",
+						"value" : "vaucluse"
+					}
+				]
+			}
+		]';
+	}
 
-			$this->parameters[] =
-			'[
-				{
-					"name" : "Catégorie de l\'article",
-					"identifier" : "u",
-					"type" : "list",
-					"values" : [
-						{
-							"name" : "À la une",
-							"value" : ""
-						},
-						{
-							"name" : "France Monde",
-							"value" : "france-monde"
-						},
-						{
-							"name" : "Faits Divers",
-							"value" : "faits-divers"
-						},
-						{
-							"name" : "Économie et Finance",
-							"value" : "economie-et-finance"
-						},
-						{
-							"name" : "Politique",
-							"value" : "politique"
-						},
-						{
-							"name" : "Sport",
-							"value" : "sport"
-						},
-						{
-							"name" : "Ain",
-							"value" : "ain"
-						},
-						{
-							"name" : "Alpes-de-Haute-Provence",
-							"value" : "haute-provence"
-						},
-						{
-							"name" : "Hautes-Alpes",
-							"value" : "hautes-alpes"
-						},
-						{
-							"name" : "Ardèche",
-							"value" : "ardeche"
-						},
-						{
-							"name" : "Drôme",
-							"value" : "drome"
-						},
-						{
-							"name" : "Isère Sud",
-							"value" : "isere-sud"
-						},
-						{
-							"name" : "Savoie",
-							"value" : "savoie"
-						},
-						{
-							"name" : "Haute-Savoie",
-							"value" : "haute-savoie"
-						},
-						{
-							"name" : "Vaucluse",
-							"value" : "vaucluse"
-						}
-					]
-				}
-			]';
-		}
-
-		function ExtractContent($url) {
+	function ExtractContent($url) {
 		$html2 = $this->file_get_html($url);
 		$text = $html2->find('div.column', 0)->innertext;
 		$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
 		return $text;
-		}
+	}
 
-        public function collectData(array $param){
+	public function collectData(array $param){
 
 		if (isset($param['u'])) { /* user timeline mode */
 			$this->request = $param['u'];
@@ -101,29 +100,28 @@ class DauphineLibereBridge extends BridgeAbstract{
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
-		 if($limit < 10) {
-		 $item = new \Item();
-		 $item->title = $element->find('title', 0)->innertext;
-		 $item->uri = $element->find('guid', 0)->plaintext;
-		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = $this->ExtractContent($item->uri);
-		 $this->items[] = $item;
-		 $limit++;
-		 }
+			if($limit < 10) {
+			$item = new \Item();
+			$item->title = $element->find('title', 0)->innertext;
+			$item->uri = $element->find('guid', 0)->plaintext;
+			$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+			$item->content = $this->ExtractContent($item->uri);
+			$this->items[] = $item;
+			$limit++;
+			}
 		}
-    
-    }
+	}
 
-    public function getName(){
-        return 'Dauphine Bridge';
-    }
+	public function getName(){
+		return 'Dauphine Bridge';
+	}
 
-    public function getURI(){
-        return 'http://ledauphine.com/';
-    }
+	public function getURI(){
+		return 'http://ledauphine.com/';
+	}
 
-    public function getCacheDuration(){
-        return 3600*2; // 2 hours
-        // return 0; // 2 hours
-    }
+	public function getCacheDuration(){
+		return 3600*2; // 2 hours
+	}
 }
+?>
\ No newline at end of file

From 0f3ca30caa2e0a31c81af3f52ade1b5c5d74b2c3 Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Tue, 2 Aug 2016 15:46:21 +0200
Subject: [PATCH 027/149] [WordPress] bridge rewrite

---
 bridges/WordPressBridge.php | 82 +++++++++++++++----------------------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index fb43286..b437b02 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -2,15 +2,14 @@
 class WordPressBridge extends BridgeAbstract {
 
 	private $url;
-	public $name;
 
 	public function loadMetadatas() {
 
 		$this->maintainer = "aledeg";
 		$this->name = "Wordpress Bridge";
-		$this->uri = "https://wordpress.com/";
+		$this->uri = "https://wordpress.org/";
 		$this->description = "Returns the 3 newest full posts of a Wordpress blog";
-		$this->update = "2015-09-05";
+		$this->update = "2016-08-02";
 
 		$this->parameters[] =
 		'[
@@ -18,72 +17,58 @@ class WordPressBridge extends BridgeAbstract {
 				"name" : "blog URL",
 				"required" : "true",
 				"identifier" : "url"
-			},
-			{
-				"name" : "Blog name",
-				"identifier" : "name"
 			}
 		]';
 
 	}
 
 	public function collectData(array $param) {
+
+                function StripCDATA($string) {
+                        $string = str_replace('<![CDATA[', '', $string);
+                        $string = str_replace(']]>', '', $string);
+                        return $string;
+                }
+
+                function clearContent($content) {
+                        $content = preg_replace('/<script.*\/script>/', '', $content);
+                        $content = preg_replace('/<div class="wpa".*/', '', $content);
+                        return $content;
+                }
+
 		$this->processParams($param);
 
 		if (!$this->hasUrl()) {
 			$this->returnError('You must specify a URL', 400);
 		}
 
+                $this->url = $this->url.'/feed/atom';
 		$html = $this->file_get_html($this->url) or $this->returnError("Could not request {$this->url}.", 404);
-		$posts = $html->find('.post');
-
-		if(!empty($posts) ) {
-			$i=0;
-			foreach ($html->find('.post') as $article) {
+		$posts = $html->find('entry');
+                if(!empty($posts) ) {
+                        $this->name = $html->find('title', 0)->plaintext;
+                        $i=0;
+			foreach ($html->find('entry') as $article) {
 				if($i < 3) {
-					$uri = $article->find('a', 0)->href;
-					$thumbnail = $article->find('img', 0)->src;
-					$this->items[] = $this->getDetails($uri, $thumbnail);
+					$this->items[$i]->uri = $article->find('link', 0)->getAttribute('href');
+					$this->items[$i]->title = StripCDATA($article->find('title', 0)->plaintext);
+					$this->items[$i]->author = trim($article->find('author', 0)->innertext);
+					$this->items[$i]->timestamp = strtotime($article->find('updated', 0)->innertext);
+
+                                        $article_html = $this->file_get_html($this->items[$i]->uri);
+					$this->items[$i]->content = clearContent($article_html->find('article', 0)->innertext);
+                                        if(empty($this->items[$i]->content))
+					        $this->items[$i]->content = clearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
+
 					$i++;
 				}
-			}
-		}
+			} 
+                }
 		else {
 			$this->returnError("Sorry, {$this->url} doesn't seem to be a Wordpress blog.", 404);
 		}
 	}
 
-	private function getDetails($uri, $thumbnail) {
-		$html = $this->file_get_html($uri) or exit;
-		$article = $html->find('.post', 0);
-
-		$title = $article->find('h1', 0)->innertext;
-		if (strlen($title) == 0)
-			$title = $article->find('h2', 0)->innertext;
-
-		$item = new \Item();
-		$item->uri = $uri;
-		$item->title = htmlspecialchars_decode($title);
-		$item->author = $article->find('a[rel=author]', 0)->innertext;
-		$item->thumbnailUri = $thumbnail;
-		$item->content = $this->clearContent($article->find('.entry-content,.entry', 0)->innertext);
-		$item->timestamp = $this->getDate($uri);
-
-		return $item;
-	}
-
-	private function clearContent($content) {
-		$content = preg_replace('/<script.*\/script>/', '', $content);
-		$content = preg_replace('/<div class="wpa".*/', '', $content);
-		return $content;
-	}
-
-	private function getDate($uri) {
-		preg_match('/\d{4}\/\d{2}\/\d{2}/', $uri, $matches);
-		$date = new \DateTime($matches[0]);
-		return $date->format('U');
-	}
-
 	public function getName() {
 		return "{$this->name} - Wordpress Bridge";
 	}
@@ -105,7 +90,6 @@ class WordPressBridge extends BridgeAbstract {
 
 	private function processParams($param) {
 		$this->url = $param['url'];
-		$this->name = $param['name'];
 	}
 
 }

From 3cc262443cb4b46e582fd2999c8e629c40e2240b Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Tue, 2 Aug 2016 15:46:52 +0200
Subject: [PATCH 028/149] [Maliki] Removed because uses WP now

---
 bridges/MalikiBridge.php | 60 ----------------------------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 bridges/MalikiBridge.php

diff --git a/bridges/MalikiBridge.php b/bridges/MalikiBridge.php
deleted file mode 100644
index 4732c85..0000000
--- a/bridges/MalikiBridge.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-class MalikiBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Maliki";
-		$this->uri = "http://www.maliki.com/";
-		$this->description = "Returns Maliki's newest strips";
-		$this->update = "2014-05-30";
-
-	}
-
-    public function collectData(array $param){
-        $html = $this->file_get_html('http://www.maliki.com/') or $this->returnError('Could not request Maliki.', 404);
-	$count=0;
-	$latest=1; $latest_title="";
-	$latest = $html->find('div.conteneur_page a', 1)->href;
-	$latest_title = $html->find('div.conteneur_page img', 0)->title;
-
-	function MalikiExtractContent($url) {
-		$html2 = $this->file_get_html($url);
-		$text = 'http://www.maliki.com/'.$html2->find('img', 0)->src;
-		$text = '<img alt="" src="'.$text.'"/><br>'.$html2->find('div.imageetnews', 0)->plaintext;
-		return $text;
-    	}
-
-            $item = new \Item();
-            $item->uri = 'http://www.maliki.com/'.$latest;
-            $item->title = $latest_title;
-            $item->timestamp = time();
-            $item->content = MalikiExtractContent($item->uri);
-            $this->items[] = $item;
-	
-
-        foreach($html->find('div.boite_strip') as $element) {
-	  if(!empty($element->find('a',0)->href) and $count < 3) {
-            $item = new \Item();
-            $item->uri = 'http://www.maliki.com/'.$element->find('a',0)->href;
-            $item->title = $element->find('img',0)->title;
-            $item->timestamp = strtotime(str_replace('/', '-', $element->find('span.stylepetit', 0)->innertext));
-            $item->content = MalikiExtractContent($item->uri);
-            $this->items[] = $item;
-	    $count++;
-          }
-        }
-    }
-
-    public function getName(){
-        return 'Maliki';
-    }
-
-    public function getURI(){
-        return 'http://www.maliki.com/';
-    }
-
-    public function getCacheDuration(){
-        return 86400*6; // 6 days
-    }
-}

From c8c3e9ef65296c436e8fbc7e11c9e7428da90e74 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 15:57:01 +0200
Subject: [PATCH 029/149] Add http-context to simulate Mozilla user-agent

This fixes "Warning: file_get_contents(http://www.ledauphine.com/rss):
failed to open stream: HTTP request failed! HTTP/1.1 403 Forbidden"
---
 bridges/DauphineLibereBridge.php | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index 03c35c6..d2fd1d1 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -81,8 +81,8 @@ class DauphineLibereBridge extends BridgeAbstract {
 		]';
 	}
 
-	function ExtractContent($url) {
-		$html2 = $this->file_get_html($url);
+	function ExtractContent($url, $context) {
+		$html2 = $this->file_get_html($url, false, $context);
 		$text = $html2->find('div.column', 0)->innertext;
 		$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
 		return $text;
@@ -90,24 +90,34 @@ class DauphineLibereBridge extends BridgeAbstract {
 
 	public function collectData(array $param){
 
+		// Simulate Mozilla user-agent to fix error 403 (Forbidden)
+		$opts = array('http' =>
+			array(
+				'method'  => 'GET',
+				'header'  => 'User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36'
+			)
+		);
+
+		$context = stream_context_create($opts);
+
 		if (isset($param['u'])) { /* user timeline mode */
 			$this->request = $param['u'];
-			$html = $this->file_get_html('http://www.ledauphine.com/'.$this->request.'/rss') or $this->returnError('Could not request DauphineLibere.', 404);
+			$html = $this->file_get_html('http://www.ledauphine.com/'.$this->request.'/rss', false, $context) or $this->returnError('Could not request DauphineLibere.', 404);
 		}
 		else {
-			$html = $this->file_get_html('http://www.ledauphine.com/rss') or $this->returnError('Could not request DauphineLibere.', 404);
+			$html = $this->file_get_html('http://www.ledauphine.com/rss', false, $context) or $this->returnError('Could not request DauphineLibere.', 404);
 		}
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
 			if($limit < 10) {
-			$item = new \Item();
-			$item->title = $element->find('title', 0)->innertext;
-			$item->uri = $element->find('guid', 0)->plaintext;
-			$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-			$item->content = $this->ExtractContent($item->uri);
-			$this->items[] = $item;
-			$limit++;
+				$item = new \Item();
+				$item->title = $element->find('title', 0)->innertext;
+				$item->uri = $element->find('guid', 0)->plaintext;
+				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+				$item->content = $this->ExtractContent($item->uri, $context);
+				$this->items[] = $item;
+				$limit++;
 			}
 		}
 	}

From f3d3582af1fe78d75736117dbc841be20d333cd1 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 16:20:43 +0200
Subject: [PATCH 030/149] 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!

This also fixes an error where calling collectData multiple times would
result in an attempt to redeclare all nested functions (which would
cause errors)
---
 bridges/GBAtempBridge.php | 109 +++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 55 deletions(-)

diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php
index d0d1fae..69c5d09 100644
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -9,7 +9,7 @@ class GBAtempBridge extends BridgeAbstract {
         $this->name = 'GBAtemp';
         $this->uri = $this->getURI();
         $this->description = 'GBAtemp is a user friendly underground video game community.';
-        $this->update = '2016-02-14';
+        $this->update = '2016-08-02';
 
         $this->parameters[] =
         '[
@@ -40,48 +40,47 @@ class GBAtempBridge extends BridgeAbstract {
         ]';
     }
 
+    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;
+    }
+
+    function build_item($uri, $title, $author, $timestamp, $thumnail, $content) {
+        $item = new \Item();
+        $item->uri = $uri;
+        $item->title = $title;
+        $item->author = $author;
+        $item->timestamp = $timestamp;
+        $item->thumbnailUri = $thumnail;
+        $item->content = $content;
+        return $item;
+    }
+
+    function cleanup_post_content($content, $site_url) {
+        $content = str_replace(':arrow:', '&#x27a4;', $content);
+        $content = str_replace('href="attachments/', 'href="'.$site_url.'attachments/', $content);
+        $content = $this->StripWithDelimiters($content, '<script', '</script>');
+        return $content;
+    }
+
+    function fetch_post_content($uri, $site_url) {
+        $html = $this->file_get_html($uri) or $this->returnError('Could not request GBAtemp: '.$uri, 500);
+        $content = $html->find('div.messageContent', 0)->innertext;
+        return $this->cleanup_post_content($content, $site_url);
+    }
+
     public function collectData(array $param) {
-
-        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;
-        }
-
-        function build_item($uri, $title, $author, $timestamp, $thumnail, $content) {
-            $item = new \Item();
-            $item->uri = $uri;
-            $item->title = $title;
-            $item->author = $author;
-            $item->timestamp = $timestamp;
-            $item->thumbnailUri = $thumnail;
-            $item->content = $content;
-            return $item;
-        }
-
-        function cleanup_post_content($content, $site_url) {
-            $content = str_replace(':arrow:', '&#x27a4;', $content);
-            $content = str_replace('href="attachments/', 'href="'.$site_url.'attachments/', $content);
-            $content = StripWithDelimiters($content, '<script', '</script>');
-            return $content;
-        }
-
-        function fetch_post_content($uri, $site_url) {
-            $html = $this->file_get_html($uri) or $this->returnError('Could not request GBAtemp: '.$uri, 500);
-            $content = $html->find('div.messageContent', 0)->innertext;
-            return cleanup_post_content($content, $site_url);
-        }
-
         $typeFilter = '';
         if (!empty($param['type'])) {
             if ($param['type'] == 'N' || $param['type'] == 'R' || $param['type'] == 'T' || $param['type'] == 'F') {
@@ -99,45 +98,45 @@ class GBAtempBridge extends BridgeAbstract {
             foreach ($html->find('li[class=news_item full]') as $newsItem) {
                 $url = $this->getURI().$newsItem->find('a', 0)->href;
                 $img = $this->getURI().$newsItem->find('img', 0)->src;
-                $time = intval(ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
+                $time = intval($this->ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $newsItem->find('a.username', 0)->plaintext;
                 $title = $newsItem->find('a', 1)->plaintext;
-                $content = fetch_post_content($url, $this->getURI());
-                $this->items[] = build_item($url, $title, $author, $time, $img, $content);
+                $content = $this->fetch_post_content($url, $this->getURI());
+                $this->items[] = $this->build_item($url, $title, $author, $time, $img, $content);
             }
         } else if ($typeFilter == 'R') {
             foreach ($html->find('li.portal_review') as $reviewItem) {
                 $url = $this->getURI().$reviewItem->find('a', 0)->href;
-                $img = $this->getURI().ExtractFromDelimiters($reviewItem->find('a', 0)->style, 'image:url(', ')');
+                $img = $this->getURI().$this->ExtractFromDelimiters($reviewItem->find('a', 0)->style, 'image:url(', ')');
                 $title = $reviewItem->find('span.review_title', 0)->plaintext;
                 $content = $this->file_get_html($url) or $this->returnError('Could not request GBAtemp: '.$uri, 500);
                 $author = $content->find('a.username', 0)->plaintext;
-                $time = intval(ExtractFromDelimiters($content->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
+                $time = intval($this->ExtractFromDelimiters($content->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $intro = '<p><b>'.($content->find('div#review_intro', 0)->plaintext).'</b></p>';
                 $review = $content->find('div#review_main', 0)->innertext;
                 $subheader = '<p><b>'.$content->find('div.review_subheader', 0)->plaintext.'</b></p>';
                 $procons = $content->find('table.review_procons', 0)->outertext;
                 $scores = $content->find('table.reviewscores', 0)->outertext;
-                $content = cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->getURI());
-                $this->items[] = build_item($url, $title, $author, $time, $img, $content);
+                $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->getURI());
+                $this->items[] = $this->build_item($url, $title, $author, $time, $img, $content);
             }
         } else if ($typeFilter == 'T') {
             foreach ($html->find('li.portal-tutorial') as $tutorialItem) {
                 $url = $this->getURI().$tutorialItem->find('a', 0)->href;
                 $title = $tutorialItem->find('a', 0)->plaintext;
-                $time = intval(ExtractFromDelimiters($tutorialItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
+                $time = intval($this->ExtractFromDelimiters($tutorialItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $tutorialItem->find('a.username', 0)->plaintext;
-                $content = fetch_post_content($url, $this->getURI());
-                $this->items[] = build_item($url, $title, $author, $time, '', $content);
+                $content = $this->fetch_post_content($url, $this->getURI());
+                $this->items[] = $this->build_item($url, $title, $author, $time, '', $content);
             }
         } else if ($typeFilter == 'F') {
             foreach ($html->find('li.rc_item') as $postItem) {
                 $url = $this->getURI().$postItem->find('a', 1)->href;
                 $title = $postItem->find('a', 1)->plaintext;
-                $time = intval(ExtractFromDelimiters($postItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
+                $time = intval($this->ExtractFromDelimiters($postItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $postItem->find('a.username', 0)->plaintext;
-                $content = fetch_post_content($url, $this->getURI());
-                $this->items[] = build_item($url, $title, $author, $time, '', $content);
+                $content = $this->fetch_post_content($url, $this->getURI());
+                $this->items[] = $this->build_item($url, $title, $author, $time, '', $content);
             }
         }
     }

From cd5f3e740a55d948d1e664537e7046d3cb8d9b97 Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Tue, 2 Aug 2016 17:48:57 +0200
Subject: [PATCH 031/149] [Wordpress] Add a div class commonly used for post
 content

---
 bridges/WordPressBridge.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index b437b02..7a1b12e 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -57,6 +57,8 @@ class WordPressBridge extends BridgeAbstract {
 
                                         $article_html = $this->file_get_html($this->items[$i]->uri);
 					$this->items[$i]->content = clearContent($article_html->find('article', 0)->innertext);
+                                        if(empty($this->items[$i]->content))
+					        $this->items[$i]->content = clearContent($article_html->find('.single-content', 0)->innertext); // another common content div
                                         if(empty($this->items[$i]->content))
 					        $this->items[$i]->content = clearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
 

From 72e457a5b7309f38140bd4837cdecda8e9a89176 Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Tue, 2 Aug 2016 17:49:47 +0200
Subject: [PATCH 032/149] [Coindesk] remove bridge: website supported by
 Wordpress bridge

---
 bridges/CoinDeskBridge.php | 58 --------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 bridges/CoinDeskBridge.php

diff --git a/bridges/CoinDeskBridge.php b/bridges/CoinDeskBridge.php
deleted file mode 100644
index 4f9e865..0000000
--- a/bridges/CoinDeskBridge.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-class CoinDeskBridge extends BridgeAbstract {
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "CoinDesk";
-		$this->uri = "http://www.coindesk.com/";
-		$this->description = "Returns the 5 newest posts from CoinDesk (full text)";
-		$this->update = "2014-05-30";
-
-	}
-
-    public function collectData(array $param) {
-
-    function CoinDeskStripCDATA($string) {
-    	$string = str_replace('<![CDATA[', '', $string);
-    	$string = str_replace(']]>', '', $string);
-    	return $string;
-    }
-    function CoinDeskExtractContent($url) {
-		//FIXME: We need to change the $this->file_get_html to a static
-		$html2 = file_get_html($url);
-		$text = $html2->find('div.single-content', 0)->innertext;
-		$text = strip_tags($text, '<p><a><img>');
-		return $text;
-    }
-
-    $html = $this->file_get_html('http://www.coindesk.com/feed/atom/') or $this->returnError('Could not request CoinDesk.', 404);
-	$limit = 0;
-
-	foreach($html->find('entry') as $element) {
-	 if($limit < 5) {
-	 $item = new \Item();
-	 $item->title = CoinDeskStripCDATA($element->find('title', 0)->innertext);
-	 $item->author = $element->find('author', 0)->plaintext;
-	 $item->uri = $element->find('link', 0)->href;
-	 $item->timestamp = strtotime($element->find('published', 0)->plaintext);
-	 $item->content = CoinDeskExtractContent($item->uri);
-	 $this->items[] = $item;
-	 $limit++;
-	 }
-	}
-    
-    }
-
-    public function getName(){
-        return 'CoinDesk';
-    }
-
-    public function getURI(){
-        return 'http://www.coindesk.com/';
-    }
-
-    public function getCacheDuration(){
-        return 1800; // 30min
-    }
-}

From ab4e63b59cc415edc25e2b38fc8315d79d023bdd Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Tue, 2 Aug 2016 18:56:12 +0200
Subject: [PATCH 033/149] New style for rss-bridge

---
 css/style.css     | 215 ++++++++++++++++++++++------------------------
 lib/HTMLUtils.php |   2 +-
 2 files changed, 102 insertions(+), 115 deletions(-)

diff --git a/css/style.css b/css/style.css
index 36f25b7..e378f57 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,143 +1,130 @@
-/* html5 boilerplate from http://csswizardry.com/2011/01/the-real-html5-boilerplate/  */
-/*------------------------------------*\
-    RESET
-\*------------------------------------*/
-/* http://meyerweb.com/eric/tools/css/reset/ 
-    v2.0b1 | 201101 
-    NOTE:WORK IN PROGRESS
-    USE WITH CAUTION AND TEST WITH ABANDON */
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video {
+
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
 
-html,body,div,span,applet,object,iframe,
-h1,h2,h3,h4,h5,h6,p,blockquote,pre,
-a,abbr,acronym,address,big,cite,code,
-del,dfn,em,img,ins,kbd,q,s,samp,
-small,strike,strong,sub,sup,tt,var,
-b,u,i,center,
-dl,dt,dd,ol,ul,li,
-fieldset,form,label,legend,
-table,caption,tbody,tfoot,thead,tr,th,td,
-article,aside,canvas,details,figcaption,figure,
-footer,header,hgroup,menu,nav,section,summary,
-time,mark,audio,video{
-    margin:0;
-    padding:0;
-    border:0;
-    outline:0;
-    font-size:100%;
-    font:inherit;
-    vertical-align:baseline;
 }
 /* HTML5 display-role reset for older browsers */
-article,aside,details,figcaption,figure,
-footer,header,hgroup,menu,nav,section{
-    display:block;
-}
-body{
-    line-height:1;
-}
-ol,ul{
-    list-style:none;
-}
-blockquote,q{
-    quotes:none;
-}
-blockquote:before,blockquote:after,
-q:before,q:after{
-    content:’’;
-    content:none;
-}
-/* remember to define visible focus styles! 
-:focus{
-    outline:?????;
-} */
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
+
+    display: block;
 
-/* remember to highlight inserts somehow! */
-ins{
-    text-decoration:none;
-}
-del{
-    text-decoration:line-through;
 }
 
-table{
-    border-collapse:collapse;
-    border-spacing:0;
-}
-
-
-/*------------------------------------*\
-    $MAIN
-\*------------------------------------*/
-/* GO! */
-
+/* Let's go for the actual style */
 
 body {
-    font-family: "Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif;
-    font-size: 120%;
+
+	background-color: #EEEEEE;
+	font-family: 'Noto Sans';
+
 }
 
-h1 {
-    font-size: 300%;
-    font-weight: bold;
-    text-shadow: 0 5px 6px rgba(150,150,150,0.69);
+header {
+
+	text-shadow:0 5px 6px rgba(150,150,150,0.69);
+	text-align: center;
+	color: #1182DB;
+
 }
 
-h2 {
-    font-size: 120%;
-    margin-bottom: 10px;
+header > h1 {
+
+	font-size: 300%;
+
 }
 
-h2 a {
-    color:black;
-}
+header > h2 {
 
-form {
-    margin-bottom: 10px;
-}
+	margin-left: 1em;
+	font-size: 120%;
 
-header,footer {
-    max-width: 600px;
-    margin: 0 auto;
-    padding: 20px;
-}
-
-header h2 {
-	margin-left:1em;
-}
-
-footer {
-    text-align: center;
-    font-size: 80%;
 }
 
 section {
-    max-width: 600px;
-    margin: 30px auto;
-    padding: 10px 15px;
-    -webkit-box-shadow: 0 0 9px rgba(50,50,50,0.51);
-    -moz-box-shadow: 0 0 9px rgba(50,50,50,0.51);
-    box-shadow: 0 0 9px rgba(50,50,50,0.51);
-    background: #f5f5f5;
+
+	background-color: #FFFFFF;
+	width: 80%;
+	margin: 30px auto;
+	padding: 10px 15px;
+	text-align: center;
+
+	box-shadow: 0px 1px 2px rgba(0,0,0, 0.25);
+
+}
+
+section > h2 {
+
+	font-size: 200%;
+	font-weight: bold;
+
+}
+
+a, a:link, a:visited {
+
+	color: #2196F3;
+
+}
+
+button {
+
+	line-height: 1.9em;
+	color: #FFF;
+	font-weight: bold;
+	vertical-align: middle;
+	padding: 6px 12px;
+	margin: 12px auto 0px;
+	box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
+	border-radius: 2px;
+	border: 1px solid transparent;
+	min-width: 140px;
+	background: #2196F3 none repeat scroll 0% 0%;
+	cursor: pointer;
+
+	width: calc(20% - 4px);
+
 }
 
 .description {
-    font-size:70%;
-    margin-bottom: 10px;
-    position:relative;
-    bottom: 5px;
-    color: #555;
+
+	margin: 10px;
+	text-decoration: underline;
+
+}
+
+h5 {
+
+	margin: 20px;
+	font-weight: bold;
+
+}
+
+form {
+
+	margin-bottom: 6px;
+
 }
 
 .maintainer {
-    font-size:60%;
-    float:right;
-    color: #777;
+
+	font-size: 60%;
+	text-align: right;
+
 }
 
-.placeholder {
-    color: #aaa;
-}
+input[type="text"] {
+
+	background-color: white;
+	color: #404552;
+	border: 0px;
+	border-bottom: 2px solid #2196F3;
+	font-size: 1.1em;
+	margin-left: 8px;
+	padding-left: 4px;
 
-input, label {
-    font-size: 80%;
 }
diff --git a/lib/HTMLUtils.php b/lib/HTMLUtils.php
index 1e2f0f7..ce08efa 100644
--- a/lib/HTMLUtils.php
+++ b/lib/HTMLUtils.php
@@ -141,7 +141,7 @@ CARD;
 
 		}
 
-		$card .= '<span class="maintainer">'.$bridgeElement->maintainer.'</span>';
+		$card .= '<p class="maintainer">'.$bridgeElement->maintainer.'</p>';
 		$card .= '</section>';
 
 		return $card;

From 8f76eebddb3d18cd70033a72c42b5cf146d1f353 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 20:29:40 +0200
Subject: [PATCH 034/149] Fix parameters list

Fixes warning: "array_key_exists() expects parameter 2 to be array,
string given in /volume1/web/rss-bridge_dev/lib/HTMLUtils.php on line 59
Warning: Invalid argument supplied for foreach() in
/volume1/web/rss-bridge_dev/lib/HTMLUtils.php on line 64
---
 bridges/ElsevierBridge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index bb73477..9265a0c 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -12,9 +12,9 @@ class ElsevierBridge extends BridgeAbstract{
     $this->name = 'Elsevier journals recent articles';
     $this->uri = 'http://www.journals.elsevier.com';
     $this->description = 'Returns the recent articles published in Elsevier journals';
-    $this->update = '2016-06-26';
+    $this->update = '2016-08-02';
 
-    $this->parameters=
+    $this->parameters[] =
       '[
          {
            "name" : "Journal name",

From 399fce06ce5f5eb95ec2f91914d970ba9db32836 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 20:35:27 +0200
Subject: [PATCH 035/149] Require input field, add example value and title

Previously the bridge could be requested without any journal causing
error 403 due to broken URL.
---
 bridges/ElsevierBridge.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index 9265a0c..408fc45 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -18,7 +18,10 @@ class ElsevierBridge extends BridgeAbstract{
       '[
          {
            "name" : "Journal name",
-           "identifier" : "j"
+           "identifier" : "j",
+           "required" : "true",
+           "exampleValue" : "academic-pediatrics",
+           "title" : "Insert html-part of your journal"
          }
        ]';
   }

From f7839697213d9a2c93b7d52519444ffd963f2c65 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 21:35:13 +0200
Subject: [PATCH 036/149] Create member functions to extract information from
 articles

The extractor function will handle many situations more specifically in
order to provide better results.
---
 bridges/ElsevierBridge.php | 47 +++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index 408fc45..7911feb 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -26,6 +26,47 @@ class ElsevierBridge extends BridgeAbstract{
        ]';
   }
 
+  // Extracts the list of names from an article as string
+  function ExtractArticleName ($article){
+    $names = $article->find('small', 0);
+    if($names)
+      return trim($names->plaintext);
+    return '';
+  }
+
+  // Extracts the timestamp from an article
+  function ExtractArticleTimestamp ($article){
+    $time = $article->find('.article-info', 0);
+    if($time){
+      $timestring = trim($time->plaintext);
+      /* 
+        The format depends on the age of an article:
+        - Available online 29 July 2016
+        - July 2016
+        - May–June 2016
+      */
+      if(preg_match('/\S*(\d+\s\S+\s\d{4})/ims', $timestring, $matches)){
+        return strtotime($matches[0]);
+      } elseif (preg_match('/([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
+        return strtotime($matches[0]);
+      } elseif (preg_match('/[A-Za-z]+\-([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
+        return strtotime($matches[0]);
+      } else {
+        return 0;
+      }
+    }
+    return 0;
+  }
+
+  // Extracts the content from an article
+  function ExtractArticleContent ($article){
+    $content = $article->find('.article-content', 0);
+    if($content){
+      return trim($content->plaintext);
+    }
+    return '';
+  }
+
   public function collectData(array $param){
     $uri = 'http://www.journals.elsevier.com/'.$param['j'].'/recent-articles/';
     $html = file_get_html($uri)
@@ -36,9 +77,9 @@ class ElsevierBridge extends BridgeAbstract{
       $item = new \Item();
       $item->uri=$article->find('.pod-listing-header>a',0)->getAttribute('href').'?np=y';
       $item->title=$article->find('.pod-listing-header>a',0)->plaintext;
-      $item->name=trim($article->find('small',0)->plaintext);
-      $item->timestamp=strtotime($article->find('.article-info',0)->plaintext);
-      $item->content=trim($article->find('.article-content',0)->plaintext);
+      $item->name=$this->ExtractArticleName($article);
+      $item->timestamp=$this->ExtractArticleTimestamp($article);
+      $item->content=$this->ExtractArticleContent($article);
 
       $this->items[]=$item;
     }

From a1c680f8e8dac7cb8086cf469d4ff05b469d4b90 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 2 Aug 2016 21:40:22 +0200
Subject: [PATCH 037/149] Fix indentation and improve code style

- Use tab instead of spaces
- Remove obsolete bridge description at start of the file
- Add spaces at the assignment operator ('=' -> ' = ')
- Remove unnecessary empty lines
---
 bridges/ElsevierBridge.php | 164 ++++++++++++++++++-------------------
 1 file changed, 78 insertions(+), 86 deletions(-)

diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index 7911feb..4f4cd57 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -1,99 +1,91 @@
 <?php
-/**
- * ElsevierBridge
- *
- * @name Elsevier Bridge
- * @description Returns the recent articles published in Elsevier journals
- */
 class ElsevierBridge extends BridgeAbstract{
-  public function loadMetadatas() {
+	public function loadMetadatas() {
 
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'Elsevier journals recent articles';
-    $this->uri = 'http://www.journals.elsevier.com';
-    $this->description = 'Returns the recent articles published in Elsevier journals';
-    $this->update = '2016-08-02';
+		$this->maintainer = 'Pierre Mazière';
+		$this->name = 'Elsevier journals recent articles';
+		$this->uri = 'http://www.journals.elsevier.com';
+		$this->description = 'Returns the recent articles published in Elsevier journals';
+		$this->update = '2016-08-02';
 
-    $this->parameters[] =
-      '[
-         {
-           "name" : "Journal name",
-           "identifier" : "j",
-           "required" : "true",
-           "exampleValue" : "academic-pediatrics",
-           "title" : "Insert html-part of your journal"
-         }
-       ]';
-  }
+		$this->parameters[] =
+			'[
+				 {
+					 "name" : "Journal name",
+					 "identifier" : "j",
+					 "required" : "true",
+					 "exampleValue" : "academic-pediatrics",
+					 "title" : "Insert html-part of your journal"
+				 }
+			 ]';
+	}
 
-  // Extracts the list of names from an article as string
-  function ExtractArticleName ($article){
-    $names = $article->find('small', 0);
-    if($names)
-      return trim($names->plaintext);
-    return '';
-  }
+	// Extracts the list of names from an article as string
+	function ExtractArticleName ($article){
+		$names = $article->find('small', 0);
+		if($names)
+			return trim($names->plaintext);
+		return '';
+	}
 
-  // Extracts the timestamp from an article
-  function ExtractArticleTimestamp ($article){
-    $time = $article->find('.article-info', 0);
-    if($time){
-      $timestring = trim($time->plaintext);
-      /* 
-        The format depends on the age of an article:
-        - Available online 29 July 2016
-        - July 2016
-        - May–June 2016
-      */
-      if(preg_match('/\S*(\d+\s\S+\s\d{4})/ims', $timestring, $matches)){
-        return strtotime($matches[0]);
-      } elseif (preg_match('/([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
-        return strtotime($matches[0]);
-      } elseif (preg_match('/[A-Za-z]+\-([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
-        return strtotime($matches[0]);
-      } else {
-        return 0;
-      }
-    }
-    return 0;
-  }
+	// Extracts the timestamp from an article
+	function ExtractArticleTimestamp ($article){
+		$time = $article->find('.article-info', 0);
+		if($time){
+			$timestring = trim($time->plaintext);
+			/* 
+				The format depends on the age of an article:
+				- Available online 29 July 2016
+				- July 2016
+				- May–June 2016
+			*/
+			if(preg_match('/\S*(\d+\s\S+\s\d{4})/ims', $timestring, $matches)){
+				return strtotime($matches[0]);
+			} elseif (preg_match('/([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
+				return strtotime($matches[0]);
+			} elseif (preg_match('/[A-Za-z]+\-([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
+				return strtotime($matches[0]);
+			} else {
+				return 0;
+			}
+		}
+		return 0;
+	}
 
-  // Extracts the content from an article
-  function ExtractArticleContent ($article){
-    $content = $article->find('.article-content', 0);
-    if($content){
-      return trim($content->plaintext);
-    }
-    return '';
-  }
+	// Extracts the content from an article
+	function ExtractArticleContent ($article){
+		$content = $article->find('.article-content', 0);
+		if($content){
+			return trim($content->plaintext);
+		}
+		return '';
+	}
 
-  public function collectData(array $param){
-    $uri = 'http://www.journals.elsevier.com/'.$param['j'].'/recent-articles/';
-    $html = file_get_html($uri)
-      or $this->returnError('No results for Elsevier journal '.$param['j'], 404);
+	public function collectData(array $param){
+		$uri = 'http://www.journals.elsevier.com/' . $param['j'] . '/recent-articles/';
+		$html = file_get_html($uri) or $this->returnError('No results for Elsevier journal '.$param['j'], 404);
 
-    foreach($html->find('.pod-listing') as $article){
+		foreach($html->find('.pod-listing') as $article){
+			$item = new \Item();
+			$item->uri = $article->find('.pod-listing-header>a',0)->getAttribute('href').'?np=y';
+			$item->title = $article->find('.pod-listing-header>a',0)->plaintext;
+			$item->name = $this->ExtractArticleName($article);
+			$item->timestamp = $this->ExtractArticleTimestamp($article);
+			$item->content = $this->ExtractArticleContent($article);
+			$this->items[] = $item;
+		}
+	}
 
-      $item = new \Item();
-      $item->uri=$article->find('.pod-listing-header>a',0)->getAttribute('href').'?np=y';
-      $item->title=$article->find('.pod-listing-header>a',0)->plaintext;
-      $item->name=$this->ExtractArticleName($article);
-      $item->timestamp=$this->ExtractArticleTimestamp($article);
-      $item->content=$this->ExtractArticleContent($article);
+	public function getName(){
+		return 'Elsevier journals recent articles';
+	}
 
-      $this->items[]=$item;
-    }
-  }
+	public function getURI(){
+		return 'http://www.journals.elsevier.com';
+	}
 
-  public function getName(){
-    return 'Elsevier journals recent articles';
-  }
-
-  public function getURI(){
-    return 'http://www.journals.elsevier.com';
-  }
-
-  public function getCacheDuration(){
-    return 43200; // 12h
-  }
+	public function getCacheDuration(){
+		return 43200; // 12h
+	}
 }
+?>
\ No newline at end of file

From 6b7b38db54c4108ed7ba798093ae89e89ab96638 Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Tue, 2 Aug 2016 22:16:43 +0200
Subject: [PATCH 038/149] Improved new style.

---
 css/style.css     | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 index.php         | 11 ++++----
 lib/HTMLUtils.php |  3 +++
 3 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/css/style.css b/css/style.css
index e378f57..4ad2a3e 100644
--- a/css/style.css
+++ b/css/style.css
@@ -58,6 +58,20 @@ section {
 
 }
 
+
+section:last-of-type {
+
+	opacity: 0.5;
+
+}
+
+section:last-of-type:hover {
+
+	opacity: 1;
+
+}
+
+
 section > h2 {
 
 	font-size: 200%;
@@ -90,6 +104,13 @@ button {
 
 }
 
+button.small {
+
+	width: auto;
+	line-height: 1.2em;
+
+}
+
 .description {
 
 	margin: 10px;
@@ -128,3 +149,47 @@ input[type="text"] {
 	padding-left: 4px;
 
 }
+
+form {
+
+	display: none;
+
+}
+
+h5 {
+
+	display: none;
+
+}
+
+.showmore-box {
+
+	display: none;
+
+}
+
+.showmore, .showless {
+
+	color: #888888;
+
+}
+
+.showmore-box:checked ~ .showmore {
+
+	display: none;
+
+}
+
+.showmore-box:not(:checked) ~ .showless {
+
+	display: none;
+
+}
+
+
+
+.showmore-box:checked ~ form, .showmore-box:checked ~ h5 {
+
+	display: block;
+
+}
diff --git a/index.php b/index.php
index d81b8c5..57cb12f 100644
--- a/index.php
+++ b/index.php
@@ -182,11 +182,12 @@ $formats = Format::searchInformation();
 				$inactiveBridges .= HTMLUtils::displayBridgeCard($bridgeName, $formats, false) . PHP_EOL;
 			}
 		}
-		echo '<hr />' . $inactiveBridges;
+		echo $inactiveBridges;
 	?>
-    <footer>
-		<?= $activeFoundBridgeCount; ?>/<?= count($bridgeList) ?> active bridges (<a href="?show_inactive=1">Show inactive</a>)<br />
-        <a href="https://github.com/sebsauvage/rss-bridge">RSS-Bridge alpha 0.2 ~ Public Domain</a>
-    </footer>
+    <section>
+        <a href="https://github.com/sebsauvage/rss-bridge">RSS-Bridge alpha 0.2 ~ Public Domain</a><br />
+		<?= $activeFoundBridgeCount; ?>/<?= count($bridgeList) ?> active bridges. <br />
+		<a href="?show_inactive=1"><button class="small">Show inactive bridges</button></a><br />
+    </section>
     </body>
 </html>
diff --git a/lib/HTMLUtils.php b/lib/HTMLUtils.php
index ce08efa..349da14 100644
--- a/lib/HTMLUtils.php
+++ b/lib/HTMLUtils.php
@@ -35,6 +35,8 @@ class HTMLUtils {
 			<p class="description">
 				{$description}
 			</p>
+			<input type="checkbox" class="showmore-box" id="showmore-{$bridgeName}" />
+			<label class="showmore" for="showmore-{$bridgeName}">Show more</label>
 CARD;
 
 		// If we don't have any parameter for the bridge, we print a generic form to load it.
@@ -141,6 +143,7 @@ CARD;
 
 		}
 
+		$card .= '<label class="showless" for="showmore-' . $bridgeName . '">Show less</label>';
 		$card .= '<p class="maintainer">'.$bridgeElement->maintainer.'</p>';
 		$card .= '</section>';
 

From 71d868fd904d31abb15b2ab8a69c9d9b64d0ef69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Michon?= <titizebioutifoul@free.fr>
Date: Tue, 2 Aug 2016 23:26:00 +0200
Subject: [PATCH 039/149] Add scalingo.json

---
 scalingo.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 scalingo.json

diff --git a/scalingo.json b/scalingo.json
new file mode 100644
index 0000000..f4c4ffd
--- /dev/null
+++ b/scalingo.json
@@ -0,0 +1,6 @@
+{
+	"name": "RSS Bridge",
+	"description": "rss-bridge is a PHP project capable of generating ATOM feeds for websites which don't have one.",
+	"repository": "https://github.com/sebsauvage/rss-bridge",
+	"website": "https://github.com/sebsauvage/rss-bridge",
+}

From 173afb8314de0bb34181f0716a3046cf1b6f2e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Michon?= <titizebioutifoul@free.fr>
Date: Tue, 2 Aug 2016 23:32:30 +0200
Subject: [PATCH 040/149] Update readme: Add scalingo one click deploy

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4bc918d..07ba235 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,8 @@ By default, the script creates `whitelist.txt` and adds the main bridges (see ab
  * to disable main bridges (remove the line)
 
 New bridges are disabled by default, so make sure to check regularly what's new and whitelist what you want !
+
+[![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/sebsauvage/rss-bridge)
  
 Author
 ===

From e7e2101889fbdf31ef0e204937a2b6ce1b04721e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Michon?= <titizebioutifoul@free.fr>
Date: Tue, 2 Aug 2016 23:37:01 +0200
Subject: [PATCH 041/149] Typo

---
 README.md     | 2 +-
 scalingo.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 07ba235..3dccf45 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ By default, the script creates `whitelist.txt` and adds the main bridges (see ab
  * to enable extra bridges (one bridge per line)
  * to disable main bridges (remove the line)
 
-New bridges are disabled by default, so make sure to check regularly what's new and whitelist what you want !
+New bridges are disabled by default, so make sure to check regularly what's new and whitelist what you want!
 
 [![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/sebsauvage/rss-bridge)
  
diff --git a/scalingo.json b/scalingo.json
index f4c4ffd..9b1d51e 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -2,5 +2,5 @@
 	"name": "RSS Bridge",
 	"description": "rss-bridge is a PHP project capable of generating ATOM feeds for websites which don't have one.",
 	"repository": "https://github.com/sebsauvage/rss-bridge",
-	"website": "https://github.com/sebsauvage/rss-bridge",
+	"website": "https://github.com/sebsauvage/rss-bridge"
 }

From 7ff901de08b767afedfc991e77107cc74aafe302 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 12:37:56 +0200
Subject: [PATCH 042/149] 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/DeveloppezDotComBridge.php | 66 +++++++++++++++---------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php
index 9c147a8..57cd2cd 100644
--- a/bridges/DeveloppezDotComBridge.php
+++ b/bridges/DeveloppezDotComBridge.php
@@ -11,48 +11,48 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 
 	}
 
+	function DeveloppezDotComStripCDATA($string) {
+		$string = str_replace('<![CDATA[', '', $string);
+		$string = str_replace(']]>', '', $string);
+		return $string;
+	}
+
+	function convert_smart_quotes($string)//F***ing quotes from Microsoft Word badly encoded, here was the trick: http://stackoverflow.com/questions/1262038/how-to-replace-microsoft-encoded-quotes-in-php
+	{
+		$search = array(chr(145),
+						chr(146),
+						chr(147),
+						chr(148),
+						chr(151));
+
+		$replace = array("'",
+							"'",
+							'"',
+							'"',
+							'-');
+
+		return str_replace($search, $replace, $string);
+	}
+
+	function DeveloppezDotComExtractContent($url) {
+		$articleHTMLContent = $this->file_get_html($url);
+		$text = $this->convert_smart_quotes($articleHTMLContent->find('div.content', 0)->innertext);
+		$text = utf8_encode($text);
+		return trim($text);
+	}
+
     public function collectData(array $param){
 
-        function DeveloppezDotComStripCDATA($string) {
-            $string = str_replace('<![CDATA[', '', $string);
-            $string = str_replace(']]>', '', $string);
-            return $string;
-        }
-
-        function convert_smart_quotes($string)//F***ing quotes from Microsoft Word badly encoded, here was the trick: http://stackoverflow.com/questions/1262038/how-to-replace-microsoft-encoded-quotes-in-php
-        {
-            $search = array(chr(145),
-                            chr(146),
-                            chr(147),
-                            chr(148),
-                            chr(151));
-
-            $replace = array("'",
-                             "'",
-                             '"',
-                             '"',
-                             '-');
-
-            return str_replace($search, $replace, $string);
-        }
-
-        function DeveloppezDotComExtractContent($url) {
-            $articleHTMLContent = $this->file_get_html($url);
-            $text = convert_smart_quotes($articleHTMLContent->find('div.content', 0)->innertext);
-            $text = utf8_encode($text);
-            return trim($text);
-        }
-
         $rssFeed = $this->file_get_html('http://www.developpez.com/index/rss') or $this->returnError('Could not request http://www.developpez.com/index/rss', 404);
     	$limit = 0;
 
     	foreach($rssFeed->find('item') as $element) {
             if($limit < 10) {
                 $item = new \Item();
-                $item->title = DeveloppezDotComStripCDATA($element->find('title', 0)->innertext);
-                $item->uri = DeveloppezDotComStripCDATA($element->find('guid', 0)->plaintext);
+                $item->title = $this->DeveloppezDotComStripCDATA($element->find('title', 0)->innertext);
+                $item->uri = $this->DeveloppezDotComStripCDATA($element->find('guid', 0)->plaintext);
                 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-                $content = DeveloppezDotComExtractContent($item->uri);
+                $content = $this->DeveloppezDotComExtractContent($item->uri);
                 $item->content = strlen($content) ? $content : $element->description;//In case of it is a tutorial, we just keep the original description
                 $this->items[] = $item;
                 $limit++;

From 58b3261fbbdbd7c3b18eb0e0d42e42bbbb70362e Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 12:42:57 +0200
Subject: [PATCH 043/149] Fix indentation and remove empty lines

---
 bridges/DeveloppezDotComBridge.php | 60 +++++++++++++++---------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php
index 57cd2cd..51dc013 100644
--- a/bridges/DeveloppezDotComBridge.php
+++ b/bridges/DeveloppezDotComBridge.php
@@ -2,13 +2,11 @@
 class DeveloppezDotComBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "polopollo";
 		$this->name = "Developpez.com Actus (FR)";
 		$this->uri = "http://www.developpez.com/";
 		$this->description = "Returns the 15 newest posts from DeveloppezDotCom (full text).";
-		$this->update = "2014-07-14";
-
+		$this->update = "2016-08-03";
 	}
 
 	function DeveloppezDotComStripCDATA($string) {
@@ -17,7 +15,9 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 		return $string;
 	}
 
-	function convert_smart_quotes($string)//F***ing quotes from Microsoft Word badly encoded, here was the trick: http://stackoverflow.com/questions/1262038/how-to-replace-microsoft-encoded-quotes-in-php
+	// F***ing quotes from Microsoft Word badly encoded, here was the trick: 
+	// http://stackoverflow.com/questions/1262038/how-to-replace-microsoft-encoded-quotes-in-php
+	function convert_smart_quotes($string)
 	{
 		$search = array(chr(145),
 						chr(146),
@@ -41,35 +41,33 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 		return trim($text);
 	}
 
-    public function collectData(array $param){
+	public function collectData(array $param){
+		$rssFeed = $this->file_get_html('http://www.developpez.com/index/rss') or $this->returnError('Could not request http://www.developpez.com/index/rss', 404);
+		$limit = 0;
 
-        $rssFeed = $this->file_get_html('http://www.developpez.com/index/rss') or $this->returnError('Could not request http://www.developpez.com/index/rss', 404);
-    	$limit = 0;
+		foreach($rssFeed->find('item') as $element) {
+			if($limit < 10) {
+				$item = new \Item();
+				$item->title = $this->DeveloppezDotComStripCDATA($element->find('title', 0)->innertext);
+				$item->uri = $this->DeveloppezDotComStripCDATA($element->find('guid', 0)->plaintext);
+				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+				$content = $this->DeveloppezDotComExtractContent($item->uri);
+				$item->content = strlen($content) ? $content : $element->description; //In case of it is a tutorial, we just keep the original description
+				$this->items[] = $item;
+				$limit++;
+			}
+		}
+	}
 
-    	foreach($rssFeed->find('item') as $element) {
-            if($limit < 10) {
-                $item = new \Item();
-                $item->title = $this->DeveloppezDotComStripCDATA($element->find('title', 0)->innertext);
-                $item->uri = $this->DeveloppezDotComStripCDATA($element->find('guid', 0)->plaintext);
-                $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-                $content = $this->DeveloppezDotComExtractContent($item->uri);
-                $item->content = strlen($content) ? $content : $element->description;//In case of it is a tutorial, we just keep the original description
-                $this->items[] = $item;
-                $limit++;
-            }
-    	}
+	public function getName(){
+		return 'DeveloppezDotCom';
+	}
 
-    }
+	public function getURI(){
+		return 'http://www.developpez.com/';
+	}
 
-    public function getName(){
-        return 'DeveloppezDotCom';
-    }
-
-    public function getURI(){
-        return 'http://www.developpez.com/';
-    }
-
-    public function getCacheDuration(){
-        return 1800; // 30min
-    }
+	public function getCacheDuration(){
+		return 1800; // 30min
+	}
 }

From 7740dbfcc95e9a2f3537066c927e3da48d96bf49 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 12:50:24 +0200
Subject: [PATCH 044/149] [Frandroid] remove bridge: website supported by
 WordPress bridge

---
 bridges/FrandroidBridge.php | 69 -------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 bridges/FrandroidBridge.php

diff --git a/bridges/FrandroidBridge.php b/bridges/FrandroidBridge.php
deleted file mode 100644
index 8b1625c..0000000
--- a/bridges/FrandroidBridge.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-class FrandroidBridge extends BridgeAbstract
-{
-	public function loadMetadatas() {
-
-		$this->maintainer = "Daiyousei";
-		$this->name = "Frandroid";
-		$this->uri = "http://www.frandroid.com/";
-		$this->description = "Returns the RSS feed from Frandroid (full text articles)";
-		$this->update = "2015-03-05";
-
-	}
-    
-    public function collectData(array $param)
-    {
-        
-        function FrandroidStripCDATA($string)
-        {
-            $string = str_replace('<![CDATA[', '', $string);
-            $string = str_replace(']]>', '', $string);
-            return $string;
-        }
-        function FrandroidExtractContent($url)
-        {
-            $html2 = $this->file_get_html($url);
-            $html3 = $html2->find('div.post-content', 0);
-            $html3->find('div.no-sidebar-ad-top', 0)->outertext = '';
-            $ret = $html3->find('div.shortcode-container');
-            foreach ($ret as $value) {
-                $value->outertext = '';
-            }
-            
-            $html3->find('div#hrr-link', 0)->outertext = '';
-            $text = $html3->innertext;
-            $text = strip_tags($text, '<h1><span><h2><p><b><a><blockquote><img><em><ul><ol>');
-            return $text;
-        }
-        $html = $this->file_get_html('http://feeds.feedburner.com/Frandroid?format=xml') or $this->returnError('Could not request Frandroid.', 404);
-        $limit = 0;
-        
-        foreach ($html->find('item') as $element) {
-            if ($limit < 5) {
-                $item = new \Item();
-                $item->title = FrandroidStripCDATA($element->find('title', 0)->innertext);
-                $item->uri = FrandroidStripCDATA($element->find('guid', 0)->plaintext);
-                $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-                $item->content = FrandroidExtractContent($item->uri);
-                $this->items[] = $item;
-                $limit++;
-            }
-        }
-        
-    }
-    
-    public function getName()
-    {
-        return 'Frandroid';
-    }
-    
-    public function getURI()
-    {
-        return 'http://www.frandroid.com/';
-    }
-    
-    public function getCacheDuration()
-    {
-        return 300; // 5min
-    }
-}

From 4f9e03f34670cf2b5a7aaa191bcae8cc72803c23 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 13:16:47 +0200
Subject: [PATCH 045/149] Create nested function to receive article or element
 author

This fixes an error that occurred by attempting to access an object that
did not exist (author).
---
 bridges/FuturaSciencesBridge.php | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php
index 9cf893f..f8d0398 100644
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -7,7 +7,7 @@ class FuturaSciencesBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'Returns the newest articles.';
-        $this->update = '2016-03-20';
+        $this->update = '2016-08-03';
 
         $this->parameters[] =
         '[
@@ -149,6 +149,23 @@ class FuturaSciencesBridge extends BridgeAbstract {
             return $string;
         }
 
+        // Extracts the author from an article or element
+        function ExtractAuthor($article, $element){
+            $article_author = $article->find('span.author', 0);
+            if($article_author){
+                $authorname = trim(str_replace(', Futura-Sciences', '', $article_author->plaintext));
+                if(empty($authorname)){
+                    $element_author = $element->find('author', 0);
+                    if($element_author)
+                        $authorname = StripCDATA($element_author->plaintext);
+                    else
+                        return '';
+                }
+                return $authorname;
+            }
+            return '';
+        }
+
         if (empty($param['feed']))
             $this->returnError('Please select a feed to display.'.$url, 400);
         if ($param['feed'] !== preg_replace('/[^a-zA-Z-\/]+/', '', $param['feed']) || substr_count($param['feed'], '/') > 1 || strlen($param['feed'] > 64))
@@ -163,9 +180,6 @@ class FuturaSciencesBridge extends BridgeAbstract {
                 $article_url = str_replace('#xtor=RSS-8', '', StripCDATA($element->find('guid', 0)->plaintext));
                 $article = $this->file_get_html($article_url) or $this->returnError('Could not request Futura-Sciences: '.$article_url, 500);
                 $contents = $article->find('div.content', 0)->innertext;
-                $author = trim(str_replace(', Futura-Sciences', '', $article->find('span.author', 0)->plaintext));
-                if (empty($author))
-                    $author = StripCDATA($element->find('author', 0)->plaintext);
 
                 foreach (array(
                     '<div class="clear',
@@ -192,7 +206,7 @@ class FuturaSciencesBridge extends BridgeAbstract {
                 $contents = StripWithDelimiters($contents, 'fs:xt:clickname="', '"');
 
                 $item = new \Item();
-                $item->author = $author;
+                $item->author = ExtractAuthor($article, $element);
                 $item->uri = $article_url;
                 $item->title = StripCDATA($element->find('title', 0)->innertext);
                 $item->thumbnailUri = StripCDATA($element->find('enclosure', 0)->url);

From a1a44cd1ff4da8cdefcd4ec3005a75dd4429e947 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 13:30:38 +0200
Subject: [PATCH 046/149] 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/GuruMedBridge.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
index 7a72a83..cdaeb72 100644
--- a/bridges/GuruMedBridge.php
+++ b/bridges/GuruMedBridge.php
@@ -7,32 +7,33 @@ class GuruMedBridge extends BridgeAbstract{
 		$this->name = "GuruMed";
 		$this->uri = "http://www.gurumed.org";
 		$this->description = "Returns the 5 newest posts from Gurumed (full text)";
-		$this->update = "03/10/2015";
+		$this->update = "2016-08-03";
 
 	}
 
-    public function collectData(array $param){
-
     function GurumedStripCDATA($string) {
     	$string = str_replace('<![CDATA[', '', $string);
     	$string = str_replace(']]>', '', $string);
     	return $string;
     }
+
     function GurumedExtractContent($url) {
 	$html2 = $this->file_get_html($url);
 	$text = $html2->find('div.entry', 0)->innertext;
 	return $text;
     }
+
+    public function collectData(array $param){
         $html = $this->file_get_html('http://gurumed.org/feed') or $this->returnError('Could not request Gurumed.', 404);
 	$limit = 0;
 
 	foreach($html->find('item') as $element) {
 	 if($limit < 5) {
 	 $item = new \Item();
-	 $item->title = GurumedStripCDATA($element->find('title', 0)->innertext);
-	 $item->uri = GurumedStripCDATA($element->find('guid', 0)->plaintext);
+	 $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 = GurumedExtractContent($item->uri);
+	 $item->content = $this->GurumedExtractContent($item->uri);
 	 $this->items[] = $item;
 	 $limit++;
 	 }

From b0dce860f7d1449db8515ca29da44a0747506708 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 13:58:32 +0200
Subject: [PATCH 047/149] Return description from source feed not subsequent
 pages

Gurumed.org prevents download of pictures from external domains. For a
feed it is sufficient to see a short description of the article as
provided in the source rss.
---
 bridges/GuruMedBridge.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
index cdaeb72..926c1e4 100644
--- a/bridges/GuruMedBridge.php
+++ b/bridges/GuruMedBridge.php
@@ -17,12 +17,6 @@ class GuruMedBridge extends BridgeAbstract{
     	return $string;
     }
 
-    function GurumedExtractContent($url) {
-	$html2 = $this->file_get_html($url);
-	$text = $html2->find('div.entry', 0)->innertext;
-	return $text;
-    }
-
     public function collectData(array $param){
         $html = $this->file_get_html('http://gurumed.org/feed') or $this->returnError('Could not request Gurumed.', 404);
 	$limit = 0;
@@ -33,7 +27,7 @@ class GuruMedBridge extends BridgeAbstract{
 	 $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->GurumedExtractContent($item->uri);
+	 $item->content = $this->GurumedStripCDATA(strip_tags($element->find('description', 0), '<p><a><br>'));
 	 $this->items[] = $item;
 	 $limit++;
 	 }

From b344f507847e0eb00bdfbbbb713f7789ac18ee1b Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 14:00:24 +0200
Subject: [PATCH 048/149] Fix indentation and remove empty lines

---
 bridges/GuruMedBridge.php | 63 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
index 926c1e4..fcc91c4 100644
--- a/bridges/GuruMedBridge.php
+++ b/bridges/GuruMedBridge.php
@@ -2,48 +2,45 @@
 class GuruMedBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "qwertygc";
 		$this->name = "GuruMed";
 		$this->uri = "http://www.gurumed.org";
 		$this->description = "Returns the 5 newest posts from Gurumed (full text)";
 		$this->update = "2016-08-03";
-
 	}
 
-    function GurumedStripCDATA($string) {
-    	$string = str_replace('<![CDATA[', '', $string);
-    	$string = str_replace(']]>', '', $string);
-    	return $string;
-    }
-
-    public function collectData(array $param){
-        $html = $this->file_get_html('http://gurumed.org/feed') or $this->returnError('Could not request Gurumed.', 404);
-	$limit = 0;
-
-	foreach($html->find('item') as $element) {
-	 if($limit < 5) {
-	 $item = new \Item();
-	 $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++;
-	 }
+	function GurumedStripCDATA($string) {
+		$string = str_replace('<![CDATA[', '', $string);
+		$string = str_replace(']]>', '', $string);
+		return $string;
 	}
-    
-    }
 
-    public function getName(){
-        return 'Gurumed';
-    }
+	public function collectData(array $param){
+		$html = $this->file_get_html('http://gurumed.org/feed') or $this->returnError('Could not request Gurumed.', 404);
+		$limit = 0;
 
-    public function getURI(){
-        return 'http://gurumed.org/';
-    }
+		foreach($html->find('item') as $element) {
+			if($limit < 5) {
+				$item = new \Item();
+				$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++;
+			}
+		}
+	}
 
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
+	public function getName(){
+		return 'Gurumed';
+	}
+
+	public function getURI(){
+		return 'http://gurumed.org/';
+	}
+
+	public function getCacheDuration(){
+		return 3600; // 1 hour
+	}
 }

From a124d4eb432c7a347f4461581344e66f209ab60e Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 20:05:13 +0200
Subject: [PATCH 049/149] 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/KoreusBridge.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php
index 0be4b5c..b1ed6c4 100644
--- a/bridges/KoreusBridge.php
+++ b/bridges/KoreusBridge.php
@@ -7,33 +7,34 @@ class KoreusBridge extends BridgeAbstract{
 		$this->name = "Koreus";
 		$this->uri = "http://www.koreus.com/";
 		$this->description = "Returns the 5 newest posts from Koreus (full text)";
-		$this->update = "2014-05-26";
+		$this->update = "2016-08-03";
 
 	}
 
-    public function collectData(array $param){
-
     function KoreusStripCDATA($string) {
         $string = str_replace('<![CDATA[', '', $string);
         $string = str_replace(']]>', '', $string);
         return $string;
     }
+
     function KoreusExtractContent($url) {
         $html2 = $this->file_get_html($url);
         $text = $html2->find('p[class=itemText]', 0)->innertext;
         $text = utf8_encode(preg_replace('/(Sur le m.+?)+$/i','',$text));
         return $text;
     }
+
+    public function collectData(array $param){
         $html = $this->file_get_html('http://feeds.feedburner.com/Koreus-articles') or $this->returnError('Could not request Koreus.', 404);
         $limit = 0;
 
         foreach($html->find('item') as $element) {
          if($limit < 5) {
          $item = new \Item();
-         $item->title = KoreusStripCDATA($element->find('title', 0)->innertext);
-         $item->uri = KoreusStripCDATA($element->find('guid', 0)->plaintext);
+         $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 = KoreusExtractContent($item->uri);
+         $item->content = $this->KoreusExtractContent($item->uri);
          $this->items[] = $item;
          $limit++;
          }

From aae4d3efec2ace60637d3d05f8e353259cc5a220 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 20:07:33 +0200
Subject: [PATCH 050/149] Fix indentation and remove empty lines

---
 bridges/KoreusBridge.php | 74 +++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php
index b1ed6c4..d605af0 100644
--- a/bridges/KoreusBridge.php
+++ b/bridges/KoreusBridge.php
@@ -2,56 +2,52 @@
 class KoreusBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "pit-fgfjiudghdf";
 		$this->name = "Koreus";
 		$this->uri = "http://www.koreus.com/";
 		$this->description = "Returns the 5 newest posts from Koreus (full text)";
 		$this->update = "2016-08-03";
-
 	}
 
-    function KoreusStripCDATA($string) {
-        $string = str_replace('<![CDATA[', '', $string);
-        $string = str_replace(']]>', '', $string);
-        return $string;
-    }
+	function KoreusStripCDATA($string) {
+		$string = str_replace('<![CDATA[', '', $string);
+		$string = str_replace(']]>', '', $string);
+		return $string;
+	}
 
-    function KoreusExtractContent($url) {
-        $html2 = $this->file_get_html($url);
-        $text = $html2->find('p[class=itemText]', 0)->innertext;
-        $text = utf8_encode(preg_replace('/(Sur le m.+?)+$/i','',$text));
-        return $text;
-    }
+	function KoreusExtractContent($url) {
+		$html2 = $this->file_get_html($url);
+		$text = $html2->find('p[class=itemText]', 0)->innertext;
+		$text = utf8_encode(preg_replace('/(Sur le m.+?)+$/i','',$text));
+		return $text;
+	}
 
-    public function collectData(array $param){
-        $html = $this->file_get_html('http://feeds.feedburner.com/Koreus-articles') or $this->returnError('Could not request Koreus.', 404);
-        $limit = 0;
+	public function collectData(array $param){
+		$html = $this->file_get_html('http://feeds.feedburner.com/Koreus-articles') or $this->returnError('Could not request Koreus.', 404);
+		$limit = 0;
 
-        foreach($html->find('item') as $element) {
-         if($limit < 5) {
-         $item = new \Item();
-         $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++;
-         }
-        }
+		foreach($html->find('item') as $element) {
+			if($limit < 5) {
+				$item = new \Item();
+				$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++;
+			}
+		}
+	}
 
-    }
+	public function getName(){
+		return 'Koreus';
+	}
 
-    public function getName(){
-        return 'Koreus';
-    }
+	public function getURI(){
+		return 'http://www.koreus.com/';
+	}
 
-    public function getURI(){
-        return 'http://www.koreus.com/';
-    }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
+	public function getCacheDuration(){
+		return 3600; // 1 hour
+	}
 }
-

From 1b0233030287ebdb5a2c67da3b036078ca2ed682 Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Wed, 3 Aug 2016 20:07:49 +0200
Subject: [PATCH 051/149] Improved style for HtmlFormat.

---
 css/HtmlFormat.css     | 100 +++++++++++++++++++++++++++++++++++++++++
 formats/HtmlFormat.php |  38 ++++------------
 2 files changed, 109 insertions(+), 29 deletions(-)
 create mode 100644 css/HtmlFormat.css

diff --git a/css/HtmlFormat.css b/css/HtmlFormat.css
new file mode 100644
index 0000000..3306128
--- /dev/null
+++ b/css/HtmlFormat.css
@@ -0,0 +1,100 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video {
+
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
+
+    display: block;
+
+}
+
+/* Let's go for the actual style */
+
+body {
+
+	background-color: #EEEEEE;
+	font-family: 'Noto Sans';
+
+}
+
+section {
+
+	background-color: #FFFFFF;
+	width: 90%;
+	margin: 30px auto;
+	padding: 10px 15px;
+
+	box-shadow: 0px 1px 2px rgba(0,0,0, 0.25);
+
+}
+
+section > h2 {
+
+	font-size: 200%;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+h1.pagetitle {
+
+	font-size: 300%;
+	font-weight: bold;
+
+	text-align: center;
+	color: #2196F3;
+
+}
+a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link, a.itemtitle:visited {
+
+	color: #2196F3;
+
+}
+
+.backlink {
+
+	display: block;
+	text-align: center;
+
+}
+
+section > div.content {
+
+	padding: 10px;
+
+}
+
+section > time {
+
+	color: #888;
+	font-size: 80%;
+
+}
+
+button.backbutton {
+
+	line-height: 1em;
+	color: #FFF;
+	font-weight: bold;
+	vertical-align: middle;
+	padding: 6px 12px;
+	margin: 12px auto 0px;
+	box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
+	border-radius: 2px;
+	border: 1px solid transparent;
+	min-width: 140px;
+	background: #2196F3 none repeat scroll 0% 0%;
+	cursor: pointer;
+
+	width: calc(20% - 4px);
+
+}
+
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index 4bc48ab..4d86eae 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -18,41 +18,21 @@ class HtmlFormat extends FormatAbstract{
         foreach($this->getDatas() as $data){
             $entryUri = is_null($data->uri) ? $uri : $data->uri;
             $entryTitle = is_null($data->title) ? '' : $this->sanitizeHtml(strip_tags($data->title));
-            $entryTimestamp = is_null($data->timestamp) ? '' : '<small><time datetime="' . date(DATE_ATOM, $data->timestamp) . '">' . date(DATE_ATOM, $data->timestamp) . '</time></small>';
-            $entryAuthor = is_null($data->author) ? '' : '<br><small>by: ' . $data->author . '</small>';
-            $entryContent = is_null($data->content) ? '' : '<p>' . $this->sanitizeHtml($data->content). '</p>';
+            $entryTimestamp = is_null($data->timestamp) ? '' : '<time datetime="' . date(DATE_ATOM, $data->timestamp) . '">' . date(DATE_ATOM, $data->timestamp) . '</time>';
+            $entryAuthor = is_null($data->author) ? '' : '<br /><p class="author">by: ' . $data->author . '</p>';
+            $entryContent = is_null($data->content) ? '' : '<div class="content">' . $this->sanitizeHtml($data->content). '</div>';
             $entries .= <<<EOD
 
-<div class="feeditem">
-	<h2><a href="{$entryUri}">{$entryTitle}</a></h2>
+<section class="feeditem">
+	<h2><a class="itemtitle" href="{$entryUri}">{$entryTitle}</a></h2>
 	{$entryTimestamp}
    {$entryAuthor}
    {$entryContent}
-</div>
+</section>
 
 EOD;
         }
 
-        $styleCss = <<<'EOD'
-body{
-	font-family:"Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;
-	font-size:10pt;
-	background-color:#aaa;
-	background-image:linear-gradient(#eee, #aaa);
-	background-attachment:fixed;
-}
-div.feeditem{border:1px solid black;padding:1em;margin:1em;background-color:#fff;}
-div.feeditem:hover { background-color:#ebf7ff; }
-h1 {border-bottom:dotted #bbb;margin:0 1em 1em 1em;}
-h2 {margin:0;}
-h2 a {color:black;text-decoration:none;}
-h2 a:hover {text-decoration:underline;}
-span.menu {margin-left:1em;}
-span.menu img {vertical-align:middle;}
-span.menu a { color:black; text-decoration:none;  padding:0.4em; }
-span.menu a:hover { background-color:white; }
-
-EOD;
 
         /* Data are prepared, now let's begin the "MAGIE !!!" */
         $toReturn = <<<EOD
@@ -61,12 +41,12 @@ EOD;
 <head>
 	<meta charset="UTF-8">
 	<title>{$title}</title>
-	<style type="text/css">{$styleCss}</style>
+	<link href="css/HtmlFormat.css" rel="stylesheet">
 	<meta name="robots" content="noindex, follow">
 </head>
 <body>
-	<h1>{$title}</h1>
-<span class="menu"><a href="./" onclick="window.history.back()">← back to rss-bridge</a> <a title="Get the ATOM feed" href="./?{$atomquery}"><img alt="feed" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAgMAAAC5h23wAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAJUExURf+cCv/8+P/OhD2VurcAAAABdFJOU/4a4wd9AAAAbklEQVQI13XOMQ6AIAwFUGzCgLtHYPEUHMHBTwgTRyFOXoDdUT2ltCKbXV6b/iZV6qcMYmY1EJtw3MwFQRJU/Bfl6VaEzENQxbHIUxKTrY4Xgk4ct0EvcrYa9iTPGrxqbE3XHWSfRfIk1trp6O8+R38aBYbaAE4AAAAASUVORK5CYII="></a></span>
+	<h1 class="pagetitle">{$title}</h1>
+	<a class="backlink" href="./"><button class="backbutton">← back to rss-bridge</button></a>
 {$entries}
 </body>
 </html>

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 052/149] 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 04de7a4..ad33923 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 053/149] 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 ad33923..991f014 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 054/149] 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 991f014..7157b7c 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 055/149] Fix typo

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

diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index 7157b7c..69f940a 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") {

From 67f5fd0860069a8e7052b4e541395b9b810e68f9 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 20:48:34 +0200
Subject: [PATCH 056/149] [MemoLinux] remove bridge: website supported by
 WordPress bridge

---
 bridges/MemoLinuxBridge.php | 58 -------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 bridges/MemoLinuxBridge.php

diff --git a/bridges/MemoLinuxBridge.php b/bridges/MemoLinuxBridge.php
deleted file mode 100644
index 443740d..0000000
--- a/bridges/MemoLinuxBridge.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-class MemoLinuxBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "qwertygc";
-		$this->name = "MemoLinux";
-		$this->uri = "http://memo-linux.com/";
-		$this->description = "Returns the 10 newest posts from MemoLinux (full text)";
-		$this->update = "2015-01-30";
-
-	}
-
-    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 = $html2->find('div.entry-content', 0)->innertext;
-        $text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
-        $text = preg_replace('@<div[^>]*?>.*?</div>@si', '', $text);
-        $text = preg_replace("/<h1.*/", '', $text);
-        return $text;
-      }
-
-      $html = $this->file_get_html('http://memo-linux.com/feed/') or $this->returnError('Could not request MemoLinux.', 404);
-      $limit = 0;
-
-    	foreach($html->find('item') as $element) {
-        if($limit < 10) {
-          $item = new \Item();
-          $item->title = StripCDATA($element->find('title', 0)->innertext);
-          $item->uri = StripCDATA($element->find('guid', 0)->plaintext);
-          $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-          $item->content = ExtractContent($item->uri);
-          $this->items[] = $item;
-          $limit++;
-        }
-    	}
-    }
-
-    public function getName(){
-        return 'MemoLinux';
-    }
-
-    public function getURI(){
-        return 'http://memo-linux.com/feed/';
-    }
-
-    public function getCacheDuration(){
-        return 3600*12; // 12 hours
-    }
-}

From 86fd1c92ea6df7c551808b6866833b67e4f44408 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 21:08:35 +0200
Subject: [PATCH 057/149] Fixed bridge to work with new layout

---
 bridges/MondeDiploBridge.php | 66 ++++++++++++------------------------
 1 file changed, 21 insertions(+), 45 deletions(-)

diff --git a/bridges/MondeDiploBridge.php b/bridges/MondeDiploBridge.php
index 5eb5d8f..2aad1a4 100644
--- a/bridges/MondeDiploBridge.php
+++ b/bridges/MondeDiploBridge.php
@@ -2,59 +2,35 @@
 class MondeDiploBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "Pitchoule";
 		$this->name = "MondeDiplo";
 		$this->uri = "http://www.monde-diplomatique.fr";
 		$this->description = "Returns most recent results from MondeDiplo.";
-		$this->update = "2014-07-22";
-
+		$this->update = "2016-08-03";
 	}
 
-    public function collectData(array $param){
-        $link = 'http://www.monde-diplomatique.fr';
-        
-        $html = $this->file_get_html($link) or $this->returnError('Could not request MondeDiplo. for : ' . $link , 404);
-    
-        foreach($html->find('div.laune') as $element) {
-            $item = new Item();
-            $item->uri = 'http://www.monde-diplomatique.fr'.$element->find('a', 0)->href;
-            $item->title = $element->find('h3', 0)->plaintext;
-            $item->content = $element->find('div.dates_auteurs', 0)->plaintext. '<br>' .strstr($element->find('div', 0)->plaintext, $element->find('div.dates_auteurs', 0)->plaintext, true);
-            $this->items[] = $item;
-        }
+	public function collectData(array $param){	
+		$html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request MondeDiplo. for : ' . $link , 404);
 
-        $liste = $html->find('div.listes', 0); // First list
-        foreach ($liste->find('li') as $e) {
-            
-            $item = new Item();
-            $item->uri = 'http://www.monde-diplomatique.fr' . $e->find('a', 0)->href;
-            $item->title = $e->find('a', 0)->plaintext;
-            $item->content = $e->find('div.dates_auteurs', 0)->plaintext;
-            $this->items[] = $item;
-        }
+		foreach($html->find('div.unarticle') as $article) {
+			$element = $article->parent();
+			$item = new Item();
+			$item->uri = $this->getURI() . $element->href;
+			$item->title = $element->find('h3', 0)->plaintext;
+			$item->content = $element->find('div.dates_auteurs', 0)->plaintext . '<br>' . strstr($element->find('div', 0)->plaintext, $element->find('div.dates_auteurs', 0)->plaintext, true);
+			$this->items[] = $item;
+		}
+	}
 
-        foreach($html->find('div.liste ul li') as $element) {
-            if ($element->getAttribute('class') != 'intrapub') {
-                 $item = new Item();
-                $item->uri = 'http://www.monde-diplomatique.fr'.$element->find('a', 0)->href;
-                $item->title = $element->find('h3', 0)->plaintext;
-                $item->content = $element->find('div.dates_auteurs', 0)->plaintext . ' <br> ' . $element->find('div.intro', 0)->plaintext;
-                $this->items[] = $item;
-            }
-        }
-        
-    }
+	public function getName(){
+		return 'Monde Diplomatique';
+	}
 
-    public function getName(){
-        return 'Monde Diplomatique';
-    }
+	public function getURI(){
+		return 'http://www.monde-diplomatique.fr';
+	}
 
-    public function getURI(){
-        return 'http://www.monde-diplomatique.fr';
-    }
-
-    public function getCacheDuration(){
-        return 21600; // 6 hours
-    }
+	public function getCacheDuration(){
+		return 21600; // 6 hours
+	}
 }

From 1d588096769c21fb8ebb3cf201bdbab42a3681a6 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 21:12:43 +0200
Subject: [PATCH 058/149] Change nested function MsnMondeExtractContent to
 member function

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/MsnMondeBridge.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php
index fab3b25..9b0c09d 100644
--- a/bridges/MsnMondeBridge.php
+++ b/bridges/MsnMondeBridge.php
@@ -11,14 +11,13 @@ class MsnMondeBridge extends BridgeAbstract{
 
 	}
 
+	function MsnMondeExtractContent($url, &$item) {
+		$html2 = $this->file_get_html($url);
+		$item->content = $html2->find('#content', 0)->find('article', 0)->find('section', 0)->plaintext;
+		$item->timestamp = strtotime($html2->find('.authorinfo-txt', 0)->find('time', 0)->datetime);
+	}
+
     public function collectData(array $param){
-
-    function MsnMondeExtractContent($url, &$item) {
-      $html2 = $this->file_get_html($url);
-      $item->content = $html2->find('#content', 0)->find('article', 0)->find('section', 0)->plaintext;
-      $item->timestamp = strtotime($html2->find('.authorinfo-txt', 0)->find('time', 0)->datetime);
-    }
-
       $html = $this->file_get_html('http://www.msn.com/fr-fr/actualite/monde') or $this->returnError('Could not request MsnMonde.', 404);
       $limit = 0;
       foreach($html->find('.smalla') as $article) {
@@ -26,7 +25,7 @@ class MsnMondeBridge extends BridgeAbstract{
          $item = new \Item();
          $item->title = utf8_decode($article->find('h4', 0)->innertext);
          $item->uri = "http://www.msn.com" . utf8_decode($article->find('a', 0)->href);
-         MsnMondeExtractContent($item->uri, $item);
+         $this->MsnMondeExtractContent($item->uri, $item);
          $this->items[] = $item;
          $limit++;
        }

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

---
 bridges/MsnMondeBridge.php | 50 ++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php
index 9b0c09d..4b0e0ef 100644
--- a/bridges/MsnMondeBridge.php
+++ b/bridges/MsnMondeBridge.php
@@ -2,13 +2,11 @@
 class MsnMondeBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "kranack";
 		$this->name = "MSN Actu Monde";
 		$this->uri = "http://www.msn.com/fr-fr/actualite/monde";
 		$this->description = "Returns the 10 newest posts from MSN Actualités (full text)";
-		$this->update = "2015-01-30";
-
+		$this->update = "2016-08-03";
 	}
 
 	function MsnMondeExtractContent($url, &$item) {
@@ -17,30 +15,30 @@ class MsnMondeBridge extends BridgeAbstract{
 		$item->timestamp = strtotime($html2->find('.authorinfo-txt', 0)->find('time', 0)->datetime);
 	}
 
-    public function collectData(array $param){
-      $html = $this->file_get_html('http://www.msn.com/fr-fr/actualite/monde') or $this->returnError('Could not request MsnMonde.', 404);
-      $limit = 0;
-      foreach($html->find('.smalla') as $article) {
-       if($limit < 10) {
-         $item = new \Item();
-         $item->title = utf8_decode($article->find('h4', 0)->innertext);
-         $item->uri = "http://www.msn.com" . utf8_decode($article->find('a', 0)->href);
-         $this->MsnMondeExtractContent($item->uri, $item);
-         $this->items[] = $item;
-         $limit++;
-       }
-      }
-    }
+	public function collectData(array $param){
+		$html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request MsnMonde.', 404);
+		$limit = 0;
+		foreach($html->find('.smalla') as $article) {
+			if($limit < 10) {
+				$item = new \Item();
+				$item->title = utf8_decode($article->find('h4', 0)->innertext);
+				$item->uri = "http://www.msn.com" . utf8_decode($article->find('a', 0)->href);
+				$this->MsnMondeExtractContent($item->uri, $item);
+				$this->items[] = $item;
+				$limit++;
+			}
+		}
+	}
 
-    public function getName(){
-        return 'MSN Actu Monde';
-    }
+	public function getName(){
+		return 'MSN Actu Monde';
+	}
 
-    public function getURI(){
-        return 'http://www.msn.com/fr-fr/actualite/monde';
-    }
+	public function getURI(){
+		return 'http://www.msn.com/fr-fr/actualite/monde';
+	}
 
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
+	public function getCacheDuration(){
+		return 3600; // 1 hour
+	}
 }

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 060/149] 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 061/149] 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 062/149] 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;
 	}
 }

From 6ee3165d6f7d00f49cdb0d4197487bc1685d4a4b Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Wed, 3 Aug 2016 21:54:54 +0200
Subject: [PATCH 063/149] Fix no cursor on show more/show less

---
 css/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/css/style.css b/css/style.css
index 4ad2a3e..f830506 100644
--- a/css/style.css
+++ b/css/style.css
@@ -171,6 +171,7 @@ h5 {
 .showmore, .showless {
 
 	color: #888888;
+	cursor: pointer;
 
 }
 

From d6e7b75b420edc7febeaeb1cc99f068a718228a2 Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Wed, 3 Aug 2016 22:01:44 +0200
Subject: [PATCH 064/149] Re-add rss feed link.

---
 css/HtmlFormat.css     | 11 ++++++-----
 formats/HtmlFormat.php |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/css/HtmlFormat.css b/css/HtmlFormat.css
index 3306128..430e15d 100644
--- a/css/HtmlFormat.css
+++ b/css/HtmlFormat.css
@@ -59,9 +59,8 @@ a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link,
 
 }
 
-.backlink {
+.buttons {
 
-	display: block;
 	text-align: center;
 
 }
@@ -76,10 +75,11 @@ section > time {
 
 	color: #888;
 	font-size: 80%;
+	padding: 10px;
 
 }
 
-button.backbutton {
+button.backbutton, button.rss-feed {
 
 	line-height: 1em;
 	color: #FFF;
@@ -90,11 +90,12 @@ button.backbutton {
 	box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
 	border-radius: 2px;
 	border: 1px solid transparent;
-	min-width: 140px;
+	width: 200px;
 	background: #2196F3 none repeat scroll 0% 0%;
 	cursor: pointer;
 
-	width: calc(20% - 4px);
+	margin: 10px;
+
 
 }
 
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index 4d86eae..9b42694 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -46,7 +46,7 @@ EOD;
 </head>
 <body>
 	<h1 class="pagetitle">{$title}</h1>
-	<a class="backlink" href="./"><button class="backbutton">← back to rss-bridge</button></a>
+	<div class="buttons"><a href="./"><button class="backbutton">← back to rss-bridge</button></a><a href="./?{$atomquery}"><button class="rss-feed">RSS feed</button></a></div>
 {$entries}
 </body>
 </html>

From ec5cb657aa8d29fdd3eaaa713c12e660aebd8229 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 3 Aug 2016 22:39:03 +0200
Subject: [PATCH 065/149] Fix bridge to work with new layout

---
 bridges/NiceMatinBridge.php | 88 ++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php
index 2bf824d..407b92b 100644
--- a/bridges/NiceMatinBridge.php
+++ b/bridges/NiceMatinBridge.php
@@ -2,61 +2,59 @@
 class NiceMatinBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
-
 		$this->maintainer = "pit-fgfjiudghdf";
 		$this->name = "NiceMatin";
 		$this->uri = "http://www.nicematin.com/";
 		$this->description = "Returns the 10 newest posts from NiceMatin (full text)";
-		$this->update = "2014-05-26";
-
+		$this->update = "2016-08-03";
 	}
 
-    public function collectData(array $param){
+	function NiceMatinExtractContent($url) {
+		$html = $this->file_get_html($url);
+		if(!$html)
+			$this->returnError('Could not acquire content from url: ' . $url . '!', 404);
+		
+		$content = $html->find('article', 0);
+		if(!$content)
+			$this->returnError('Could not find \'section\'!', 404);
+		
+		$text = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $content->innertext);
+		$text = strip_tags($text, '<p><a><img>');
+		return $text;
+	}
 
-    function NiceMatinUrl($string) {
-        $string = str_replace('</link>', '', $string);
-        //$string = str_replace('.+', '', $string);
-        $string = preg_replace('/html.*http.*/i','html',$string);
-        $string = preg_replace('/.*http/i','http',$string);
-        return $string;
-    }
+	public function collectData(array $param){
+		$html = $this->file_get_html('http://www.nicematin.com/derniere-minute/rss') or $this->returnError('Could not request NiceMatin.', 404);
+		$limit = 0;
 
-    function NiceMatinExtractContent($url) {
-        $html2 = $this->file_get_html($url);
-        $text = $html2->find('figure[itemprop=associatedMedia]', 0)->innertext;
-        $text .= $html2->find('div[id=content-article]', 0)->innertext;
-        return $text;
-    }
+		foreach($html->find('item') as $element) {
+			if($limit < 10) {
+				// 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 = str_get_html($element_text);
 
-        $html = $this->file_get_html('http://www.nicematin.com/derniere-minute/rss') or $this->returnError('Could not request NiceMatin.', 404);
-        $limit = 0;
+				$item = new \Item();
+				$item->title = $element->find('title', 0)->innertext;
+				$item->uri = $element->find('url', 0)->innertext;
+				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+				$item->content = $this->NiceMatinExtractContent($item->uri);
+				$this->items[] = $item;
+				$limit++;
+			}
+		}
+	}
 
-        foreach($html->find('item') as $element) {
-         if($limit < 10) {
-         $item = new \Item();
-         //$item->title = NiceMatinStripCDATA($element->find('title', 0)->innertext);
-         $item->title = $element->find('title', 0)->innertext;
-         $item->uri = NiceMatinUrl($element->plaintext);
+	public function getName(){
+		return 'NiceMatin';
+	}
 
-         $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-         $item->content = NiceMatinExtractContent($item->uri);
-         $this->items[] = $item;
-         $limit++;
-         }
-        }
+	public function getURI(){
+		return 'http://www.nicematin.com/';
+	}
 
-    }
-
-    public function getName(){
-        return 'NiceMatin';
-    }
-
-    public function getURI(){
-        return 'http://www.nicematin.com/';
-    }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
+	public function getCacheDuration(){
+		return 3600; // 1 hour
+	}
 }
-

From f8cb976e2cffc8a4f2413a7bed9a262acd85eedc Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 11:51:12 +0200
Subject: [PATCH 066/149] Add bridge ShanaprojectBridge

This bridge returns a list of anime from the current Season Anime List.
Automatically switches to the next season upon release!
---
 bridges/ShanaprojectBridge.php | 124 +++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 bridges/ShanaprojectBridge.php

diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php
new file mode 100644
index 0000000..64c33b6
--- /dev/null
+++ b/bridges/ShanaprojectBridge.php
@@ -0,0 +1,124 @@
+<?php
+class ShanaprojectBridge extends BridgeAbstract {
+    public function loadMetadatas() {
+        $this->maintainer = 'logmanoriginal';
+        $this->name = $this->getName();
+        $this->uri = $this->getURI();
+        $this->description = 'Returns a list of anime from the current Season Anime List';
+        $this->update = '2016-08-04';
+    }
+
+    // Returns an html object for the Season Anime List (latest season)
+    function LoadSeasonAnimeList(){
+        // First we need to find the URI to the latest season from the 'seasons' page searching for 'Season Anime List'
+        $html = $this->file_get_html($this->getURI() . '/seasons');
+        if(!$html) 
+            $this->returnError('Could not load \'seasons\' page!', 404);
+
+        $season = $html->find('div.follows_menu/a', 1);
+        if(!$season)
+            $this->returnError('Could not find \'Season Anime List\'!', 404);
+
+        $html = $this->file_get_html($this->getURI() . $season->href);
+        if(!$html)
+            $this->returnError('Could not load \'Season Anime List\' from \'' . $season->innertext . '\'!');
+        
+        return $html;
+    }
+
+    // Extracts the anime title
+    function ExtractAnimeTitle($anime){
+        $title = $anime->find('a', 0);
+        if(!$title)
+            $this->returnError('Could not find anime title!', 404);
+        return trim($title->innertext);
+    }
+
+    // Extracts the anime URI
+    function ExtractAnimeURI($anime){
+        $uri = $anime->find('a', 0);
+        if(!$uri)
+            $this->returnError('Could not find anime URI!', 404);
+        return $this->getURI() . $uri->href;
+    }
+
+    // Extracts the anime release date (timestamp)
+    function ExtractAnimeTimestamp($anime){
+        $timestamp = $anime->find('span.header_info_block', 1);
+        if(!$timestamp)
+            $this->returnError('Could not find anime timestamp!', 404);
+        return strtotime($timestamp->innertext);
+    }
+
+    // Extracts the anime studio name (author)
+    function ExtractAnimeAuthor($anime){
+        $author = $anime->find('span.header_info_block', 2);
+        if(!$author)
+            return; // Sometimes the studio is unknown, so leave empty
+        return trim($author->innertext);
+    }
+
+    // Extracts the episode information (x of y released)
+    function ExtractAnimeEpisodeInformation($anime){
+        $episode = $anime->find('div.header_info_episode', 0);
+        if(!$episode)
+            $this->returnError('Could not find anime episode information!', 404);
+        return preg_replace('/\r|\n/', ' ', $episode->plaintext);
+    }
+
+    // Extracts the background image
+    function ExtractAnimeBackgroundImage($anime){
+        // Getting the picture is a little bit tricky as it is part of the style.
+        // Luckily the style is part of the parent div :)
+
+        if(preg_match("/url\(\/\/([^\)]+)\)/i", $anime->parent->style, $matches))
+            return $matches[1];
+        
+        $this->returnError('Could not extract background image!', 404);
+    }
+
+    // Builds an URI to search for a specific anime (subber is left empty)
+    function BuildAnimeSearchURI($anime){
+        return $this->getURI() . '/search/?title=' . urlencode($this->ExtractAnimeTitle($anime)) . '&subber=';
+    }
+
+    // Builds the content string for a given anime
+    function BuildAnimeContent($anime){
+        // We'll use a template string to place our contents
+        return '<a href="' . $this->ExtractAnimeURI($anime) . '">
+                    <img src="http://' . $this->ExtractAnimeBackgroundImage($anime) . '" alt="' . htmlspecialchars($this->ExtractAnimeTitle($anime)) . '" style="border: 1px solid black">
+                </a><br>
+                <p>' . $this->ExtractAnimeEpisodeInformation($anime) . '</p><br>
+                <p><a href="' . $this->BuildAnimeSearchURI($anime) . '">Search episodes</a></p>';
+    }
+
+    public function collectData (array $param){
+        $html = $this->LoadSeasonAnimeList();
+
+        $animes = $html->find('div.header_display_box_info');
+        if(!$animes)
+            $this->returnError('Could not find anime headers!', 404);
+        
+        foreach($animes as $anime){
+            $item = new \Item();
+            $item->title = $this->ExtractAnimeTitle($anime);
+            $item->author = $this->ExtractAnimeAuthor($anime);
+            $item->uri = $this->ExtractAnimeURI($anime);
+            $item->timestamp = $this->ExtractAnimeTimestamp($anime);
+            $item->content = $this->BuildAnimeContent($anime);
+            $this->items[] = $item;
+        }
+    }
+
+    public function getName(){
+        return 'Shanaproject Bridge';
+    }
+
+    public function getURI(){
+        return 'http://www.shanaproject.com';
+    }
+
+    public function getCacheDuration(){
+        return 3600; // 1 hour
+    }
+}

From e8473bf95e9f49b3e53f66b76b43b5bbd55eaa06 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 11:59:44 +0200
Subject: [PATCH 067/149] [OpenTheory] remove bridge: website supported by
 WordPress bridge

---
 bridges/OpenTheoryBridge.php | 56 ------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 bridges/OpenTheoryBridge.php

diff --git a/bridges/OpenTheoryBridge.php b/bridges/OpenTheoryBridge.php
deleted file mode 100644
index 7b8c7be..0000000
--- a/bridges/OpenTheoryBridge.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-class OpenTheoryBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "qwertygc";
-		$this->name = "Opentheory";
-		$this->uri = "http://open1theory.com";
-		$this->description = "Returns the 5 newest posts from OpenTheory (full text)";
-		$this->update = "02-08-2014";
-
-	}
-
-    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 = $html2->find('div.entry-content', 0)->innertext;
-	$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
-	return $text;
-    }
-        $html = $this->file_get_html('http://open1theory.com/feed') or $this->returnError('Could not request OpenTheory.', 404);
-	$limit = 0;
-
-	foreach($html->find('item') as $element) {
-	 if($limit < 5) {
-	 $item = new \Item();
-	 $item->title = StripCDATA($element->find('title', 0)->innertext);
-	 $item->uri = StripCDATA($element->find('guid', 0)->plaintext);
-	 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-	 $item->content = ExtractContent($item->uri);
-	 $this->items[] = $item;
-	 $limit++;
-	 }
-	}
-    
-    }
-
-    public function getName(){
-        return 'OpenTheory';
-    }
-
-    public function getURI(){
-        return 'http://open1theory.com/feed';
-    }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-        // return 0; // 1 hour
-    }
-}

From 77f326e377865ee865483dd09eaec8e6e2db3a80 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:02:27 +0200
Subject: [PATCH 068/149] [PlanetLibre] Change nested function to member
 function

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/PlanetLibreBridge.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php
index cccda6d..b65038a 100644
--- a/bridges/PlanetLibreBridge.php
+++ b/bridges/PlanetLibreBridge.php
@@ -7,17 +7,17 @@ class PlanetLibreBridge extends BridgeAbstract{
 		$this->name = "PlanetLibre";
 		$this->uri = "http://www.planet-libre.org";
 		$this->description = "Returns the 5 newest posts from PlanetLibre (full text)";
-		$this->update = "2014-05-26";
+		$this->update = "2016-08-04";
 
 	}
 
-    public function collectData(array $param){
-
     function PlanetLibreExtractContent($url) {
         $html2 = $this->file_get_html($url);
         $text = $html2->find('div[class="post-text"]', 0)->innertext;
         return $text;
     }
+
+    public function collectData(array $param){
         $html = $this->file_get_html('http://www.planet-libre.org/') or $this->returnError('Could not request PlanetLibre.', 404);
         $limit = 0;
         foreach($html->find('div.post') as $element) {
@@ -26,7 +26,7 @@ class PlanetLibreBridge extends BridgeAbstract{
          $item->title = $element->find('h1', 0)->plaintext;
          $item->uri = $element->find('a', 0)->href;
          $item->timestamp = strtotime(str_replace('/', '-', $element->find('div[class="post-date"]', 0)->plaintext));
-         $item->content = PlanetLibreExtractContent($item->uri);
+         $item->content = $this->PlanetLibreExtractContent($item->uri);
          $this->items[] = $item;
          $limit++;
          }

From 2913f866848e7ca234256f47bfde39a04f9a2234 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:04:29 +0200
Subject: [PATCH 069/149] [PlanetLibre] Fix indentation and remove empty lines

---
 bridges/PlanetLibreBridge.php | 63 +++++++++++++++++------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php
index b65038a..80a703b 100644
--- a/bridges/PlanetLibreBridge.php
+++ b/bridges/PlanetLibreBridge.php
@@ -1,46 +1,43 @@
 <?php
 class PlanetLibreBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-
+	public function loadMetadatas(){
 		$this->maintainer = "pit-fgfjiudghdf";
 		$this->name = "PlanetLibre";
 		$this->uri = "http://www.planet-libre.org";
 		$this->description = "Returns the 5 newest posts from PlanetLibre (full text)";
 		$this->update = "2016-08-04";
-
 	}
 
-    function PlanetLibreExtractContent($url) {
-        $html2 = $this->file_get_html($url);
-        $text = $html2->find('div[class="post-text"]', 0)->innertext;
-        return $text;
-    }
+	function PlanetLibreExtractContent($url){
+		$html2 = $this->file_get_html($url);
+		$text = $html2->find('div[class="post-text"]', 0)->innertext;
+		return $text;
+	}
 
-    public function collectData(array $param){
-        $html = $this->file_get_html('http://www.planet-libre.org/') or $this->returnError('Could not request PlanetLibre.', 404);
-        $limit = 0;
-        foreach($html->find('div.post') as $element) {
-         if($limit < 5) {
-         $item = new \Item();
-         $item->title = $element->find('h1', 0)->plaintext;
-         $item->uri = $element->find('a', 0)->href;
-         $item->timestamp = strtotime(str_replace('/', '-', $element->find('div[class="post-date"]', 0)->plaintext));
-         $item->content = $this->PlanetLibreExtractContent($item->uri);
-         $this->items[] = $item;
-         $limit++;
-         }
-        }
+	public function collectData(array $param){
+		$html = $this->file_get_html('http://www.planet-libre.org/') or $this->returnError('Could not request PlanetLibre.', 404);
+		$limit = 0;
+		foreach($html->find('div.post') as $element) {
+			if($limit < 5) {
+				$item = new \Item();
+				$item->title = $element->find('h1', 0)->plaintext;
+				$item->uri = $element->find('a', 0)->href;
+				$item->timestamp = strtotime(str_replace('/', '-', $element->find('div[class="post-date"]', 0)->plaintext));
+				$item->content = $this->PlanetLibreExtractContent($item->uri);
+				$this->items[] = $item;
+				$limit++;
+			}
+		}
+	}
 
-    }
-    public function getName(){
-        return 'PlanetLibre';
-    }
-    public function getURI(){
-        return 'http://www.planet-libre.org/';
-    }
-    public function getCacheDuration(){
-        return 3600*2; // 1 hour
-    }
+	public function getName(){
+		return 'PlanetLibre';
+	}
+	public function getURI(){
+		return 'http://www.planet-libre.org/';
+	}
+	public function getCacheDuration(){
+		return 3600*2; // 1 hour
+	}
 }
-

From 0cb66e21943f193c1da121cbc1cf31c0364be3c1 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:11:10 +0200
Subject: [PATCH 070/149] [Reporterre] Change nested function to member
 function

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/ReporterreBridge.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index 6990022..f88d6d2 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -7,22 +7,21 @@ class ReporterreBridge extends BridgeAbstract{
 			$this->name = "Reporterre Bridge";
 			$this->uri = "http://www.reporterre.net/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "2015-04-07";
+			$this->update = "2016-08-04";
 
 		}
 
+		function ExtractContentReporterre($url) {
+			$html2 = $this->file_get_html($url);
+			foreach($html2->find('div[style=text-align:justify]') as $e) {
+				$text = $e->outertext;
+			}
+			$html2->clear();
+			unset ($html2);
+			return $text;
+		}
+
         public function collectData(array $param){
-
-		function ExtractContentReporterre($url) {
-		$html2 = $this->file_get_html($url);
-		foreach($html2->find('div[style=text-align:justify]') as $e) {
-		 $text = $e->outertext;
-		}
-		$html2->clear();
-		unset ($html2);
-		return $text;
-		}
-
 		$html = $this->file_get_html('http://www.reporterre.net/spip.php?page=backend') or $this->returnError('Could not request Reporterre.', 404);
 		$limit = 0;
 
@@ -32,7 +31,7 @@ class ReporterreBridge extends BridgeAbstract{
 		  $item->title = html_entity_decode($element->find('title', 0)->plaintext);
 		  $item->timestamp = strtotime($element->find('dc:date', 0)->plaintext);
 		  $item->uri = $element->find('guid', 0)->innertext;
-		  $item->content = html_entity_decode(ExtractContentReporterre($item->uri));
+		  $item->content = html_entity_decode($this->ExtractContentReporterre($item->uri));
 		  $this->items[] = $item;
 		  $limit++;
 		 }

From d6ff40c527f03d3430785be9de1e39f1de54a9cb Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:34:19 +0200
Subject: [PATCH 071/149] [Reporterre] Replace relative image paths with
 absolute URL

Images from their own servers are linked relatively via 'local/...' we
must replace this for images to point to the correct destination.

Also use strip_tags to get rid of iframes
---
 bridges/ReporterreBridge.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index f88d6d2..b0dfb30 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -18,6 +18,12 @@ class ReporterreBridge extends BridgeAbstract{
 			}
 			$html2->clear();
 			unset ($html2);
+
+			// Replace all relative urls with absolute ones
+			$text = preg_replace('/(href|src)(\=[\"\'])(?!http)([^"\']+)/ims', "$1$2" . $this->getURI() . "$3", $text);
+			
+			$text = strip_tags($text, '<p><br><a><img>');
+
 			return $text;
 		}
 

From 6162164bd43fdf0d43b4a57a68e25262d39a9ee4 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:34:40 +0200
Subject: [PATCH 072/149] [Reporterre] Fix indentation and remove empty lines

---
 bridges/ReporterreBridge.php | 49 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index b0dfb30..1f5d021 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -2,59 +2,56 @@
 class ReporterreBridge extends BridgeAbstract{
 
 		public function loadMetadatas() {
-
 			$this->maintainer = "nyutag";
 			$this->name = "Reporterre Bridge";
 			$this->uri = "http://www.reporterre.net/";
 			$this->description = "Returns the newest articles.";
 			$this->update = "2016-08-04";
-
 		}
 
 		function ExtractContentReporterre($url) {
 			$html2 = $this->file_get_html($url);
+
 			foreach($html2->find('div[style=text-align:justify]') as $e) {
 				$text = $e->outertext;
 			}
+
 			$html2->clear();
 			unset ($html2);
 
 			// Replace all relative urls with absolute ones
 			$text = preg_replace('/(href|src)(\=[\"\'])(?!http)([^"\']+)/ims', "$1$2" . $this->getURI() . "$3", $text);
-			
-			$text = strip_tags($text, '<p><br><a><img>');
 
+			$text = strip_tags($text, '<p><br><a><img>');
 			return $text;
 		}
 
-        public function collectData(array $param){
+	public function collectData(array $param){
 		$html = $this->file_get_html('http://www.reporterre.net/spip.php?page=backend') or $this->returnError('Could not request Reporterre.', 404);
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
-		 if($limit < 5) {
-		  $item = new \Item();
-		  $item->title = html_entity_decode($element->find('title', 0)->plaintext);
-		  $item->timestamp = strtotime($element->find('dc:date', 0)->plaintext);
-		  $item->uri = $element->find('guid', 0)->innertext;
-		  $item->content = html_entity_decode($this->ExtractContentReporterre($item->uri));
-		  $this->items[] = $item;
-		  $limit++;
-		 }
+			if($limit < 5) {
+				$item = new \Item();
+				$item->title = html_entity_decode($element->find('title', 0)->plaintext);
+				$item->timestamp = strtotime($element->find('dc:date', 0)->plaintext);
+				$item->uri = $element->find('guid', 0)->innertext;
+				$item->content = html_entity_decode($this->ExtractContentReporterre($item->uri));
+				$this->items[] = $item;
+				$limit++;
+			}
 		}
-    
-    }
+	}
 
-    public function getName(){
-        return 'Reporterre Bridge';
-    }
+	public function getName(){
+		return 'Reporterre Bridge';
+	}
 
-    public function getURI(){
-        return 'http://www.reporterre.net/';
-    }
+	public function getURI(){
+		return 'http://www.reporterre.net/';
+	}
 
-    public function getCacheDuration(){
-        return 3600; // 1 hours
-//	return 0;
-    }
+	public function getCacheDuration(){
+		return 3600; // 1 hours
+	}
 }

From c113b01f013a07ac264ec9e37d22239e87216b81 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:37:29 +0200
Subject: [PATCH 073/149] [Scilogs] remove bridge: website supported by
 WordPress bridge

---
 bridges/ScilogsBridge.php | 54 ---------------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 bridges/ScilogsBridge.php

diff --git a/bridges/ScilogsBridge.php b/bridges/ScilogsBridge.php
deleted file mode 100644
index ee634b3..0000000
--- a/bridges/ScilogsBridge.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-class ScilogsBridge extends BridgeAbstract{
-
-		public function loadMetadatas() {
-
-			$this->maintainer = "qwertygc";
-			$this->name = "Scilogs Bridge";
-			$this->uri = "http://www.scilogs.fr/";
-			$this->description = "Returns the newest articles.";
-			$this->update = "2014-05-25";
-
-		}
-
-        public function collectData(array $param){
-
-			function ScilogsStripCDATA($string) {
-			$string = str_replace('<![CDATA[', '', $string);
-			$string = str_replace(']]>', '', $string);
-			return $string;
-		}
-		function ScilogsExtractContent($url) {
-		$html2 = $this->file_get_html($url);
-		$text = $html2->find('div.entrybody', 0)->innertext;
-		return $text;
-		}
-		$html = $this->file_get_html('http://www.scilogs.fr/?wpmu-feed=posts') or $this->returnError('Could not request Scilogs.', 404);
-		$limit = 0;
-
-		foreach($html->find('item') as $element) {
-		 if($limit < 10) {
-		 $item = new \Item();
-		 $item->title = ScilogsStripCDATA($element->find('title', 0)->innertext);
-		 $item->uri = ScilogsStripCDATA($element->find('guid', 0)->plaintext);
-		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = ScilogsExtractContent($item->uri);
-		 $this->items[] = $item;
-		 $limit++;
-		 }
-		}
-    
-    }
-
-    public function getName(){
-        return 'Scilogs Bridge';
-    }
-
-    public function getURI(){
-        return 'http://scilogs.fr/';
-    }
-
-    public function getCacheDuration(){
-        return 3600*2; // 2 hours
-    }
-}

From f1f67f35d3718ce9bd27a5aeb26ed04e97c4d58e Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:39:26 +0200
Subject: [PATCH 074/149] [SegfaultMint] remove bridge: website supported by
 WordPress bridge

---
 bridges/SegfaultMintBridge.php | 55 ----------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 bridges/SegfaultMintBridge.php

diff --git a/bridges/SegfaultMintBridge.php b/bridges/SegfaultMintBridge.php
deleted file mode 100644
index b5e9d52..0000000
--- a/bridges/SegfaultMintBridge.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-class SegfaultMintBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "qwertygc";
-		$this->name = "SegfaultMint";
-		$this->uri = "http://segfault.linuxmint.com/";
-		$this->description = "Returns the 5 newest posts from SegfaultMint (full text)";
-		$this->update = "2014-07-05";
-
-	}
-
-    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 = $html2->find('div.post-bodycopy', 0)->innertext;
-	$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
-	return $text;
-    }
-        $html = $this->file_get_html('http://segfault.linuxmint.com/feed/') or $this->returnError('Could not request segfault.', 404);
-	$limit = 0;
-
-	foreach($html->find('item') as $element) {
-	 if($limit < 5) {
-	 $item = new \Item();
-	 $item->title = StripCDATA($element->find('title', 0)->innertext);
-	 $item->uri = StripCDATA($element->find('guid', 0)->plaintext);
-	 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-	 $item->content = ExtractContent($item->uri);
-	 $this->items[] = $item;
-	 $limit++;
-	 }
-	}
-    
-    }
-
-    public function getName(){
-        return 'Segfault Mint';
-    }
-
-    public function getURI(){
-        return 'http://segfault.linuxmint.com/feed/';
-    }
-
-    public function getCacheDuration(){
-        return 3600*24; // 24 hours
-    }
-}

From 628e133e96e568caffd192ecbcc5cf1d84247869 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:41:22 +0200
Subject: [PATCH 075/149] [Tuxboard] remove bridge: website supported by
 WordPress bridge

---
 bridges/TuxboardBridge.php | 64 --------------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 bridges/TuxboardBridge.php

diff --git a/bridges/TuxboardBridge.php b/bridges/TuxboardBridge.php
deleted file mode 100644
index 63a1ed4..0000000
--- a/bridges/TuxboardBridge.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-class TuxboardBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Tuxboard";
-		$this->uri = "http://www.tuxboard.com/";
-		$this->description = "Tuxboard";
-		$this->update = "2014-07-08";
-
-	}
-
-    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 = $html2->find('article#page', 0)->innertext;
-	$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
-	return $text;
-    }
-
-        $html = $this->file_get_html('http://www.tuxboard.com/feed/atom/') or $this->returnError('Could not request Tuxboard.', 404);
-	$limit = 0;
-
-	foreach($html->find('entry') as $element) {
-	 if($limit < 10) {
-	 $item = new \Item();
-	 $item->title = StripCDATA($element->find('title', 0)->innertext);
-	 $item->uri = $element->find('link', 0)->href;
-	 $item->timestamp = strtotime($element->find('published', 0)->plaintext);
-	 $item->content = ExtractContent($item->uri);
-	 $this->items[] = $item;
-	 $limit++;
-	 }
-	}
-
-       
-        
-    }
-
-    public function getName(){
-        return 'Tuxboard';
-    }
-
-    public function getURI(){
-        return 'http://www.tuxboard.com';
-    }
-
-    public function getDescription(){
-        return 'Tuxboard via rss-bridge';
-    }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
-}
-?>

From 8cbca68b8a54137fc649b67bd2431388e630207c Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 12:49:08 +0200
Subject: [PATCH 076/149] [WikipediaEO] Fix search pattern

---
 bridges/WikipediaEOBridge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bridges/WikipediaEOBridge.php b/bridges/WikipediaEOBridge.php
index 89050a6..4ca8864 100644
--- a/bridges/WikipediaEOBridge.php
+++ b/bridges/WikipediaEOBridge.php
@@ -20,12 +20,12 @@ class WikipediaEOBridge extends BridgeAbstract{
 
         $html = $this->file_get_html($host.$link) or $this->returnError('Could not request Wikipedia EO.', 404);
 
-		$element = $html->find('div[id=mf-tfa]', 0);
+		$element = $html->find('div[id=mf-artikolo-de-la-semajno]', 0);
 		// Link to article
-		$link = $element->find('p', -2)->find('a', 0);
+		$link = $element->find('p', 3)->find('a', 0);
 		$item = new \Item();
 		$item->uri = $host.$link->href;
-		$item->title = $link->title;
+		$item->title = $element->find('p',0)->find('i',0)->innertext;
 		$item->content = str_replace('href="/', 'href="'.$host.'/', $element->innertext);
 		$this->items[] = $item;
     }

From 905b0f24998dbf09c073ff2a987c4fb049da5aac Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 14:10:48 +0200
Subject: [PATCH 077/149] Apply time style to author

The author is mentioned right below the time so it makes sense to give
them the same style.
---
 css/HtmlFormat.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/HtmlFormat.css b/css/HtmlFormat.css
index 430e15d..2b8ddd5 100644
--- a/css/HtmlFormat.css
+++ b/css/HtmlFormat.css
@@ -71,7 +71,7 @@ section > div.content {
 
 }
 
-section > time {
+section > time, section > p.author {
 
 	color: #888;
 	font-size: 80%;

From 0a008c4eb3c9e415fd55cc174ec5319a66265180 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 20:06:53 +0200
Subject: [PATCH 078/149] [WordPress] Support atom AND rss for feed replies

Some sites return RSS feeds instead of ATOM feeds even though ATOM
feeds were specifically requested (/feeds/atom)!

This bridge will now detect ATOM/RSS feeds and change behavior
accordingly.
---
 bridges/WordPressBridge.php | 52 ++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 7a1b12e..27c231d 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -1,4 +1,6 @@
 <?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 {
 
 	private $url;
@@ -9,7 +11,7 @@ class WordPressBridge extends BridgeAbstract {
 		$this->name = "Wordpress Bridge";
 		$this->uri = "https://wordpress.org/";
 		$this->description = "Returns the 3 newest full posts of a Wordpress blog";
-		$this->update = "2016-08-02";
+		$this->update = "2016-08-04";
 
 		$this->parameters[] =
 		'[
@@ -22,6 +24,24 @@ class WordPressBridge extends BridgeAbstract {
 
 	}
 
+	// Returns the content type for a given html dom
+	function DetectContentType($html){
+		if($html->find('entry'))
+			return WORDPRESS_TYPE_ATOM;
+		if($html->find('item'))
+			return WORDPRESS_TYPE_RSS;
+		return WORDPRESS_TYPE_ATOM; // Make ATOM default
+	}
+
+	// Replaces all 'link' tags with 'url' for simplehtmldom to actually find 'links' ('url')	
+	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);
+		return str_get_html($element_text);
+	}
+
 	public function collectData(array $param) {
 
                 function StripCDATA($string) {
@@ -44,17 +64,35 @@ class WordPressBridge extends BridgeAbstract {
 
                 $this->url = $this->url.'/feed/atom';
 		$html = $this->file_get_html($this->url) or $this->returnError("Could not request {$this->url}.", 404);
-		$posts = $html->find('entry');
+
+		// Notice: We requested an ATOM feed, however some sites return RSS feeds instead!
+		$type = $this->DetectContentType($html);
+
+		if($type === WORDPRESS_TYPE_RSS)
+			$posts = $html->find('item');
+		else
+			$posts = $html->find('entry');
+
+
                 if(!empty($posts) ) {
                         $this->name = $html->find('title', 0)->plaintext;
                         $i=0;
-			foreach ($html->find('entry') as $article) {
+			foreach ($posts as $article) {
 				if($i < 3) {
-					$this->items[$i]->uri = $article->find('link', 0)->getAttribute('href');
-					$this->items[$i]->title = StripCDATA($article->find('title', 0)->plaintext);
-					$this->items[$i]->author = trim($article->find('author', 0)->innertext);
-					$this->items[$i]->timestamp = strtotime($article->find('updated', 0)->innertext);
 
+					$article = $this->ReplaceLinkTagsWithUrlTags($article);
+
+					if($type === WORDPRESS_TYPE_RSS){
+						$this->items[$i]->uri = $article->find('url', 0)->innertext; // 'link' => 'url'!
+						$this->items[$i]->title = $article->find('title', 0)->plaintext;
+						$this->items[$i]->author = trim($article->find('dc:creator', 0)->innertext);
+						$this->items[$i]->timestamp = strtotime($article->find('pubDate', 0)->innertext);
+					} else {
+						$this->items[$i]->uri = $article->find('url', 0)->getAttribute('href'); // 'link' => 'url'!
+						$this->items[$i]->title = StripCDATA($article->find('title', 0)->plaintext);
+						$this->items[$i]->author = trim($article->find('author', 0)->innertext);
+						$this->items[$i]->timestamp = strtotime($article->find('updated', 0)->innertext);
+					}
                                         $article_html = $this->file_get_html($this->items[$i]->uri);
 					$this->items[$i]->content = clearContent($article_html->find('article', 0)->innertext);
                                         if(empty($this->items[$i]->content))

From 2672b96e11b775b37301cdb37d8b4b401bb8b03d Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 20:12:51 +0200
Subject: [PATCH 079/149] [WordPress] Initialize item before assigning values

This solves warning: "Creating default object from empty value"
---
 bridges/WordPressBridge.php | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 27c231d..70e7a3f 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -80,26 +80,29 @@ class WordPressBridge extends BridgeAbstract {
 			foreach ($posts as $article) {
 				if($i < 3) {
 
+					$item = new \Item();
+
 					$article = $this->ReplaceLinkTagsWithUrlTags($article);
 
 					if($type === WORDPRESS_TYPE_RSS){
-						$this->items[$i]->uri = $article->find('url', 0)->innertext; // 'link' => 'url'!
-						$this->items[$i]->title = $article->find('title', 0)->plaintext;
-						$this->items[$i]->author = trim($article->find('dc:creator', 0)->innertext);
-						$this->items[$i]->timestamp = strtotime($article->find('pubDate', 0)->innertext);
+						$item->uri = $article->find('url', 0)->innertext; // 'link' => 'url'!
+						$item->title = $article->find('title', 0)->plaintext;
+						$item->author = trim($article->find('dc:creator', 0)->innertext);
+						$item->timestamp = strtotime($article->find('pubDate', 0)->innertext);
 					} else {
-						$this->items[$i]->uri = $article->find('url', 0)->getAttribute('href'); // 'link' => 'url'!
-						$this->items[$i]->title = StripCDATA($article->find('title', 0)->plaintext);
-						$this->items[$i]->author = trim($article->find('author', 0)->innertext);
-						$this->items[$i]->timestamp = strtotime($article->find('updated', 0)->innertext);
+						$item->uri = $article->find('url', 0)->getAttribute('href'); // 'link' => 'url'!
+						$item->title = 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->file_get_html($this->items[$i]->uri);
-					$this->items[$i]->content = clearContent($article_html->find('article', 0)->innertext);
-                                        if(empty($this->items[$i]->content))
-					        $this->items[$i]->content = clearContent($article_html->find('.single-content', 0)->innertext); // another common content div
-                                        if(empty($this->items[$i]->content))
-					        $this->items[$i]->content = clearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
-
+                                        $article_html = $this->file_get_html($item->uri);
+					$item->content = clearContent($article_html->find('article', 0)->innertext);
+                                        if(empty($item->content))
+					        $item->content = clearContent($article_html->find('.single-content', 0)->innertext); // another common content div
+                                        if(empty($item->content))
+					        $item->content = clearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
+					
+					$this->items[] = $item;
 					$i++;
 				}
 			} 

From 21523eb549f0f94d4d5c87dffff793ffce9e3b96 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 20:15:28 +0200
Subject: [PATCH 080/149] [WordPress] Change all nested functions to member
 functions

---
 bridges/WordPressBridge.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 70e7a3f..50d54c4 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -42,20 +42,19 @@ class WordPressBridge extends BridgeAbstract {
 		return str_get_html($element_text);
 	}
 
+	function StripCDATA($string) {
+		$string = str_replace('<![CDATA[', '', $string);
+		$string = str_replace(']]>', '', $string);
+		return $string;
+	}
+
+	function ClearContent($content) {
+		$content = preg_replace('/<script.*\/script>/', '', $content);
+		$content = preg_replace('/<div class="wpa".*/', '', $content);
+		return $content;
+	}
+
 	public function collectData(array $param) {
-
-                function StripCDATA($string) {
-                        $string = str_replace('<![CDATA[', '', $string);
-                        $string = str_replace(']]>', '', $string);
-                        return $string;
-                }
-
-                function clearContent($content) {
-                        $content = preg_replace('/<script.*\/script>/', '', $content);
-                        $content = preg_replace('/<div class="wpa".*/', '', $content);
-                        return $content;
-                }
-
 		$this->processParams($param);
 
 		if (!$this->hasUrl()) {
@@ -91,16 +90,16 @@ class WordPressBridge extends BridgeAbstract {
 						$item->timestamp = strtotime($article->find('pubDate', 0)->innertext);
 					} else {
 						$item->uri = $article->find('url', 0)->getAttribute('href'); // 'link' => 'url'!
-						$item->title = StripCDATA($article->find('title', 0)->plaintext);
+						$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->file_get_html($item->uri);
-					$item->content = clearContent($article_html->find('article', 0)->innertext);
+					$item->content = $this->ClearContent($article_html->find('article', 0)->innertext);
                                         if(empty($item->content))
-					        $item->content = clearContent($article_html->find('.single-content', 0)->innertext); // another common content div
+					        $item->content = $this->ClearContent($article_html->find('.single-content', 0)->innertext); // another common content div
                                         if(empty($item->content))
-					        $item->content = clearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
+					        $item->content = $this->ClearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
 					
 					$this->items[] = $item;
 					$i++;

From 455b98757cd71d29f76df6474e552f67dde95b47 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 20:40:38 +0200
Subject: [PATCH 081/149] [WordPress] Don't attempt to load pages with missing
 .article

Some sites use WordPress but don't provide pages with articles.
Instead of throwing internal errors we just don't return any
content.
---
 bridges/WordPressBridge.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 50d54c4..eee3c97 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -39,6 +39,7 @@ class WordPressBridge extends BridgeAbstract {
 		$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);
 	}
 
@@ -94,13 +95,17 @@ class WordPressBridge extends BridgeAbstract {
 						$item->author = trim($article->find('author', 0)->innertext);
 						$item->timestamp = strtotime($article->find('updated', 0)->innertext);
 					}
+
                                         $article_html = $this->file_get_html($item->uri);
-					$item->content = $this->ClearContent($article_html->find('article', 0)->innertext);
-                                        if(empty($item->content))
-					        $item->content = $this->ClearContent($article_html->find('.single-content', 0)->innertext); // another common content div
-                                        if(empty($item->content))
-					        $item->content = $this->ClearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
-					
+
+					$article = $article_html->find('article', 0);
+					if(!empty($article)){
+						$item->content = $this->ClearContent($article->innertext);
+						if(empty($item->content))
+							$item->content = $this->ClearContent($article_html->find('.single-content', 0)->innertext); // another common content div
+						if(empty($item->content))
+							$item->content = $this->ClearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
+					}
 					$this->items[] = $item;
 					$i++;
 				}

From d944558a3dcc417b6c756a6f2a8919fe1f28c073 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 20:45:21 +0200
Subject: [PATCH 082/149] [WordPress] Fix indentation and remove empty lines

---
 bridges/WordPressBridge.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index eee3c97..11cddbf 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -21,7 +21,6 @@ class WordPressBridge extends BridgeAbstract {
 				"identifier" : "url"
 			}
 		]';
-
 	}
 
 	// Returns the content type for a given html dom
@@ -62,7 +61,7 @@ class WordPressBridge extends BridgeAbstract {
 			$this->returnError('You must specify a URL', 400);
 		}
 
-                $this->url = $this->url.'/feed/atom';
+		$this->url = $this->url.'/feed/atom';
 		$html = $this->file_get_html($this->url) or $this->returnError("Could not request {$this->url}.", 404);
 
 		// Notice: We requested an ATOM feed, however some sites return RSS feeds instead!
@@ -73,10 +72,10 @@ class WordPressBridge extends BridgeAbstract {
 		else
 			$posts = $html->find('entry');
 
+		if(!empty($posts) ) {
+			$this->name = $html->find('title', 0)->plaintext;
+			$i=0;
 
-                if(!empty($posts) ) {
-                        $this->name = $html->find('title', 0)->plaintext;
-                        $i=0;
 			foreach ($posts as $article) {
 				if($i < 3) {
 
@@ -96,7 +95,7 @@ class WordPressBridge extends BridgeAbstract {
 						$item->timestamp = strtotime($article->find('updated', 0)->innertext);
 					}
 
-                                        $article_html = $this->file_get_html($item->uri);
+					$article_html = $this->file_get_html($item->uri);
 
 					$article = $article_html->find('article', 0);
 					if(!empty($article)){
@@ -110,8 +109,7 @@ class WordPressBridge extends BridgeAbstract {
 					$i++;
 				}
 			} 
-                }
-		else {
+		} else {
 			$this->returnError("Sorry, {$this->url} doesn't seem to be a Wordpress blog.", 404);
 		}
 	}
@@ -138,6 +136,4 @@ class WordPressBridge extends BridgeAbstract {
 	private function processParams($param) {
 		$this->url = $param['url'];
 	}
-
 }
-

From 2c41ed550def91348049815f025f1df0d6781ecc Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 21:06:12 +0200
Subject: [PATCH 083/149] [WordPress] Fix content loading

---
 bridges/WordPressBridge.php | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 11cddbf..27afe0e 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -86,7 +86,7 @@ class WordPressBridge extends BridgeAbstract {
 					if($type === WORDPRESS_TYPE_RSS){
 						$item->uri = $article->find('url', 0)->innertext; // 'link' => 'url'!
 						$item->title = $article->find('title', 0)->plaintext;
-						$item->author = trim($article->find('dc:creator', 0)->innertext);
+						$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'!
@@ -97,14 +97,30 @@ class WordPressBridge extends BridgeAbstract {
 
 					$article_html = $this->file_get_html($item->uri);
 
-					$article = $article_html->find('article', 0);
-					if(!empty($article)){
-						$item->content = $this->ClearContent($article->innertext);
-						if(empty($item->content))
-							$item->content = $this->ClearContent($article_html->find('.single-content', 0)->innertext); // another common content div
-						if(empty($item->content))
-							$item->content = $this->ClearContent($article_html->find('.post', 0)->innertext); // for old WordPress themes without HTML5
+					// Attempt to find most common content div
+					if(empty($item->content)){
+						$article = $article_html->find('article', 0);
+						if(!empty($article)){
+							$item->content = $this->ClearContent($article->innertext);
+						}
 					}
+
+					// another common content div
+					if(empty($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(empty($item->content)){
+						$article = $article_html->find('.post', 0);
+						if(!empty($article)){
+							$item->content = $this->ClearContent($article->innertext);
+						}
+					}
+
 					$this->items[] = $item;
 					$i++;
 				}

From 870ef6f6fc9216b83629a7cb32defc5db78070be Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 21:42:06 +0200
Subject: [PATCH 084/149] [WordPress] Remove forms and improve script removal

Some sites contain scripts like these, that were not captured by the
previous implementation:

<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
---
 bridges/WordPressBridge.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 27afe0e..0ba1851 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -49,8 +49,9 @@ class WordPressBridge extends BridgeAbstract {
 	}
 
 	function ClearContent($content) {
-		$content = preg_replace('/<script.*\/script>/', '', $content);
+		$content = preg_replace('/<script[^>]*>[^<]*<\/script>/', '', $content);
 		$content = preg_replace('/<div class="wpa".*/', '', $content);
+		$content = preg_replace('/<form.*\/form>/', '', $content);
 		return $content;
 	}
 

From 7afee0e277d82cba2da2eeb4146cce98640665c7 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 21:56:11 +0200
Subject: [PATCH 085/149] [WordPress] Fix site name on bridge content

---
 bridges/WordPressBridge.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 0ba1851..35ef3bf 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -4,6 +4,7 @@ define('WORDPRESS_TYPE_RSS', 2); // Content is of type RSS
 class WordPressBridge extends BridgeAbstract {
 
 	private $url;
+	public $sitename; // Name of the site
 
 	public function loadMetadatas() {
 
@@ -74,7 +75,7 @@ class WordPressBridge extends BridgeAbstract {
 			$posts = $html->find('entry');
 
 		if(!empty($posts) ) {
-			$this->name = $html->find('title', 0)->plaintext;
+			$this->sitename = $html->find('title', 0)->plaintext;
 			$i=0;
 
 			foreach ($posts as $article) {
@@ -132,7 +133,7 @@ class WordPressBridge extends BridgeAbstract {
 	}
 
 	public function getName() {
-		return "{$this->name} - Wordpress Bridge";
+		return "{$this->sitename} - Wordpress Bridge";
 	}
 
 	public function getURI() {

From 12abf9d455a3326760345727c64dbbfc0b3d9753 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 21:57:13 +0200
Subject: [PATCH 086/149] [LeMotDuJour] remove Bridge: Supported by WordPress
 bridge

http://www.lemotdujour.com doesn't seem to be active for the last two
years (last entry is dated 17. oct 2014). WordPress will return the
headlines which seems to be sufficient for now.
---
 bridges/LeMotDuJourBridge.php | 55 -----------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 bridges/LeMotDuJourBridge.php

diff --git a/bridges/LeMotDuJourBridge.php b/bridges/LeMotDuJourBridge.php
deleted file mode 100644
index d121594..0000000
--- a/bridges/LeMotDuJourBridge.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-class LeMotDuJourBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "qwertygc";
-		$this->name = "LeMotDuJour Bridge";
-		$this->uri = "http://www.lemotdujour.com/";
-		$this->description = "Returns the newest articles.";
-		$this->update = "2014-05-25";
-
-	}
-    
-        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 = $html2->find('div.single-contenu', 0)->innertext;
-		return $text;
-		}
-		$html = $this->file_get_html('http://feeds2.feedburner.com/lemotdujour/lemotdujour') or $this->returnError('Could not request LeMotDuJour.', 404);
-		$limit = 0;
-
-		foreach($html->find('item') as $element) {
-		 if($limit < 10) {
-		 $item = new \Item();
-		 $item->title = StripCDATA($element->find('title', 0)->innertext);
-		 $item->uri = StripCDATA($element->find('guid', 0)->plaintext);
-		 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-		 $item->content = ExtractContent($item->uri);
-		 $this->items[] = $item;
-		 $limit++;
-		 }
-		}
-    
-    }
-
-    public function getName(){
-        return 'LeMotDuJour Bridge';
-    }
-
-    public function getURI(){
-        return 'http://lemotdujour.com/';
-    }
-
-    public function getCacheDuration(){
-        return 3600*2; // 2 hours
-        // return 0; // 2 hours
-    }
-}

From 02e169584a8dbfc243c12e4e8c0b8587a6cf1aca Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 4 Aug 2016 22:00:51 +0200
Subject: [PATCH 087/149] [Raymond] remove bridge: supported by WordPress
 bridge

---
 bridges/RaymondBridge.php | 53 ---------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 bridges/RaymondBridge.php

diff --git a/bridges/RaymondBridge.php b/bridges/RaymondBridge.php
deleted file mode 100644
index 9e96a54..0000000
--- a/bridges/RaymondBridge.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-class RaymondBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "Raymond";
-		$this->uri = "http://www.raymond.cc";
-		$this->description = "Returns the 3 newest posts from Raymond.cc (full text)";
-		$this->update = "2014-05-26";
-
-	}
-
-    public function collectData(array $param){
-    function raymondStripCDATA($string) {
-        $string = str_replace('<![CDATA[', '', $string);
-        $string = str_replace(']]>', '', $string);
-        return $string;
-    }
-    function raymondExtractContent($url) {
-        $html2 = $this->file_get_html($url);
-        $text = $html2->find('div.entry-content', 0)->innertext;
-	$text = preg_replace('/class="ad".*/', '', $text);
-	$text = strip_tags($text, '<p><a><i><strong><em><img>');
-	$text = str_replace('(adsbygoogle = window.adsbygoogle || []).push({});', '', $text);
-        return $text;
-    }
-        $html = $this->file_get_html('http://www.raymond.cc/blog/feed') or $this->returnError('Could not request raymond.', 404);
-        $limit = 0;
-        foreach($html->find('item') as $element) {
-         if($limit < 3) {
-         $item = new \Item();
-         $item->title = raymondStripCDATA($element->find('title', 0)->innertext);
-         $item->uri = raymondStripCDATA($element->find('guid', 0)->plaintext);
-         $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-         $item->content = raymondExtractContent($item->uri);
-         $this->items[] = $item;
-         $limit++;
-         }
-        }
-
-    }
-    public function getName(){
-        return 'raymond';
-    }
-    public function getURI(){
-        return 'http://www.raymond.cc/blog';
-    }
-    public function getCacheDuration(){
-        return 3600*12; // 12 hour
-    }
-}
-

From e6bd815bcc7e3148d44a9d7f2f3e17be1621ca4b Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Fri, 5 Aug 2016 11:27:47 +0200
Subject: [PATCH 088/149] [lib/Bridge] Fix typo

This fixes "Notice: Undefined variable: defaultBRtext in
C:\xampp\htdocs\rss-bridge_dev\lib\Bridge.php on line 114"
---
 lib/Bridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Bridge.php b/lib/Bridge.php
index 8cc0bee..de9d022 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -111,7 +111,7 @@ abstract class BridgeAbstract implements BridgeInterface{
         }
       }
       return file_get_html($url,$use_include_path,$context,$offset,$maxLen,
-        $lowercase,$forceTagsClosed,$target_charset,$stripRN,$defaultBRtext,
+        $lowercase,$forceTagsClosed,$target_charset,$stripRN,$defaultBRText,
         $defaultSpanText);
     }
 

From 31bdf7390a32e7f26955540092ea8cea8b4c104b Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Fri, 5 Aug 2016 13:16:00 +0200
Subject: [PATCH 089/149] [Castorus] Add new bridge

---
 bridges/CastorusBridge.php | 92 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 bridges/CastorusBridge.php

diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
new file mode 100644
index 0000000..d54bb5b
--- /dev/null
+++ b/bridges/CastorusBridge.php
@@ -0,0 +1,92 @@
+<?php
+class CastorusBridge extends BridgeAbstract {
+	public function loadMetadatas(){
+		$this->maintainer = "logmanoriginal";
+		$this->name = "Castorus Bridge";
+		$this->uri = $this->getURI();
+		$this->description = "Returns the latest changes";
+		$this->update = "2016-08-05";
+	}
+
+	// Extracts the tile from an actitiy
+	function ExtractActivityTitle($activity){
+		$title = $activity->find('a', 0);
+
+		if(!$title)
+			$this->returnError('Cannot find title!', 404);
+		
+		return htmlspecialchars(trim($title->plaintext));
+	}
+
+	// Extracts the url from an actitiy
+	function ExtractActivityUrl($activity){
+		$url = $activity->find('a', 0);
+
+		if(!$url)
+			$this->returnError('Cannot find url!', 404);
+		
+		return $this->getURI() . $url->href;
+	}
+
+	// Extracts the time from an activity
+	function ExtractActivityTime($activity){
+		// Unfortunately the time is part of the parent node, 
+		// so we have to clear all child nodes first
+		$nodes = $activity->find('*');
+
+		if(!$nodes)
+			$this->returnError('Cannot find nodes!', 404);
+		
+		foreach($nodes as $node){
+			$node->outertext = '';
+		}
+
+		return strtotime($activity->innertext);
+	}
+
+	// Extracts the price change
+	function ExtractActivityPrice($activity){
+		$price = $activity->find('span', 1);
+
+		if(!$price)
+			$this->returnError('Cannot find price!', 404);
+		
+		return $price->innertext;
+	}
+
+	public function collectData(array $params){
+		$html = $this->file_get_html($this->getURI());
+
+		if(!$html)
+			$this->returnError('Could not load data from ' . $this->getURI() . '!', 404);
+		
+		$activities = $html->find('div#activite/li');
+
+		if(!$activities)
+			$this->returnError('Failed to find activities!', 404);
+		
+		foreach($activities as $activity){
+			$item = new \Item();
+
+			$item->title = $this->ExtractActivityTitle($activity);
+			$item->uri = $this->ExtractActivityUrl($activity);
+			$item->timestamp = $this->ExtractActivityTime($activity);
+			$item->content = '<a href="' . $item->uri . '">' . $item->title . '</a><br><p>' 
+								. $this->ExtractActivityPrice($activity) . '</p>';
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getName(){
+		return 'Castorus Bridge';
+	}
+
+	public function getURI(){
+		return 'http://www.castorus.com';
+	}
+
+	public function getCacheDuration(){
+		return 3600; // 1 hour
+	}
+}

From e4a56e504e9166cbea98c7c6456458da3437e043 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Fri, 5 Aug 2016 13:19:36 +0200
Subject: [PATCH 090/149] [Castorus] Reduce cache duration to 10 minutes

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

diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
index d54bb5b..69d8961 100644
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -87,6 +87,6 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	public function getCacheDuration(){
-		return 3600; // 1 hour
+		return 600; // 10 minutes
 	}
 }

From a5120dde2c526cf8184a6eeeb9bf5374b160fe9a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Fri, 5 Aug 2016 14:59:26 +0200
Subject: [PATCH 091/149] [Castorus] Allow filter via ZIP code or city name

---
 bridges/CastorusBridge.php | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
index 69d8961..55ff7b7 100644
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -6,6 +6,30 @@ class CastorusBridge extends BridgeAbstract {
 		$this->uri = $this->getURI();
 		$this->description = "Returns the latest changes";
 		$this->update = "2016-08-05";
+
+		$this->parameters["Get latest changes"] = '[]';
+		$this->parameters["Get latest changes via ZIP code"] = 
+		'[
+			{
+				"name": "ZIP code",
+				"identifier" : "zip",
+				"type" : "text",
+				"required" : "true",
+				"exampleValue" : "74910, 74",
+				"title" : "Insert ZIP code (complete or partial)"
+			}
+		]';
+		$this->parameters["Get latest changes via city name"] = 
+		'[
+			{
+				"name": "City name",
+				"identifier" : "city",
+				"type" : "text",
+				"required" : "true",
+				"exampleValue" : "Seyssel, Seys",
+				"title" : "Insert city name (complete or partial)"
+			}
+		]';
 	}
 
 	// Extracts the tile from an actitiy
@@ -55,6 +79,12 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	public function collectData(array $params){
+		if(isset($params['zip']))
+			$zip_filter = trim($params['zip']);
+
+		if(isset($params['city']))
+			$city_filter = trim($params['city']);
+
 		$html = $this->file_get_html($this->getURI());
 
 		if(!$html)
@@ -74,6 +104,14 @@ class CastorusBridge extends BridgeAbstract {
 			$item->content = '<a href="' . $item->uri . '">' . $item->title . '</a><br><p>' 
 								. $this->ExtractActivityPrice($activity) . '</p>';
 
+			if(isset($zip_filter) && !(substr($item->title, 0, strlen($zip_filter)) === $zip_filter)){
+				continue; // Skip this item
+			}
+
+			if(isset($city_filter) && !(substr($item->title, strpos($item->title, ' ') + 1, strlen($city_filter)) === $city_filter)){
+				continue; // Skip this item
+			}
+
 			$this->items[] = $item;
 		}
 	}

From 5b7a6300ec4ed87cf582033f95da28aa3af9363a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Fri, 5 Aug 2016 19:43:39 +0200
Subject: [PATCH 092/149] [CREATE_BRIDGE] Update documentation to reflect
 current status

---
 CREATE_BRIDGE.md | 238 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 189 insertions(+), 49 deletions(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index 9948050..f7dc13a 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -1,53 +1,54 @@
 # Howto create a bridge
 
-A bridge is an interface that allows rss-bridge to create a RSS feed from a website.
+A bridge is an class that allows rss-bridge to create a RSS feed from a website.
 The bridge is a PHP file, located in the `bridges/` folder.
 
-##Specifications
+Read the following chapters an make sure to read the [Guidelines](#guidelines)!
 
-A rss bridge must extend the `BridgeAbstract` class, and implement the following functions :
+## Specifications
 
-* The `loadMetadatas` function, described below,
-* The `getCacheDuration` function, describing the time during which rss-bridge will output cached values instead of re-generating a RSS feed.
-* The `collectData` function, also described below.
+A rss bridge must extend the `BridgeAbstract` class and implement the following functions :
 
-##The `collectData` function
+* [`loadMetadatas`](#the-loadmetadatas-function)
+* [`collectData`](#the-collectdata-function)
+* [`getName`](#the-getname-function)
+* [`getURI`](#the-geturi-function)
+* [`getCacheDuration`](#the-getcacheduration-function)
 
-This function takes as a parameter an array called `$param`, that is automatically filled with values from the user, according to the values setted in `loadMetadatas`.
-This function is the place where all the website scrapping and the RSS feed generation process will go.
+Find a [template](#template) at the end of this file.
 
-The RSS elements are stored in the class variable `items[]`.
+## The `loadMetadatas` function
 
-Every RSS element is an instance of the `Item` class.
+This function is used by rss-bridge to determine the name, maintainer name, website, last updated date... of the bridge, and the user parameters.
 
-##The `loadMetadatas` function
+### Basic metadatas
 
-This function is the one used by rss-bridge core to determine the name, maintainer name, website, last updated date... of the bridge, and the user parameters.
-
-### Basic metadatas.
-
-The basic metadatas are the following :
+The basic metadatas are :
 
 ```PHP
-$this->maintainer
-$this->name
-$this->uri
-$this->description
-$this->update
+$this->maintainer // Name of the maintainer
+$this->name // Name of the bridge
+$this->uri // URI to the target website of the bridge ("http://....")
+$this->description // A brief description of the bridge
+$this->update // Date of last change in format "yyyy-mm-dd"
+$this->parameters // (optional) Definition of additional parameters
 ```
 
-The default values are the following :
+Find a description of `$this->parameters` [below](#parameters)
+
+The default values are :
 
 ```PHP
+$this->maintainer = 'No maintainer';
 $this->name = "Unnamed bridge";
 $this->uri = "";
 $this->description = 'No description provided';
-$this->maintainer = 'No maintainer';
+$this->parameters = array();
 ```
 
 ### Parameters
 
-Parameters use a JSON-like format, which is parsed and transformed to HTML `<form>` by rss-bridge.
+Parameters are defined in a JSON-like format, which is parsed and transformed into a HTML `<form>` by rss-bridge.
 
 These datas goes into the `$this->parameters` array, which is not mandatory if your bridge doesn't take any parameter.
 
@@ -59,47 +60,186 @@ The array can be a key-based array, but it is not necessary. The following synta
 $this->parameters[] = ...
 $this->parameters['First usage of my bridge'] = ...
 ```
+
 It is worth mentionning that you can also define a set of parameters that will be applied to every possible utilisation of your bridge.
-To do this, just create a parameter array with the `global` key.
+To do this, just create a parameter array with the `global` key :
+
+```PHP
+$this->parameters['global'] = ...
+```
 
 ### Format specifications
 
-Every `$this->parameters` element is a JSON array (`[ ... ]`) containing every input.
+Every `$this->parameters` element is a JSON array of cluster (`[ ... ]`) containing all input fields.
 
-It needs the following elements to be setted :
-* name, the input name as displayed to the user
-* identifier, which will be the key in the `$param` array for the corresponding data.
+Following elements are supported :
 
-Hence, the most basic parameter definition is the following:
+Parameter Name | Required | Type | Supported values | Description
+---------------|----------|------|------------------| -----------
+`name`|**yes**|Text||Input name as displayed to the user
+`identifier`|**yes**|Text||Identifier, which will be the key in the `$param` array for the [`collectData`](#the-collectdata-function) function
+`type`|no|Text|`text`, `number`, `list`, `checkbox`|Type of the input, default is text
+`required`|no|Boolean|`true`, `false`|Set this if you want your attribute to be required
+`values`|no|Text|`[ {"name" : option1Name, "value" : "option1Value"}, ... ]`| Values list, required with the '`list`' type
+`title`|no|Text||Will be shown as tooltip when mouse-hovering over the input
+
+Hence, the most basic parameter definition is the following :
 
 ```PHP
-	$this->parameters =
+...
+	$this->parameters[] =
 	'[
 		{
 			"name" : "Username",
 			"identifier" : "u"
-
 		}
 	]';
+...
 ```
 
-####Optional parameters
+## The `collectData` function
 
-Here is a list of optional parameters for the input :
+This function takes as a parameter an array called `$param`, that is automatically filled with values from the user, according to the values defined in the parameters array in `loadMetadatas`.
+This function is the place where all the website scrapping and the RSS feed generation process must be implemented.
 
-Parameter Name | Parameter values | Description
----------------|------------------|------------
-type|text, number, list, checkbox| Type of the input, default is text
-required| true | Set this if you want your attribute to be required
-values| [ {"name" : option1Name, "value" : "option1Value"}, ...] | Values list, required with the 'list' type
-title| text | Will be shown as tooltip when mouse-hovering over the input
+RSS elements collected by this function must be stored in the class variable `items[]`.
 
-#### Guidelines
+Every RSS element is an instance of the `Item` class.
 
-  * scripts (eg. Javascript) must be stripped out. Make good use of `strip_tags()` and `preg_replace()`
-  * bridge must present data within 8 seconds (adjust iterators accordingly)
-  * cache timeout must be fine-tuned so that each refresh can provide 1 or 2 new elements on busy periods
-  * `<audio>` and `<video>` must not autoplay. Seriously.
-  * do everything you can to extract valid timestamps. Translate formats, use API, exploit sitemap, whatever. Free the data!
-  * don't create duplicates. If the website runs on WordPress, use the generic WordPress bridge if possible.
-  * maintain efficient and well-commented code :wink:
+## Items
+
+The `Item` class is used to store parameter that are collected in the [`collectData`](#the-collectdata-function) function. Following properties are supported by rss-bridge :
+
+```PHP
+$item->uri // URI to reach the subject ("http://...")
+$item->thumbnailUri // URI for the thumbnail ("http://...")
+$item->title // Title of the item
+$item->name // Name of the item
+$item->timestamp // Timestamp of the item in numeric format (use strtotime)
+$item->author // Name of the author
+$item->content // Content in HTML format
+```
+
+In order to create a new item you'll have to escape the **I** in **I**tem like this :
+
+```PHP
+$item = new \Item();
+```
+
+### Item usage
+
+Which items are necessary depends on the output format. There are two formats that support literally any property in the `$item`:
+
+* JSON
+* Plaintext
+
+The following list provides an overview of the parameters used by the other formats :
+
+Parameter | ATOM | HTML | (M)RSS
+----------|------|------|-------
+`uri`|X|X|X
+`thumbnailUri`||X
+`title`|X|X|X
+`name`|X||
+`timestamp`|X|X|X
+`author`|X|X|X
+`content`|X|X|X
+
+## The `getName` function
+
+This function returns the name of the bridge as it should be displayed on the main page of rss-bridge.
+
+```PHP
+	public function getName(){
+		return ''; // Insert your bridge name here!
+	}
+```
+
+## The `getURI` function
+
+This function returns the URI to the destination site of the bridge. It will be used on the main page of rss-bridge when clicking your brige name.
+
+```PHP
+	public function getURI(){
+		return ''; // Insert your URI here!
+	}
+```
+
+## The `getCacheDuration` function
+
+This function returns the time in **seconds** during which rss-bridge will output cached values instead of re-generating a RSS feed.
+
+```PHP
+	public function getCacheDuration(){
+		return 3600; // 1 hour
+	}
+```
+
+# Bridge Abstract functions
+
+All bridges extend from `BridgeAbstract` and therefore are able to make use of functions defined in `BridgeAbstract`. 
+
+Following functions should be used for good practice and will support you with your bridge :
+
+* [`returnError`](#the-returnerror-function)
+* [`file_get_html`](#the-file-get-html-function)
+
+## The `returnError` function
+
+This function aborts execution of the current bridge and returns the given error message with the provided error number :
+
+```PHP
+$this->returnError('Your error message', 404)
+```
+
+Check the [list of error codes](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes) for applicable error numbers.
+
+## The `file_get_html` function
+
+This function is a wrapper around the simple_html_dom file_get_html function in order to provide context by design. It is considered good practice to use this function.
+
+```PHP
+$html = $this->file_get_html('your URI');
+```
+
+# Guidelines
+
+* scripts (eg. Javascript) must be stripped out. Make good use of `strip_tags()` and `preg_replace()`
+* each bridge must present data within 8 seconds (adjust iterators accordingly)
+* cache timeout must be fine-tuned so that each refresh can provide 1 or 2 new elements on busy periods
+* `<audio>` and `<video>` must not autoplay. Seriously.
+* do everything you can to extract valid timestamps. Translate formats, use API, exploit sitemap, whatever. Free the data!
+* don't create duplicates. If the website runs on WordPress, use the generic WordPress bridge if possible.
+* maintain efficient and well-commented code :wink:
+
+# Template
+
+This is a template for a new bridge:
+
+```PHP
+class MySiteBridge extends BridgeAbstract{
+	public function loadMetadatas(){
+		$this->maintainer = 'No maintainer';
+		$this->name = $this->getName();
+		$this->uri = $this->getURI();
+		$this->description = 'No description provided';
+		$this->parameters = array();
+	}
+
+	public function collectData(array $params){
+		// Implement your bridge here!
+	}
+
+	public function getName(){
+		return ''; // Insert your bridge name here!
+	}
+
+	public function getURI(){
+		return ''; // Insert your URI here!
+	}
+
+	public function getCacheDuration(){
+		return 3600; // 1 hour
+	}
+}
+```

From 48711bd7726dfc95d0b08f3278680a6a6a12938c Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Fri, 5 Aug 2016 19:56:08 +0200
Subject: [PATCH 093/149] [CREATE_BRIDGE] Fix some typos

---
 CREATE_BRIDGE.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index f7dc13a..748ab3c 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -1,7 +1,7 @@
 # Howto create a bridge
 
 A bridge is an class that allows rss-bridge to create a RSS feed from a website.
-The bridge is a PHP file, located in the `bridges/` folder.
+The bridge is a PHP file, located in the [`bridges/`](bridges/) folder.
 
 Read the following chapters an make sure to read the [Guidelines](#guidelines)!
 
@@ -147,7 +147,7 @@ Parameter | ATOM | HTML | (M)RSS
 
 ## The `getName` function
 
-This function returns the name of the bridge as it should be displayed on the main page of rss-bridge.
+This function returns the name of the bridge as it will be displayed on the main page of rss-bridge or on top of the feed output (HTML, ATOM, etc...).
 
 ```PHP
 	public function getName(){
@@ -157,7 +157,7 @@ This function returns the name of the bridge as it should be displayed on the ma
 
 ## The `getURI` function
 
-This function returns the URI to the destination site of the bridge. It will be used on the main page of rss-bridge when clicking your brige name.
+This function returns the URI to the destination site of the bridge. It will be used on the main page of rss-bridge when clicking your bridge name.
 
 ```PHP
 	public function getURI(){
@@ -182,7 +182,7 @@ All bridges extend from `BridgeAbstract` and therefore are able to make use of f
 Following functions should be used for good practice and will support you with your bridge :
 
 * [`returnError`](#the-returnerror-function)
-* [`file_get_html`](#the-file-get-html-function)
+* [`file_get_html`](#the-file_get_html-function)
 
 ## The `returnError` function
 
@@ -217,6 +217,7 @@ $html = $this->file_get_html('your URI');
 This is a template for a new bridge:
 
 ```PHP
+<?php
 class MySiteBridge extends BridgeAbstract{
 	public function loadMetadatas(){
 		$this->maintainer = 'No maintainer';
@@ -242,4 +243,5 @@ class MySiteBridge extends BridgeAbstract{
 		return 3600; // 1 hour
 	}
 }
+
 ```

From 1d53b70272cffa11426a4b00ee5cc1643afcf222 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 16:00:56 +0200
Subject: [PATCH 094/149] bridges: Remove unused functions and update scopes

Many bridges implemented getDescription() which is only applicable for
bridges extending RSSExpander.

Functions that are not part of the abstract class or interface should
be in private scope for better readability.
---
 bridges/AllocineFRBridge.php            |  5 +----
 bridges/AllocineT5Bridge.php            |  5 +----
 bridges/AllocineTueursEnSerieBridge.php |  5 +----
 bridges/BlaguesDeMerdeBridge.php        |  5 +----
 bridges/CADBridge.php                   |  4 ++--
 bridges/CastorusBridge.php              | 10 +++++-----
 bridges/CommonDreamsBridge.php          |  4 ++--
 bridges/CopieDoubleBridge.php           |  8 +-------
 bridges/DauphineLibereBridge.php        |  4 ++--
 bridges/DeveloppezDotComBridge.php      |  8 ++++----
 bridges/DilbertBridge.php               |  8 ++------
 bridges/ElsevierBridge.php              |  8 ++++----
 bridges/EstCeQuonMetEnProdBridge.php    |  8 ++------
 bridges/FootitoBridge.php               |  6 +-----
 bridges/GBAtempBridge.php               | 12 ++++++------
 bridges/GiphyBridge.php                 |  6 +-----
 bridges/GuruMedBridge.php               |  4 ++--
 bridges/HentaiHavenBridge.php           |  5 +----
 bridges/KoreusBridge.php                |  6 +++---
 bridges/LeJournalDuGeekBridge.php       |  6 +++---
 bridges/LesJoiesDuCodeBridge.php        |  6 +-----
 bridges/MsnMondeBridge.php              |  4 ++--
 bridges/NextInpactBridge.php            |  6 +++---
 bridges/NiceMatinBridge.php             |  4 ++--
 bridges/NovelUpdatesBridge.php          |  5 +----
 bridges/PlanetLibreBridge.php           |  4 ++--
 bridges/ReporterreBridge.php            |  4 ++--
 bridges/SensCritiqueBridge.php          | 16 ++++++++--------
 bridges/Sexactu.php                     |  7 ++-----
 bridges/ShanaprojectBridge.php          | 20 ++++++++++----------
 bridges/TheCodingLoveBridge.php         |  6 +-----
 bridges/TwitterBridgeTweaked.php        |  6 +-----
 bridges/WordPressBridge.php             | 10 +++++-----
 bridges/WorldOfTanks.php                |  7 ++-----
 34 files changed, 87 insertions(+), 145 deletions(-)

diff --git a/bridges/AllocineFRBridge.php b/bridges/AllocineFRBridge.php
index 7270b97..c54edff 100644
--- a/bridges/AllocineFRBridge.php
+++ b/bridges/AllocineFRBridge.php
@@ -10,7 +10,7 @@ class AllocineFRBridge extends BridgeAbstract{
 		$this->name = "Allo Cine : Faux Raccord";
 		$this->uri = "http://www.allocine.fr/video/programme-12284/saison-24580/";
 		$this->description = "Allo Cine : Faux Raccord";
-		$this->update = "07/11/2013";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -50,8 +50,5 @@ class AllocineFRBridge extends BridgeAbstract{
     public function getCacheDuration(){
         return 25200; // 7 hours
     }
-    public function getDescription(){
-        return "Allo Cine : " . $this->_NOM . " via rss-bridge";
-    }
 }
 ?>
diff --git a/bridges/AllocineT5Bridge.php b/bridges/AllocineT5Bridge.php
index 4c13cdf..2dd1d81 100644
--- a/bridges/AllocineT5Bridge.php
+++ b/bridges/AllocineT5Bridge.php
@@ -10,7 +10,7 @@ class AllocineT5Bridge extends BridgeAbstract{
 		$this->name = "Allo Cine : Top 5";
 		$this->uri = "http://www.allocine.fr/video/programme-12299/saison-22542/";
 		$this->description = "Allo Cine : Top 5 via rss-bridge";
-		$this->update = "07/11/2013";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -50,8 +50,5 @@ class AllocineT5Bridge extends BridgeAbstract{
     public function getCacheDuration(){
         return 25200; // 7 hours
     }
-    public function getDescription(){
-        return "Allo Cine : " . $this->_NOM . " via rss-bridge";
-    }
 }
 ?>
diff --git a/bridges/AllocineTueursEnSerieBridge.php b/bridges/AllocineTueursEnSerieBridge.php
index 6a27e61..d4330ec 100644
--- a/bridges/AllocineTueursEnSerieBridge.php
+++ b/bridges/AllocineTueursEnSerieBridge.php
@@ -10,7 +10,7 @@ class AllocineTueursEnSerieBridge extends BridgeAbstract{
 		$this->name = "Allo Cine : Tueurs En Serie";
 		$this->uri = "http://www.allocine.fr/video/programme-12286/saison-22938/";
 		$this->description = "Allo Cine : Tueurs En Serie";
-		$this->update = "12/11/2013";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -50,8 +50,5 @@ class AllocineTueursEnSerieBridge extends BridgeAbstract{
     public function getCacheDuration(){
         return 25200; // 7 hours
     }
-    public function getDescription(){
-        return "Allo Cine : " . $this->_NOM . " via rss-bridge";
-    }
 }
 ?>
diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php
index ca87242..126ca82 100644
--- a/bridges/BlaguesDeMerdeBridge.php
+++ b/bridges/BlaguesDeMerdeBridge.php
@@ -7,7 +7,7 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{
 		$this->name = "Blagues De Merde";
 		$this->uri = "http://www.blaguesdemerde.fr/";
 		$this->description = "Blagues De Merde";
-		$this->update = "16/10/2013";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -43,8 +43,5 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{
     public function getCacheDuration(){
         return 7200; // 2h hours
     }
-    public function getDescription(){
-        return "Blagues De Merde via rss-bridge";
-    }
 }
 ?>
diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php
index 90b338c..299bd10 100644
--- a/bridges/CADBridge.php
+++ b/bridges/CADBridge.php
@@ -5,10 +5,10 @@ class CADBridge extends BridgeAbstract{
 		$this->name = "CAD Bridge";
 		$this->uri = "http://www.cad-comic.com/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-02";
+		$this->update = "2016-08-06";
 	}
 
-	function CADExtractContent($url) {
+	private function CADExtractContent($url) {
 		$html3 = $this->file_get_html($url);
 
 		// The request might fail due to missing https support or wrong URL
diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
index 55ff7b7..a6ac5f4 100644
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -5,7 +5,7 @@ class CastorusBridge extends BridgeAbstract {
 		$this->name = "Castorus Bridge";
 		$this->uri = $this->getURI();
 		$this->description = "Returns the latest changes";
-		$this->update = "2016-08-05";
+		$this->update = "2016-08-06";
 
 		$this->parameters["Get latest changes"] = '[]';
 		$this->parameters["Get latest changes via ZIP code"] = 
@@ -33,7 +33,7 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	// Extracts the tile from an actitiy
-	function ExtractActivityTitle($activity){
+	private function ExtractActivityTitle($activity){
 		$title = $activity->find('a', 0);
 
 		if(!$title)
@@ -43,7 +43,7 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	// Extracts the url from an actitiy
-	function ExtractActivityUrl($activity){
+	private function ExtractActivityUrl($activity){
 		$url = $activity->find('a', 0);
 
 		if(!$url)
@@ -53,7 +53,7 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	// Extracts the time from an activity
-	function ExtractActivityTime($activity){
+	private function ExtractActivityTime($activity){
 		// Unfortunately the time is part of the parent node, 
 		// so we have to clear all child nodes first
 		$nodes = $activity->find('*');
@@ -69,7 +69,7 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	// Extracts the price change
-	function ExtractActivityPrice($activity){
+	private function ExtractActivityPrice($activity){
 		$price = $activity->find('span', 1);
 
 		if(!$price)
diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php
index cf4b589..6222661 100644
--- a/bridges/CommonDreamsBridge.php
+++ b/bridges/CommonDreamsBridge.php
@@ -6,10 +6,10 @@ class CommonDreamsBridge extends BridgeAbstract{
 		$this->name = "CommonDreams Bridge";
 		$this->uri = "http://www.commondreams.org/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-02";
+		$this->update = "2016-08-06";
 	}
 
-	function CommonDreamsExtractContent($url) {
+	private function CommonDreamsExtractContent($url) {
 		$html3 = $this->file_get_html($url);
 		$text = $html3->find('div[class=field--type-text-with-summary]', 0)->innertext;
 		$html3->clear();
diff --git a/bridges/CopieDoubleBridge.php b/bridges/CopieDoubleBridge.php
index 2030979..d629976 100644
--- a/bridges/CopieDoubleBridge.php
+++ b/bridges/CopieDoubleBridge.php
@@ -7,7 +7,7 @@ class CopieDoubleBridge extends BridgeAbstract{
 		$this->name = "CopieDouble";
 		$this->uri = "http://www.copie-double.com/";
 		$this->description = "CopieDouble";
-		$this->update = "12/12/2013";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -50,13 +50,7 @@ class CopieDoubleBridge extends BridgeAbstract{
         return 'http://www.copie-double.com';
     }
 
-    public function getDescription(){
-        return 'CopieDouble via rss-bridge';
-    }
-
     public function getCacheDuration(){
         return 14400; // 4 hours
     }
 }
-
-?>
diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index d2fd1d1..24477a7 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -7,7 +7,7 @@ class DauphineLibereBridge extends BridgeAbstract {
 		$this->name = "DauphineLibereBridge Bridge";
 		$this->uri = "http://www.ledauphine.com/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-02";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -81,7 +81,7 @@ class DauphineLibereBridge extends BridgeAbstract {
 		]';
 	}
 
-	function ExtractContent($url, $context) {
+	private function ExtractContent($url, $context) {
 		$html2 = $this->file_get_html($url, false, $context);
 		$text = $html2->find('div.column', 0)->innertext;
 		$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php
index 51dc013..66a9b2b 100644
--- a/bridges/DeveloppezDotComBridge.php
+++ b/bridges/DeveloppezDotComBridge.php
@@ -6,10 +6,10 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 		$this->name = "Developpez.com Actus (FR)";
 		$this->uri = "http://www.developpez.com/";
 		$this->description = "Returns the 15 newest posts from DeveloppezDotCom (full text).";
-		$this->update = "2016-08-03";
+		$this->update = "2016-08-06";
 	}
 
-	function DeveloppezDotComStripCDATA($string) {
+	private function DeveloppezDotComStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
 		$string = str_replace(']]>', '', $string);
 		return $string;
@@ -17,7 +17,7 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 
 	// F***ing quotes from Microsoft Word badly encoded, here was the trick: 
 	// http://stackoverflow.com/questions/1262038/how-to-replace-microsoft-encoded-quotes-in-php
-	function convert_smart_quotes($string)
+	private function convert_smart_quotes($string)
 	{
 		$search = array(chr(145),
 						chr(146),
@@ -34,7 +34,7 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 		return str_replace($search, $replace, $string);
 	}
 
-	function DeveloppezDotComExtractContent($url) {
+	private function DeveloppezDotComExtractContent($url) {
 		$articleHTMLContent = $this->file_get_html($url);
 		$text = $this->convert_smart_quotes($articleHTMLContent->find('div.content', 0)->innertext);
 		$text = utf8_encode($text);
diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php
index 3826028..f513ef9 100644
--- a/bridges/DilbertBridge.php
+++ b/bridges/DilbertBridge.php
@@ -6,8 +6,8 @@ class DilbertBridge extends BridgeAbstract {
         $this->maintainer = 'kranack';
         $this->name = $this->getName();
         $this->uri = $this->getURI();
-        $this->description = $this->getDescription();
-        $this->update = "14/05/2016";
+        $this->description = 'The Unofficial Dilbert Daily Comic Strip';
+        $this->update = "2016-08-06";
 
     }
 
@@ -46,10 +46,6 @@ class DilbertBridge extends BridgeAbstract {
         return 'http://dilbert.com';
     }
 
-    public function getDescription() {
-        return 'The Unofficial Dilbert Daily Comic Strip';
-    }
-
     public function getCacheDuration() {
         return 21600; // 6 hours
     }
diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index 4f4cd57..bd35925 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -6,7 +6,7 @@ class ElsevierBridge extends BridgeAbstract{
 		$this->name = 'Elsevier journals recent articles';
 		$this->uri = 'http://www.journals.elsevier.com';
 		$this->description = 'Returns the recent articles published in Elsevier journals';
-		$this->update = '2016-08-02';
+		$this->update = '2016-08-06';
 
 		$this->parameters[] =
 			'[
@@ -21,7 +21,7 @@ class ElsevierBridge extends BridgeAbstract{
 	}
 
 	// Extracts the list of names from an article as string
-	function ExtractArticleName ($article){
+	private function ExtractArticleName ($article){
 		$names = $article->find('small', 0);
 		if($names)
 			return trim($names->plaintext);
@@ -29,7 +29,7 @@ class ElsevierBridge extends BridgeAbstract{
 	}
 
 	// Extracts the timestamp from an article
-	function ExtractArticleTimestamp ($article){
+	private function ExtractArticleTimestamp ($article){
 		$time = $article->find('.article-info', 0);
 		if($time){
 			$timestring = trim($time->plaintext);
@@ -53,7 +53,7 @@ class ElsevierBridge extends BridgeAbstract{
 	}
 
 	// Extracts the content from an article
-	function ExtractArticleContent ($article){
+	private function ExtractArticleContent ($article){
 		$content = $article->find('.article-content', 0);
 		if($content){
 			return trim($content->plaintext);
diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php
index 7d3e652..b964ea4 100644
--- a/bridges/EstCeQuonMetEnProdBridge.php
+++ b/bridges/EstCeQuonMetEnProdBridge.php
@@ -5,8 +5,8 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
         $this->maintainer = 'ORelio';
         $this->name = $this->getName();
         $this->uri = $this->getURI();
-        $this->description = $this->getDescription();
-        $this->update = "02/07/2016";
+        $this->description = 'Should we put a website in production today? (French)';
+        $this->update = "2016-08-06";
     }
 
     public function collectData(array $param) {
@@ -45,10 +45,6 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
         return 'https://www.estcequonmetenprodaujourdhui.info/';
     }
 
-    public function getDescription() {
-        return 'Should we put a website in production today? (French)';
-    }
-
     public function getCacheDuration() {
         return 21600; // 6 hours
     }
diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php
index bc16d43..cfd1496 100644
--- a/bridges/FootitoBridge.php
+++ b/bridges/FootitoBridge.php
@@ -7,7 +7,7 @@ class FootitoBridge extends BridgeAbstract{
 		$this->name = "Footito";
 		$this->uri = "http://www.footito.fr/";
 		$this->description = "Footito";
-		$this->update = "21/11/2013";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -53,8 +53,4 @@ class FootitoBridge extends BridgeAbstract{
     public function getCacheDuration(){
         return 3600; // 1h hours
     }
-    public function getDescription(){
-        return "Footito via rss-bridge";
-    }
 }
-?>
diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php
index 69c5d09..75217b0 100644
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -9,7 +9,7 @@ class GBAtempBridge extends BridgeAbstract {
         $this->name = 'GBAtemp';
         $this->uri = $this->getURI();
         $this->description = 'GBAtemp is a user friendly underground video game community.';
-        $this->update = '2016-08-02';
+        $this->update = '2016-08-06';
 
         $this->parameters[] =
         '[
@@ -40,7 +40,7 @@ class GBAtempBridge extends BridgeAbstract {
         ]';
     }
 
-    function ExtractFromDelimiters($string, $start, $end) {
+    private 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));
@@ -48,7 +48,7 @@ class GBAtempBridge extends BridgeAbstract {
         } return false;
     }
 
-    function StripWithDelimiters($string, $start, $end) {
+    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));
@@ -56,7 +56,7 @@ class GBAtempBridge extends BridgeAbstract {
         } return $string;
     }
 
-    function build_item($uri, $title, $author, $timestamp, $thumnail, $content) {
+    private function build_item($uri, $title, $author, $timestamp, $thumnail, $content) {
         $item = new \Item();
         $item->uri = $uri;
         $item->title = $title;
@@ -67,14 +67,14 @@ class GBAtempBridge extends BridgeAbstract {
         return $item;
     }
 
-    function cleanup_post_content($content, $site_url) {
+    private function cleanup_post_content($content, $site_url) {
         $content = str_replace(':arrow:', '&#x27a4;', $content);
         $content = str_replace('href="attachments/', 'href="'.$site_url.'attachments/', $content);
         $content = $this->StripWithDelimiters($content, '<script', '</script>');
         return $content;
     }
 
-    function fetch_post_content($uri, $site_url) {
+    private function fetch_post_content($uri, $site_url) {
         $html = $this->file_get_html($uri) or $this->returnError('Could not request GBAtemp: '.$uri, 500);
         $content = $html->find('div.messageContent', 0)->innertext;
         return $this->cleanup_post_content($content, $site_url);
diff --git a/bridges/GiphyBridge.php b/bridges/GiphyBridge.php
index 8f29bad..acc01d2 100644
--- a/bridges/GiphyBridge.php
+++ b/bridges/GiphyBridge.php
@@ -9,7 +9,7 @@ class GiphyBridge extends BridgeAbstract{
 		$this->name = "Giphy Bridge";
 		$this->uri = "http://giphy.com/";
 		$this->description = "Bridge for giphy.com";
-		$this->update = "2014-12-05";
+		$this->update = "2016-08-06";
 
 		$this->parameters["By tag"] =
 		'[
@@ -92,8 +92,4 @@ class GiphyBridge extends BridgeAbstract{
 	public function getCacheDuration(){
 		return 300; // 5 minutes
 	}
-    
-	public function getUsername(){
-		return $this->items[0]->username;
-	}
 }
diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
index fcc91c4..ec94415 100644
--- a/bridges/GuruMedBridge.php
+++ b/bridges/GuruMedBridge.php
@@ -6,10 +6,10 @@ class GuruMedBridge extends BridgeAbstract{
 		$this->name = "GuruMed";
 		$this->uri = "http://www.gurumed.org";
 		$this->description = "Returns the 5 newest posts from Gurumed (full text)";
-		$this->update = "2016-08-03";
+		$this->update = "2016-08-06";
 	}
 
-	function GurumedStripCDATA($string) {
+	private function GurumedStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
 		$string = str_replace(']]>', '', $string);
 		return $string;
diff --git a/bridges/HentaiHavenBridge.php b/bridges/HentaiHavenBridge.php
index a1e938e..c5ef263 100644
--- a/bridges/HentaiHavenBridge.php
+++ b/bridges/HentaiHavenBridge.php
@@ -7,7 +7,7 @@ class HentaiHavenBridge extends BridgeAbstract{
 		$this->name = "Hentai Haven";
 		$this->uri = "http://hentaihaven.org/";
 		$this->description = "Returns releases from Hentai Haven";
-		$this->update = "2015-01-16";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -29,9 +29,6 @@ class HentaiHavenBridge extends BridgeAbstract{
     public function getURI(){
         return '';
     }
-    public function getDescription(){
-        return "Hentai Haven | Everything Else is Irrelevant";
-    }
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php
index d605af0..80bb963 100644
--- a/bridges/KoreusBridge.php
+++ b/bridges/KoreusBridge.php
@@ -6,16 +6,16 @@ class KoreusBridge extends BridgeAbstract{
 		$this->name = "Koreus";
 		$this->uri = "http://www.koreus.com/";
 		$this->description = "Returns the 5 newest posts from Koreus (full text)";
-		$this->update = "2016-08-03";
+		$this->update = "2016-08-06";
 	}
 
-	function KoreusStripCDATA($string) {
+	private function KoreusStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
 		$string = str_replace(']]>', '', $string);
 		return $string;
 	}
 
-	function KoreusExtractContent($url) {
+	private function KoreusExtractContent($url) {
 		$html2 = $this->file_get_html($url);
 		$text = $html2->find('p[class=itemText]', 0)->innertext;
 		$text = utf8_encode(preg_replace('/(Sur le m.+?)+$/i','',$text));
diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index 69f940a..0b6407b 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -6,16 +6,16 @@ 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 = "2016-08-03";
+		$this->update = "2016-08-06";
 	}
 
-	function LeJournalDuGeekStripCDATA($string) {
+	private function LeJournalDuGeekStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
 		$string = str_replace(']]>', '', $string);
 		return $string;
 	}
 
-	function LeJournalDuGeekExtractContent($url) {
+	private function LeJournalDuGeekExtractContent($url) {
 		$articleHTMLContent = $this->file_get_html($url);
 		$text = $articleHTMLContent->find('div.post-content', 0)->innertext;
 
diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php
index ddacb93..ab759dd 100644
--- a/bridges/LesJoiesDuCodeBridge.php
+++ b/bridges/LesJoiesDuCodeBridge.php
@@ -7,7 +7,7 @@ class LesJoiesDuCodeBridge extends BridgeAbstract{
 		$this->name = "Les Joies Du Code";
 		$this->uri = "http://lesjoiesducode.fr/";
 		$this->description = "LesJoiesDuCode";
-		$this->update = "04/02/2015";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -59,8 +59,4 @@ class LesJoiesDuCodeBridge extends BridgeAbstract{
     public function getCacheDuration(){
         return 7200; // 2h hours
     }
-    public function getDescription(){
-        return "Les Joies Du Code via rss-bridge";
-    }
 }
-?>
diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php
index 4b0e0ef..783f6e0 100644
--- a/bridges/MsnMondeBridge.php
+++ b/bridges/MsnMondeBridge.php
@@ -6,10 +6,10 @@ class MsnMondeBridge extends BridgeAbstract{
 		$this->name = "MSN Actu Monde";
 		$this->uri = "http://www.msn.com/fr-fr/actualite/monde";
 		$this->description = "Returns the 10 newest posts from MSN Actualités (full text)";
-		$this->update = "2016-08-03";
+		$this->update = "2016-08-06";
 	}
 
-	function MsnMondeExtractContent($url, &$item) {
+	private function MsnMondeExtractContent($url, &$item) {
 		$html2 = $this->file_get_html($url);
 		$item->content = $html2->find('#content', 0)->find('article', 0)->find('section', 0)->plaintext;
 		$item->timestamp = strtotime($html2->find('.authorinfo-txt', 0)->find('time', 0)->datetime);
diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index e4597e5..c3026bf 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -6,16 +6,16 @@ class NextInpactBridge extends BridgeAbstract {
 		$this->name = "NextInpact Bridge";
 		$this->uri = "http://www.nextinpact.com/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-03";
+		$this->update = "2016-08-06";
 	}
 
-	function StripCDATA($string) {
+	private function StripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
 		$string = str_replace(']]>', '', $string);
 		return $string;
 	}
 
-	function ExtractContent($url) {
+	private 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>'
diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php
index 407b92b..96b1921 100644
--- a/bridges/NiceMatinBridge.php
+++ b/bridges/NiceMatinBridge.php
@@ -6,10 +6,10 @@ class NiceMatinBridge extends BridgeAbstract{
 		$this->name = "NiceMatin";
 		$this->uri = "http://www.nicematin.com/";
 		$this->description = "Returns the 10 newest posts from NiceMatin (full text)";
-		$this->update = "2016-08-03";
+		$this->update = "2016-08-06";
 	}
 
-	function NiceMatinExtractContent($url) {
+	private function NiceMatinExtractContent($url) {
 		$html = $this->file_get_html($url);
 		if(!$html)
 			$this->returnError('Could not acquire content from url: ' . $url . '!', 404);
diff --git a/bridges/NovelUpdatesBridge.php b/bridges/NovelUpdatesBridge.php
index b597755..ff5cd88 100644
--- a/bridges/NovelUpdatesBridge.php
+++ b/bridges/NovelUpdatesBridge.php
@@ -7,7 +7,7 @@ class NovelUpdatesBridge extends BridgeAbstract{
 		$this->name = "Novel Updates";
 		$this->uri = "http://www.novelupdates.com/";
 		$this->description = "Returns releases from Novel Updates";
-		$this->update = "2016-05-21";
+		$this->update = "2016-08-06";
 		$this->parameters[] =
 		'[
 			{
@@ -50,9 +50,6 @@ class NovelUpdatesBridge extends BridgeAbstract{
     public function getURI(){
         return 'http://www.novelupdates.com/';
     }
-    public function getDescription(){
-        return "Novel Updates - Directory of Translated Novels";
-    }
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php
index 80a703b..cbfa023 100644
--- a/bridges/PlanetLibreBridge.php
+++ b/bridges/PlanetLibreBridge.php
@@ -6,10 +6,10 @@ class PlanetLibreBridge extends BridgeAbstract{
 		$this->name = "PlanetLibre";
 		$this->uri = "http://www.planet-libre.org";
 		$this->description = "Returns the 5 newest posts from PlanetLibre (full text)";
-		$this->update = "2016-08-04";
+		$this->update = "2016-08-06";
 	}
 
-	function PlanetLibreExtractContent($url){
+	private function PlanetLibreExtractContent($url){
 		$html2 = $this->file_get_html($url);
 		$text = $html2->find('div[class="post-text"]', 0)->innertext;
 		return $text;
diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index 1f5d021..b15c969 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -6,10 +6,10 @@ class ReporterreBridge extends BridgeAbstract{
 			$this->name = "Reporterre Bridge";
 			$this->uri = "http://www.reporterre.net/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "2016-08-04";
+			$this->update = "2016-08-06";
 		}
 
-		function ExtractContentReporterre($url) {
+		private function ExtractContentReporterre($url) {
 			$html2 = $this->file_get_html($url);
 
 			foreach($html2->find('div[style=text-align:justify]') as $e) {
diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index cfd9e1c..f4b8fc7 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -8,7 +8,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->name = "Sens Critique";
 		$this->uri = "http://www.senscritique.com";
 		$this->description = "Sens Critique news";
-		$this->update = "2016-07-29";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -63,7 +63,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		}
   }
 
-	public function collectMoviesData() {
+	private function collectMoviesData() {
 		$html = '';
     $html = $this->file_get_html('http://www.senscritique.com/films/cette-semaine') or $this->returnError('No results for this query.', 404);
 		$list = $html->find('ul.elpr-list', 0);
@@ -71,7 +71,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->extractDataFromList($list);
 	}
 
-	public function collectSeriesData() {
+	private function collectSeriesData() {
 		$html = '';
 		$html = $this->file_get_html('http://www.senscritique.com/series/actualite') or $this->returnError('No results for this query.', 404);
 		$list = $html->find('ul.elpr-list', 0);
@@ -79,7 +79,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->extractDataFromList($list);
 	}
 
-	public function collectGamesData() {
+	private function collectGamesData() {
 		$html = '';
 		$html = $this->file_get_html('http://www.senscritique.com/jeuxvideo/actualite') or $this->returnError('No results for this query.', 404);
 		$list = $html->find('ul.elpr-list', 0);
@@ -87,7 +87,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->extractDataFromList($list);
 	}
 
-	public function collectBooksData() {
+	private function collectBooksData() {
 		$html = '';
 		$html = $this->file_get_html('http://www.senscritique.com/livres/actualite') or $this->returnError('No results for this query.', 404);
 		$list = $html->find('ul.elpr-list', 0);
@@ -95,7 +95,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->extractDataFromList($list);
 	}
 
-	public function collectBDsData() {
+	private function collectBDsData() {
 		$html = '';
 		$html = $this->file_get_html('http://www.senscritique.com/bd/actualite') or $this->returnError('No results for this query.', 404);
 		$list = $html->find('ul.elpr-list', 0);
@@ -103,7 +103,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->extractDataFromList($list);
 	}
 
-	public function collectMusicsData() {
+	private function collectMusicsData() {
 		$html = '';
 		$html = $this->file_get_html('http://www.senscritique.com/musique/actualite') or $this->returnError('No results for this query.', 404);
 		$list = $html->find('ul.elpr-list', 0);
@@ -111,7 +111,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->extractDataFromList($list);
 	}
 
-	public function extractDataFromList($list) {
+	private function extractDataFromList($list) {
 		if ($list === null) {
 			$this->returnError('Cannot extract data from list', 400);
 		}
diff --git a/bridges/Sexactu.php b/bridges/Sexactu.php
index 92f4d9f..cfa97a7 100644
--- a/bridges/Sexactu.php
+++ b/bridges/Sexactu.php
@@ -8,7 +8,7 @@ class Sexactu extends BridgeAbstract{
 		$this->name = "Sexactu";
 		$this->uri = "http://www.gqmagazine.fr";
 		$this->description = "Sexactu via rss-bridge";
-		$this->update = "04/02/2014";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -69,11 +69,8 @@ $replace = array('January', 'February', 'March', 'April', 'May', 'June', 'July',
     public function getCacheDuration(){
         return 7200; // 2h hours
     }
-    public function getDescription(){
-        return "Sexactu via rss-bridge";
-    }
     
-    public function correctCase($str) {
+    private function correctCase($str) {
         $sentences=explode('.', mb_strtolower($str, "UTF-8"));
         $str="";
         $sep="";
diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php
index 64c33b6..8a7f2c1 100644
--- a/bridges/ShanaprojectBridge.php
+++ b/bridges/ShanaprojectBridge.php
@@ -5,11 +5,11 @@ class ShanaprojectBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'Returns a list of anime from the current Season Anime List';
-        $this->update = '2016-08-04';
+        $this->update = '2016-08-06';
     }
 
     // Returns an html object for the Season Anime List (latest season)
-    function LoadSeasonAnimeList(){
+    private function LoadSeasonAnimeList(){
         // First we need to find the URI to the latest season from the 'seasons' page searching for 'Season Anime List'
         $html = $this->file_get_html($this->getURI() . '/seasons');
         if(!$html) 
@@ -27,7 +27,7 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     // Extracts the anime title
-    function ExtractAnimeTitle($anime){
+    private function ExtractAnimeTitle($anime){
         $title = $anime->find('a', 0);
         if(!$title)
             $this->returnError('Could not find anime title!', 404);
@@ -35,7 +35,7 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     // Extracts the anime URI
-    function ExtractAnimeURI($anime){
+    private function ExtractAnimeURI($anime){
         $uri = $anime->find('a', 0);
         if(!$uri)
             $this->returnError('Could not find anime URI!', 404);
@@ -43,7 +43,7 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     // Extracts the anime release date (timestamp)
-    function ExtractAnimeTimestamp($anime){
+    private function ExtractAnimeTimestamp($anime){
         $timestamp = $anime->find('span.header_info_block', 1);
         if(!$timestamp)
             $this->returnError('Could not find anime timestamp!', 404);
@@ -51,7 +51,7 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     // Extracts the anime studio name (author)
-    function ExtractAnimeAuthor($anime){
+    private function ExtractAnimeAuthor($anime){
         $author = $anime->find('span.header_info_block', 2);
         if(!$author)
             return; // Sometimes the studio is unknown, so leave empty
@@ -59,7 +59,7 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     // Extracts the episode information (x of y released)
-    function ExtractAnimeEpisodeInformation($anime){
+    private function ExtractAnimeEpisodeInformation($anime){
         $episode = $anime->find('div.header_info_episode', 0);
         if(!$episode)
             $this->returnError('Could not find anime episode information!', 404);
@@ -67,7 +67,7 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     // Extracts the background image
-    function ExtractAnimeBackgroundImage($anime){
+    private function ExtractAnimeBackgroundImage($anime){
         // Getting the picture is a little bit tricky as it is part of the style.
         // Luckily the style is part of the parent div :)
 
@@ -78,12 +78,12 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     // Builds an URI to search for a specific anime (subber is left empty)
-    function BuildAnimeSearchURI($anime){
+    private function BuildAnimeSearchURI($anime){
         return $this->getURI() . '/search/?title=' . urlencode($this->ExtractAnimeTitle($anime)) . '&subber=';
     }
 
     // Builds the content string for a given anime
-    function BuildAnimeContent($anime){
+    private function BuildAnimeContent($anime){
         // We'll use a template string to place our contents
         return '<a href="' . $this->ExtractAnimeURI($anime) . '">
                     <img src="http://' . $this->ExtractAnimeBackgroundImage($anime) . '" alt="' . htmlspecialchars($this->ExtractAnimeTitle($anime)) . '" style="border: 1px solid black">
diff --git a/bridges/TheCodingLoveBridge.php b/bridges/TheCodingLoveBridge.php
index e9eef5b..b23c6ee 100644
--- a/bridges/TheCodingLoveBridge.php
+++ b/bridges/TheCodingLoveBridge.php
@@ -7,7 +7,7 @@ class TheCodingLoveBridge extends BridgeAbstract{
 		$this->name = "The Coding Love";
 		$this->uri = "http://thecodinglove.com/";
 		$this->description = "The Coding Love";
-		$this->update = "04/02/2015";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -60,8 +60,4 @@ class TheCodingLoveBridge extends BridgeAbstract{
     public function getCacheDuration(){
         return 7200; // 2h hours
     }
-    public function getDescription(){
-        return "The Coding Love via rss-bridge";
-    }
 }
-?>
diff --git a/bridges/TwitterBridgeTweaked.php b/bridges/TwitterBridgeTweaked.php
index e817ced..4f55fb9 100644
--- a/bridges/TwitterBridgeTweaked.php
+++ b/bridges/TwitterBridgeTweaked.php
@@ -7,7 +7,7 @@ class TwitterBridgeTweaked extends BridgeAbstract{
 		$this->name = "Twitter Bridge Tweaked";
 		$this->uri = "https://twitter.com/";
 		$this->description = "(same as Twitter Bridge Extended, but with cleaned title & content)";
-		$this->update = "2014-12-05";
+		$this->update = "2016-08-06";
 
 		$this->parameters["By keyword or hashtag"] =
 		'[
@@ -158,8 +158,4 @@ class TwitterBridgeTweaked extends BridgeAbstract{
 	public function getCacheDuration(){
 		return 300; // 5 minutes
 	}
-
-	public function getUsername(){
-		return $this->items[0]->username;
-	}
 }
diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 35ef3bf..69db325 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -12,7 +12,7 @@ class WordPressBridge extends BridgeAbstract {
 		$this->name = "Wordpress Bridge";
 		$this->uri = "https://wordpress.org/";
 		$this->description = "Returns the 3 newest full posts of a Wordpress blog";
-		$this->update = "2016-08-04";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -25,7 +25,7 @@ class WordPressBridge extends BridgeAbstract {
 	}
 
 	// Returns the content type for a given html dom
-	function DetectContentType($html){
+	private function DetectContentType($html){
 		if($html->find('entry'))
 			return WORDPRESS_TYPE_ATOM;
 		if($html->find('item'))
@@ -34,7 +34,7 @@ class WordPressBridge extends BridgeAbstract {
 	}
 
 	// Replaces all 'link' tags with 'url' for simplehtmldom to actually find 'links' ('url')	
-	function ReplaceLinkTagsWithUrlTags($element){
+	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);
@@ -43,13 +43,13 @@ class WordPressBridge extends BridgeAbstract {
 		return str_get_html($element_text);
 	}
 
-	function StripCDATA($string) {
+	private function StripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
 		$string = str_replace(']]>', '', $string);
 		return $string;
 	}
 
-	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);
diff --git a/bridges/WorldOfTanks.php b/bridges/WorldOfTanks.php
index 0d7967c..3a1d2b4 100644
--- a/bridges/WorldOfTanks.php
+++ b/bridges/WorldOfTanks.php
@@ -12,7 +12,7 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
 		$this->name = "World of Tanks";
 		$this->uri = "http://worldoftanks.eu/";
 		$this->description = "News about the tank slaughter game.";
-		$this->update = "2015-09-12";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -79,7 +79,7 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
        }
     }
     
-    public function parseLine($infoLink) {
+    private function parseLine($infoLink) {
         $item = new Item();
         $item->uri = WORLD_OF_TANKS.$infoLink->href;
         // now load that uri from cache
@@ -105,7 +105,4 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
     public function getCacheDuration(){
         return 3600; // 2h hours
     }
-    public function getDescription(){
-        return "Toutes les actualités les plus brulantes de ce simulateur de destruction d'acier.";
-    }
 }

From 5ad157d2fddc23e447dfb0792911f40dc28ee8a0 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 16:17:58 +0200
Subject: [PATCH 095/149] bridges: Remove getCacheDuration if default

BridgeAbstract will return 3600 seconds by default, so the function
can be removed from any bridge implementing getCacheDuration
returning the same value.

Documentation updated accordingly.
---
 CREATE_BRIDGE.md                     | 8 +++-----
 bridges/ABCTabsBridge.php            | 6 +-----
 bridges/CommonDreamsBridge.php       | 4 ----
 bridges/EZTVBridge.php               | 6 +-----
 bridges/FootitoBridge.php            | 4 ----
 bridges/FuturaSciencesBridge.php     | 6 +-----
 bridges/GitlabCommitsBridge.php      | 6 +-----
 bridges/GuruMedBridge.php            | 4 ----
 bridges/InstagramBridge.php          | 6 +-----
 bridges/KoreusBridge.php             | 4 ----
 bridges/LeBonCoinBridge.php          | 6 +-----
 bridges/MsnMondeBridge.php           | 4 ----
 bridges/NakedSecurityBridge.php      | 6 +-----
 bridges/NeuviemeArtBridge.php        | 6 +-----
 bridges/NextInpactBridge.php         | 4 ----
 bridges/NextgovBridge.php            | 6 +-----
 bridges/NiceMatinBridge.php          | 4 ----
 bridges/PinterestBridge.php          | 6 +-----
 bridges/ReporterreBridge.php         | 4 ----
 bridges/Rue89Bridge.php              | 5 +----
 bridges/ShanaprojectBridge.php       | 4 ----
 bridges/T411Bridge.php               | 7 +------
 bridges/TheHackerNewsBridge.php      | 6 +-----
 bridges/ThePirateBayBridge.php       | 6 +-----
 bridges/WeLiveSecurityBridge.php     | 6 +-----
 bridges/WorldOfTanks.php             | 4 ----
 bridges/ZDNetBridge.php              | 6 +-----
 bridges/ZoneTelechargementBridge.php | 6 +-----
 28 files changed, 20 insertions(+), 130 deletions(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index 748ab3c..707c7a3 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -169,6 +169,8 @@ This function returns the URI to the destination site of the bridge. It will be
 
 This function returns the time in **seconds** during which rss-bridge will output cached values instead of re-generating a RSS feed.
 
+**Notice:** rss-bridge will return `3600` seconds (1 hour) by default, so you only have to implement this function if you require different timing!
+
 ```PHP
 	public function getCacheDuration(){
 		return 3600; // 1 hour
@@ -214,7 +216,7 @@ $html = $this->file_get_html('your URI');
 
 # Template
 
-This is a template for a new bridge:
+This is the minimum template for a new bridge:
 
 ```PHP
 <?php
@@ -238,10 +240,6 @@ class MySiteBridge extends BridgeAbstract{
 	public function getURI(){
 		return ''; // Insert your URI here!
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
 }
 
 ```
diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php
index 591cca3..9ab3e9c 100644
--- a/bridges/ABCTabsBridge.php
+++ b/bridges/ABCTabsBridge.php
@@ -9,7 +9,7 @@ class ABCTabsBridge extends BridgeAbstract{
 		$this->name = "ABC Tabs Bridge";
 		$this->uri = "http://www.abc-tabs.com/";
 		$this->description = "Returns 22 newest tabs";
-		$this->update = "2014-07-23";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -41,8 +41,4 @@ class ABCTabsBridge extends BridgeAbstract{
 		return "http://www.abc-tabs.com/";
 
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
 }
diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php
index 6222661..54cf526 100644
--- a/bridges/CommonDreamsBridge.php
+++ b/bridges/CommonDreamsBridge.php
@@ -47,8 +47,4 @@ class CommonDreamsBridge extends BridgeAbstract{
 	public function getURI(){
 		return 'http://www.commondreams.org/';
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hours
-	}
 }
diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php
index 6266977..c171aee 100644
--- a/bridges/EZTVBridge.php
+++ b/bridges/EZTVBridge.php
@@ -7,7 +7,7 @@ class EZTVBridge extends BridgeAbstract{
 		$this->name = "EZTV";
 		$this->uri = "https://eztv.ch/";
 		$this->description = "Returns list of *recent* torrents for a specific show on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name.";
-		$this->update = "2014-01-20";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -80,8 +80,4 @@ class EZTVBridge extends BridgeAbstract{
     public function getURI(){
         return 'https://eztv.ch/';
     }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
 }
diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php
index cfd1496..a66dd82 100644
--- a/bridges/FootitoBridge.php
+++ b/bridges/FootitoBridge.php
@@ -49,8 +49,4 @@ class FootitoBridge extends BridgeAbstract{
     public function getURI(){
         return 'http://www.footito.fr/';
     }
-
-    public function getCacheDuration(){
-        return 3600; // 1h hours
-    }
 }
diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php
index f8d0398..0a37051 100644
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -7,7 +7,7 @@ class FuturaSciencesBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'Returns the newest articles.';
-        $this->update = '2016-08-03';
+        $this->update = '2016-08-06';
 
         $this->parameters[] =
         '[
@@ -226,8 +226,4 @@ class FuturaSciencesBridge extends BridgeAbstract {
     public function getURI() {
         return 'http://www.futura-sciences.com/';
     }
-
-    public function getCacheDuration() {
-        return 3600;
-    }
 }
diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php
index df04d63..030c74b 100644
--- a/bridges/GitlabCommitsBridge.php
+++ b/bridges/GitlabCommitsBridge.php
@@ -12,7 +12,7 @@ class GitlabCommitsBridge extends BridgeAbstract{
     $this->name = 'Gitlab Commits';
     $this->uri = '';
     $this->description = 'Returns the commits of a project hosted on a gitlab instance';
-    $this->update = '2016-06-19';
+    $this->update = '2016-08-06';
 
     $this->parameters[] =
       '[
@@ -87,8 +87,4 @@ class GitlabCommitsBridge extends BridgeAbstract{
   public function getURI(){
     return '';
   }
-
-  public function getCacheDuration(){
-    return 3600; // one hour
-  }
 }
diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
index ec94415..57252a0 100644
--- a/bridges/GuruMedBridge.php
+++ b/bridges/GuruMedBridge.php
@@ -39,8 +39,4 @@ class GuruMedBridge extends BridgeAbstract{
 	public function getURI(){
 		return 'http://gurumed.org/';
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
 }
diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index b39b7e0..104022b 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -9,7 +9,7 @@ class InstagramBridge extends BridgeAbstract{
 		$this->name = "Instagram Bridge";
 		$this->uri = "http://instagram.com/";
 		$this->description = "Returns the newest images";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -81,8 +81,4 @@ class InstagramBridge extends BridgeAbstract{
     public function getURI(){
         return 'http://instagram.com/';
     }
-
-    public function getCacheDuration(){
-        return 3600; 
-    }
 }
diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php
index 80bb963..830d75f 100644
--- a/bridges/KoreusBridge.php
+++ b/bridges/KoreusBridge.php
@@ -46,8 +46,4 @@ class KoreusBridge extends BridgeAbstract{
 	public function getURI(){
 		return 'http://www.koreus.com/';
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
 }
diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php
index 14ca16f..e6d0427 100755
--- a/bridges/LeBonCoinBridge.php
+++ b/bridges/LeBonCoinBridge.php
@@ -7,7 +7,7 @@ class LeBonCoinBridge extends BridgeAbstract{
 		$this->name = "LeBonCoin";
 		$this->uri = "http://www.leboncoin.fr";
 		$this->description = "Returns most recent results from LeBonCoin for a region, and optionally a category and a keyword .";
-		$this->update = "2016-05-02";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
             '[
@@ -283,8 +283,4 @@ class LeBonCoinBridge extends BridgeAbstract{
 	public function getURI(){
 		return 'http://www.leboncoin.fr';
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
 }
\ No newline at end of file
diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php
index 783f6e0..4b833c9 100644
--- a/bridges/MsnMondeBridge.php
+++ b/bridges/MsnMondeBridge.php
@@ -37,8 +37,4 @@ class MsnMondeBridge extends BridgeAbstract{
 	public function getURI(){
 		return 'http://www.msn.com/fr-fr/actualite/monde';
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
 }
diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php
index b785764..355cbbc 100644
--- a/bridges/NakedSecurityBridge.php
+++ b/bridges/NakedSecurityBridge.php
@@ -6,7 +6,7 @@ class NakedSecurityBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'Returns the newest articles.';
-        $this->update = '2016-04-30';
+        $this->update = '2016-08-06';
     }
 
     public function collectData(array $param) {
@@ -77,8 +77,4 @@ class NakedSecurityBridge extends BridgeAbstract {
     public function getURI() {
         return 'https://nakedsecurity.sophos.com/';
     }
-
-    public function getCacheDuration() {
-        return 3600; //1 hour
-    }
 }
\ No newline at end of file
diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php
index 07b85a9..5ee207a 100644
--- a/bridges/NeuviemeArtBridge.php
+++ b/bridges/NeuviemeArtBridge.php
@@ -6,7 +6,7 @@ class NeuviemeArtBridge extends BridgeAbstract {
         $this->name = "9ème Art";
         $this->uri = "http://www.9emeart.fr/";
         $this->description = "Returns the newest articles.";
-        $this->update = "2016-02-05";
+        $this->update = "2016-08-06";
     }
 
     public function collectData(array $param) {
@@ -63,8 +63,4 @@ class NeuviemeArtBridge extends BridgeAbstract {
     public function getURI() {
         return 'http://www.9emeart.fr/';
     }
-
-    public function getCacheDuration() {
-        return 3600; //1 hour
-    }
 }
\ No newline at end of file
diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index c3026bf..ee89ab1 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -52,8 +52,4 @@ class NextInpactBridge extends BridgeAbstract {
 	public function getURI() {
 		return 'http://www.nextinpact.com/';
 	}
-
-	public function getCacheDuration() {
-		return 3600; // 1 hour
-	}
 }
diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
index eac7aa1..7fdde73 100644
--- a/bridges/NextgovBridge.php
+++ b/bridges/NextgovBridge.php
@@ -7,7 +7,7 @@ class NextgovBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.';
-        $this->update = '2016-07-20';
+        $this->update = '2016-08-06';
 
         $this->parameters[] =
         '[
@@ -103,8 +103,4 @@ class NextgovBridge extends BridgeAbstract {
     public function getURI() {
         return 'https://www.nextgov.com/';
     }
-
-    public function getCacheDuration() {
-        return 3600; //1 hour
-    }
 }
\ No newline at end of file
diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php
index 96b1921..aa41822 100644
--- a/bridges/NiceMatinBridge.php
+++ b/bridges/NiceMatinBridge.php
@@ -53,8 +53,4 @@ class NiceMatinBridge extends BridgeAbstract{
 	public function getURI(){
 		return 'http://www.nicematin.com/';
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
 }
diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php
index 7b05511..f6c0e33 100644
--- a/bridges/PinterestBridge.php
+++ b/bridges/PinterestBridge.php
@@ -11,7 +11,7 @@ class PinterestBridge extends BridgeAbstract{
 		$this->name = "Pinterest Bridge";
 		$this->uri = "http://www.pinterest.com/";
 		$this->description = "Returns the newest images on a board";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-06";
 
 		$this->parameters["By username and board"] =
 		'[
@@ -114,8 +114,4 @@ class PinterestBridge extends BridgeAbstract{
     public function getURI(){
         return 'http://www.pinterest.com';
     }
-
-    public function getCacheDuration(){
-        return 3600; 
-    }
 }
diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index b15c969..702f13d 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -50,8 +50,4 @@ class ReporterreBridge extends BridgeAbstract{
 	public function getURI(){
 		return 'http://www.reporterre.net/';
 	}
-
-	public function getCacheDuration(){
-		return 3600; // 1 hours
-	}
 }
diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php
index 92bd9e9..2a2b8f1 100644
--- a/bridges/Rue89Bridge.php
+++ b/bridges/Rue89Bridge.php
@@ -7,7 +7,7 @@ class Rue89Bridge extends BridgeAbstract{
 		$this->name = "Rue89";
 		$this->uri = "http://rue89.nouvelobs.com/";
 		$this->description = "Returns the 5 newest posts from Rue89 (full text)";
-		$this->update = "2015-01-30";
+		$this->update = "2016-08-06";
 
 	}
 
@@ -50,7 +50,4 @@ class Rue89Bridge extends BridgeAbstract{
     public function getURI(){
         return 'http://rue89.nouvelobs.com/';
     }
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
 }
diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php
index 8a7f2c1..59106a5 100644
--- a/bridges/ShanaprojectBridge.php
+++ b/bridges/ShanaprojectBridge.php
@@ -117,8 +117,4 @@ class ShanaprojectBridge extends BridgeAbstract {
     public function getURI(){
         return 'http://www.shanaproject.com';
     }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
 }
diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php
index 9d9ff24..76d7f4a 100644
--- a/bridges/T411Bridge.php
+++ b/bridges/T411Bridge.php
@@ -7,7 +7,7 @@ class T411Bridge extends BridgeAbstract {
         $this->name = 'T411';
         $this->uri = $this->getURI();
         $this->description = 'Returns the 10 newest torrents with specified search terms <br /> Use url part after "?" mark when using their search engine.';
-        $this->update = '2016-06-25';
+        $this->update = '2016-08-06';
 
         $this->parameters[] =
         '[
@@ -102,10 +102,5 @@ class T411Bridge extends BridgeAbstract {
     public function getURI() {
         return 'https://t411.ch/';
     }
-
-    public function getCacheDuration() {
-        return 3600; // 1 hour
-    }
-
 }
 
diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php
index 4081b93..e09432c 100644
--- a/bridges/TheHackerNewsBridge.php
+++ b/bridges/TheHackerNewsBridge.php
@@ -7,7 +7,7 @@ class TheHackerNewsBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'Cyber Security, Hacking, Technology News.';
-        $this->update = '2016-07-22';
+        $this->update = '2016-08-06';
 
     }
 
@@ -83,8 +83,4 @@ class TheHackerNewsBridge extends BridgeAbstract {
     public function getURI() {
         return 'https://thehackernews.com/';
     }
-
-    public function getCacheDuration() {
-        return 3600; //1 hour
-    }
 }
\ No newline at end of file
diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php
index 6f6d318..c8b8b68 100644
--- a/bridges/ThePirateBayBridge.php
+++ b/bridges/ThePirateBayBridge.php
@@ -7,7 +7,7 @@ class ThePirateBayBridge extends BridgeAbstract{
 		$this->name = "The Pirate Bay";
 		$this->uri = "https://thepiratebay.org/";
 		$this->description = "Returns results for the keywords. You can put several list of keywords by separating them with a semicolon (e.g. \"one show;another show\")";
-		$this->update = "2015-01-09";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -88,8 +88,4 @@ class ThePirateBayBridge extends BridgeAbstract{
     public function getURI(){
         return 'https://thepiratebay.org/';
     }
-
-    public function getCacheDuration(){
-        return 3600; // 1 hour
-    }
 }
diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php
index cdb04bd..97cd58a 100644
--- a/bridges/WeLiveSecurityBridge.php
+++ b/bridges/WeLiveSecurityBridge.php
@@ -6,7 +6,7 @@ class WeLiveSecurityBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'Returns the newest articles.';
-        $this->update = '2016-07-19';
+        $this->update = '2016-08-06';
     }
 
     public function collectData(array $param) {
@@ -68,8 +68,4 @@ class WeLiveSecurityBridge extends BridgeAbstract {
     public function getURI() {
         return 'http://www.welivesecurity.com/';
     }
-
-    public function getCacheDuration() {
-        return 3600; //1 hour
-    }
 }
\ No newline at end of file
diff --git a/bridges/WorldOfTanks.php b/bridges/WorldOfTanks.php
index 3a1d2b4..8912358 100644
--- a/bridges/WorldOfTanks.php
+++ b/bridges/WorldOfTanks.php
@@ -101,8 +101,4 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
     public function getURI(){
         return $this->uri;
     }
-
-    public function getCacheDuration(){
-        return 3600; // 2h hours
-    }
 }
diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 79924aa..92ac649 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -7,7 +7,7 @@ class ZDNetBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
-        $this->update = '2016-07-20';
+        $this->update = '2016-08-06';
 
         $this->parameters[] =
         // http://www.zdnet.com/zdnet.opml
@@ -310,8 +310,4 @@ class ZDNetBridge extends BridgeAbstract {
     public function getURI() {
         return 'http://www.zdnet.com/';
     }
-
-    public function getCacheDuration() {
-        return 3600; //1 hour
-    }
 }
diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php
index 07c29b7..d416dff 100644
--- a/bridges/ZoneTelechargementBridge.php
+++ b/bridges/ZoneTelechargementBridge.php
@@ -7,7 +7,7 @@ class ZoneTelechargementBridge extends BridgeAbstract {
         $this->name = $this->getName();
         $this->uri = $this->getURI();
         $this->description = 'RSS proxy returning the newest releases.<br />You may specify a category found in RSS URLs, else main feed is selected.';
-        $this->update = "2016-03-16";
+        $this->update = "2016-08-06";
 
         $this->parameters[] =
         '[
@@ -51,8 +51,4 @@ class ZoneTelechargementBridge extends BridgeAbstract {
     public function getURI() {
         return 'https://www.zone-telechargement.com/';
     }
-
-    public function getCacheDuration() {
-        return 3600;
-    }
 }

From 5432cabef5a79db8b8a1b913563bf1db5ffbb0bd Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 17:55:29 +0200
Subject: [PATCH 096/149] bridges: Put name/uri directly in bridge metadata

Some bridges used getName() and getURI() to put information into the
metadatas. Instead the metadatas should be initialized with data and
(not yet done) returned by default via getName() and getURI().
---
 bridges/DilbertBridge.php            |  8 ++++----
 bridges/EstCeQuonMetEnProdBridge.php |  8 ++++----
 bridges/FuturaSciencesBridge.php     |  8 ++++----
 bridges/LichessBridge.php            | 10 +++++-----
 bridges/NakedSecurityBridge.php      |  8 ++++----
 bridges/NextgovBridge.php            |  8 ++++----
 bridges/ShanaprojectBridge.php       |  8 ++++----
 bridges/TheHackerNewsBridge.php      |  8 ++++----
 bridges/WeLiveSecurityBridge.php     |  8 ++++----
 bridges/ZDNetBridge.php              |  8 ++++----
 bridges/ZoneTelechargementBridge.php |  8 ++++----
 11 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php
index f513ef9..c1a21ce 100644
--- a/bridges/DilbertBridge.php
+++ b/bridges/DilbertBridge.php
@@ -4,8 +4,8 @@ class DilbertBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'kranack';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Dilbert Daily Strip';
+        $this->uri = 'http://dilbert.com';
         $this->description = 'The Unofficial Dilbert Daily Comic Strip';
         $this->update = "2016-08-06";
 
@@ -39,11 +39,11 @@ class DilbertBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Dilbert Daily Strip';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'http://dilbert.com';
+        return $this->uri;
     }
 
     public function getCacheDuration() {
diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php
index b964ea4..7ca7ebb 100644
--- a/bridges/EstCeQuonMetEnProdBridge.php
+++ b/bridges/EstCeQuonMetEnProdBridge.php
@@ -3,8 +3,8 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
 
     public function loadMetadatas() {
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Est-ce qu\'on met en prod aujourd\'hui ?';
+        $this->uri = 'https://www.estcequonmetenprodaujourdhui.info/';
         $this->description = 'Should we put a website in production today? (French)';
         $this->update = "2016-08-06";
     }
@@ -38,11 +38,11 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Est-ce qu\'on met en prod aujourd\'hui ?';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://www.estcequonmetenprodaujourdhui.info/';
+        return $this->uri;
     }
 
     public function getCacheDuration() {
diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php
index 0a37051..738b7f5 100644
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -4,8 +4,8 @@ class FuturaSciencesBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Futura-Sciences Bridge';
+        $this->uri = 'http://www.futura-sciences.com/';
         $this->description = 'Returns the newest articles.';
         $this->update = '2016-08-06';
 
@@ -220,10 +220,10 @@ class FuturaSciencesBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Futura-Sciences Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'http://www.futura-sciences.com/';
+        return $this->uri;
     }
 }
diff --git a/bridges/LichessBridge.php b/bridges/LichessBridge.php
index 88aab12..9ed1f75 100644
--- a/bridges/LichessBridge.php
+++ b/bridges/LichessBridge.php
@@ -5,10 +5,10 @@ class LichessBridge  extends BridgeAbstract
     public function loadMetadatas()
     {
         $this->maintainer = 'AmauryCarrade';
-        $this->name = $this->getName() . ' Bridge';
-        $this->uri = $this->getURI();
+        $this->name = 'Lichess Blog';
+        $this->uri = 'http://lichess.org/blog';
         $this->description = 'Returns the 5 newest posts from the Lichess blog (full text)';
-        $this->update = "2016-03-22";
+        $this->update = "2016-08-06";
     }
 
     public function collectData(array $param)
@@ -51,11 +51,11 @@ class LichessBridge  extends BridgeAbstract
 
     public function getName()
     {
-        return 'Lichess Blog';
+        return $this->name;
     }
 
     public function getURI()
     {
-        return 'http://lichess.org/blog';
+        return $this->uri;
     }
 }
diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php
index 355cbbc..99bfb1e 100644
--- a/bridges/NakedSecurityBridge.php
+++ b/bridges/NakedSecurityBridge.php
@@ -3,8 +3,8 @@ class NakedSecurityBridge extends BridgeAbstract {
 
     public function loadMetadatas() {
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Naked Security';
+        $this->uri = 'https://nakedsecurity.sophos.com/';
         $this->description = 'Returns the newest articles.';
         $this->update = '2016-08-06';
     }
@@ -71,10 +71,10 @@ class NakedSecurityBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Naked Security';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://nakedsecurity.sophos.com/';
+        return $this->uri;
     }
 }
\ No newline at end of file
diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
index 7fdde73..1ef1938 100644
--- a/bridges/NextgovBridge.php
+++ b/bridges/NextgovBridge.php
@@ -4,8 +4,8 @@ class NextgovBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Nextgov Bridge';
+        $this->uri = 'https://www.nextgov.com/';
         $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.';
         $this->update = '2016-08-06';
 
@@ -97,10 +97,10 @@ class NextgovBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Nextgov Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://www.nextgov.com/';
+        return $this->uri;
     }
 }
\ No newline at end of file
diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php
index 59106a5..dd4e61d 100644
--- a/bridges/ShanaprojectBridge.php
+++ b/bridges/ShanaprojectBridge.php
@@ -2,8 +2,8 @@
 class ShanaprojectBridge extends BridgeAbstract {
     public function loadMetadatas() {
         $this->maintainer = 'logmanoriginal';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Shanaproject Bridge';
+        $this->uri = 'http://www.shanaproject.com';
         $this->description = 'Returns a list of anime from the current Season Anime List';
         $this->update = '2016-08-06';
     }
@@ -111,10 +111,10 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     public function getName(){
-        return 'Shanaproject Bridge';
+        return $this->name;
     }
 
     public function getURI(){
-        return 'http://www.shanaproject.com';
+        return $this->uri;
     }
 }
diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php
index e09432c..5b06a6c 100644
--- a/bridges/TheHackerNewsBridge.php
+++ b/bridges/TheHackerNewsBridge.php
@@ -4,8 +4,8 @@ class TheHackerNewsBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'The Hacker News Bridge';
+        $this->uri = 'https://thehackernews.com/';
         $this->description = 'Cyber Security, Hacking, Technology News.';
         $this->update = '2016-08-06';
 
@@ -77,10 +77,10 @@ class TheHackerNewsBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'The Hacker News Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://thehackernews.com/';
+        return $this->uri;
     }
 }
\ No newline at end of file
diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php
index 97cd58a..1a2b73d 100644
--- a/bridges/WeLiveSecurityBridge.php
+++ b/bridges/WeLiveSecurityBridge.php
@@ -3,8 +3,8 @@ class WeLiveSecurityBridge extends BridgeAbstract {
 
     public function loadMetadatas() {
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'We Live Security';
+        $this->uri = 'http://www.welivesecurity.com/';
         $this->description = 'Returns the newest articles.';
         $this->update = '2016-08-06';
     }
@@ -62,10 +62,10 @@ class WeLiveSecurityBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'We Live Security';
+        return $this-name;
     }
 
     public function getURI() {
-        return 'http://www.welivesecurity.com/';
+        return $this->uri;
     }
 }
\ No newline at end of file
diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 92ac649..6f066fb 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -4,8 +4,8 @@ class ZDNetBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'ZDNet Bridge';
+        $this->uri = 'http://www.zdnet.com/';
         $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
         $this->update = '2016-08-06';
 
@@ -304,10 +304,10 @@ class ZDNetBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'ZDNet Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'http://www.zdnet.com/';
+        return $this->uri;
     }
 }
diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php
index d416dff..01da87d 100644
--- a/bridges/ZoneTelechargementBridge.php
+++ b/bridges/ZoneTelechargementBridge.php
@@ -4,8 +4,8 @@ class ZoneTelechargementBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Zone Telechargement Bridge';
+        $this->uri = 'https://www.zone-telechargement.com/';
         $this->description = 'RSS proxy returning the newest releases.<br />You may specify a category found in RSS URLs, else main feed is selected.';
         $this->update = "2016-08-06";
 
@@ -45,10 +45,10 @@ class ZoneTelechargementBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Zone Telechargement Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://www.zone-telechargement.com/';
+        return $this->uri;
     }
 }

From b59915f23be10188fa5af9b7d1977c3606a1f67d Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 18:21:43 +0200
Subject: [PATCH 097/149] [lib/Bridge] Define default behavior for getName()
 and getURI()

Bridges no longer require implementation for getName() and getURI()
as they are now implemented with default behavior in BridgeAbstract.

This was previously implemented only for RSSExpander and is now part
of BridgeAbstract (automatically inherited).

Documentation is updated accordingly.
---
 CREATE_BRIDGE.md | 24 ++++++++++--------------
 lib/Bridge.php   | 23 ++++++++++++++---------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index 707c7a3..420248b 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -9,8 +9,8 @@ Read the following chapters an make sure to read the [Guidelines](#guidelines)!
 
 A rss bridge must extend the `BridgeAbstract` class and implement the following functions :
 
-* [`loadMetadatas`](#the-loadmetadatas-function)
-* [`collectData`](#the-collectdata-function)
+* [`loadMetadatas`](#the-loadmetadatas-function) (**required**)
+* [`collectData`](#the-collectdata-function) (**required**)
 * [`getName`](#the-getname-function)
 * [`getURI`](#the-geturi-function)
 * [`getCacheDuration`](#the-getcacheduration-function)
@@ -149,9 +149,11 @@ Parameter | ATOM | HTML | (M)RSS
 
 This function returns the name of the bridge as it will be displayed on the main page of rss-bridge or on top of the feed output (HTML, ATOM, etc...).
 
+**Notice:** rss-bridge will by default return `$this->name` which is defined in the [`loadMetadatas`](#the-loadmetadatas-function) function, so you only have to implement this function if you require different behavior!
+
 ```PHP
 	public function getName(){
-		return ''; // Insert your bridge name here!
+		return $this->name;
 	}
 ```
 
@@ -159,9 +161,11 @@ This function returns the name of the bridge as it will be displayed on the main
 
 This function returns the URI to the destination site of the bridge. It will be used on the main page of rss-bridge when clicking your bridge name.
 
+**Notice:** rss-bridge will by default return `$this->uri` which is defined in the [`loadMetadatas`](#the-loadmetadatas-function) function, so you only have to implement this function if you require different behavior!
+
 ```PHP
 	public function getURI(){
-		return ''; // Insert your URI here!
+		return $this-uri;
 	}
 ```
 
@@ -223,8 +227,8 @@ This is the minimum template for a new bridge:
 class MySiteBridge extends BridgeAbstract{
 	public function loadMetadatas(){
 		$this->maintainer = 'No maintainer';
-		$this->name = $this->getName();
-		$this->uri = $this->getURI();
+		$this->name = 'Unnamed bridge';
+		$this->uri = '';
 		$this->description = 'No description provided';
 		$this->parameters = array();
 	}
@@ -232,14 +236,6 @@ class MySiteBridge extends BridgeAbstract{
 	public function collectData(array $params){
 		// Implement your bridge here!
 	}
-
-	public function getName(){
-		return ''; // Insert your bridge name here!
-	}
-
-	public function getURI(){
-		return ''; // Insert your URI here!
-	}
 }
 
 ```
diff --git a/lib/Bridge.php b/lib/Bridge.php
index de9d022..4de1b4b 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -74,6 +74,20 @@ abstract class BridgeAbstract implements BridgeInterface{
         }
     }
 
+    /**
+    * Define default bridge name
+    */ 
+    public function getName(){
+        return $this->name;
+    }
+
+    /**
+    * Define default bridge URI
+    */
+    public function getURI(){
+        return $this->uri;
+    }
+
     /**
     * Define default duraction for cache
     */
@@ -365,15 +379,6 @@ abstract class RssExpander extends HttpCachingBridgeAbstract{
      */
     abstract protected function parseRSSItem($item);
 
-
-    public function getName(){
-        return $this->name;
-    }
-
-    public function getURI(){
-        return $this->uri;
-    }
-
     public function getDescription() {
         return $this->description;
     }

From a1257126bc366c97cbdd3903a88cc9f2d5f8a1fa Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 18:38:42 +0200
Subject: [PATCH 098/149] [index] Make sure metadata is loaded before
 requesting data

loadMetadatas must be executed before setDatas to load all
metadatas before using them in collectData (called by setDatas)
---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 57cb12f..ec74915 100644
--- a/index.php
+++ b/index.php
@@ -113,8 +113,8 @@ try{
                     } else {
                         $bridge->setCache($cache); // just add disable cache to your query to disable caching
                     }
-                    $bridge->setDatas($_REQUEST);
 					$bridge->loadMetadatas();
+                    $bridge->setDatas($_REQUEST);
                     // Data transformation
                     try {
 		                $format = Format::create($format);

From 0ddf664d898f785973653a54f8ec41b6018a3dd2 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 18:40:36 +0200
Subject: [PATCH 099/149] bridges: Remove obsolete getName() and getURI()

---
 bridges/CNETBridge.php               |  7 +------
 bridges/CpasbienBridge.php           |  6 +-----
 bridges/DilbertBridge.php            |  8 --------
 bridges/EstCeQuonMetEnProdBridge.php |  8 --------
 bridges/FacebookBridge.php           |  6 +-----
 bridges/FuturaSciencesBridge.php     |  8 --------
 bridges/LichessBridge.php            | 10 ----------
 bridges/NakedSecurityBridge.php      |  8 --------
 bridges/NextgovBridge.php            |  8 --------
 bridges/PinterestBridge.php          |  6 +-----
 bridges/SensCritiqueBridge.php       |  4 ----
 bridges/ShanaprojectBridge.php       |  8 --------
 bridges/SoundcloudBridge.php         |  6 +-----
 bridges/TheHackerNewsBridge.php      |  8 --------
 bridges/VkBridge.php                 |  6 +-----
 bridges/WeLiveSecurityBridge.php     |  8 --------
 bridges/WhydBridge.php               |  6 +-----
 bridges/WorldOfTanks.php             |  8 --------
 bridges/ZDNetBridge.php              |  8 --------
 bridges/ZoneTelechargementBridge.php |  8 --------
 20 files changed, 7 insertions(+), 138 deletions(-)

diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php
index ea0898a..5b0a8d5 100644
--- a/bridges/CNETBridge.php
+++ b/bridges/CNETBridge.php
@@ -9,7 +9,7 @@ class CNETBridge extends BridgeAbstract {
         $this->name = 'CNET News';
         $this->uri = 'http://www.cnet.com/';
         $this->description = 'Returns the newest articles. <br /> You may specify a topic found in some section URLs, else all topics are selected.';
-        $this->update = '2016-03-16';
+        $this->update = '2016-08-06';
 
         $this->parameters[] =
         '[
@@ -96,12 +96,7 @@ class CNETBridge extends BridgeAbstract {
         return 'CNET News Bridge'.(empty($this->topicName) ? '' : ' - '.$this->topicName);
     }
 
-    public function getURI() {
-        return 'http://www.cnet.com/';
-    }
-
     public function getCacheDuration() {
         return 1800; // 30 minutes
-        // return 0;
     }
 }
diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php
index 1f67cf3..93649e6 100644
--- a/bridges/CpasbienBridge.php
+++ b/bridges/CpasbienBridge.php
@@ -24,7 +24,7 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
 		$this->name = "Cpasbien Bridge";
 		$this->uri = "http://www.cpasbien.io";
 		$this->description = "Returns latest torrents from a request query";
-		$this->update = "2016-01-26";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -83,10 +83,6 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
         return (!empty($this->request) ? $this->request .' - ' : '') . $this->name;
     }
 
-    public function getURI(){
-        return $this->uri;
-    }
-
     public function getCacheDuration(){
         return 60*60*24; // 24 hours
     }
diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php
index c1a21ce..e4f2c9c 100644
--- a/bridges/DilbertBridge.php
+++ b/bridges/DilbertBridge.php
@@ -38,14 +38,6 @@ class DilbertBridge extends BridgeAbstract {
         }
     }
 
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
-
     public function getCacheDuration() {
         return 21600; // 6 hours
     }
diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php
index 7ca7ebb..5e5d8b4 100644
--- a/bridges/EstCeQuonMetEnProdBridge.php
+++ b/bridges/EstCeQuonMetEnProdBridge.php
@@ -37,14 +37,6 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
         $this->items[] = $item;
     }
 
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
-
     public function getCacheDuration() {
         return 21600; // 6 hours
     }
diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php
index 103494f..f1c9406 100644
--- a/bridges/FacebookBridge.php
+++ b/bridges/FacebookBridge.php
@@ -7,7 +7,7 @@ class FacebookBridge extends BridgeAbstract{
 		$this->name = "Facebook";
 		$this->uri = "http://www.facebook.com/";
 		$this->description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117";
-		$this->update = "31/03/2016";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -226,10 +226,6 @@ class FacebookBridge extends BridgeAbstract{
 		return (isset($this->name) ? $this->name.' - ' : '').'Facebook Bridge';
 	}
 
-	public function getURI() {
-		return 'http://facebook.com';
-	}
-
 	public function getCacheDuration() {
 		return 300; // 5 minutes
 	}
diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php
index 738b7f5..f22c610 100644
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -218,12 +218,4 @@ class FuturaSciencesBridge extends BridgeAbstract {
         }
 
     }
-
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
 }
diff --git a/bridges/LichessBridge.php b/bridges/LichessBridge.php
index 9ed1f75..8b49867 100644
--- a/bridges/LichessBridge.php
+++ b/bridges/LichessBridge.php
@@ -48,14 +48,4 @@ class LichessBridge  extends BridgeAbstract
 
         return $content;
     }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getURI()
-    {
-        return $this->uri;
-    }
 }
diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php
index 99bfb1e..fc3d73a 100644
--- a/bridges/NakedSecurityBridge.php
+++ b/bridges/NakedSecurityBridge.php
@@ -69,12 +69,4 @@ class NakedSecurityBridge extends BridgeAbstract {
             }
         }
     }
-
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
 }
\ No newline at end of file
diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
index 1ef1938..35ca1fc 100644
--- a/bridges/NextgovBridge.php
+++ b/bridges/NextgovBridge.php
@@ -95,12 +95,4 @@ class NextgovBridge extends BridgeAbstract {
         }
 
     }
-
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
 }
\ No newline at end of file
diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php
index f6c0e33..1a353b1 100644
--- a/bridges/PinterestBridge.php
+++ b/bridges/PinterestBridge.php
@@ -9,7 +9,7 @@ class PinterestBridge extends BridgeAbstract{
 
 		$this->maintainer = "pauder";
 		$this->name = "Pinterest Bridge";
-		$this->uri = "http://www.pinterest.com/";
+		$this->uri = "http://www.pinterest.com";
 		$this->description = "Returns the newest images on a board";
 		$this->update = "2016-08-06";
 
@@ -110,8 +110,4 @@ class PinterestBridge extends BridgeAbstract{
         	return $this->username .' - '. $this->board.' - Pinterest';
     	}
     }
-
-    public function getURI(){
-        return 'http://www.pinterest.com';
-    }
 }
diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index f4b8fc7..f471602 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -131,10 +131,6 @@ class SensCritiqueBridge extends BridgeAbstract {
 		}
 	}
 
-	public function getName() {
-		return $this->name;
-	}
-
 	public function getURI() {
 		return (trim($this->uri) === "") ? "http://www.senscritique.com" : $this->uri;
 	}
diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php
index dd4e61d..7d340ce 100644
--- a/bridges/ShanaprojectBridge.php
+++ b/bridges/ShanaprojectBridge.php
@@ -109,12 +109,4 @@ class ShanaprojectBridge extends BridgeAbstract {
             $this->items[] = $item;
         }
     }
-
-    public function getName(){
-        return $this->name;
-    }
-
-    public function getURI(){
-        return $this->uri;
-    }
 }
diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php
index 43e1736..ebc3f8e 100644
--- a/bridges/SoundcloudBridge.php
+++ b/bridges/SoundcloudBridge.php
@@ -10,7 +10,7 @@ class SoundCloudBridge extends BridgeAbstract{
 		$this->name = "Soundcloud Bridge";
 		$this->uri = "http://www.soundcloud.com/";
 		$this->description = "Returns 10 newest music from user profile";
-		$this->update = "2015-09-08";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -53,10 +53,6 @@ class SoundCloudBridge extends BridgeAbstract{
 		return (!empty($this->name) ? $this->name .' - ' : '') . (!empty($this->request) ? $this->request : '');
 	}
 
-	public function getURI(){
-		return 'https://www.soundcloud.com/';
-	}
-
 	public function getCacheDuration(){
 		return 600; // 10 minutes
 	}
diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php
index 5b06a6c..2fb6a1a 100644
--- a/bridges/TheHackerNewsBridge.php
+++ b/bridges/TheHackerNewsBridge.php
@@ -75,12 +75,4 @@ class TheHackerNewsBridge extends BridgeAbstract {
         }
 
     }
-
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
 }
\ No newline at end of file
diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php
index abaf423..7f5b4ff 100644
--- a/bridges/VkBridge.php
+++ b/bridges/VkBridge.php
@@ -9,7 +9,7 @@ class VkBridge extends BridgeAbstract {
         $this->name = "VK.com";
         $this->uri = "http://www.vk.com/";
         $this->description = "Working with open pages";
-        $this->update = "21/02/2016";
+        $this->update = "2016-08-06";
         $this->parameters["Url on page group or user"] = '[
 			{
 				"name" : "Url",
@@ -53,10 +53,6 @@ class VkBridge extends BridgeAbstract {
         return(isset($this->name) ? $this->name . ' - ' : '') . 'VK Bridge';
     }
 
-    public function getURI() {
-        return 'http://vk.com';
-    }
-
     public function getCacheDuration() {
         return 300; // 5 minutes
     }
diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php
index 1a2b73d..4fd23ea 100644
--- a/bridges/WeLiveSecurityBridge.php
+++ b/bridges/WeLiveSecurityBridge.php
@@ -60,12 +60,4 @@ class WeLiveSecurityBridge extends BridgeAbstract {
             }
         }
     }
-
-    public function getName() {
-        return $this-name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
 }
\ No newline at end of file
diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php
index 2b9e1dd..25ab15f 100644
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@@ -10,7 +10,7 @@ class WhydBridge extends BridgeAbstract{
 		$this->name = "Whyd Bridge";
 		$this->uri = "http://www.whyd.com/";
 		$this->description = "Returns 10 newest music from user profile";
-		$this->update = "2014-07-18";
+		$this->update = "2016-08-06";
 
 		$this->parameters[] =
 		'[
@@ -60,10 +60,6 @@ class WhydBridge extends BridgeAbstract{
 		return (!empty($this->name) ? $this->name .' - ' : '') .'Whyd Bridge';
 	}
 
-	public function getURI(){
-		return 'http://www.whyd.com/';
-	}
-
 	public function getCacheDuration(){
 		return 600; // 10 minutes
 	}
diff --git a/bridges/WorldOfTanks.php b/bridges/WorldOfTanks.php
index 8912358..ae51a0e 100644
--- a/bridges/WorldOfTanks.php
+++ b/bridges/WorldOfTanks.php
@@ -93,12 +93,4 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
         $item->timestamp = $content->find('.b-statistic_time', 0)->getAttribute("data-timestamp");
         $this->items[] = $item;
     }
-
-    public function getName(){
-        return $this->name;
-    }
-
-    public function getURI(){
-        return $this->uri;
-    }
 }
diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 6f066fb..1b2b4df 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -302,12 +302,4 @@ class ZDNetBridge extends BridgeAbstract {
         }
 
     }
-
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
 }
diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php
index 01da87d..2d0c6b6 100644
--- a/bridges/ZoneTelechargementBridge.php
+++ b/bridges/ZoneTelechargementBridge.php
@@ -43,12 +43,4 @@ class ZoneTelechargementBridge extends BridgeAbstract {
             $limit++;
         }
     }
-
-    public function getName() {
-        return $this->name;
-    }
-
-    public function getURI() {
-        return $this->uri;
-    }
 }

From 62c77384eca64da6f8202551717577e5e06af832 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 18:54:36 +0200
Subject: [PATCH 100/149] [CREATE_BRIDGE] Fix typos

---
 CREATE_BRIDGE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index 420248b..efe4286 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -165,7 +165,7 @@ This function returns the URI to the destination site of the bridge. It will be
 
 ```PHP
 	public function getURI(){
-		return $this-uri;
+		return $this->uri;
 	}
 ```
 
@@ -202,7 +202,7 @@ Check the [list of error codes](https://en.wikipedia.org/wiki/List_of_HTTP_statu
 
 ## The `file_get_html` function
 
-This function is a wrapper around the simple_html_dom file_get_html function in order to provide context by design. It is considered good practice to use this function.
+This function is a wrapper around the [simple_html_dom](http://simplehtmldom.sourceforge.net/) [file_get_html](http://simplehtmldom.sourceforge.net/manual_api.htm#api) function in order to provide context by design. It is considered good practice to use this function.
 
 ```PHP
 $html = $this->file_get_html('your URI');

From 7d073b3e9654d61061842773efe999c03e07c34a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sat, 6 Aug 2016 19:02:02 +0200
Subject: [PATCH 101/149] [lib/Bridge] Remove loadMetadatas from BridgeAbstract

This method MUST be implemented by the bridges.
---
 lib/Bridge.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/Bridge.php b/lib/Bridge.php
index 4de1b4b..a7ffba3 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -23,14 +23,6 @@ abstract class BridgeAbstract implements BridgeInterface{
 	public $maintainer = 'No maintainer';
 	public $parameters = array();
 
-	/**
-	* Loads the Bridge Metadatas
-	*/
-	public function loadMetadatas() {
-
-
-	}
-
     /**
     * Launch probative exception
     */

From 2c954a848df01ec0dde94b4b8a59eb4726d9e92a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 00:06:14 +0200
Subject: [PATCH 102/149] [Wikipedia] Create bridge for multiple languages

---
 bridges/WikipediaBridge.php | 176 ++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 bridges/WikipediaBridge.php

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
new file mode 100644
index 0000000..e348df1
--- /dev/null
+++ b/bridges/WikipediaBridge.php
@@ -0,0 +1,176 @@
+<?php
+class WikipediaBridge extends BridgeAbstract{
+	public function loadMetadatas(){
+		$this->maintainer = 'logmanoriginal';
+		$this->name = 'Wikipedia bridge for \'Today\'s featured article...\' for many languages';
+		$this->uri = 'https://www.wikipedia.org/';
+		$this->description = 'Returns \'Today\'s featured article...\' for a language of your choice';
+		$this->update = '2016-08-07';
+
+		$this->parameters[] = 
+		'[
+			{
+				"name": "Language",
+				"identifier": "language",
+				"type": "list",
+				"required": "true",
+				"title": "Select your language",
+				"exampleValue": "English",
+				"values": [
+					{
+						"name": "English",
+						"value": "en"
+					},
+					{
+						"name": "German",
+						"value": "de"	
+					},
+					{
+						"name": "French",
+						"value": "fr"
+					},
+					{
+						"name": "Esperanto",
+						"value": "eo"
+					}
+				]
+			},
+			{
+				"name": "Load full article",
+				"identifier": "fullarticle",
+				"type": "checkbox",
+				"required": "false",
+				"title": "Activate to always load the full article",
+				"exampleValue": "false"
+			}
+		]';
+	}
+
+	public function collectData(array $params){
+		if(!isset($params['language']))
+			$this->returnError('You must specify a valid language via \'&language=\'!', 400);
+		
+		if(!$this->CheckLanguageCode(strtolower($params['language'])))
+			$this->returnError('The language code you provided (\'' . $params['language'] . '\') is not supported!', 400);
+		
+		$fullArticle = false;
+		if(isset($params['fullarticle']))
+			$fullArticle = $params['fullarticle'] === 'on' ? true : false;
+
+		// We store the correct URI as URI of this bridge (so it can be used later!)
+		$this->uri = 'https://' . strtolower($params['language']) . '.wikipedia.org';
+
+		// While we at it let's also update the name for the feed
+		$this->name = 'Today\'s featured articles from ' . strtolower($params['language']) . '.wikipedia.org';
+
+		// This will automatically send us to the correct main page in any language (try it!)
+		$html = $this->file_get_html($this->uri . '/wiki');
+
+		if(!$html)
+			$this->returnError('Could not load site: ' . $this->uri . '!', 404);
+
+		/* 
+		* Now read content depending on the language (make sure to create one function per language!)
+		* We build the function name automatically, just make sure you create a private function ending
+		* with your desired language code, where the language code is upper case! (en -> GetContentsEN).
+		*/
+		$function = 'GetContents' . strtoupper($params['language']);
+
+		if(!method_exists($this, $function))
+			$this->returnError('A function to get the contents for your langauage is missing (\'' . $function . '\')!', 501);
+		
+		/*
+		* The method takes care of creating all items.
+		*/
+		$this->$function($html, $fullArticle);
+	}
+
+	/** 
+	* Returns true if the language code is part of the parameters list
+	*/
+	private function CheckLanguageCode($languageCode){
+		$parameter = json_decode($this->parameters[0], true);
+		$languages = $parameter[0]['values'];
+
+		$language_names = array();
+
+		foreach($languages as $language)
+			$language_names[] = $language['value'];
+		
+		return in_array($languageCode, $language_names);
+	}
+
+	/*
+	* Adds a new item to $items using a generic operation (should work for most (all?) wikis)
+	*/
+	private function AddElementGeneric($element, $fullArticle){
+		// Clean the bottom of the featured article
+		$element->find('div', -1)->outertext = '';
+
+		$item = new \Item();
+		$item->uri = $this->uri . $element->find('p', 0)->find('a', 0)->href;
+		$item->title = $element->find('p', 0)->find('a', 0)->title;
+
+		if(!$fullArticle)
+			$item->content = strip_tags(str_replace('href="/', 'href="' . $this->uri . '/', $element->innertext), '<a><p><br><img>');
+		else 
+			$item->content = $this->LoadFullArticle($item->uri);
+
+		$this->items[] = $item;
+	}
+
+	/**
+	* Loads the full article from a given URI
+	*/
+	private function LoadFullArticle($uri){
+		$content_html = $this->file_get_html($uri);
+		
+		if(!$content_html)
+			$this->returnError('Could not load site: ' . $uri . '!', 404);
+		
+		$content = $content_html->find('#mw-content-text', 0);
+
+		if(!$content)
+			$this->returnError('Could not find content in page: ' . $uri . '!', 404);
+		
+		// Let's remove a couple of things from the article
+		$content->find('#toc', 0)->outertext = ''; // 'Contents' table
+
+		foreach($content->find('ol.references') as $reference) // References
+			$reference->outertext = '';
+
+		return str_replace('href="/', 'href="' . $this->uri . '/', $content->innertext);
+	}
+
+	/**
+	* Implementation for de.wikipedia.org
+	*/
+	private function GetContentsDE($html, $fullArticle){
+		$element = $html->find('div[id=mf-tfa]', 0);
+		$this->AddElementGeneric($element, $fullArticle);
+	}
+
+	/**
+	* Implementation for fr.wikipedia.org
+	*/
+	private function GetContentsFR($html, $fullArticle){
+		$element = $html->find('div[id=accueil-lumieresur]', 0);
+		$this->AddElementGeneric($element, $fullArticle);
+	}
+
+	/**
+	* Implementation for en.wikipedia.org
+	*/
+	private function GetContentsEN($html, $fullArticle){
+		$element = $html->find('div[id=mp-tfa]', 0);
+		$this->AddElementGeneric($element, $fullArticle);
+	}
+
+	/**
+	* Implementation for eo.wikipedia.org
+	*/
+	private function GetContentsEO($html, $fullArticle){
+		$element = $html->find('div[id=mf-artikolo-de-la-semajno]', 0);
+		$this->AddElementGeneric($element, $fullArticle);
+	}
+}

From d4435e0b13f706cdd3a84b7ccd17e46ad44cc2bd Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 00:07:28 +0200
Subject: [PATCH 103/149] [Wikipedia] Remove other bridges

All previous bridges are now completely covered by the
new WikipediaBridge!
---
 bridges/WikipediaDEBridge.php | 48 -----------------------------------
 bridges/WikipediaENBridge.php | 44 --------------------------------
 bridges/WikipediaEOBridge.php | 44 --------------------------------
 bridges/WikipediaFRBridge.php | 46 ---------------------------------
 4 files changed, 182 deletions(-)
 delete mode 100644 bridges/WikipediaDEBridge.php
 delete mode 100644 bridges/WikipediaENBridge.php
 delete mode 100644 bridges/WikipediaEOBridge.php
 delete mode 100644 bridges/WikipediaFRBridge.php

diff --git a/bridges/WikipediaDEBridge.php b/bridges/WikipediaDEBridge.php
deleted file mode 100644
index 5bb974a..0000000
--- a/bridges/WikipediaDEBridge.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-class WikipediaDEBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "cnlpete";
-		$this->name = "Wikipedia DE Today's Featured Article...";
-		$this->uri = "https://de.wikipedia.org/";
-		$this->description = "Returns the highlighted en.wikipedia.org article.";
-		$this->update = "2015-11-04";
-
-	}
-
-    public function collectData(array $param){
-        $html = '';
-        $host = 'http://de.wikipedia.org';
-        // If you want HTTPS access instead, uncomment the following line:
-        //$host = 'https://de.wikipedia.org';
-        $link = '/wiki/Wikipedia:Hauptseite';
-
-        $html = $this->file_get_html($host.$link) or $this->returnError('Could not request Wikipedia DE.', 404);
-
-        $element = $html->find('div[id=mf-tfa]', 0);
-        $element->find('div', -1)->outertext = '';
-
-        $item = new \Item();
-        $item->uri = $host.$element->find('p', 0)->find('a', 0)->href;
-        $item->title = $element->find('p',0)->find('a',0)->title;
-
-        $html2 = $this->file_get_html($item->uri) or $this->returnError('Could not request Wikipedia DE '.$item->title.'.', 404);
-        $element2 = $html2->find('div[id=mw-content-text]', 0);
-        $item->content = str_replace('href="/', 'href="'.$host.'/', $element2->innertext);
-
-        $this->items[] = $item;
-    }
-
-    public function getName(){
-        return 'Wikipedia DE "Today\'s Featured Article"';
-    }
-
-    public function getURI(){
-        return 'https://de.wikipedia.org/wiki/Wikipedia:Hauptseite';
-    }
-
-    public function getCacheDuration(){
-        return 3600*8; // 8 hours
-    }
-}
diff --git a/bridges/WikipediaENBridge.php b/bridges/WikipediaENBridge.php
deleted file mode 100644
index 37f1f57..0000000
--- a/bridges/WikipediaENBridge.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-class WikipediaENBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "gsurrel";
-		$this->name = "Wikipedia EN 'Today's Featured Article...'";
-		$this->uri = "https://en.wikipedia.org/";
-		$this->description = "Returns the highlighted en.wikipedia.org article.";
-		$this->update = "2014-05-25";
-
-	}
-
-    public function collectData(array $param){
-        $html = '';
-        $host = 'http://en.wikipedia.org';
-        // If you want HTTPS access instead, uncomment the following line:
-        //$host = 'https://en.wikipedia.org';
-        $link = '/wiki/Main_Page';
-
-        $html = $this->file_get_html($host.$link) or $this->returnError('Could not request Wikipedia EN.', 404);
-
-		$element = $html->find('div[id=mp-tfa]', 0);
-		// Clean the bottom of the featured article
-		$element->find('div', -1)->outertext = '';
-		$item = new \Item();
-		$item->uri = $host.$element->find('p', 0)->find('a', 0)->href;
-		$item->title = $element->find('p',0)->find('a',0)->title;
-		$item->content = str_replace('href="/', 'href="'.$host.'/', $element->innertext);
-		$this->items[] = $item;
-    }
-
-    public function getName(){
-        return 'Wikipedia EN "Today\'s Featued Article"';
-    }
-
-    public function getURI(){
-        return 'https://en.wikipedia.org/wiki/Main_Page';
-    }
-
-    public function getCacheDuration(){
-        return 3600*4; // 4 hours
-    }
-}
diff --git a/bridges/WikipediaEOBridge.php b/bridges/WikipediaEOBridge.php
deleted file mode 100644
index 4ca8864..0000000
--- a/bridges/WikipediaEOBridge.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-class WikipediaEOBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "gsurrel";
-		$this->name = "Wikipedia EO 'Artikolo de la semajno'";
-		$this->uri = "https://eo.wikipedia.org/";
-		$this->description = "Returns the highlighted eo.wikipedia.org article.";
-		$this->update = "2014-05-25";
-
-	}
-
-    public function collectData(array $param){
-        $html = '';
-        $host = 'http://eo.wikipedia.org';
-        // If you want HTTPS access instead, uncomment the following line:
-        //$host = 'https://eo.wikipedia.org';
-        $link = '/wiki/Vikipedio:%C4%88efpa%C4%9Do';
-
-        $html = $this->file_get_html($host.$link) or $this->returnError('Could not request Wikipedia EO.', 404);
-
-		$element = $html->find('div[id=mf-artikolo-de-la-semajno]', 0);
-		// Link to article
-		$link = $element->find('p', 3)->find('a', 0);
-		$item = new \Item();
-		$item->uri = $host.$link->href;
-		$item->title = $element->find('p',0)->find('i',0)->innertext;
-		$item->content = str_replace('href="/', 'href="'.$host.'/', $element->innertext);
-		$this->items[] = $item;
-    }
-
-    public function getName(){
-        return 'Wikipedia EO "Artikolo de la semajno"';
-    }
-
-    public function getURI(){
-        return 'https://eo.wikipedia.org/wiki/Vikipedio:%C4%88efpa%C4%9Do';
-    }
-
-    public function getCacheDuration(){
-        return 3600*12; // 12 hours
-    }
-}
diff --git a/bridges/WikipediaFRBridge.php b/bridges/WikipediaFRBridge.php
deleted file mode 100644
index 293d7c9..0000000
--- a/bridges/WikipediaFRBridge.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-class WikipediaFRBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "gsurrel";
-		$this->name = "Wikipedia FR 'Lumière sur...'";
-		$this->uri = "https://fr.wikipedia.org/";
-		$this->description = "Returns the highlighted fr.wikipedia.org article.";
-		$this->update = "2016-06-04";
-
-	}
-
-    public function collectData(array $param){
-        $html = '';
-        $host = 'http://fr.wikipedia.org';
-        // If you want HTTPS access instead, uncomment the following line:
-        //$host = 'https://fr.wikipedia.org';
-        $link = '/wiki/Wikip%C3%A9dia:Accueil_principal';
-
-        $html = $this->file_get_html($host.$link) or $this->returnError('Could not request Wikipedia FR.', 404);
-
-		$element = $html->find('div[id=mf-lumieresur]', 0);
-		# Use the "Lire la suite" link to dependably get the title of the article
-		# usually it's a child of a li.BA element (Bon article)
-		# occasionally it's a li.AdQ (Article de qualité)
-		$lirelasuite_link = $element->find('.BA > i > a, .AdQ > i > a', 0);
-		$item = new \Item();
-		$item->uri = $host.$lirelasuite_link->href;
-		$item->title = $lirelasuite_link->title;
-		$item->content = str_replace('href="/', 'href="'.$host.'/', $element->innertext);
-		$this->items[] = $item;
-    }
-
-    public function getName(){
-        return 'Wikipedia FR "Lumière sur..."';
-    }
-
-    public function getURI(){
-        return 'https://fr.wikipedia.org/wiki/Wikip%C3%A9dia:Accueil_principal';
-    }
-
-    public function getCacheDuration(){
-        return 3600*4; // 4 hours
-    }
-}

From 0b923ab76a78c2d660d9521289c19d4506f94d6b Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 11:26:45 +0200
Subject: [PATCH 104/149] [Wikipedia] Improve title search algorithm

---
 bridges/WikipediaBridge.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index e348df1..c69b9b1 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -107,9 +107,18 @@ class WikipediaBridge extends BridgeAbstract{
 		// Clean the bottom of the featured article
 		$element->find('div', -1)->outertext = '';
 
+		// The title and URI of the article is best defined in an anchor containint the string '...' ('full article ...')
+		$target = $element->find('p/a', 0); // We'll use the first anchor as fallback
+		foreach($element->find('//a') as $anchor){
+			if(strpos($anchor->innertext, '...') !== false){
+				$target = $anchor;
+				break;
+			} 
+		}
+
 		$item = new \Item();
-		$item->uri = $this->uri . $element->find('p', 0)->find('a', 0)->href;
-		$item->title = $element->find('p', 0)->find('a', 0)->title;
+		$item->uri = $this->uri . $target->href;
+		$item->title = $target->title;
 
 		if(!$fullArticle)
 			$item->content = strip_tags(str_replace('href="/', 'href="' . $this->uri . '/', $element->innertext), '<a><p><br><img>');

From 17c9d8fc3713b0d2c828a2e55113c4c68064f8bb Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 11:29:00 +0200
Subject: [PATCH 105/149] [Wikipedia] Fix typo

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

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index c69b9b1..005a0a9 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -61,7 +61,7 @@ class WikipediaBridge extends BridgeAbstract{
 		$this->uri = 'https://' . strtolower($params['language']) . '.wikipedia.org';
 
 		// While we at it let's also update the name for the feed
-		$this->name = 'Today\'s featured articles from ' . strtolower($params['language']) . '.wikipedia.org';
+		$this->name = 'Today\'s featured article from ' . strtolower($params['language']) . '.wikipedia.org';
 
 		// This will automatically send us to the correct main page in any language (try it!)
 		$html = $this->file_get_html($this->uri . '/wiki');

From 04b4dd1db986ec6abee9609af8ac6c5c5c6fa553 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 12:51:09 +0200
Subject: [PATCH 106/149] [Wikipedia] Add support for 'Did you know?' articles

---
 bridges/WikipediaBridge.php | 155 +++++++++++++++++++++++++++++++-----
 1 file changed, 136 insertions(+), 19 deletions(-)

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index 005a0a9..8434c8e 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -1,10 +1,14 @@
 <?php
+
+define('WIKIPEDIA_SUBJECT_TFA', 0); // Today's featured LoadFullArticle
+define('WIKIPEDIA_SUBJECT_DYK', 1); // Did you know...
+
 class WikipediaBridge extends BridgeAbstract{
 	public function loadMetadatas(){
 		$this->maintainer = 'logmanoriginal';
-		$this->name = 'Wikipedia bridge for \'Today\'s featured article...\' for many languages';
+		$this->name = 'Wikipedia bridge for many languages';
 		$this->uri = 'https://www.wikipedia.org/';
-		$this->description = 'Returns \'Today\'s featured article...\' for a language of your choice';
+		$this->description = 'Returns articles for a language of your choice';
 		$this->update = '2016-08-07';
 
 		$this->parameters[] = 
@@ -35,6 +39,24 @@ class WikipediaBridge extends BridgeAbstract{
 					}
 				]
 			},
+			{
+				"name": "Subject",
+				"identifier": "subject",
+				"type": "list",
+				"required": "true",
+				"title": "What subject are you interested in?",
+				"exampleValue": "Today\'s featured article",
+				"values": [
+					{
+						"name": "Today\'s featured article",
+						"value": "tfa"
+					},
+					{
+						"name": "Did you know...",
+						"value": "dyk"
+					}
+				]
+			},
 			{
 				"name": "Load full article",
 				"identifier": "fullarticle",
@@ -53,6 +75,22 @@ class WikipediaBridge extends BridgeAbstract{
 		if(!$this->CheckLanguageCode(strtolower($params['language'])))
 			$this->returnError('The language code you provided (\'' . $params['language'] . '\') is not supported!', 400);
 		
+		if(!isset($params['subject']))
+			$this->returnError('You must specify a valid subject via \'&subject=\'!', 400);
+		
+		$subject = WIKIPEDIA_SUBJECT_TFA;
+		switch($params['subject']){
+			case 'tfa':
+				$subject = WIKIPEDIA_SUBJECT_TFA;
+				break;
+			case 'dyk':
+				$subject = WIKIPEDIA_SUBJECT_DYK;
+				break;
+			default:
+				$subject = WIKIPEDIA_SUBJECT_TFA;
+				break;
+		}
+
 		$fullArticle = false;
 		if(isset($params['fullarticle']))
 			$fullArticle = $params['fullarticle'] === 'on' ? true : false;
@@ -61,7 +99,17 @@ class WikipediaBridge extends BridgeAbstract{
 		$this->uri = 'https://' . strtolower($params['language']) . '.wikipedia.org';
 
 		// While we at it let's also update the name for the feed
-		$this->name = 'Today\'s featured article from ' . strtolower($params['language']) . '.wikipedia.org';
+		switch($subject){
+			case WIKIPEDIA_SUBJECT_TFA:
+				$this->name = 'Today\'s featured article from ' . strtolower($params['language']) . '.wikipedia.org';
+				break;
+			case WIKIPEDIA_SUBJECT_DYK:
+				$this->name = 'Did you know? - articles from ' . strtolower($params['language']) . '.wikipedia.org';
+				break;
+			default:
+				$this->name = 'Articles from ' . strtolower($params['language']) . '.wikipedia.org';
+				break;
+		}
 
 		// This will automatically send us to the correct main page in any language (try it!)
 		$html = $this->file_get_html($this->uri . '/wiki');
@@ -82,7 +130,7 @@ class WikipediaBridge extends BridgeAbstract{
 		/*
 		* The method takes care of creating all items.
 		*/
-		$this->$function($html, $fullArticle);
+		$this->$function($html, $subject, $fullArticle);
 	}
 
 	/** 
@@ -100,10 +148,19 @@ class WikipediaBridge extends BridgeAbstract{
 		return in_array($languageCode, $language_names);
 	}
 
+	/**
+	* Replaces all relative URIs with absolute ones
+	* @param $element A simplehtmldom element
+	* @return The $element->innertext with all URIs replaced
+	*/
+	private function ReplaceURIInHTMLElement($element){
+		return str_replace('href="/', 'href="' . $this->uri . '/', $element->innertext);
+	}
+
 	/*
 	* Adds a new item to $items using a generic operation (should work for most (all?) wikis)
 	*/
-	private function AddElementGeneric($element, $fullArticle){
+	private function AddTodaysFeaturedArticleGeneric($element, $fullArticle){
 		// Clean the bottom of the featured article
 		$element->find('div', -1)->outertext = '';
 
@@ -121,13 +178,31 @@ class WikipediaBridge extends BridgeAbstract{
 		$item->title = $target->title;
 
 		if(!$fullArticle)
-			$item->content = strip_tags(str_replace('href="/', 'href="' . $this->uri . '/', $element->innertext), '<a><p><br><img>');
+			$item->content = strip_tags($this->ReplaceURIInHTMLElement($element), '<a><p><br><img>');
 		else 
 			$item->content = $this->LoadFullArticle($item->uri);
 
 		$this->items[] = $item;
 	}
 
+	/*
+	* Adds a new item to $items using a generic operation (should work for most (all?) wikis)
+	*/
+	private function AddDidYouKnowGeneric($element, $fullArticle){
+		foreach($element->find('ul', 0)->find('li') as $entry){
+			$item = new \Item();
+			$item->uri = $this->uri . $entry->find('a', 0)->href;
+			$item->title = $entry->find('a', 0)->title;
+
+			if(!$fullArticle)
+				$item->content = $this->ReplaceURIInHTMLElement($entry);
+			else 
+				$item->content = $this->LoadFullArticle($item->uri);
+
+			$this->items[] = $item;
+		}
+	}
+
 	/**
 	* Loads the full article from a given URI
 	*/
@@ -143,7 +218,9 @@ class WikipediaBridge extends BridgeAbstract{
 			$this->returnError('Could not find content in page: ' . $uri . '!', 404);
 		
 		// Let's remove a couple of things from the article
-		$content->find('#toc', 0)->outertext = ''; // 'Contents' table
+		$table = $content->find('#toc', 0); // Table of contents
+		if(!$table === false)
+			$table->outertext = '';
 
 		foreach($content->find('ol.references') as $reference) // References
 			$reference->outertext = '';
@@ -154,32 +231,72 @@ class WikipediaBridge extends BridgeAbstract{
 	/**
 	* Implementation for de.wikipedia.org
 	*/
-	private function GetContentsDE($html, $fullArticle){
-		$element = $html->find('div[id=mf-tfa]', 0);
-		$this->AddElementGeneric($element, $fullArticle);
+	private function GetContentsDE($html, $subject, $fullArticle){
+		switch($subject){
+			case WIKIPEDIA_SUBJECT_TFA:		
+				$element = $html->find('div[id=mf-tfa]', 0);
+				$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
+				break;
+			case WIKIPEDIA_SUBJECT_DYK:
+				$element = $html->find('div[id=mf-dyk]', 0);
+				$this->AddDidYouKnowGeneric($element, $fullArticle);
+				break;
+			default:
+				break;
+		}
 	}
 
 	/**
 	* Implementation for fr.wikipedia.org
 	*/
-	private function GetContentsFR($html, $fullArticle){
-		$element = $html->find('div[id=accueil-lumieresur]', 0);
-		$this->AddElementGeneric($element, $fullArticle);
+	private function GetContentsFR($html, $subject, $fullArticle){
+		switch($subject){
+			case WIKIPEDIA_SUBJECT_TFA:		
+				$element = $html->find('div[id=accueil-lumieresur]', 0);
+				$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
+				break;
+			case WIKIPEDIA_SUBJECT_DYK:
+				$element = $html->find('div[id=SaviezVous]', 0);
+				$this->AddDidYouKnowGeneric($element, $fullArticle);
+				break;
+			default:
+				break;
+		}
 	}
 
 	/**
 	* Implementation for en.wikipedia.org
 	*/
-	private function GetContentsEN($html, $fullArticle){
-		$element = $html->find('div[id=mp-tfa]', 0);
-		$this->AddElementGeneric($element, $fullArticle);
+	private function GetContentsEN($html, $subject, $fullArticle){
+		switch($subject){
+			case WIKIPEDIA_SUBJECT_TFA:		
+				$element = $html->find('div[id=mp-tfa]', 0);
+				$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
+				break;
+			case WIKIPEDIA_SUBJECT_DYK:
+				$element = $html->find('div[id=mp-dyk]', 0);
+				$this->AddDidYouKnowGeneric($element, $fullArticle);
+				break;
+			default:
+				break;
+		}
 	}
 
 	/**
 	* Implementation for eo.wikipedia.org
 	*/
-	private function GetContentsEO($html, $fullArticle){
-		$element = $html->find('div[id=mf-artikolo-de-la-semajno]', 0);
-		$this->AddElementGeneric($element, $fullArticle);
+	private function GetContentsEO($html, $subject, $fullArticle){
+		switch($subject){
+			case WIKIPEDIA_SUBJECT_TFA:		
+				$element = $html->find('div[id=mf-artikolo-de-la-semajno]', 0);
+				$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
+				break;
+			case WIKIPEDIA_SUBJECT_DYK:
+				$element = $html->find('div[id=mw-content-text]', 0)->find('table', 4)->find('td', 4);
+				$this->AddDidYouKnowGeneric($element, $fullArticle);
+				break;
+			default:
+				break;
+		}
 	}
 }

From 1cfb8c02a07681e3f10459b085c00e6304602f33 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 13:02:10 +0200
Subject: [PATCH 107/149] [Wikipedia] Use entire entry as title for 'Did you
 know'

---
 bridges/WikipediaBridge.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index 8434c8e..535b11a 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -191,8 +191,10 @@ class WikipediaBridge extends BridgeAbstract{
 	private function AddDidYouKnowGeneric($element, $fullArticle){
 		foreach($element->find('ul', 0)->find('li') as $entry){
 			$item = new \Item();
+			
+			// We can only use the first anchor, there is no way of finding the 'correct' one if there are multiple
 			$item->uri = $this->uri . $entry->find('a', 0)->href;
-			$item->title = $entry->find('a', 0)->title;
+			$item->title = strip_tags($entry->innertext);
 
 			if(!$fullArticle)
 				$item->content = $this->ReplaceURIInHTMLElement($entry);

From 13d42746d79a9d9257609258eec2f05434a574ea Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 13:26:30 +0200
Subject: [PATCH 108/149] [Wikipedia] Fix typo

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

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index 535b11a..5fb48f9 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -1,6 +1,6 @@
 <?php
 
-define('WIKIPEDIA_SUBJECT_TFA', 0); // Today's featured LoadFullArticle
+define('WIKIPEDIA_SUBJECT_TFA', 0); // Today's featured article
 define('WIKIPEDIA_SUBJECT_DYK', 1); // Did you know...
 
 class WikipediaBridge extends BridgeAbstract{

From d98a7d664486827c35867e7834ecda162647a22c Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 14:55:58 +0200
Subject: [PATCH 109/149] [HtmlFormat] Return to bridge #id when pressing 'back
 to rss-bridge'

---
 formats/HtmlFormat.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index 9b42694..e676df4 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -46,7 +46,7 @@ EOD;
 </head>
 <body>
 	<h1 class="pagetitle">{$title}</h1>
-	<div class="buttons"><a href="./"><button class="backbutton">← back to rss-bridge</button></a><a href="./?{$atomquery}"><button class="rss-feed">RSS feed</button></a></div>
+	<div class="buttons"><a href="./#bridge-{$_GET['bridge']}"><button class="backbutton">← back to rss-bridge</button></a><a href="./?{$atomquery}"><button class="rss-feed">RSS feed</button></a></div>
 {$entries}
 </body>
 </html>

From 75f7a32b99c322d55b6babafa0481f5b0aef2c0d Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 15:06:48 +0200
Subject: [PATCH 110/149] [index] Allow hiding of inactive bridges when shown

---
 index.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index ec74915..11211c6 100644
--- a/index.php
+++ b/index.php
@@ -187,7 +187,13 @@ $formats = Format::searchInformation();
     <section>
         <a href="https://github.com/sebsauvage/rss-bridge">RSS-Bridge alpha 0.2 ~ Public Domain</a><br />
 		<?= $activeFoundBridgeCount; ?>/<?= count($bridgeList) ?> active bridges. <br />
-		<a href="?show_inactive=1"><button class="small">Show inactive bridges</button></a><br />
+        <?php
+            // FIXME: This should be done in pure CSS
+            if(!$showInactive)
+                echo '<a href="?show_inactive=1"><button class="small">Show inactive bridges</button></a><br />';
+            else
+                echo '<a href="?show_inactive=0"><button class="small">Hide inactive bridges</button></a><br />';
+        ?>
     </section>
     </body>
 </html>

From 3f83763ff96008458acdbed40b416f862ad1fcb8 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 15:15:55 +0200
Subject: [PATCH 111/149] [index] Don't render 'Show inactive bridges' if non
 inactive

---
 index.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 11211c6..94c8a11 100644
--- a/index.php
+++ b/index.php
@@ -188,11 +188,13 @@ $formats = Format::searchInformation();
         <a href="https://github.com/sebsauvage/rss-bridge">RSS-Bridge alpha 0.2 ~ Public Domain</a><br />
 		<?= $activeFoundBridgeCount; ?>/<?= count($bridgeList) ?> active bridges. <br />
         <?php
-            // FIXME: This should be done in pure CSS
-            if(!$showInactive)
-                echo '<a href="?show_inactive=1"><button class="small">Show inactive bridges</button></a><br />';
-            else
-                echo '<a href="?show_inactive=0"><button class="small">Hide inactive bridges</button></a><br />';
+            if($activeFoundBridgeCount !== count($bridgeList)){
+                // FIXME: This should be done in pure CSS
+                if(!$showInactive)
+                    echo '<a href="?show_inactive=1"><button class="small">Show inactive bridges</button></a><br />';
+                else
+                    echo '<a href="?show_inactive=0"><button class="small">Hide inactive bridges</button></a><br />';
+            }
         ?>
     </section>
     </body>

From 82f06ad2c5121f28383e587c52e833433fb1d3b1 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 15:29:59 +0200
Subject: [PATCH 112/149] [HtmlFormat] Add anchor for bridge URI to title

---
 css/HtmlFormat.css     | 5 +++++
 formats/HtmlFormat.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/css/HtmlFormat.css b/css/HtmlFormat.css
index 2b8ddd5..cee2020 100644
--- a/css/HtmlFormat.css
+++ b/css/HtmlFormat.css
@@ -53,6 +53,11 @@ h1.pagetitle {
 	color: #2196F3;
 
 }
+
+h1.pagetitle > a {
+	color: #2196F3;
+}
+
 a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link, a.itemtitle:visited {
 
 	color: #2196F3;
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index e676df4..20d4901 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -45,7 +45,7 @@ EOD;
 	<meta name="robots" content="noindex, follow">
 </head>
 <body>
-	<h1 class="pagetitle">{$title}</h1>
+	<h1 class="pagetitle"><a href="{$uri}" target="_blank">{$title}</a></h1>
 	<div class="buttons"><a href="./#bridge-{$_GET['bridge']}"><button class="backbutton">← back to rss-bridge</button></a><a href="./?{$atomquery}"><button class="rss-feed">RSS feed</button></a></div>
 {$entries}
 </body>

From c0b607c841684eefc85e2bac457e7c6c0e702832 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Sun, 7 Aug 2016 15:36:50 +0200
Subject: [PATCH 113/149] [index] Fix whitelist default array

WikipediaBridge recently replaced WikipediaENBridge,
WikipediaEOBridge and WikipediaFRBridge
---
 index.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 94c8a11..9440625 100644
--- a/index.php
+++ b/index.php
@@ -67,9 +67,7 @@ $whitelist_default = array(
 	"PinterestBridge",
 	"ScmbBridge",
 	"TwitterBridge",
-	"WikipediaENBridge",
-	"WikipediaEOBridge",
-	"WikipediaFRBridge",
+	"WikipediaBridge",
 	"YoutubeBridge");
 
 if (!file_exists($whitelist_file)) {

From 0663c9507f2a62a47ca46944bbcea834e6c489ba Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Mon, 8 Aug 2016 22:43:28 +0200
Subject: [PATCH 114/149] [AtomFormat] Remove enclosures

This feature was implemented for AtomFormat only and implemented by no
bridge other than DemoBridge.
---
 bridges/DemoBridge.php |  3 +--
 formats/AtomFormat.php | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/bridges/DemoBridge.php b/bridges/DemoBridge.php
index b1d8515..3f71375 100644
--- a/bridges/DemoBridge.php
+++ b/bridges/DemoBridge.php
@@ -7,7 +7,7 @@ class DemoBridge extends BridgeAbstract{
 		$this->name = "DemoBridge";
 		$this->uri = "http://github.com/sebsauvage/rss-bridge";
 		$this->description = "Bridge used for demos";
-		$this->update = "2015-11-03";
+		$this->update = "2016-08-08";
 
 		$this->parameters['testCheckbox'] =
 		'[
@@ -59,7 +59,6 @@ class DemoBridge extends BridgeAbstract{
 	    $item->content = "Awesome content !";
 	    $item->id = "Lalala";
 	    $item->uri = "http://test.test/test";
-		$item->enclosures[] = "http://www.ardmediathek.de/ard/servlet/image/00/32/68/18/38/1135274624/16x9/960";
 
 	    $this->items[] = $item;
 
diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 303e386..18f27b4 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -36,15 +36,6 @@ class AtomFormat extends FormatAbstract{
             // We prevent content from closing the CDATA too early.
             $entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>';
 
-			// We generate a list of the enclosure links
-			$entryEnclosures = "";
-            
-			foreach($data->enclosures as $enclosure) {
-
-				$entryEnclosures .= "<link rel=\"enclosure\" href=\"".$enclosure."\"></link>";
-
-			}
-
             $entries .= <<<EOD
 
     <entry>
@@ -57,7 +48,6 @@ class AtomFormat extends FormatAbstract{
         <id>{$entryUri}</id>
         <updated>{$entryTimestamp}</updated>
         <content type="html">{$entryContent}</content>
-		{$entryEnclosures}
     </entry>
 
 EOD;

From 1af6008d65f4ec3ee4c4671a63aa38b52395f141 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Mon, 8 Aug 2016 22:57:43 +0200
Subject: [PATCH 115/149] [CREATE_BRIDGE] Fix typo

---
 CREATE_BRIDGE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index efe4286..791a28f 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -138,7 +138,7 @@ The following list provides an overview of the parameters used by the other form
 Parameter | ATOM | HTML | (M)RSS
 ----------|------|------|-------
 `uri`|X|X|X
-`thumbnailUri`||X
+`thumbnailUri`|||X
 `title`|X|X|X
 `name`|X||
 `timestamp`|X|X|X

From f3eefab475ec49446ab49c9bf3224558852e1f4e Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Mon, 8 Aug 2016 23:28:50 +0200
Subject: [PATCH 116/149] [MrssFormat] Remove media:title and media:content

Both items only make sense in combination with media:content.
This subsequently eradicates $item->thumbnailUri.
---
 CREATE_BRIDGE.md       | 2 --
 formats/MrssFormat.php | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index 791a28f..a7a0f45 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -112,7 +112,6 @@ The `Item` class is used to store parameter that are collected in the [`collectD
 
 ```PHP
 $item->uri // URI to reach the subject ("http://...")
-$item->thumbnailUri // URI for the thumbnail ("http://...")
 $item->title // Title of the item
 $item->name // Name of the item
 $item->timestamp // Timestamp of the item in numeric format (use strtotime)
@@ -138,7 +137,6 @@ The following list provides an overview of the parameters used by the other form
 Parameter | ATOM | HTML | (M)RSS
 ----------|------|------|-------
 `uri`|X|X|X
-`thumbnailUri`|||X
 `title`|X|X|X
 `name`|X||
 `timestamp`|X|X|X
diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index a5e6cd2..d80b267 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -25,7 +25,6 @@ class MrssFormat extends FormatAbstract{
             $itemTitle = strip_tags(is_null($data->title) ? '' : $data->title);
             $itemUri = is_null($data->uri) ? '' : $data->uri;
             $itemAuthor = is_null($data->author) ? '' : $data->author;
-            $itemThumbnailUri = is_null($data->thumbnailUri) ? '' : $data->thumbnailUri;
             $itemTimestamp = is_null($data->timestamp) ? '' : date(DATE_RFC2822, $data->timestamp);
             // We prevent content from closing the CDATA too early.
             $itemContent = is_null($data->content) ? '' : htmlspecialchars($this->sanitizeHtml(str_replace(']]>','',$data->content)));
@@ -39,8 +38,6 @@ class MrssFormat extends FormatAbstract{
         <pubDate>{$itemTimestamp}</pubDate>
         <description>{$itemContent}</description>
         <author>{$itemAuthor}</author>
-        <media:title>{$itemTitle}</media:title>
-        <media:thumbnail url="{$itemThumbnailUri}" />
     </item>
 
 EOD;

From 8c21769078386e98610718c64e48edbd633fd594 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Mon, 8 Aug 2016 23:41:52 +0200
Subject: [PATCH 117/149] [AtomFormat] Use $item->author for author name

$item->name was inteded as the author name and $item->author as the author
uri.

Bridges use $item->name and $item->author interchangably for author name,
so $item->name can be removed.

$item->author is now used for the author name!
---
 CREATE_BRIDGE.md       | 2 --
 formats/AtomFormat.php | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
index a7a0f45..fded177 100644
--- a/CREATE_BRIDGE.md
+++ b/CREATE_BRIDGE.md
@@ -113,7 +113,6 @@ The `Item` class is used to store parameter that are collected in the [`collectD
 ```PHP
 $item->uri // URI to reach the subject ("http://...")
 $item->title // Title of the item
-$item->name // Name of the item
 $item->timestamp // Timestamp of the item in numeric format (use strtotime)
 $item->author // Name of the author
 $item->content // Content in HTML format
@@ -138,7 +137,6 @@ Parameter | ATOM | HTML | (M)RSS
 ----------|------|------|-------
 `uri`|X|X|X
 `title`|X|X|X
-`name`|X||
 `timestamp`|X|X|X
 `author`|X|X|X
 `content`|X|X|X
diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 18f27b4..680c3ce 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -28,7 +28,6 @@ class AtomFormat extends FormatAbstract{
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryName = is_null($data->name) ? $title : xml_encode($data->name);
             $entryAuthor = is_null($data->author) ? $uri : xml_encode($data->author);
             $entryTitle = is_null($data->title) ? '' : xml_encode($data->title);
             $entryUri = is_null($data->uri) ? '' : xml_encode($data->uri);
@@ -40,8 +39,7 @@ class AtomFormat extends FormatAbstract{
 
     <entry>
         <author>
-            <name>{$entryName}</name>
-            <uri>{$entryAuthor}</uri>
+            <name>{$entryAuthor}</name>
         </author>
         <title type="html"><![CDATA[{$entryTitle}]]></title>
         <link rel="alternate" type="text/html" href="{$entryUri}" />

From 4806092b9f27011f054cb105f226d040dc9e9b51 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 14:29:44 +0200
Subject: [PATCH 118/149] [AtomFormat] Fix default value for author

---
 formats/AtomFormat.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 680c3ce..fac3e55 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -28,7 +28,7 @@ class AtomFormat extends FormatAbstract{
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryAuthor = is_null($data->author) ? $uri : xml_encode($data->author);
+            $entryAuthor = is_null($data->author) ? $title : xml_encode($data->author);
             $entryTitle = is_null($data->title) ? '' : xml_encode($data->title);
             $entryUri = is_null($data->uri) ? '' : xml_encode($data->uri);
             $entryTimestamp = is_null($data->timestamp) ? '' : xml_encode(date(DATE_ATOM, $data->timestamp));

From e329a4c1b6a6c2ae266d05bb3777f78365113a7f Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 14:54:44 +0200
Subject: [PATCH 119/149] bridges: Change ->name to ->author

---
 bridges/ABCTabsBridge.php            | 4 ++--
 bridges/BandcampBridge.php           | 4 ++--
 bridges/BlaguesDeMerdeBridge.php     | 4 ++--
 bridges/CpasbienBridge.php           | 4 ++--
 bridges/DemoBridge.php               | 4 ++--
 bridges/ElsevierBridge.php           | 4 ++--
 bridges/FootitoBridge.php            | 4 ++--
 bridges/Freenews.php                 | 4 ++--
 bridges/Gawker.php                   | 4 ++--
 bridges/GithubIssueBridge.php        | 4 ++--
 bridges/GitlabCommitsBridge.php      | 4 ++--
 bridges/LWNprevBridge.php            | 8 ++++----
 bridges/Les400Culs.php               | 4 ++--
 bridges/LesJoiesDuCodeBridge.php     | 4 ++--
 bridges/SensCritiqueBridge.php       | 4 ++--
 bridges/Sexactu.php                  | 4 ++--
 bridges/SoundcloudBridge.php         | 4 ++--
 bridges/StripeAPIChangeLogBridge.php | 4 ++--
 bridges/TheCodingLoveBridge.php      | 4 ++--
 bridges/TheOatMealBridge.php         | 6 +++---
 bridges/WhydBridge.php               | 4 ++--
 bridges/WorldOfTanks.php             | 3 +--
 22 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php
index 9ab3e9c..29b41e0 100644
--- a/bridges/ABCTabsBridge.php
+++ b/bridges/ABCTabsBridge.php
@@ -9,7 +9,7 @@ class ABCTabsBridge extends BridgeAbstract{
 		$this->name = "ABC Tabs Bridge";
 		$this->uri = "http://www.abc-tabs.com/";
 		$this->description = "Returns 22 newest tabs";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -21,7 +21,7 @@ class ABCTabsBridge extends BridgeAbstract{
 		foreach ($table->find('tr') as $tab)
 		{
 		    $item = new \Item();
-		    $item->name = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext;
+		    $item->author = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext;
 		    $item->title = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext;
 		    $item->content = 'Le ' . $tab->find('td', 0)->plaintext . '<br> Par: ' . $tab->find('td', 5)->plaintext . '<br> Type: ' . $tab->find('td', 3)->plaintext;
 		    $item->id = 'http://www.abc-tabs.com' . $tab->find('td', 2)->find('a', 0)->getAttribute('href');
diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php
index ce0c65c..80e3dee 100644
--- a/bridges/BandcampBridge.php
+++ b/bridges/BandcampBridge.php
@@ -9,7 +9,7 @@ class BandcampBridge extends BridgeAbstract{
 		$this->name = "Bandcamp Tag";
 		$this->uri = "http://bandcamp.com/";
 		$this->description = "New bandcamp release by tag";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -38,7 +38,7 @@ class BandcampBridge extends BridgeAbstract{
             $uri = rtrim($uri, "')");
 
             $item = new \Item();
-            $item->name = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext;
+            $item->author = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext;
             $item->title = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext;
             $item->content = '<img src="' . $uri . '"/><br/>' . $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext;
             $item->id = $release->find('a',0)->getAttribute('href');
diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php
index 126ca82..d977cae 100644
--- a/bridges/BlaguesDeMerdeBridge.php
+++ b/bridges/BlaguesDeMerdeBridge.php
@@ -7,7 +7,7 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{
 		$this->name = "Blagues De Merde";
 		$this->uri = "http://www.blaguesdemerde.fr/";
 		$this->description = "Blagues De Merde";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -26,7 +26,7 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{
                 $date = $element->find("li.bdm_date",0)->innertext;
                 $time = mktime(0, 0, 0, substr($date, 3, 2), substr($date, 0, 2), substr($date, 6, 4));
                 $item->timestamp = $time;
-                $item->name = $element->find("li.bdm_pseudo",0)->innertext;;
+                $item->author = $element->find("li.bdm_pseudo",0)->innertext;;
                 $this->items[] = $item;
             }
         }
diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php
index 93649e6..63cec4b 100644
--- a/bridges/CpasbienBridge.php
+++ b/bridges/CpasbienBridge.php
@@ -24,7 +24,7 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
 		$this->name = "Cpasbien Bridge";
 		$this->uri = "http://www.cpasbien.io";
 		$this->description = "Returns latest torrents from a request query";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -57,7 +57,7 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
                 $htmlepisode=content_get_html($this->get_cached($episode->find('a', 0)->getAttribute('href')));
 
                 $item = new \Item();
-                $item->name = $episode->find('a', 0)->text();
+                $item->author = $episode->find('a', 0)->text();
                 $item->title = $episode->find('a', 0)->text();
                 $item->timestamp = $this->get_cached_time($episode->find('a', 0)->getAttribute('href'));
                 $textefiche=$htmlepisode->find('#textefiche', 0)->find('p',1);
diff --git a/bridges/DemoBridge.php b/bridges/DemoBridge.php
index 3f71375..2e576c6 100644
--- a/bridges/DemoBridge.php
+++ b/bridges/DemoBridge.php
@@ -7,7 +7,7 @@ class DemoBridge extends BridgeAbstract{
 		$this->name = "DemoBridge";
 		$this->uri = "http://github.com/sebsauvage/rss-bridge";
 		$this->description = "Bridge used for demos";
-		$this->update = "2016-08-08";
+		$this->update = "2016-08-09";
 
 		$this->parameters['testCheckbox'] =
 		'[
@@ -54,7 +54,7 @@ class DemoBridge extends BridgeAbstract{
 	public function collectData(array $param){
 
 		$item = new \Item();
-	    $item->name = "TestElement";
+	    $item->author = "Me!";
 	    $item->title = "Test";
 	    $item->content = "Awesome content !";
 	    $item->id = "Lalala";
diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index bd35925..cca3d85 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -6,7 +6,7 @@ class ElsevierBridge extends BridgeAbstract{
 		$this->name = 'Elsevier journals recent articles';
 		$this->uri = 'http://www.journals.elsevier.com';
 		$this->description = 'Returns the recent articles published in Elsevier journals';
-		$this->update = '2016-08-06';
+		$this->update = '2016-08-09';
 
 		$this->parameters[] =
 			'[
@@ -69,7 +69,7 @@ class ElsevierBridge extends BridgeAbstract{
 			$item = new \Item();
 			$item->uri = $article->find('.pod-listing-header>a',0)->getAttribute('href').'?np=y';
 			$item->title = $article->find('.pod-listing-header>a',0)->plaintext;
-			$item->name = $this->ExtractArticleName($article);
+			$item->author = $this->ExtractArticleName($article);
 			$item->timestamp = $this->ExtractArticleTimestamp($article);
 			$item->content = $this->ExtractArticleContent($article);
 			$this->items[] = $item;
diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php
index a66dd82..ffcba2f 100644
--- a/bridges/FootitoBridge.php
+++ b/bridges/FootitoBridge.php
@@ -7,7 +7,7 @@ class FootitoBridge extends BridgeAbstract{
 		$this->name = "Footito";
 		$this->uri = "http://www.footito.fr/";
 		$this->description = "Footito";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -36,7 +36,7 @@ class FootitoBridge extends BridgeAbstract{
             $info = $element->find('div.infos', 0);
             
             $item->timestamp = strtotime($info->find('time', 0)->datetime);
-            $item->name = $info->find('a.auteur', 0)->plaintext;
+            $item->author = $info->find('a.auteur', 0)->plaintext;
             
             $this->items[] = $item;
         }
diff --git a/bridges/Freenews.php b/bridges/Freenews.php
index b2e27c9..9cc0baf 100644
--- a/bridges/Freenews.php
+++ b/bridges/Freenews.php
@@ -8,7 +8,7 @@ class Freenews extends RssExpander {
 		$this->name = "Freenews";
 		$this->uri = "http://freenews.fr";
 		$this->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.";
-		$this->update = "26/03/2014";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -38,7 +38,7 @@ class Freenews extends RssExpander {
 
         $content = $articlePage->find('.post-container', 0);
         $item->content = $content->innertext;
-        $item->name = $articlePage->find('a[rel=author]', 0)->innertext;
+        $item->author = $articlePage->find('a[rel=author]', 0)->innertext;
         // format should parse 2014-03-25T16:21:20Z. But, according to http://stackoverflow.com/a/10478469, it is not that simple
         $item->timestamp = $this->RSS_2_0_time_to_timestamp($newsItem);
         return $item;
diff --git a/bridges/Gawker.php b/bridges/Gawker.php
index 624e66d..71bba27 100644
--- a/bridges/Gawker.php
+++ b/bridges/Gawker.php
@@ -10,7 +10,7 @@ class Gawker extends RssExpander{
 		$this->name = "Gawker media";
 		$this->uri = "http://feeds.gawker.com/";
 		$this->description = "A bridge allowing access to any of the numerous Gawker media blogs (Lifehacker, deadspin, Kotaku, Jezebel, and so on. Notice you have to give its id to find the RSS stream in gawker maze";
-		$this->update = "27/03/2014";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -53,7 +53,7 @@ class Gawker extends RssExpander{
                 $vcard = $articlePage->find('.vcard', 0);
                 if(is_object($vcard)) {
                     $authorLink = $vcard->find('a', 0);
-    				$item->name = $authorLink->innertext;
+    				$item->author = $authorLink->innertext;
                     // TODO use author link href to fill the feed info
                 }
 //                $this->message("item quite loaded : ".var_export($item, true));
diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php
index 4c56cf0..84b1f56 100644
--- a/bridges/GithubIssueBridge.php
+++ b/bridges/GithubIssueBridge.php
@@ -12,7 +12,7 @@ class GithubIssueBridge extends BridgeAbstract{
     $this->name = 'Github Issue';
     $this->uri = '';
     $this->description = 'Returns the comments of a github project issue';
-    $this->update = '2016-06-25';
+    $this->update = '2016-08-09';
 
     $this->parameters[]=
       '[
@@ -40,7 +40,7 @@ class GithubIssueBridge extends BridgeAbstract{
     foreach($html->find('.js-comment-container') as $comment){
 
       $item = new \Item();
-      $item->name=$comment->find('img',0)->getAttribute('alt');
+      $item->author=$comment->find('img',0)->getAttribute('alt');
 
       $comment=$comment->firstChild()->nextSibling();
 
diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php
index 030c74b..ba1b002 100644
--- a/bridges/GitlabCommitsBridge.php
+++ b/bridges/GitlabCommitsBridge.php
@@ -12,7 +12,7 @@ class GitlabCommitsBridge extends BridgeAbstract{
     $this->name = 'Gitlab Commits';
     $this->uri = '';
     $this->description = 'Returns the commits of a project hosted on a gitlab instance';
-    $this->update = '2016-08-06';
+    $this->update = '2016-08-09';
 
     $this->parameters[] =
       '[
@@ -64,7 +64,7 @@ class GitlabCommitsBridge extends BridgeAbstract{
           $item->title=$a->plaintext;
         }
         if(in_array('commit-author-link',$classes)){
-          $item->name=trim($a->plaintext);
+          $item->author=trim($a->plaintext);
         }
       }
 
diff --git a/bridges/LWNprevBridge.php b/bridges/LWNprevBridge.php
index 9772799..15bc1f2 100644
--- a/bridges/LWNprevBridge.php
+++ b/bridges/LWNprevBridge.php
@@ -12,7 +12,7 @@ class LWNprevBridge extends BridgeAbstract{
     $this->name = 'LWN Free Weekly Edition';
     $this->uri = 'https://lwn.net/free/bigpage';
     $this->description = 'LWN Free Weekly Edition available one week late';
-    $this->update = '2016-19-01';
+    $this->update = '2016-08-09';
 
   }
 
@@ -88,14 +88,14 @@ class LWNprevBridge extends BridgeAbstract{
 
       switch($h2NextSibling->getAttribute('class')){
       case 'FeatureByline':
-        $item->name=$h2NextSibling->getElementsByTagName('b')->item(0)->textContent;
+        $item->author=$h2NextSibling->getElementsByTagName('b')->item(0)->textContent;
         break;
       case 'GAByline':
         $text=$h2NextSibling->textContent;
-        $item->name=substr($text,strpos($text,'by '));
+        $item->author=substr($text,strpos($text,'by '));
         break;
       default:
-        $item->name='LWN';
+        $item->author='LWN';
         break;
       };
 
diff --git a/bridges/Les400Culs.php b/bridges/Les400Culs.php
index c8b89c8..65bd5a6 100644
--- a/bridges/Les400Culs.php
+++ b/bridges/Les400Culs.php
@@ -10,7 +10,7 @@ class Les400Culs extends RssExpander{
 		$this->name = "Les 400 Culs";
 		$this->uri = "http://sexes.blogs.liberation.fr";
 		$this->description = "La planete sexe vue par Agnes Girard via rss-bridge";
-		$this->update = "20/02/2014";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -34,7 +34,7 @@ class Les400Culs extends RssExpander{
 
 //        $content = $articlePage->find('.post-container', 0);
         $item->content = (string) $newsItem->description;
-        $item->name = (string) $newsItem->author;
+        $item->author = (string) $newsItem->author;
         $item->timestamp = $this->RSS_2_0_time_to_timestamp($newsItem);
         return $item;
     }
diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php
index ab759dd..4ff8e2c 100644
--- a/bridges/LesJoiesDuCodeBridge.php
+++ b/bridges/LesJoiesDuCodeBridge.php
@@ -7,7 +7,7 @@ class LesJoiesDuCodeBridge extends BridgeAbstract{
 		$this->name = "Les Joies Du Code";
 		$this->uri = "http://lesjoiesducode.fr/";
 		$this->description = "LesJoiesDuCode";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -36,7 +36,7 @@ class LesJoiesDuCodeBridge extends BridgeAbstract{
             if($pos > 0)
             {
                 $auteur = trim(str_replace("*/", "", substr($auteur->innertext, ($pos + 2))));
-                $item->name = $auteur;
+                $item->author = $auteur;
             }
             
             
diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index f471602..fc20932 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -8,7 +8,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 		$this->name = "Sens Critique";
 		$this->uri = "http://www.senscritique.com";
 		$this->description = "Sens Critique news";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -118,7 +118,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 
 		foreach ($list->find('li') as $movie) {
 		    $item = new \Item();
-		    $item->name = htmlspecialchars_decode($movie->find('.elco-title a', 0)->plaintext, ENT_QUOTES) . ' ' . $movie->find('.elco-date', 0)->plaintext;
+		    $item->author = htmlspecialchars_decode($movie->find('.elco-title a', 0)->plaintext, ENT_QUOTES) . ' ' . $movie->find('.elco-date', 0)->plaintext;
 		    $item->title = $movie->find('.elco-title a', 0)->plaintext . ' ' . $movie->find('.elco-date', 0)->plaintext;
 		    $item->content = '<em>' . $movie->find('.elco-original-title', 0)->plaintext . '</em><br><br>' .
 												 $movie->find('.elco-baseline', 0)->plaintext . '<br>' .
diff --git a/bridges/Sexactu.php b/bridges/Sexactu.php
index cfa97a7..c5480e4 100644
--- a/bridges/Sexactu.php
+++ b/bridges/Sexactu.php
@@ -8,7 +8,7 @@ class Sexactu extends BridgeAbstract{
 		$this->name = "Sexactu";
 		$this->uri = "http://www.gqmagazine.fr";
 		$this->description = "Sexactu via rss-bridge";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -42,7 +42,7 @@ $replace = array('January', 'February', 'March', 'April', 'May', 'June', 'July',
                         $date = strtotime($dateText); 
                         $item->timestamp = $date;
 
-                        $item->name = "Maïa Mazaurette";
+                        $item->author = "Maïa Mazaurette";
                         $elementText = $element->find('.text-container', 0);
                         // don't forget to replace images server url with gq one
                         foreach($elementText->find('img') as $image) {
diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php
index ebc3f8e..40836d5 100644
--- a/bridges/SoundcloudBridge.php
+++ b/bridges/SoundcloudBridge.php
@@ -10,7 +10,7 @@ class SoundCloudBridge extends BridgeAbstract{
 		$this->name = "Soundcloud Bridge";
 		$this->uri = "http://www.soundcloud.com/";
 		$this->description = "Returns 10 newest music from user profile";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -40,7 +40,7 @@ class SoundCloudBridge extends BridgeAbstract{
 
 		for ($i=0; $i < 10; $i++) {
 		    $item = new \Item();
-		    $item->name = $tracks[$i]->user->username .' - '. $tracks[$i]->title;
+		    $item->author = $tracks[$i]->user->username .' - '. $tracks[$i]->title;
 		    $item->title = $tracks[$i]->user->username .' - '. $tracks[$i]->title;
 		    $item->content = '<audio src="'. $tracks[$i]->uri .'/stream?client_id='. self::CLIENT_ID .'">';
 		    $item->id = 'https://soundcloud.com/'. urlencode($this->request) .'/'. urlencode($tracks[$i]->permalink);
diff --git a/bridges/StripeAPIChangeLogBridge.php b/bridges/StripeAPIChangeLogBridge.php
index 664c96f..1a5b57f 100644
--- a/bridges/StripeAPIChangeLogBridge.php
+++ b/bridges/StripeAPIChangeLogBridge.php
@@ -12,7 +12,7 @@ class StripeAPIChangeLogBridge extends BridgeAbstract{
     $this->name = 'Stripe API Changelog';
     $this->uri = '';
     $this->description = 'Returns the changes made to the stripe.com API';
-    $this->update = '2016-06-20';
+    $this->update = '2016-08-09';
   }
 
   public function collectData(array $param){
@@ -24,7 +24,7 @@ class StripeAPIChangeLogBridge extends BridgeAbstract{
       $item=new \Item();
       $item->title=trim($change->plaintext);
       $item->uri='https://stripe.com/docs/upgrades#'.$item->title;
-      $item->name='stripe';
+      $item->author='stripe';
       $item->content=$change->nextSibling()->outertext;
       $item->timestamp=strtotime($item->title);
       $this->items[]=$item;
diff --git a/bridges/TheCodingLoveBridge.php b/bridges/TheCodingLoveBridge.php
index b23c6ee..6e8702b 100644
--- a/bridges/TheCodingLoveBridge.php
+++ b/bridges/TheCodingLoveBridge.php
@@ -7,7 +7,7 @@ class TheCodingLoveBridge extends BridgeAbstract{
 		$this->name = "The Coding Love";
 		$this->uri = "http://thecodinglove.com/";
 		$this->description = "The Coding Love";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -37,7 +37,7 @@ class TheCodingLoveBridge extends BridgeAbstract{
             if($pos > 0)
             {
                 $auteur = trim(str_replace("*/", "", substr($auteur->innertext, ($pos + 2))));
-                $item->name = $auteur;
+                $item->author = $auteur;
             }
             
             
diff --git a/bridges/TheOatMealBridge.php b/bridges/TheOatMealBridge.php
index 9e8a0ff..e65a09b 100644
--- a/bridges/TheOatMealBridge.php
+++ b/bridges/TheOatMealBridge.php
@@ -10,7 +10,7 @@ class TheOatmealBridge extends RssExpander{
 		$this->name = "The Oatmeal";
 		$this->uri = "http://theoatmeal.com/";
 		$this->description = "Un petit site de dessins assez rigolos";
-		$this->update = "2015-07-03";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -53,9 +53,9 @@ class TheOatmealBridge extends RssExpander{
         $item->content = $content->innertext;
         
         $this->message("dc content is ".var_export($dc, true));
-        $item->name = (string) $dc->creator;
+        $item->author = (string) $dc->creator;
         $item->timestamp = DateTime::createFromFormat(DateTime::ISO8601, $dc->date)->getTimestamp();
-        $this->message("writtem by ".$item->name." on ".$item->timestamp);
+        $this->message("writtem by ".$item->author." on ".$item->timestamp);
         return $item;
     }
     
diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php
index 25ab15f..cf9959c 100644
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@@ -10,7 +10,7 @@ class WhydBridge extends BridgeAbstract{
 		$this->name = "Whyd Bridge";
 		$this->uri = "http://www.whyd.com/";
 		$this->description = "Returns 10 newest music from user profile";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -48,7 +48,7 @@ class WhydBridge extends BridgeAbstract{
 		for($i = 0; $i < 10; $i++) {
 			$track = $html->find('div.post', $i);
             $item = new \Item();
-            $item->name = $track->find('h2', 0)->plaintext;
+            $item->author = $track->find('h2', 0)->plaintext;
             $item->title = $track->find('h2', 0)->plaintext;
             $item->content = $track->find('a.thumb',0) . '<br/>' . $track->find('h2', 0)->plaintext;
             $item->id = 'http://www.whyd.com' . $track->find('a.no-ajaxy',0)->getAttribute('href');
diff --git a/bridges/WorldOfTanks.php b/bridges/WorldOfTanks.php
index ae51a0e..3d30e3f 100644
--- a/bridges/WorldOfTanks.php
+++ b/bridges/WorldOfTanks.php
@@ -12,7 +12,7 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
 		$this->name = "World of Tanks";
 		$this->uri = "http://worldoftanks.eu/";
 		$this->description = "News about the tank slaughter game.";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -89,7 +89,6 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
         HTMLSanitizer::defaultImageSrcTo($content, WORLD_OF_TANKS);
         $item->title = $content->find('h1', 0)->innertext;
         $item->content = $content->find('.b-content', 0)->innertext;
-//        $item->name = $auteur->innertext;
         $item->timestamp = $content->find('.b-statistic_time', 0)->getAttribute("data-timestamp");
         $this->items[] = $item;
     }

From 42b6c82753127407e7c5ccd5f39ffa4e78040e9e Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 15:50:25 +0200
Subject: [PATCH 120/149] bridges: Cleanup occurrences of $item->thumbnailUri

This is a subsequent change to f3eefab
---
 bridges/AnimeUltimeBridge.php         |  4 +---
 bridges/ArstechnicaBridge.php         |  3 +--
 bridges/Arte7Bridge.php               |  5 ++---
 bridges/BooruprojectBridge.php        |  5 ++---
 bridges/CNETBridge.php                | 13 +------------
 bridges/CpasbienBridge.php            |  1 -
 bridges/DailymotionBridge.php         |  5 ++---
 bridges/DanbooruBridge.php            |  6 +++---
 bridges/DilbertBridge.php             |  3 +--
 bridges/DollbooruBridge.php           |  6 +++---
 bridges/EstCeQuonMetEnProdBridge.php  | 10 +---------
 bridges/FacebookBridge.php            |  9 +--------
 bridges/FlickrExploreBridge.php       |  5 ++---
 bridges/FlickrTagBridge.php           |  6 +++---
 bridges/FuturaSciencesBridge.php      |  3 +--
 bridges/GBAtempBridge.php             | 15 ++++++---------
 bridges/GelbooruBridge.php            |  6 +++---
 bridges/HDWallpapersBridge.php        |  5 ++---
 bridges/HentaiHavenBridge.php         |  6 +++---
 bridges/JapanExpoBridge.php           |  3 +--
 bridges/KonachanBridge.php            |  5 ++---
 bridges/LeMondeInformatiqueBridge.php |  4 +---
 bridges/LinkedInCompany.php           |  3 +--
 bridges/LolibooruBridge.php           |  5 ++---
 bridges/MangareaderBridge.php         |  8 ++++----
 bridges/MilbooruBridge.php            |  6 +++---
 bridges/MspabooruBridge.php           |  6 +++---
 bridges/NakedSecurityBridge.php       |  3 +--
 bridges/NeuviemeArtBridge.php         |  3 +--
 bridges/NextInpactBridge.php          |  3 +--
 bridges/NextgovBridge.php             |  6 +-----
 bridges/PickyWallpapersBridge.php     |  3 +--
 bridges/RTBFBridge.php                |  5 +++--
 bridges/Releases3DSBridge.php         |  3 +--
 bridges/Rule34Bridge.php              |  6 +++---
 bridges/Rule34pahealBridge.php        |  6 +++---
 bridges/SafebooruBridge.php           |  6 +++---
 bridges/SakugabooruBridge.php         |  5 ++---
 bridges/SiliconBridge.php             |  3 +--
 bridges/SuperbWallpapersBridge.php    |  3 +--
 bridges/T411Bridge.php                | 12 +-----------
 bridges/TagBoardBridge.php            |  8 ++++----
 bridges/TbibBridge.php                |  6 +++---
 bridges/TheHackerNewsBridge.php       |  4 +---
 bridges/TwitchApiBridge.php           |  5 ++---
 bridges/UnsplashBridge.php            |  5 ++---
 bridges/ViadeoCompany.php             |  5 ++---
 bridges/WallpaperStopBridge.php       |  5 ++---
 bridges/WeLiveSecurityBridge.php      |  3 +--
 bridges/XbooruBridge.php              |  6 +++---
 bridges/YandereBridge.php             |  5 ++---
 bridges/YoutubeBridge.php             |  6 +++---
 bridges/ZDNetBridge.php               |  6 +-----
 53 files changed, 104 insertions(+), 183 deletions(-)

diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php
index 20f0bfd..224f664 100644
--- a/bridges/AnimeUltimeBridge.php
+++ b/bridges/AnimeUltimeBridge.php
@@ -9,7 +9,7 @@ class AnimeUltimeBridge extends BridgeAbstract {
         $this->name = 'Anime-Ultime';
         $this->uri = 'http://www.anime-ultime.net/';
         $this->description = 'Returns the 10 newest releases posted on Anime-Ultime';
-        $this->update = '2015-10-30';
+        $this->update = '2016-08-09';
 
         $this->parameters[] =
         '[
@@ -86,7 +86,6 @@ class AnimeUltimeBridge extends BridgeAbstract {
                         $item_link_element = $release->find('td', 0)->find('a', 0);
                         $item_uri = $website.$item_link_element->href;
                         $item_name = html_entity_decode($item_link_element->plaintext);
-                        $item_image = $website.substr($item_link_element->onmouseover, 37, strpos($item_link_element->onmouseover, ' ', 37) - 37);
                         $item_episode = html_entity_decode(str_pad($release->find('td', 1)->plaintext, 2, '0', STR_PAD_LEFT));
                         $item_fansub = $release->find('td', 2)->plaintext;
                         $item_type = $release->find('td', 4)->plaintext;
@@ -108,7 +107,6 @@ class AnimeUltimeBridge extends BridgeAbstract {
                             $item->title = $item_name.' '.$item_type.' '.$item_episode;
                             $item->author = $item_fansub;
                             $item->timestamp = $item_date;
-                            $item->thumbnailUri = $item_image;
                             $item->content = $item_description;
                             $this->items[] = $item;
                             $processedOK++;
diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
index de26ee1..3e0b3c4 100644
--- a/bridges/ArstechnicaBridge.php
+++ b/bridges/ArstechnicaBridge.php
@@ -9,7 +9,7 @@ class ArstechnicaBridge extends BridgeAbstract {
                 $this->name = "ArstechnicaBridge";
                 $this->uri = "http://arstechnica.com";
                 $this->description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
-                $this->update = "01/08/2016";
+                $this->update = "2016-08-09";
 
         }
 
@@ -51,7 +51,6 @@ class ArstechnicaBridge extends BridgeAbstract {
                                 $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->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
                                 $item->content = ExtractContent($item->uri);
diff --git a/bridges/Arte7Bridge.php b/bridges/Arte7Bridge.php
index 07de0a4..2c2e2f6 100644
--- a/bridges/Arte7Bridge.php
+++ b/bridges/Arte7Bridge.php
@@ -7,7 +7,7 @@ class Arte7Bridge extends BridgeAbstract{
 		$this->name = "Arte +7";
 		$this->uri = "http://www.arte.tv/";
 		$this->description = "Returns newest videos from ARTE +7";
-		$this->update = "2015-10-31";
+		$this->update = "2016-08-09";
 		$this->parameters["Catégorie (Français)"] =
 		'[
 			{
@@ -147,12 +147,11 @@ class Arte7Bridge extends BridgeAbstract{
                $hack_broadcast_time = strtok($hack_broadcast_time, 'T');
                $hack_broadcast_time = strtok('T');
             $item->timestamp = strtotime($element['scheduled_on'].'T'.$hack_broadcast_time);
-            $item->thumbnailUri = $element['thumbnail_url'];
             $item->title = $element['title'];
             if (!empty($element['subtitle']))
                $item->title = $element['title'].' | '.$element['subtitle'];
             $item->duration = round((int)$element['duration']/60);
-            $item->content = $element['teaser'].'<br><br>'.$item->duration.'min<br><a href="'.$item->uri.'"><img src="' . $item->thumbnailUri . '" /></a>';
+            $item->content = $element['teaser'].'<br><br>'.$item->duration.'min<br><a href="'.$item->uri.'"><img src="' . $element['thumbnail_url'] . '" /></a>';
             $this->items[] = $item;
         }
     }
diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php
index 9f9546a..3ed40f2 100644
--- a/bridges/BooruprojectBridge.php
+++ b/bridges/BooruprojectBridge.php
@@ -7,7 +7,7 @@ class BooruprojectBridge extends BridgeAbstract{
 		$this->name = "Booruproject";
 		$this->uri = "http://booru.org/";
 		$this->description = "Returns images from given page and booruproject instance (****.booru.org)";
-		$this->update = "2015-09-12";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -51,10 +51,9 @@ class BooruprojectBridge extends BridgeAbstract{
 		$item->uri = 'http://'.$param['i'].'.booru.org/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->find('a', 0)->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('title');
 		$item->title = 'Booruproject '.$param['i'].' | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $element->find('img', 0)->src . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php
index 5b0a8d5..e73027c 100644
--- a/bridges/CNETBridge.php
+++ b/bridges/CNETBridge.php
@@ -9,7 +9,7 @@ class CNETBridge extends BridgeAbstract {
         $this->name = 'CNET News';
         $this->uri = 'http://www.cnet.com/';
         $this->description = 'Returns the newest articles. <br /> You may specify a topic found in some section URLs, else all topics are selected.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
 
         $this->parameters[] =
         '[
@@ -59,7 +59,6 @@ class CNETBridge extends BridgeAbstract {
 
                 $article_title = trim($element->find('h2', 0)->plaintext);
                 $article_uri = 'http://www.cnet.com'.($element->find('a', 0)->href);
-                $article_thumbnail = $element->parent()->find('img', 0)->src;
                 $article_timestamp = strtotime($element->find('time.assetTime', 0)->plaintext);
                 $article_author = trim($element->find('a[rel=author]', 0)->plaintext);
 
@@ -67,20 +66,10 @@ class CNETBridge extends BridgeAbstract {
 
                     $article_html = $this->file_get_html($article_uri) or $this->returnError('Could not request CNET: '.$article_uri, 500);
 
-                    if (is_null($article_thumbnail))
-                        $article_thumbnail = $article_html->find('div.originalImage', 0);
-
-                    if (is_null($article_thumbnail))
-                        $article_thumbnail = $article_html->find('span.imageContainer', 0);
-
-                    if (is_object($article_thumbnail))
-                        $article_thumbnail = $article_thumbnail->find('img', 0)->src;
-
                     $article_content = trim(CleanArticle(ExtractFromDelimiters($article_html, '<div class="articleContent', '<footer>')));
 
                     $item = new \Item();
                     $item->uri = $article_uri;
-                    $item->thumbnailUri = $article_thumbnail;
                     $item->title = $article_title;
                     $item->author = $article_author;
                     $item->timestamp = $article_timestamp;
diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php
index 63cec4b..4299043 100644
--- a/bridges/CpasbienBridge.php
+++ b/bridges/CpasbienBridge.php
@@ -70,7 +70,6 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
 
                 $item->id = $episode->find('a', 0)->getAttribute('href');
                 $item->uri = $this->uri . $htmlepisode->find('#telecharger',0)->getAttribute('href');
-                $item->thumbnailUri = $htmlepisode->find('#bigcover', 0)->find('img',0)->getAttribute('src');
                 $this->items[] = $item;
             }
         }
diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php
index 2e834ab..b9d4227 100644
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -9,7 +9,7 @@ class DailymotionBridge extends BridgeAbstract{
 		$this->name = "Dailymotion Bridge";
 		$this->uri = "https://www.dailymotion.com/";
 		$this->description = "Returns the 5 newest videos by username/playlist or search";
-		$this->update = "2016-08-02";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By username"] =
 		'[
@@ -83,10 +83,9 @@ class DailymotionBridge extends BridgeAbstract{
 				$item->id = str_replace('/video/', '', strtok($element->href, '_'));
 				$metadata = getMetadata($item->id);
 				$item->uri = $metadata['uri'];
-				$item->thumbnailUri = $metadata['thumbnailUri'];
 				$item->title = $metadata['title'];
 				$item->timestamp = $metadata['timestamp'];
-				$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
+				$item->content = '<a href="' . $item->uri . '"><img src="' . $metadata['thumbnailUri'] . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
 				$this->items[] = $item;
 				$count++;
 			}
diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php
index ac4bef6..91befb1 100644
--- a/bridges/DanbooruBridge.php
+++ b/bridges/DanbooruBridge.php
@@ -7,7 +7,7 @@ class DanbooruBridge extends BridgeAbstract{
 		$this->name = "Danbooru";
 		$this->uri = "http://donmai.us/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -37,10 +37,10 @@ class DanbooruBridge extends BridgeAbstract{
 		$item->uri = 'http://donmai.us'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('data-id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = 'http://donmai.us'.$element->find('img', 0)->src;
+		$thumbnailUri = 'http://donmai.us'.$element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('alt');
 		$item->title = 'Danbooru | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php
index e4f2c9c..8cb7c80 100644
--- a/bridges/DilbertBridge.php
+++ b/bridges/DilbertBridge.php
@@ -7,7 +7,7 @@ class DilbertBridge extends BridgeAbstract {
         $this->name = 'Dilbert Daily Strip';
         $this->uri = 'http://dilbert.com';
         $this->description = 'The Unofficial Dilbert Daily Comic Strip';
-        $this->update = "2016-08-06";
+        $this->update = "2016-08-09";
 
     }
 
@@ -29,7 +29,6 @@ class DilbertBridge extends BridgeAbstract {
 
             $item = new \Item();
             $item->uri = $url;
-            $item->thumbnailUri = $comic;
             $item->title = $title;
             $item->author = 'Scott Adams';
             $item->timestamp = $date;
diff --git a/bridges/DollbooruBridge.php b/bridges/DollbooruBridge.php
index 958fce5..fe6d6fb 100644
--- a/bridges/DollbooruBridge.php
+++ b/bridges/DollbooruBridge.php
@@ -7,7 +7,7 @@ class DollbooruBridge extends BridgeAbstract{
 		$this->name = "Dollbooru";
 		$this->uri = "http://dollbooru.org/";
 		$this->description = "Returns images from given page";
-		$this->update = "2015-01-20";
+		$this->update = "2016-08-09";
 
 
 		$this->parameters[]  =
@@ -40,10 +40,10 @@ class DollbooruBridge extends BridgeAbstract{
 		$item->uri = 'http://dollbooru.org'.$element->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('data-post-id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = 'http://dollbooru.org'.$element->find('img', 0)->src;
+		$thumbnailUri = 'http://dollbooru.org'.$element->find('img', 0)->src;
 		$item->tags = $element->getAttribute('data-tags');
 		$item->title = 'Dollbooru | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php
index 5e5d8b4..f0636b8 100644
--- a/bridges/EstCeQuonMetEnProdBridge.php
+++ b/bridges/EstCeQuonMetEnProdBridge.php
@@ -6,7 +6,7 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
         $this->name = 'Est-ce qu\'on met en prod aujourd\'hui ?';
         $this->uri = 'https://www.estcequonmetenprodaujourdhui.info/';
         $this->description = 'Should we put a website in production today? (French)';
-        $this->update = "2016-08-06";
+        $this->update = "2016-08-09";
     }
 
     public function collectData(array $param) {
@@ -20,16 +20,8 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
 
         $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request EstCeQuonMetEnProd: '.$this->getURI(), 500);
 
-        $img = $html->find('img', 0);
-        if (is_object($img)) {
-            $img = $img->src;
-            if ($img[0] == '/')
-                $img = substr($this->getURI(), 0, strlen($this->getURI()) - 1).$img;
-        }
-
         $item = new \Item();
         $item->uri = $this->getURI().'#'.date('Y-m-d');
-        $item->thumbnailUri = $img;
         $item->title = $this->getName();
         $item->author = 'Nicolas Hoffmann';
         $item->timestamp = strtotime('today midnight');
diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php
index f1c9406..96974fc 100644
--- a/bridges/FacebookBridge.php
+++ b/bridges/FacebookBridge.php
@@ -7,7 +7,7 @@ class FacebookBridge extends BridgeAbstract{
 		$this->name = "Facebook";
 		$this->uri = "http://www.facebook.com/";
 		$this->description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -197,15 +197,8 @@ class FacebookBridge extends BridgeAbstract{
 					if (strlen($title) > 64)
 						$title = substr($title, 0, strpos(wordwrap($title, 64), "\n")).'...';
 
-					//Use first image as thumbnail if available, or profile pic fallback
-					$thumbnail = $post->find('img', 1);
-					if (is_object($thumbnail))
-						$thumbnail = $thumbnail->src;
-					else $thumbnail = $profilePic;
-
 					//Build and add final item
 					$item->uri = 'https://facebook.com'.$post->find('abbr')[0]->parent()->getAttribute('href');
-					$item->thumbnailUri = $thumbnail;
 					$item->content = $content;
 					$item->title = $title;
 					$item->author = $author;
diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php
index 524d9d9..8e859b1 100644
--- a/bridges/FlickrExploreBridge.php
+++ b/bridges/FlickrExploreBridge.php
@@ -7,7 +7,7 @@ class FlickrExploreBridge extends BridgeAbstract{
 		$this->name = "Flickr Explore";
 		$this->uri = "https://www.flickr.com/explore";
 		$this->description = "Returns the latest interesting images from Flickr";
-		$this->update = "2016-07-30";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -30,8 +30,7 @@ class FlickrExploreBridge extends BridgeAbstract{
 
             $item = new \Item();
             $item->uri = 'https://flickr.com/photo.gne?id='.$imageID;
-            $item->thumbnailUri = $imageURI;
-            $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>'; // FIXME: Filter javascript ?
+            $item->content = '<a href="' . $item->uri . '"><img src="' . $imageURI . '" /></a>'; // FIXME: Filter javascript ?
             $item->title = $imageJSON->photo->title->_content;
             $this->items[] = $item;
         }
diff --git a/bridges/FlickrTagBridge.php b/bridges/FlickrTagBridge.php
index 918c765..61f59a2 100644
--- a/bridges/FlickrTagBridge.php
+++ b/bridges/FlickrTagBridge.php
@@ -7,7 +7,7 @@ class FlickrTagBridge extends BridgeAbstract{
 		$this->name = "Flickr TagUser";
 		$this->uri = "http://www.flickr.com/";
 		$this->description = "Returns the tagged or user images from Flickr";
-		$this->update = "2014-05-26";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By keyword"] =
 		'[
@@ -44,8 +44,8 @@ class FlickrTagBridge extends BridgeAbstract{
         foreach($html->find('span.photo_container') as $element) {
             $item = new \Item();
             $item->uri = 'http://flickr.com'.$element->find('a',0)->href;
-            $item->thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src');
-            $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>'; // FIXME: Filter javascript ?
+            $thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src');
+            $item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a>'; // FIXME: Filter javascript ?
             $item->title = $element->find('a',0)->title;
             $this->items[] = $item;
         }
diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php
index f22c610..2886249 100644
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -7,7 +7,7 @@ class FuturaSciencesBridge extends BridgeAbstract {
         $this->name = 'Futura-Sciences Bridge';
         $this->uri = 'http://www.futura-sciences.com/';
         $this->description = 'Returns the newest articles.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
 
         $this->parameters[] =
         '[
@@ -209,7 +209,6 @@ class FuturaSciencesBridge extends BridgeAbstract {
                 $item->author = ExtractAuthor($article, $element);
                 $item->uri = $article_url;
                 $item->title = StripCDATA($element->find('title', 0)->innertext);
-                $item->thumbnailUri = StripCDATA($element->find('enclosure', 0)->url);
                 $item->timestamp = strtotime(StripCDATA($element->find('pubDate', 0)->plaintext));
                 $item->content = trim($contents);
                 $this->items[] = $item;
diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php
index 75217b0..b1ac17d 100644
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -9,7 +9,7 @@ class GBAtempBridge extends BridgeAbstract {
         $this->name = 'GBAtemp';
         $this->uri = $this->getURI();
         $this->description = 'GBAtemp is a user friendly underground video game community.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
 
         $this->parameters[] =
         '[
@@ -56,13 +56,12 @@ class GBAtempBridge extends BridgeAbstract {
         } return $string;
     }
 
-    private function build_item($uri, $title, $author, $timestamp, $thumnail, $content) {
+    private function build_item($uri, $title, $author, $timestamp, $content) {
         $item = new \Item();
         $item->uri = $uri;
         $item->title = $title;
         $item->author = $author;
         $item->timestamp = $timestamp;
-        $item->thumbnailUri = $thumnail;
         $item->content = $content;
         return $item;
     }
@@ -97,17 +96,15 @@ class GBAtempBridge extends BridgeAbstract {
         if ($typeFilter == 'N') {
             foreach ($html->find('li[class=news_item full]') as $newsItem) {
                 $url = $this->getURI().$newsItem->find('a', 0)->href;
-                $img = $this->getURI().$newsItem->find('img', 0)->src;
                 $time = intval($this->ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $newsItem->find('a.username', 0)->plaintext;
                 $title = $newsItem->find('a', 1)->plaintext;
                 $content = $this->fetch_post_content($url, $this->getURI());
-                $this->items[] = $this->build_item($url, $title, $author, $time, $img, $content);
+                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         } else if ($typeFilter == 'R') {
             foreach ($html->find('li.portal_review') as $reviewItem) {
                 $url = $this->getURI().$reviewItem->find('a', 0)->href;
-                $img = $this->getURI().$this->ExtractFromDelimiters($reviewItem->find('a', 0)->style, 'image:url(', ')');
                 $title = $reviewItem->find('span.review_title', 0)->plaintext;
                 $content = $this->file_get_html($url) or $this->returnError('Could not request GBAtemp: '.$uri, 500);
                 $author = $content->find('a.username', 0)->plaintext;
@@ -118,7 +115,7 @@ class GBAtempBridge extends BridgeAbstract {
                 $procons = $content->find('table.review_procons', 0)->outertext;
                 $scores = $content->find('table.reviewscores', 0)->outertext;
                 $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->getURI());
-                $this->items[] = $this->build_item($url, $title, $author, $time, $img, $content);
+                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         } else if ($typeFilter == 'T') {
             foreach ($html->find('li.portal-tutorial') as $tutorialItem) {
@@ -127,7 +124,7 @@ class GBAtempBridge extends BridgeAbstract {
                 $time = intval($this->ExtractFromDelimiters($tutorialItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $tutorialItem->find('a.username', 0)->plaintext;
                 $content = $this->fetch_post_content($url, $this->getURI());
-                $this->items[] = $this->build_item($url, $title, $author, $time, '', $content);
+                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         } else if ($typeFilter == 'F') {
             foreach ($html->find('li.rc_item') as $postItem) {
@@ -136,7 +133,7 @@ class GBAtempBridge extends BridgeAbstract {
                 $time = intval($this->ExtractFromDelimiters($postItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $postItem->find('a.username', 0)->plaintext;
                 $content = $this->fetch_post_content($url, $this->getURI());
-                $this->items[] = $this->build_item($url, $title, $author, $time, '', $content);
+                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         }
     }
diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php
index 16968b8..e4cd2b5 100644
--- a/bridges/GelbooruBridge.php
+++ b/bridges/GelbooruBridge.php
@@ -7,7 +7,7 @@ class GelbooruBridge extends BridgeAbstract{
 		$this->name = "Gelbooru";
 		$this->uri = "http://gelbooru.com/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -42,10 +42,10 @@ class GelbooruBridge extends BridgeAbstract{
 		$item->uri = 'http://gelbooru.com/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
+		$thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('alt');
 		$item->title = 'Gelbooru | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php
index 45a6deb..99161a3 100644
--- a/bridges/HDWallpapersBridge.php
+++ b/bridges/HDWallpapersBridge.php
@@ -10,7 +10,7 @@ class HDWallpapersBridge extends BridgeAbstract {
 		$this->name = "HD Wallpapers Bridge";
 		$this->uri = "http://www.hdwallpapers.in/";
 		$this->description = "Returns the latests wallpapers from HDWallpapers";
-		$this->update = "2015-04-08";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -63,8 +63,7 @@ class HDWallpapersBridge extends BridgeAbstract {
                 $item->uri = $baseUri.'/download'.str_replace('wallpapers.html', $this->resolution.'.jpg', $element->href);
                 $item->timestamp = time();
                 $item->title = $element->find('p', 0)->text();
-                $item->thumbnailUri = $baseUri.$thumbnail->src;
-                $item->content = $item->title.'<br><a href="'.$item->uri.'"><img src="'.$item->thumbnailUri.'" /></a>';
+                $item->content = $item->title.'<br><a href="'.$item->uri.'"><img src="'.$baseUri.$thumbnail->src.'" /></a>';
                 $this->items[] = $item;
 
                 $num++;
diff --git a/bridges/HentaiHavenBridge.php b/bridges/HentaiHavenBridge.php
index c5ef263..ccd1f08 100644
--- a/bridges/HentaiHavenBridge.php
+++ b/bridges/HentaiHavenBridge.php
@@ -7,7 +7,7 @@ class HentaiHavenBridge extends BridgeAbstract{
 		$this->name = "Hentai Haven";
 		$this->uri = "http://hentaihaven.org/";
 		$this->description = "Returns releases from Hentai Haven";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -16,10 +16,10 @@ class HentaiHavenBridge extends BridgeAbstract{
         foreach($html->find('div.zoe-grid') as $element) {
             $item = new \Item();
             $item->uri = $this->getURI().$element->find('div.brick-content h3 a', 0)->href;
-            $item->thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src');
+            $thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src');
             $item->title = mb_convert_encoding(trim($element->find('div.brick-content h3 a', 0)->innertext), 'UTF-8', 'HTML-ENTITIES');
             $item->tags = $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent span.tags', 0)->plaintext;
-            $item->content = 'Tags: ' . $item->tags.'<br><br><a href="' . $item->uri . '"><img width="300" height="169" src="' . $item->thumbnailUri . '" /></a><br>' . $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent p.description', 0)->innertext;
+            $item->content = 'Tags: ' . $item->tags.'<br><br><a href="' . $item->uri . '"><img width="300" height="169" src="' . $thumbnailUri . '" /></a><br>' . $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent p.description', 0)->innertext;
             $this->items[] = $item;
         }
     }
diff --git a/bridges/JapanExpoBridge.php b/bridges/JapanExpoBridge.php
index 2d38726..1c7afa7 100644
--- a/bridges/JapanExpoBridge.php
+++ b/bridges/JapanExpoBridge.php
@@ -6,7 +6,7 @@ class JapanExpoBridge extends BridgeAbstract{
         $this->name = 'JapanExpo';
         $this->uri = 'http://www.japan-expo-paris.com/fr/actualites';
         $this->description = 'Returns most recent entries from Japan Expo actualités.';
-        $this->update = '2016-06-12';
+        $this->update = '2016-08-09';
         $this->parameters[] =
         '[
             {
@@ -96,7 +96,6 @@ class JapanExpoBridge extends BridgeAbstract{
             $item->uri = $url;
             $item->title = $title;
             $item->timestamp = $timestamp;
-            $item->thumbnailUri = $thumbnail;
             $item->content = $content;
             $this->items[] = $item;
             $count++;
diff --git a/bridges/KonachanBridge.php b/bridges/KonachanBridge.php
index 00de438..1b3a378 100644
--- a/bridges/KonachanBridge.php
+++ b/bridges/KonachanBridge.php
@@ -7,7 +7,7 @@ class KonachanBridge extends BridgeAbstract{
 		$this->name = "Konachan";
 		$this->uri = "http://konachan.com/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -44,9 +44,8 @@ class KonachanBridge extends BridgeAbstract{
             $item->postid = $json['id'];
             $item->timestamp = $json['created_at'];
             $item->imageUri = $json['file_url'];
-            $item->thumbnailUri = $json['preview_url'];
             $item->title = 'Konachan | '.$json['id'];
-            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$json['tags']; 
+            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $json['preview_url'] . '" /></a><br>Tags: '.$json['tags']; 
             $this->items[] = $item;
         }
     }
diff --git a/bridges/LeMondeInformatiqueBridge.php b/bridges/LeMondeInformatiqueBridge.php
index f373938..df81b66 100644
--- a/bridges/LeMondeInformatiqueBridge.php
+++ b/bridges/LeMondeInformatiqueBridge.php
@@ -7,7 +7,7 @@ class LeMondeInformatiqueBridge extends BridgeAbstract {
         $this->name = "Le Monde Informatique";
         $this->uri = "http://www.lemondeinformatique.fr/";
         $this->description = "Returns the newest articles.";
-        $this->update = "2016-01-28";
+        $this->update = "2016-08-09";
 
     }
 
@@ -45,14 +45,12 @@ class LeMondeInformatiqueBridge extends BridgeAbstract {
                 $article_uri = substr($article_uri, strpos($article_uri, '<link>') + 6);
                 $article_uri = substr($article_uri, 0, strpos($article_uri, '</link>'));
                 $article_html = $this->file_get_html($article_uri) or $this->returnError('Could not request LeMondeInformatique: '.$article_uri, 500);
-                $thumbnailUri = $article_html->find('div#article', 0)->find('img#illustration', 0)->src;
                 $article_content = CleanArticle($article_html->find('div#article', 0)->innertext);
                 $article_title = $article_html->find('h1.cleanprint-title', 0)->plaintext;
 
                 //Build and add final item
                 $item = new \Item();
                 $item->uri = $article_uri;
-                $item->thumbnailUri = $thumbnailUri;
                 $item->title = $article_title;
                 $item->author = StripCDATA($element->find('dc:creator', 0)->innertext);
                 $item->timestamp = strtotime($element->find('dc:date', 0)->plaintext);
diff --git a/bridges/LinkedInCompany.php b/bridges/LinkedInCompany.php
index b7a49bd..243f70c 100644
--- a/bridges/LinkedInCompany.php
+++ b/bridges/LinkedInCompany.php
@@ -7,7 +7,7 @@ class LinkedInCompany extends BridgeAbstract{
 		$this->name = "LinkedIn Company";
 		$this->uri = "https://www.linkedin.com/";
 		$this->description = "Returns most recent actus from Company on LinkedIn. (https://www.linkedin.com/company/<strong style=\"font-weight:bold;\">apple</strong>)";
-		$this->update = "2015-12-22";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -31,7 +31,6 @@ class LinkedInCompany extends BridgeAbstract{
                 $item->uri = $link;
                 $item->title = mb_substr(strip_tags($element->find('span.share-body', 0)->innertext), 0 ,100);
                 $item->content = strip_tags($element->find('span.share-body', 0)->innertext);
-                $item->thumbnailUri = htmlspecialchars_decode($element->find('img', 0)->attr['data-li-lazy-load-src']);
                 $this->items[] = $item;
                 $i++;
             }
diff --git a/bridges/LolibooruBridge.php b/bridges/LolibooruBridge.php
index 37e06f3..74fe9ab 100644
--- a/bridges/LolibooruBridge.php
+++ b/bridges/LolibooruBridge.php
@@ -7,7 +7,7 @@ class LolibooruBridge extends BridgeAbstract{
 		$this->name = "Lolibooru";
 		$this->uri = "http://lolibooru.moe/";
 		$this->description = "Returns images from given page and tags";
-		$this->update = "2015-03-21";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -45,9 +45,8 @@ class LolibooruBridge extends BridgeAbstract{
             $item->postid = $json['id'];
             $item->timestamp = $json['created_at'];
             $item->imageUri = $json['file_url'];
-            $item->thumbnailUri = $json['preview_url'];
             $item->title = 'Lolibooru | '.$json['id'];
-            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$json['tags']; 
+            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $json['preview_url'] . '" /></a><br>Tags: '.$json['tags']; 
             $this->items[] = $item;
         }
     }
diff --git a/bridges/MangareaderBridge.php b/bridges/MangareaderBridge.php
index 3d92682..568eb23 100644
--- a/bridges/MangareaderBridge.php
+++ b/bridges/MangareaderBridge.php
@@ -8,7 +8,7 @@ class MangareaderBridge extends BridgeAbstract{
 		$this->name = "Mangareader Bridge";
 		$this->uri = "http://www.mangareader.net";
 		$this->description = "Returns the latest updates, popular mangas or manga updates (new chapters)";
-		$this->update = "2016-01-22";
+		$this->update = "2016-08-09";
 
 		$this->parameters["Get latest updates"] = '[]';
         $this->parameters["Get popular mangas"] = 
@@ -281,15 +281,15 @@ class MangareaderBridge extends BridgeAbstract{
                 // The thumbnail is encrypted in a css-style...
                 // format: "background-image:url('<the part which is actually interesting>')"
                 $mangaimgelement = $xpath->query(".//*[@class='imgsearchresults']", $manga)->item(0)->getAttribute('style'); 
-                
+                $thumbnail = substr($mangaimgelement, 22, strlen($mangaimgelement) - 24);
+
                 $item = new \Item();
                 $item->title = htmlspecialchars($xpath->query(".//*[@class='manga_name']//a", $manga)->item(0)->nodeValue);
                 $item->uri = 'http://www.mangareader.net' . $xpath->query(".//*[@class='manga_name']//a", $manga)->item(0)->getAttribute('href');
                 $item->author = htmlspecialchars($xpath->query("//*[@class='author_name']", $manga)->item(0)->nodeValue);
                 $item->chaptercount = $xpath->query(".//*[@class='chapter_count']", $manga)->item(0)->nodeValue;
                 $item->genre = htmlspecialchars($xpath->query(".//*[@class='manga_genre']", $manga)->item(0)->nodeValue);
-                $item->thumbnailUri = substr($mangaimgelement, 22, strlen($mangaimgelement) - 24);
-                $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" alt="' . $item->title . '" /></a><p>' . $item->genre . '</p><p>' . $item->chaptercount . '</p>';
+                $item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnail . '" alt="' . $item->title . '" /></a><p>' . $item->genre . '</p><p>' . $item->chaptercount . '</p>';
                 $this->items[] = $item;
             }
         }
diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php
index eb1e133..946a132 100644
--- a/bridges/MilbooruBridge.php
+++ b/bridges/MilbooruBridge.php
@@ -7,7 +7,7 @@ class MilbooruBridge extends BridgeAbstract{
 		$this->name = "Milbooru";
 		$this->uri = "http://sheslostcontrol.net/moe/shimmie/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -39,10 +39,10 @@ class MilbooruBridge extends BridgeAbstract{
 		$item->uri = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->find('a', 0)->getAttribute('data-post-id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('img', 0)->src;
+		$thumbnailUri = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('img', 0)->src;
 		$item->tags = $element->find('a', 0)->getAttribute('data-tags');
 		$item->title = 'Milbooru | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/MspabooruBridge.php b/bridges/MspabooruBridge.php
index caac095..2ad84d6 100644
--- a/bridges/MspabooruBridge.php
+++ b/bridges/MspabooruBridge.php
@@ -7,7 +7,7 @@ class MspabooruBridge extends BridgeAbstract{
 		$this->name = "Mspabooru";
 		$this->uri = "http://mspabooru.com/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -42,10 +42,10 @@ class MspabooruBridge extends BridgeAbstract{
 		$item->uri = 'http://mspabooru.com/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
+		$thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('alt');
 		$item->title = 'Mspabooru | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php
index fc3d73a..5b0eab0 100644
--- a/bridges/NakedSecurityBridge.php
+++ b/bridges/NakedSecurityBridge.php
@@ -6,7 +6,7 @@ class NakedSecurityBridge extends BridgeAbstract {
         $this->name = 'Naked Security';
         $this->uri = 'https://nakedsecurity.sophos.com/';
         $this->description = 'Returns the newest articles.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
     }
 
     public function collectData(array $param) {
@@ -60,7 +60,6 @@ class NakedSecurityBridge extends BridgeAbstract {
                 $item = new \Item();
                 $item->uri = $article_uri;
                 $item->title = $article_title;
-                $item->thumbnailUri = $article_image;
                 $item->author = $article_html->find('a[rel=author]', 0)->plaintext;
                 $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
                 $item->content = $article_content;
diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php
index 5ee207a..b772f5d 100644
--- a/bridges/NeuviemeArtBridge.php
+++ b/bridges/NeuviemeArtBridge.php
@@ -6,7 +6,7 @@ class NeuviemeArtBridge extends BridgeAbstract {
         $this->name = "9ème Art";
         $this->uri = "http://www.9emeart.fr/";
         $this->description = "Returns the newest articles.";
-        $this->update = "2016-08-06";
+        $this->update = "2016-08-09";
     }
 
     public function collectData(array $param) {
@@ -46,7 +46,6 @@ class NeuviemeArtBridge extends BridgeAbstract {
                 $item = new \Item();
                 $item->uri = $article_uri;
                 $item->title = $article_title;
-                $item->thumbnailUri = $element->find('enclosure', 0)->url;
                 $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;
diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index ee89ab1..52bc908 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -6,7 +6,7 @@ class NextInpactBridge extends BridgeAbstract {
 		$this->name = "NextInpact Bridge";
 		$this->uri = "http://www.nextinpact.com/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function StripCDATA($string) {
@@ -35,7 +35,6 @@ class NextInpactBridge extends BridgeAbstract {
 				$item = new \Item();
 				$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('creator', 0)->innertext);
 				$item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
 				$item->content = $this->ExtractContent($item->uri);
diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
index 35ca1fc..1ead4fa 100644
--- a/bridges/NextgovBridge.php
+++ b/bridges/NextgovBridge.php
@@ -7,7 +7,7 @@ class NextgovBridge extends BridgeAbstract {
         $this->name = 'Nextgov Bridge';
         $this->uri = 'https://www.nextgov.com/';
         $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
 
         $this->parameters[] =
         '[
@@ -79,14 +79,10 @@ class NextgovBridge extends BridgeAbstract {
                     .'<p><b>'.$article_subtitle.'</b></p>'
                     .trim($contents);
 
-                if ($article_thumbnail == '')
-                    $article_thumbnail = 'http://cdn.nextgov.com/nextgov/images/logo.png';
-
                 $item = new \Item();
                 $item->uri = $article_url;
                 $item->title = $article_title;
                 $item->author = $article_author;
-                $item->thumbnailUri = $article_thumbnail;
                 $item->timestamp = $article_timestamp;
                 $item->content = $contents;
                 $this->items[] = $item;
diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php
index 18d1d35..b45a61b 100644
--- a/bridges/PickyWallpapersBridge.php
+++ b/bridges/PickyWallpapersBridge.php
@@ -11,7 +11,7 @@ class PickyWallpapersBridge extends BridgeAbstract {
 		$this->name = "PickyWallpapers Bridge";
 		$this->uri = "http://www.pickywallpapers.com/";
 		$this->description = "Returns the latests wallpapers from PickyWallpapers";
-		$this->update = "2014-03-31";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -68,7 +68,6 @@ class PickyWallpapersBridge extends BridgeAbstract {
                     $item->uri = str_replace('www', 'wallpaper', $baseUri).'/'.$this->resolution.'/'.basename($element->src);
                     $item->timestamp = time();
                     $item->title = $element->alt;
-                    $item->thumbnailUri = $element->src;
                     $item->content = $item->title.'<br><a href="'.$item->uri.'">'.$element.'</a>';
                     $this->items[] = $item;
 
diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php
index 3b2a890..2eb2d98 100644
--- a/bridges/RTBFBridge.php
+++ b/bridges/RTBFBridge.php
@@ -5,6 +5,7 @@ class RTBFBridge extends BridgeAbstract {
 		$this->uri = "http://www.rtbf.be/auvio/emissions";
 		$this->description = "Returns the newest RTBF videos by series ID";
 		$this->maintainer = "Frenzie";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -33,10 +34,10 @@ class RTBFBridge extends BridgeAbstract {
 					$item->uri = 'http://www.rtbf.be/auvio/detail?id='.$item->id;
 					$thumbnailUriSrcSet = explode(',', $element->find('figure .www-img-16by9 img', 0)->getAttribute('data-srcset'));
 					$thumbnailUriLastSrc = end($thumbnailUriSrcSet);
-					$item->thumbnailUri = explode(' ', $thumbnailUriLastSrc)[0];
+					$thumbnailUri = explode(' ', $thumbnailUriLastSrc)[0];
 					$item->title = trim($element->find('h3',0)->plaintext) . ' - ' . trim($element->find('h4',0)->plaintext);
 					$item->timestamp = strtotime($element->find('time', 0)->getAttribute('datetime'));
-					$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>';
+					$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a>';
 					$this->items[] = $item;
 					$count++;
 				}
diff --git a/bridges/Releases3DSBridge.php b/bridges/Releases3DSBridge.php
index abd35ad..54a5a81 100644
--- a/bridges/Releases3DSBridge.php
+++ b/bridges/Releases3DSBridge.php
@@ -7,7 +7,7 @@ class Releases3DSBridge extends BridgeAbstract {
 		$this->name = "3DS Scene Releases";
 		$this->uri = "http://www.3dsdb.com/";
 		$this->description = "Returns the newest scene releases.";
-		$this->update = "2015-09-17";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -108,7 +108,6 @@ class Releases3DSBridge extends BridgeAbstract {
                         $item->title = $name;
                         $item->author = $publisher;
                         $item->timestamp = $ignDate;
-                        $item->thumbnailUri = $ignCoverArt;
                         $item->uri = empty($ignLink) ? $searchLinkDuckDuckGo : $ignLink;
                         $item->content = $ignDescription.$releaseDescription.$releaseSearchLinks;
                         $this->items[] = $item;
diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php
index b4c30dd..d9ca066 100644
--- a/bridges/Rule34Bridge.php
+++ b/bridges/Rule34Bridge.php
@@ -7,7 +7,7 @@ class Rule34Bridge extends BridgeAbstract{
 		$this->name = "Rule34";
 		$this->uri = "http://rule34.xxx/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -41,10 +41,10 @@ class Rule34Bridge extends BridgeAbstract{
 		$item->uri = 'http://rule34.xxx/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
+		$thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('alt');
 		$item->title = 'Rule34 | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php
index 3371640..ecffcc5 100644
--- a/bridges/Rule34pahealBridge.php
+++ b/bridges/Rule34pahealBridge.php
@@ -7,7 +7,7 @@ class Rule34pahealBridge extends BridgeAbstract{
 		$this->name = "Rule34paheal";
 		$this->uri = "http://rule34.paheal.net/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -40,10 +40,10 @@ class Rule34pahealBridge extends BridgeAbstract{
 		$item->uri = 'http://rule34.paheal.net'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->find('img', 0)->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
+		$thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->getAttribute('data-tags');
 		$item->title = 'Rule34paheal | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php
index 63ffd1a..b9d2ee1 100644
--- a/bridges/SafebooruBridge.php
+++ b/bridges/SafebooruBridge.php
@@ -7,7 +7,7 @@ class SafebooruBridge extends BridgeAbstract{
 		$this->name = "Safebooru";
 		$this->uri = "http://safebooru.org/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -42,10 +42,10 @@ class SafebooruBridge extends BridgeAbstract{
 		$item->uri = 'http://safebooru.org/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
+		$thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('alt');
 		$item->title = 'Safebooru | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php
index d35da26..ac6d58d 100644
--- a/bridges/SakugabooruBridge.php
+++ b/bridges/SakugabooruBridge.php
@@ -7,7 +7,7 @@ class SakugabooruBridge extends BridgeAbstract{
 		$this->name = "Sakugabooru";
 		$this->uri = "http://sakuga.yshi.org/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -44,9 +44,8 @@ class SakugabooruBridge extends BridgeAbstract{
             $item->postid = $json['id'];
             $item->timestamp = $json['created_at'];
             $item->imageUri = $json['file_url'];
-            $item->thumbnailUri = $json['preview_url'];
             $item->title = 'Sakugabooru | '.$json['id'];
-            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$json['tags']; 
+            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $json['preview_url'] . '" /></a><br>Tags: '.$json['tags']; 
             $this->items[] = $item;
         }
     }
diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php
index b715ba7..4cd7388 100644
--- a/bridges/SiliconBridge.php
+++ b/bridges/SiliconBridge.php
@@ -7,7 +7,7 @@ class SiliconBridge extends BridgeAbstract {
 		$this->name = "Silicon.fr";
 		$this->uri = "http://www.silicon.fr/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2015-09-08";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -48,7 +48,6 @@ class SiliconBridge extends BridgeAbstract {
                 //Build and add final item
                 $item = new \Item();
                 $item->uri = $article_uri;
-                $item->thumbnailUri = $thumbnailUri;
                 $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);
diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php
index f9b0a5c..ed9d78f 100644
--- a/bridges/SuperbWallpapersBridge.php
+++ b/bridges/SuperbWallpapersBridge.php
@@ -10,7 +10,7 @@ class SuperbWallpapersBridge extends BridgeAbstract {
 		$this->name = "Superb Wallpapers Bridge";
 		$this->uri = "http://www.superbwallpapers.com/";
 		$this->description = "Returns the latests wallpapers from SuperbWallpapers";
-		$this->update = "2015-04-08";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -61,7 +61,6 @@ class SuperbWallpapersBridge extends BridgeAbstract {
                 $item->uri = str_replace('200x125', $this->resolution, $thumbnail->src);
                 $item->timestamp = time();
                 $item->title = $element->title;
-                $item->thumbnailUri = $thumbnail->src;
                 $item->content = $item->title.'<br><a href="'.$item->uri.'">'.$thumbnail.'</a>';
                 $this->items[] = $item;
 
diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php
index 76d7f4a..5a7e2bc 100644
--- a/bridges/T411Bridge.php
+++ b/bridges/T411Bridge.php
@@ -7,7 +7,7 @@ class T411Bridge extends BridgeAbstract {
         $this->name = 'T411';
         $this->uri = $this->getURI();
         $this->description = 'Returns the 10 newest torrents with specified search terms <br /> Use url part after "?" mark when using their search engine.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
 
         $this->parameters[] =
         '[
@@ -63,15 +63,6 @@ class T411Bridge extends BridgeAbstract {
                     $item_desc = $item_html->find('div.description', 0);
                     $item_author = $item_html->find('a.profile', 0)->innertext;
 
-                    //Retrieve image for thumbnail or generic logo fallback
-                    $item_image = $this->getURI().'themes/blue/images/logo.png';
-                    foreach ($item_desc->find('img') as $img) {
-                        if (strpos($img->src, 'prez') === false && strpos($img->src, '/ad/') === false) {
-                            $item_image = $img->src;
-                            break;
-                        }
-                    }
-
                     //Cleanup advertisments
                     $divs = explode('<div class="align-center">', $item_desc->innertext);
                     $item_desc = '';
@@ -86,7 +77,6 @@ class T411Bridge extends BridgeAbstract {
                     $item->title = $item_title;
                     $item->author = $item_author;
                     $item->timestamp = $item_date;
-                    $item->thumbnailUri = $item_image;
                     $item->content = $item_desc;
                     $this->items[] = $item;
                     $limit++;
diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php
index 30a950b..406f64f 100644
--- a/bridges/TagBoardBridge.php
+++ b/bridges/TagBoardBridge.php
@@ -7,7 +7,7 @@ class TagBoardBridge extends BridgeAbstract{
 		$this->name = "TagBoard";
 		$this->uri = "http://www.TagBoard.com";
 		$this->description = "Returns most recent results from TagBoard.";
-		$this->update = "2014-09-10";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -31,9 +31,9 @@ class TagBoardBridge extends BridgeAbstract{
                 $item = new Item();
                 $item->uri = $element->{'permalink'};
 		$item->title = $element->{'text'};
-                $item->thumbnailUri = $element->{'photos'}[0]->{'m'};
-                if (isset($item->thumbnailUri)) {
-                  $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>';
+                $thumbnailUri = $element->{'photos'}[0]->{'m'};
+                if (isset($thumbnailUri)) {
+                  $item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a>';
                 }else{
                   $item->content = $element->{'html'};
                 }
diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php
index 7490c86..f0c91c7 100644
--- a/bridges/TbibBridge.php
+++ b/bridges/TbibBridge.php
@@ -7,7 +7,7 @@ class TbibBridge extends BridgeAbstract{
 		$this->name = "Tbib";
 		$this->uri = "http://tbib.org/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -41,10 +41,10 @@ class TbibBridge extends BridgeAbstract{
 		$item->uri = 'http://tbib.org/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
+		$thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('alt');
 		$item->title = 'Tbib | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php
index 2fb6a1a..ab43fad 100644
--- a/bridges/TheHackerNewsBridge.php
+++ b/bridges/TheHackerNewsBridge.php
@@ -7,7 +7,7 @@ class TheHackerNewsBridge extends BridgeAbstract {
         $this->name = 'The Hacker News Bridge';
         $this->uri = 'https://thehackernews.com/';
         $this->description = 'Cyber Security, Hacking, Technology News.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
 
     }
 
@@ -55,7 +55,6 @@ class TheHackerNewsBridge extends BridgeAbstract {
                 $article_author = trim($element->find('span.vcard', 0)->plaintext);
                 $article_title = $element->find('a.entry-title', 0)->plaintext;
                 $article_timestamp = strtotime($element->find('span.updated', 0)->plaintext);
-                $article_thumbnail = $element->find('img', 0)->src;
                 $article = $this->file_get_html($article_url) or $this->returnError('Could not request TheHackerNews: '.$article_url, 500);
 
                 $contents = $article->find('div.articlebodyonly', 0)->innertext;
@@ -66,7 +65,6 @@ class TheHackerNewsBridge extends BridgeAbstract {
                 $item->uri = $article_url;
                 $item->title = $article_title;
                 $item->author = $article_author;
-                $item->thumbnailUri = $article_thumbnail;
                 $item->timestamp = $article_timestamp;
                 $item->content = trim($contents);
                 $this->items[] = $item;
diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php
index c3dbdef..adebd05 100644
--- a/bridges/TwitchApiBridge.php
+++ b/bridges/TwitchApiBridge.php
@@ -13,7 +13,7 @@ class TwitchApiBridge extends BridgeAbstract{
 		$this->name = "Twitch API Bridge";
 		$this->uri = "http://www.twitch.tv";
 		$this->description = "Returns the newest broadcasts or highlights by channel name using the Twitch API (v3)";
-		$this->update = "2016-01-09";
+		$this->update = "2016-08-09";
 
 		$this->parameters["Get channel without limit"] =
 		'[
@@ -140,10 +140,9 @@ class TwitchApiBridge extends BridgeAbstract{
 				$item = new \Item();
 				$item->id = $video->_id;
 				$item->uri = $video->url;
-				$item->thumbnailUri = $video->preview;
 				$item->title = htmlspecialchars($video->title);
 				$item->timestamp = strtotime($video->recorded_at);
-				$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
+				$item->content = '<a href="' . $item->uri . '"><img src="' . $video->preview . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
 				$this->items[] = $item;
 				
 				// Stop once the number of requested items is reached
diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php
index 2ac8ef2..6fa5c3c 100644
--- a/bridges/UnsplashBridge.php
+++ b/bridges/UnsplashBridge.php
@@ -7,7 +7,7 @@ class UnsplashBridge extends BridgeAbstract {
 		$this->name = "Unsplash Bridge";
 		$this->uri = "http://unsplash.com/";
 		$this->description = "Returns the latests photos from Unsplash";
-		$this->update = "2015-03-02";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -61,8 +61,7 @@ class UnsplashBridge extends BridgeAbstract {
                                          $thumbnail->src).'.jpg';           // '.jpg' only for format hint
                 $item->timestamp = time();
                 $item->title = $thumbnail->alt;
-                $item->thumbnailUri = $thumbnail->src;
-                $item->content = $item->title.'<br><a href="'.$item->uri.'"><img src="'.$item->thumbnailUri.'" /></a>';
+                $item->content = $item->title.'<br><a href="'.$item->uri.'"><img src="'.$thumbnail->src.'" /></a>';
                 $this->items[] = $item;
 
                 $num++;
diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompany.php
index 325cf1a..d5369a5 100644
--- a/bridges/ViadeoCompany.php
+++ b/bridges/ViadeoCompany.php
@@ -7,7 +7,7 @@ class ViadeoCompany extends BridgeAbstract{
 		$this->name = "Viadeo Company";
 		$this->uri = "https://www.viadeo.com/";
 		$this->description = "Returns most recent actus from Company on Viadeo. (http://www.viadeo.com/fr/company/<strong style=\"font-weight:bold;\">apple</strong>)";
-		$this->update = "2015-12-22";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -30,8 +30,7 @@ class ViadeoCompany extends BridgeAbstract{
                 $item = new \Item();
                 $item->uri = $link;
                 $item->title = mb_substr($element->find('p', 0)->innertext, 0 ,100);
-                $item->content = $element->find('p', 0)->innertext;
-                $item->thumbnailUri = str_replace('//', 'http://', $element->find('img.usage-article__image_only', 0)->src);
+                $item->content = $element->find('p', 0)->innertext;;
                 $this->items[] = $item;
                 $i++;
             }
diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php
index 3379e82..2cd3d2d 100644
--- a/bridges/WallpaperStopBridge.php
+++ b/bridges/WallpaperStopBridge.php
@@ -11,7 +11,7 @@ class WallpaperStopBridge extends BridgeAbstract {
 		$this->name = "WallpaperStop Bridge";
 		$this->uri = "http://www.wallpaperstop.com/";
 		$this->description = "Returns the latests wallpapers from WallpaperStop";
-		$this->update = "2014-11-05";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -73,8 +73,7 @@ class WallpaperStopBridge extends BridgeAbstract {
                         $item->id = $matches[3];
                         $item->timestamp = time();
                         $item->title = $thumbnail->title;
-                        $item->thumbnailUri = $baseUri.$thumbnail->src;
-                        $item->content = $item->title.'<br><a href="'.$wplink.'"><img src="'.$item->thumbnailUri.'" /></a>';
+                        $item->content = $item->title.'<br><a href="'.$wplink.'"><img src="'.$baseUri.$thumbnail->src.'" /></a>';
                         $this->items[] = $item;
 
                         $num++;
diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php
index 4fd23ea..9fdf87b 100644
--- a/bridges/WeLiveSecurityBridge.php
+++ b/bridges/WeLiveSecurityBridge.php
@@ -6,7 +6,7 @@ class WeLiveSecurityBridge extends BridgeAbstract {
         $this->name = 'We Live Security';
         $this->uri = 'http://www.welivesecurity.com/';
         $this->description = 'Returns the newest articles.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
     }
 
     public function collectData(array $param) {
@@ -49,7 +49,6 @@ class WeLiveSecurityBridge extends BridgeAbstract {
 
                 $item = new \Item();
                 $item->uri = $article_url;
-                $item->thumbnailUri = $article_image;
                 $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);
diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php
index b867987..74fe4ab 100644
--- a/bridges/XbooruBridge.php
+++ b/bridges/XbooruBridge.php
@@ -7,7 +7,7 @@ class XbooruBridge extends BridgeAbstract{
 		$this->name = "Xbooru";
 		$this->uri = "http://xbooru.com/";
 		$this->description = "Returns images from given page";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -41,10 +41,10 @@ class XbooruBridge extends BridgeAbstract{
 		$item->uri = 'http://xbooru.com/'.$element->find('a', 0)->href;
 		$item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));	
 		$item->timestamp = time();
-		$item->thumbnailUri = $element->find('img', 0)->src;
+		$thumbnailUri = $element->find('img', 0)->src;
 		$item->tags = $element->find('img', 0)->getAttribute('alt');
 		$item->title = 'Xbooru | '.$item->postid;
-		$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$item->tags;
+		$item->content = '<a href="' . $item->uri . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item->tags;
 		$this->items[] = $item; 
 	}
     }
diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php
index 83245e2..088599f 100644
--- a/bridges/YandereBridge.php
+++ b/bridges/YandereBridge.php
@@ -7,7 +7,7 @@ class YandereBridge extends BridgeAbstract{
 		$this->name = "Yande.re";
 		$this->uri = "https://yande.re/";
 		$this->description = "Returns images from given page and tags";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -44,9 +44,8 @@ class YandereBridge extends BridgeAbstract{
             $item->postid = $json['id'];
             $item->timestamp = $json['created_at'];
             $item->imageUri = $json['file_url'];
-            $item->thumbnailUri = $json['preview_url'];
             $item->title = 'Yandere | '.$json['id'];
-            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $item->thumbnailUri . '" /></a><br>Tags: '.$json['tags']; 
+            $item->content = '<a href="' . $item->imageUri . '"><img src="' . $json['preview_url'] . '" /></a><br>Tags: '.$json['tags']; 
             $this->items[] = $item;
         }
     }
diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index 971b133..bd6baae 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -14,7 +14,7 @@ class YoutubeBridge extends BridgeAbstract {
 		$this->homepage = $this->getURI();
 		$this->description = 'Returns the 10 newest videos by username/channel/playlist or search';
 		$this->maintainer = 'mitsukarenai';
-		$this->update = '02/05/2016';
+		$this->update = '2016-08-09';
 
 		$this->parameters['By username'] =
 		'[
@@ -83,8 +83,8 @@ class YoutubeBridge extends BridgeAbstract {
 		$item->author = $author;
 		$item->timestamp = $time;
 		$item->uri = $this->getURI().'watch?v='.$vid;
-		$item->thumbnailUri = str_replace('/www.', '/img.', $this->getURI()).'vi/'.$vid.'/0.jpg';
-		$item->content = '<a href="'.$item->uri.'"><img src="'.$item->thumbnailUri.'" /></a><br />'.$desc;
+		$thumbnailUri = str_replace('/www.', '/img.', $this->getURI()).'vi/'.$vid.'/0.jpg';
+		$item->content = '<a href="'.$item->uri.'"><img src="'.$thumbnailUri.'" /></a><br />'.$desc;
 		$this->items[] = $item;
 	}
 
diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 1b2b4df..5859adc 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -7,7 +7,7 @@ class ZDNetBridge extends BridgeAbstract {
         $this->name = 'ZDNet Bridge';
         $this->uri = 'http://www.zdnet.com/';
         $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
-        $this->update = '2016-08-06';
+        $this->update = '2016-08-09';
 
         $this->parameters[] =
         // http://www.zdnet.com/zdnet.opml
@@ -286,14 +286,10 @@ class ZDNetBridge extends BridgeAbstract {
                     .'<p><b>'.$article_subtitle.'</b></p>'
                     .$contents;
 
-                if ($thumbnail == '')
-                    $thumbnail = 'http://zdnet1.cbsistatic.com/fly/bundles/zdnetcss/images/logos/logo-192x192.png';
-
                 $item = new \Item();
                 $item->author = $author;
                 $item->uri = $article_url;
                 $item->title = $article_title;
-                $item->thumbnailUri = $thumbnail;
                 $item->timestamp = $article_timestamp;
                 $item->content = $contents;
                 $this->items[] = $item;

From be487a6950d4c8c652572afa0b552165692dab83 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 16:27:32 +0200
Subject: [PATCH 121/149] [MrssFormat] Link channel to rss-bridge host

This is the same behavior as in AtomFormat
---
 formats/MrssFormat.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index d80b267..8d95b50 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -56,7 +56,7 @@ EOD;
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/" xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
         <title>{$title}</title>
-        <link>{$uri}/</link>
+        <link>http{$https}://{$httpHost}{$httpInfo}/</link>
         <description>{$title}</description>
         <atom:link rel="self" href="http{$https}://{$httpHost}{$serverRequestUri}" />
         {$items}

From e3c578510b96f37b8466e88329826b0c39e91f7a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 16:36:31 +0200
Subject: [PATCH 122/149] [AtomFormat] Change xml_encode($) to private scope

---
 formats/AtomFormat.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index fac3e55..0758d96 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -1,9 +1,4 @@
 <?php
-
-function xml_encode($text) {
-	return htmlspecialchars($text, ENT_XML1);
-}
-
 /**
 * Atom
 * Documentation Source http://en.wikipedia.org/wiki/Atom_%28standard%29 and http://tools.ietf.org/html/rfc4287
@@ -18,20 +13,20 @@ class AtomFormat extends FormatAbstract{
         $httpHost = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
         $httpInfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
 
-        $serverRequestUri = xml_encode($_SERVER['REQUEST_URI']);
+        $serverRequestUri = $this->xml_encode($_SERVER['REQUEST_URI']);
 
         $extraInfos = $this->getExtraInfos();
-        $title = xml_encode($extraInfos['name']);
+        $title = $this->xml_encode($extraInfos['name']);
         $uri = $extraInfos['uri'];
-        $icon = xml_encode('http://icons.better-idea.org/icon?url='. $uri .'&size=64');
-        $uri = xml_encode($uri);
+        $icon = $this->xml_encode('http://icons.better-idea.org/icon?url='. $uri .'&size=64');
+        $uri = $this->xml_encode($uri);
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryAuthor = is_null($data->author) ? $title : xml_encode($data->author);
-            $entryTitle = is_null($data->title) ? '' : xml_encode($data->title);
-            $entryUri = is_null($data->uri) ? '' : xml_encode($data->uri);
-            $entryTimestamp = is_null($data->timestamp) ? '' : xml_encode(date(DATE_ATOM, $data->timestamp));
+            $entryAuthor = is_null($data->author) ? $title : $this->xml_encode($data->author);
+            $entryTitle = is_null($data->title) ? '' : $this->xml_encode($data->title);
+            $entryUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
+            $entryTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_ATOM, $data->timestamp));
             // We prevent content from closing the CDATA too early.
             $entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>';
 
@@ -96,4 +91,8 @@ EOD;
 
         return parent::display();
     }
+
+    private function xml_encode($text) {
+        return htmlspecialchars($text, ENT_XML1);
+    }
 }

From 368fc66fbf1d0612f5721dfbb98232236b6645cd Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 16:45:33 +0200
Subject: [PATCH 123/149] [AtomFormat] Use default feed URI if non defined

---
 formats/AtomFormat.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 0758d96..d72e8b7 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -17,7 +17,7 @@ class AtomFormat extends FormatAbstract{
 
         $extraInfos = $this->getExtraInfos();
         $title = $this->xml_encode($extraInfos['name']);
-        $uri = $extraInfos['uri'];
+        $uri = !empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/sebsauvage/rss-bridge';
         $icon = $this->xml_encode('http://icons.better-idea.org/icon?url='. $uri .'&size=64');
         $uri = $this->xml_encode($uri);
 

From ae716abf6581973f5ff7bfb80017bbc8155ccb15 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 16:49:27 +0200
Subject: [PATCH 124/149] [MrssFormat] Remove unused  and create default URI if
 non defined

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

diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index 8d95b50..fc00ae2 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -17,8 +17,7 @@ class MrssFormat extends FormatAbstract{
 
         $extraInfos = $this->getExtraInfos();
         $title = htmlspecialchars($extraInfos['name']);
-        $uri = htmlspecialchars($extraInfos['uri']);
-        $icon = 'http://g.etfv.co/'. $uri .'?icon.jpg';
+        $uri = !empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/sebsauvage/rss-bridge';
 
         $items = '';
         foreach($this->getDatas() as $data){
@@ -58,6 +57,7 @@ EOD;
         <title>{$title}</title>
         <link>http{$https}://{$httpHost}{$httpInfo}/</link>
         <description>{$title}</description>
+        <atom:link rel="alternate" type="text/html" href="{$uri}" />
         <atom:link rel="self" href="http{$https}://{$httpHost}{$serverRequestUri}" />
         {$items}
     </channel>

From 8b468e94a8dcf076fdd0b7c8d6e34a5d225eadfa Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 17:02:45 +0200
Subject: [PATCH 125/149] [AtomFormat] Use XML encoding instead of CDATA
 section

---
 formats/AtomFormat.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index d72e8b7..b71b15c 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -28,7 +28,7 @@ class AtomFormat extends FormatAbstract{
             $entryUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
             $entryTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_ATOM, $data->timestamp));
             // We prevent content from closing the CDATA too early.
-            $entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>';
+            $entryContent = is_null($data->content) ? '' : $this->xml_encode($this->sanitizeHtml($data->content));
 
             $entries .= <<<EOD
 

From 0d94f1fe0eddc5a4903c4253e44c2c649516fc05 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 17:05:29 +0200
Subject: [PATCH 126/149] [MrssFormat] Use XML encoding on data

---
 formats/MrssFormat.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index fc00ae2..1f76a7e 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -13,20 +13,20 @@ class MrssFormat extends FormatAbstract{
         $httpHost = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
         $httpInfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
 
-        $serverRequestUri = htmlspecialchars($_SERVER['REQUEST_URI']);
+        $serverRequestUri = $this->xml_encode($_SERVER['REQUEST_URI']);
 
         $extraInfos = $this->getExtraInfos();
-        $title = htmlspecialchars($extraInfos['name']);
-        $uri = !empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/sebsauvage/rss-bridge';
+        $title = $this->xml_encode($extraInfos['name']);
+        $uri = $this->xml_encode(!empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/sebsauvage/rss-bridge');
 
         $items = '';
         foreach($this->getDatas() as $data){
-            $itemTitle = strip_tags(is_null($data->title) ? '' : $data->title);
-            $itemUri = is_null($data->uri) ? '' : $data->uri;
-            $itemAuthor = is_null($data->author) ? '' : $data->author;
-            $itemTimestamp = is_null($data->timestamp) ? '' : date(DATE_RFC2822, $data->timestamp);
+            $itemTitle = strip_tags(is_null($data->title) ? '' : $this->xml_encode($data->title));
+            $itemUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
+            $itemAuthor = is_null($data->author) ? $title : $this->xml_encode($data->author);
+            $itemTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_RFC2822, $data->timestamp));
             // We prevent content from closing the CDATA too early.
-            $itemContent = is_null($data->content) ? '' : htmlspecialchars($this->sanitizeHtml(str_replace(']]>','',$data->content)));
+            $itemContent = is_null($data->content) ? '' : $this->xml_encode($this->sanitizeHtml($data->content));
 
             $items .= <<<EOD
 
@@ -82,4 +82,8 @@ EOD;
 
         return parent::display();
     }
+
+    private function xml_encode($text) {
+        return htmlspecialchars($text, ENT_XML1);
+    }
 }

From 606e756bc12c51d70f23bcd11df88fe7311827a7 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 17:12:28 +0200
Subject: [PATCH 127/149] formats: Use same general entity generation order

---
 formats/AtomFormat.php | 4 +---
 formats/HtmlFormat.php | 8 ++++----
 formats/MrssFormat.php | 4 +---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index b71b15c..06ef8eb 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -23,13 +23,11 @@ class AtomFormat extends FormatAbstract{
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryAuthor = is_null($data->author) ? $title : $this->xml_encode($data->author);
+            $entryAuthor = is_null($data->author) ? '' : $this->xml_encode($data->author);
             $entryTitle = is_null($data->title) ? '' : $this->xml_encode($data->title);
             $entryUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
             $entryTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_ATOM, $data->timestamp));
-            // We prevent content from closing the CDATA too early.
             $entryContent = is_null($data->content) ? '' : $this->xml_encode($this->sanitizeHtml($data->content));
-
             $entries .= <<<EOD
 
     <entry>
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index 20d4901..6c75a8e 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -12,14 +12,14 @@ class HtmlFormat extends FormatAbstract{
         $extraInfos = $this->getExtraInfos();
         $title = htmlspecialchars($extraInfos['name']);
         $uri = htmlspecialchars($extraInfos['uri']);
-	$atomquery = str_replace('format=HtmlFormat', 'format=AtomFormat', htmlentities($_SERVER['QUERY_STRING']));
+        $atomquery = str_replace('format=HtmlFormat', 'format=AtomFormat', htmlentities($_SERVER['QUERY_STRING']));
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryUri = is_null($data->uri) ? $uri : $data->uri;
-            $entryTitle = is_null($data->title) ? '' : $this->sanitizeHtml(strip_tags($data->title));
-            $entryTimestamp = is_null($data->timestamp) ? '' : '<time datetime="' . date(DATE_ATOM, $data->timestamp) . '">' . date(DATE_ATOM, $data->timestamp) . '</time>';
             $entryAuthor = is_null($data->author) ? '' : '<br /><p class="author">by: ' . $data->author . '</p>';
+            $entryTitle = is_null($data->title) ? '' : $this->sanitizeHtml(strip_tags($data->title));
+            $entryUri = is_null($data->uri) ? $uri : $data->uri;
+            $entryTimestamp = is_null($data->timestamp) ? '' : '<time datetime="' . date(DATE_ATOM, $data->timestamp) . '">' . date(DATE_ATOM, $data->timestamp) . '</time>';
             $entryContent = is_null($data->content) ? '' : '<div class="content">' . $this->sanitizeHtml($data->content). '</div>';
             $entries .= <<<EOD
 
diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index 1f76a7e..46012e9 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -21,13 +21,11 @@ class MrssFormat extends FormatAbstract{
 
         $items = '';
         foreach($this->getDatas() as $data){
+            $itemAuthor = is_null($data->author) ? '' : $this->xml_encode($data->author);
             $itemTitle = strip_tags(is_null($data->title) ? '' : $this->xml_encode($data->title));
             $itemUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
-            $itemAuthor = is_null($data->author) ? $title : $this->xml_encode($data->author);
             $itemTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_RFC2822, $data->timestamp));
-            // We prevent content from closing the CDATA too early.
             $itemContent = is_null($data->content) ? '' : $this->xml_encode($this->sanitizeHtml($data->content));
-
             $items .= <<<EOD
 
     <item>

From d79366f479eb345eff07581987fee1bfbb34a9b2 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 17:17:37 +0200
Subject: [PATCH 128/149] [HtmlFormat] Add button for MRSS feed

---
 formats/HtmlFormat.php | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index 6c75a8e..19b7702 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -13,6 +13,7 @@ class HtmlFormat extends FormatAbstract{
         $title = htmlspecialchars($extraInfos['name']);
         $uri = htmlspecialchars($extraInfos['uri']);
         $atomquery = str_replace('format=HtmlFormat', 'format=AtomFormat', htmlentities($_SERVER['QUERY_STRING']));
+        $mrssquery = str_replace('format=HtmlFormat', 'format=MrssFormat', htmlentities($_SERVER['QUERY_STRING']));
 
         $entries = '';
         foreach($this->getDatas() as $data){
@@ -24,10 +25,10 @@ class HtmlFormat extends FormatAbstract{
             $entries .= <<<EOD
 
 <section class="feeditem">
-	<h2><a class="itemtitle" href="{$entryUri}">{$entryTitle}</a></h2>
-	{$entryTimestamp}
-   {$entryAuthor}
-   {$entryContent}
+    <h2><a class="itemtitle" href="{$entryUri}">{$entryTitle}</a></h2>
+    {$entryTimestamp}
+    {$entryAuthor}
+    {$entryContent}
 </section>
 
 EOD;
@@ -39,14 +40,18 @@ EOD;
 <!DOCTYPE html>
 <html>
 <head>
-	<meta charset="UTF-8">
-	<title>{$title}</title>
-	<link href="css/HtmlFormat.css" rel="stylesheet">
-	<meta name="robots" content="noindex, follow">
+    <meta charset="UTF-8">
+    <title>{$title}</title>
+    <link href="css/HtmlFormat.css" rel="stylesheet">
+    <meta name="robots" content="noindex, follow">
 </head>
 <body>
-	<h1 class="pagetitle"><a href="{$uri}" target="_blank">{$title}</a></h1>
-	<div class="buttons"><a href="./#bridge-{$_GET['bridge']}"><button class="backbutton">← back to rss-bridge</button></a><a href="./?{$atomquery}"><button class="rss-feed">RSS feed</button></a></div>
+    <h1 class="pagetitle"><a href="{$uri}" target="_blank">{$title}</a></h1>
+    <div class="buttons">
+        <a href="./#bridge-{$_GET['bridge']}"><button class="backbutton">← back to rss-bridge</button></a>
+        <a href="./?{$atomquery}"><button class="rss-feed">RSS feed (ATOM)</button></a>
+        <a href="./?{$mrssquery}"><button class="rss-feed">RSS feed (MRSS)</button></a>
+    </div>
 {$entries}
 </body>
 </html>

From 63bb7ef24ded812d6c4b959ddbe0cafe04c83b39 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 20:01:21 +0200
Subject: [PATCH 129/149] bridges: Remove unnecessary functions getName() and
 getURI()

---
 bridges/ABCTabsBridge.php               | 12 ------------
 bridges/AcrimedBridge.php               | 14 +-------------
 bridges/AnimeUltimeBridge.php           |  4 ----
 bridges/ArstechnicaBridge.php           |  9 ---------
 bridges/Arte7Bridge.php                 |  8 --------
 bridges/BandcampBridge.php              |  4 ----
 bridges/BastaBridge.php                 | 10 +---------
 bridges/BlaguesDeMerdeBridge.php        |  8 --------
 bridges/BooruprojectBridge.php          |  8 --------
 bridges/CADBridge.php                   | 10 +---------
 bridges/CastorusBridge.php              | 18 +++++-------------
 bridges/CollegeDeFranceBridge.php       | 10 +---------
 bridges/CommonDreamsBridge.php          | 10 +---------
 bridges/CopieDoubleBridge.php           | 10 +---------
 bridges/CourrierInternationalBridge.php | 12 ++----------
 bridges/CryptomeBridge.php              | 10 +---------
 bridges/DailymotionBridge.php           |  4 ----
 bridges/DanbooruBridge.php              |  8 --------
 bridges/DansTonChatBridge.php           | 12 ++----------
 bridges/DauphineLibereBridge.php        | 12 ++----------
 bridges/DemoBridge.php                  | 12 ------------
 bridges/DeveloppezDotComBridge.php      | 10 +---------
 bridges/DollbooruBridge.php             |  8 --------
 bridges/DuckDuckGoBridge.php            | 10 +---------
 bridges/EZTVBridge.php                  | 10 +---------
 bridges/EliteDangerousGalnetBridge.php  | 12 +-----------
 bridges/ElsevierBridge.php              |  8 --------
 bridges/FierPandaBridge.php             | 10 +---------
 bridges/FlickrExploreBridge.php         |  8 --------
 bridges/FlickrTagBridge.php             |  8 --------
 bridges/FootitoBridge.php               |  8 --------
 bridges/FourchanBridge.php              | 10 +---------
 bridges/GBAtempBridge.php               | 24 ++++++++++--------------
 bridges/GelbooruBridge.php              |  8 --------
 bridges/GiphyBridge.php                 | 10 +---------
 bridges/GithubIssueBridge.php           |  8 --------
 bridges/GitlabCommitsBridge.php         |  8 --------
 bridges/GizmodoFRBridge.php             | 10 +---------
 bridges/GoogleSearchBridge.php          |  6 +-----
 bridges/GuruMedBridge.php               | 10 +---------
 bridges/HDWallpapersBridge.php          |  4 ----
 bridges/HentaiHavenBridge.php           |  9 ++-------
 bridges/InstagramBridge.php             |  6 +-----
 bridges/JapanExpoBridge.php             | 10 +---------
 bridges/KonachanBridge.php              |  8 --------
 bridges/KoreusBridge.php                | 10 +---------
 bridges/LWNprevBridge.php               |  8 --------
 bridges/LeBonCoinBridge.php             | 10 +---------
 bridges/LeJournalDuGeekBridge.php       | 10 +---------
 bridges/LeMondeInformatiqueBridge.php   |  8 --------
 bridges/LesJoiesDuCodeBridge.php        |  8 --------
 bridges/LinkedInCompany.php             |  8 --------
 bridges/LolibooruBridge.php             |  8 --------
 bridges/MangareaderBridge.php           |  4 ----
 bridges/MilbooruBridge.php              |  8 --------
 bridges/MondeDiploBridge.php            | 18 +++++-------------
 bridges/MsnMondeBridge.php              | 16 ++++------------
 bridges/MspabooruBridge.php             |  8 --------
 bridges/NasaApodBridge.php              | 10 +---------
 bridges/NeuviemeArtBridge.php           | 12 ++----------
 bridges/NextInpactBridge.php            |  8 --------
 bridges/NiceMatinBridge.php             | 10 +---------
 bridges/NovelUpdatesBridge.php          |  7 +++----
 bridges/NumeramaBridge.php              | 12 ++----------
 bridges/OpenClassroomsBridge.php        | 10 +---------
 bridges/ParuVenduImmoBridge.php         | 12 ++++--------
 bridges/PickyWallpapersBridge.php       |  4 ----
 bridges/PlanetLibreBridge.php           |  8 +-------
 bridges/ProjectMGameBridge.php          | 10 +---------
 bridges/RTBFBridge.php                  |  4 ----
 bridges/Releases3DSBridge.php           |  8 --------
 bridges/ReporterreBridge.php            | 12 ++----------
 bridges/Rue89Bridge.php                 |  8 +-------
 bridges/Rule34Bridge.php                |  8 --------
 bridges/Rule34pahealBridge.php          |  8 --------
 bridges/SafebooruBridge.php             |  8 --------
 bridges/SakugabooruBridge.php           |  8 --------
 bridges/ScmbBridge.php                  | 10 +---------
 bridges/ScoopItBridge.php               | 10 +---------
 bridges/SensCritiqueBridge.php          |  4 ----
 bridges/Sexactu.php                     | 11 +++--------
 bridges/SiliconBridge.php               | 13 ++-----------
 bridges/StripeAPIChangeLogBridge.php    | 10 +---------
 bridges/SuperbWallpapersBridge.php      |  4 ----
 bridges/T411Bridge.php                  | 16 ++++------------
 bridges/TagBoardBridge.php              |  4 ----
 bridges/TbibBridge.php                  |  8 --------
 bridges/TheCodingLoveBridge.php         |  8 --------
 bridges/ThePirateBayBridge.php          | 10 +---------
 bridges/TwitchApiBridge.php             |  4 ----
 bridges/TwitterBridge.php               |  6 +-----
 bridges/TwitterBridgeClean.php          |  6 +-----
 bridges/TwitterBridgeCleanExtended.php  |  6 +-----
 bridges/TwitterBridgeExtended.php       | 10 +---------
 bridges/TwitterBridgeTweaked.php        | 10 +---------
 bridges/UnsplashBridge.php              |  8 --------
 bridges/ViadeoCompany.php               |  8 --------
 bridges/VineBridge.php                  | 10 +---------
 bridges/WallpaperStopBridge.php         |  4 ----
 bridges/WordPressBridge.php             |  6 +-----
 bridges/XbooruBridge.php                |  8 --------
 bridges/YandereBridge.php               |  8 --------
 bridges/YoutubeBridge.php               | 24 ++++++++++--------------
 bridges/ZatazBridge.php                 | 16 ++++------------
 104 files changed, 107 insertions(+), 854 deletions(-)

diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php
index 29b41e0..8e2becc 100644
--- a/bridges/ABCTabsBridge.php
+++ b/bridges/ABCTabsBridge.php
@@ -29,16 +29,4 @@ class ABCTabsBridge extends BridgeAbstract{
 		    $this->items[] = $item;
 		}
     }
-
-	public function getName() {
-
-		return "ABC Tabs Bridge";
-
-	}
-
-	public function getURI() {
-
-		return "http://www.abc-tabs.com/";
-
-	}
 }
diff --git a/bridges/AcrimedBridge.php b/bridges/AcrimedBridge.php
index 4ef08bd..85e93fe 100644
--- a/bridges/AcrimedBridge.php
+++ b/bridges/AcrimedBridge.php
@@ -7,7 +7,7 @@ class AcrimedBridge extends RssExpander{
 			$this->name = "Acrimed Bridge";
 			$this->uri = "http://www.acrimed.org/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "2014-05-25";
+			$this->update = "2016-08-09";
 
 		}
 
@@ -40,18 +40,6 @@ class AcrimedBridge extends RssExpander{
 
 		}
 
-	public function getName() {
-
-		return "Acrimed Bridge";
-
-	}
-
-	public function getURI() {
-
-		return "http://www.acrimed.org/";
-
-	}
-
     public function getCacheDuration(){
         return 4800; // 2 hours
     }
diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php
index 224f664..274b64c 100644
--- a/bridges/AnimeUltimeBridge.php
+++ b/bridges/AnimeUltimeBridge.php
@@ -125,10 +125,6 @@ class AnimeUltimeBridge extends BridgeAbstract {
         return 'Latest '.$this->filter.' - Anime-Ultime Bridge';
     }
 
-    public function getURI() {
-        return 'http://www.anime-ultime.net/';
-    }
-
     public function getCacheDuration() {
         return 3600*3; // 3 hours
     }
diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
index 3e0b3c4..a4a08ce 100644
--- a/bridges/ArstechnicaBridge.php
+++ b/bridges/ArstechnicaBridge.php
@@ -62,17 +62,8 @@ class ArstechnicaBridge extends BridgeAbstract {
 
 }
 
-
-        public function getName() {
-                return 'ArsTechnica';
-        }
-
         public function getCacheDuration() {
                 return 7200; // 2h
         }
 
-        public function getURI() {
-                return "http://arstechnica.com";
-        }
-
 }
diff --git a/bridges/Arte7Bridge.php b/bridges/Arte7Bridge.php
index 2c2e2f6..25b7d45 100644
--- a/bridges/Arte7Bridge.php
+++ b/bridges/Arte7Bridge.php
@@ -156,14 +156,6 @@ class Arte7Bridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Arte7';
-    }
-
-    public function getURI(){
-        return 'http://www.arte.tv/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php
index 80e3dee..e396e7e 100644
--- a/bridges/BandcampBridge.php
+++ b/bridges/BandcampBridge.php
@@ -51,10 +51,6 @@ class BandcampBridge extends BridgeAbstract{
         return (!empty($this->request) ? $this->request .' - ' : '') .'Bandcamp Tag';
     }
 
-    public function getURI(){
-        return 'http://bandcamp.com';
-    }
-
     public function getCacheDuration(){
         return 600; // 10 minutes
     }
diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php
index acdcd67..5c23ed3 100644
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -5,7 +5,7 @@ class BastaBridge extends BridgeAbstract{
 		$this->name = "Bastamag Bridge";
 		$this->uri = "http://www.bastamag.net/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-02";
+		$this->update = "2016-08-09";
 	}
 	
 	public function collectData(array $param){
@@ -30,14 +30,6 @@ class BastaBridge extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'Bastamag Bridge';
-	}
-
-	public function getURI(){
-		return 'http://bastamag.net/';
-	}
-
 	public function getCacheDuration(){
 		return 3600*2; // 2 hours
 	}
diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php
index d977cae..b6c6405 100644
--- a/bridges/BlaguesDeMerdeBridge.php
+++ b/bridges/BlaguesDeMerdeBridge.php
@@ -32,14 +32,6 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'blaguesdemerde';
-    }
-
-    public function getURI(){
-        return 'http://www.blaguesdemerde.fr/';
-    }
-
     public function getCacheDuration(){
         return 7200; // 2h hours
     }
diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php
index 3ed40f2..34c79d6 100644
--- a/bridges/BooruprojectBridge.php
+++ b/bridges/BooruprojectBridge.php
@@ -58,14 +58,6 @@ class BooruprojectBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Booruproject';
-    }
-
-    public function getURI(){
-        return 'http://booru.org/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php
index 299bd10..0b57ee5 100644
--- a/bridges/CADBridge.php
+++ b/bridges/CADBridge.php
@@ -5,7 +5,7 @@ class CADBridge extends BridgeAbstract{
 		$this->name = "CAD Bridge";
 		$this->uri = "http://www.cad-comic.com/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function CADExtractContent($url) {
@@ -63,14 +63,6 @@ class CADBridge extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'CAD Bridge';
-	}
-
-	public function getURI(){
-		return 'http://www.cad-comic.com/';
-	}
-
 	public function getCacheDuration(){
 		return 3600*2; // 2 hours
 	}
diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
index a6ac5f4..6be6588 100644
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -3,9 +3,9 @@ class CastorusBridge extends BridgeAbstract {
 	public function loadMetadatas(){
 		$this->maintainer = "logmanoriginal";
 		$this->name = "Castorus Bridge";
-		$this->uri = $this->getURI();
+		$this->uri = 'http://www.castorus.com';
 		$this->description = "Returns the latest changes";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters["Get latest changes"] = '[]';
 		$this->parameters["Get latest changes via ZIP code"] = 
@@ -49,7 +49,7 @@ class CastorusBridge extends BridgeAbstract {
 		if(!$url)
 			$this->returnError('Cannot find url!', 404);
 		
-		return $this->getURI() . $url->href;
+		return $this->uri . $url->href;
 	}
 
 	// Extracts the time from an activity
@@ -85,10 +85,10 @@ class CastorusBridge extends BridgeAbstract {
 		if(isset($params['city']))
 			$city_filter = trim($params['city']);
 
-		$html = $this->file_get_html($this->getURI());
+		$html = $this->file_get_html($this->uri);
 
 		if(!$html)
-			$this->returnError('Could not load data from ' . $this->getURI() . '!', 404);
+			$this->returnError('Could not load data from ' . $this->uri . '!', 404);
 		
 		$activities = $html->find('div#activite/li');
 
@@ -116,14 +116,6 @@ class CastorusBridge extends BridgeAbstract {
 		}
 	}
 
-	public function getName(){
-		return 'Castorus Bridge';
-	}
-
-	public function getURI(){
-		return 'http://www.castorus.com';
-	}
-
 	public function getCacheDuration(){
 		return 600; // 10 minutes
 	}
diff --git a/bridges/CollegeDeFranceBridge.php b/bridges/CollegeDeFranceBridge.php
index 585ceba..5dbd195 100644
--- a/bridges/CollegeDeFranceBridge.php
+++ b/bridges/CollegeDeFranceBridge.php
@@ -6,7 +6,7 @@ class CollegeDeFranceBridge extends BridgeAbstract{
 		$this->name = "CollegeDeFrance";
 		$this->uri = "http://www.college-de-france.fr/";
 		$this->description = "Returns the latest audio and video from CollegeDeFrance";
-		$this->update = "2016-05-01";
+		$this->update = "2016-08-09";
 	}
 
 	public function collectData(array $param) {
@@ -54,14 +54,6 @@ class CollegeDeFranceBridge extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'CollegeDeFrance';
-	}
-
-	public function getURI(){
-		return 'http://www.college-de-france.fr/';
-	}
-
 	public function getCacheDuration(){
 		return 3600*3; // 3 hours
 	}
diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php
index 54cf526..08a055c 100644
--- a/bridges/CommonDreamsBridge.php
+++ b/bridges/CommonDreamsBridge.php
@@ -6,7 +6,7 @@ class CommonDreamsBridge extends BridgeAbstract{
 		$this->name = "CommonDreams Bridge";
 		$this->uri = "http://www.commondreams.org/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function CommonDreamsExtractContent($url) {
@@ -39,12 +39,4 @@ class CommonDreamsBridge extends BridgeAbstract{
 			}
 		}
 	}
-
-	public function getName(){
-		return 'CommonDreams Bridge';
-	}
-
-	public function getURI(){
-		return 'http://www.commondreams.org/';
-	}
 }
diff --git a/bridges/CopieDoubleBridge.php b/bridges/CopieDoubleBridge.php
index d629976..62935f6 100644
--- a/bridges/CopieDoubleBridge.php
+++ b/bridges/CopieDoubleBridge.php
@@ -7,7 +7,7 @@ class CopieDoubleBridge extends BridgeAbstract{
 		$this->name = "CopieDouble";
 		$this->uri = "http://www.copie-double.com/";
 		$this->description = "CopieDouble";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -42,14 +42,6 @@ class CopieDoubleBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'CopieDouble';
-    }
-
-    public function getURI(){
-        return 'http://www.copie-double.com';
-    }
-
     public function getCacheDuration(){
         return 14400; // 4 hours
     }
diff --git a/bridges/CourrierInternationalBridge.php b/bridges/CourrierInternationalBridge.php
index e35eb47..1e8f8cd 100644
--- a/bridges/CourrierInternationalBridge.php
+++ b/bridges/CourrierInternationalBridge.php
@@ -4,10 +4,10 @@ class CourrierInternationalBridge extends BridgeAbstract{
 	public function loadMetadatas() {
 
 		$this->maintainer = "teromene";
-		$this->name = "CourrierInternational";
+		$this->name = "Courrier International Bridge";
 		$this->uri = "http://CourrierInternational.fr/";
 		$this->description = "Courrier International bridge";
-		$this->update = "01/09/2015";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -61,14 +61,6 @@ class CourrierInternationalBridge extends BridgeAbstract{
 
     }
 
-    public function getName(){
-        return 'Courrier International Bridge';
-    }
-
-    public function getURI(){
-        return 'http://courrierinternational.com';
-    }
-
     public function getCacheDuration(){
         return 300; // 5 minutes
     }
diff --git a/bridges/CryptomeBridge.php b/bridges/CryptomeBridge.php
index 9f80671..74da107 100644
--- a/bridges/CryptomeBridge.php
+++ b/bridges/CryptomeBridge.php
@@ -7,7 +7,7 @@ class CryptomeBridge extends BridgeAbstract{
 		$this->name = "Cryptome";
 		$this->uri = "http://cryptome.org/";
 		$this->description = "Returns the N most recent documents.";
-		$this->update = "";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -46,14 +46,6 @@ class CryptomeBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Cryptome';
-    }
-
-    public function getURI(){
-        return 'https://secure.netsolhost.com/cryptome.org/';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php
index b9d4227..85afc3b 100644
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -96,10 +96,6 @@ class DailymotionBridge extends BridgeAbstract{
 		return (!empty($this->request) ? $this->request .' - ' : '') .'Dailymotion Bridge';
 	}
 
-	public function getURI(){
-		return 'https://www.dailymotion.com/';
-	}
-
 	public function getCacheDuration(){
 		return 3600*3; // 3 hours
 	}
diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php
index 91befb1..7f4560f 100644
--- a/bridges/DanbooruBridge.php
+++ b/bridges/DanbooruBridge.php
@@ -45,14 +45,6 @@ class DanbooruBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Danbooru';
-    }
-
-    public function getURI(){
-        return 'http://donmai.us/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/DansTonChatBridge.php b/bridges/DansTonChatBridge.php
index 947ed61..5f5d72e 100644
--- a/bridges/DansTonChatBridge.php
+++ b/bridges/DansTonChatBridge.php
@@ -5,9 +5,9 @@ class DansTonChatBridge extends BridgeAbstract{
 
 		$this->maintainer = "Astalaseven";
 		$this->name = "DansTonChat Bridge";
-		$this->uri = "http://danstonchat.com/latest.html";
+		$this->uri = "http://danstonchat.com";
 		$this->description = "Returns latest quotes from DansTonChat.";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -26,14 +26,6 @@ class DansTonChatBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'DansTonChat';
-    }
-
-    public function getURI(){
-        return 'http://danstonchat.com';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index 24477a7..7ef4161 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -4,10 +4,10 @@ class DauphineLibereBridge extends BridgeAbstract {
 	public function loadMetadatas() {
 
 		$this->maintainer = "qwertygc";
-		$this->name = "DauphineLibereBridge Bridge";
+		$this->name = "Dauphine Bridge";
 		$this->uri = "http://www.ledauphine.com/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -122,14 +122,6 @@ class DauphineLibereBridge extends BridgeAbstract {
 		}
 	}
 
-	public function getName(){
-		return 'Dauphine Bridge';
-	}
-
-	public function getURI(){
-		return 'http://ledauphine.com/';
-	}
-
 	public function getCacheDuration(){
 		return 3600*2; // 2 hours
 	}
diff --git a/bridges/DemoBridge.php b/bridges/DemoBridge.php
index 2e576c6..b772ad1 100644
--- a/bridges/DemoBridge.php
+++ b/bridges/DemoBridge.php
@@ -64,18 +64,6 @@ class DemoBridge extends BridgeAbstract{
 
     }
 
-	public function getName() {
-
-		return "DemoBridge";
-
-	}
-
-	public function getURI() {
-
-		return "http://github.com/sebsauvage/rss-bridge";
-
-	}
-
 	public function getCacheDuration(){
 		return 00; // 1 hour
 	}
diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php
index 66a9b2b..e44160f 100644
--- a/bridges/DeveloppezDotComBridge.php
+++ b/bridges/DeveloppezDotComBridge.php
@@ -6,7 +6,7 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 		$this->name = "Developpez.com Actus (FR)";
 		$this->uri = "http://www.developpez.com/";
 		$this->description = "Returns the 15 newest posts from DeveloppezDotCom (full text).";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function DeveloppezDotComStripCDATA($string) {
@@ -59,14 +59,6 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'DeveloppezDotCom';
-	}
-
-	public function getURI(){
-		return 'http://www.developpez.com/';
-	}
-
 	public function getCacheDuration(){
 		return 1800; // 30min
 	}
diff --git a/bridges/DollbooruBridge.php b/bridges/DollbooruBridge.php
index fe6d6fb..3f81071 100644
--- a/bridges/DollbooruBridge.php
+++ b/bridges/DollbooruBridge.php
@@ -48,14 +48,6 @@ class DollbooruBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Dollbooru';
-    }
-
-    public function getURI(){
-        return 'http://dollbooru.org/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/DuckDuckGoBridge.php b/bridges/DuckDuckGoBridge.php
index eca6327..999b8e3 100644
--- a/bridges/DuckDuckGoBridge.php
+++ b/bridges/DuckDuckGoBridge.php
@@ -7,7 +7,7 @@ class DuckDuckGoBridge extends BridgeAbstract{
 		$this->name = "DuckDuckGo";
 		$this->uri = "https://duckduckgo.com/";
 		$this->description = "Returns most recent results from DuckDuckGo.";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -33,14 +33,6 @@ class DuckDuckGoBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'DuckDuckGo';
-    }
-
-    public function getURI(){
-        return 'https://duckduckgo.com';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php
index c171aee..16c106c 100644
--- a/bridges/EZTVBridge.php
+++ b/bridges/EZTVBridge.php
@@ -7,7 +7,7 @@ class EZTVBridge extends BridgeAbstract{
 		$this->name = "EZTV";
 		$this->uri = "https://eztv.ch/";
 		$this->description = "Returns list of *recent* torrents for a specific show on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name.";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -72,12 +72,4 @@ class EZTVBridge extends BridgeAbstract{
             }
         }
 	}
-    
-    public function getName(){
-        return 'EZTV';
-    }
-
-    public function getURI(){
-        return 'https://eztv.ch/';
-    }
 }
diff --git a/bridges/EliteDangerousGalnetBridge.php b/bridges/EliteDangerousGalnetBridge.php
index f9ff981..38490b5 100644
--- a/bridges/EliteDangerousGalnetBridge.php
+++ b/bridges/EliteDangerousGalnetBridge.php
@@ -8,7 +8,7 @@ class EliteDangerousGalnetBridge extends BridgeAbstract
 		$this->name = "Elite: Dangerous Galnet";
 		$this->uri = "https://community.elitedangerous.com/galnet";
 		$this->description = "Returns the latest page of news from Galnet";
-		$this->update = "2016-04-06";
+		$this->update = "2016-08-09";
 	}
 
 	public function collectData(array $param)
@@ -36,16 +36,6 @@ class EliteDangerousGalnetBridge extends BridgeAbstract
 		}
 	}
 
-	public function getName()
-	{
-		return 'Elite: Dangerous Galnet';
-	}
-
-	public function getURI()
-	{
-		return 'https://community.elitedangerous.com/galnet';
-	}
-
 	public function getCacheDuration()
 	{
 		return 3600 * 2; // 2 hours
diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index cca3d85..6c44cac 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -76,14 +76,6 @@ class ElsevierBridge extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'Elsevier journals recent articles';
-	}
-
-	public function getURI(){
-		return 'http://www.journals.elsevier.com';
-	}
-
 	public function getCacheDuration(){
 		return 43200; // 12h
 	}
diff --git a/bridges/FierPandaBridge.php b/bridges/FierPandaBridge.php
index cba96d3..c747a5a 100644
--- a/bridges/FierPandaBridge.php
+++ b/bridges/FierPandaBridge.php
@@ -7,7 +7,7 @@ Class FierPandaBridge extends BridgeAbstract{
         $this->name = "Fier Panda Bridge";
         $this->uri = "http://www.fier-panda.fr/";
         $this->description = "Returns latest articles from Fier Panda.";
-        $this->update = "2015-12-11";
+        $this->update = "2016-08-09";
 
     }
 
@@ -27,14 +27,6 @@ Class FierPandaBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Fier Panda';
-    }
-
-    public function getURI(){
-        return 'http://www.fier-panda.fr';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php
index 8e859b1..9629302 100644
--- a/bridges/FlickrExploreBridge.php
+++ b/bridges/FlickrExploreBridge.php
@@ -36,14 +36,6 @@ class FlickrExploreBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Flickr Explore';
-    }
-
-    public function getURI(){
-        return 'https://www.flickr.com/explore';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/FlickrTagBridge.php b/bridges/FlickrTagBridge.php
index 61f59a2..700f5fe 100644
--- a/bridges/FlickrTagBridge.php
+++ b/bridges/FlickrTagBridge.php
@@ -51,14 +51,6 @@ class FlickrTagBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Flickr Tag';
-    }
-
-    public function getURI(){
-        return 'http://www.flickr.com/search/';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php
index ffcba2f..48a8cba 100644
--- a/bridges/FootitoBridge.php
+++ b/bridges/FootitoBridge.php
@@ -41,12 +41,4 @@ class FootitoBridge extends BridgeAbstract{
             $this->items[] = $item;
         }
     }
-
-    public function getName(){
-        return 'footito';
-    }
-
-    public function getURI(){
-        return 'http://www.footito.fr/';
-    }
 }
diff --git a/bridges/FourchanBridge.php b/bridges/FourchanBridge.php
index 2cb8b00..df4efba 100644
--- a/bridges/FourchanBridge.php
+++ b/bridges/FourchanBridge.php
@@ -7,7 +7,7 @@ class FourchanBridge extends BridgeAbstract{
 		$this->name = "4chan";
 		$this->uri = "https://www.4chan.org/";
 		$this->description = "Returns posts from the specified thread";
-		$this->update = "2015-02-01";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -60,14 +60,6 @@ class FourchanBridge extends BridgeAbstract{
 	$this->items = array_reverse($this->items);
   }
     
-    public function getName(){
-        return '4chan';
-    }
-
-    public function getURI(){
-        return 'https://www.4chan.org/';
-    }
-
     public function getCacheDuration(){
         return 300; // 5min
     }
diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php
index b1ac17d..94ea2e2 100644
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -7,7 +7,7 @@ class GBAtempBridge extends BridgeAbstract {
 
         $this->maintainer = 'ORelio';
         $this->name = 'GBAtemp';
-        $this->uri = $this->getURI();
+        $this->uri = 'http://gbatemp.net/';
         $this->description = 'GBAtemp is a user friendly underground video game community.';
         $this->update = '2016-08-09';
 
@@ -91,20 +91,20 @@ class GBAtempBridge extends BridgeAbstract {
             } else $this->returnError('The provided type filter is invalid. Expecting N, R, T, or F.', 400);
         } else $this->returnError('Please provide a type filter. Expecting N, R, T, or F.', 400);
 
-        $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request GBAtemp.', 500);
+        $html = $this->file_get_html($this->uri) or $this->returnError('Could not request GBAtemp.', 500);
 
         if ($typeFilter == 'N') {
             foreach ($html->find('li[class=news_item full]') as $newsItem) {
-                $url = $this->getURI().$newsItem->find('a', 0)->href;
+                $url = $this->uri.$newsItem->find('a', 0)->href;
                 $time = intval($this->ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $newsItem->find('a.username', 0)->plaintext;
                 $title = $newsItem->find('a', 1)->plaintext;
-                $content = $this->fetch_post_content($url, $this->getURI());
+                $content = $this->fetch_post_content($url, $this->uri);
                 $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         } else if ($typeFilter == 'R') {
             foreach ($html->find('li.portal_review') as $reviewItem) {
-                $url = $this->getURI().$reviewItem->find('a', 0)->href;
+                $url = $this->uri.$reviewItem->find('a', 0)->href;
                 $title = $reviewItem->find('span.review_title', 0)->plaintext;
                 $content = $this->file_get_html($url) or $this->returnError('Could not request GBAtemp: '.$uri, 500);
                 $author = $content->find('a.username', 0)->plaintext;
@@ -114,25 +114,25 @@ class GBAtempBridge extends BridgeAbstract {
                 $subheader = '<p><b>'.$content->find('div.review_subheader', 0)->plaintext.'</b></p>';
                 $procons = $content->find('table.review_procons', 0)->outertext;
                 $scores = $content->find('table.reviewscores', 0)->outertext;
-                $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->getURI());
+                $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->uri);
                 $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         } else if ($typeFilter == 'T') {
             foreach ($html->find('li.portal-tutorial') as $tutorialItem) {
-                $url = $this->getURI().$tutorialItem->find('a', 0)->href;
+                $url = $this->uri.$tutorialItem->find('a', 0)->href;
                 $title = $tutorialItem->find('a', 0)->plaintext;
                 $time = intval($this->ExtractFromDelimiters($tutorialItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $tutorialItem->find('a.username', 0)->plaintext;
-                $content = $this->fetch_post_content($url, $this->getURI());
+                $content = $this->fetch_post_content($url, $this->uri);
                 $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         } else if ($typeFilter == 'F') {
             foreach ($html->find('li.rc_item') as $postItem) {
-                $url = $this->getURI().$postItem->find('a', 1)->href;
+                $url = $this->uri.$postItem->find('a', 1)->href;
                 $title = $postItem->find('a', 1)->plaintext;
                 $time = intval($this->ExtractFromDelimiters($postItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
                 $author = $postItem->find('a.username', 0)->plaintext;
-                $content = $this->fetch_post_content($url, $this->getURI());
+                $content = $this->fetch_post_content($url, $this->uri);
                 $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
         }
@@ -142,10 +142,6 @@ class GBAtempBridge extends BridgeAbstract {
         return 'GBAtemp'.(empty($this->filter) ? '' : ' '.$this->filter).' Bridge';
     }
 
-    public function getURI() {
-        return 'http://gbatemp.net/';
-    }
-
     public function getCacheDuration() {
         return ($this->filter === 'Forum') ? 300 : 3600; // 5 minutes / 1 hour
     }
diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php
index e4cd2b5..59ac38b 100644
--- a/bridges/GelbooruBridge.php
+++ b/bridges/GelbooruBridge.php
@@ -50,14 +50,6 @@ class GelbooruBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Gelbooru';
-    }
-
-    public function getURI(){
-        return 'http://gelbooru.com/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/GiphyBridge.php b/bridges/GiphyBridge.php
index acc01d2..4ac77e2 100644
--- a/bridges/GiphyBridge.php
+++ b/bridges/GiphyBridge.php
@@ -9,7 +9,7 @@ class GiphyBridge extends BridgeAbstract{
 		$this->name = "Giphy Bridge";
 		$this->uri = "http://giphy.com/";
 		$this->description = "Bridge for giphy.com";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By tag"] =
 		'[
@@ -81,14 +81,6 @@ class GiphyBridge extends BridgeAbstract{
         }
 	}
 
-	public function getName(){
-		return 'Giphy Bridge';
-	}
-
-	public function getURI(){
-		return 'http://giphy.com/';
-	}
-
 	public function getCacheDuration(){
 		return 300; // 5 minutes
 	}
diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php
index 84b1f56..28b19da 100644
--- a/bridges/GithubIssueBridge.php
+++ b/bridges/GithubIssueBridge.php
@@ -53,14 +53,6 @@ class GithubIssueBridge extends BridgeAbstract{
     }
   }
 
-  public function getName(){
-    return 'Github Issue';
-  }
-
-  public function getURI(){
-    return '';
-  }
-
   public function getCacheDuration(){
     return 600; // ten minutes
   }
diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php
index ba1b002..c08bc8d 100644
--- a/bridges/GitlabCommitsBridge.php
+++ b/bridges/GitlabCommitsBridge.php
@@ -79,12 +79,4 @@ class GitlabCommitsBridge extends BridgeAbstract{
       $this->items[]=$item;
     }
   }
-
-  public function getName(){
-    return 'Gitlab Commits';
-  }
-
-  public function getURI(){
-    return '';
-  }
 }
diff --git a/bridges/GizmodoFRBridge.php b/bridges/GizmodoFRBridge.php
index 2c4080f..1204e9f 100644
--- a/bridges/GizmodoFRBridge.php
+++ b/bridges/GizmodoFRBridge.php
@@ -7,7 +7,7 @@ class GizmodoFRBridge extends BridgeAbstract{
 		$this->name = "GizmodoFR";
 		$this->uri = "http://www.gizmodo.fr/";
 		$this->description = "Returns the 15 newest posts from GizmodoFR (full text).";
-		$this->update = "2014-07-14";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -43,14 +43,6 @@ class GizmodoFRBridge extends BridgeAbstract{
 
     }
 
-    public function getName(){
-        return 'GizmodoFR';
-    }
-
-    public function getURI(){
-        return 'http://www.gizmodo.fr/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30min
     }
diff --git a/bridges/GoogleSearchBridge.php b/bridges/GoogleSearchBridge.php
index 1745922..30e8815 100644
--- a/bridges/GoogleSearchBridge.php
+++ b/bridges/GoogleSearchBridge.php
@@ -17,7 +17,7 @@ class GoogleSearchBridge extends BridgeAbstract{
 		$this->name = "Google search";
 		$this->uri = "https://www.google.com/";
 		$this->description = "Returns most recent results from Google search.";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -62,10 +62,6 @@ class GoogleSearchBridge extends BridgeAbstract{
         return (!empty($this->request) ? $this->request .' - ' : '') .'Google search';
     }
 
-    public function getURI(){
-        return 'http://google.com';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
index 57252a0..92a4454 100644
--- a/bridges/GuruMedBridge.php
+++ b/bridges/GuruMedBridge.php
@@ -6,7 +6,7 @@ class GuruMedBridge extends BridgeAbstract{
 		$this->name = "GuruMed";
 		$this->uri = "http://www.gurumed.org";
 		$this->description = "Returns the 5 newest posts from Gurumed (full text)";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function GurumedStripCDATA($string) {
@@ -31,12 +31,4 @@ class GuruMedBridge extends BridgeAbstract{
 			}
 		}
 	}
-
-	public function getName(){
-		return 'Gurumed';
-	}
-
-	public function getURI(){
-		return 'http://gurumed.org/';
-	}
 }
diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php
index 99161a3..7a60e5b 100644
--- a/bridges/HDWallpapersBridge.php
+++ b/bridges/HDWallpapersBridge.php
@@ -77,10 +77,6 @@ class HDWallpapersBridge extends BridgeAbstract {
         return 'HDWallpapers - '.str_replace(['__', '_'], [' & ', ' '], $this->category).' ['.$this->resolution.']';
     }
 
-    public function getURI(){
-        return 'http://www.hdwallpapers.in';
-    }
-
     public function getCacheDuration(){
         return 43200; // 12 hours
     }
diff --git a/bridges/HentaiHavenBridge.php b/bridges/HentaiHavenBridge.php
index ccd1f08..b3ea196 100644
--- a/bridges/HentaiHavenBridge.php
+++ b/bridges/HentaiHavenBridge.php
@@ -15,7 +15,7 @@ class HentaiHavenBridge extends BridgeAbstract{
         $html = $this->file_get_html('http://hentaihaven.org/') or $this->returnError('Could not request Hentai Haven.', 404);
         foreach($html->find('div.zoe-grid') as $element) {
             $item = new \Item();
-            $item->uri = $this->getURI().$element->find('div.brick-content h3 a', 0)->href;
+            $item->uri = $element->find('div.brick-content h3 a', 0)->href;
             $thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src');
             $item->title = mb_convert_encoding(trim($element->find('div.brick-content h3 a', 0)->innertext), 'UTF-8', 'HTML-ENTITIES');
             $item->tags = $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent span.tags', 0)->plaintext;
@@ -23,12 +23,7 @@ class HentaiHavenBridge extends BridgeAbstract{
             $this->items[] = $item;
         }
     }
-    public function getName(){
-        return 'Hentai Haven';
-    }
-    public function getURI(){
-        return '';
-    }
+
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index 104022b..2c50003 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -9,7 +9,7 @@ class InstagramBridge extends BridgeAbstract{
 		$this->name = "Instagram Bridge";
 		$this->uri = "http://instagram.com/";
 		$this->description = "Returns the newest images";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -77,8 +77,4 @@ class InstagramBridge extends BridgeAbstract{
     public function getName(){
         return (!empty($this->request) ? $this->request .' - ' : '') .'Instagram Bridge';
     }
-
-    public function getURI(){
-        return 'http://instagram.com/';
-    }
 }
diff --git a/bridges/JapanExpoBridge.php b/bridges/JapanExpoBridge.php
index 1c7afa7..afff948 100644
--- a/bridges/JapanExpoBridge.php
+++ b/bridges/JapanExpoBridge.php
@@ -3,7 +3,7 @@ class JapanExpoBridge extends BridgeAbstract{
 
     public function loadMetadatas() {
         $this->maintainer = 'Ginko';
-        $this->name = 'JapanExpo';
+        $this->name = 'Japan Expo Actualités';
         $this->uri = 'http://www.japan-expo-paris.com/fr/actualites';
         $this->description = 'Returns most recent entries from Japan Expo actualités.';
         $this->update = '2016-08-09';
@@ -102,14 +102,6 @@ class JapanExpoBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Japan Expo Actualités';
-    }
-
-    public function getURI(){
-        return 'http://www.japan-expo-paris.com/fr/actualites';
-    }
-
     public function getCacheDuration(){
         return 14400; // 4 hours
     }
diff --git a/bridges/KonachanBridge.php b/bridges/KonachanBridge.php
index 1b3a378..45227a4 100644
--- a/bridges/KonachanBridge.php
+++ b/bridges/KonachanBridge.php
@@ -50,14 +50,6 @@ class KonachanBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Konachan';
-    }
-
-    public function getURI(){
-        return 'http://konachan.com/post';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php
index 830d75f..15bcaa1 100644
--- a/bridges/KoreusBridge.php
+++ b/bridges/KoreusBridge.php
@@ -6,7 +6,7 @@ class KoreusBridge extends BridgeAbstract{
 		$this->name = "Koreus";
 		$this->uri = "http://www.koreus.com/";
 		$this->description = "Returns the 5 newest posts from Koreus (full text)";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function KoreusStripCDATA($string) {
@@ -38,12 +38,4 @@ class KoreusBridge extends BridgeAbstract{
 			}
 		}
 	}
-
-	public function getName(){
-		return 'Koreus';
-	}
-
-	public function getURI(){
-		return 'http://www.koreus.com/';
-	}
 }
diff --git a/bridges/LWNprevBridge.php b/bridges/LWNprevBridge.php
index 15bc1f2..52d7172 100644
--- a/bridges/LWNprevBridge.php
+++ b/bridges/LWNprevBridge.php
@@ -160,14 +160,6 @@ class LWNprevBridge extends BridgeAbstract{
     }
   }
 
-  public function getName(){
-    return 'LWN Free Weekly Edition';
-  }
-
-  public function getURI(){
-    return 'https://lwn.net/free/bigpage';
-  }
-
   public function getCacheDuration(){
     return 604800; // one week
   }
diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php
index e6d0427..98a45be 100755
--- a/bridges/LeBonCoinBridge.php
+++ b/bridges/LeBonCoinBridge.php
@@ -7,7 +7,7 @@ class LeBonCoinBridge extends BridgeAbstract{
 		$this->name = "LeBonCoin";
 		$this->uri = "http://www.leboncoin.fr";
 		$this->description = "Returns most recent results from LeBonCoin for a region, and optionally a category and a keyword .";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
             '[
@@ -275,12 +275,4 @@ class LeBonCoinBridge extends BridgeAbstract{
 			$this->items[] = $item;
 		}
 	}
-
-	public function getName(){
-		return 'LeBonCoin';
-	}
-
-	public function getURI(){
-		return 'http://www.leboncoin.fr';
-	}
 }
\ No newline at end of file
diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index 0b6407b..d30853c 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -6,7 +6,7 @@ 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 = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function LeJournalDuGeekStripCDATA($string) {
@@ -54,14 +54,6 @@ class LeJournalDuGeekBridge extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'LeJournalDuGeek';
-	}
-
-	public function getURI(){
-		return 'http://www.journaldugeek.com/';
-	}
-
 	public function getCacheDuration(){
 		return 1800; // 30min
 	}
diff --git a/bridges/LeMondeInformatiqueBridge.php b/bridges/LeMondeInformatiqueBridge.php
index df81b66..2ee1c42 100644
--- a/bridges/LeMondeInformatiqueBridge.php
+++ b/bridges/LeMondeInformatiqueBridge.php
@@ -61,14 +61,6 @@ class LeMondeInformatiqueBridge extends BridgeAbstract {
         }
     }
 
-    public function getName() {
-        return 'Le Monde Informatique';
-    }
-
-    public function getURI() {
-        return 'http://www.lemondeinformatique.fr/';
-    }
-
     public function getCacheDuration() {
         return 1800; // 30 minutes
     }
diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php
index 4ff8e2c..ed14be9 100644
--- a/bridges/LesJoiesDuCodeBridge.php
+++ b/bridges/LesJoiesDuCodeBridge.php
@@ -48,14 +48,6 @@ class LesJoiesDuCodeBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Les Joies Du Code';
-    }
-
-    public function getURI(){
-        return 'http://lesjoiesducode.fr/';
-    }
-
     public function getCacheDuration(){
         return 7200; // 2h hours
     }
diff --git a/bridges/LinkedInCompany.php b/bridges/LinkedInCompany.php
index 243f70c..97e3643 100644
--- a/bridges/LinkedInCompany.php
+++ b/bridges/LinkedInCompany.php
@@ -37,14 +37,6 @@ class LinkedInCompany extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'LinkedIn';
-    }
-
-    public function getURI(){
-        return 'https://www.linkedin.com';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/LolibooruBridge.php b/bridges/LolibooruBridge.php
index 74fe9ab..3d4745b 100644
--- a/bridges/LolibooruBridge.php
+++ b/bridges/LolibooruBridge.php
@@ -51,14 +51,6 @@ class LolibooruBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Lolibooru';
-    }
-
-    public function getURI(){
-        return 'http://lolibooru.moe/post';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/MangareaderBridge.php b/bridges/MangareaderBridge.php
index 568eb23..e8d53f4 100644
--- a/bridges/MangareaderBridge.php
+++ b/bridges/MangareaderBridge.php
@@ -328,10 +328,6 @@ class MangareaderBridge extends BridgeAbstract{
 		return (!empty($this->request) ? $this->request . ' - ' : '') . 'Mangareader Bridge';
 	}
 
-	public function getURI(){
-		return 'http://www.mangareader.net';
-	}
-
 	public function getCacheDuration(){
 		return 10800; // 3 hours
 	}
diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php
index 946a132..59a7b26 100644
--- a/bridges/MilbooruBridge.php
+++ b/bridges/MilbooruBridge.php
@@ -47,14 +47,6 @@ class MilbooruBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Milbooru';
-    }
-
-    public function getURI(){
-        return 'http://sheslostcontrol.net/moe/shimmie/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/MondeDiploBridge.php b/bridges/MondeDiploBridge.php
index 2aad1a4..d6d2d3b 100644
--- a/bridges/MondeDiploBridge.php
+++ b/bridges/MondeDiploBridge.php
@@ -3,33 +3,25 @@ class MondeDiploBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
 		$this->maintainer = "Pitchoule";
-		$this->name = "MondeDiplo";
-		$this->uri = "http://www.monde-diplomatique.fr";
+		$this->name = 'Monde Diplomatique';
+		$this->uri = 'http://www.monde-diplomatique.fr';
 		$this->description = "Returns most recent results from MondeDiplo.";
-		$this->update = "2016-08-03";
+		$this->update = "2016-08-09";
 	}
 
 	public function collectData(array $param){	
-		$html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request MondeDiplo. for : ' . $link , 404);
+		$html = $this->file_get_html($this->uri) or $this->returnError('Could not request MondeDiplo. for : ' . $link , 404);
 
 		foreach($html->find('div.unarticle') as $article) {
 			$element = $article->parent();
 			$item = new Item();
-			$item->uri = $this->getURI() . $element->href;
+			$item->uri = $this->uri . $element->href;
 			$item->title = $element->find('h3', 0)->plaintext;
 			$item->content = $element->find('div.dates_auteurs', 0)->plaintext . '<br>' . strstr($element->find('div', 0)->plaintext, $element->find('div.dates_auteurs', 0)->plaintext, true);
 			$this->items[] = $item;
 		}
 	}
 
-	public function getName(){
-		return 'Monde Diplomatique';
-	}
-
-	public function getURI(){
-		return 'http://www.monde-diplomatique.fr';
-	}
-
 	public function getCacheDuration(){
 		return 21600; // 6 hours
 	}
diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php
index 4b833c9..03c3eb6 100644
--- a/bridges/MsnMondeBridge.php
+++ b/bridges/MsnMondeBridge.php
@@ -3,10 +3,10 @@ class MsnMondeBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
 		$this->maintainer = "kranack";
-		$this->name = "MSN Actu Monde";
-		$this->uri = "http://www.msn.com/fr-fr/actualite/monde";
+		$this->name = 'MSN Actu Monde';
+		$this->uri = 'http://www.msn.com/fr-fr/actualite/monde';
 		$this->description = "Returns the 10 newest posts from MSN Actualités (full text)";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function MsnMondeExtractContent($url, &$item) {
@@ -16,7 +16,7 @@ class MsnMondeBridge extends BridgeAbstract{
 	}
 
 	public function collectData(array $param){
-		$html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request MsnMonde.', 404);
+		$html = $this->file_get_html($this->uri) or $this->returnError('Could not request MsnMonde.', 404);
 		$limit = 0;
 		foreach($html->find('.smalla') as $article) {
 			if($limit < 10) {
@@ -29,12 +29,4 @@ class MsnMondeBridge extends BridgeAbstract{
 			}
 		}
 	}
-
-	public function getName(){
-		return 'MSN Actu Monde';
-	}
-
-	public function getURI(){
-		return 'http://www.msn.com/fr-fr/actualite/monde';
-	}
 }
diff --git a/bridges/MspabooruBridge.php b/bridges/MspabooruBridge.php
index 2ad84d6..edd327d 100644
--- a/bridges/MspabooruBridge.php
+++ b/bridges/MspabooruBridge.php
@@ -50,14 +50,6 @@ class MspabooruBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Mspabooru';
-    }
-
-    public function getURI(){
-        return 'http://mspabooru.com/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/NasaApodBridge.php b/bridges/NasaApodBridge.php
index 9da120a..3c0f256 100644
--- a/bridges/NasaApodBridge.php
+++ b/bridges/NasaApodBridge.php
@@ -7,7 +7,7 @@ class NasaApodBridge extends BridgeAbstract{
 		$this->name = "NASA APOD Bridge";
 		$this->uri = "http://apod.nasa.gov/apod/astropix.html";
 		$this->description = "Returns the 3 latest NASA APOD pictures and explanations";
-		$this->update = "2014-08-27";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -45,14 +45,6 @@ class NasaApodBridge extends BridgeAbstract{
     }
   }
 
-  public function getName(){
-    return 'NASA APOD';
-  }
-
-  public function getURI(){
-    return 'http://apod.nasa.gov/apod/astropix.html';
-  }
-
   public function getCacheDuration(){
     return 3600*12; // 12 hours
   }
diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php
index b772f5d..d26e6f2 100644
--- a/bridges/NeuviemeArtBridge.php
+++ b/bridges/NeuviemeArtBridge.php
@@ -3,7 +3,7 @@ class NeuviemeArtBridge extends BridgeAbstract {
 
     public function loadMetadatas() {
         $this->maintainer = "ORelio";
-        $this->name = "9ème Art";
+        $this->name = '9ème Art Bridge';
         $this->uri = "http://www.9emeart.fr/";
         $this->description = "Returns the newest articles.";
         $this->update = "2016-08-09";
@@ -54,12 +54,4 @@ class NeuviemeArtBridge extends BridgeAbstract {
             }
         }
     }
-
-    public function getName() {
-        return '9ème Art Bridge';
-    }
-
-    public function getURI() {
-        return 'http://www.9emeart.fr/';
-    }
-}
\ No newline at end of file
+}
diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index 52bc908..3c8b976 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -43,12 +43,4 @@ class NextInpactBridge extends BridgeAbstract {
 			}
 		}
 	}
-
-	public function getName() {
-		return 'Nextinpact Bridge';
-	}
-
-	public function getURI() {
-		return 'http://www.nextinpact.com/';
-	}
 }
diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php
index aa41822..0a05d06 100644
--- a/bridges/NiceMatinBridge.php
+++ b/bridges/NiceMatinBridge.php
@@ -6,7 +6,7 @@ class NiceMatinBridge extends BridgeAbstract{
 		$this->name = "NiceMatin";
 		$this->uri = "http://www.nicematin.com/";
 		$this->description = "Returns the 10 newest posts from NiceMatin (full text)";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function NiceMatinExtractContent($url) {
@@ -45,12 +45,4 @@ class NiceMatinBridge extends BridgeAbstract{
 			}
 		}
 	}
-
-	public function getName(){
-		return 'NiceMatin';
-	}
-
-	public function getURI(){
-		return 'http://www.nicematin.com/';
-	}
 }
diff --git a/bridges/NovelUpdatesBridge.php b/bridges/NovelUpdatesBridge.php
index ff5cd88..e61ebfd 100644
--- a/bridges/NovelUpdatesBridge.php
+++ b/bridges/NovelUpdatesBridge.php
@@ -7,7 +7,7 @@ class NovelUpdatesBridge extends BridgeAbstract{
 		$this->name = "Novel Updates";
 		$this->uri = "http://www.novelupdates.com/";
 		$this->description = "Returns releases from Novel Updates";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 		$this->parameters[] =
 		'[
 			{
@@ -44,12 +44,11 @@ class NovelUpdatesBridge extends BridgeAbstract{
             $this->items[] = $item;
         }
     }
+
     public function getName(){
         return (!empty($this->request) ? $this->request.' - ' : '') .'Novel Updates';
     }
-    public function getURI(){
-        return 'http://www.novelupdates.com/';
-    }
+
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/NumeramaBridge.php b/bridges/NumeramaBridge.php
index c8dcb4c..d6248a6 100644
--- a/bridges/NumeramaBridge.php
+++ b/bridges/NumeramaBridge.php
@@ -7,7 +7,7 @@ class NumeramaBridge extends BridgeAbstract{
         $this->name = 'Numerama';
         $this->uri = 'http://www.numerama.com/';
         $this->description = 'Returns the 5 newest posts from Numerama (full text)';
-        $this->update = '2016-07-19';
+        $this->update = '2016-08-09';
 
     }
 
@@ -19,7 +19,7 @@ class NumeramaBridge extends BridgeAbstract{
             return $string;
         }
 
-        $feed = $this->getURI().'feed/';
+        $feed = $this->uri.'feed/';
         $html = $this->file_get_html($feed) or $this->returnError('Could not request Numerama: '.$feed, 500);
         $limit = 0;
 
@@ -45,14 +45,6 @@ class NumeramaBridge extends BridgeAbstract{
 
     }
 
-    public function getName() {
-        return 'Numerama';
-    }
-
-    public function getURI() {
-        return 'http://www.numerama.com/';
-    }
-
     public function getCacheDuration() {
         return 1800; // 30min
     }
diff --git a/bridges/OpenClassroomsBridge.php b/bridges/OpenClassroomsBridge.php
index f217fa9..9371b5c 100644
--- a/bridges/OpenClassroomsBridge.php
+++ b/bridges/OpenClassroomsBridge.php
@@ -7,7 +7,7 @@ class OpenClassroomsBridge extends BridgeAbstract{
 		$this->name = "OpenClassrooms Bridge";
 		$this->uri = "https://openclassrooms.com/";
 		$this->description = "Returns latest tutorials from OpenClassrooms.";
-		$this->update = "2015-10-30";
+		$this->update = "2016-08-09";
 
 
 		$this->parameters[] =
@@ -79,14 +79,6 @@ class OpenClassroomsBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'OpenClassrooms';
-    }
-
-    public function getURI(){
-        return 'https://openclassrooms.com/';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php
index 40f4ead..ac9b316 100644
--- a/bridges/ParuVenduImmoBridge.php
+++ b/bridges/ParuVenduImmoBridge.php
@@ -8,9 +8,9 @@ class ParuVenduImmoBridge extends BridgeAbstract
 
 		$this->maintainer = "polo2ro";
 		$this->name = "Paru Vendu Immobilier";
-		$this->uri = "http://www.paruvendu.fr/immobilier/";
+		$this->uri = "http://www.paruvendu.fr";
 		$this->description = "Returns the ads from the first page of search result.";
-		$this->update = "2015-02-02";
+		$this->update = "2016-08-09";
 
 
 		$this->parameters[] =
@@ -46,7 +46,7 @@ class ParuVenduImmoBridge extends BridgeAbstract
         $num = 20;
         $appartment = '&tbApp=1&tbDup=1&tbChb=1&tbLof=1&tbAtl=1&tbPla=1';
         $maison = '&tbMai=1&tbVil=1&tbCha=1&tbPro=1&tbHot=1&tbMou=1&tbFer=1';
-        $link = $this->getURI().'/immobilier/annonceimmofo/liste/listeAnnonces?tt=1'.$appartment.$maison;
+        $link = $this->uri.'/immobilier/annonceimmofo/liste/listeAnnonces?tt=1'.$appartment.$maison;
         
         if (isset($param['minarea'])) {
             $this->request .= ' '.$param['minarea'].' m2';
@@ -90,7 +90,7 @@ class ParuVenduImmoBridge extends BridgeAbstract
             list($href) = explode('#', $element->href);
             
             $item = new \Item();
-            $item->uri = $this->getURI().$href;
+            $item->uri = $this->uri.$href;
             $item->title = $element->title;
             $item->content = $img.$desc.$price;
             $this->items[] = $item;
@@ -102,10 +102,6 @@ class ParuVenduImmoBridge extends BridgeAbstract
         return 'Paru Vendu Immobilier'.$this->request;
     }
 
-    public function getURI(){
-        return 'http://www.paruvendu.fr';
-    }
-
     public function getCacheDuration(){
         return 10800; // 3 hours
     }
diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php
index b45a61b..29b116c 100644
--- a/bridges/PickyWallpapersBridge.php
+++ b/bridges/PickyWallpapersBridge.php
@@ -83,10 +83,6 @@ class PickyWallpapersBridge extends BridgeAbstract {
         return 'PickyWallpapers - '.$this->category.(!empty($this->subcategory) ? ' > '.$this->subcategory : '').' ['.$this->resolution.']';
     }
 
-    public function getURI(){
-        return 'http://www.pickywallpapers.com';
-    }
-
     public function getCacheDuration(){
         return 43200; // 12 hours
     }
diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php
index cbfa023..53250ea 100644
--- a/bridges/PlanetLibreBridge.php
+++ b/bridges/PlanetLibreBridge.php
@@ -6,7 +6,7 @@ class PlanetLibreBridge extends BridgeAbstract{
 		$this->name = "PlanetLibre";
 		$this->uri = "http://www.planet-libre.org";
 		$this->description = "Returns the 5 newest posts from PlanetLibre (full text)";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 	}
 
 	private function PlanetLibreExtractContent($url){
@@ -31,12 +31,6 @@ class PlanetLibreBridge extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'PlanetLibre';
-	}
-	public function getURI(){
-		return 'http://www.planet-libre.org/';
-	}
 	public function getCacheDuration(){
 		return 3600*2; // 1 hour
 	}
diff --git a/bridges/ProjectMGameBridge.php b/bridges/ProjectMGameBridge.php
index b9835c9..19c2e61 100644
--- a/bridges/ProjectMGameBridge.php
+++ b/bridges/ProjectMGameBridge.php
@@ -7,7 +7,7 @@ class ProjectMGameBridge extends BridgeAbstract{
 		$this->name = "Project M Game Bridge";
 		$this->uri = "http://projectmgame.com/en/";
 		$this->description = "Returns the newest articles.";
-		$this->update = "2014-08-27";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -33,14 +33,6 @@ class ProjectMGameBridge extends BridgeAbstract{
     }
   }
 
-  public function getName(){
-    return 'Project M Game Bridge';
-  }
-
-  public function getURI(){
-    return 'http://projectmgame.com/en/';
-  }
-
   public function getCacheDuration(){
     return 10800; //3 hours
   }
diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php
index 2eb2d98..d96dd27 100644
--- a/bridges/RTBFBridge.php
+++ b/bridges/RTBFBridge.php
@@ -52,10 +52,6 @@ class RTBFBridge extends BridgeAbstract {
 		return (!empty($this->request) ? $this->request .' - ' : '') .'RTBF Bridge';
 	}
 
-	public function getURI(){
-		return 'http://www.rtbf.be/auvio/emissions';
-	}
-
 	public function getCacheDuration(){
 		return 21600; // 6 hours
 	}
diff --git a/bridges/Releases3DSBridge.php b/bridges/Releases3DSBridge.php
index 54a5a81..3c5c74e 100644
--- a/bridges/Releases3DSBridge.php
+++ b/bridges/Releases3DSBridge.php
@@ -118,14 +118,6 @@ class Releases3DSBridge extends BridgeAbstract {
         }
     }
 
-    public function getName() {
-        return '3DS Scene Releases';
-    }
-
-    public function getURI() {
-        return 'http://www.3dsdb.com/';
-    }
-
     public function getCacheDuration() {
         return 10800; //3 hours
     }
diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index 702f13d..387316e 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -6,7 +6,7 @@ class ReporterreBridge extends BridgeAbstract{
 			$this->name = "Reporterre Bridge";
 			$this->uri = "http://www.reporterre.net/";
 			$this->description = "Returns the newest articles.";
-			$this->update = "2016-08-06";
+			$this->update = "2016-08-09";
 		}
 
 		private function ExtractContentReporterre($url) {
@@ -20,7 +20,7 @@ class ReporterreBridge extends BridgeAbstract{
 			unset ($html2);
 
 			// Replace all relative urls with absolute ones
-			$text = preg_replace('/(href|src)(\=[\"\'])(?!http)([^"\']+)/ims', "$1$2" . $this->getURI() . "$3", $text);
+			$text = preg_replace('/(href|src)(\=[\"\'])(?!http)([^"\']+)/ims', "$1$2" . $this->uri . "$3", $text);
 
 			$text = strip_tags($text, '<p><br><a><img>');
 			return $text;
@@ -42,12 +42,4 @@ class ReporterreBridge extends BridgeAbstract{
 			}
 		}
 	}
-
-	public function getName(){
-		return 'Reporterre Bridge';
-	}
-
-	public function getURI(){
-		return 'http://www.reporterre.net/';
-	}
 }
diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php
index 2a2b8f1..ae407d3 100644
--- a/bridges/Rue89Bridge.php
+++ b/bridges/Rue89Bridge.php
@@ -7,7 +7,7 @@ class Rue89Bridge extends BridgeAbstract{
 		$this->name = "Rue89";
 		$this->uri = "http://rue89.nouvelobs.com/";
 		$this->description = "Returns the 5 newest posts from Rue89 (full text)";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 	}
 
@@ -44,10 +44,4 @@ class Rue89Bridge extends BridgeAbstract{
         }
 
     }
-    public function getName(){
-        return 'Rue89';
-    }
-    public function getURI(){
-        return 'http://rue89.nouvelobs.com/';
-    }
 }
diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php
index d9ca066..3b22d43 100644
--- a/bridges/Rule34Bridge.php
+++ b/bridges/Rule34Bridge.php
@@ -49,14 +49,6 @@ class Rule34Bridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Rule34';
-    }
-
-    public function getURI(){
-        return 'http://rule34.xxx/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php
index ecffcc5..e6e135e 100644
--- a/bridges/Rule34pahealBridge.php
+++ b/bridges/Rule34pahealBridge.php
@@ -48,14 +48,6 @@ class Rule34pahealBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Rule34paheal';
-    }
-
-    public function getURI(){
-        return 'http://rule34.paheal.net/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php
index b9d2ee1..42272f8 100644
--- a/bridges/SafebooruBridge.php
+++ b/bridges/SafebooruBridge.php
@@ -50,14 +50,6 @@ class SafebooruBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Safebooru';
-    }
-
-    public function getURI(){
-        return 'http://safebooru.org/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php
index ac6d58d..5e6e529 100644
--- a/bridges/SakugabooruBridge.php
+++ b/bridges/SakugabooruBridge.php
@@ -50,14 +50,6 @@ class SakugabooruBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Sakugabooru';
-    }
-
-    public function getURI(){
-        return 'http://sakuga.yshi.org/post';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/ScmbBridge.php b/bridges/ScmbBridge.php
index 6cf9673..95bd544 100644
--- a/bridges/ScmbBridge.php
+++ b/bridges/ScmbBridge.php
@@ -7,7 +7,7 @@ class ScmbBridge extends BridgeAbstract{
 		$this->name = "Se Coucher Moins Bête Bridge";
 		$this->uri = "http://secouchermoinsbete.fr/";
 		$this->description = "Returns the newest anecdotes.";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 	}
     
@@ -38,14 +38,6 @@ class ScmbBridge extends BridgeAbstract{
 		}
     }
 
-    public function getName(){
-        return 'Se Coucher Moins Bête Bridge';
-    }
-
-    public function getURI(){
-        return 'http://secouchermoinsbete.fr/';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/ScoopItBridge.php b/bridges/ScoopItBridge.php
index da439de..449f8d1 100644
--- a/bridges/ScoopItBridge.php
+++ b/bridges/ScoopItBridge.php
@@ -7,7 +7,7 @@ class ScoopItBridge extends BridgeAbstract{
 		$this->name = "ScoopIt";
 		$this->uri = "http://www.scoop.it";
 		$this->description = "Returns most recent results from ScoopIt.";
-		$this->update = "2014-06-13";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -39,14 +39,6 @@ class ScoopItBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'ScooptIt';
-    }
-
-    public function getURI(){
-        return 'http://Scoop.it';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index fc20932..1b7a95e 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -131,10 +131,6 @@ class SensCritiqueBridge extends BridgeAbstract {
 		}
 	}
 
-	public function getURI() {
-		return (trim($this->uri) === "") ? "http://www.senscritique.com" : $this->uri;
-	}
-
 	public function getCacheDuration(){
 		return 21600; // 6 hours
 	}
diff --git a/bridges/Sexactu.php b/bridges/Sexactu.php
index c5480e4..d9f70c4 100644
--- a/bridges/Sexactu.php
+++ b/bridges/Sexactu.php
@@ -1,5 +1,4 @@
 <?php
-define("GQ", "http://www.gqmagazine.fr");
 class Sexactu extends BridgeAbstract{
 
 	public function loadMetadatas() {
@@ -33,7 +32,7 @@ $replace = array('January', 'February', 'March', 'April', 'May', 'June', 'July',
                         $titleData = $titleDetails->find('h2', 0)->find('a',0);
                         $titleTimestamp =$titleDetails->find('h4',0);
                         $item->title = $this->correctCase(trim($titleData->innertext));
-                        $item->uri = GQ.$titleData->href;
+                        $item->uri = $this->uri.$titleData->href;
 
                         // Fugly date parsing due to the fact my DNS-323 doesn't support php intl extension
                         $dateText = $titleTimestamp->innertext;
@@ -46,7 +45,7 @@ $replace = array('January', 'February', 'March', 'April', 'May', 'June', 'July',
                         $elementText = $element->find('.text-container', 0);
                         // don't forget to replace images server url with gq one
                         foreach($elementText->find('img') as $image) {
-                            $image->src = GQ.$image->src;
+                            $image->src = $this->uri.$image->src;
                         }
                         $item->content = $elementText->innertext;
                         $this->items[] = $item;
@@ -58,12 +57,8 @@ $replace = array('January', 'February', 'March', 'April', 'May', 'June', 'July',
         }
     }
 
-    public function getName(){
-        return 'Sexactu';
-    }
-
     public function getURI(){
-        return GQ.'/sexactu';
+        return $this->uri.'/sexactu';
     }
 
     public function getCacheDuration(){
diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php
index 4cd7388..0805e8d 100644
--- a/bridges/SiliconBridge.php
+++ b/bridges/SiliconBridge.php
@@ -4,8 +4,8 @@ class SiliconBridge extends BridgeAbstract {
 	public function loadMetadatas() {
 
 		$this->maintainer = "ORelio";
-		$this->name = "Silicon.fr";
-		$this->uri = "http://www.silicon.fr/";
+		$this->name = 'Silicon Bridge';
+		$this->uri = 'http://www.silicon.fr/';
 		$this->description = "Returns the newest articles.";
 		$this->update = "2016-08-09";
 
@@ -58,16 +58,7 @@ class SiliconBridge extends BridgeAbstract {
         }
     }
 
-    public function getName() {
-        return 'Silicon Bridge';
-    }
-
-    public function getURI() {
-        return 'http://www.silicon.fr/';
-    }
-
     public function getCacheDuration() {
         return 1800; // 30 minutes
-        // return 0;
     }
 }
diff --git a/bridges/StripeAPIChangeLogBridge.php b/bridges/StripeAPIChangeLogBridge.php
index 1a5b57f..32945a1 100644
--- a/bridges/StripeAPIChangeLogBridge.php
+++ b/bridges/StripeAPIChangeLogBridge.php
@@ -10,7 +10,7 @@ class StripeAPIChangeLogBridge extends BridgeAbstract{
 
     $this->maintainer = 'Pierre Mazière';
     $this->name = 'Stripe API Changelog';
-    $this->uri = '';
+    $this->uri = 'https://stripe.com/docs/upgrades';
     $this->description = 'Returns the changes made to the stripe.com API';
     $this->update = '2016-08-09';
   }
@@ -31,14 +31,6 @@ class StripeAPIChangeLogBridge extends BridgeAbstract{
     }
   }
 
-  public function getName(){
-    return 'Stripe API Changelog';
-  }
-
-  public function getURI(){
-    return 'https://stripe.com/docs/upgrades';
-  }
-
   public function getCacheDuration(){
     return 86400; // one day
   }
diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php
index ed9d78f..2d21cfa 100644
--- a/bridges/SuperbWallpapersBridge.php
+++ b/bridges/SuperbWallpapersBridge.php
@@ -75,10 +75,6 @@ class SuperbWallpapersBridge extends BridgeAbstract {
         return 'HDWallpapers - '.$this->category.' ['.$this->resolution.']';
     }
 
-    public function getURI(){
-        return 'http://www.superbwallpapers.com';
-    }
-
     public function getCacheDuration(){
         return 43200; // 12 hours
     }
diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php
index 5a7e2bc..0238f33 100644
--- a/bridges/T411Bridge.php
+++ b/bridges/T411Bridge.php
@@ -4,8 +4,8 @@ class T411Bridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = 'T411';
-        $this->uri = $this->getURI();
+        $this->name = 'T411 Bridge';
+        $this->uri = 'https://t411.ch/';
         $this->description = 'Returns the 10 newest torrents with specified search terms <br /> Use url part after "?" mark when using their search engine.';
         $this->update = '2016-08-09';
 
@@ -35,7 +35,7 @@ class T411Bridge extends BridgeAbstract {
         }
 
         //Retrieve torrent listing from search results, which does not contain torrent description
-        $url = $this->getURI().'torrents/search/?'.$param['search'].'&order=added&type=desc';
+        $url = $this->uri.'torrents/search/?'.$param['search'].'&order=added&type=desc';
         $html = $this->file_get_html($url) or $this->returnError('Could not request t411: '.$url, 500);
         $results = $html->find('table.results', 0);
         if (is_null($results))
@@ -52,7 +52,7 @@ class T411Bridge extends BridgeAbstract {
                 usleep(500000); //So we need to wait (500ms)
 
                 //Retrieve data from RSS entry
-                $item_uri = $this->getURI().'torrents/details/?id='.ExtractFromDelimiters($element->find('a.nfo', 0)->outertext, '?id=', '"');
+                $item_uri = $this->uri.'torrents/details/?id='.ExtractFromDelimiters($element->find('a.nfo', 0)->outertext, '?id=', '"');
                 $item_title = ExtractFromDelimiters($element->outertext, '" title="', '"');
                 $item_date = strtotime($element->find('dd', 0)->plaintext);
 
@@ -84,13 +84,5 @@ class T411Bridge extends BridgeAbstract {
             }
         }
     }
-
-    public function getName() {
-        return "T411 Bridge";
-    }
-
-    public function getURI() {
-        return 'https://t411.ch/';
-    }
 }
 
diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php
index 406f64f..b2a94ea 100644
--- a/bridges/TagBoardBridge.php
+++ b/bridges/TagBoardBridge.php
@@ -45,10 +45,6 @@ class TagBoardBridge extends BridgeAbstract{
         return 'tagboard - ' .$this->request;
     }
 
-    public function getURI(){
-        return 'http://TagBoard.com';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php
index f0c91c7..e624c69 100644
--- a/bridges/TbibBridge.php
+++ b/bridges/TbibBridge.php
@@ -49,14 +49,6 @@ class TbibBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Tbib';
-    }
-
-    public function getURI(){
-        return 'http://tbib.org/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/TheCodingLoveBridge.php b/bridges/TheCodingLoveBridge.php
index 6e8702b..e2ff360 100644
--- a/bridges/TheCodingLoveBridge.php
+++ b/bridges/TheCodingLoveBridge.php
@@ -49,14 +49,6 @@ class TheCodingLoveBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'The Coding Love';
-    }
-
-    public function getURI(){
-        return 'http://thecodinglove.com/';
-    }
-
     public function getCacheDuration(){
         return 7200; // 2h hours
     }
diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php
index c8b8b68..4e2bd05 100644
--- a/bridges/ThePirateBayBridge.php
+++ b/bridges/ThePirateBayBridge.php
@@ -7,7 +7,7 @@ class ThePirateBayBridge extends BridgeAbstract{
 		$this->name = "The Pirate Bay";
 		$this->uri = "https://thepiratebay.org/";
 		$this->description = "Returns results for the keywords. You can put several list of keywords by separating them with a semicolon (e.g. \"one show;another show\")";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -80,12 +80,4 @@ class ThePirateBayBridge extends BridgeAbstract{
             }
         }
 	}
-    
-    public function getName(){
-        return 'The Pirate Bay';
-    }
-
-    public function getURI(){
-        return 'https://thepiratebay.org/';
-    }
 }
diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php
index adebd05..789324a 100644
--- a/bridges/TwitchApiBridge.php
+++ b/bridges/TwitchApiBridge.php
@@ -164,10 +164,6 @@ class TwitchApiBridge extends BridgeAbstract{
 		return (!empty($this->channel) ? $this->channel . ' - ' : '') . 'Twitch API Bridge';
 	}
 
-	public function getURI(){
-		return 'https://www.twitch.tv';
-	}
-
 	public function getCacheDuration(){
 		return 10800; // 3 hours
 	}
diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
index c116713..4a7ec9d 100644
--- a/bridges/TwitterBridge.php
+++ b/bridges/TwitterBridge.php
@@ -10,7 +10,7 @@ class TwitterBridge extends BridgeAbstract{
 		$this->name = "Twitter Bridge";
 		$this->uri = "http://twitter.com/";
 		$this->description = "Returns user timelines or keyword/hashtag search results (without using their API).";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By keyword or hashtag"] =
 		'[
@@ -74,10 +74,6 @@ class TwitterBridge extends BridgeAbstract{
         return (!empty($this->request) ? $this->request .' - ' : '') .'Twitter Bridge';
     }
 
-    public function getURI(){
-        return 'http://twitter.com';
-    }
-
     public function getCacheDuration(){
         return 300; // 5 minutes
     }
diff --git a/bridges/TwitterBridgeClean.php b/bridges/TwitterBridgeClean.php
index 9f6ccfc..235469c 100644
--- a/bridges/TwitterBridgeClean.php
+++ b/bridges/TwitterBridgeClean.php
@@ -10,7 +10,7 @@ class TwitterBridgeClean extends BridgeAbstract{
 		$this->name = "Twitter Bridge Clean";
 		$this->uri = "http://twitter.com/";
 		$this->description = "Returns user timelines without username in title or search results for keywords/hashtags (without using their API).";
-		$this->update = "2015-03-07";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By keyword or hashtag"] =
 		'[
@@ -75,10 +75,6 @@ class TwitterBridgeClean extends BridgeAbstract{
         return (!empty($this->request) ? $this->request .' - ' : '') .'Twitter Bridge';
     }
 
-    public function getURI(){
-        return 'http://twitter.com';
-    }
-
     public function getCacheDuration(){
         return 300; // 5 minutes
     }
diff --git a/bridges/TwitterBridgeCleanExtended.php b/bridges/TwitterBridgeCleanExtended.php
index 170efff..1be4c7b 100644
--- a/bridges/TwitterBridgeCleanExtended.php
+++ b/bridges/TwitterBridgeCleanExtended.php
@@ -10,7 +10,7 @@ class TwitterBridgeCleanExtended extends BridgeAbstract{
 		$this->name = "Twitter Bridge Clean Extended";
 		$this->uri = "http://twitter.com/";
 		$this->description = "Returns user timelines showing RTs correctly or search results for keywords/hashtags (without using their API).";
-		$this->update = "2016-01-27";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By keyword or hashtag"] =
 		'[
@@ -80,10 +80,6 @@ class TwitterBridgeCleanExtended extends BridgeAbstract{
         return (!empty($this->request) ? $this->request : '');
     }
 
-    public function getURI(){
-        return 'http://twitter.com';
-    }
-
     public function getCacheDuration(){
         return 300; // 5 minutes
     }
diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index e15a0e9..b824a72 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -7,7 +7,7 @@ class TwitterBridgeExtended extends BridgeAbstract{
 		$this->name = "Twitter Bridge Extended";
 		$this->uri = "https://twitter.com/";
 		$this->description = "(same as Twitter Bridge, but with avatar, replies and RTs)";
-		$this->update = "2014-05-25";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By keyword or hashtag"] =
 		'[
@@ -78,14 +78,6 @@ class TwitterBridgeExtended extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'Twitter Bridge Extended';
-	}
-
-	public function getURI(){
-		return 'http://twitter.com';
-	}
-
 	public function getCacheDuration(){
 		return 300; // 5 minutes
 	}
diff --git a/bridges/TwitterBridgeTweaked.php b/bridges/TwitterBridgeTweaked.php
index 4f55fb9..5c1e53c 100644
--- a/bridges/TwitterBridgeTweaked.php
+++ b/bridges/TwitterBridgeTweaked.php
@@ -7,7 +7,7 @@ class TwitterBridgeTweaked extends BridgeAbstract{
 		$this->name = "Twitter Bridge Tweaked";
 		$this->uri = "https://twitter.com/";
 		$this->description = "(same as Twitter Bridge Extended, but with cleaned title & content)";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters["By keyword or hashtag"] =
 		'[
@@ -147,14 +147,6 @@ class TwitterBridgeTweaked extends BridgeAbstract{
 		}
 	}
 
-	public function getName(){
-		return 'Twitter Bridge Tweaked';
-	}
-
-	public function getURI(){
-		return 'http://twitter.com';
-	}
-
 	public function getCacheDuration(){
 		return 300; // 5 minutes
 	}
diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php
index 6fa5c3c..ccbf2a2 100644
--- a/bridges/UnsplashBridge.php
+++ b/bridges/UnsplashBridge.php
@@ -71,14 +71,6 @@ class UnsplashBridge extends BridgeAbstract {
         }
     }
 
-    public function getName(){
-        return 'Unsplash';
-    }
-
-    public function getURI(){
-        return 'http://unsplash.com';
-    }
-
     public function getCacheDuration(){
         return 43200; // 12 hours
     }
diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompany.php
index d5369a5..eee7a24 100644
--- a/bridges/ViadeoCompany.php
+++ b/bridges/ViadeoCompany.php
@@ -37,14 +37,6 @@ class ViadeoCompany extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Viadeo';
-    }
-
-    public function getURI(){
-        return 'https://www.viadeo.com';
-    }
-
     public function getCacheDuration(){
         return 21600; // 6 hours
     }
diff --git a/bridges/VineBridge.php b/bridges/VineBridge.php
index daf520e..db63983 100644
--- a/bridges/VineBridge.php
+++ b/bridges/VineBridge.php
@@ -7,7 +7,7 @@ class VineBridge extends BridgeAbstract {
 		$this->name = "Vine bridge";
 		$this->uri = "http://vine.co/";
 		$this->description = "Returns the latests vines from vine user page";
-		$this->update = "2016-03-12";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -45,14 +45,6 @@ class VineBridge extends BridgeAbstract {
 
     }
 
-    public function getName(){
-        return 'Vine';
-    }
-
-    public function getURI(){
-        return 'http://vine.co';
-    }
-
     public function getCacheDuration(){
         return 10; //seconds
     }
diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php
index 2cd3d2d..7a70ef2 100644
--- a/bridges/WallpaperStopBridge.php
+++ b/bridges/WallpaperStopBridge.php
@@ -90,10 +90,6 @@ class WallpaperStopBridge extends BridgeAbstract {
         return 'WallpaperStop - '.$this->category.(!empty($this->subcategory) ? ' > '.$this->subcategory : '').' ['.$this->resolution.']';
     }
 
-    public function getURI(){
-        return 'http://www.wallpaperstop.com';
-    }
-
     public function getCacheDuration(){
         return 43200; // 12 hours
     }
diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 69db325..28e5704 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -12,7 +12,7 @@ class WordPressBridge extends BridgeAbstract {
 		$this->name = "Wordpress Bridge";
 		$this->uri = "https://wordpress.org/";
 		$this->description = "Returns the 3 newest full posts of a Wordpress blog";
-		$this->update = "2016-08-06";
+		$this->update = "2016-08-09";
 
 		$this->parameters[] =
 		'[
@@ -136,10 +136,6 @@ class WordPressBridge extends BridgeAbstract {
 		return "{$this->sitename} - Wordpress Bridge";
 	}
 
-	public function getURI() {
-		return $this->url;
-	}
-
 	public function getCacheDuration() {
 		return 3600*3; // 3 hours
 	}
diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php
index 74fe4ab..2d28f44 100644
--- a/bridges/XbooruBridge.php
+++ b/bridges/XbooruBridge.php
@@ -49,14 +49,6 @@ class XbooruBridge extends BridgeAbstract{
 	}
     }
 
-    public function getName(){
-        return 'Xbooru';
-    }
-
-    public function getURI(){
-        return 'http://xbooru.com/';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php
index 088599f..65a6b1a 100644
--- a/bridges/YandereBridge.php
+++ b/bridges/YandereBridge.php
@@ -50,14 +50,6 @@ class YandereBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
-        return 'Yande.re';
-    }
-
-    public function getURI(){
-        return 'http://yande.re/post';
-    }
-
     public function getCacheDuration(){
         return 1800; // 30 minutes
     }
diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index bd6baae..08656bc 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -11,7 +11,7 @@ class YoutubeBridge extends BridgeAbstract {
 	public function loadMetadatas() {
 
 		$this->name = 'YouTube Bridge';
-		$this->homepage = $this->getURI();
+		$this->homepage = 'https://www.youtube.com/';
 		$this->description = 'Returns the 10 newest videos by username/channel/playlist or search';
 		$this->maintainer = 'mitsukarenai';
 		$this->update = '2016-08-09';
@@ -68,7 +68,7 @@ class YoutubeBridge extends BridgeAbstract {
 	}
 
 	private function ytBridgeQueryVideoInfo($vid, &$author, &$desc, &$time) {
-		$html = $this->file_get_html($this->getURI()."watch?v=$vid");
+		$html = $this->file_get_html($this->uri."watch?v=$vid");
 		$author = $html->innertext;
 		$author = substr($author, strpos($author, '"author=') + 8);
 		$author = substr($author, 0, strpos($author, '\u0026'));
@@ -82,8 +82,8 @@ class YoutubeBridge extends BridgeAbstract {
 		$item->title = $title;
 		$item->author = $author;
 		$item->timestamp = $time;
-		$item->uri = $this->getURI().'watch?v='.$vid;
-		$thumbnailUri = str_replace('/www.', '/img.', $this->getURI()).'vi/'.$vid.'/0.jpg';
+		$item->uri = $this->uri.'watch?v='.$vid;
+		$thumbnailUri = str_replace('/www.', '/img.', $this->uri).'vi/'.$vid.'/0.jpg';
 		$item->content = '<a href="'.$item->uri.'"><img src="'.$thumbnailUri.'" /></a><br />'.$desc;
 		$this->items[] = $item;
 	}
@@ -130,12 +130,12 @@ class YoutubeBridge extends BridgeAbstract {
 
 		if (isset($param['u'])) { /* User and Channel modes */
 			$this->request = $param['u'];
-			$url_feed = $this->getURI().'feeds/videos.xml?user='.urlencode($this->request);
-			$url_listing = $this->getURI().'user/'.urlencode($this->request).'/videos';
+			$url_feed = $this->uri.'feeds/videos.xml?user='.urlencode($this->request);
+			$url_listing = $this->uri.'user/'.urlencode($this->request).'/videos';
 		} else if (isset($param['c'])) {
 			$this->request = $param['c'];
-			$url_feed = $this->getURI().'feeds/videos.xml?channel_id='.urlencode($this->request);
-			$url_listing = $this->getURI().'channel/'.urlencode($this->request).'/videos';
+			$url_feed = $this->uri.'feeds/videos.xml?channel_id='.urlencode($this->request);
+			$url_listing = $this->uri.'channel/'.urlencode($this->request).'/videos';
 		}
 		if (!empty($url_feed) && !empty($url_listing)) {
 			if ($xml = $this->file_get_html($url_feed)) {
@@ -147,7 +147,7 @@ class YoutubeBridge extends BridgeAbstract {
 
 		else if (isset($param['p'])) { /* playlist mode */
 			$this->request = $param['p'];
-			$url_listing = $this->getURI().'playlist?list='.urlencode($this->request);
+			$url_listing = $this->uri.'playlist?list='.urlencode($this->request);
 			$html = $this->file_get_html($url_listing) or $this->returnError("Could not request YouTube. Tried:\n - $url_listing", 500);
 			$this->ytBridgeParseHtmlListing($html, 'tr.pl-video', '.pl-video-title a');
 			$this->request = 'Playlist: '.str_replace(' - YouTube', '', $html->find('title', 0)->plaintext);
@@ -155,7 +155,7 @@ class YoutubeBridge extends BridgeAbstract {
 
 		else if (isset($param['s'])) { /* search mode */
 			$this->request = $param['s']; $page = 1; if (isset($param['pa'])) $page = (int)preg_replace("/[^0-9]/",'', $param['pa']); 
-			$url_listing = $this->getURI().'results?search_query='.urlencode($this->request).'&page='.$page.'&filters=video&search_sort=video_date_uploaded';
+			$url_listing = $this->uri.'results?search_query='.urlencode($this->request).'&page='.$page.'&filters=video&search_sort=video_date_uploaded';
 			$html = $this->file_get_html($url_listing) or $this->returnError("Could not request YouTube. Tried:\n - $url_listing", 500);
 			$this->ytBridgeParseHtmlListing($html, 'div.yt-lockup', 'h3');
 			$this->request = 'Search: '.str_replace(' - YouTube', '', $html->find('title', 0)->plaintext);
@@ -170,10 +170,6 @@ class YoutubeBridge extends BridgeAbstract {
 		return (!empty($this->request) ? $this->request .' - ' : '') .'YouTube Bridge';
 	}
 
-	public function getURI(){
-		return 'https://www.youtube.com/';
-	}
-
 	public function getCacheDuration(){
 		return 10800; // 3 hours
 	}
diff --git a/bridges/ZatazBridge.php b/bridges/ZatazBridge.php
index baf2828..7a771da 100644
--- a/bridges/ZatazBridge.php
+++ b/bridges/ZatazBridge.php
@@ -4,15 +4,15 @@ class ZatazBridge extends BridgeAbstract {
 	public function loadMetadatas() {
 
 		$this->maintainer = "aledeg";
-		$this->name = "Zataz";
-		$this->uri = "http://www.zataz.com/";
+		$this->name = 'Zataz Magazine';
+		$this->uri = 'http://www.zataz.com';
 		$this->description = "ZATAZ Magazine - S'informer, c'est déjà se sécuriser";
-		$this->update = "07/02/2015";
+		$this->update = "2016-08-09";
 
 	}
 
 	public function collectData(array $param) {
-		$html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request ' . $this->getURI(), 404);
+		$html = $this->file_get_html($this->uri) or $this->returnError('Could not request ' . $this->uri, 404);
 
 		$recent_posts = $html->find('#recent-posts-3', 0)->find('ul', 0)->find('li');
 		foreach ($recent_posts as $article) {
@@ -42,16 +42,8 @@ class ZatazBridge extends BridgeAbstract {
 		return $date->format('U');
 	}
 
-	public function getName() {
-		return 'Zataz Magazine';
-	}
-
 	public function getCacheDuration() {
 		return 7200; // 2h
 	}
 
-	public function getURI() {
-		return 'http://www.zataz.com';
-	}
-
 }

From 1a572f66395cd8bfb4639264770fbe281176b329 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 21:36:45 +0200
Subject: [PATCH 130/149] [TwitterBridgeExtended] Use username as alternative
 to the image

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

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index b824a72..6a90c2e 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -70,7 +70,7 @@ class TwitterBridgeExtended extends BridgeAbstract{
 			}
 
 			// get tweet text
-			$item->content = '<a href="https://twitter.com/'.$item->username.'"><img style="align:top;width:75px;" alt="avatar" src="'.$item->avatar.'" />'.$item->username.'</a> '.$item->fullname.'<br/><blockquote>'.str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext).'</blockquote>';
+			$item->content = '<a href="https://twitter.com/'.$item->username.'"><img style="align:top;width:75px;" alt="'.$item->username.'" src="'.$item->avatar.'" /></a> '.$item->fullname.'<br/><blockquote>'.str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext).'</blockquote>';
 			// generate the title
 			$item->title = $item->fullname . ' (@'. $item->username . ') | ' . $item->content_simple;
 			// put out

From 13d9b8d462a35d2cdff4f906fff4977f7f4fe1a1 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 21:47:29 +0200
Subject: [PATCH 131/149] [TwitterBridgeExtended] Use heredoc syntax to build
 ->content

---
 bridges/TwitterBridgeExtended.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index 6a90c2e..e0e2607 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -70,7 +70,16 @@ class TwitterBridgeExtended extends BridgeAbstract{
 			}
 
 			// get tweet text
-			$item->content = '<a href="https://twitter.com/'.$item->username.'"><img style="align:top;width:75px;" alt="'.$item->username.'" src="'.$item->avatar.'" /></a> '.$item->fullname.'<br/><blockquote>'.str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext).'</blockquote>';
+			//$item->content = '<a href="https://twitter.com/'.$item->username.'"><img style="align:top;width:75px;" alt="'.$item->username.'" src="'.$item->avatar.'" /></a><p>'.$item->fullname.'</p><br/><blockquote>'.str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext).'</blockquote>';
+
+			$cleanedTweet = str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext);
+
+			$item->content = <<<EOD
+<a href="https://twitter.com/{$item->username}"><img style="align:top;width:75px;" alt="{$item->username}" src="{$item->avatar}" /></a>
+<p>{$item->fullname}</p><br/>
+<blockquote>{$cleanedTweet}</blockquote>
+EOD;
+
 			// generate the title
 			$item->title = $item->fullname . ' (@'. $item->username . ') | ' . $item->content_simple;
 			// put out

From 0683457eb3288e1f322fb4f2543e2e6daefb30ca Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 21:59:55 +0200
Subject: [PATCH 132/149] [TwitterBridgeExtended] Reduce size of emojis in the
 tweet

---
 bridges/TwitterBridgeExtended.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index e0e2607..df1e492 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -69,9 +69,12 @@ class TwitterBridgeExtended extends BridgeAbstract{
 				$link->removeAttribute('title');
 			}
 
-			// get tweet text
-			//$item->content = '<a href="https://twitter.com/'.$item->username.'"><img style="align:top;width:75px;" alt="'.$item->username.'" src="'.$item->avatar.'" /></a><p>'.$item->fullname.'</p><br/><blockquote>'.str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext).'</blockquote>';
+			// process emojis (reduce size)
+			foreach($tweet->find('img.Emoji') as $img){
+				$img->style .= ' height: 1em;';
+			}
 
+			// get tweet text
 			$cleanedTweet = str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext);
 
 			$item->content = <<<EOD

From faacbda027e740b5c1deeb37681b967a45b0cd3d Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Tue, 9 Aug 2016 22:05:42 +0200
Subject: [PATCH 133/149] [TwitterBridgeExtended] Use inline-blocks to format
 HTML output

---
 bridges/TwitterBridgeExtended.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index df1e492..acbe6f1 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -78,9 +78,12 @@ class TwitterBridgeExtended extends BridgeAbstract{
 			$cleanedTweet = str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext);
 
 			$item->content = <<<EOD
-<a href="https://twitter.com/{$item->username}"><img style="align:top;width:75px;" alt="{$item->username}" src="{$item->avatar}" /></a>
-<p>{$item->fullname}</p><br/>
-<blockquote>{$cleanedTweet}</blockquote>
+<div style="display: inline-block; vertical-align: top;">
+	<a href="https://twitter.com/{$item->username}"><img style="align: top; width:75 px;" alt="{$item->username}" src="{$item->avatar}" title="{$item->fullname}" /></a>
+</div>
+<div style="display: inline-block; vertical-align: top;">
+	<blockquote>{$cleanedTweet}</blockquote>
+</div>
 EOD;
 
 			// generate the title

From 61380317933bc7dba1e07957f68bad4c6a7cc1fa Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 10:08:03 +0200
Subject: [PATCH 134/149] [TwitterBridgeExtended] Add border around profile
 picture

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

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index acbe6f1..ba98b63 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -79,7 +79,7 @@ class TwitterBridgeExtended extends BridgeAbstract{
 
 			$item->content = <<<EOD
 <div style="display: inline-block; vertical-align: top;">
-	<a href="https://twitter.com/{$item->username}"><img style="align: top; width:75 px;" alt="{$item->username}" src="{$item->avatar}" title="{$item->fullname}" /></a>
+	<a href="https://twitter.com/{$item->username}"><img style="align: top; width:75 px; border: 1px solid black;" alt="{$item->username}" src="{$item->avatar}" title="{$item->fullname}" /></a>
 </div>
 <div style="display: inline-block; vertical-align: top;">
 	<blockquote>{$cleanedTweet}</blockquote>

From 89aad9f79628ae31d78bcc11040f227c4a673a2a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 10:26:29 +0200
Subject: [PATCH 135/149] [TwitterBridgeExtended] Directly write content to
 ->title

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

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index ba98b63..0fdebb4 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -45,6 +45,8 @@ class TwitterBridgeExtended extends BridgeAbstract{
 			$item->username = $tweet->getAttribute('data-screen-name');
 			// extract fullname (pseudonym)
 			$item->fullname = $tweet->getAttribute('data-name'); 
+			// get author
+			$item->author = $item->fullname . ' (@' . $item->username . ')';
 			// get avatar link
 			$item->avatar = $tweet->find('img', 0)->src;	
 			// get TweetID
@@ -53,8 +55,8 @@ class TwitterBridgeExtended extends BridgeAbstract{
 			$item->uri = 'https://twitter.com'.$tweet->find('a.js-permalink', 0)->getAttribute('href');	
 			// extract tweet timestamp
 			$item->timestamp = $tweet->find('span.js-short-timestamp', 0)->getAttribute('data-time');
-			// extract plaintext	
-			$item->content_simple = str_replace('href="/', 'href="https://twitter.com/', html_entity_decode(strip_tags($tweet->find('p.js-tweet-text', 0)->innertext, '<a>'))); 
+			// generate the title
+			$item->title = strip_tags($tweet->find('p.js-tweet-text', 0)->innertext); 
 	
 			// processing content links
 			foreach($tweet->find('a') as $link) {
@@ -86,8 +88,6 @@ class TwitterBridgeExtended extends BridgeAbstract{
 </div>
 EOD;
 
-			// generate the title
-			$item->title = $item->fullname . ' (@'. $item->username . ') | ' . $item->content_simple;
 			// put out
 			$this->items[] = $item;
 		}

From a628abd04c8c603619cbdac54d330117347f0e78 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 10:44:23 +0200
Subject: [PATCH 136/149] [TwitterBridgeExtended] Add option to show/hide
 profile pictures

---
 bridges/TwitterBridgeExtended.php | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index 0fdebb4..8a6d079 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -7,7 +7,19 @@ class TwitterBridgeExtended extends BridgeAbstract{
 		$this->name = "Twitter Bridge Extended";
 		$this->uri = "https://twitter.com/";
 		$this->description = "(same as Twitter Bridge, but with avatar, replies and RTs)";
-		$this->update = "2016-08-09";
+		$this->update = "2016-08-10";
+
+		$this->parameters["global"] = 
+		'[
+			{
+				"name" : "Hide profile pictures",
+				"identifier" : "pic",
+				"type" : "checkbox",
+				"required" : "false",
+				"exampleValue" : "checked",
+				"title" : "Activate to hide profile pictures in content"
+			}
+		]';
 
 		$this->parameters["By keyword or hashtag"] =
 		'[
@@ -39,6 +51,10 @@ class TwitterBridgeExtended extends BridgeAbstract{
 			$this->returnError('You must specify a keyword (?q=...) or a Twitter username (?u=...).', 400);
 		}
 
+		$hidePictures = false;
+		if (isset($param['pic']))
+			$hidePictures = $param['pic'] === 'on';
+
 		foreach($html->find('div.js-stream-tweet') as $tweet) {
 			$item = new \Item();
 			// extract username and sanitize
@@ -79,9 +95,18 @@ class TwitterBridgeExtended extends BridgeAbstract{
 			// get tweet text
 			$cleanedTweet = str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext);
 
+			// Add picture to content
+			$picture_html = '';
+			if(!$hidePictures){
+				$picture_html = <<<EOD
+<a href="https://twitter.com/{$item->username}"><img style="align: top; width:75 px; border: 1px solid black;" alt="{$item->username}" src="{$item->avatar}" title="{$item->fullname}" /></a>
+EOD;
+			}
+
+			// add content
 			$item->content = <<<EOD
 <div style="display: inline-block; vertical-align: top;">
-	<a href="https://twitter.com/{$item->username}"><img style="align: top; width:75 px; border: 1px solid black;" alt="{$item->username}" src="{$item->avatar}" title="{$item->fullname}" /></a>
+	{$picture_html}
 </div>
 <div style="display: inline-block; vertical-align: top;">
 	<blockquote>{$cleanedTweet}</blockquote>

From 5ef26343b3700e0c68881cd93e219a4a0b6969fc Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 10:55:06 +0200
Subject: [PATCH 137/149] [TwitterBridgeExtended] Complete definition of
 parameters

---
 bridges/TwitterBridgeExtended.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php
index 8a6d079..21f05ff 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridgeExtended.php
@@ -25,7 +25,11 @@ class TwitterBridgeExtended extends BridgeAbstract{
 		'[
 			{
 				"name" : "Keyword or #hashtag",
-				"identifier" : "q"
+				"identifier" : "q",
+				"type" : "text",
+				"required" : "true",
+				"exampleValue" : "rss-bridge, #rss-bridge",
+				"title" : "Insert a keyword or hashtag"
 			}
 		]';
 
@@ -33,7 +37,11 @@ class TwitterBridgeExtended extends BridgeAbstract{
 		'[
 			{
 				"name" : "username",
-				"identifier" : "u"
+				"identifier" : "u",
+				"type" : "text",
+				"required" : "true",
+				"exampleValue" : "sebsauvage",
+				"title" : "Insert a user name"
 			}
 		]';
 

From 1ea38d521d8475396a861fffc173080360f7896a Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 10:56:06 +0200
Subject: [PATCH 138/149] bridges: Remove all Twitter bridges except
 TwitterBridgeExtended

---
 bridges/TwitterBridge.php              |  80 -------------
 bridges/TwitterBridgeClean.php         |  81 -------------
 bridges/TwitterBridgeCleanExtended.php |  86 --------------
 bridges/TwitterBridgeTweaked.php       | 153 -------------------------
 4 files changed, 400 deletions(-)
 delete mode 100644 bridges/TwitterBridge.php
 delete mode 100644 bridges/TwitterBridgeClean.php
 delete mode 100644 bridges/TwitterBridgeCleanExtended.php
 delete mode 100644 bridges/TwitterBridgeTweaked.php

diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
deleted file mode 100644
index 4a7ec9d..0000000
--- a/bridges/TwitterBridge.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-//Based on https://github.com/mitsukarenai/twitterbridge-noapi
-class TwitterBridge extends BridgeAbstract{
-
-    private $request;
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Twitter Bridge";
-		$this->uri = "http://twitter.com/";
-		$this->description = "Returns user timelines or keyword/hashtag search results (without using their API).";
-		$this->update = "2016-08-09";
-
-		$this->parameters["By keyword or hashtag"] =
-		'[
-			{
-				"name" : "Keyword or #hashtag",
-				"identifier" : "q"
-			}
-		]';
-
-		$this->parameters["By username"] =
-		'[
-			{
-				"name" : "username",
-				"identifier" : "u"
-			}
-		]';
-
-	}
-
-    public function collectData(array $param){
-        $html = '';
-        if (isset($param['q'])) {   /* keyword search mode */
-            $this->request = $param['q'];
-            $html = $this->file_get_html('https://twitter.com/search?q='.urlencode($this->request).'&f=tweets') or $this->returnError('No results for this query.', 404);
-        }
-        elseif (isset($param['u'])) {   /* user timeline mode */
-            $this->request = $param['u'];
-            $html = $this->file_get_html('http://twitter.com/'.urlencode($this->request)) or $this->returnError('Requested username can\'t be found.', 404);
-        }
-        else {
-            $this->returnError('You must specify a keyword (?q=...) or a Twitter username (?u=...).', 400);
-        }
-
-        foreach($html->find('div.js-stream-tweet') as $tweet) {
-            $item = new \Item();
-            $item->username = $tweet->getAttribute('data-screen-name');	// extract username and sanitize
-            $item->fullname = $tweet->getAttribute('data-name'); // extract fullname (pseudonym)
-            $item->avatar = $tweet->find('img', 0)->src;	// get avatar link
-            $item->id = $tweet->getAttribute('data-tweet-id');	// get TweetID
-            $item->uri = 'https://twitter.com'.$tweet->find('a.js-permalink', 0)->getAttribute('href');	// get tweet link
-            $item->timestamp = $tweet->find('span.js-short-timestamp', 0)->getAttribute('data-time');	// extract tweet timestamp
-		// processing content links
-		foreach($tweet->find('a') as $link) {
-			if($link->hasAttribute('data-expanded-url') ) {
-				$link->href = $link->getAttribute('data-expanded-url');
-			}
-			$link->removeAttribute('data-expanded-url');
-			$link->removeAttribute('data-query-source');
-			$link->removeAttribute('rel');
-			$link->removeAttribute('class');
-			$link->removeAttribute('target');
-			$link->removeAttribute('title');
-		}
-            $item->content = str_replace('href="/', 'href="https://twitter.com/', strip_tags($tweet->find('p.js-tweet-text', 0)->innertext, '<a>'));	// extract tweet text
-            $item->title = $item->fullname . ' (@' . $item->username . ') | ' . html_entity_decode(strip_tags($item->content),ENT_QUOTES,'UTF-8');
-            $this->items[] = $item;
-        }
-    }
-
-    public function getName(){
-        return (!empty($this->request) ? $this->request .' - ' : '') .'Twitter Bridge';
-    }
-
-    public function getCacheDuration(){
-        return 300; // 5 minutes
-    }
-}
diff --git a/bridges/TwitterBridgeClean.php b/bridges/TwitterBridgeClean.php
deleted file mode 100644
index 235469c..0000000
--- a/bridges/TwitterBridgeClean.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-//Based on https://github.com/mitsukarenai/twitterbridge-noapi
-class TwitterBridgeClean extends BridgeAbstract{
-
-    private $request;
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "vinzv";
-		$this->name = "Twitter Bridge Clean";
-		$this->uri = "http://twitter.com/";
-		$this->description = "Returns user timelines without username in title or search results for keywords/hashtags (without using their API).";
-		$this->update = "2016-08-09";
-
-		$this->parameters["By keyword or hashtag"] =
-		'[
-			{
-				"name" : "Keyword or #hashtag",
-				"identifier" : "q"
-			}
-		]';
-
-		$this->parameters["By username"] =
-		'[
-			{
-				"name" : "username",
-				"identifier" : "u"
-			}
-		]';
-
-	}
-
-    public function collectData(array $param){
-        $html = '';
-        if (isset($param['q'])) {   /* keyword search mode */
-            $this->request = $param['q'];
-            $html = $this->file_get_html('https://twitter.com/search?q='.urlencode($this->request).'&f=tweets') or $this->returnError('No results for this query.', 404);
-        }
-        elseif (isset($param['u'])) {   /* user timeline mode */
-            $this->request = $param['u'];
-            $html = $this->file_get_html('http://twitter.com/'.urlencode($this->request)) or $this->returnError('Requested username can\'t be found.', 404);
-        }
-        else {
-            $this->returnError('You must specify a keyword (?q=...) or a Twitter username (?u=...).', 400);
-        }
-
-        foreach($html->find('div.js-stream-tweet') as $tweet) {
-            $item = new \Item();
-            $item->username = $tweet->getAttribute('data-screen-name');	// extract username and sanitize
-            $item->fullname = $tweet->getAttribute('data-name'); // extract fullname (pseudonym)
-            $item->avatar = $tweet->find('img', 0)->src;	// get avatar link
-            $item->id = $tweet->getAttribute('data-tweet-id');	// get TweetID
-            $item->uri = 'https://twitter.com'.$tweet->find('a.js-permalink', 0)->getAttribute('href');	// get tweet link
-            $item->timestamp = $tweet->find('span.js-short-timestamp', 0)->getAttribute('data-time');	// extract tweet timestamp
-		// processing content links
-		foreach($tweet->find('a') as $link) {
-			if($link->hasAttribute('data-expanded-url') ) {
-				$link->href = $link->getAttribute('data-expanded-url');
-			}
-			$link->removeAttribute('data-expanded-url');
-			$link->removeAttribute('data-query-source');
-			$link->removeAttribute('rel');
-			$link->removeAttribute('class');
-			$link->removeAttribute('target');
-			$link->removeAttribute('title');
-			$link->removeAttribute('dir');
-		}
-            $item->content = str_replace('pic.twitter.com', 'https://pic.twitter.com', strip_tags($tweet->find('p.js-tweet-text', 0)->innertext));	// extract tweet text
-            $item->title = html_entity_decode($item->content,ENT_QUOTES,'UTF-8');
-            $this->items[] = $item;
-        }
-    }
-
-    public function getName(){
-        return (!empty($this->request) ? $this->request .' - ' : '') .'Twitter Bridge';
-    }
-
-    public function getCacheDuration(){
-        return 300; // 5 minutes
-    }
-}
diff --git a/bridges/TwitterBridgeCleanExtended.php b/bridges/TwitterBridgeCleanExtended.php
deleted file mode 100644
index 1be4c7b..0000000
--- a/bridges/TwitterBridgeCleanExtended.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-//Based on https://github.com/sebsauvage/rss-bridge/blob/master/bridges/TwitterBridgeClean.php by vinzv
-class TwitterBridgeCleanExtended extends BridgeAbstract{
-
-    private $request;
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "Max Mehl";
-		$this->name = "Twitter Bridge Clean Extended";
-		$this->uri = "http://twitter.com/";
-		$this->description = "Returns user timelines showing RTs correctly or search results for keywords/hashtags (without using their API).";
-		$this->update = "2016-08-09";
-
-		$this->parameters["By keyword or hashtag"] =
-		'[
-			{
-				"name" : "Keyword or #hashtag",
-				"identifier" : "q"
-			}
-		]';
-
-		$this->parameters["By username"] =
-		'[
-			{
-				"name" : "username",
-				"identifier" : "u"
-			}
-		]';
-
-	}
-
-    public function collectData(array $param){
-        $html = '';
-        if (isset($param['q'])) {   /* keyword search mode */
-            $this->request = $param['q'];
-            $html = $this->file_get_html('https://twitter.com/search?q='.urlencode($this->request).'&f=tweets') or $this->returnError('No results for this query.', 404);
-        }
-        elseif (isset($param['u'])) {   /* user timeline mode */
-            $this->request = $param['u'];
-            $html = $this->file_get_html('http://twitter.com/'.urlencode($this->request)) or $this->returnError('Requested username can\'t be found.', 404);
-        }
-        else {
-            $this->returnError('You must specify a keyword (?q=...) or a Twitter username (?u=...).', 400);
-        }
-
-        foreach($html->find('div.js-stream-tweet') as $tweet) {
-            $item = new \Item();
-            $item->username = $tweet->getAttribute('data-screen-name');	// extract username and sanitize
-            $item->fullname = $tweet->getAttribute('data-name'); // extract fullname (pseudonym)
-            $item->avatar = $tweet->find('img', 0)->src;	// get avatar link
-            $item->id = $tweet->getAttribute('data-tweet-id');	// get TweetID
-            $item->uri = 'https://twitter.com'.$tweet->find('a.js-permalink', 0)->getAttribute('href');	// get tweet link
-            $item->timestamp = $tweet->find('span.js-short-timestamp', 0)->getAttribute('data-time');	// extract tweet timestamp
-		// processing content links
-		foreach($tweet->find('a') as $link) {
-			if($link->hasAttribute('data-expanded-url') ) {
-				$link->href = $link->getAttribute('data-expanded-url');
-			}
-			$link->removeAttribute('data-expanded-url');
-			$link->removeAttribute('data-query-source');
-			$link->removeAttribute('rel');
-			$link->removeAttribute('class');
-			$link->removeAttribute('target');
-			$link->removeAttribute('title');
-			$link->removeAttribute('dir');
-		}
-            $item->content = str_replace('pic.twitter.com', 'https://pic.twitter.com', strip_tags($tweet->find('p.js-tweet-text', 0)->innertext));	// extract tweet text
-            if(isset($param['u'])) {
-              if($item->username != $param['u']) {
-                $item->content = '&#9851; @' . $item->username . ': ' . $item->content;
-              }
-            }
-            $item->title = html_entity_decode($item->content,ENT_QUOTES,'UTF-8');
-            $this->items[] = $item;
-        }
-    }
-
-    public function getName(){
-        return (!empty($this->request) ? $this->request : '');
-    }
-
-    public function getCacheDuration(){
-        return 300; // 5 minutes
-    }
-}
diff --git a/bridges/TwitterBridgeTweaked.php b/bridges/TwitterBridgeTweaked.php
deleted file mode 100644
index 5c1e53c..0000000
--- a/bridges/TwitterBridgeTweaked.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-class TwitterBridgeTweaked extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "kraoc";
-		$this->name = "Twitter Bridge Tweaked";
-		$this->uri = "https://twitter.com/";
-		$this->description = "(same as Twitter Bridge Extended, but with cleaned title & content)";
-		$this->update = "2016-08-09";
-
-		$this->parameters["By keyword or hashtag"] =
-		'[
-			{
-				"name" : "Keyword or #hashtag",
-				"identifier" : "q"
-			}
-		]';
-
-		$this->parameters["By username"] =
-		'[
-			{
-				"name" : "username",
-				"identifier" : "u"
-			}
-		]';
-
-	}
-
-    private function containsTLD($string) {
-        preg_match(
-            "/(AC($|\/)|\.AD($|\/)|\.AE($|\/)|\.AERO($|\/)|\.AF($|\/)|\.AG($|\/)|\.AI($|\/)|\.AL($|\/)|\.AM($|\/)|\.AN($|\/)|\.AO($|\/)|\.AQ($|\/)|\.AR($|\/)|\.ARPA($|\/)|\.AS($|\/)|\.ASIA($|\/)|\.AT($|\/)|\.AU($|\/)|\.AW($|\/)|\.AX($|\/)|\.AZ($|\/)|\.BA($|\/)|\.BB($|\/)|\.BD($|\/)|\.BE($|\/)|\.BF($|\/)|\.BG($|\/)|\.BH($|\/)|\.BI($|\/)|\.BIZ($|\/)|\.BJ($|\/)|\.BM($|\/)|\.BN($|\/)|\.BO($|\/)|\.BR($|\/)|\.BS($|\/)|\.BT($|\/)|\.BV($|\/)|\.BW($|\/)|\.BY($|\/)|\.BZ($|\/)|\.CA($|\/)|\.CAT($|\/)|\.CC($|\/)|\.CD($|\/)|\.CF($|\/)|\.CG($|\/)|\.CH($|\/)|\.CI($|\/)|\.CK($|\/)|\.CL($|\/)|\.CM($|\/)|\.CN($|\/)|\.CO($|\/)|\.COM($|\/)|\.COOP($|\/)|\.CR($|\/)|\.CU($|\/)|\.CV($|\/)|\.CX($|\/)|\.CY($|\/)|\.CZ($|\/)|\.DE($|\/)|\.DJ($|\/)|\.DK($|\/)|\.DM($|\/)|\.DO($|\/)|\.DZ($|\/)|\.EC($|\/)|\.EDU($|\/)|\.EE($|\/)|\.EG($|\/)|\.ER($|\/)|\.ES($|\/)|\.ET($|\/)|\.EU($|\/)|\.FI($|\/)|\.FJ($|\/)|\.FK($|\/)|\.FM($|\/)|\.FO($|\/)|\.FR($|\/)|\.GA($|\/)|\.GB($|\/)|\.GD($|\/)|\.GE($|\/)|\.GF($|\/)|\.GG($|\/)|\.GH($|\/)|\.GI($|\/)|\.GL($|\/)|\.GM($|\/)|\.GN($|\/)|\.GOV($|\/)|\.GP($|\/)|\.GQ($|\/)|\.GR($|\/)|\.GS($|\/)|\.GT($|\/)|\.GU($|\/)|\.GW($|\/)|\.GY($|\/)|\.HK($|\/)|\.HM($|\/)|\.HN($|\/)|\.HR($|\/)|\.HT($|\/)|\.HU($|\/)|\.ID($|\/)|\.IE($|\/)|\.IL($|\/)|\.IM($|\/)|\.IN($|\/)|\.INFO($|\/)|\.INT($|\/)|\.IO($|\/)|\.IQ($|\/)|\.IR($|\/)|\.IS($|\/)|\.IT($|\/)|\.JE($|\/)|\.JM($|\/)|\.JO($|\/)|\.JOBS($|\/)|\.JP($|\/)|\.KE($|\/)|\.KG($|\/)|\.KH($|\/)|\.KI($|\/)|\.KM($|\/)|\.KN($|\/)|\.KP($|\/)|\.KR($|\/)|\.KW($|\/)|\.KY($|\/)|\.KZ($|\/)|\.LA($|\/)|\.LB($|\/)|\.LC($|\/)|\.LI($|\/)|\.LK($|\/)|\.LR($|\/)|\.LS($|\/)|\.LT($|\/)|\.LU($|\/)|\.LV($|\/)|\.LY($|\/)|\.MA($|\/)|\.MC($|\/)|\.MD($|\/)|\.ME($|\/)|\.MG($|\/)|\.MH($|\/)|\.MIL($|\/)|\.MK($|\/)|\.ML($|\/)|\.MM($|\/)|\.MN($|\/)|\.MO($|\/)|\.MOBI($|\/)|\.MP($|\/)|\.MQ($|\/)|\.MR($|\/)|\.MS($|\/)|\.MT($|\/)|\.MU($|\/)|\.MUSEUM($|\/)|\.MV($|\/)|\.MW($|\/)|\.MX($|\/)|\.MY($|\/)|\.MZ($|\/)|\.NA($|\/)|\.NAME($|\/)|\.NC($|\/)|\.NE($|\/)|\.NET($|\/)|\.NF($|\/)|\.NG($|\/)|\.NI($|\/)|\.NL($|\/)|\.NO($|\/)|\.NP($|\/)|\.NR($|\/)|\.NU($|\/)|\.NZ($|\/)|\.OM($|\/)|\.ORG($|\/)|\.PA($|\/)|\.PE($|\/)|\.PF($|\/)|\.PG($|\/)|\.PH($|\/)|\.PK($|\/)|\.PL($|\/)|\.PM($|\/)|\.PN($|\/)|\.PR($|\/)|\.PRO($|\/)|\.PS($|\/)|\.PT($|\/)|\.PW($|\/)|\.PY($|\/)|\.QA($|\/)|\.RE($|\/)|\.RO($|\/)|\.RS($|\/)|\.RU($|\/)|\.RW($|\/)|\.SA($|\/)|\.SB($|\/)|\.SC($|\/)|\.SD($|\/)|\.SE($|\/)|\.SG($|\/)|\.SH($|\/)|\.SI($|\/)|\.SJ($|\/)|\.SK($|\/)|\.SL($|\/)|\.SM($|\/)|\.SN($|\/)|\.SO($|\/)|\.SR($|\/)|\.ST($|\/)|\.SU($|\/)|\.SV($|\/)|\.SY($|\/)|\.SZ($|\/)|\.TC($|\/)|\.TD($|\/)|\.TEL($|\/)|\.TF($|\/)|\.TG($|\/)|\.TH($|\/)|\.TJ($|\/)|\.TK($|\/)|\.TL($|\/)|\.TM($|\/)|\.TN($|\/)|\.TO($|\/)|\.TP($|\/)|\.TR($|\/)|\.TRAVEL($|\/)|\.TT($|\/)|\.TV($|\/)|\.TW($|\/)|\.TZ($|\/)|\.UA($|\/)|\.UG($|\/)|\.UK($|\/)|\.US($|\/)|\.UY($|\/)|\.UZ($|\/)|\.VA($|\/)|\.VC($|\/)|\.VE($|\/)|\.VG($|\/)|\.VI($|\/)|\.VN($|\/)|\.VU($|\/)|\.WF($|\/)|\.WS($|\/)|\.XN--0ZWM56D($|\/)|\.XN--11B5BS3A9AJ6G($|\/)|\.XN--80AKHBYKNJ4F($|\/)|\.XN--9T4B11YI5A($|\/)|\.XN--DEBA0AD($|\/)|\.XN--G6W251D($|\/)|\.XN--HGBK6AJ7F53BBA($|\/)|\.XN--HLCJ6AYA9ESC7A($|\/)|\.XN--JXALPDLP($|\/)|\.XN--KGBECHTV($|\/)|\.XN--ZCKZAH($|\/)|\.YE($|\/)|\.YT($|\/)|\.YU($|\/)|\.ZA($|\/)|\.ZM($|\/)|\.ZW)/i",
-            $string,
-            $M
-        );
-        $has_tld = (count($M) > 0) ? true : false;
-        return $has_tld;
-    }
-    private function cleaner($url) {
-        $U = explode(' ', $url);
-        $W =array();
-        foreach ($U as $k => $u) {
-            if (stristr($u,".")) { //only preg_match if there is a dot
-                if ($this->containsTLD($u) === true) {
-                    unset($U[$k]);
-                    return $this->cleaner( implode(' ', $U) );
-                }
-            }
-        }
-        return implode(' ', $U);
-    }
-
-    // (c) Kraoc / urlclean
-    // https://github.com/kraoc/Leed-market/blob/master/urlclean/urlclean.plugin.disabled.php
-    private function resolve_url($link) {
-        // fallback to crawl to real url (slowest method and unsecure to privacy)
-        if (function_exists('curl_init') && !ini_get('safe_mode')) {
-            curl_setopt($ch, CURLOPT_USERAGENT, $ua);
-            curl_setopt($ch, CURLOPT_URL, $link);
-            curl_setopt($ch, CURLOPT_HEADER, true);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            // >>> anonimization
-            curl_setopt($ch, CURLOPT_COOKIESESSION, true);
-            curl_setopt($ch, CURLOPT_REFERER, '');
-            // <<< anonimization
-            $ch = curl_init();
-            $ua = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.16 (KHTML, like Gecko) Chrome/24.0.1304.0 Safari/537.16';
-            $a = curl_exec($ch);
-            $link = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-        }
-
-        $link = preg_replace("/[&#?]xtor=(.)+/", "", $link); // remove: xtor
-        $link = preg_replace("/utm_([^&#]|(&amp;))+&*/", "", $link); // remove: utm_
-
-        // cleanup end of url
-        $link = preg_replace("/\?&/", "", $link);
-        if (isset($link[strlen($link) -1])){
-            if ($link[strlen($link) -1] == '?')
-                $link = substr($link, 0, strlen($link) -1);
-        }
-
-        return $link;
-    }
-
-	public function collectData(array $param){
-		$html = '';
-		if (isset($param['q'])) {   /* keyword search mode */
-			$html = $this->file_get_html('https://twitter.com/search?q='.urlencode($param['q']).'&f=tweets') or $this->returnError('No results for this query.', 404);
-		}
-		elseif (isset($param['u'])) {   /* user timeline mode */
-			$html = $this->file_get_html('https://twitter.com/'.urlencode($param['u']).'/with_replies') or $this->returnError('Requested username can\'t be found.', 404);
-		}
-		else {
-			$this->returnError('You must specify a keyword (?q=...) or a Twitter username (?u=...).', 400);
-		}
-
-		foreach($html->find('div.js-stream-tweet') as $tweet) {
-			$item = new \Item();
-			// extract username and sanitize
-			$item->username = $tweet->getAttribute('data-screen-name');
-			// extract fullname (pseudonym)
-			$item->fullname = $tweet->getAttribute('data-name');
-			// get avatar link
-			$item->avatar = $tweet->find('img', 0)->src;
-			// get TweetID
-			$item->id = $tweet->getAttribute('data-tweet-id');
-			// get tweet link
-			$item->uri = 'https://twitter.com'.$tweet->find('a.js-permalink', 0)->getAttribute('href');
-			// extract tweet timestamp
-			$item->timestamp = $tweet->find('span.js-short-timestamp', 0)->getAttribute('data-time');
-			// extract plaintext
-			$item->content_simple = str_replace('href="/', 'href="https://twitter.com/', html_entity_decode(strip_tags($tweet->find('p.js-tweet-text', 0)->innertext, '<a>')));
-
-			// processing content links
-			foreach($tweet->find('a') as $link) {
-				if($link->hasAttribute('data-expanded-url') ) {
-					$link->href = $link->getAttribute('data-expanded-url');
-				}
-				$link->removeAttribute('data-expanded-url');
-				$link->removeAttribute('data-query-source');
-				$link->removeAttribute('rel');
-				$link->removeAttribute('class');
-				$link->removeAttribute('target');
-				$link->removeAttribute('title');
-			}
-
-			// get tweet text
-			$item->content = '<a href="https://twitter.com/'.$item->username.'"><img style="align:top;width:75px;" alt="avatar" src="'.$item->avatar.'" />'.$item->username.'</a> '.$item->fullname.'<br/><blockquote>'.str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext).'</blockquote>';
-			// generate the title
-//			$item->title = $item->fullname . ' (@'. $item->username . ') | ' . $item->content_simple;
-            $item->title = $item->content_simple;
-            $item->title = preg_replace('|https?://www\.[a-z\.0-9]+|i', '', $item->title); // remove http(s) links
-            $item->title = preg_replace('|www\.[a-z\.0-9]+|i', '', $item->title); // remove www. links
-            $item->title = $this->cleaner($item->title); // remove all remaining links
-            $item->title = trim($item->title); // remove extra spaces at beginning and end
-
-            // convert all content links to real ones
-            $regex = "/(http|https|ftp|ftps)\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?/";
-            $item->content = preg_replace_callback($regex, function($url) {
-                // do stuff with $url[0] here
-                return $this->resolve_url($url[0]);
-            }, $item->content);
-
-			// put out
-			$this->items[] = $item;
-		}
-	}
-
-	public function getCacheDuration(){
-		return 300; // 5 minutes
-	}
-}

From 68d1c1f961585e6852cfa1bbd99d4db0dc45f9c0 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 11:00:40 +0200
Subject: [PATCH 139/149] [TwitterBridgeExtended] -> [TwitterBridge] make this
 the only one

---
 bridges/{TwitterBridgeExtended.php => TwitterBridge.php} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename bridges/{TwitterBridgeExtended.php => TwitterBridge.php} (95%)

diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridge.php
similarity index 95%
rename from bridges/TwitterBridgeExtended.php
rename to bridges/TwitterBridge.php
index 21f05ff..04b0d0e 100644
--- a/bridges/TwitterBridgeExtended.php
+++ b/bridges/TwitterBridge.php
@@ -1,12 +1,12 @@
 <?php
-class TwitterBridgeExtended extends BridgeAbstract{
+class TwitterBridge extends BridgeAbstract{
 
 	public function loadMetadatas() {
 
 		$this->maintainer = "mitsukarenai";
-		$this->name = "Twitter Bridge Extended";
+		$this->name = "Twitter Bridge";
 		$this->uri = "https://twitter.com/";
-		$this->description = "(same as Twitter Bridge, but with avatar, replies and RTs)";
+		$this->description = "Returns tweets by keyword/hashtag or user name";
 		$this->update = "2016-08-10";
 
 		$this->parameters["global"] = 

From 0c1ec44c497060e58d6e2ff842909f9103ce46ae Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 11:41:35 +0200
Subject: [PATCH 140/149] bridges: Merge all Allocine* bridges into
 AllocineFRBridge

---
 bridges/AllocineFRBridge.php            | 98 +++++++++++++++++--------
 bridges/AllocineT5Bridge.php            | 54 --------------
 bridges/AllocineTueursEnSerieBridge.php | 54 --------------
 3 files changed, 69 insertions(+), 137 deletions(-)
 delete mode 100644 bridges/AllocineT5Bridge.php
 delete mode 100644 bridges/AllocineTueursEnSerieBridge.php

diff --git a/bridges/AllocineFRBridge.php b/bridges/AllocineFRBridge.php
index c54edff..b0a5b4c 100644
--- a/bridges/AllocineFRBridge.php
+++ b/bridges/AllocineFRBridge.php
@@ -1,54 +1,94 @@
 <?php
 class AllocineFRBridge extends BridgeAbstract{
 
-    private $_URL = "http://www.allocine.fr/video/programme-12284/saison-24580/";
-    private $_NOM = "Faux Raccord";
-
     public function loadMetadatas() {
 
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Allo Cine : Faux Raccord";
-		$this->uri = "http://www.allocine.fr/video/programme-12284/saison-24580/";
-		$this->description = "Allo Cine : Faux Raccord";
-		$this->update = "2016-08-06";
+        $this->maintainer = "superbaillot.net";
+        $this->name = "Allo Cine Bridge";
+        $this->uri = "http://www.allocine.fr";
+        $this->description = "Bridge for allocine.fr";
+        $this->update = "2016-08-10";
 
-	}
+        $this->parameters[] = 
+        '[
+            {
+                "name" : "category",
+                "identifier" : "category",
+                "type" : "list",
+                "required" : "true",
+                "exampleValue" : "Faux Raccord",
+                "title" : "Select your category",
+                "values" : 
+                [
+                    {
+                        "name" : "Faux Raccord",
+                        "value" : "faux-raccord"
+                    },
+                    {
+                        "name" : "Top 5",
+                        "value" : "top-5"
+                    },
+                    {
+                        "name" : "Tueurs En Serie",
+                        "value" : "tuers-en-serie"
+                    }
+                ]
+            }
+        ]';
+    }
 
-    public function collectData(array $param){
-        $html = $this->file_get_html($this->_URL) or $this->returnError('Could not request Allo cine.', 404);
+    public function collectData(array $params){
+
+        // Check all parameters
+        if(!isset($params['category']))
+            $this->returnError('You must specify a valid category (&category= )!', 400);
+
+        $category = '';
+        switch($params['category']){
+            case 'faux-raccord':
+                $this->uri = 'http://www.allocine.fr/video/programme-12284/saison-24580/';
+                $category = 'Faux Raccord';
+                break;
+            case 'top-5':
+                $this->uri = 'http://www.allocine.fr/video/programme-12299/saison-22542/';
+                $category = 'Top 5';
+                break;
+            case 'tuers-en-serie':
+                $this->uri = 'http://www.allocine.fr/video/programme-12286/saison-22938/';
+                $category = 'Tueurs en Séries';
+                break;
+            default:
+                $this->returnError('You must select a valid category!', 400);
+        }
+
+        // Update bridge name to match selection
+        $this->name .= ' : ' . $category;
+
+        $html = $this->file_get_html($this->uri) or $this->returnError("Could not request {$this->uri}!", 404);
 
         foreach($html->find('figure.media-meta-fig') as $element)
         {
             $item = new Item();
             
-            $titre = $element->find('div.titlebar h3.title a', 0);
+            $title = $element->find('div.titlebar h3.title a', 0);
             $content = trim($element->innertext);
-            
-            $figCaption = strpos($content, $this->_NOM);
+            $figCaption = strpos($content, $category);
+
             if($figCaption !== false)
             {
-                $content = str_replace('src="/', 'src="http://www.allocine.fr/',$content);
-                $content = str_replace('href="/', 'href="http://www.allocine.fr/',$content);
-                $content = str_replace('src=\'/', 'src=\'http://www.allocine.fr/',$content);
-                $content = str_replace('href=\'/', 'href=\'http://www.allocine.fr/',$content);
+                $content = str_replace('src="/', 'src="http://www.allocine.fr/', $content);
+                $content = str_replace('href="/', 'href="http://www.allocine.fr/', $content);
+                $content = str_replace('src=\'/', 'src=\'http://www.allocine.fr/', $content);
+                $content = str_replace('href=\'/', 'href=\'http://www.allocine.fr/', $content);
                 $item->content = $content;
-                $item->title = trim($titre->innertext);
-                $item->uri = "http://www.allocine.fr" . $titre->href;
+                $item->title = trim($title->innertext);
+                $item->uri = "http://www.allocine.fr" . $title->href;
                 $this->items[] = $item;
             }
         }
     }
 
-    public function getName(){
-        return 'Allo Cine : ' . $this->_NOM;
-    }
-
-    public function getURI(){
-        return $this->_URL;
-    }
-
     public function getCacheDuration(){
         return 25200; // 7 hours
     }
 }
-?>
diff --git a/bridges/AllocineT5Bridge.php b/bridges/AllocineT5Bridge.php
deleted file mode 100644
index 2dd1d81..0000000
--- a/bridges/AllocineT5Bridge.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-class AllocineT5Bridge extends BridgeAbstract{
-
-    private $_URL = "http://www.allocine.fr/video/programme-12299/saison-22542/";
-    private $_NOM = "Top 5";
-
-    public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Allo Cine : Top 5";
-		$this->uri = "http://www.allocine.fr/video/programme-12299/saison-22542/";
-		$this->description = "Allo Cine : Top 5 via rss-bridge";
-		$this->update = "2016-08-06";
-
-	}
-
-    public function collectData(array $param){
-        $html = $this->file_get_html($this->_URL) or $this->returnError('Could not request Allo cine.', 404);
-
-        foreach($html->find('figure.media-meta-fig') as $element)
-        {
-            $item = new Item();
-            
-            $titre = $element->find('div.titlebar h3.title a', 0);
-            $content = trim($element->innertext);
-            
-            $figCaption = strpos($content, $this->_NOM);
-            if($figCaption !== false)
-            {
-                $content = str_replace('src="/', 'src="http://www.allocine.fr/',$content);
-                $content = str_replace('href="/', 'href="http://www.allocine.fr/',$content);
-                $content = str_replace('src=\'/', 'src=\'http://www.allocine.fr/',$content);
-                $content = str_replace('href=\'/', 'href=\'http://www.allocine.fr/',$content);
-                $item->content = $content;
-                $item->title = trim($titre->innertext);
-                $item->uri = "http://www.allocine.fr" . $titre->href;
-                $this->items[] = $item;
-            }
-        }
-    }
-
-    public function getName(){
-        return 'Allo Cine : ' . $this->_NOM;
-    }
-
-    public function getURI(){
-        return $this->_URL;
-    }
-
-    public function getCacheDuration(){
-        return 25200; // 7 hours
-    }
-}
-?>
diff --git a/bridges/AllocineTueursEnSerieBridge.php b/bridges/AllocineTueursEnSerieBridge.php
deleted file mode 100644
index d4330ec..0000000
--- a/bridges/AllocineTueursEnSerieBridge.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-class AllocineTueursEnSerieBridge extends BridgeAbstract{
-
-    private $_URL = "http://www.allocine.fr/video/programme-12286/saison-22938/";
-    private $_NOM = "Tueurs en Séries";
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Allo Cine : Tueurs En Serie";
-		$this->uri = "http://www.allocine.fr/video/programme-12286/saison-22938/";
-		$this->description = "Allo Cine : Tueurs En Serie";
-		$this->update = "2016-08-06";
-
-	}
-
-    public function collectData(array $param){
-        $html = $this->file_get_html($this->_URL) or $this->returnError('Could not request Allo cine.', 404);
-
-        foreach($html->find('figure.media-meta-fig') as $element)
-        {
-            $item = new Item();
-            
-            $titre = $element->find('div.titlebar h3.title a', 0);
-            $content = trim($element->innertext);
-            
-            $figCaption = strpos($content, $this->_NOM);
-            if($figCaption !== false)
-            {
-                $content = str_replace('src="/', 'src="http://www.allocine.fr/',$content);
-                $content = str_replace('href="/', 'href="http://www.allocine.fr/',$content);
-                $content = str_replace('src=\'/', 'src=\'http://www.allocine.fr/',$content);
-                $content = str_replace('href=\'/', 'href=\'http://www.allocine.fr/',$content);
-                $item->content = $content;
-                $item->title = trim($titre->innertext);
-                $item->uri = "http://www.allocine.fr" . $titre->href;
-                $this->items[] = $item;
-            }
-        }
-    }
-
-    public function getName(){
-        return 'Allo Cine : ' . $this->_NOM;
-    }
-
-    public function getURI(){
-        return $this->_URL;
-    }
-
-    public function getCacheDuration(){
-        return 25200; // 7 hours
-    }
-}
-?>

From f0f2e8f84785c4f956391658e5c8953f5345501b Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 23:18:35 +0200
Subject: [PATCH 141/149] [KununuBridge] Add new bridge

---
 bridges/KununuBridge.php | 278 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 278 insertions(+)
 create mode 100644 bridges/KununuBridge.php

diff --git a/bridges/KununuBridge.php b/bridges/KununuBridge.php
new file mode 100644
index 0000000..375680b
--- /dev/null
+++ b/bridges/KununuBridge.php
@@ -0,0 +1,278 @@
+<?php
+class KununuBridge extends BridgeAbstract{
+	public function loadMetadatas(){
+		$this->maintainer = "logmanoriginal";
+		$this->name = "Kununu Bridge"; /* This will be replaced later! */
+		$this->uri = "https://www.kununu.com"; /* This will be replaced later! */
+		$this->description = "Returns the latest reviews for a company and site of your choice.";
+		$this->update = "2016-08-10";
+
+		$this->parameters['global'] = 
+		'[
+			{
+				"name" : "Site",
+				"identifier" : "site",
+				"type" : "list",
+				"required" : "true",
+				"exampleValue" : "United States",
+				"title" : "Select your site",
+				"values" : 
+				[
+					{
+						"name" : "Austria",
+						"value" : "at"
+					},
+					{
+						"name" : "Germany",
+						"value" : "de"
+					},
+					{
+						"name" : "Switzerland",
+						"value" : "ch"
+					},
+					{
+						"name" : "United States",
+						"value" : "us"
+					}
+				]
+			},
+			{
+				"name" : "Load full article",
+				"identifier" : "full",
+				"type" : "checkbox",
+				"required" : "false",
+				"exampleValue" : "checked",
+				"title" : "Activate to load full article"
+			}
+		]';
+
+		$this->parameters[] = 
+		'[
+			{
+				"name" : "Company",
+				"identifier" : "company",
+				"type" : "text",
+				"required" : "true",
+				"exampleValue" : "kununu-us",
+				"title" : "Insert company name (i.e. Kununu US) or URI path (i.e. kununu-us)"
+			}
+		]';
+	}
+
+	public function collectData(array $params){
+
+		// Get Site
+		$site = strtolower(trim($params['site']));
+		if(!isset($site) || empty($site) || !$this->site_is_valid($site))
+			$this->returnError('You must specify a valid site (&site=...)!', 400);
+
+		// Get Company (fixing whitespace and umlauts)
+		$company = $this->encode_umlauts(strtolower(str_replace(' ', '-', trim($params['company']))));
+		if(!isset($company) || empty($company))
+			$this->returnError('You must specify a company (&company=...)!', 400);
+
+		$full = false; // By default we'll load only short article
+		if(isset($params['full']))
+			$full = strtolower(trim($params['full'])) === 'on';
+
+		// Get reviews section name (depends on site)
+		$section = '';
+		switch($site){
+			case 'at':
+			case 'de':
+			case 'ch':
+				$section = 'kommentare';
+				break;
+			case 'us':
+				$section = 'reviews';
+				break;
+			default:
+				$this->returnError('The reviews section is not defined for you selection!', 404);
+		}
+
+		// Update URI for the content
+		$this->uri .= "/{$site}/{$company}/{$section}";
+
+		// Load page
+		$html = $this->file_get_html($this->uri);
+		if($html === false)
+			$this->returnError('Unable to receive data from ' . $this->uri . '!', 404);
+
+		// Update name for this request
+		$this->name = $this->extract_company_name($html) . ' - ' . $this->name;
+
+		// Find the section with all the panels (reviews)
+		$section = $html->find('section.kununu-scroll-element', 0);
+		if($section === false)
+			$this->returnError('Unable to find panel section!', 404);
+
+		// Find all articles (within the panels)
+		$articles = $section->find('article');
+		if($articles === false || empty($articles))
+			$this->returnError('Unable to find articles!', 404);
+
+		// Go through all articles
+		foreach($articles as $article){
+			$item = new \Item();
+
+			$item->author = $this->extract_article_author_position($article);
+			$item->timestamp = $this->extract_article_date($article);
+			$item->title = $this->extract_article_rating($article) . ' : ' . $this->extract_article_summary($article);
+			$item->uri = $this->extract_article_uri($article);
+
+			if($full)
+				$item->content = $this->extract_full_description($item->uri);
+			else
+				$item->content = $this->extract_article_description($article);
+
+			$this->items[] = $item;
+		}
+	}
+
+	/** 
+	* Returns true if the given site is part of the parameters list
+	*/
+	private function site_is_valid($site){
+		$parameter = json_decode($this->parameters['global'], true);
+		$sites = $parameter[0]['values'];
+
+		$site_names = array();
+
+		foreach($sites as $site_item)
+			$site_names[] = $site_item['value'];
+
+		return in_array($site, $site_names);
+	}
+
+	/**
+	* Fixes relative URLs in the given text
+	*/
+	private function fix_url($text){
+		return preg_replace('/href=(\'|\")\//i', 'href="https://www.kununu.com/', $text);
+	}
+
+	/**
+	* Encodes unmlauts in the given text
+	*/
+	private function encode_umlauts($text){
+		$umlauts = Array("/ä/","/ö/","/ü/","/Ä/","/Ö/","/Ü/","/ß/");
+		$replace = Array("ae","oe","ue","Ae","Oe","Ue","ss");
+
+		return preg_replace($umlauts, $replace, $text);
+	}
+
+	/**
+	* Returns the company name from the review html
+	*/
+	private function extract_company_name($html){
+		$panel = $html->find('div.panel', 0);
+		if($panel === false)
+			$this->returnError('Cannot find panel for company name!', 404);
+		
+		$company_name = $panel->find('h1', 0);
+		if($company_name === false)
+			$this->returnError('Cannot find company name!', 404);
+		
+		return $company_name->plaintext;
+	}
+
+	/**
+	* Returns the date from a given article
+	*/
+	private function extract_article_date($article){
+		// They conviniently provide a time attribute for us :)
+		$date = $article->find('time[itemprop=dtreviewed]', 0);
+		if($date === false)
+			$this->returnError('Cannot find article date!', 404);
+		
+		return strtotime($date->datetime);
+	}
+
+	/**
+	* Returns the rating from a given article
+	*/
+	private function extract_article_rating($article){
+		$rating = $article->find('span.rating', 0);
+		if($rating === false)
+			$this->returnError('Cannot find article rating!', 404);
+		
+		return $rating->getAttribute('aria-label');
+	}
+
+	/**
+	* Returns the summary from a given article
+	*/
+	private function extract_article_summary($article){
+		$summary = $article->find('[itemprop=summary]', 0);
+		if($summary === false)
+			$this->returnError('Cannot find article summary!', 404);
+		
+		return strip_tags($summary->innertext);
+	}
+
+	/**
+	* Returns the URI from a given article
+	*/
+	private function extract_article_uri($article){
+		// Notice: This first part is the same as in extract_article_summary!
+		$summary = $article->find('[itemprop=summary]', 0);
+		if($summary === false)
+			$this->returnError('Cannot find article summary!', 404);
+
+		$anchor = $summary->find('a', 0);
+		if($anchor === false)
+			$this->returnError('Cannot find article URI!', 404);
+		
+		return 'https://www.kununu.com' . $anchor->href;
+	}
+
+	/**
+	* Returns the position of the author from a given article
+	*/
+	private function extract_article_author_position($article){
+		// We need to parse the aside manually
+		$aside = $article->find('aside', 0);
+		if($aside === false)
+			$this->returnError('Cannot find article author information!', 404);
+
+		// Go through all h2 elements to find index of required span (I know... it's stupid)
+		$author_position = 'Unknown';
+		foreach($aside->find('h2') as $subject){
+			if(stristr(strtolower($subject->plaintext), 'position')){ /* This works for at, ch, de, us */
+				$author_position = $subject->next_sibling()->plaintext;
+				break;
+			}
+		}
+		
+		return $author_position;
+	}
+
+	/**
+	* Returns the description from a given article
+	*/
+	private function extract_article_description($article){
+		$description = $article->find('div[itemprop=description]', 0);
+		if($description === false)
+			$this->returnError('Cannot find article description!', 404);
+		
+		return $this->fix_url($description->innertext);
+	}
+
+	/**
+	* Returns the full description from a given uri
+	*/
+	private function extract_full_description($uri){
+		// Load full article
+		$html = file_get_html($uri);
+		if($html === false)
+			$this->returnError('Could not load full description!', 404);
+
+		// Find the article
+		$article = $html->find('article', 0);
+		if($article === false)
+			$this->returnError('Cannot find article!', 404);
+
+		// Luckily they use the same layout for the review overview and full article pages :)
+		return $this->extract_article_description($article);
+	}
+}

From 2a04940fb8d96271b2c9d76bc83a385040f3d261 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Wed, 10 Aug 2016 23:27:48 +0200
Subject: [PATCH 142/149] [KununuBridge] Increase cache duration to 1 day

---
 bridges/KununuBridge.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bridges/KununuBridge.php b/bridges/KununuBridge.php
index 375680b..3b61fa6 100644
--- a/bridges/KununuBridge.php
+++ b/bridges/KununuBridge.php
@@ -129,6 +129,10 @@ class KununuBridge extends BridgeAbstract{
 		}
 	}
 
+	public function getCacheDuration(){
+		return 86400; // 1 day
+	}
+
 	/** 
 	* Returns true if the given site is part of the parameters list
 	*/

From 69a590be7906e7cc196b5dff9ef811841e37a9bb Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Thu, 11 Aug 2016 13:23:51 +0200
Subject: [PATCH 143/149] i[README] small change :)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3dccf45..d9c4667 100644
--- a/README.md
+++ b/README.md
@@ -65,13 +65,13 @@ New bridges are disabled by default, so make sure to check regularly what's new
 
 [![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/sebsauvage/rss-bridge)
  
-Author
+Authors
 ===
-I'm sebsauvage, webmaster of [sebsauvage.net](http://sebsauvage.net), author of [Shaarli](http://sebsauvage.net/wiki/doku.php?id=php:shaarli) and [ZeroBin](http://sebsauvage.net/wiki/doku.php?id=php:zerobin).
+We are RSS Bridge Community, a group of developers continuing the project initiated by sebsauvage, webmaster of [sebsauvage.net](http://sebsauvage.net), author of [Shaarli](http://sebsauvage.net/wiki/doku.php?id=php:shaarli) and [ZeroBin](http://sebsauvage.net/wiki/doku.php?id=php:zerobin).
 
 Patch/contributors :
 
- * Yves ASTIER ([Draeli](https://github.com/Draeli)) : PHP optimizations, fixes, dynamic brigde/format list with all stuff behind and extend cache system. Mail : contact@yves-astier.com
+ * Yves ASTIER ([Draeli](https://github.com/Draeli)) : PHP optimizations, fixes, dynamic brigde/format list with all stuff behind and extend cache system. Mail : contact /at\ yves-astier.com
  * [Mitsukarenai](https://github.com/Mitsukarenai) : Initial inspiration, collaborator
  * [ArthurHoaro](https://github.com/ArthurHoaro)
  * [BoboTiG](https://github.com/BoboTiG)

From c9fd3979c1aedf5d98b6dc60ba8f540deadebf2b Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 11 Aug 2016 20:18:44 +0200
Subject: [PATCH 144/149] [.gitignore] Ignore all Visual Studio Code settings

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9a267f6..d28d273 100644
--- a/.gitignore
+++ b/.gitignore
@@ -227,3 +227,8 @@ pip-log.txt
 /cache
 /whitelist.txt
 DEBUG
+
+######################
+## VisualStudioCode ##
+######################
+.vscode/*
\ No newline at end of file

From 619f4898fabdb6baa566753e6a15c8c84fe97b6d Mon Sep 17 00:00:00 2001
From: LogMANOriginal <LogMANOriginal@users.noreply.github.com>
Date: Thu, 11 Aug 2016 21:21:43 +0200
Subject: [PATCH 145/149] [README] Update with new screenshots & content

---
 README.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index d9c4667..876b6b3 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,7 @@ Supported sites/pages (main)
  * `OpenClassrooms`: Lastest tutorials from [fr.openclassrooms.com](http://fr.openclassrooms.com/)
  * `Pinterest`: Most recent photos from user or search
  * `ScmbBridge`: Newest stories from [secouchermoinsbete.fr](http://secouchermoinsbete.fr/)
- * `WikipediaENLatest`: highlighted articles from Wikipedia in English
- * `WikipediaFRLatest`: highlighted articles from Wikipedia in French
- * `WikipediaEOLatest`: highlighted articles from Wikipedia in Esperanto
+ * `Wikipedia`: highlighted articles from [Wikipedia](https://wikipedia.org/) in English, German, French or Esperanto
  * `Bandcamp` : Returns last release from [bandcamp](https://bandcamp.com/) for a tag
  * `ThePirateBay` : Returns the newest indexed torrents from [The Pirate Bay](https://thepiratebay.se/) with keywords
  * `Facebook` : Returns the latest posts on a page or profile on [Facebook](https://facebook.com/)
@@ -33,6 +31,7 @@ Output format
 Output format can take several forms:
 
  * `Atom` : ATOM Feed, for use in RSS/Feed readers
+ * `Mrss` : MRSS Feed, for use in RSS/Feed readers
  * `Json` : Json, for consumption by other applications.
  * `Html` : Simple html page.
  * `Plaintext` : raw text (php object, as returned by print_r)
@@ -42,11 +41,11 @@ Screenshot
 
 Welcome screen:
 
-![Screenshot](http://sebsauvage.net/galerie/photos/Bordel/rss-bridge-screenshot-3.png)
+![Screenshot](https://github.com/RSS-Bridge/rss-bridge/wiki/images/screenshot_rss-bridge_welcome.png)
    
-Minecraft hashtag (#Minecraft) search on Twitter, in ATOM format (as displayed by Firefox):
+RSS-Bridge hashtag (#rss-bridge) search on Twitter, in ATOM format (as displayed by Firefox):
 
-![Screenshot](http://sebsauvage.net/galerie/photos/Bordel/rss-bridge-screenshot-2-twitter-hashtag.png)
+![Screenshot](https://github.com/RSS-Bridge/rss-bridge/wiki/images/screenshot_twitterbridge_atom.png)
    
 Requirements
 ===
@@ -63,6 +62,8 @@ By default, the script creates `whitelist.txt` and adds the main bridges (see ab
 
 New bridges are disabled by default, so make sure to check regularly what's new and whitelist what you want!
 
+Deploy
+===
 [![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/sebsauvage/rss-bridge)
  
 Authors
@@ -104,7 +105,7 @@ Patch/contributors :
  * [kraoc](https://github.com/kraoc)
  * [lagaisse](https://github.com/lagaisse)
 
-License
+Licenses
 ===
 Code is [Public Domain](UNLICENSE).
 
@@ -113,9 +114,10 @@ Including `PHP Simple HTML DOM Parser` under the [MIT License](http://opensource
 
 Technical notes
 ===
-  * There is a cache so that source services won't ban you even if you hammer the rss-bridge with requests. Each bridge has a different duration for the cache. The `cache` subdirectory will be automatically created and cached objects older than 24 hours get purged.
+  * There is a cache so that source services won't ban you even if you hammer the rss-bridge with requests. Each bridge can have a different duration for the cache. The `cache` subdirectory will be automatically created and cached objects older than 24 hours get purged.
   * To implement a new rss-bridge, [follow the specifications](CREATE_BRIDGE.md) and take a look at existing bridges for examples.
   * To enable debug mode (disabling cache and enabling error reporting), create an empty file named `DEBUG` in the root directory (next to `index.php`).
+  * For more information refer to the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki)
 
 Rant
 ===

From eeb6c9681d944a2501e43724ecb3801e0a96fe90 Mon Sep 17 00:00:00 2001
From: logmanoriginal <log.man@gmx.de>
Date: Thu, 11 Aug 2016 21:42:49 +0200
Subject: [PATCH 146/149] [YoutubeBridge] Fix typo

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

diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index 08656bc..9fd0ea6 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -11,10 +11,10 @@ class YoutubeBridge extends BridgeAbstract {
 	public function loadMetadatas() {
 
 		$this->name = 'YouTube Bridge';
-		$this->homepage = 'https://www.youtube.com/';
+		$this->uri = 'https://www.youtube.com/';
 		$this->description = 'Returns the 10 newest videos by username/channel/playlist or search';
 		$this->maintainer = 'mitsukarenai';
-		$this->update = '2016-08-09';
+		$this->update = '2016-08-11';
 
 		$this->parameters['By username'] =
 		'[

From 0e7f992e64274ae0224fa741c066d94ebc03d616 Mon Sep 17 00:00:00 2001
From: LogMANOriginal <LogMANOriginal@users.noreply.github.com>
Date: Sat, 13 Aug 2016 19:08:03 +0200
Subject: [PATCH 147/149] [README] Add license badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 876b6b3..0fb8620 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 rss-bridge
 ===
+[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE)
 
 rss-bridge is a PHP project capable of generating ATOM feeds for websites which don't have one.
 

From 890b48c56de59638ee40deee98757710b6b31581 Mon Sep 17 00:00:00 2001
From: logmanoriginal <logmanoriginal@users.noreply.github.com>
Date: Sat, 13 Aug 2016 21:32:14 +0200
Subject: [PATCH 148/149] [CREATE_BRIDGE] Remove file

The contents of this file are now part of the Wiki
---
 CREATE_BRIDGE.md | 237 -----------------------------------------------
 1 file changed, 237 deletions(-)
 delete mode 100644 CREATE_BRIDGE.md

diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md
deleted file mode 100644
index fded177..0000000
--- a/CREATE_BRIDGE.md
+++ /dev/null
@@ -1,237 +0,0 @@
-# Howto create a bridge
-
-A bridge is an class that allows rss-bridge to create a RSS feed from a website.
-The bridge is a PHP file, located in the [`bridges/`](bridges/) folder.
-
-Read the following chapters an make sure to read the [Guidelines](#guidelines)!
-
-## Specifications
-
-A rss bridge must extend the `BridgeAbstract` class and implement the following functions :
-
-* [`loadMetadatas`](#the-loadmetadatas-function) (**required**)
-* [`collectData`](#the-collectdata-function) (**required**)
-* [`getName`](#the-getname-function)
-* [`getURI`](#the-geturi-function)
-* [`getCacheDuration`](#the-getcacheduration-function)
-
-Find a [template](#template) at the end of this file.
-
-## The `loadMetadatas` function
-
-This function is used by rss-bridge to determine the name, maintainer name, website, last updated date... of the bridge, and the user parameters.
-
-### Basic metadatas
-
-The basic metadatas are :
-
-```PHP
-$this->maintainer // Name of the maintainer
-$this->name // Name of the bridge
-$this->uri // URI to the target website of the bridge ("http://....")
-$this->description // A brief description of the bridge
-$this->update // Date of last change in format "yyyy-mm-dd"
-$this->parameters // (optional) Definition of additional parameters
-```
-
-Find a description of `$this->parameters` [below](#parameters)
-
-The default values are :
-
-```PHP
-$this->maintainer = 'No maintainer';
-$this->name = "Unnamed bridge";
-$this->uri = "";
-$this->description = 'No description provided';
-$this->parameters = array();
-```
-
-### Parameters
-
-Parameters are defined in a JSON-like format, which is parsed and transformed into a HTML `<form>` by rss-bridge.
-
-These datas goes into the `$this->parameters` array, which is not mandatory if your bridge doesn't take any parameter.
-
-Every possible usage of a bridge is an array element.
-
-The array can be a key-based array, but it is not necessary. The following syntaxes are hereby correct :
-
-```PHP
-$this->parameters[] = ...
-$this->parameters['First usage of my bridge'] = ...
-```
-
-It is worth mentionning that you can also define a set of parameters that will be applied to every possible utilisation of your bridge.
-To do this, just create a parameter array with the `global` key :
-
-```PHP
-$this->parameters['global'] = ...
-```
-
-### Format specifications
-
-Every `$this->parameters` element is a JSON array of cluster (`[ ... ]`) containing all input fields.
-
-Following elements are supported :
-
-Parameter Name | Required | Type | Supported values | Description
----------------|----------|------|------------------| -----------
-`name`|**yes**|Text||Input name as displayed to the user
-`identifier`|**yes**|Text||Identifier, which will be the key in the `$param` array for the [`collectData`](#the-collectdata-function) function
-`type`|no|Text|`text`, `number`, `list`, `checkbox`|Type of the input, default is text
-`required`|no|Boolean|`true`, `false`|Set this if you want your attribute to be required
-`values`|no|Text|`[ {"name" : option1Name, "value" : "option1Value"}, ... ]`| Values list, required with the '`list`' type
-`title`|no|Text||Will be shown as tooltip when mouse-hovering over the input
-
-Hence, the most basic parameter definition is the following :
-
-```PHP
-...
-	$this->parameters[] =
-	'[
-		{
-			"name" : "Username",
-			"identifier" : "u"
-		}
-	]';
-...
-```
-
-## The `collectData` function
-
-This function takes as a parameter an array called `$param`, that is automatically filled with values from the user, according to the values defined in the parameters array in `loadMetadatas`.
-This function is the place where all the website scrapping and the RSS feed generation process must be implemented.
-
-RSS elements collected by this function must be stored in the class variable `items[]`.
-
-Every RSS element is an instance of the `Item` class.
-
-## Items
-
-The `Item` class is used to store parameter that are collected in the [`collectData`](#the-collectdata-function) function. Following properties are supported by rss-bridge :
-
-```PHP
-$item->uri // URI to reach the subject ("http://...")
-$item->title // Title of the item
-$item->timestamp // Timestamp of the item in numeric format (use strtotime)
-$item->author // Name of the author
-$item->content // Content in HTML format
-```
-
-In order to create a new item you'll have to escape the **I** in **I**tem like this :
-
-```PHP
-$item = new \Item();
-```
-
-### Item usage
-
-Which items are necessary depends on the output format. There are two formats that support literally any property in the `$item`:
-
-* JSON
-* Plaintext
-
-The following list provides an overview of the parameters used by the other formats :
-
-Parameter | ATOM | HTML | (M)RSS
-----------|------|------|-------
-`uri`|X|X|X
-`title`|X|X|X
-`timestamp`|X|X|X
-`author`|X|X|X
-`content`|X|X|X
-
-## The `getName` function
-
-This function returns the name of the bridge as it will be displayed on the main page of rss-bridge or on top of the feed output (HTML, ATOM, etc...).
-
-**Notice:** rss-bridge will by default return `$this->name` which is defined in the [`loadMetadatas`](#the-loadmetadatas-function) function, so you only have to implement this function if you require different behavior!
-
-```PHP
-	public function getName(){
-		return $this->name;
-	}
-```
-
-## The `getURI` function
-
-This function returns the URI to the destination site of the bridge. It will be used on the main page of rss-bridge when clicking your bridge name.
-
-**Notice:** rss-bridge will by default return `$this->uri` which is defined in the [`loadMetadatas`](#the-loadmetadatas-function) function, so you only have to implement this function if you require different behavior!
-
-```PHP
-	public function getURI(){
-		return $this->uri;
-	}
-```
-
-## The `getCacheDuration` function
-
-This function returns the time in **seconds** during which rss-bridge will output cached values instead of re-generating a RSS feed.
-
-**Notice:** rss-bridge will return `3600` seconds (1 hour) by default, so you only have to implement this function if you require different timing!
-
-```PHP
-	public function getCacheDuration(){
-		return 3600; // 1 hour
-	}
-```
-
-# Bridge Abstract functions
-
-All bridges extend from `BridgeAbstract` and therefore are able to make use of functions defined in `BridgeAbstract`. 
-
-Following functions should be used for good practice and will support you with your bridge :
-
-* [`returnError`](#the-returnerror-function)
-* [`file_get_html`](#the-file_get_html-function)
-
-## The `returnError` function
-
-This function aborts execution of the current bridge and returns the given error message with the provided error number :
-
-```PHP
-$this->returnError('Your error message', 404)
-```
-
-Check the [list of error codes](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes) for applicable error numbers.
-
-## The `file_get_html` function
-
-This function is a wrapper around the [simple_html_dom](http://simplehtmldom.sourceforge.net/) [file_get_html](http://simplehtmldom.sourceforge.net/manual_api.htm#api) function in order to provide context by design. It is considered good practice to use this function.
-
-```PHP
-$html = $this->file_get_html('your URI');
-```
-
-# Guidelines
-
-* scripts (eg. Javascript) must be stripped out. Make good use of `strip_tags()` and `preg_replace()`
-* each bridge must present data within 8 seconds (adjust iterators accordingly)
-* cache timeout must be fine-tuned so that each refresh can provide 1 or 2 new elements on busy periods
-* `<audio>` and `<video>` must not autoplay. Seriously.
-* do everything you can to extract valid timestamps. Translate formats, use API, exploit sitemap, whatever. Free the data!
-* don't create duplicates. If the website runs on WordPress, use the generic WordPress bridge if possible.
-* maintain efficient and well-commented code :wink:
-
-# Template
-
-This is the minimum template for a new bridge:
-
-```PHP
-<?php
-class MySiteBridge extends BridgeAbstract{
-	public function loadMetadatas(){
-		$this->maintainer = 'No maintainer';
-		$this->name = 'Unnamed bridge';
-		$this->uri = '';
-		$this->description = 'No description provided';
-		$this->parameters = array();
-	}
-
-	public function collectData(array $params){
-		// Implement your bridge here!
-	}
-}
-
-```

From 94404aad610a41b7cca8ed4a6c5476ecff9492c5 Mon Sep 17 00:00:00 2001
From: logmanoriginal <logmanoriginal@users.noreply.github.com>
Date: Sat, 13 Aug 2016 21:32:36 +0200
Subject: [PATCH 149/149] [README] Update links

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0fb8620..6d5c554 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ Including `PHP Simple HTML DOM Parser` under the [MIT License](http://opensource
 Technical notes
 ===
   * There is a cache so that source services won't ban you even if you hammer the rss-bridge with requests. Each bridge can have a different duration for the cache. The `cache` subdirectory will be automatically created and cached objects older than 24 hours get purged.
-  * To implement a new rss-bridge, [follow the specifications](CREATE_BRIDGE.md) and take a look at existing bridges for examples.
+  * To implement a new Bridge, [follow the specifications](https://github.com/RSS-Bridge/rss-bridge/wiki/Bridge-API) and take a look at existing Bridges for examples.
   * To enable debug mode (disabling cache and enabling error reporting), create an empty file named `DEBUG` in the root directory (next to `index.php`).
   * For more information refer to the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki)