From 755d3e133f9acdf567d78c488b28ff982dc95fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 10:36:56 +0200
Subject: [PATCH 01/62] [ABCTabsBridge] remove useless member $request
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/ABCTabsBridge.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php
index 6031d316..355f82d2 100644
--- a/bridges/ABCTabsBridge.php
+++ b/bridges/ABCTabsBridge.php
@@ -1,8 +1,6 @@
 <?php
 class ABCTabsBridge extends BridgeAbstract{
 
-	private $request;
-
     public function loadMetadatas() {
 
 		$this->maintainer = "kranack";

From 1de7fb748cf93b06be25921d87b613d2aa87c275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 10:58:00 +0200
Subject: [PATCH 02/62] [BandcampBridge] remove useless member $request
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/BandcampBridge.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php
index b9dbaa27..fa64c075 100644
--- a/bridges/BandcampBridge.php
+++ b/bridges/BandcampBridge.php
@@ -1,8 +1,6 @@
 <?php
 class BandcampBridge extends BridgeAbstract{
 
-    private $request;
-
 	public function loadMetadatas() {
 
 		$this->maintainer = "sebsauvage";
@@ -22,8 +20,7 @@ class BandcampBridge extends BridgeAbstract{
         $param=$this->parameters[$this->queriedContext];
         $html = '';
         if (isset($param['tag']['value'])) {
-            $this->request = $param['tag']['value'];
-            $html = $this->getSimpleHTMLDOM('http://bandcamp.com/tag/'.urlencode($this->request).'?sort_field=date') or $this->returnServerError('No results for this query.');
+            $html = $this->getSimpleHTMLDOM('http://bandcamp.com/tag/'.urlencode($param['tag']['value']).'?sort_field=date') or $this->returnServerError('No results for this query.');
         }
         else {
             $this->returnClientError('You must specify tag (/tag/...)');
@@ -45,7 +42,9 @@ class BandcampBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        return (!empty($this->request) ? $this->request .' - ' : '') .'Bandcamp Tag';
+        $param=$this->parameters[$this->queriedContext];
+
+        return (!empty($param['tag']['value']) ? $param['tag']['value'] .' - ' : '') .'Bandcamp Tag';
     }
 
     public function getCacheDuration(){

From 0d36ca21df02f0258651440aadfdaa56584ac34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 11:05:08 +0200
Subject: [PATCH 03/62] [CNETBridge] remove useless member $topicName
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/CNETBridge.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php
index 2fbed359..b92cecc2 100644
--- a/bridges/CNETBridge.php
+++ b/bridges/CNETBridge.php
@@ -1,8 +1,6 @@
 <?php
 class CNETBridge extends BridgeAbstract {
 
-    private $topicName = '';
-
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
@@ -43,10 +41,7 @@ class CNETBridge extends BridgeAbstract {
             return $article_html;
         }
 
-        if (!empty($param['topic']['value']))
-            $this->topicName = $param['topic']['value'];
-
-        $pageUrl = 'http://www.cnet.com/'.(empty($this->topicName) ? '' : 'topics/'.$this->topicName.'/');
+        $pageUrl = 'http://www.cnet.com/'.(empty($param['topic']['value']) ? '' : 'topics/'.$param['topic']['value'].'/');
         $html = $this->getSimpleHTMLDOM($pageUrl) or $this->returnServerError('Could not request CNET: '.$pageUrl);
         $limit = 0;
 
@@ -78,7 +73,8 @@ class CNETBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'CNET News Bridge'.(empty($this->topicName) ? '' : ' - '.$this->topicName);
+        $param=$this->parameters[$this->queriedContext];
+        return 'CNET News Bridge'.(empty($param['topic']['value']) ? '' : ' - '.$this->param['topic']['value']);
     }
 
     public function getCacheDuration() {

From ed0fd12193e1608649e483cab3861201be10481a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 11:55:58 +0200
Subject: [PATCH 04/62] [DailymotionBridge] simplify code
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/DailymotionBridge.php | 155 +++++++++++++++++++---------------
 1 file changed, 88 insertions(+), 67 deletions(-)

diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php
index 0a73df8f..f085f04e 100644
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -1,25 +1,25 @@
 <?php
 class DailymotionBridge extends BridgeAbstract{
 
-	private $request;
-
     public function loadMetadatas() {
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Dailymotion Bridge";
-		$this->uri = "https://www.dailymotion.com/";
-		$this->description = "Returns the 5 newest videos by username/playlist or search";
+        $this->maintainer = "mitsukarenai";
+        $this->name = "Dailymotion Bridge";
+        $this->uri = "https://www.dailymotion.com/";
+        $this->description = "Returns the 5 newest videos by username/playlist or search";
 
         $this->parameters["By username"] = array(
-          'u'=>array('name'=>'username')
+            'u'=>array(
+                'name'=>'username',
+                'required'=>true
+            )
         );
 
         $this->parameters["By playlist id"] = array(
-          'p'=>array(
-            'name'=>'playlist id',
-            'type'=>'text',
-            'required'=>true
-        )
+            'p'=>array(
+                'name'=>'playlist id',
+                'required'=>true
+            )
         );
 
         $this->parameters["From search results"] = array(
@@ -27,66 +27,87 @@ class DailymotionBridge extends BridgeAbstract{
                 'name'=>'Search keyword',
                 'required'=>true
             ),
-          'pa'=>array(
-            'name'=>'Page',
-            'type'=>'number'
-          )
+            'pa'=>array(
+                'name'=>'Page',
+                'type'=>'number'
+            )
         );
-	}
-
-    function getMetadata($id) {
-      $metadata=array();
-      $html2 = $this->getSimpleHTMLDOM('http://www.dailymotion.com/video/'.$id) or $this->returnServerError('Could not request Dailymotion.');
-      $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');
-      $metadata['uri'] = $html2->find('meta[property=og:url]', 0)->getAttribute('content');
-
-      return $metadata;
     }
 
-	public function collectData(){
+    function getMetadata($id) {
+        $metadata=array();
+        $html2 = $this->getSimpleHTMLDOM('http://www.dailymotion.com/video/'.$id)
+            or $this->returnServerError('Could not request Dailymotion.');
+        $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');
+        $metadata['uri'] = $html2->find('meta[property=og:url]', 0)->getAttribute('content');
+        return $metadata;
+    }
+
+    public function collectData(){
+        $html = '';
+        $limit = 5;
+        $count = 0;
+
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+            or $this->returnServerError('Could not request Dailymotion.');
+
+        foreach($html->find('div.media a.preview_link') as $element) {
+            if($count < $limit) {
+                $item = array();
+                $item['id'] = str_replace('/video/', '', strtok($element->href, '_'));
+                $metadata = $this->getMetadata($item['id']);
+                $item['uri'] = $metadata['uri'];
+                $item['title'] = $metadata['title'];
+                $item['timestamp'] = $metadata['timestamp'];
+                $item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $metadata['thumbnailUri'] . '" /></a><br><a href="' . $item['uri'] . '">' . $item['title'] . '</a>';
+                $this->items[] = $item;
+                $count++;
+            }
+        }
+    }
+
+    public function getName(){
         $param=$this->parameters[$this->queriedContext];
-        	$html = '';
-		$limit = 5;
-		$count = 0;
+        switch($this->queriedContext){
+        case 'By username':
+            $specific=$param['u']['value'];
+            break;
+        case 'By playlist id':
+            $specific=strtok($param['p']['value'], '_');
+            break;
+        case 'From search results':
+            $specific=$param['s']['value'];
+            break;
+        }
 
-		if (isset($param['u']['value'])) {   // user timeline mode
-			$this->request = $param['u']['value'];
-			$html = $this->getSimpleHTMLDOM('http://www.dailymotion.com/user/'.urlencode($this->request).'/1') or $this->returnServerError('Could not request Dailymotion.');
-		}
-		else if (isset($param['p']['value'])) {    // playlist mode
-			$this->request = strtok($param['p']['value'], '_');
-			$html = $this->getSimpleHTMLDOM('http://www.dailymotion.com/playlist/'.urlencode($this->request).'') or $this->returnServerError('Could not request Dailymotion.');
-		}
-		else if (isset($param['s']['value'])) {   // search mode
-			$this->request = $param['s']['value']; $page = 1; if (isset($param['pa']['value'])) $page = (int)preg_replace("/[^0-9]/",'', $param['pa']['value']);
-			$html = $this->getSimpleHTMLDOM('http://www.dailymotion.com/search/'.urlencode($this->request).'/'.$page.'') or $this->returnServerError('Could not request Dailymotion.');
-		}
-		else {
-			$this->returnClientError('You must either specify a Dailymotion username (?u=...) or a playlist id (?p=...) or search (?s=...)');
-		}
+        return $specific.' : Dailymotion Bridge';
+    }
 
-		foreach($html->find('div.media a.preview_link') as $element) {
-			if($count < $limit) {
-				$item = array();
-				$item['id'] = str_replace('/video/', '', strtok($element->href, '_'));
-				$metadata = $this->getMetadata($item['id']);
-				$item['uri'] = $metadata['uri'];
-				$item['title'] = $metadata['title'];
-				$item['timestamp'] = $metadata['timestamp'];
-				$item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $metadata['thumbnailUri'] . '" /></a><br><a href="' . $item['uri'] . '">' . $item['title'] . '</a>';
-				$this->items[] = $item;
-				$count++;
-			}
-		}
-	}
+    public function getURI(){
+        $param=$this->parameters[$this->queriedContext];
+        switch($this->queriedContext){
+        case 'By username':
+            $uri='http://www.dailymotion.com/user/'
+                .urlencode($param['u']['value']).'/1';
+            break;
+        case 'By playlist id':
+            $uri='http://www.dailymotion.com/playlist/'
+                .urlencode(strtok($param['p']['value'], '_'));
+            break;
+        case 'From search results':
+            $uri='http://www.dailymotion.com/search/'
+                .urlencode($param['s']['value']);
+            if(isset($param['pa']['value'])){
+                $uri.='/'.$param['pa']['value'];
+            }
+            break;
+        }
+        return $uri;
+    }
 
-	public function getName(){
-		return (!empty($this->request) ? $this->request .' - ' : '') .'Dailymotion Bridge';
-	}
-
-	public function getCacheDuration(){
-		return 3600*3; // 3 hours
-	}
+    public function getCacheDuration(){
+        return 3600*3; // 3 hours
+    }
 }

From 2f1fa810825419a3066dc912784eb62d5c1fd468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 12:27:28 +0200
Subject: [PATCH 05/62] [GBAtempBridge] remove useless checks and simplify code
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/GBAtempBridge.php | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php
index f8fc9ff0..d9281171 100644
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -1,8 +1,6 @@
 <?php
 class GBAtempBridge extends BridgeAbstract {
 
-    private $filter = '';
-
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
@@ -14,6 +12,7 @@ class GBAtempBridge extends BridgeAbstract {
           'type'=>array(
             'name'=>'Type',
             'type'=>'list',
+            'required'=>true,
             'values'=>array(
               'News'=>'N',
               'Reviews'=>'R',
@@ -65,20 +64,11 @@ class GBAtempBridge extends BridgeAbstract {
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
-        $typeFilter = '';
-        if (!empty($param['type']['value'])) {
-            if ($param['type']['value'] == 'N' || $param['type']['value'] == 'R' || $param['type']['value'] == 'T' || $param['type']['value'] == 'F') {
-                $typeFilter = $param['type']['value'];
-                if ($typeFilter == 'N') { $this->filter = 'News'; }
-                if ($typeFilter == 'R') { $this->filter = 'Review'; }
-                if ($typeFilter == 'T') { $this->filter = 'Tutorial'; }
-                if ($typeFilter == 'F') { $this->filter = 'Forum'; }
-            } else $this->returnClientError('The provided type filter is invalid. Expecting N, R, T, or F.');
-        } else $this->returnClientError('Please provide a type filter. Expecting N, R, T, or F.');
 
         $html = $this->getSimpleHTMLDOM($this->uri) or $this->returnServerError('Could not request GBAtemp.');
 
-        if ($typeFilter == 'N') {
+        switch($param['type']['value']){
+        case 'N':
             foreach ($html->find('li[class=news_item full]') as $newsItem) {
                 $url = $this->uri.$newsItem->find('a', 0)->href;
                 $time = intval($this->ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
@@ -87,7 +77,7 @@ class GBAtempBridge extends BridgeAbstract {
                 $content = $this->fetch_post_content($url, $this->uri);
                 $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
-        } else if ($typeFilter == 'R') {
+        case 'R':
             foreach ($html->find('li.portal_review') as $reviewItem) {
                 $url = $this->uri.$reviewItem->find('a', 0)->href;
                 $title = $reviewItem->find('span.review_title', 0)->plaintext;
@@ -102,7 +92,7 @@ class GBAtempBridge extends BridgeAbstract {
                 $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') {
+        case 'T':
             foreach ($html->find('li.portal-tutorial') as $tutorialItem) {
                 $url = $this->uri.$tutorialItem->find('a', 0)->href;
                 $title = $tutorialItem->find('a', 0)->plaintext;
@@ -111,7 +101,7 @@ class GBAtempBridge extends BridgeAbstract {
                 $content = $this->fetch_post_content($url, $this->uri);
                 $this->items[] = $this->build_item($url, $title, $author, $time, $content);
             }
-        } else if ($typeFilter == 'F') {
+        case 'F':
             foreach ($html->find('li.rc_item') as $postItem) {
                 $url = $this->uri.$postItem->find('a', 1)->href;
                 $title = $postItem->find('a', 1)->plaintext;
@@ -124,7 +114,9 @@ class GBAtempBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'GBAtemp'.(empty($this->filter) ? '' : ' '.$this->filter).' Bridge';
+        $param=$this->parameters[$this->queriedContext];
+        $type=array_search($param['type']['value'],$param['type']['values']);
+        return 'GBAtemp '.$type.' Bridge';
     }
 
     public function getCacheDuration() {

From c061057861330214dc0d95d2332152ad27958c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 12:43:53 +0200
Subject: [PATCH 06/62] [GoogleSearchBridge] remove useless checks and useless
 member $request
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

still broken though

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

diff --git a/bridges/GoogleSearchBridge.php b/bridges/GoogleSearchBridge.php
index 5585cea2..c2512bf0 100644
--- a/bridges/GoogleSearchBridge.php
+++ b/bridges/GoogleSearchBridge.php
@@ -9,8 +9,6 @@
 */
 class GoogleSearchBridge extends BridgeAbstract{
 
-    private $request;
-
     public function loadMetadatas() {
 
 		$this->maintainer = "sebsauvage";
@@ -19,7 +17,10 @@ class GoogleSearchBridge extends BridgeAbstract{
 		$this->description = "Returns most recent results from Google search.";
 
         $this->parameters[] = array(
-          'q'=>array('name'=>"keyword")
+            'q'=>array(
+                'name'=>"keyword",
+                'required'=>true
+            )
         );
 
 	}
@@ -29,13 +30,7 @@ class GoogleSearchBridge extends BridgeAbstract{
         $param=$this->parameters[$this->queriedContext];
         $html = '';
 
-        if (isset($param['q']['value'])) {   /* keyword search mode */
-            $this->request = $param['q']['value'];
-            $html = $this->getSimpleHTMLDOM('https://www.google.com/search?q=' . urlencode($this->request) . '&num=100&complete=0&tbs=qdr:y,sbd:1') or $this->returnServerError('No results for this query.');
-        }
-        else{
-            $this->returnClientError('You must specify a keyword (?q=...).');
-        }
+            $html = $this->getSimpleHTMLDOM('https://www.google.com/search?q=' . urlencode($param['q']['value']) . '&num=100&complete=0&tbs=qdr:y,sbd:1') or $this->returnServerError('No results for this query.');
 
         $emIsRes = $html->find('div[id=ires]',0);
         if( !is_null($emIsRes) ){
@@ -55,7 +50,8 @@ class GoogleSearchBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        return (!empty($this->request) ? $this->request .' - ' : '') .'Google search';
+        $param=$this->parameters[$this->queriedContext];
+        return $param['q']['value'] .' - Google search';
     }
 
     public function getCacheDuration(){

From d95fa6117aaab74d3eb6d0afb290993908575273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 14:47:52 +0200
Subject: [PATCH 07/62] [IdenticaBridge] remove useless code and fix getURI()
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/IdenticaBridge.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/bridges/IdenticaBridge.php b/bridges/IdenticaBridge.php
index a9d30173..15ed7598 100644
--- a/bridges/IdenticaBridge.php
+++ b/bridges/IdenticaBridge.php
@@ -1,8 +1,6 @@
 <?php
 class IdenticaBridge extends BridgeAbstract{
 
-	private $request;
-
 	public function loadMetadatas() {
 
 		$this->maintainer = "mitsukarenai";
@@ -20,15 +18,9 @@ class IdenticaBridge extends BridgeAbstract{
 	}
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (isset($param['u']['value'])) {   /* user timeline mode */
-        	$this->request = $param['u']['value'];
-            $html = $this->getSimpleHTMLDOM('https://identi.ca/'.urlencode($this->request)) or $this->returnServerError('Requested username can\'t be found.');
-        }
-        else {
-            $this->returnClientError('You must specify an Identica username (?u=...).');
-        }
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+            or $this->returnServerError('Requested username can\'t be found.');
 
         foreach($html->find('li.major') as $dent) {
             $item = array();
@@ -41,11 +33,13 @@ class IdenticaBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        return (!empty($this->request) ? $this->request .' - ' : '') .'Identica Bridge';
+        $param=$this->parameters[$this->queriedContext];
+        return $param['u']['value'] .' - Identica Bridge';
     }
 
     public function getURI(){
-        return 'https://identica.com';
+        $param=$this->parameters[$this->queriedContext];
+        return $this->uri.urlencode($param['u']['value']);
     }
 
     public function getCacheDuration(){

From 760141a7513b24f39a2643694e40c95248cc7a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 14:54:10 +0200
Subject: [PATCH 08/62] [InstagramBridge] fix parameter 'u' requirement status
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/InstagramBridge.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index 85709474..2c2a7e0c 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -11,7 +11,10 @@ class InstagramBridge extends BridgeAbstract{
 		$this->description = "Returns the newest images";
 
         $this->parameters[] = array(
-          'u'=>array('name'=>'username')
+            'u'=>array(
+                'name'=>'username',
+                'required'=>true
+            )
         );
 
 	}

From 614d425da4e3d37abbdc34444ba8de3304979eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 14:57:43 +0200
Subject: [PATCH 09/62] [InstagramBridge] fix uri, remove useless code
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/InstagramBridge.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index 2c2a7e0c..9b48890d 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -1,8 +1,6 @@
 <?php
 class InstagramBridge extends BridgeAbstract{
 
-    private $request;
-
     public function loadMetadatas() {
 
 		$this->maintainer = "pauder";
@@ -20,15 +18,8 @@ class InstagramBridge extends BridgeAbstract{
 	}
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-        $html = '';
-        if (isset($param['u']['value'])) {   /* user timeline mode */
-            $this->request = $param['u']['value'];
-            $html = $this->getSimpleHTMLDOM('http://instagram.com/'.urlencode($this->request)) or $this->returnServerError('Could not request Instagram.');
-        }
-        else {
-            $this->returnClientError('You must specify a Instagram username (?u=...).');
-        }
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+            or $this->returnServerError('Could not request Instagram.');
 
         $innertext = null;
 
@@ -74,6 +65,13 @@ class InstagramBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        return (!empty($this->request) ? $this->request .' - ' : '') .'Instagram Bridge';
+        $param=$this->parameters[$this->queriedContext];
+        return $this->param['u']['value'] .' - Instagram Bridge';
+    }
+
+    public function getURI(){
+        $param=$this->parameters[$this->queriedContext];
+        return $this->uri.urlencode($param['u']['value']);
     }
 }
+

From 292f0f85ada51234cd9535337f83b9eb31ce4468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 15:41:42 +0200
Subject: [PATCH 10/62] [ParuVenduImmoBridge] fix undefined $param variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and remove useless member $request

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

diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php
index 345ef97d..bb0a77bd 100644
--- a/bridges/ParuVenduImmoBridge.php
+++ b/bridges/ParuVenduImmoBridge.php
@@ -2,8 +2,6 @@
 
 class ParuVenduImmoBridge extends BridgeAbstract
 {
-    private $request = '';
-
 	public function loadMetadatas() {
 
 		$this->maintainer = "polo2ro";
@@ -31,6 +29,7 @@ class ParuVenduImmoBridge extends BridgeAbstract
 
     public function collectData()
     {
+        $param=$this->parameters[$this->queriedContext];
         $html = '';
         $num = 20;
         $appartment = '&tbApp=1&tbDup=1&tbChb=1&tbLof=1&tbAtl=1&tbPla=1';
@@ -38,7 +37,6 @@ class ParuVenduImmoBridge extends BridgeAbstract
         $link = $this->uri.'/immobilier/annonceimmofo/liste/listeAnnonces?tt=1'.$appartment.$maison;
 
         if (isset($param['minarea']['value'])) {
-            $this->request .= ' '.$param['minarea']['value'].' m2';
             $link .= '&sur0='.urlencode($param['minarea']['value']);
         }
 
@@ -51,7 +49,6 @@ class ParuVenduImmoBridge extends BridgeAbstract
         }
 
         if (isset($param['lo']['value'])) {
-            $this->request .= ' In: '.$param['lo']['value'];
             $link .= '&lo='.urlencode($param['lo']['value']);
         }
 
@@ -88,7 +85,18 @@ class ParuVenduImmoBridge extends BridgeAbstract
     }
 
     public function getName(){
-        return 'Paru Vendu Immobilier'.$this->request;
+        $param=$this->parameters[$this->queriedContext];
+        $request='';
+        if(isset($param['minarea']['value']) &&
+            !empty($param['minarea']['value'])
+        ){
+            $request .= ' '.$param['minarea']['value'].' m2';
+        }
+        if(isset($param['lo']['value']) &&
+            !empty($param['lo']['value'])){
+            $request .= ' In: '.$param['lo']['value'];
+        }
+        return 'Paru Vendu Immobilier'.$request;
     }
 
     public function getCacheDuration(){

From 05001f6b2ee09492e8468ec04a34f485b56c558c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 16:02:12 +0200
Subject: [PATCH 11/62] [SoundcloudBridge] remove useless code
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/SoundcloudBridge.php | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php
index 407d6e4a..b064be1a 100644
--- a/bridges/SoundcloudBridge.php
+++ b/bridges/SoundcloudBridge.php
@@ -1,9 +1,6 @@
 <?php
 class SoundCloudBridge extends BridgeAbstract{
 
-	private $request;
-	public $name;
-
 	public function loadMetadatas() {
 
 		$this->maintainer = "kranack";
@@ -25,31 +22,35 @@ class SoundCloudBridge extends BridgeAbstract{
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
 
-		if (isset($param['u']['value']) && !empty($param['u']['value']))
-		{
-			$this->request = $param['u']['value'];
-
-			$res = json_decode($this->getContents('https://api.soundcloud.com/resolve?url=http://www.soundcloud.com/'. urlencode($this->request) .'&client_id=' . self::CLIENT_ID)) or $this->returnServerError('No results for this query');
-			$tracks = json_decode($this->getContents('https://api.soundcloud.com/users/'. urlencode($res->id) .'/tracks?client_id=' . self::CLIENT_ID)) or $this->returnServerError('No results for this user');
-		}
-		else
-		{
-			$this->returnClientError('You must specify username');
-		}
+        $res = json_decode($this->getContents(
+            'https://api.soundcloud.com/resolve?url=http://www.soundcloud.com/'
+            . urlencode($param['u']['value'])
+            .'&client_id=' . self::CLIENT_ID
+        )) or $this->returnServerError('No results for this query');
+        $tracks = json_decode($this->getContents(
+            'https://api.soundcloud.com/users/'
+            . urlencode($res->id)
+            .'/tracks?client_id=' . self::CLIENT_ID
+        )) or $this->returnServerError('No results for this user');
 
 		for ($i=0; $i < 10; $i++) {
 		    $item = array();
 		    $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);
-		    $item['uri'] = 'https://soundcloud.com/'. urlencode($this->request) .'/'. urlencode($tracks[$i]->permalink);
+            $item['id'] = 'https://soundcloud.com/'
+                . urlencode($param['u']['value']) .'/'
+                . urlencode($tracks[$i]->permalink);
+            $item['uri'] = 'https://soundcloud.com/'
+                . urlencode($param['u']['value']) .'/'
+                . urlencode($tracks[$i]->permalink);
 		    $this->items[] = $item;
 		}
 
     }
 	public function getName(){
-		return (!empty($this->name) ? $this->name .' - ' : '') . (!empty($this->request) ? $this->request : '');
+        $param=$this->parameters[$this->queriedContext];
+		return $this->name .' - '. $param['u']['value'];
 	}
 
 	public function getCacheDuration(){

From 72e3031d5c9afd6f0c04f6175e962ba678681daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 16:14:38 +0200
Subject: [PATCH 12/62] [TwitchApiBridge] remove useless code
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/TwitchApiBridge.php | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php
index 1214b317..bf846bf4 100644
--- a/bridges/TwitchApiBridge.php
+++ b/bridges/TwitchApiBridge.php
@@ -4,9 +4,6 @@ define('TWITCH_BROADCASTS', 'false'); // The default flag for broadcasts
 
 class TwitchApiBridge extends BridgeAbstract{
 
-	// for use in the getName function!
-	private $channel;
-
 	public function loadMetadatas() {
 
 		$this->maintainer = "logmanoriginal";
@@ -64,25 +61,12 @@ class TwitchApiBridge extends BridgeAbstract{
 
 		$context = stream_context_create($opts);
 
-		$channel = '';
 		$limit = TWITCH_LIMIT;
 		$broadcasts = TWITCH_BROADCASTS;
 		$requests = 1;
 
-		if(isset($param['channel']['value'])) {
-			$channel = $param['channel']['value'];
-		} else {
-			$this->returnClientError('You must specify a valid channel name! Received: &channel=' . $param['channel']['value']);
-		}
-
-		$this->channel = $channel;
-
 		if(isset($param['limit']['value'])) {
-			try {
-				$limit = (int)$param['limit']['value'];
-			} catch (Exception $e){
-				$this->returnClientError('The limit you specified is not valid! Received: &limit=' . $param['limit']['value'] . ' Expected: &limit=<num> where <num> is any integer number.');
-			}
+            $limit = (int)$param['limit']['value'];
 		} else {
 			$limit = TWITCH_LIMIT;
 		}
@@ -94,19 +78,15 @@ class TwitchApiBridge extends BridgeAbstract{
 			if($limit % 100 != 0) { $requests++; }
 		}
 
-		if(isset($param['broadcasts']['value']) && ($param['broadcasts']['value'] == 'true' || $param['broadcasts']['value'] == 'false')) {
-			$broadcasts = $param['broadcasts']['value'];
-		} else {
-			$this->returnClientError('The value for broadcasts you specified is not valid! Received: &broadcasts=' . $param['broadcasts']['value'] . ' Expected: &broadcasts=false or &broadcasts=true');
-		}
+        $broadcasts = $param['broadcasts']['value'];
 
 		// Build the initial request, see also: https://github.com/justintv/Twitch-API/blob/master/v3_resources/videos.md#get-channelschannelvideos
 		$request = '';
 
 		if($requests == 1) {
-			$request = 'https://api.twitch.tv/kraken/channels/' . $channel . '/videos?limit=' . $limit . '&broadcasts=' . $broadcasts;
+			$request = 'https://api.twitch.tv/kraken/channels/' . $param['channel']['value'] . '/videos?limit=' . $limit . '&broadcasts=' . $broadcasts;
 		} else {
-			$request = 'https://api.twitch.tv/kraken/channels/' . $channel . '/videos?limit=100&broadcasts=' . $broadcasts;
+			$request = 'https://api.twitch.tv/kraken/channels/' . $param['channel']['value'] . '/videos?limit=100&broadcasts=' . $broadcasts;
 		}
 
 		/* Finally we're ready to request data from the API. Each response provides information for the next request. */
@@ -144,7 +124,8 @@ class TwitchApiBridge extends BridgeAbstract{
 	}
 
 	public function getName(){
-		return (!empty($this->channel) ? $this->channel . ' - ' : '') . 'Twitch API Bridge';
+        $param=$this->parameters[$this->queriedContext];
+		return $param['channel'] . ' - Twitch API Bridge';
 	}
 
 	public function getCacheDuration(){

From 7857325d9c5868e2af25bd53aa0a093a621853e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 18:02:57 +0200
Subject: [PATCH 13/62] [core] set checkboxes default value to false
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index 55c85c06..ff08d629 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -273,6 +273,23 @@ abstract class BridgeAbstract implements BridgeInterface {
                         $this->returnClientError('Mixed context parameters');
                     }else{
                         $this->queriedContext=$queriedContext;
+                        $contexts=array($this->queriedContext);
+                        if(isset($this->parameters['global'])){
+                            $contexts[]='global';
+                        }
+                        foreach($contexts as $context){
+                            foreach($this->parameters[$context] as $p=>$props){
+                                if(isset($props['type']) &&
+                                    $props['type']==='checkbox' &&
+                                    !isset($props['value'])){
+                                    if(!isset($props['defaultValue'])){
+                                        $this->parameters[$context][$p]['value']=false;
+                                    }else{
+                                        $this->parameters[$context][$p]['value']=$props['defaultValue'];
+                                    }
+                                }
+                            }
+                        }
                         foreach($param as $name=>$value){
                             if(isset($this->parameters['global'][$name])){
                                 $this->parameters[$queriedContext][$name]['value']=$value;

From 720b7924c506a7d71d88f8f0be6248047234d82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 18:06:19 +0200
Subject: [PATCH 14/62] [TwitchApiBridge] Simplify parameters and remove
 useless code
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/TwitchApiBridge.php | 65 ++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php
index bf846bf4..f7bc5416 100644
--- a/bridges/TwitchApiBridge.php
+++ b/bridges/TwitchApiBridge.php
@@ -1,6 +1,5 @@
 <?php
 define('TWITCH_LIMIT', 10); // The default limit
-define('TWITCH_BROADCASTS', 'false'); // The default flag for broadcasts
 
 class TwitchApiBridge extends BridgeAbstract{
 
@@ -11,38 +10,19 @@ class TwitchApiBridge extends BridgeAbstract{
 		$this->uri = "http://www.twitch.tv";
 		$this->description = "Returns the newest broadcasts or highlights by channel name using the Twitch API (v3)";
 
-        $this->parameters["Get channel without limit"] = array(
-          'channel'=>array(
-            'name'=>'Channel',
-            'required'=>true
-          ),
-          'broadcasts'=>array(
-            'name'=>'Broadcasts',
-            'type'=>'list',
-            'values'=>array(
-              'Show broadcasts'=>'true',
-              'Show highlights'=>'false'
+        $this->parameters['Show Channel Videos']=array(
+            'channel'=>array(
+                'name'=>'Channel',
+                'required'=>true
+            ),
+            'broadcasts'=>array(
+                'name'=>'Show Broadcasts rather than Highlights',
+                'type'=>'checkbox'
+            ),
+            'limit'=>array(
+                'name'=>'Limit',
+                'type'=>'number'
             )
-          )
-        );
-
-        $this->parameters["Get channel with limit"] = array(
-          'channel'=>array(
-            'name'=>'Channel',
-            'required'=>true
-          ),
-          'limit'=>array(
-            'name'=>'Limit',
-            'type'=>'number'
-          ),
-          'broadcasts'=>array(
-            'name'=>'Broadcasts',
-            'type'=>'list',
-            'values'=>array(
-              'Show broadcasts'=>'true',
-              'Show highlights'=>'false'
-            )
-          )
         );
 	}
 
@@ -61,24 +41,27 @@ class TwitchApiBridge extends BridgeAbstract{
 
 		$context = stream_context_create($opts);
 
-		$limit = TWITCH_LIMIT;
-		$broadcasts = TWITCH_BROADCASTS;
-		$requests = 1;
-
-		if(isset($param['limit']['value'])) {
-            $limit = (int)$param['limit']['value'];
-		} else {
+		if(!isset($param['limit']['value']) ||
+		   empty($param['limit']['value'])){
 			$limit = TWITCH_LIMIT;
+		}else{
+			$limit = (int)$param['limit']['value'];
 		}
 
 		// The Twitch API allows a limit between 1 .. 100. Therefore any value below must be set to 1, any greater must result in multiple requests.
+        $requests=1;
 		if($limit < 1) { $limit = 1; }
 		if($limit > 100) {
 			$requests = (int)($limit / 100);
 			if($limit % 100 != 0) { $requests++; }
 		}
 
-        $broadcasts = $param['broadcasts']['value'];
+		if($param['broadcasts']['value']){
+			$broadcasts='true';
+		}else{
+			$broadcasts='false';
+		}
+
 
 		// Build the initial request, see also: https://github.com/justintv/Twitch-API/blob/master/v3_resources/videos.md#get-channelschannelvideos
 		$request = '';
@@ -125,7 +108,7 @@ class TwitchApiBridge extends BridgeAbstract{
 
 	public function getName(){
         $param=$this->parameters[$this->queriedContext];
-		return $param['channel'] . ' - Twitch API Bridge';
+		return $param['channel']['value'] . ' - Twitch API Bridge';
 	}
 
 	public function getCacheDuration(){

From 341ce2bf3e5f4e1de869422d36cfabc14f680541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 18:13:06 +0200
Subject: [PATCH 15/62] [VkBridge] remove useless $request member
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/VkBridge.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php
index 6f016554..b5ddb35f 100644
--- a/bridges/VkBridge.php
+++ b/bridges/VkBridge.php
@@ -2,8 +2,6 @@
 
 class VkBridge extends BridgeAbstract {
 
-    private $request;
-
     public function loadMetadatas() {
         $this->maintainer = "ahiles3005";
         $this->name = "VK.com";
@@ -21,8 +19,8 @@ class VkBridge extends BridgeAbstract {
         $param=$this->parameters[$this->queriedContext];
         $html = '';
         if (isset($param['u']['value'])) {
-            $this->request = $param['u']['value'];
-            $text_html = $this->getSimpleHTMLDOM(urldecode($this->request)) or $this->returnServerError('No results for this query.');
+            $text_html = $this->getSimpleHTMLDOM(urldecode($param['u']['value']))
+                or $this->returnServerError('No results for this query.');
             $text_html = iconv('windows-1251', 'utf-8', $text_html);
             $html = str_get_html($text_html);
         }

From 0de4fce41d92af6963417b1be4fd22ac407230ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 18:25:24 +0200
Subject: [PATCH 16/62] [WhydBridge] remove useless code
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/WhydBridge.php | 43 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php
index 5f8fb23f..882882cd 100644
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@@ -1,9 +1,6 @@
 <?php
 class WhydBridge extends BridgeAbstract{
 
-	private $request;
-	public $name;
-
     public function loadMetadatas() {
 
 		$this->maintainer = "kranack";
@@ -23,26 +20,26 @@ class WhydBridge extends BridgeAbstract{
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
 		$html = '';
-		if (isset($param['u']['value']))
-		{
-			$this->request = $param['u']['value'];
-            if (strlen(preg_replace("/[^0-9a-f]/",'', $this->request)) == 24) { // is input the userid ?
-				$html = $this->getSimpleHTMLDOM('http://www.whyd.com/u/'.preg_replace("/[^0-9a-f]/",'', $this->request)) or $this->returnServerError('No results for this query.');
-			} else { // input may be the username
-				$html = $this->getSimpleHTMLDOM('http://www.whyd.com/search?q='.urlencode($this->request)) or $this->returnServerError('No results for this query.');
-				for ($j = 0; $j < 5; $j++) {
-					if (strtolower($html->find('div.user', $j)->find('a',0)->plaintext) == strtolower($this->request)) {
-						$html = $this->getSimpleHTMLDOM('http://www.whyd.com' . $html->find('div.user', $j)->find('a', 0)->getAttribute('href')) or $this->returnServerError('No results for this query');
-						break;
-					}
-				}
-			}
-            $this->name = $html->find('div#profileTop', 0)->find('h1', 0)->plaintext;
-		}
-		else
-		{
-			$this->returnClientError('You must specify username');
-		}
+        if (strlen(preg_replace("/[^0-9a-f]/",'', $param['u']['value'])) == 24){
+            // is input the userid ?
+            $html = $this->getSimpleHTMLDOM(
+                $this->uri.'u/'.preg_replace("/[^0-9a-f]/",'', $param['u']['value'])
+            ) or $this->returnServerError('No results for this query.');
+        } else { // input may be the username
+            $html = $this->getSimpleHTMLDOM(
+                $this->uri.'search?q='.urlencode($param['u']['value'])
+            ) or $this->returnServerError('No results for this query.');
+
+            for ($j = 0; $j < 5; $j++) {
+                if (strtolower($html->find('div.user', $j)->find('a',0)->plaintext) == strtolower($param['u']['value'])) {
+                    $html = $this->getSimpleHTMLDOM(
+                        $this->uri . $html->find('div.user', $j)->find('a', 0)->getAttribute('href')
+                    ) or $this->returnServerError('No results for this query');
+                    break;
+                }
+            }
+        }
+        $this->name = $html->find('div#profileTop', 0)->find('h1', 0)->plaintext;
 
 		for($i = 0; $i < 10; $i++) {
 			$track = $html->find('div.post', $i);

From a24e6ea32325b48b252ade937060925f6d0c9308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 18:39:57 +0200
Subject: [PATCH 17/62] [WikipediaBridge] implement and use getURI() and
 getName()
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/WikipediaBridge.php | 64 ++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index 7a284037..55394f74 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -44,8 +44,42 @@ class WikipediaBridge extends BridgeAbstract{
         );
 	}
 
+    public function getURI(){
+		$params=$this->parameters[$this->queriedContext];
+		return 'https://' . strtolower($params['language']['value']) . '.wikipedia.org';
+    }
+
+    public function getName(){
+		$params=$this->parameters[$this->queriedContext];
+        $subject = WIKIPEDIA_SUBJECT_TFA;
+		switch($params['subject']['value']){
+			case 'tfa':
+				$subject = WIKIPEDIA_SUBJECT_TFA;
+				break;
+			case 'dyk':
+				$subject = WIKIPEDIA_SUBJECT_DYK;
+				break;
+			default:
+				$subject = WIKIPEDIA_SUBJECT_TFA;
+				break;
+		}
+
+		switch($subject){
+			case WIKIPEDIA_SUBJECT_TFA:
+				$name = 'Today\'s featured article from ' . strtolower($params['language']['value']) . '.wikipedia.org';
+				break;
+			case WIKIPEDIA_SUBJECT_DYK:
+				$name = 'Did you know? - articles from ' . strtolower($params['language']['value']) . '.wikipedia.org';
+				break;
+			default:
+				$name = 'Articles from ' . strtolower($params['language']['value']) . '.wikipedia.org';
+				break;
+		}
+        return $name;
+    }
+
 	public function collectData(){
-        $params=$this->parameters[$this->queriedContext];
+		$params=$this->parameters[$this->queriedContext];
 		if(!isset($params['language']['value']))
 			$this->returnClientError('You must specify a valid language via \'&language=\'!');
 
@@ -72,27 +106,11 @@ class WikipediaBridge extends BridgeAbstract{
 		if(isset($params['fullarticle']['value']))
 			$fullArticle = $params['fullarticle']['value'];
 
-		// We store the correct URI as URI of this bridge (so it can be used later!)
-		$this->uri = 'https://' . strtolower($params['language']['value']) . '.wikipedia.org';
-
-		// While we at it let's also update the name for the feed
-		switch($subject){
-			case WIKIPEDIA_SUBJECT_TFA:
-				$this->name = 'Today\'s featured article from ' . strtolower($params['language']['value']) . '.wikipedia.org';
-				break;
-			case WIKIPEDIA_SUBJECT_DYK:
-				$this->name = 'Did you know? - articles from ' . strtolower($params['language']['value']) . '.wikipedia.org';
-				break;
-			default:
-				$this->name = 'Articles from ' . strtolower($params['language']['value']) . '.wikipedia.org';
-				break;
-		}
-
 		// This will automatically send us to the correct main page in any language (try it!)
-		$html = $this->getSimpleHTMLDOM($this->uri . '/wiki');
+		$html = $this->getSimpleHTMLDOM($this->getURI() . '/wiki');
 
 		if(!$html)
-			$this->returnServerError('Could not load site: ' . $this->uri . '!');
+			$this->returnServerError('Could not load site: ' . $this->getURI() . '!');
 
 		/*
 		* Now read content depending on the language (make sure to create one function per language!)
@@ -130,7 +148,7 @@ class WikipediaBridge extends BridgeAbstract{
 	* @return The $element->innertext with all URIs replaced
 	*/
 	private function ReplaceURIInHTMLElement($element){
-		return str_replace('href="/', 'href="' . $this->uri . '/', $element->innertext);
+		return str_replace('href="/', 'href="' . $this->getURI() . '/', $element->innertext);
 	}
 
 	/*
@@ -153,7 +171,7 @@ class WikipediaBridge extends BridgeAbstract{
 		}
 
 		$item = array();
-		$item['uri'] = $this->uri . $target->href;
+		$item['uri'] = $this->getURI() . $target->href;
 		$item['title'] = $target->title;
 
 		if(!$fullArticle)
@@ -172,7 +190,7 @@ class WikipediaBridge extends BridgeAbstract{
 			$item = array();
 
 			// 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['uri'] = $this->getURI() . $entry->find('a', 0)->href;
 			$item['title'] = strip_tags($entry->innertext);
 
 			if(!$fullArticle)
@@ -206,7 +224,7 @@ class WikipediaBridge extends BridgeAbstract{
 		foreach($content->find('ol.references') as $reference) // References
 			$reference->outertext = '';
 
-		return str_replace('href="/', 'href="' . $this->uri . '/', $content->innertext);
+		return str_replace('href="/', 'href="' . $this->getURI() . '/', $content->innertext);
 	}
 
 	/**

From 792578aefbbfe8a804b4f09801722035d907ccb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 20:16:22 +0200
Subject: [PATCH 18/62] [WikipediaBridge] remove useless code
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/WikipediaBridge.php | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index 55394f74..d12f6ed3 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -51,7 +51,6 @@ class WikipediaBridge extends BridgeAbstract{
 
     public function getName(){
 		$params=$this->parameters[$this->queriedContext];
-        $subject = WIKIPEDIA_SUBJECT_TFA;
 		switch($params['subject']['value']){
 			case 'tfa':
 				$subject = WIKIPEDIA_SUBJECT_TFA;
@@ -80,16 +79,7 @@ class WikipediaBridge extends BridgeAbstract{
 
 	public function collectData(){
 		$params=$this->parameters[$this->queriedContext];
-		if(!isset($params['language']['value']))
-			$this->returnClientError('You must specify a valid language via \'&language=\'!');
 
-		if(!$this->CheckLanguageCode(strtolower($params['language']['value'])))
-			$this->returnClientError('The language code you provided (\'' . $params['language']['value'] . '\') is not supported!');
-
-		if(!isset($params['subject']['value']))
-			$this->returnClientError('You must specify a valid subject via \'&subject=\'!');
-
-		$subject = WIKIPEDIA_SUBJECT_TFA;
 		switch($params['subject']['value']){
 			case 'tfa':
 				$subject = WIKIPEDIA_SUBJECT_TFA;
@@ -102,9 +92,7 @@ class WikipediaBridge extends BridgeAbstract{
 				break;
 		}
 
-		$fullArticle = false;
-		if(isset($params['fullarticle']['value']))
-			$fullArticle = $params['fullarticle']['value'];
+		$fullArticle = $params['fullarticle']['value'];
 
 		// This will automatically send us to the correct main page in any language (try it!)
 		$html = $this->getSimpleHTMLDOM($this->getURI() . '/wiki');
@@ -128,20 +116,6 @@ class WikipediaBridge extends BridgeAbstract{
 		$this->$function($html, $subject, $fullArticle);
 	}
 
-	/**
-	* Returns true if the language code is part of the parameters list
-	*/
-	private function CheckLanguageCode($languageCode){
-		$languages = $this->parameters[0]['language']['values'];
-
-		$language_names = array();
-
-		foreach($languages as $name=>$value)
-			$language_names[] = $value;
-
-		return in_array($languageCode, $language_names);
-	}
-
 	/**
 	* Replaces all relative URIs with absolute ones
 	* @param $element A simplehtmldom element

From 2301a12cc62f187f5891c5c82685ac7122be61a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 20:42:05 +0200
Subject: [PATCH 19/62] [WordpPessBridge] implement getURI() and simplify code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index 370b772c..db2f4a70 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -3,7 +3,6 @@ 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;
 	public $sitename; // Name of the site
 
 	public function loadMetadatas() {
@@ -21,15 +20,6 @@ class WordPressBridge extends BridgeAbstract {
         );
 	}
 
-	// Returns the content type for a given html dom
-	private 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')
 	private function ReplaceLinkTagsWithUrlTags($element){
 		// We need to fix the 'link' tag as simplehtmldom cannot parse it (just rename it and load back as dom)
@@ -54,18 +44,19 @@ class WordPressBridge extends BridgeAbstract {
 	}
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-		$this->processParams($param);
+		$param=$this->parameters[$this->queriedContext];
 
-		if (!$this->hasUrl()) {
-			$this->returnClientError('You must specify a URL');
-		}
-
-		$this->url = $this->url.'/feed/atom';
-		$html = $this->getSimpleHTMLDOM($this->url) or $this->returnServerError("Could not request {$this->url}.");
+		$html = $this->getSimpleHTMLDOM($this->getURI().'/feed/atom')
+				or $this->returnServerError("Could not request ".$this->getURI().'/feed/atom');
 
 		// Notice: We requested an ATOM feed, however some sites return RSS feeds instead!
-		$type = $this->DetectContentType($html);
+		if($html->find('entry')){
+				$type=WORDPRESS_TYPE_ATOM;
+		}else if($html->find('item')){
+				$type=WORDPRESS_TYPE_RSS;
+		}else{
+				$type=WORDPRESS_TYPE_ATOM; // Make ATOM default
+		}
 
 		if($type === WORDPRESS_TYPE_RSS)
 			$posts = $html->find('item');
@@ -126,10 +117,15 @@ class WordPressBridge extends BridgeAbstract {
 				}
 			}
 		} else {
-			$this->returnServerError("Sorry, {$this->url} doesn't seem to be a Wordpress blog.");
+			$this->returnServerError("Sorry, ".$this->getURI()." doesn't seem to be a Wordpress blog.");
 		}
 	}
 
+	public function getURI(){
+		$param=$this->parameters[$this->queriedContext];
+		return $param['url']['value'];
+	}
+
 	public function getName() {
 		return "{$this->sitename} - Wordpress Bridge";
 	}
@@ -137,15 +133,4 @@ class WordPressBridge extends BridgeAbstract {
 	public function getCacheDuration() {
 		return 3600*3; // 3 hours
 	}
-
-	private function hasUrl() {
-		if (empty($this->url)) {
-			return false;
-		}
-		return true;
-	}
-
-	private function processParams($param) {
-		$this->url = $param['url']['value'];
-	}
 }

From de1b39c8e5945d74894d0d42bd7cbc6bcd60f074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 21:03:26 +0200
Subject: [PATCH 20/62] [core + bridges] get rid of loadMetadata
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

if a bridge needs to modify some of the data that were initialized
there, ::__construct() should be used instead.

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/ABCTabsBridge.php               |  12 +-
 bridges/AcrimedBridge.php               |  11 +-
 bridges/AllocineFRBridge.php            |  25 +-
 bridges/AnimeUltimeBridge.php           |  20 +-
 bridges/ArstechnicaBridge.php           |  12 +-
 bridges/Arte7Bridge.php                 |  82 +++----
 bridges/AskfmBridge.php                 |  26 +-
 bridges/BandcampBridge.php              |  20 +-
 bridges/BastaBridge.php                 |  10 +-
 bridges/BlaguesDeMerdeBridge.php        |  11 +-
 bridges/BooruprojectBridge.php          |  15 +-
 bridges/CADBridge.php                   |  10 +-
 bridges/CNETBridge.php                  |  17 +-
 bridges/CastorusBridge.php              |  50 ++--
 bridges/CollegeDeFranceBridge.php       |  10 +-
 bridges/CommonDreamsBridge.php          |  10 +-
 bridges/CopieDoubleBridge.php           |  13 +-
 bridges/CourrierInternationalBridge.php |  12 +-
 bridges/CpasbienBridge.php              |  21 +-
 bridges/CryptomeBridge.php              |  20 +-
 bridges/DailymotionBridge.php           |  55 +++--
 bridges/DanbooruBridge.php              |  19 +-
 bridges/DansTonChatBridge.php           |  12 +-
 bridges/DauphineLibereBridge.php        |  49 ++--
 bridges/DemoBridge.php                  |  81 +++----
 bridges/DeveloppezDotComBridge.php      |  10 +-
 bridges/DilbertBridge.php               |  12 +-
 bridges/DollbooruBridge.php             |  21 +-
 bridges/DuckDuckGoBridge.php            |  17 +-
 bridges/EZTVBridge.php                  |  19 +-
 bridges/EliteDangerousGalnetBridge.php  |  12 +-
 bridges/ElsevierBridge.php              |  19 +-
 bridges/EstCeQuonMetEnProdBridge.php    |  10 +-
 bridges/FacebookBridge.php              |  19 +-
 bridges/FierPandaBridge.php             |  14 +-
 bridges/FlickrExploreBridge.php         |  12 +-
 bridges/FlickrTagBridge.php             |  25 +-
 bridges/FootitoBridge.php               |  12 +-
 bridges/FourchanBridge.php              |  18 +-
 bridges/FreenewsBridge.php              |  11 +-
 bridges/FuturaSciencesBridge.php        | 145 ++++++-----
 bridges/GBAtempBridge.php               |  27 +--
 bridges/GawkerBridge.php                |  23 +-
 bridges/GelbooruBridge.php              |  22 +-
 bridges/GiphyBridge.php                 |  26 +-
 bridges/GithubIssueBridge.php           |  24 +-
 bridges/GitlabCommitsBridge.php         |  20 +-
 bridges/GizmodoFRBridge.php             |  12 +-
 bridges/GooglePlusPostBridge.php        |  24 +-
 bridges/GoogleSearchBridge.php          |  23 +-
 bridges/GuruMedBridge.php               |  10 +-
 bridges/HDWallpapersBridge.php          |  22 +-
 bridges/HentaiHavenBridge.php           |  12 +-
 bridges/IdenticaBridge.php              |  24 +-
 bridges/InstagramBridge.php             |  24 +-
 bridges/IsoHuntBridge.php               | 164 ++++++-------
 bridges/JapanExpoBridge.php             |  22 +-
 bridges/KonachanBridge.php              |  21 +-
 bridges/KoreusBridge.php                |  10 +-
 bridges/KununuBridge.php                |  20 +-
 bridges/LWNprevBridge.php               |  18 +-
 bridges/LeBonCoinBridge.php             |  20 +-
 bridges/LeJournalDuGeekBridge.php       |  10 +-
 bridges/LeMondeInformatiqueBridge.php   |  12 +-
 bridges/Les400CulsBridge.php            |  12 +-
 bridges/LesJoiesDuCodeBridge.php        |  12 +-
 bridges/LichessBridge.php               |  11 +-
 bridges/LinkedInCompany.php             |  19 +-
 bridges/LolibooruBridge.php             |  21 +-
 bridges/MangareaderBridge.php           |  23 +-
 bridges/MilbooruBridge.php              |  20 +-
 bridges/MondeDiploBridge.php            |  10 +-
 bridges/MsnMondeBridge.php              |  10 +-
 bridges/MspabooruBridge.php             |  21 +-
 bridges/NakedSecurityBridge.php         |  10 +-
 bridges/NasaApodBridge.php              |  12 +-
 bridges/NeuviemeArtBridge.php           |  10 +-
 bridges/NextInpactBridge.php            |  10 +-
 bridges/NextgovBridge.php               |  39 ++-
 bridges/NiceMatinBridge.php             |  10 +-
 bridges/NovelUpdatesBridge.php          |  19 +-
 bridges/NumeramaBridge.php              |  12 +-
 bridges/OpenClassroomsBridge.php        |  38 ++-
 bridges/ParuVenduImmoBridge.php         |  30 +--
 bridges/PickyWallpapersBridge.php       |  27 +--
 bridges/PinterestBridge.php             |  28 +--
 bridges/PlanetLibreBridge.php           |  10 +-
 bridges/ProjectMGameBridge.php          |  12 +-
 bridges/RTBFBridge.php                  |  18 +-
 bridges/Releases3DSBridge.php           |  12 +-
 bridges/ReporterreBridge.php            |  10 +-
 bridges/Rue89Bridge.php                 |  12 +-
 bridges/Rule34Bridge.php                |  22 +-
 bridges/Rule34pahealBridge.php          |  21 +-
 bridges/SafebooruBridge.php             |  22 +-
 bridges/SakugabooruBridge.php           |  22 +-
 bridges/ScmbBridge.php                  |  12 +-
 bridges/ScoopItBridge.php               |  20 +-
 bridges/SensCritiqueBridge.php          |  40 ++-
 bridges/Sexactu.php                     |  12 +-
 bridges/ShanaprojectBridge.php          |  18 +-
 bridges/SiliconBridge.php               |  12 +-
 bridges/SoundcloudBridge.php            |  20 +-
 bridges/StripeAPIChangeLogBridge.php    |  17 +-
 bridges/SuperbWallpapersBridge.php      |  27 +--
 bridges/T411Bridge.php                  |  19 +-
 bridges/TagBoardBridge.php              |  20 +-
 bridges/TbibBridge.php                  |  21 +-
 bridges/TheCodingLoveBridge.php         |  12 +-
 bridges/TheHackerNewsBridge.php         |  12 +-
 bridges/TheOatMealBridge.php            |  12 +-
 bridges/ThePirateBayBridge.php          |  19 +-
 bridges/TwitchApiBridge.php             |  17 +-
 bridges/TwitterBridge.php               |  72 +++---
 bridges/UnsplashBridge.php              |  15 +-
 bridges/ViadeoCompany.php               |  19 +-
 bridges/VineBridge.php                  |  19 +-
 bridges/VkBridge.php                    |  24 +-
 bridges/WallpaperStopBridge.php         |  27 +--
 bridges/WeLiveSecurityBridge.php        |  10 +-
 bridges/WhydBridge.php                  |  20 +-
 bridges/WikipediaBridge.php             |  78 +++---
 bridges/WordPressBridge.php             |  23 +-
 bridges/WorldOfTanksBridge.php          |  41 ++--
 bridges/XbooruBridge.php                |  21 +-
 bridges/YandereBridge.php               |  21 +-
 bridges/YoutubeBridge.php               |  78 +++---
 bridges/ZDNetBridge.php                 | 307 ++++++++++++------------
 bridges/ZatazBridge.php                 |  12 +-
 bridges/ZoneTelechargementBridge.php    |  17 +-
 index.php                               |   2 +-
 lib/Bridge.php                          |   9 +-
 lib/HTMLUtils.php                       |   2 -
 133 files changed, 1433 insertions(+), 1848 deletions(-)

diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php
index 355f82d2..51a767a0 100644
--- a/bridges/ABCTabsBridge.php
+++ b/bridges/ABCTabsBridge.php
@@ -1,14 +1,10 @@
 <?php
 class ABCTabsBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-
-		$this->maintainer = "kranack";
-		$this->name = "ABC Tabs Bridge";
-		$this->uri = "http://www.abc-tabs.com/";
-		$this->description = "Returns 22 newest tabs";
-
-	}
+	public $maintainer = "kranack";
+	public $name = "ABC Tabs Bridge";
+	public $uri = "http://www.abc-tabs.com/";
+	public $description = "Returns 22 newest tabs";
 
 	public function collectData(){
 		$html = '';
diff --git a/bridges/AcrimedBridge.php b/bridges/AcrimedBridge.php
index 8ddbc853..abf10832 100644
--- a/bridges/AcrimedBridge.php
+++ b/bridges/AcrimedBridge.php
@@ -1,14 +1,11 @@
 <?php
 class AcrimedBridge extends RssExpander{
 
-		public function loadMetadatas() {
 
-			$this->maintainer = "qwertygc";
-			$this->name = "Acrimed Bridge";
-			$this->uri = "http://www.acrimed.org/";
-			$this->description = "Returns the newest articles.";
-
-		}
+	public $maintainer = "qwertygc";
+	public $name = "Acrimed Bridge";
+	public $uri = "http://www.acrimed.org/";
+	public $description = "Returns the newest articles.";
 
        public function collectData(){
 
diff --git a/bridges/AllocineFRBridge.php b/bridges/AllocineFRBridge.php
index c9c0f0f8..4289b0c0 100644
--- a/bridges/AllocineFRBridge.php
+++ b/bridges/AllocineFRBridge.php
@@ -1,28 +1,25 @@
 <?php
 class AllocineFRBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
 
-        $this->maintainer = "superbaillot.net";
-        $this->name = "Allo Cine Bridge";
-        $this->uri = "http://www.allocine.fr";
-        $this->description = "Bridge for allocine.fr";
-
-        $this->parameters[] = array(
-          'category'=>array(
+    public $maintainer = "superbaillot.net";
+    public $name = "Allo Cine Bridge";
+    public $uri = "http://www.allocine.fr";
+    public $description = "Bridge for allocine.fr";
+    public $parameters = array( array(
+        'category'=>array(
             'name'=>'category',
             'type'=>'list',
             'required'=>true,
             'exampleValue'=>'Faux Raccord',
             'title'=>'Select your category',
             'values'=>array(
-              'Faux Raccord'=>'faux-raccord',
-              'Top 5'=>'top-5',
-              'Tueurs En Serie'=>'tuers-en-serie'
+                'Faux Raccord'=>'faux-raccord',
+                'Top 5'=>'top-5',
+                'Tueurs En Serie'=>'tuers-en-serie'
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $params=$this->parameters[$this->queriedContext];
diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php
index 3f0370c7..51e74e17 100644
--- a/bridges/AnimeUltimeBridge.php
+++ b/bridges/AnimeUltimeBridge.php
@@ -1,16 +1,11 @@
 <?php
 class AnimeUltimeBridge extends BridgeAbstract {
 
-    private $filter = 'Releases';
-
-    public function loadMetadatas() {
-
-        $this->maintainer = 'ORelio';
-        $this->name = 'Anime-Ultime';
-        $this->uri = 'http://www.anime-ultime.net/';
-        $this->description = 'Returns the 10 newest releases posted on Anime-Ultime';
-
-        $this->parameters[] = array(
+        public $maintainer = 'ORelio';
+        public $name = 'Anime-Ultime';
+        public $uri = 'http://www.anime-ultime.net/';
+        public $description = 'Returns the 10 newest releases posted on Anime-Ultime';
+        public $parameters = array( array(
           'type'=>array(
             'name'=>'Type',
             'type'=>'list',
@@ -21,8 +16,9 @@ class AnimeUltimeBridge extends BridgeAbstract {
               'Tokusatsu'=>'T'
             )
           )
-        );
-    }
+        ));
+
+    private $filter = 'Releases';
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php
index 6c5521f4..d2a62b2b 100644
--- a/bridges/ArstechnicaBridge.php
+++ b/bridges/ArstechnicaBridge.php
@@ -3,14 +3,10 @@
 #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";
-
-  }
+  public $maintainer = "prysme";
+  public $name = "ArstechnicaBridge";
+  public $uri = "http://arstechnica.com";
+  public $description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
 
   function StripWithDelimiters($string, $start, $end) {
     while (strpos($string, $start) !== false) {
diff --git a/bridges/Arte7Bridge.php b/bridges/Arte7Bridge.php
index bc8725bd..2f24b810 100644
--- a/bridges/Arte7Bridge.php
+++ b/bridges/Arte7Bridge.php
@@ -1,50 +1,48 @@
-<?php
-class Arte7Bridge extends BridgeAbstract{
+    <?php
+    class Arte7Bridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Arte +7";
-		$this->uri = "http://www.arte.tv/";
-		$this->description = "Returns newest videos from ARTE +7";
-        $this->parameters["Catégorie (Français)"] = array(
-          'catfr'=>array(
-            'type'=>'list',
-            'name'=>'Catégorie',
-            'values'=>array(
-              'Toutes les vidéos (français)'=>'toutes-les-videos',
-              'Actu & société'=>'actu-société',
-              'Séries & fiction'=>'séries-fiction',
-              'Cinéma'=>'cinéma',
-              'Arts & spectacles classiques'=>'arts-spectacles-classiques',
-              'Culture pop'=>'culture-pop',
-              'Découverte'=>'découverte',
-              'Histoire'=>'histoire',
-              'Junior'=>'junior'
+        public $maintainer = "mitsukarenai";
+        public $name = "Arte +7";
+        public $uri = "http://www.arte.tv/";
+        public $description = "Returns newest videos from ARTE +7";
+        public $parameters = array(
+            'Catégorie (Français)' => array(
+                'catfr'=>array(
+                    'type'=>'list',
+                    'name'=>'Catégorie',
+                    'values'=>array(
+                        'Toutes les vidéos (français)'=>'toutes-les-videos',
+                        'Actu & société'=>'actu-société',
+                        'Séries & fiction'=>'séries-fiction',
+                        'Cinéma'=>'cinéma',
+                        'Arts & spectacles classiques'=>'arts-spectacles-classiques',
+                        'Culture pop'=>'culture-pop',
+                        'Découverte'=>'découverte',
+                        'Histoire'=>'histoire',
+                        'Junior'=>'junior'
 
+                    )
+                )
+            ),
+            'Catégorie (Allemand)' => array(
+                'catde'=>array(
+                    'type'=>'list',
+                    'name'=>'Catégorie',
+                    'values'=>array(
+                        'Alle Videos (deutsch)'=>'alle-videos',
+                        'Aktuelles & Gesellschaft'=>'aktuelles-gesellschaft',
+                        'Fernsehfilme & Serien'=>'fernsehfilme-serien',
+                        'Kino'=>'kino',
+                        'Kunst & Kultur'=>'kunst-kultur',
+                        'Popkultur & Alternativ'=>'popkultur-alternativ',
+                        'Entdeckung'=>'entdeckung',
+                        'Geschichte'=>'geschichte',
+                        'Junior'=>'junior'
+                    )
+                )
             )
-          )
         );
 
-        $this->parameters["Catégorie (Allemand)"] = array(
-          'catde'=>array(
-            'type'=>'list',
-            'name'=>'Catégorie',
-            'values'=>array(
-              'Alle Videos (deutsch)'=>'alle-videos',
-              'Aktuelles & Gesellschaft'=>'aktuelles-gesellschaft',
-              'Fernsehfilme & Serien'=>'fernsehfilme-serien',
-              'Kino'=>'kino',
-              'Kunst & Kultur'=>'kunst-kultur',
-              'Popkultur & Alternativ'=>'popkultur-alternativ',
-              'Entdeckung'=>'entdeckung',
-              'Geschichte'=>'geschichte',
-              'Junior'=>'junior'
-            )
-          )
-        );
-	}
-
     protected  function extractVideoset($category='toutes-les-videos', $lang='fr'){
         $url = 'http://www.arte.tv/guide/'.$lang.'/plus7/'.$category;
         $input = $this->getContents($url) or die('Could not request ARTE.');
diff --git a/bridges/AskfmBridge.php b/bridges/AskfmBridge.php
index 0ff36556..0a88d510 100644
--- a/bridges/AskfmBridge.php
+++ b/bridges/AskfmBridge.php
@@ -1,20 +1,18 @@
 <?php
 class AskfmBridge extends BridgeAbstract{
 
-        public function loadMetadatas() {
-
-                $this->maintainer = "az5he6ch";
-                $this->name = "Ask.fm Answers";
-                $this->uri = "http://ask.fm/";
-                $this->description = "Returns answers from an Ask.fm user";
-
-                $this->parameters["Ask.fm username"] = array(
-                  'u'=>array(
-                      'name'=>'Username',
-                      'required'=>true
-                  )
-                );
-        }
+    public $maintainer = "az5he6ch";
+    public $name = "Ask.fm Answers";
+    public $uri = "http://ask.fm/";
+    public $description = "Returns answers from an Ask.fm user";
+    public $parameters = array(
+        'Ask.fm username'=>array(
+            'u'=>array(
+                'name'=>'Username',
+                'required'=>true
+            )
+        )
+    );
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php
index fa64c075..a5666e8c 100644
--- a/bridges/BandcampBridge.php
+++ b/bridges/BandcampBridge.php
@@ -1,20 +1,16 @@
 <?php
 class BandcampBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "sebsauvage";
-		$this->name = "Bandcamp Tag";
-		$this->uri = "http://bandcamp.com/";
-		$this->description = "New bandcamp release by tag";
-
-        $this->parameters[] = array(
-          'tag'=>array(
+    public $maintainer = "sebsauvage";
+    public $name = "Bandcamp Tag";
+    public $uri = "http://bandcamp.com/";
+    public $description = "New bandcamp release by tag";
+    public $parameters = array( array(
+        'tag'=>array(
             'name'=>'tag',
             'type'=>'text'
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php
index ec46b5f9..e91f9fa8 100644
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -1,11 +1,9 @@
 <?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.";
-	}
+	public $maintainer = "qwertygc";
+	public $name = "Bastamag Bridge";
+	public $uri = "http://www.bastamag.net/";
+	public $description = "Returns the newest articles.";
 
 	public function collectData(){
 		// Replaces all relative image URLs by absolute URLs. Relative URLs always start with 'local/'!
diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php
index 0f32467d..5d1b277c 100644
--- a/bridges/BlaguesDeMerdeBridge.php
+++ b/bridges/BlaguesDeMerdeBridge.php
@@ -1,14 +1,11 @@
 <?php
 class BlaguesDeMerdeBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "superbaillot.net";
+    public $name = "Blagues De Merde";
+    public $uri = "http://www.blaguesdemerde.fr/";
+    public $description = "Blagues De Merde";
 
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Blagues De Merde";
-		$this->uri = "http://www.blaguesdemerde.fr/";
-		$this->description = "Blagues De Merde";
-
-	}
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://www.blaguesdemerde.fr/') or $this->returnServerError('Could not request BDM.');
diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php
index a4e3aeb4..36845411 100644
--- a/bridges/BooruprojectBridge.php
+++ b/bridges/BooruprojectBridge.php
@@ -1,23 +1,20 @@
 <?php
 class BooruprojectBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Booruproject";
-		$this->uri = "http://booru.org/";
-		$this->description = "Returns images from given page and booruproject instance (****.booru.org)";
+	public $maintainer = "mitsukarenai";
+	public $name = "Booruproject";
+	public $uri = "http://booru.org/";
+	public $description = "Returns images from given page and booruproject instance (****.booru.org)";
 
-        $this->parameters[] = array(
+    public $parameters = array( array(
           'i'=>array(
             'name'=>'instance (required)',
             'required'=>true
           ),
           'p'=>array('name'=>'page'),
           't'=>array('name'=>'tags')
-        );
-	}
-
+        ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php
index 4c695f06..8073f86a 100644
--- a/bridges/CADBridge.php
+++ b/bridges/CADBridge.php
@@ -1,11 +1,9 @@
 <?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.";
-	}
+	public $maintainer = "nyutag";
+	public $name = "CAD Bridge";
+	public $uri = "http://www.cad-comic.com/";
+	public $description = "Returns the newest articles.";
 
 	private function CADExtractContent($url) {
 		$html3 = $this->getSimpleHTMLDOM($url);
diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php
index b92cecc2..445c1196 100644
--- a/bridges/CNETBridge.php
+++ b/bridges/CNETBridge.php
@@ -1,17 +1,14 @@
 <?php
 class CNETBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'CNET News';
+    public $uri = 'http://www.cnet.com/';
+    public $description = 'Returns the newest articles. <br /> You may specify a topic found in some section URLs, else all topics are selected.';
 
-        $this->maintainer = 'ORelio';
-        $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->parameters[] = array(
-          'topic'=>array('name'=>'Topic name')
-        );
-    }
+    public $parameters = array( array(
+        'topic'=>array('name'=>'Topic name')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
index 73e8a1af..c328293a 100644
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -1,31 +1,31 @@
 <?php
 class CastorusBridge extends BridgeAbstract {
-	public function loadMetadatas(){
-		$this->maintainer = "logmanoriginal";
-		$this->name = "Castorus Bridge";
-		$this->uri = 'http://www.castorus.com';
-		$this->description = "Returns the latest changes";
+	public $maintainer = "logmanoriginal";
+	public $name = "Castorus Bridge";
+	public $uri = 'http://www.castorus.com';
+	public $description = "Returns the latest changes";
 
-		$this->parameters["Get latest changes"] = array();
-        $this->parameters["Get latest changes via ZIP code"] = array(
-          'zip'=>array(
-            'name'=>'ZIP code',
-            'type'=>'text',
-            'required'=>true,
-            'exampleValue'=>'74910, 74',
-            'title'=>'Insert ZIP code (complete or partial)'
-          )
-        );
-        $this->parameters["Get latest changes via city name"] = array(
-          'city'=>array(
-            'name'=>'City name',
-            'type'=>'text',
-            'required'=>true,
-            'exampleValue'=>'Seyssel, Seys',
-            'title'=>'Insert city name (complete or partial)'
-          )
-        );
-	}
+    public $parameters = array(
+        'Get latest changes' => array(),
+        'Get latest changes via ZIP code' => array(
+            'zip'=>array(
+                'name'=>'ZIP code',
+                'type'=>'text',
+                'required'=>true,
+                'exampleValue'=>'74910, 74',
+                'title'=>'Insert ZIP code (complete or partial)'
+            )
+        ),
+        'Get latest changes via city name' => array(
+            'city'=>array(
+                'name'=>'City name',
+                'type'=>'text',
+                'required'=>true,
+                'exampleValue'=>'Seyssel, Seys',
+                'title'=>'Insert city name (complete or partial)'
+            )
+        )
+    );
 
 	// Extracts the tile from an actitiy
 	private function ExtractActivityTitle($activity){
diff --git a/bridges/CollegeDeFranceBridge.php b/bridges/CollegeDeFranceBridge.php
index 241e6f38..fc695335 100644
--- a/bridges/CollegeDeFranceBridge.php
+++ b/bridges/CollegeDeFranceBridge.php
@@ -1,12 +1,10 @@
 <?php
 class CollegeDeFranceBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "CollegeDeFrance";
-		$this->uri = "http://www.college-de-france.fr/";
-		$this->description = "Returns the latest audio and video from CollegeDeFrance";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "CollegeDeFrance";
+	public $uri = "http://www.college-de-france.fr/";
+	public $description = "Returns the latest audio and video from CollegeDeFrance";
 
 	public function collectData(){
 		$months = array(
diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php
index 21dfcbe1..23627e3b 100644
--- a/bridges/CommonDreamsBridge.php
+++ b/bridges/CommonDreamsBridge.php
@@ -1,12 +1,10 @@
 <?php
 class CommonDreamsBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "nyutag";
-		$this->name = "CommonDreams Bridge";
-		$this->uri = "http://www.commondreams.org/";
-		$this->description = "Returns the newest articles.";
-	}
+	public $maintainer = "nyutag";
+	public $name = "CommonDreams Bridge";
+	public $uri = "http://www.commondreams.org/";
+	public $description = "Returns the newest articles.";
 
 	private function CommonDreamsExtractContent($url) {
 		$html3 = $this->getSimpleHTMLDOM($url);
diff --git a/bridges/CopieDoubleBridge.php b/bridges/CopieDoubleBridge.php
index a4420e6f..7c06d95a 100644
--- a/bridges/CopieDoubleBridge.php
+++ b/bridges/CopieDoubleBridge.php
@@ -1,15 +1,10 @@
 <?php
 class CopieDoubleBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "CopieDouble";
-		$this->uri = "http://www.copie-double.com/";
-		$this->description = "CopieDouble";
-
-	}
-
+    public $maintainer = "superbaillot.net";
+    public $name = "CopieDouble";
+    public $uri = "http://www.copie-double.com/";
+    public $description = "CopieDouble";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://www.copie-double.com/') or $this->returnServerError('Could not request CopieDouble.');
diff --git a/bridges/CourrierInternationalBridge.php b/bridges/CourrierInternationalBridge.php
index 62c8feec..634b88cb 100644
--- a/bridges/CourrierInternationalBridge.php
+++ b/bridges/CourrierInternationalBridge.php
@@ -1,14 +1,10 @@
 <?php
 class CourrierInternationalBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "teromene";
-		$this->name = "Courrier International Bridge";
-		$this->uri = "http://CourrierInternational.fr/";
-		$this->description = "Courrier International bridge";
-
-	}
+    public $maintainer = "teromene";
+    public $name = "Courrier International Bridge";
+    public $uri = "http://CourrierInternational.fr/";
+    public $description = "Courrier International bridge";
 
     public function collectData(){
 
diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php
index d41d4423..a8e1b5a7 100644
--- a/bridges/CpasbienBridge.php
+++ b/bridges/CpasbienBridge.php
@@ -1,23 +1,18 @@
 <?php
 class CpasbienBridge extends HttpCachingBridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "lagaisse";
+    public $name = "Cpasbien Bridge";
+    public $uri = "http://www.cpasbien.io";
+    public $description = "Returns latest torrents from a request query";
 
-		$this->maintainer = "lagaisse";
-		$this->name = "Cpasbien Bridge";
-		$this->uri = "http://www.cpasbien.io";
-		$this->description = "Returns latest torrents from a request query";
-
-        $this->parameters[] = array(
-          'q'=>array(
+    public $parameters = array( array(
+        'q'=>array(
             'name'=>'Search',
             'required'=>true,
             'title'=>'Type your search'
-          )
-        );
-
-	}
-
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/CryptomeBridge.php b/bridges/CryptomeBridge.php
index daf404fb..b7e5fbbe 100644
--- a/bridges/CryptomeBridge.php
+++ b/bridges/CryptomeBridge.php
@@ -1,22 +1,18 @@
 <?php
 class CryptomeBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "BoboTiG";
+    public $name = "Cryptome";
+    public $uri = "http://cryptome.org/";
+    public $description = "Returns the N most recent documents.";
 
-		$this->maintainer = "BoboTiG";
-		$this->name = "Cryptome";
-		$this->uri = "http://cryptome.org/";
-		$this->description = "Returns the N most recent documents.";
-
-        $this->parameters[] = array(
-          'n'=>array(
+    public $parameters = array( array(
+        'n'=>array(
             'name'=>'number of elements',
             'type'=>'number',
             'exampleValue'=>10
-          )
-        );
-	}
-
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php
index f085f04e..50c89889 100644
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -1,38 +1,37 @@
 <?php
 class DailymotionBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
+        public $maintainer = "mitsukarenai";
+        public $name = "Dailymotion Bridge";
+        public $uri = "https://www.dailymotion.com/";
+        public $description = "Returns the 5 newest videos by username/playlist or search";
 
-        $this->maintainer = "mitsukarenai";
-        $this->name = "Dailymotion Bridge";
-        $this->uri = "https://www.dailymotion.com/";
-        $this->description = "Returns the 5 newest videos by username/playlist or search";
-
-        $this->parameters["By username"] = array(
-            'u'=>array(
-                'name'=>'username',
-                'required'=>true
-            )
-        );
-
-        $this->parameters["By playlist id"] = array(
-            'p'=>array(
-                'name'=>'playlist id',
-                'required'=>true
-            )
-        );
-
-        $this->parameters["From search results"] = array(
-            's'=>array(
-                'name'=>'Search keyword',
-                'required'=>true
+        public $parameters = array (
+            'By username' => array(
+                'u'=>array(
+                    'name'=>'username',
+                    'required'=>true
+                )
             ),
-            'pa'=>array(
-                'name'=>'Page',
-                'type'=>'number'
+
+            'By playlist id' => array(
+                'p'=>array(
+                    'name'=>'playlist id',
+                    'required'=>true
+                )
+            ),
+
+            'From search results' => array(
+                's'=>array(
+                    'name'=>'Search keyword',
+                    'required'=>true
+                ),
+                'pa'=>array(
+                    'name'=>'Page',
+                    'type'=>'number'
+                )
             )
         );
-    }
 
     function getMetadata($id) {
         $metadata=array();
diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php
index f41bc776..0e73967d 100644
--- a/bridges/DanbooruBridge.php
+++ b/bridges/DanbooruBridge.php
@@ -1,18 +1,15 @@
 <?php
 class DanbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Danbooru";
+	public $uri = "http://donmai.us/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Danbooru";
-		$this->uri = "http://donmai.us/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array('name'=>'page'),
-          't'=>array('name'=>'tags')
-        );
-	}
+    public $parameters = array( array(
+        'p'=>array('name'=>'page'),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/DansTonChatBridge.php b/bridges/DansTonChatBridge.php
index 83f6cd2a..32bfe234 100644
--- a/bridges/DansTonChatBridge.php
+++ b/bridges/DansTonChatBridge.php
@@ -1,14 +1,10 @@
 <?php
 class DansTonChatBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Astalaseven";
-		$this->name = "DansTonChat Bridge";
-		$this->uri = "http://danstonchat.com";
-		$this->description = "Returns latest quotes from DansTonChat.";
-
-	}
+	public $maintainer = "Astalaseven";
+	public $name = "DansTonChat Bridge";
+	public $uri = "http://danstonchat.com";
+	public $description = "Returns latest quotes from DansTonChat.";
 
     public function collectData(){
         $html = '';
diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index d97a0a59..f55017f9 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -1,37 +1,34 @@
 <?php
 class DauphineLibereBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
+	public $maintainer = "qwertygc";
+	public $name = "Dauphine Bridge";
+	public $uri = "http://www.ledauphine.com/";
+	public $description = "Returns the newest articles.";
 
-		$this->maintainer = "qwertygc";
-		$this->name = "Dauphine Bridge";
-		$this->uri = "http://www.ledauphine.com/";
-		$this->description = "Returns the newest articles.";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'Catégorie de l\'article',
             'type'=>'list',
             'values'=>array(
-              'À la une'=>'',
-              'France Monde'=>'france-monde',
-              'Faits Divers'=>'faits-divers',
-              'Économie et Finance'=>'economie-et-finance',
-              'Politique'=>'politique',
-              'Sport'=>'sport',
-              'Ain'=>'ain',
-              'Alpes-de-Haute-Provence'=>'haute-provence',
-              'Hautes-Alpes'=>'hautes-alpes',
-              'Ardèche'=>'ardeche',
-              'Drôme'=>'drome',
-              'Isère Sud'=>'isere-sud',
-              'Savoie'=>'savoie',
-              'Haute-Savoie'=>'haute-savoie',
-              'Vaucluse'=>'vaucluse'
+                'À la une'=>'',
+                'France Monde'=>'france-monde',
+                'Faits Divers'=>'faits-divers',
+                'Économie et Finance'=>'economie-et-finance',
+                'Politique'=>'politique',
+                'Sport'=>'sport',
+                'Ain'=>'ain',
+                'Alpes-de-Haute-Provence'=>'haute-provence',
+                'Hautes-Alpes'=>'hautes-alpes',
+                'Ardèche'=>'ardeche',
+                'Drôme'=>'drome',
+                'Isère Sud'=>'isere-sud',
+                'Savoie'=>'savoie',
+                'Haute-Savoie'=>'haute-savoie',
+                'Vaucluse'=>'vaucluse'
             )
-          )
-        );
-	}
+        )
+    ));
 
 	private function ExtractContent($url, $context) {
 		$html2 = $this->getSimpleHTMLDOM($url,false,$context);
diff --git a/bridges/DemoBridge.php b/bridges/DemoBridge.php
index f6d6efb1..feddc32a 100644
--- a/bridges/DemoBridge.php
+++ b/bridges/DemoBridge.php
@@ -1,54 +1,53 @@
 <?php
 class DemoBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "teromene";
+    public $name = "DemoBridge";
+    public $uri = "http://github.com/sebsauvage/rss-bridge";
+    public $description = "Bridge used for demos";
 
-		$this->maintainer = "teromene";
-		$this->name = "DemoBridge";
-		$this->uri = "http://github.com/sebsauvage/rss-bridge";
-		$this->description = "Bridge used for demos";
-
-        $this->parameters['testCheckbox'] = array(
-          'testCheckbox'=>array(
-            'type'=>'checkbox',
-            'name'=>'test des checkbox'
-          )
-        );
-
-        $this->parameters['testList'] = array(
-          'testList'=>array(
-            'type'=>'list',
-            'name'=>'test des listes',
-            'values'=>array(
-              'Test'=>'test',
-              'Test 2'=>'test2'
+    public $parameters = array(
+        'testCheckbox' => array(
+            'testCheckbox'=>array(
+                'type'=>'checkbox',
+                'name'=>'test des checkbox'
             )
-          )
-        );
+        ),
 
-        $this->parameters['testNumber'] = array(
-          'testNumber'=>array(
-            'type'=>'number',
-            'name'=>'test des numéros',
-            'exampleValue'=>'1515632'
-          )
-        );
-	}
+        'testList' => array(
+            'testList'=>array(
+                'type'=>'list',
+                'name'=>'test des listes',
+                'values'=>array(
+                    'Test'=>'test',
+                    'Test 2'=>'test2'
+                )
+            )
+        ),
 
-	public function collectData(){
+        'testNumber' => array(
+            'testNumber'=>array(
+                'type'=>'number',
+                'name'=>'test des numéros',
+                'exampleValue'=>'1515632'
+            )
+        )
+    );
 
-		$item = array();
-	    $item['author'] = "Me!";
-	    $item['title'] = "Test";
-	    $item['content'] = "Awesome content !";
-	    $item['id'] = "Lalala";
-	    $item['uri'] = "http://test.test/test";
+    public function collectData(){
 
-	    $this->items[] = $item;
+        $item = array();
+        $item['author'] = "Me!";
+        $item['title'] = "Test";
+        $item['content'] = "Awesome content !";
+        $item['id'] = "Lalala";
+        $item['uri'] = "http://test.test/test";
+
+        $this->items[] = $item;
 
     }
 
-	public function getCacheDuration(){
-		return 00; // 1 hour
-	}
+    public function getCacheDuration(){
+        return 00; // 1 hour
+    }
 }
diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php
index ca18fe39..d1453fae 100644
--- a/bridges/DeveloppezDotComBridge.php
+++ b/bridges/DeveloppezDotComBridge.php
@@ -1,12 +1,10 @@
 <?php
 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).";
-	}
+	public $maintainer = "polopollo";
+	public $name = "Developpez.com Actus (FR)";
+	public $uri = "http://www.developpez.com/";
+	public $description = "Returns the 15 newest posts from DeveloppezDotCom (full text).";
 
 	private function DeveloppezDotComStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php
index e0c23e6f..05d94fcb 100644
--- a/bridges/DilbertBridge.php
+++ b/bridges/DilbertBridge.php
@@ -1,14 +1,10 @@
 <?php
 class DilbertBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = 'kranack';
-        $this->name = 'Dilbert Daily Strip';
-        $this->uri = 'http://dilbert.com';
-        $this->description = 'The Unofficial Dilbert Daily Comic Strip';
-
-    }
+    public $maintainer = 'kranack';
+    public $name = 'Dilbert Daily Strip';
+    public $uri = 'http://dilbert.com';
+    public $description = 'The Unofficial Dilbert Daily Comic Strip';
 
     public function collectData(){
 
diff --git a/bridges/DollbooruBridge.php b/bridges/DollbooruBridge.php
index fb3a5da6..43faba47 100644
--- a/bridges/DollbooruBridge.php
+++ b/bridges/DollbooruBridge.php
@@ -1,22 +1,19 @@
 <?php
 class DollbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Dollbooru";
-		$this->uri = "http://dollbooru.org/";
-		$this->description = "Returns images from given page";
+	public $maintainer = "mitsukarenai";
+	public $name = "Dollbooru";
+	public $uri = "http://dollbooru.org/";
+	public $description = "Returns images from given page";
 
 
-        $this->parameters[]  = array(
-          'p'=>array(
+    public $parameters  = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/DuckDuckGoBridge.php b/bridges/DuckDuckGoBridge.php
index 1522978e..143ab9fe 100644
--- a/bridges/DuckDuckGoBridge.php
+++ b/bridges/DuckDuckGoBridge.php
@@ -1,19 +1,16 @@
 <?php
 class DuckDuckGoBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "Astalaseven";
+	public $name = "DuckDuckGo";
+	public $uri = "https://duckduckgo.com/";
+	public $description = "Returns most recent results from DuckDuckGo.";
 
-		$this->maintainer = "Astalaseven";
-		$this->name = "DuckDuckGo";
-		$this->uri = "https://duckduckgo.com/";
-		$this->description = "Returns most recent results from DuckDuckGo.";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'keyword',
             'required'=>true)
-        );
-	}
+        ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php
index 83b93d13..5e28413e 100644
--- a/bridges/EZTVBridge.php
+++ b/bridges/EZTVBridge.php
@@ -1,21 +1,18 @@
 <?php
 class EZTVBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "alexAubin";
+	public $name = "EZTV";
+	public $uri = "https://eztv.ch/";
+	public $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->maintainer = "alexAubin";
-		$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->parameters[] = array(
-          'i'=>array(
+    public $parameters = array( array(
+        'i'=>array(
             'name'=>'Show ids',
             'exampleValue'=>'showID1,showID2,…',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/EliteDangerousGalnetBridge.php b/bridges/EliteDangerousGalnetBridge.php
index 9e9400d0..26f091f1 100644
--- a/bridges/EliteDangerousGalnetBridge.php
+++ b/bridges/EliteDangerousGalnetBridge.php
@@ -1,14 +1,10 @@
-
 <?php
 class EliteDangerousGalnetBridge extends BridgeAbstract
 {
-	public function loadMetadatas()
-	{
-		$this->maintainer = "corenting";
-		$this->name = "Elite: Dangerous Galnet";
-		$this->uri = "https://community.elitedangerous.com/galnet";
-		$this->description = "Returns the latest page of news from Galnet";
-	}
+	public $maintainer = "corenting";
+	public $name = "Elite: Dangerous Galnet";
+	public $uri = "https://community.elitedangerous.com/galnet";
+	public $description = "Returns the latest page of news from Galnet";
 
 	public function collectData()
 	{
diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index 25a9446f..6a96a6ce 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -1,21 +1,18 @@
 <?php
 class ElsevierBridge extends BridgeAbstract{
-	public function loadMetadatas() {
+	public $maintainer = 'Pierre Mazière';
+	public $name = 'Elsevier journals recent articles';
+	public $uri = 'http://www.journals.elsevier.com';
+	public $description = 'Returns the recent articles published in Elsevier journals';
 
-		$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->parameters[] = array(
-          'j'=>array(
+    public $parameters = array( array(
+        'j'=>array(
             'name'=>'Journal name',
             'required'=>true,
             'exampleValue'=>'academic-pediactrics',
             'title'=>'Insert html-part of your journal'
-          )
-        );
-	}
+        )
+    ));
 
 	// Extracts the list of names from an article as string
 	private function ExtractArticleName ($article){
diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php
index 383d7712..531d68b1 100644
--- a/bridges/EstCeQuonMetEnProdBridge.php
+++ b/bridges/EstCeQuonMetEnProdBridge.php
@@ -1,12 +1,10 @@
 <?php
 class EstCeQuonMetEnProdBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = 'ORelio';
-        $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)';
-    }
+    public $maintainer = 'ORelio';
+    public $name = 'Est-ce qu\'on met en prod aujourd\'hui ?';
+    public $uri = 'https://www.estcequonmetenprodaujourdhui.info/';
+    public $description = 'Should we put a website in production today? (French)';
 
     public function collectData(){
         function ExtractFromDelimiters($string, $start, $end) {
diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php
index 4c67c50e..d3ef9bf2 100644
--- a/bridges/FacebookBridge.php
+++ b/bridges/FacebookBridge.php
@@ -1,20 +1,17 @@
 <?php
 class FacebookBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "teromene";
+	public $name = "Facebook";
+	public $uri = "http://www.facebook.com/";
+	public $description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117";
 
-		$this->maintainer = "teromene";
-		$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->parameters[] =array(
-          'u'=>array(
+    public $parameters =array( array(
+        'u'=>array(
             'name'=>'Username',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/FierPandaBridge.php b/bridges/FierPandaBridge.php
index 44a792ab..b6e00744 100644
--- a/bridges/FierPandaBridge.php
+++ b/bridges/FierPandaBridge.php
@@ -1,14 +1,10 @@
 <?php
-Class FierPandaBridge extends BridgeAbstract{
+class FierPandaBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = "snroki";
-        $this->name = "Fier Panda Bridge";
-        $this->uri = "http://www.fier-panda.fr/";
-        $this->description = "Returns latest articles from Fier Panda.";
-
-    }
+    public $maintainer = "snroki";
+    public $name = "Fier Panda Bridge";
+    public $uri = "http://www.fier-panda.fr/";
+    public $description = "Returns latest articles from Fier Panda.";
 
     public function collectData(){
         $link = 'http://www.fier-panda.fr/';
diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php
index 09f946e7..d407f769 100644
--- a/bridges/FlickrExploreBridge.php
+++ b/bridges/FlickrExploreBridge.php
@@ -1,14 +1,10 @@
 <?php
 class FlickrExploreBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "sebsauvage";
-		$this->name = "Flickr Explore";
-		$this->uri = "https://www.flickr.com/explore";
-		$this->description = "Returns the latest interesting images from Flickr";
-
-	}
+	public $maintainer = "sebsauvage";
+	public $name = "Flickr Explore";
+	public $uri = "https://www.flickr.com/explore";
+	public $description = "Returns the latest interesting images from Flickr";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('https://www.flickr.com/explore') or $this->returnServerError('Could not request Flickr.');
diff --git a/bridges/FlickrTagBridge.php b/bridges/FlickrTagBridge.php
index 2c6158d7..43e22d9f 100644
--- a/bridges/FlickrTagBridge.php
+++ b/bridges/FlickrTagBridge.php
@@ -1,21 +1,20 @@
 <?php
 class FlickrTagBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "erwang";
+	public $name = "Flickr TagUser";
+	public $uri = "http://www.flickr.com/";
+	public $description = "Returns the tagged or user images from Flickr";
 
-		$this->maintainer = "erwang";
-		$this->name = "Flickr TagUser";
-		$this->uri = "http://www.flickr.com/";
-		$this->description = "Returns the tagged or user images from Flickr";
+    public $parameters = array(
+        'By keyword' => array(
+            'q'=>array('name'=>'keyword')
+        ),
 
-        $this->parameters["By keyword"] = array(
-          'q'=>array('name'=>'keyword')
-        );
-
-        $this->parameters["By username"] = array(
-          'u'=>array('name'=>'Username')
-        );
-	}
+        'By username' => array(
+            'u'=>array('name'=>'Username')
+        ),
+    );
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php
index 326cbd50..47518853 100644
--- a/bridges/FootitoBridge.php
+++ b/bridges/FootitoBridge.php
@@ -1,14 +1,10 @@
 <?php
 class FootitoBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Footito";
-		$this->uri = "http://www.footito.fr/";
-		$this->description = "Footito";
-
-	}
+	public $maintainer = "superbaillot.net";
+	public $name = "Footito";
+	public $uri = "http://www.footito.fr/";
+	public $description = "Footito";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://www.footito.fr/') or $this->returnServerError('Could not request Footito.');
diff --git a/bridges/FourchanBridge.php b/bridges/FourchanBridge.php
index 976d8dba..f5663647 100644
--- a/bridges/FourchanBridge.php
+++ b/bridges/FourchanBridge.php
@@ -1,18 +1,14 @@
 <?php
 class FourchanBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "4chan";
-		$this->uri = "https://www.4chan.org/";
-		$this->description = "Returns posts from the specified thread";
-
-        $this->parameters[] = array(
-          't'=>array('name'=>'Thread URL')
-        );
-	}
+	public $maintainer = "mitsukarenai";
+	public $name = "4chan";
+	public $uri = "https://www.4chan.org/";
+	public $description = "Returns posts from the specified thread";
 
+    public $parameters = array( array(
+        't'=>array('name'=>'Thread URL')
+    ));
 
   public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/FreenewsBridge.php b/bridges/FreenewsBridge.php
index 727f9f5f..7c50a09c 100644
--- a/bridges/FreenewsBridge.php
+++ b/bridges/FreenewsBridge.php
@@ -2,13 +2,10 @@
 define("FREENEWS_RSS", 'http://feeds.feedburner.com/Freenews-Freebox?format=xml');
 class FreenewsBridge extends RssExpander {
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$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.";
-	}
+	public $maintainer = "mitsukarenai";
+	public $name = "Freenews";
+	public $uri = "http://freenews.fr";
+	public $description = "Un site d'actualité pour les freenautes (mais ne parlant pas que de la freebox). Ne rentrez pas d'id si vous voulez accéder aux actualités générales.";
 
     public function collectData(){
         parent::collectExpandableDatas(FREENEWS_RSS);
diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php
index 06033935..d25d6acc 100644
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -1,85 +1,82 @@
 <?php
 class FuturaSciencesBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'Futura-Sciences Bridge';
+    public $uri = 'http://www.futura-sciences.com/';
+    public $description = 'Returns the newest articles.';
 
-        $this->maintainer = 'ORelio';
-        $this->name = 'Futura-Sciences Bridge';
-        $this->uri = 'http://www.futura-sciences.com/';
-        $this->description = 'Returns the newest articles.';
-
-        $this->parameters[] = array(
-          'feed'=> array(
+    public $parameters = array( array(
+        'feed'=> array(
             'name'=>'Feed',
             'type'=>'list',
             'values'=>array(
-              'Les flux multi-magazines'=>array(
-                'Les dernières actualités de Futura-Sciences'=>'actualites',
-                'Les dernières définitions de Futura-Sciences'=>'definitions',
-                'Les dernières photos de Futura-Sciences'=>'photos',
-                'Les dernières questions - réponses de Futura-Sciences'=>'questions-reponses',
-                'Les derniers dossiers de Futura-Sciences'=>'dossiers'
-              ),
-              'Les flux Services'=> array(
-                'Les cartes virtuelles de Futura-Sciences'=>'services/cartes-virtuelles',
-                'Les fonds d\'écran de Futura-Sciences'=>'services/fonds-ecran'
-              ),
-              'Les flux Santé'=>array(
-                'Les dernières actualités de Futura-Santé'=>'sante/actualites',
-                'Les dernières définitions de Futura-Santé'=>'sante/definitions',
-                'Les dernières questions-réponses de Futura-Santé'=>'sante/question-reponses',
-                'Les derniers dossiers de Futura-Santé'=>'sante/dossiers'
-              ),
-              'Les flux High-Tech'=>array(
-                'Les dernières actualités de Futura-High-Tech'=>'high-tech/actualites',
-                'Les dernières astuces de Futura-High-Tech'=>'high-tech/question-reponses',
-                'Les dernières définitions de Futura-High-Tech'=>'high-tech/definitions',
-                'Les derniers dossiers de Futura-High-Tech'=>'high-tech/dossiers'
-              ),
-              'Les flux Espace'=>array(
-                'Les dernières actualités de Futura-Espace'=>'espace/actualites',
-                'Les dernières définitions de Futura-Espace'=>'espace/definitions',
-                'Les dernières questions-réponses de Futura-Espace'=>'espace/question-reponses',
-                'Les derniers dossiers de Futura-Espace'=>'espace/dossiers'
-              ),
-              'Les flux Environnement'=>array(
-                'Les dernières actualités de Futura-Environnement'=>'environnement/actualites',
-                'Les dernières définitions de Futura-Environnement'=>'environnement/definitions',
-                'Les dernières questions-réponses de Futura-Environnement'=>'environnement/question-reponses',
-                'Les derniers dossiers de Futura-Environnement'=>'environnement/dossiers'
-              ),
-              'Les flux Maison'=>array(
-                'Les dernières actualités de Futura-Maison'=>'maison/actualites',
-                'Les dernières astuces de Futura-Maison'=>'maison/question-reponses',
-                'Les dernières définitions de Futura-Maison'=>'maison/definitions',
-                'Les derniers dossiers de Futura-Maison'=>'maison/dossiers'
-              ),
-              'Les flux Nature'=>array(
-                'Les dernières actualités de Futura-Nature'=>'nature/actualites',
-                'Les dernières définitions de Futura-Nature'=>'nature/definitions',
-                'Les dernières questions-réponses de Futura-Nature'=>'nature/question-reponses',
-                'Les derniers dossiers de Futura-Nature'=>'nature/dossiers'
-              ),
-              'Les flux Terre'=>array(
-                'Les dernières actualités de Futura-Terre'=>'terre/actualites',
-                'Les dernières définitions de Futura-Terre'=>'terre/definitions',
-                'Les dernières questions-réponses de Futura-Terre'=>'terre/question-reponses',
-                'Les derniers dossiers de Futura-Terre'=>'terre/dossiers'
-              ),
-              'Les flux Matière'=>array(
-                'Les dernières actualités de Futura-Matière'=>'matiere/actualites',
-                'Les dernières définitions de Futura-Matière'=>'matiere/definitions',
-                'Les dernières questions-réponses de Futura-Matière'=>'matiere/question-reponses',
-                'Les derniers dossiers de Futura-Matière'=>'matiere/dossiers'
-              ),
-              'Les flux Mathématiques'=>array(
-                'Les dernières actualités de Futura-Mathématiques'=>'mathematiques/actualites',
-                'Les derniers dossiers de Futura-Mathématiques'=>'mathematiques/dossiers'
-              )
+                'Les flux multi-magazines'=>array(
+                    'Les dernières actualités de Futura-Sciences'=>'actualites',
+                    'Les dernières définitions de Futura-Sciences'=>'definitions',
+                    'Les dernières photos de Futura-Sciences'=>'photos',
+                    'Les dernières questions - réponses de Futura-Sciences'=>'questions-reponses',
+                    'Les derniers dossiers de Futura-Sciences'=>'dossiers'
+                ),
+                'Les flux Services'=> array(
+                    'Les cartes virtuelles de Futura-Sciences'=>'services/cartes-virtuelles',
+                    'Les fonds d\'écran de Futura-Sciences'=>'services/fonds-ecran'
+                ),
+                'Les flux Santé'=>array(
+                    'Les dernières actualités de Futura-Santé'=>'sante/actualites',
+                    'Les dernières définitions de Futura-Santé'=>'sante/definitions',
+                    'Les dernières questions-réponses de Futura-Santé'=>'sante/question-reponses',
+                    'Les derniers dossiers de Futura-Santé'=>'sante/dossiers'
+                ),
+                'Les flux High-Tech'=>array(
+                    'Les dernières actualités de Futura-High-Tech'=>'high-tech/actualites',
+                    'Les dernières astuces de Futura-High-Tech'=>'high-tech/question-reponses',
+                    'Les dernières définitions de Futura-High-Tech'=>'high-tech/definitions',
+                    'Les derniers dossiers de Futura-High-Tech'=>'high-tech/dossiers'
+                ),
+                'Les flux Espace'=>array(
+                    'Les dernières actualités de Futura-Espace'=>'espace/actualites',
+                    'Les dernières définitions de Futura-Espace'=>'espace/definitions',
+                    'Les dernières questions-réponses de Futura-Espace'=>'espace/question-reponses',
+                    'Les derniers dossiers de Futura-Espace'=>'espace/dossiers'
+                ),
+                'Les flux Environnement'=>array(
+                    'Les dernières actualités de Futura-Environnement'=>'environnement/actualites',
+                    'Les dernières définitions de Futura-Environnement'=>'environnement/definitions',
+                    'Les dernières questions-réponses de Futura-Environnement'=>'environnement/question-reponses',
+                    'Les derniers dossiers de Futura-Environnement'=>'environnement/dossiers'
+                ),
+                'Les flux Maison'=>array(
+                    'Les dernières actualités de Futura-Maison'=>'maison/actualites',
+                    'Les dernières astuces de Futura-Maison'=>'maison/question-reponses',
+                    'Les dernières définitions de Futura-Maison'=>'maison/definitions',
+                    'Les derniers dossiers de Futura-Maison'=>'maison/dossiers'
+                ),
+                'Les flux Nature'=>array(
+                    'Les dernières actualités de Futura-Nature'=>'nature/actualites',
+                    'Les dernières définitions de Futura-Nature'=>'nature/definitions',
+                    'Les dernières questions-réponses de Futura-Nature'=>'nature/question-reponses',
+                    'Les derniers dossiers de Futura-Nature'=>'nature/dossiers'
+                ),
+                'Les flux Terre'=>array(
+                    'Les dernières actualités de Futura-Terre'=>'terre/actualites',
+                    'Les dernières définitions de Futura-Terre'=>'terre/definitions',
+                    'Les dernières questions-réponses de Futura-Terre'=>'terre/question-reponses',
+                    'Les derniers dossiers de Futura-Terre'=>'terre/dossiers'
+                ),
+                'Les flux Matière'=>array(
+                    'Les dernières actualités de Futura-Matière'=>'matiere/actualites',
+                    'Les dernières définitions de Futura-Matière'=>'matiere/definitions',
+                    'Les dernières questions-réponses de Futura-Matière'=>'matiere/question-reponses',
+                    'Les derniers dossiers de Futura-Matière'=>'matiere/dossiers'
+                ),
+                'Les flux Mathématiques'=>array(
+                    'Les dernières actualités de Futura-Mathématiques'=>'mathematiques/actualites',
+                    'Les derniers dossiers de Futura-Mathématiques'=>'mathematiques/dossiers'
+                )
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php
index d9281171..ef554ada 100644
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -1,27 +1,24 @@
 <?php
 class GBAtempBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'GBAtemp';
+    public $uri = 'http://gbatemp.net/';
+    public $description = 'GBAtemp is a user friendly underground video game community.';
 
-        $this->maintainer = 'ORelio';
-        $this->name = 'GBAtemp';
-        $this->uri = 'http://gbatemp.net/';
-        $this->description = 'GBAtemp is a user friendly underground video game community.';
-
-        $this->parameters[] = array(
-          'type'=>array(
+    public $parameters = array( array(
+        'type'=>array(
             'name'=>'Type',
             'type'=>'list',
             'required'=>true,
             'values'=>array(
-              'News'=>'N',
-              'Reviews'=>'R',
-              'Tutorials'=>'T',
-              'Forum'=>'F'
+                'News'=>'N',
+                'Reviews'=>'R',
+                'Tutorials'=>'T',
+                'Forum'=>'F'
             )
-          )
-        );
-    }
+        )
+    ));
 
     private function ExtractFromDelimiters($string, $start, $end) {
         if (strpos($string, $start) !== false) {
diff --git a/bridges/GawkerBridge.php b/bridges/GawkerBridge.php
index 60122208..3d6bc2b4 100644
--- a/bridges/GawkerBridge.php
+++ b/bridges/GawkerBridge.php
@@ -4,20 +4,17 @@ define("RSS_SUFFIX", "/full");
 
 class GawkerBridge extends RssExpander{
 
-    public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Gawker media";
+	public $uri = "http://feeds.gawker.com/";
+	public $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->maintainer = "mitsukarenai";
-		$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->parameters[] = array(
-            'site'=>array(
-                'name'=>'site id to put in uri between feeds.gawker.com and /full .. which is obviously not full AT ALL',
-                'required'=>true
-            )
-        );
-	}
+    public $parameters = array( array(
+        'site'=>array(
+            'name'=>'site id to put in uri between feeds.gawker.com and /full .. which is obviously not full AT ALL',
+            'required'=>true
+        )
+    ));
 
 
     private function toURI($name) {
diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php
index 94d35949..486c9ebb 100644
--- a/bridges/GelbooruBridge.php
+++ b/bridges/GelbooruBridge.php
@@ -1,22 +1,18 @@
 <?php
 class GelbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Gelbooru";
+	public $uri = "http://gelbooru.com/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Gelbooru";
-		$this->uri = "http://gelbooru.com/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/GiphyBridge.php b/bridges/GiphyBridge.php
index b294969b..cf2af65e 100644
--- a/bridges/GiphyBridge.php
+++ b/bridges/GiphyBridge.php
@@ -3,22 +3,18 @@ define('GIPHY_LIMIT', 10);
 
 class GiphyBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "kraoc";
+	public $name = "Giphy Bridge";
+	public $uri = "http://giphy.com/";
+	public $description = "Bridge for giphy.com";
 
-		$this->maintainer = "kraoc";
-		$this->name = "Giphy Bridge";
-		$this->uri = "http://giphy.com/";
-		$this->description = "Bridge for giphy.com";
-
-        $this->parameters[] = array(
-            's'=>array('name'=>'search tag'),
-            'n'=>array(
-                'name'=>'max number of returned items',
-                'type'=>'number'
-            )
-        );
-
-	}
+    public $parameters = array( array(
+        's'=>array('name'=>'search tag'),
+        'n'=>array(
+            'name'=>'max number of returned items',
+            'type'=>'number'
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php
index 3374ed8b..83c98bea 100644
--- a/bridges/GithubIssueBridge.php
+++ b/bridges/GithubIssueBridge.php
@@ -1,13 +1,13 @@
 <?php
 class GithubIssueBridge extends BridgeAbstract{
-  public function loadMetadatas() {
 
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'Github Issue';
-    $this->uri = '';
-    $this->description = 'Returns the issues or comments of an issue of a github project';
+  public $maintainer = 'Pierre Mazière';
+  public $name = 'Github Issue';
+  public $uri = '';
+  public $description = 'Returns the issues or comments of an issue of a github project';
 
-    $this->parameters['global']=array (
+  public $parameters=array(
+    'global'=>array (
       'u'=>array(
         'name'=>'User name',
         'required'=>true
@@ -16,20 +16,20 @@ class GithubIssueBridge extends BridgeAbstract{
         'name'=>'Project name',
         'required'=>true
       )
-    );
+    ),
 
-    $this->parameters['Project Issues']=array();
-    $this->parameters['Issue comments']=array(
+    'Project Issues'=>array(),
+    'Issue comments'=>array(
       'i'=>array(
         'name'=>'Issue number',
         'type'=>'number',
         'required'=>'true'
       )
-    );
-  }
+    )
+  );
 
   public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
+    $param=$this->parameters[$this->queriedContext];
     $uri = 'https://github.com/'.$param['u']['value'].'/'.$param['p']['value'].'/issues/'.(isset($param['i']['value'])?$param['i']['value']:'');
     $html = $this->getSimpleHTMLDOM($uri)
       or $this->returnServerError('No results for Github Issue '.$param['i']['value'].' in project '.$param['u']['value'].'/'.$param['p']['value']);
diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php
index 61c15b57..c8558fec 100644
--- a/bridges/GitlabCommitsBridge.php
+++ b/bridges/GitlabCommitsBridge.php
@@ -1,19 +1,12 @@
 <?php
-/**
-* GitlabCommitsBridge
-*
-* @name GitlabCommits Bridge
-* @description Returns the commits of a project hosted on a gitlab instance
- */
 class GitlabCommitsBridge extends BridgeAbstract{
-  public function loadMetadatas() {
 
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'Gitlab Commits';
-    $this->uri = '';
-    $this->description = 'Returns the commits of a project hosted on a gitlab instance';
+    public $maintainer = 'Pierre Mazière';
+    public $name = 'Gitlab Commits';
+    public $uri = '';
+    public $description = 'Returns the commits of a project hosted on a gitlab instance';
 
-    $this->parameters[] = array(
+    public $parameters = array( array(
       'uri'=>array(
         'name'=>'Base URI',
         'defaultValue'=>'https://gitlab.com'
@@ -30,8 +23,7 @@ class GitlabCommitsBridge extends BridgeAbstract{
         'name'=>'Project branch',
         'defaultValue'=>'master'
       )
-    );
-  }
+    ));
 
   public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/GizmodoFRBridge.php b/bridges/GizmodoFRBridge.php
index ce4e96d2..e79dcd4c 100644
--- a/bridges/GizmodoFRBridge.php
+++ b/bridges/GizmodoFRBridge.php
@@ -1,14 +1,10 @@
 <?php
 class GizmodoFRBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "polopollo";
-		$this->name = "GizmodoFR";
-		$this->uri = "http://www.gizmodo.fr/";
-		$this->description = "Returns the 15 newest posts from GizmodoFR (full text).";
-
-	}
+	public $maintainer = "polopollo";
+	public $name = "GizmodoFR";
+	public $uri = "http://www.gizmodo.fr/";
+	public $description = "Returns the 15 newest posts from GizmodoFR (full text).";
 
     public function collectData(){
 
diff --git a/bridges/GooglePlusPostBridge.php b/bridges/GooglePlusPostBridge.php
index 56af4524..62414b5b 100644
--- a/bridges/GooglePlusPostBridge.php
+++ b/bridges/GooglePlusPostBridge.php
@@ -4,21 +4,17 @@ class GooglePlusPostBridge extends BridgeAbstract
 	protected $_title;
 	protected $_url;
 
-	public function loadMetadatas() {
+	public $maintainer = "Grummfy";
+	public $name = "Google Plus Post Bridge";
+	public $uri = "http://plus.google.com/";
+	public $description = "Returns user public post (without API).";
 
-		$this->maintainer = "Grummfy";
-		$this->name = "Google Plus Post Bridge";
-		$this->uri = "http://plus.google.com/";
-		$this->description = "Returns user public post (without API).";
-
-        $this->parameters[] = array(
-            'username'=>array(
-                'name'=>'username or Id',
-                'required'=>true
-            )
-        );
-
-	}
+    public $parameters = array( array(
+        'username'=>array(
+            'name'=>'username or Id',
+            'required'=>true
+        )
+    ));
 
 	const GOOGLE_PLUS_BASE_URL = 'https://plus.google.com/';
 
diff --git a/bridges/GoogleSearchBridge.php b/bridges/GoogleSearchBridge.php
index c2512bf0..9d1cf5c9 100644
--- a/bridges/GoogleSearchBridge.php
+++ b/bridges/GoogleSearchBridge.php
@@ -9,21 +9,18 @@
 */
 class GoogleSearchBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
 
-		$this->maintainer = "sebsauvage";
-		$this->name = "Google search";
-		$this->uri = "https://www.google.com/";
-		$this->description = "Returns most recent results from Google search.";
+	public $maintainer = "sebsauvage";
+	public $name = "Google search";
+	public $uri = "https://www.google.com/";
+	public $description = "Returns most recent results from Google search.";
 
-        $this->parameters[] = array(
-            'q'=>array(
-                'name'=>"keyword",
-                'required'=>true
-            )
-        );
-
-	}
+    public $parameters = array( array(
+        'q'=>array(
+            'name'=>"keyword",
+            'required'=>true
+        )
+    ));
 
 
     public function collectData(){
diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php
index 65617559..a91e5e32 100644
--- a/bridges/GuruMedBridge.php
+++ b/bridges/GuruMedBridge.php
@@ -1,12 +1,10 @@
 <?php
 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)";
-	}
+	public $maintainer = "qwertygc";
+	public $name = "GuruMed";
+	public $uri = "http://www.gurumed.org";
+	public $description = "Returns the 5 newest posts from Gurumed (full text)";
 
 	private function GurumedStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php
index 4aeb5961..2008e40d 100644
--- a/bridges/HDWallpapersBridge.php
+++ b/bridges/HDWallpapersBridge.php
@@ -4,22 +4,20 @@ class HDWallpapersBridge extends BridgeAbstract {
     private $category;
     private $resolution;
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "nel50n";
-		$this->name = "HD Wallpapers Bridge";
-		$this->uri = "http://www.hdwallpapers.in/";
-		$this->description = "Returns the latests wallpapers from HDWallpapers";
+	public $maintainer = "nel50n";
+	public $name = "HD Wallpapers Bridge";
+	public $uri = "http://www.hdwallpapers.in/";
+	public $description = "Returns the latests wallpapers from HDWallpapers";
 
-        $this->parameters[] = array(
-          'c'=>array('name'=>'category'),
-          'm'=>array('name'=>'max number of wallpapers'),
-          'r'=>array(
+    public $parameters = array( array(
+        'c'=>array('name'=>'category'),
+        'm'=>array('name'=>'max number of wallpapers'),
+        'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…'
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/HentaiHavenBridge.php b/bridges/HentaiHavenBridge.php
index 22381924..7be61450 100644
--- a/bridges/HentaiHavenBridge.php
+++ b/bridges/HentaiHavenBridge.php
@@ -1,14 +1,10 @@
 <?php
 class HentaiHavenBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "albirew";
-		$this->name = "Hentai Haven";
-		$this->uri = "http://hentaihaven.org/";
-		$this->description = "Returns releases from Hentai Haven";
-
-	}
+	public $maintainer = "albirew";
+	public $name = "Hentai Haven";
+	public $uri = "http://hentaihaven.org/";
+	public $description = "Returns releases from Hentai Haven";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://hentaihaven.org/') or $this->returnServerError('Could not request Hentai Haven.');
diff --git a/bridges/IdenticaBridge.php b/bridges/IdenticaBridge.php
index 15ed7598..91685231 100644
--- a/bridges/IdenticaBridge.php
+++ b/bridges/IdenticaBridge.php
@@ -1,21 +1,17 @@
 <?php
 class IdenticaBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Identica Bridge";
+	public $uri = "https://identi.ca/";
+	public $description = "Returns user timelines";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Identica Bridge";
-		$this->uri = "https://identi.ca/";
-		$this->description = "Returns user timelines";
-
-        $this->parameters[] = array(
-            'u'=>array(
-                'name'=>'username',
-                'required'=>true
-            )
-        );
-
-	}
+    public $parameters = array( array(
+        'u'=>array(
+            'name'=>'username',
+            'required'=>true
+        )
+    ));
 
     public function collectData(){
         $html = '';
diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index 9b48890d..1c7905cc 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -1,21 +1,17 @@
 <?php
 class InstagramBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
+	public $maintainer = "pauder";
+	public $name = "Instagram Bridge";
+	public $uri = "http://instagram.com/";
+	public $description = "Returns the newest images";
 
-		$this->maintainer = "pauder";
-		$this->name = "Instagram Bridge";
-		$this->uri = "http://instagram.com/";
-		$this->description = "Returns the newest images";
-
-        $this->parameters[] = array(
-            'u'=>array(
-                'name'=>'username',
-                'required'=>true
-            )
-        );
-
-	}
+    public $parameters = array( array(
+        'u'=>array(
+            'name'=>'username',
+            'required'=>true
+        )
+    ));
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM($this->getURI())
diff --git a/bridges/IsoHuntBridge.php b/bridges/IsoHuntBridge.php
index bfeb2fd9..5f9cad7b 100644
--- a/bridges/IsoHuntBridge.php
+++ b/bridges/IsoHuntBridge.php
@@ -1,93 +1,93 @@
 <?php
 class IsoHuntBridge extends BridgeAbstract{
-    public function loadMetadatas(){
-        $this->maintainer = 'logmanoriginal';
-        $this->name = 'isoHunt Bridge'; // Is replaced later!
-        $this->uri = 'https://isohunt.to'; // Is replaced later!
-        $this->description = 'Returns the latest results by category or search result';
+    public $maintainer = 'logmanoriginal';
+    public $name = 'isoHunt Bridge'; // Is replaced later!
+    public $uri = 'https://isohunt.to'; // Is replaced later!
+    public $description = 'Returns the latest results by category or search result';
+
+    public $parameters = array(
+        /*
+         * Get feeds for one of the "latest" categories
+         * Notice: The categories "News" and "Top Searches" are received from the main page
+         * Elements are sorted by name ascending!
+         */
+        'By "Latest" category' => array(
+            'latest_category'=>array(
+                'name'=>'Latest category',
+                'type'=>'list',
+                'required'=>true,
+                'title'=>'Select your category',
+                'defaultValue'=>'News',
+                'values'=>array(
+                    'Hot Torrents'=>'hot_torrents',
+                    'News'=>'news',
+                    'Releases'=>'releases',
+                    'Torrents'=>'torrents'
+                )
+            )
+        ),
 
         /*
-        * Get feeds for one of the "latest" categories
-        * Notice: The categories "News" and "Top Searches" are received from the main page
-        * Elements are sorted by name ascending!
-        */
-        $this->parameters['By "Latest" category'] = array(
-          'latest_category'=>array(
-            'name'=>'Latest category',
-            'type'=>'list',
-            'required'=>true,
-            'title'=>'Select your category',
-            'defaultValue'=>'News',
-            'values'=>array(
-              'Hot Torrents'=>'hot_torrents',
-              'News'=>'news',
-              'Releases'=>'releases',
-              'Torrents'=>'torrents'
+         * Get feeds for one of the "torrent" categories
+         * Make sure to add new categories also to get_torrent_category_index($)!
+         * Elements are sorted by name ascending!
+         */
+        'By "Torrent" category' => array(
+            'torrent_category'=>array(
+                'name'=>'Torrent category',
+                'type'=>'list',
+                'required'=>true,
+                'title'=>'Select your category',
+                'defaultValue'=>'Anime',
+                'values'=>array(
+                    'Adult'=>'adult',
+                    'Anime'=>'anime',
+                    'Books'=>'books',
+                    'Games'=>'games',
+                    'Movies'=>'movies',
+                    'Music'=>'music',
+                    'Other'=>'other',
+                    'Series & TV'=>'series_tv',
+                    'Software'=>'software'
+                )
+            ),
+            'torrent_popularity'=>array(
+                'name'=>'Sort by popularity',
+                'type'=>'checkbox',
+                'title'=>'Activate to receive results by popularity'
             )
-          )
-        );
+        ),
 
         /*
-        * Get feeds for one of the "torrent" categories
-        * Make sure to add new categories also to get_torrent_category_index($)!
-        * Elements are sorted by name ascending!
-        */
-        $this->parameters['By "Torrent" category'] = array(
-          'torrent_category'=>array(
-            'name'=>'Torrent category',
-            'type'=>'list',
-            'required'=>true,
-            'title'=>'Select your category',
-            'defaultValue'=>'Anime',
-            'values'=>array(
-              'Adult'=>'adult',
-              'Anime'=>'anime',
-              'Books'=>'books',
-              'Games'=>'games',
-              'Movies'=>'movies',
-              'Music'=>'music',
-              'Other'=>'other',
-              'Series & TV'=>'series_tv',
-              'Software'=>'software'
+         * Get feeds for a specific search request
+         */
+        'Search torrent by name' => array(
+            'search_name'=>array(
+                'name'=>'Name',
+                'required'=>true,
+                'title'=>'Insert your search query',
+                'exampleValue'=>'Bridge'
+            ),
+            'search_category'=>array(
+                'name'=>'Category',
+                'type'=>'list',
+                'title'=>'Select your category',
+                'defaultValue'=>'All',
+                'values'=>array(
+                    'Adult'=>'adult',
+                    'All'=>'all',
+                    'Anime'=>'anime',
+                    'Books'=>'books',
+                    'Games'=>'games',
+                    'Movies'=>'movies',
+                    'Music'=>'music',
+                    'Other'=>'other',
+                    'Series & TV'=>'series_tv',
+                    'Software'=>'software'
+                )
             )
-          ),
-          'torrent_popularity'=>array(
-            'name'=>'Sort by popularity',
-            'type'=>'checkbox',
-            'title'=>'Activate to receive results by popularity'
-          )
-        );
-
-        /*
-        * Get feeds for a specific search request
-        */
-        $this->parameters['Search torrent by name'] = array(
-          'search_name'=>array(
-            'name'=>'Name',
-            'required'=>true,
-            'title'=>'Insert your search query',
-            'exampleValue'=>'Bridge'
-          ),
-          'search_category'=>array(
-            'name'=>'Category',
-            'type'=>'list',
-            'title'=>'Select your category',
-            'defaultValue'=>'All',
-            'values'=>array(
-              'Adult'=>'adult',
-              'All'=>'all',
-              'Anime'=>'anime',
-              'Books'=>'books',
-              'Games'=>'games',
-              'Movies'=>'movies',
-              'Music'=>'music',
-              'Other'=>'other',
-              'Series & TV'=>'series_tv',
-              'Software'=>'software'
-            )
-          )
-        );
-    }
+        )
+    );
 
     public function collectData(){
         $params=$this->parameters[$this->queriedContext];
diff --git a/bridges/JapanExpoBridge.php b/bridges/JapanExpoBridge.php
index 7ac1f8a7..828593e2 100644
--- a/bridges/JapanExpoBridge.php
+++ b/bridges/JapanExpoBridge.php
@@ -1,22 +1,20 @@
 <?php
 class JapanExpoBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-        $this->maintainer = 'Ginko';
-        $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->parameters[] = array(
-          'mode'=>array(
+    public $maintainer = 'Ginko';
+    public $name = 'Japan Expo Actualités';
+    public $uri = 'http://www.japan-expo-paris.com/fr/actualites';
+    public $description = 'Returns most recent entries from Japan Expo actualités.';
+    public $parameters = array( array(
+        'mode'=>array(
             'name'=>'Mode',
             'type'=>'list',
             'values'=>array(
-              'Titles only'=>'light',
-              'Full Contents'=>'full'
+                'Titles only'=>'light',
+                'Full Contents'=>'full'
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/KonachanBridge.php b/bridges/KonachanBridge.php
index 1ae4fff3..bda5a961 100644
--- a/bridges/KonachanBridge.php
+++ b/bridges/KonachanBridge.php
@@ -1,21 +1,18 @@
 <?php
 class KonachanBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Konachan";
+	public $uri = "http://konachan.com/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Konachan";
-		$this->uri = "http://konachan.com/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php
index 66fe3733..4cb86c81 100644
--- a/bridges/KoreusBridge.php
+++ b/bridges/KoreusBridge.php
@@ -1,12 +1,10 @@
 <?php
 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)";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "Koreus";
+	public $uri = "http://www.koreus.com/";
+	public $description = "Returns the 5 newest posts from Koreus (full text)";
 
 	private function KoreusStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
diff --git a/bridges/KununuBridge.php b/bridges/KununuBridge.php
index e81917d8..0fa63c9d 100644
--- a/bridges/KununuBridge.php
+++ b/bridges/KununuBridge.php
@@ -1,12 +1,12 @@
 <?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.";
+	public $maintainer = "logmanoriginal";
+	public $name = "Kununu Bridge"; /* This will be replaced later! */
+	public $uri = "https://www.kununu.com"; /* This will be replaced later! */
+	public $description = "Returns the latest reviews for a company and site of your choice.";
 
-        $this->parameters['global'] = array(
+    public $parameters = array(
+        'global' => array(
           'site'=>array(
             'name'=>'Site',
             'type'=>'list',
@@ -27,17 +27,17 @@ class KununuBridge extends BridgeAbstract{
             'exampleValue'=>'checked',
             'title'=>'Activate to load full article'
           )
-        );
+        ),
 
-        $this->parameters[] = array(
+        array(
           'company'=>array(
             'name'=>'Company',
             'required'=>true,
             'exampleValue'=>'kununu-us',
             'title'=>'Insert company name (i.e. Kununu US) or URI path (i.e. kununu-us)'
           )
-        );
-	}
+      )
+  );
 
 	public function collectData(){
         $params=$this->parameters[$this->queriedContext];
diff --git a/bridges/LWNprevBridge.php b/bridges/LWNprevBridge.php
index 32a79447..9e64a5cd 100644
--- a/bridges/LWNprevBridge.php
+++ b/bridges/LWNprevBridge.php
@@ -1,19 +1,9 @@
 <?php
-/**
- * RssBridgeLWNprev
- *
- * @name LWNPrev Bridge
- * @description Returns the articles from the previous LWN.net edition
- */
 class LWNprevBridge extends BridgeAbstract{
-  public function loadMetadatas() {
-
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'LWN Free Weekly Edition';
-    $this->uri = 'https://lwn.net/free/bigpage';
-    $this->description = 'LWN Free Weekly Edition available one week late';
-
-  }
+    public $maintainer = 'Pierre Mazière';
+    public $name = 'LWN Free Weekly Edition';
+    public $uri = 'https://lwn.net/free/bigpage';
+    public $description = 'LWN Free Weekly Edition available one week late';
 
   private function jumpToNextTag(&$node){
     while($node && $node->nodeType===XML_TEXT_NODE){
diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php
index 855600fe..974419ca 100755
--- a/bridges/LeBonCoinBridge.php
+++ b/bridges/LeBonCoinBridge.php
@@ -1,14 +1,12 @@
 <?php
 class LeBonCoinBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "16mhz";
+	public $name = "LeBonCoin";
+	public $uri = "http://www.leboncoin.fr";
+	public $description = "Returns most recent results from LeBonCoin for a region, and optionally a category and a keyword .";
 
-		$this->maintainer = "16mhz";
-		$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->parameters[] = array(
+    public $parameters = array( array(
           'k'=>array('name'=>'Mot Clé'),
           'r'=>array(
             'name'=>'Région',
@@ -132,11 +130,9 @@ class LeBonCoinBridge extends BridgeAbstract{
               ),
               'AUTRES'=>'autres'
             )
-          )
-        );
-
-	}
-
+        )
+      )
+  );
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php
index 19f06e19..370a1892 100644
--- a/bridges/LeJournalDuGeekBridge.php
+++ b/bridges/LeJournalDuGeekBridge.php
@@ -1,12 +1,10 @@
 <?php
 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).";
-	}
+	public $maintainer = "polopollo";
+	public $name = "journaldugeek.com (FR)";
+	public $uri = "http://www.journaldugeek.com/";
+	public $description = "Returns the 5 newest posts from LeJournalDuGeek (full text).";
 
 	private function LeJournalDuGeekStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
diff --git a/bridges/LeMondeInformatiqueBridge.php b/bridges/LeMondeInformatiqueBridge.php
index e4fbdbcb..a1aadab1 100644
--- a/bridges/LeMondeInformatiqueBridge.php
+++ b/bridges/LeMondeInformatiqueBridge.php
@@ -1,14 +1,10 @@
 <?php
 class LeMondeInformatiqueBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = "ORelio";
-        $this->name = "Le Monde Informatique";
-        $this->uri = "http://www.lemondeinformatique.fr/";
-        $this->description = "Returns the newest articles.";
-
-    }
+    public $maintainer = "ORelio";
+    public $name = "Le Monde Informatique";
+    public $uri = "http://www.lemondeinformatique.fr/";
+    public $description = "Returns the newest articles.";
 
     public function collectData(){
 
diff --git a/bridges/Les400CulsBridge.php b/bridges/Les400CulsBridge.php
index 2dd9883f..31b101b7 100644
--- a/bridges/Les400CulsBridge.php
+++ b/bridges/Les400CulsBridge.php
@@ -4,14 +4,10 @@ define("SEXE_FEED", "http://sexes.blogs.liberation.fr/feeds/");
 
 class Les400CulsBridge extends RssExpander{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "unknown";
-		$this->name = "Les 400 Culs";
-		$this->uri = "http://sexes.blogs.liberation.fr";
-		$this->description = "La planete sexe vue par Agnes Girard via rss-bridge";
-
-	}
+	public $maintainer = "unknown";
+	public $name = "Les 400 Culs";
+	public $uri = "http://sexes.blogs.liberation.fr";
+	public $description = "La planete sexe vue par Agnes Girard via rss-bridge";
 
 
     public function collectData(){
diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php
index d3299395..db40bff4 100644
--- a/bridges/LesJoiesDuCodeBridge.php
+++ b/bridges/LesJoiesDuCodeBridge.php
@@ -1,14 +1,10 @@
 <?php
 class LesJoiesDuCodeBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Les Joies Du Code";
-		$this->uri = "http://lesjoiesducode.fr/";
-		$this->description = "LesJoiesDuCode";
-
-	}
+	public $maintainer = "superbaillot.net";
+	public $name = "Les Joies Du Code";
+	public $uri = "http://lesjoiesducode.fr/";
+	public $description = "LesJoiesDuCode";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://lesjoiesducode.fr/') or $this->returnServerError('Could not request LesJoiesDuCode.');
diff --git a/bridges/LichessBridge.php b/bridges/LichessBridge.php
index 839b183a..dd86f063 100644
--- a/bridges/LichessBridge.php
+++ b/bridges/LichessBridge.php
@@ -2,13 +2,10 @@
 
 class LichessBridge  extends BridgeAbstract
 {
-    public function loadMetadatas()
-    {
-        $this->maintainer = 'AmauryCarrade';
-        $this->name = 'Lichess Blog';
-        $this->uri = 'http://lichess.org/blog';
-        $this->description = 'Returns the 5 newest posts from the Lichess blog (full text)';
-    }
+    public $maintainer = 'AmauryCarrade';
+    public $name = 'Lichess Blog';
+    public $uri = 'http://lichess.org/blog';
+    public $description = 'Returns the 5 newest posts from the Lichess blog (full text)';
 
     public function collectData()
     {
diff --git a/bridges/LinkedInCompany.php b/bridges/LinkedInCompany.php
index 7640d15b..9f0560d6 100644
--- a/bridges/LinkedInCompany.php
+++ b/bridges/LinkedInCompany.php
@@ -1,20 +1,17 @@
 <?php
 class LinkedInCompany extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "regisenguehard";
+	public $name = "LinkedIn Company";
+	public $uri = "https://www.linkedin.com/";
+	public $description = "Returns most recent actus from Company on LinkedIn. (https://www.linkedin.com/company/<strong style=\"font-weight:bold;\">apple</strong>)";
 
-		$this->maintainer = "regisenguehard";
-		$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->parameters[] = array(
-          'c'=>array(
+    public $parameters = array( array(
+        'c'=>array(
             'name'=>'Company name',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/LolibooruBridge.php b/bridges/LolibooruBridge.php
index 66892167..5bfec8c3 100644
--- a/bridges/LolibooruBridge.php
+++ b/bridges/LolibooruBridge.php
@@ -1,21 +1,18 @@
 <?php
 class LolibooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Lolibooru";
+	public $uri = "http://lolibooru.moe/";
+	public $description = "Returns images from given page and tags";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Lolibooru";
-		$this->uri = "http://lolibooru.moe/";
-		$this->description = "Returns images from given page and tags";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/MangareaderBridge.php b/bridges/MangareaderBridge.php
index 59cb0649..8d00f29a 100644
--- a/bridges/MangareaderBridge.php
+++ b/bridges/MangareaderBridge.php
@@ -2,15 +2,14 @@
 define('MANGAREADER_LIMIT', 10); // The default limit
 class MangareaderBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "logmanoriginal";
+	public $name = "Mangareader Bridge";
+	public $uri = "http://www.mangareader.net";
+	public $description = "Returns the latest updates, popular mangas or manga updates (new chapters)";
 
-		$this->maintainer = "logmanoriginal";
-		$this->name = "Mangareader Bridge";
-		$this->uri = "http://www.mangareader.net";
-		$this->description = "Returns the latest updates, popular mangas or manga updates (new chapters)";
-
-		$this->parameters["Get latest updates"] = array();
-        $this->parameters["Get popular mangas"] = array(
+    public $parameters = array(
+        'Get latest updates' => array(),
+        'Get popular mangas' => array(
           'category'=>array(
             'name'=>'Category',
             'type'=>'list',
@@ -58,8 +57,8 @@ class MangareaderBridge extends BridgeAbstract{
             'exampleValue'=>'All',
             'title'=>'Select your category'
           )
-        );
-        $this->parameters["Get manga updates"] = array(
+        ),
+        'Get manga updates' => array(
           'path'=>array(
             'name'=>'Path',
             'required'=>true,
@@ -73,8 +72,8 @@ class MangareaderBridge extends BridgeAbstract{
             'exampleValue'=>10,
             'title'=>'Number of items to return [-1 returns all]'
           )
-        );
-	}
+      )
+  );
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php
index 58b539f8..a0352025 100644
--- a/bridges/MilbooruBridge.php
+++ b/bridges/MilbooruBridge.php
@@ -1,21 +1,19 @@
 <?php
 class MilbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Milbooru";
-		$this->uri = "http://sheslostcontrol.net/moe/shimmie/";
-		$this->description = "Returns images from given page";
+	public $maintainer = "mitsukarenai";
+	public $name = "Milbooru";
+	public $uri = "http://sheslostcontrol.net/moe/shimmie/";
+	public $description = "Returns images from given page";
 
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/MondeDiploBridge.php b/bridges/MondeDiploBridge.php
index 0bbab2a2..5123ccd8 100644
--- a/bridges/MondeDiploBridge.php
+++ b/bridges/MondeDiploBridge.php
@@ -1,12 +1,10 @@
 <?php
 class MondeDiploBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "Pitchoule";
-		$this->name = 'Monde Diplomatique';
-		$this->uri = 'http://www.monde-diplomatique.fr';
-		$this->description = "Returns most recent results from MondeDiplo.";
-	}
+	public $maintainer = "Pitchoule";
+	public $name = 'Monde Diplomatique';
+	public $uri = 'http://www.monde-diplomatique.fr';
+	public $description = "Returns most recent results from MondeDiplo.";
 
 	public function collectData(){
 		$html = $this->getSimpleHTMLDOM($this->uri) or $this->returnServerError('Could not request MondeDiplo. for : ' . $link);
diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php
index e4af1374..17a8a44d 100644
--- a/bridges/MsnMondeBridge.php
+++ b/bridges/MsnMondeBridge.php
@@ -1,12 +1,10 @@
 <?php
 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)";
-	}
+	public $maintainer = "kranack";
+	public $name = 'MSN Actu Monde';
+	public $uri = 'http://www.msn.com/fr-fr/actualite/monde';
+	public $description = "Returns the 10 newest posts from MSN Actualités (full text)";
 
 	private function MsnMondeExtractContent($url, &$item) {
 		$html2 = $this->getSimpleHTMLDOM($url);
diff --git a/bridges/MspabooruBridge.php b/bridges/MspabooruBridge.php
index 5a7f8a2b..3deca865 100644
--- a/bridges/MspabooruBridge.php
+++ b/bridges/MspabooruBridge.php
@@ -1,22 +1,19 @@
 <?php
 class MspabooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Mspabooru";
-		$this->uri = "http://mspabooru.com/";
-		$this->description = "Returns images from given page";
+	public $maintainer = "mitsukarenai";
+	public $name = "Mspabooru";
+	public $uri = "http://mspabooru.com/";
+	public $description = "Returns images from given page";
 
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php
index 0ad8370b..5d0fb36c 100644
--- a/bridges/NakedSecurityBridge.php
+++ b/bridges/NakedSecurityBridge.php
@@ -1,12 +1,10 @@
 <?php
 class NakedSecurityBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = 'ORelio';
-        $this->name = 'Naked Security';
-        $this->uri = 'https://nakedsecurity.sophos.com/';
-        $this->description = 'Returns the newest articles.';
-    }
+    public $maintainer = 'ORelio';
+    public $name = 'Naked Security';
+    public $uri = 'https://nakedsecurity.sophos.com/';
+    public $description = 'Returns the newest articles.';
 
     public function collectData(){
 
diff --git a/bridges/NasaApodBridge.php b/bridges/NasaApodBridge.php
index 2209c4d3..c30eccfc 100644
--- a/bridges/NasaApodBridge.php
+++ b/bridges/NasaApodBridge.php
@@ -1,14 +1,10 @@
 <?php
 class NasaApodBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "corenting";
-		$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";
-
-	}
+	public $maintainer = "corenting";
+	public $name = "NASA APOD Bridge";
+	public $uri = "http://apod.nasa.gov/apod/astropix.html";
+	public $description = "Returns the 3 latest NASA APOD pictures and explanations";
 
   public function collectData(){
 
diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php
index 0d7ae981..ff33fa1d 100644
--- a/bridges/NeuviemeArtBridge.php
+++ b/bridges/NeuviemeArtBridge.php
@@ -1,12 +1,10 @@
 <?php
 class NeuviemeArtBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = "ORelio";
-        $this->name = '9ème Art Bridge';
-        $this->uri = "http://www.9emeart.fr/";
-        $this->description = "Returns the newest articles.";
-    }
+    public $maintainer = "ORelio";
+    public $name = '9ème Art Bridge';
+    public $uri = "http://www.9emeart.fr/";
+    public $description = "Returns the newest articles.";
 
     public function collectData(){
 
diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php
index 93b3a819..1422a315 100644
--- a/bridges/NextInpactBridge.php
+++ b/bridges/NextInpactBridge.php
@@ -1,12 +1,10 @@
 <?php
 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.";
-	}
+	public $maintainer = "qwertygc";
+	public $name = "NextInpact Bridge";
+	public $uri = "http://www.nextinpact.com/";
+	public $description = "Returns the newest articles.";
 
 	private function StripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);
diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
index 196c0fac..622fc65f 100644
--- a/bridges/NextgovBridge.php
+++ b/bridges/NextgovBridge.php
@@ -1,32 +1,29 @@
 <?php
 class NextgovBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'Nextgov Bridge';
+    public $uri = 'https://www.nextgov.com/';
+    public $description = 'USA Federal technology news, best practices, and web 2.0 tools.';
 
-        $this->maintainer = 'ORelio';
-        $this->name = 'Nextgov Bridge';
-        $this->uri = 'https://www.nextgov.com/';
-        $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.';
-
-        $this->parameters[] = array(
-          'category'=>array(
+    public $parameters = array( array(
+        'category'=>array(
             'name'=>'Category',
             'type'=>'list',
             'values'=>array(
-              'All'=>'all',
-              'Technology News'=>'technology-news',
-              'CIO Briefing'=>'cio-briefing',
-              'Emerging Tech'=>'emerging-tech',
-              'Cloud'=>'cloud-computing',
-              'Cybersecurity'=>'cybersecurity',
-              'Mobile'=>'mobile',
-              'Health'=>'health',
-              'Defense'=>'defense',
-              'Big Data'=>'big-data'
+                'All'=>'all',
+                'Technology News'=>'technology-news',
+                'CIO Briefing'=>'cio-briefing',
+                'Emerging Tech'=>'emerging-tech',
+                'Cloud'=>'cloud-computing',
+                'Cybersecurity'=>'cybersecurity',
+                'Mobile'=>'mobile',
+                'Health'=>'health',
+                'Defense'=>'defense',
+                'Big Data'=>'big-data'
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php
index d56fc275..d01ef53c 100644
--- a/bridges/NiceMatinBridge.php
+++ b/bridges/NiceMatinBridge.php
@@ -1,12 +1,10 @@
 <?php
 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)";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "NiceMatin";
+	public $uri = "http://www.nicematin.com/";
+	public $description = "Returns the 10 newest posts from NiceMatin (full text)";
 
 	private function NiceMatinExtractContent($url) {
 		$html = $this->getSimpleHTMLDOM($url);
diff --git a/bridges/NovelUpdatesBridge.php b/bridges/NovelUpdatesBridge.php
index 84da2a9d..b389dac2 100644
--- a/bridges/NovelUpdatesBridge.php
+++ b/bridges/NovelUpdatesBridge.php
@@ -1,19 +1,16 @@
 <?php
 class NovelUpdatesBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "albirew";
-		$this->name = "Novel Updates";
-		$this->uri = "http://www.novelupdates.com/";
-		$this->description = "Returns releases from Novel Updates";
-		$this->parameters[] = array(
-          'n'=>array(
+	public $maintainer = "albirew";
+	public $name = "Novel Updates";
+	public $uri = "http://www.novelupdates.com/";
+	public $description = "Returns releases from Novel Updates";
+	public $parameters = array( array(
+        'n'=>array(
             'name'=>'Novel URL',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/NumeramaBridge.php b/bridges/NumeramaBridge.php
index d9ae0835..77129bd2 100644
--- a/bridges/NumeramaBridge.php
+++ b/bridges/NumeramaBridge.php
@@ -1,14 +1,10 @@
 <?php
 class NumeramaBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-
-        $this->maintainer = 'mitsukarenai';
-        $this->name = 'Numerama';
-        $this->uri = 'http://www.numerama.com/';
-        $this->description = 'Returns the 5 newest posts from Numerama (full text)';
-
-    }
+    public $maintainer = 'mitsukarenai';
+    public $name = 'Numerama';
+    public $uri = 'http://www.numerama.com/';
+    public $description = 'Returns the 5 newest posts from Numerama (full text)';
 
     public function collectData(){
 
diff --git a/bridges/OpenClassroomsBridge.php b/bridges/OpenClassroomsBridge.php
index 8f26275e..d878709f 100644
--- a/bridges/OpenClassroomsBridge.php
+++ b/bridges/OpenClassroomsBridge.php
@@ -1,32 +1,28 @@
 <?php
 class OpenClassroomsBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "sebsauvage";
+	public $name = "OpenClassrooms Bridge";
+	public $uri = "https://openclassrooms.com/";
+	public $description = "Returns latest tutorials from OpenClassrooms.";
 
-		$this->maintainer = "sebsauvage";
-		$this->name = "OpenClassrooms Bridge";
-		$this->uri = "https://openclassrooms.com/";
-		$this->description = "Returns latest tutorials from OpenClassrooms.";
-
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'Catégorie',
             'type'=>'list',
             'values'=>array(
-              'Arts & Culture'=>'arts',
-              'Code'=>'code',
-              'Design'=>'design',
-              'Entreprise'=>'business',
-              'Numérique'=>'digital',
-              'Sciences'=>'sciences',
-              'Sciences Humaines'=>'humainities',
-              'Systèmes d\'information'=>'it',
-              'Autres'=>'others'
+                'Arts & Culture'=>'arts',
+                'Code'=>'code',
+                'Design'=>'design',
+                'Entreprise'=>'business',
+                'Numérique'=>'digital',
+                'Sciences'=>'sciences',
+                'Sciences Humaines'=>'humainities',
+                'Systèmes d\'information'=>'it',
+                'Autres'=>'others'
             )
-          )
-        );
-	}
+        )
+    ));
 
 
     public function collectData(){
diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php
index bb0a77bd..cd620997 100644
--- a/bridges/ParuVenduImmoBridge.php
+++ b/bridges/ParuVenduImmoBridge.php
@@ -1,31 +1,27 @@
 <?php
-
 class ParuVenduImmoBridge extends BridgeAbstract
 {
-	public function loadMetadatas() {
-
-		$this->maintainer = "polo2ro";
-		$this->name = "Paru Vendu Immobilier";
-		$this->uri = "http://www.paruvendu.fr";
-		$this->description = "Returns the ads from the first page of search result.";
+	public $maintainer = "polo2ro";
+	public $name = "Paru Vendu Immobilier";
+	public $uri = "http://www.paruvendu.fr";
+	public $description = "Returns the ads from the first page of search result.";
 
 
-        $this->parameters[] = array(
-          'minarea'=>array(
+    public $parameters = array( array(
+        'minarea'=>array(
             'name'=>'Minimal surface m²',
             'type'=>'number'
-          ),
-          'maxprice'=>array(
+        ),
+        'maxprice'=>array(
             'name'=>'Max price',
             'type'=>'number'
-          ),
-          'pa'=>array(
+        ),
+        'pa'=>array(
             'name'=>'Country code',
             'exampleValue'=>'FR'
-          ),
-          'lo'=>array('name'=>'department numbers or postal codes, comma-separated')
-        );
-	}
+        ),
+        'lo'=>array('name'=>'department numbers or postal codes, comma-separated')
+    ));
 
     public function collectData()
     {
diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php
index b35c9c36..380a8852 100644
--- a/bridges/PickyWallpapersBridge.php
+++ b/bridges/PickyWallpapersBridge.php
@@ -5,28 +5,25 @@ class PickyWallpapersBridge extends BridgeAbstract {
     private $subcategory;
     private $resolution;
 
-	public function loadMetadatas() {
+	public $maintainer = "nel50n";
+	public $name = "PickyWallpapers Bridge";
+	public $uri = "http://www.pickywallpapers.com/";
+	public $description = "Returns the latests wallpapers from PickyWallpapers";
 
-		$this->maintainer = "nel50n";
-		$this->name = "PickyWallpapers Bridge";
-		$this->uri = "http://www.pickywallpapers.com/";
-		$this->description = "Returns the latests wallpapers from PickyWallpapers";
-
-        $this->parameters[] = array(
-          'c'=>array('name'=>'category'),
-          's'=>array('name'=>'subcategory'),
-          'm'=>array(
+    public $parameters = array( array(
+        'c'=>array('name'=>'category'),
+        's'=>array('name'=>'subcategory'),
+        'm'=>array(
             'name'=>'Max number of wallpapers',
             'type'=>'number'
-          ),
-          'r'=>array(
+        ),
+        'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…',
             'pattern'=>'[0-9]{3,4}x[0-9]{3,4}'
-          )
-        );
+        )
+    ));
 
-	}
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php
index f82c7c71..b3ddd8ee 100644
--- a/bridges/PinterestBridge.php
+++ b/bridges/PinterestBridge.php
@@ -5,22 +5,20 @@ class PinterestBridge extends BridgeAbstract{
     private $board;
     private $query;
 
-    public function loadMetadatas() {
+	public $maintainer = "pauder";
+	public $name = "Pinterest Bridge";
+	public $uri = "http://www.pinterest.com";
+	public $description = "Returns the newest images on a board";
 
-		$this->maintainer = "pauder";
-		$this->name = "Pinterest Bridge";
-		$this->uri = "http://www.pinterest.com";
-		$this->description = "Returns the newest images on a board";
-
-        $this->parameters["By username and board"] = array(
-          'u'=>array('name'=>'username'),
-          'b'=>array('name'=>'board')
-        );
-
-        $this->parameters["From search"] = array(
-          'q'=>array('name'=>'Keyword')
-        );
-	}
+    public $parameters = array(
+        'By username and board' => array(
+            'u'=>array('name'=>'username'),
+            'b'=>array('name'=>'board')
+        ),
+        'From search' => array(
+            'q'=>array('name'=>'Keyword')
+        )
+    );
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php
index 02e95355..bfafb48f 100644
--- a/bridges/PlanetLibreBridge.php
+++ b/bridges/PlanetLibreBridge.php
@@ -1,12 +1,10 @@
 <?php
 class PlanetLibreBridge extends BridgeAbstract{
 
-	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)";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "PlanetLibre";
+	public $uri = "http://www.planet-libre.org";
+	public $description = "Returns the 5 newest posts from PlanetLibre (full text)";
 
 	private function PlanetLibreExtractContent($url){
 		$html2 = $this->getSimpleHTMLDOM($url);
diff --git a/bridges/ProjectMGameBridge.php b/bridges/ProjectMGameBridge.php
index b6dacbd8..b7130a23 100644
--- a/bridges/ProjectMGameBridge.php
+++ b/bridges/ProjectMGameBridge.php
@@ -1,14 +1,10 @@
 <?php
 class ProjectMGameBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "corenting";
-		$this->name = "Project M Game Bridge";
-		$this->uri = "http://projectmgame.com/en/";
-		$this->description = "Returns the newest articles.";
-
-	}
+	public $maintainer = "corenting";
+	public $name = "Project M Game Bridge";
+	public $uri = "http://projectmgame.com/en/";
+	public $description = "Returns the newest articles.";
 
 
   public function collectData(){
diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php
index 561bcc56..c669bc9f 100644
--- a/bridges/RTBFBridge.php
+++ b/bridges/RTBFBridge.php
@@ -1,19 +1,17 @@
 <?php
 class RTBFBridge extends BridgeAbstract {
-	public function loadMetadatas() {
-		$this->name = "RTBF Bridge";
-		$this->uri = "http://www.rtbf.be/auvio/emissions";
-		$this->description = "Returns the newest RTBF videos by series ID";
-		$this->maintainer = "Frenzie";
+	public $name = "RTBF Bridge";
+	public $uri = "http://www.rtbf.be/auvio/emissions";
+	public $description = "Returns the newest RTBF videos by series ID";
+	public $maintainer = "Frenzie";
 
-        $this->parameters[] = array(
-          'c'=>array(
+    public $parameters = array( array(
+        'c'=>array(
             'name'=>'series id',
             'exampleValue'=>9500,
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/Releases3DSBridge.php b/bridges/Releases3DSBridge.php
index fb85fcb4..25ba50be 100644
--- a/bridges/Releases3DSBridge.php
+++ b/bridges/Releases3DSBridge.php
@@ -1,14 +1,10 @@
 <?php
 class Releases3DSBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "ORelio";
-		$this->name = "3DS Scene Releases";
-		$this->uri = "http://www.3dsdb.com/";
-		$this->description = "Returns the newest scene releases.";
-
-	}
+	public $maintainer = "ORelio";
+	public $name = "3DS Scene Releases";
+	public $uri = "http://www.3dsdb.com/";
+	public $description = "Returns the newest scene releases.";
 
     public function collectData(){
 
diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index e3103443..8596942c 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -1,12 +1,10 @@
 <?php
 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.";
-		}
+		public $maintainer = "nyutag";
+		public $name = "Reporterre Bridge";
+		public $uri = "http://www.reporterre.net/";
+		public $description = "Returns the newest articles.";
 
 		private function ExtractContentReporterre($url) {
 			$html2 = $this->getSimpleHTMLDOM($url);
diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php
index 39c6c4fc..978223fe 100644
--- a/bridges/Rue89Bridge.php
+++ b/bridges/Rue89Bridge.php
@@ -1,14 +1,10 @@
 <?php
 class Rue89Bridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "Rue89";
-		$this->uri = "http://rue89.nouvelobs.com/";
-		$this->description = "Returns the 5 newest posts from Rue89 (full text)";
-
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "Rue89";
+	public $uri = "http://rue89.nouvelobs.com/";
+	public $description = "Returns the 5 newest posts from Rue89 (full text)";
 
 	private function rue89getDatas($url){
 
diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php
index 12c69259..5a0ebf89 100644
--- a/bridges/Rule34Bridge.php
+++ b/bridges/Rule34Bridge.php
@@ -1,22 +1,18 @@
 <?php
 class Rule34Bridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Rule34";
+	public $uri = "http://rule34.xxx/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Rule34";
-		$this->uri = "http://rule34.xxx/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php
index 76605c66..2c9b3dad 100644
--- a/bridges/Rule34pahealBridge.php
+++ b/bridges/Rule34pahealBridge.php
@@ -1,21 +1,18 @@
 <?php
 class Rule34pahealBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Rule34paheal";
+	public $uri = "http://rule34.paheal.net/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Rule34paheal";
-		$this->uri = "http://rule34.paheal.net/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
 
     public function collectData(){
diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php
index a6d98919..dc4fed78 100644
--- a/bridges/SafebooruBridge.php
+++ b/bridges/SafebooruBridge.php
@@ -1,22 +1,18 @@
 <?php
 class SafebooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Safebooru";
+	public $uri = "http://safebooru.org/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Safebooru";
-		$this->uri = "http://safebooru.org/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php
index 2a386013..41ad5166 100644
--- a/bridges/SakugabooruBridge.php
+++ b/bridges/SakugabooruBridge.php
@@ -1,22 +1,18 @@
 <?php
 class SakugabooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Sakugabooru";
+	public $uri = "http://sakuga.yshi.org/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Sakugabooru";
-		$this->uri = "http://sakuga.yshi.org/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/ScmbBridge.php b/bridges/ScmbBridge.php
index c1d6031b..9e5997e1 100644
--- a/bridges/ScmbBridge.php
+++ b/bridges/ScmbBridge.php
@@ -1,14 +1,10 @@
 <?php
 class ScmbBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Astalaseven";
-		$this->name = "Se Coucher Moins Bête Bridge";
-		$this->uri = "http://secouchermoinsbete.fr/";
-		$this->description = "Returns the newest anecdotes.";
-
-	}
+	public $maintainer = "Astalaseven";
+	public $name = "Se Coucher Moins Bête Bridge";
+	public $uri = "http://secouchermoinsbete.fr/";
+	public $description = "Returns the newest anecdotes.";
 
     public function collectData(){
         $html = '';
diff --git a/bridges/ScoopItBridge.php b/bridges/ScoopItBridge.php
index 6a233d44..c9a89716 100644
--- a/bridges/ScoopItBridge.php
+++ b/bridges/ScoopItBridge.php
@@ -1,21 +1,17 @@
 <?php
 class ScoopItBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "Pitchoule";
+	public $name = "ScoopIt";
+	public $uri = "http://www.scoop.it";
+	public $description = "Returns most recent results from ScoopIt.";
 
-		$this->maintainer = "Pitchoule";
-		$this->name = "ScoopIt";
-		$this->uri = "http://www.scoop.it";
-		$this->description = "Returns most recent results from ScoopIt.";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'keyword',
             'required'=>true
-          )
-        );
-
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index 0e44bdca..c1d6986e 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -1,41 +1,37 @@
 <?php
 class SensCritiqueBridge extends BridgeAbstract {
 
-	private $request;
+	public $maintainer = "kranack";
+	public $name = "Sens Critique";
+	public $uri = "http://www.senscritique.com";
+	public $description = "Sens Critique news";
 
-  public function loadMetadatas() {
-		$this->maintainer = "kranack";
-		$this->name = "Sens Critique";
-		$this->uri = "http://www.senscritique.com";
-		$this->description = "Sens Critique news";
-
-        $this->parameters[] = array(
-          'm'=>array(
+    public $parameters = array( array(
+        'm'=>array(
             'name'=>'Movies',
             'type'=>'checkbox'
-          ),
-          's'=>array(
+        ),
+        's'=>array(
             'name'=>'Series',
             'type'=>'checkbox'
-          ),
-          'g'=>array(
+        ),
+        'g'=>array(
             'name'=>'Video Games',
             'type'=>'checkbox'
-          ),
-          'b'=>array(
+        ),
+        'b'=>array(
             'name'=>'Books',
             'type'=>'checkbox'
-          ),
-          'bd'=>array(
+        ),
+        'bd'=>array(
             'name'=>'BD',
             'type'=>'checkbox'
-          ),
-          'mu'=>array(
+        ),
+        'mu'=>array(
             'name'=>'Music',
             'type'=>'checkbox'
-          )
-        );
-  }
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/Sexactu.php b/bridges/Sexactu.php
index 839f6dd8..f6647b17 100644
--- a/bridges/Sexactu.php
+++ b/bridges/Sexactu.php
@@ -1,14 +1,10 @@
 <?php
 class Sexactu extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Riduidel";
-		$this->name = "Sexactu";
-		$this->uri = "http://www.gqmagazine.fr";
-		$this->description = "Sexactu via rss-bridge";
-
-	}
+	public $maintainer = "Riduidel";
+	public $name = "Sexactu";
+	public $uri = "http://www.gqmagazine.fr";
+	public $description = "Sexactu via rss-bridge";
 
     public function collectData(){
 $find = array('janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'novembre', 'décembre');
diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php
index 5abc31f8..6c117e34 100644
--- a/bridges/ShanaprojectBridge.php
+++ b/bridges/ShanaprojectBridge.php
@@ -1,17 +1,15 @@
 <?php
 class ShanaprojectBridge extends BridgeAbstract {
-    public function loadMetadatas() {
-        $this->maintainer = 'logmanoriginal';
-        $this->name = 'Shanaproject Bridge';
-        $this->uri = 'http://www.shanaproject.com';
-        $this->description = 'Returns a list of anime from the current Season Anime List';
-    }
+    public $maintainer = 'logmanoriginal';
+    public $name = 'Shanaproject Bridge';
+    public $uri = 'http://www.shanaproject.com';
+    public $description = 'Returns a list of anime from the current Season Anime List';
 
     // Returns an html object for the Season Anime List (latest season)
     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->getSimpleHTMLDOM($this->getURI() . '/seasons');
-        if(!$html) 
+        if(!$html)
             $this->returnServerError('Could not load \'seasons\' page!');
 
         $season = $html->find('div.follows_menu/a', 1);
@@ -21,7 +19,7 @@ class ShanaprojectBridge extends BridgeAbstract {
         $html = $this->getSimpleHTMLDOM($this->getURI() . $season->href);
         if(!$html)
             $this->returnServerError('Could not load \'Season Anime List\' from \'' . $season->innertext . '\'!');
-        
+
         return $html;
     }
 
@@ -72,7 +70,7 @@ class ShanaprojectBridge extends BridgeAbstract {
 
         if(preg_match("/url\(\/\/([^\)]+)\)/i", $anime->parent->style, $matches))
             return $matches[1];
-        
+
         $this->returnServerError('Could not extract background image!');
     }
 
@@ -97,7 +95,7 @@ class ShanaprojectBridge extends BridgeAbstract {
         $animes = $html->find('div.header_display_box_info');
         if(!$animes)
             $this->returnServerError('Could not find anime headers!');
-        
+
         foreach($animes as $anime){
             $item = array();
             $item['title'] = $this->ExtractAnimeTitle($anime);
diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php
index be064688..f821bcf9 100644
--- a/bridges/SiliconBridge.php
+++ b/bridges/SiliconBridge.php
@@ -1,14 +1,10 @@
 <?php
 class SiliconBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "ORelio";
-		$this->name = 'Silicon Bridge';
-		$this->uri = 'http://www.silicon.fr/';
-		$this->description = "Returns the newest articles.";
-
-	}
+	public $maintainer = "ORelio";
+	public $name = 'Silicon Bridge';
+	public $uri = 'http://www.silicon.fr/';
+	public $description = "Returns the newest articles.";
 
     public function collectData(){
 
diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php
index b064be1a..46f4529f 100644
--- a/bridges/SoundcloudBridge.php
+++ b/bridges/SoundcloudBridge.php
@@ -1,21 +1,17 @@
 <?php
 class SoundCloudBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "kranack";
+	public $name = "Soundcloud Bridge";
+	public $uri = "http://www.soundcloud.com/";
+	public $description = "Returns 10 newest music from user profile";
 
-		$this->maintainer = "kranack";
-		$this->name = "Soundcloud Bridge";
-		$this->uri = "http://www.soundcloud.com/";
-		$this->description = "Returns 10 newest music from user profile";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'username',
             'required'=>true
-          )
-        );
-
-	}
+        )
+    ));
 
   	const CLIENT_ID = '0aca19eae3843844e4053c6d8fdb7875';
 
diff --git a/bridges/StripeAPIChangeLogBridge.php b/bridges/StripeAPIChangeLogBridge.php
index 107a9d33..6d625973 100644
--- a/bridges/StripeAPIChangeLogBridge.php
+++ b/bridges/StripeAPIChangeLogBridge.php
@@ -1,18 +1,9 @@
 <?php
-/**
-* StripeAPIChangeLogBridge
-*
-* @name Stripe API Changelog Bridge
-* @description Returns the changes made to the stripe.com API
- */
 class StripeAPIChangeLogBridge extends BridgeAbstract{
-  public function loadMetadatas() {
-
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'Stripe API Changelog';
-    $this->uri = 'https://stripe.com/docs/upgrades';
-    $this->description = 'Returns the changes made to the stripe.com API';
-  }
+  public $maintainer = 'Pierre Mazière';
+  public $name = 'Stripe API Changelog';
+  public $uri = 'https://stripe.com/docs/upgrades';
+  public $description = 'Returns the changes made to the stripe.com API';
 
   public function collectData(){
     $html = $this->getSimpleHTMLDOM('https://stripe.com/docs/upgrades')
diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php
index a5146da9..3e38a2f3 100644
--- a/bridges/SuperbWallpapersBridge.php
+++ b/bridges/SuperbWallpapersBridge.php
@@ -4,27 +4,22 @@ class SuperbWallpapersBridge extends BridgeAbstract {
     private $category;
     private $resolution;
 
-	public function loadMetadatas() {
+	public $maintainer = "nel50n";
+	public $name = "Superb Wallpapers Bridge";
+	public $uri = "http://www.superbwallpapers.com/";
+	public $description = "Returns the latests wallpapers from SuperbWallpapers";
 
-		$this->maintainer = "nel50n";
-		$this->name = "Superb Wallpapers Bridge";
-		$this->uri = "http://www.superbwallpapers.com/";
-		$this->description = "Returns the latests wallpapers from SuperbWallpapers";
-
-        $this->parameters[] = array(
-          'c'=>array('name'=>'category'),
-          'm'=>array(
+    public $parameters = array( array(
+        'c'=>array('name'=>'category'),
+        'm'=>array(
             'name'=>'Max number of wallpapers',
             'type'=>'number'
-          ),
-          'r'=>array(
+        ),
+        'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…'
-          )
-        );
-
-	}
-
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php
index 6791bfaa..92fa8416 100644
--- a/bridges/T411Bridge.php
+++ b/bridges/T411Bridge.php
@@ -1,20 +1,17 @@
 <?php
 class T411Bridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'T411 Bridge';
+    public $uri = 'https://t411.ch/';
+    public $description = 'Returns the 10 newest torrents with specified search terms <br /> Use url part after "?" mark when using their search engine.';
 
-        $this->maintainer = 'ORelio';
-        $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->parameters[] = array(
-          'search'=>array(
+    public $parameters = array( array(
+        'search'=>array(
             'name'=>'Search criteria',
             'required'=>true
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php
index a9418dbb..c1c36501 100644
--- a/bridges/TagBoardBridge.php
+++ b/bridges/TagBoardBridge.php
@@ -1,21 +1,17 @@
 <?php
 class TagBoardBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "Pitchoule";
+	public $name = "TagBoard";
+	public $uri = "http://www.TagBoard.com";
+	public $description = "Returns most recent results from TagBoard.";
 
-		$this->maintainer = "Pitchoule";
-		$this->name = "TagBoard";
-		$this->uri = "http://www.TagBoard.com";
-		$this->description = "Returns most recent results from TagBoard.";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'keyword',
             'required'=>true
-          )
-        );
-
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php
index a7e0a72d..fdc4c096 100644
--- a/bridges/TbibBridge.php
+++ b/bridges/TbibBridge.php
@@ -1,21 +1,18 @@
 <?php
 class TbibBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Tbib";
+	public $uri = "http://tbib.org/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Tbib";
-		$this->uri = "http://tbib.org/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/TheCodingLoveBridge.php b/bridges/TheCodingLoveBridge.php
index aae75c0e..b42690f7 100644
--- a/bridges/TheCodingLoveBridge.php
+++ b/bridges/TheCodingLoveBridge.php
@@ -1,14 +1,10 @@
 <?php
 class TheCodingLoveBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "The Coding Love";
-		$this->uri = "http://thecodinglove.com/";
-		$this->description = "The Coding Love";
-
-	}
+	public $maintainer = "superbaillot.net";
+	public $name = "The Coding Love";
+	public $uri = "http://thecodinglove.com/";
+	public $description = "The Coding Love";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://thecodinglove.com/') or $this->returnServerError('Could not request The Coding Love.');
diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php
index 932efe1c..baf55946 100644
--- a/bridges/TheHackerNewsBridge.php
+++ b/bridges/TheHackerNewsBridge.php
@@ -1,14 +1,10 @@
 <?php
 class TheHackerNewsBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = 'ORelio';
-        $this->name = 'The Hacker News Bridge';
-        $this->uri = 'https://thehackernews.com/';
-        $this->description = 'Cyber Security, Hacking, Technology News.';
-
-    }
+    public $maintainer = 'ORelio';
+    public $name = 'The Hacker News Bridge';
+    public $uri = 'https://thehackernews.com/';
+    public $description = 'Cyber Security, Hacking, Technology News.';
 
     public function collectData(){
 
diff --git a/bridges/TheOatMealBridge.php b/bridges/TheOatMealBridge.php
index c6ab0cd0..f8f2584b 100644
--- a/bridges/TheOatMealBridge.php
+++ b/bridges/TheOatMealBridge.php
@@ -4,14 +4,10 @@ define("THE_OATMEAL_RSS", "http://feeds.feedburner.com/oatmealfeed");
 
 class TheOatmealBridge extends RssExpander{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Riduidel";
-		$this->name = "The Oatmeal";
-		$this->uri = "http://theoatmeal.com/";
-		$this->description = "Un petit site de dessins assez rigolos";
-
-	}
+	public $maintainer = "Riduidel";
+	public $name = "The Oatmeal";
+	public $uri = "http://theoatmeal.com/";
+	public $description = "Un petit site de dessins assez rigolos";
 
     public function collectData(){
         parent::collectExpandableDatas(THE_OATMEAL_RSS);
diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php
index 5b995e2b..1d70b14e 100644
--- a/bridges/ThePirateBayBridge.php
+++ b/bridges/ThePirateBayBridge.php
@@ -1,20 +1,17 @@
 <?php
 class ThePirateBayBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "The Pirate Bay";
+	public $uri = "https://thepiratebay.org/";
+	public $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->maintainer = "mitsukarenai";
-		$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->parameters[] = array(
-          'q'=>array(
+    public $parameters = array( array(
+        'q'=>array(
             'name'=>'keywords, separated by semicolons',
             'exampleValue'=>'first list;second list;…'
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php
index f7bc5416..5852ad98 100644
--- a/bridges/TwitchApiBridge.php
+++ b/bridges/TwitchApiBridge.php
@@ -3,14 +3,13 @@ define('TWITCH_LIMIT', 10); // The default limit
 
 class TwitchApiBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "logmanoriginal";
+	public $name = "Twitch API Bridge";
+	public $uri = "http://www.twitch.tv";
+	public $description = "Returns the newest broadcasts or highlights by channel name using the Twitch API (v3)";
 
-		$this->maintainer = "logmanoriginal";
-		$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->parameters['Show Channel Videos']=array(
+    public $parameters = array(
+        'Show Channel Videos'=>array(
             'channel'=>array(
                 'name'=>'Channel',
                 'required'=>true
@@ -23,8 +22,8 @@ class TwitchApiBridge extends BridgeAbstract{
                 'name'=>'Limit',
                 'type'=>'number'
             )
-        );
-	}
+        )
+    );
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
index 94048240..f107c35d 100644
--- a/bridges/TwitterBridge.php
+++ b/bridges/TwitterBridge.php
@@ -1,44 +1,38 @@
 <?php
 class TwitterBridge extends BridgeAbstract{
-
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Twitter Bridge";
-		$this->uri = "https://twitter.com/";
-		$this->description = "Returns tweets by keyword/hashtag or user name";
-
-        $this->parameters["global"] = array(
-          'nopic'=>array(
-            'name'=>'Hide profile pictures',
-            'type'=>'checkbox',
-            'title'=>'Activate to hide profile pictures in content'
-          )
-        );
-
-        $this->parameters["By keyword or hashtag"] = array(
-          'q'=>array(
-            'name'=>'Keyword or #hashtag',
-            'required'=>true,
-            'exampleValue'=>'rss-bridge, #rss-bridge',
-            'title'=>'Insert a keyword or hashtag'
-          )
-        );
-
-        $this->parameters["By username"] = array(
-          'u'=>array(
-            'name'=>'username',
-            'required'=>true,
-            'exampleValue'=>'sebsauvage',
-            'title'=>'Insert a user name'
-          ),
-          'norep'=>array(
-            'name'=>'Without replies',
-            'type'=>'checkbox',
-            'title'=>'Only return initial tweets'
-          )
-        );
-	}
+    public $name='Twitter Bridge';
+    public $uri='https://twitter.com';
+    public $description='returns tweets';
+    public $parameters=array(
+        'global'=>array(
+            'nopic'=>array(
+                'name'=>'Hide profile pictures',
+                'type'=>'checkbox',
+                'title'=>'Activate to hide profile pictures in content'
+            )
+        ),
+        'By keyword or hashtag' => array(
+            'q'=>array(
+                'name'=>'Keyword or #hashtag',
+                'required'=>true,
+                'exampleValue'=>'rss-bridge, #rss-bridge',
+                'title'=>'Insert a keyword or hashtag'
+            )
+        ),
+        'By username' => array(
+            'u'=>array(
+                'name'=>'username',
+                'required'=>true,
+                'exampleValue'=>'sebsauvage',
+                'title'=>'Insert a user name'
+            ),
+            'norep'=>array(
+                'name'=>'Without replies',
+                'type'=>'checkbox',
+                'title'=>'Only return initial tweets'
+            )
+        )
+    );
 
     public function getName(){
         switch($this->queriedContext){
diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php
index 3295458b..e984d528 100644
--- a/bridges/UnsplashBridge.php
+++ b/bridges/UnsplashBridge.php
@@ -1,14 +1,12 @@
 <?php
 class UnsplashBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
+	public $maintainer = "nel50n";
+	public $name = "Unsplash Bridge";
+	public $uri = "http://unsplash.com/";
+	public $description = "Returns the latests photos from Unsplash";
 
-		$this->maintainer = "nel50n";
-		$this->name = "Unsplash Bridge";
-		$this->uri = "http://unsplash.com/";
-		$this->description = "Returns the latests photos from Unsplash";
-
-        $this->parameters[] = array(
+    public $parameters = array( array(
           'm'=>array(
             'name'=>'Max number of photos',
             'type'=>'number'
@@ -21,8 +19,7 @@ class UnsplashBridge extends BridgeAbstract {
             'name'=>'JPEG quality',
             'type'=>'number'
           )
-        );
-	}
+      ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompany.php
index 0568d590..e7aecbb5 100644
--- a/bridges/ViadeoCompany.php
+++ b/bridges/ViadeoCompany.php
@@ -1,20 +1,17 @@
 <?php
 class ViadeoCompany extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "regisenguehard";
+	public $name = "Viadeo Company";
+	public $uri = "https://www.viadeo.com/";
+	public $description = "Returns most recent actus from Company on Viadeo. (http://www.viadeo.com/fr/company/<strong style=\"font-weight:bold;\">apple</strong>)";
 
-		$this->maintainer = "regisenguehard";
-		$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->parameters[] = array(
-          'c'=>array(
+    public $parameters = array( array(
+        'c'=>array(
             'name'=>'Company name',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/VineBridge.php b/bridges/VineBridge.php
index 5865262a..de27a0ad 100644
--- a/bridges/VineBridge.php
+++ b/bridges/VineBridge.php
@@ -1,20 +1,17 @@
 <?php
 class VineBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
+	public $maintainer = "ckiw";
+	public $name = "Vine bridge";
+	public $uri = "http://vine.co/";
+	public $description = "Returns the latests vines from vine user page";
 
-		$this->maintainer = "ckiw";
-		$this->name = "Vine bridge";
-		$this->uri = "http://vine.co/";
-		$this->description = "Returns the latests vines from vine user page";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'User id',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php
index b5ddb35f..acc88b6f 100644
--- a/bridges/VkBridge.php
+++ b/bridges/VkBridge.php
@@ -2,18 +2,18 @@
 
 class VkBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = "ahiles3005";
-        $this->name = "VK.com";
-        $this->uri = "http://www.vk.com/";
-        $this->description = "Working with open pages";
-        $this->parameters["Url on page group or user"] = array(
-          'u'=>array(
-            'name'=>'Url',
-            'required'=>true
-          )
-        );
-    }
+    public $maintainer = "ahiles3005";
+    public $name = "VK.com";
+    public $uri = "http://www.vk.com/";
+    public $description = "Working with open pages";
+    public $parameters=array(
+        'Url on page group or user' => array(
+            'u'=>array(
+                'name'=>'Url',
+                'required'=>true
+            )
+        )
+    );
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php
index d0bdad2c..55628058 100644
--- a/bridges/WallpaperStopBridge.php
+++ b/bridges/WallpaperStopBridge.php
@@ -5,26 +5,23 @@ class WallpaperStopBridge extends BridgeAbstract {
     private $subcategory;
     private $resolution;
 
-	public function loadMetadatas() {
+	public $maintainer = "nel50n";
+	public $name = "WallpaperStop Bridge";
+	public $uri = "http://www.wallpaperstop.com/";
+	public $description = "Returns the latests wallpapers from WallpaperStop";
 
-		$this->maintainer = "nel50n";
-		$this->name = "WallpaperStop Bridge";
-		$this->uri = "http://www.wallpaperstop.com/";
-		$this->description = "Returns the latests wallpapers from WallpaperStop";
-
-        $this->parameters[] = array(
-          'c'=>array('name'=>'Category'),
-          's'=>array('name'=>'subcategory'),
-          'm'=>array(
+    public $parameters = array( array(
+        'c'=>array('name'=>'Category'),
+        's'=>array('name'=>'subcategory'),
+        'm'=>array(
             'name'=>'Max number of wallpapers',
             'type'=>'number'
-          ),
-          'r'=>array(
+        ),
+        'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…',
-          )
-        );
-	}
+        )
+    ));
 
 
     public function collectData(){
diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php
index dc7c2b58..359a2aa9 100644
--- a/bridges/WeLiveSecurityBridge.php
+++ b/bridges/WeLiveSecurityBridge.php
@@ -1,12 +1,10 @@
 <?php
 class WeLiveSecurityBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = 'ORelio';
-        $this->name = 'We Live Security';
-        $this->uri = 'http://www.welivesecurity.com/';
-        $this->description = 'Returns the newest articles.';
-    }
+    public $maintainer = 'ORelio';
+    public $name = 'We Live Security';
+    public $uri = 'http://www.welivesecurity.com/';
+    public $description = 'Returns the newest articles.';
 
     public function collectData(){
 
diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php
index 882882cd..fa2f634c 100644
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@@ -1,21 +1,17 @@
 <?php
 class WhydBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
+	public $maintainer = "kranack";
+	public $name = "Whyd Bridge";
+	public $uri = "http://www.whyd.com/";
+	public $description = "Returns 10 newest music from user profile";
 
-		$this->maintainer = "kranack";
-		$this->name = "Whyd Bridge";
-		$this->uri = "http://www.whyd.com/";
-		$this->description = "Returns 10 newest music from user profile";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'username/id',
             'required'=>true
-          )
-        );
-
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index d12f6ed3..0fe53092 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -4,52 +4,50 @@ define('WIKIPEDIA_SUBJECT_TFA', 0); // Today's featured article
 define('WIKIPEDIA_SUBJECT_DYK', 1); // Did you know...
 
 class WikipediaBridge extends BridgeAbstract{
-	public function loadMetadatas(){
-		$this->maintainer = 'logmanoriginal';
-		$this->name = 'Wikipedia bridge for many languages';
-		$this->uri = 'https://www.wikipedia.org/';
-		$this->description = 'Returns articles for a language of your choice';
+	public $maintainer = 'logmanoriginal';
+	public $name = 'Wikipedia bridge for many languages';
+	public $uri = 'https://www.wikipedia.org/';
+	public $description = 'Returns articles for a language of your choice';
 
-        $this->parameters[] = array(
-          'language'=>array(
-            'name'=>'Language',
-            'type'=>'list',
-            'required'=>true,
-            'title'=>'Select your language',
-            'exampleValue'=>'English',
-            'values'=>array(
-              'English'=>'en',
-              'Dutch'=>'nl',
-              'Esperanto'=>'eo',
-              'French'=>'fr',
-              'German'=>'de',
-            )
-          ),
-          'subject'=>array(
-            'name'=>'Subject',
-            'type'=>'list',
-            'required'=>true,
-            'title'=>'What subject are you interested in?',
-            'exampleValue'=>'Today\'s featured article',
-            'values'=>array(
-              'Today\'s featured article'=>'tfa',
-              'Did you know…'=>'dyk'
-            )
-          ),
-          'fullarticle'=>array(
-            'name'=>'Load full article',
-            'type'=>'checkbox',
-            'title'=>'Activate to always load the full article'
-          )
-        );
-	}
+	public $parameters = array( array(
+		'language'=>array(
+			'name'=>'Language',
+			'type'=>'list',
+			'required'=>true,
+			'title'=>'Select your language',
+			'exampleValue'=>'English',
+			'values'=>array(
+				'English'=>'en',
+				'Dutch'=>'nl',
+				'Esperanto'=>'eo',
+				'French'=>'fr',
+				'German'=>'de',
+			)
+		),
+		'subject'=>array(
+			'name'=>'Subject',
+			'type'=>'list',
+			'required'=>true,
+			'title'=>'What subject are you interested in?',
+			'exampleValue'=>'Today\'s featured article',
+			'values'=>array(
+				'Today\'s featured article'=>'tfa',
+				'Did you know…'=>'dyk'
+			)
+		),
+		'fullarticle'=>array(
+			'name'=>'Load full article',
+			'type'=>'checkbox',
+			'title'=>'Activate to always load the full article'
+		)
+	));
 
-    public function getURI(){
+	public function getURI(){
 		$params=$this->parameters[$this->queriedContext];
 		return 'https://' . strtolower($params['language']['value']) . '.wikipedia.org';
     }
 
-    public function getName(){
+	public function getName(){
 		$params=$this->parameters[$this->queriedContext];
 		switch($params['subject']['value']){
 			case 'tfa':
diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index db2f4a70..cfc21738 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -5,20 +5,17 @@ class WordPressBridge extends BridgeAbstract {
 
 	public $sitename; // Name of the site
 
-	public function loadMetadatas() {
+	public $maintainer = "aledeg";
+	public $name = "Wordpress Bridge";
+	public $uri = "https://wordpress.org/";
+	public $description = "Returns the 3 newest full posts of a Wordpress blog";
 
-		$this->maintainer = "aledeg";
-		$this->name = "Wordpress Bridge";
-		$this->uri = "https://wordpress.org/";
-		$this->description = "Returns the 3 newest full posts of a Wordpress blog";
-
-        $this->parameters[] = array(
-          'url'=>array(
-            'name'=>'Blog URL',
-            'required'=>true
-          )
-        );
-	}
+	public $parameters = array( array(
+		'url'=>array(
+			'name'=>'Blog URL',
+			'required'=>true
+		)
+	));
 
 	// Replaces all 'link' tags with 'url' for simplehtmldom to actually find 'links' ('url')
 	private function ReplaceLinkTagsWithUrlTags($element){
diff --git a/bridges/WorldOfTanksBridge.php b/bridges/WorldOfTanksBridge.php
index 98f27bf0..e10ce94e 100644
--- a/bridges/WorldOfTanksBridge.php
+++ b/bridges/WorldOfTanksBridge.php
@@ -1,33 +1,30 @@
 <?php
 class WorldOfTanksBridge extends HttpCachingBridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "mitsukarenai";
+    public $name = "World of Tanks";
+    public $uri = "http://worldoftanks.eu/";
+    public $description = "News about the tank slaughter game.";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "World of Tanks";
-		$this->uri = "http://worldoftanks.eu/";
-		$this->description = "News about the tank slaughter game.";
-
-        $this->parameters[] = array(
-            'category'=>array(
-                // TODO: should be a list
-                'name'=>'nom de la catégorie'
-            ),
-          'lang'=>array(
+    public $parameters = array( array(
+        'category'=>array(
+            // TODO: should be a list
+            'name'=>'nom de la catégorie'
+        ),
+        'lang'=>array(
             'name'=>'Langue',
             'type'=>'list',
             'values'=>array(
-              'Français'=>'fr',
-              'English'=>'en',
-              'Español'=>'es',
-              'Deutsch'=>'de',
-              'Čeština'=>'cs',
-              'Polski'=>'pl',
-              'Türkçe'=>'tr'
+                'Français'=>'fr',
+                'English'=>'en',
+                'Español'=>'es',
+                'Deutsch'=>'de',
+                'Čeština'=>'cs',
+                'Polski'=>'pl',
+                'Türkçe'=>'tr'
             )
-          )
-        );
-	}
+        )
+    ));
 
     function getURI(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php
index 75fa65f4..6f774e21 100644
--- a/bridges/XbooruBridge.php
+++ b/bridges/XbooruBridge.php
@@ -1,21 +1,18 @@
 <?php
 class XbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "mitsukarenai";
+    public $name = "Xbooru";
+    public $uri = "http://xbooru.com/";
+    public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Xbooru";
-		$this->uri = "http://xbooru.com/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php
index 05391289..607a729b 100644
--- a/bridges/YandereBridge.php
+++ b/bridges/YandereBridge.php
@@ -1,21 +1,18 @@
 <?php
 class YandereBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Yande.re";
+	public $uri = "https://yande.re/";
+	public $description = "Returns images from given page and tags";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Yande.re";
-		$this->uri = "https://yande.re/";
-		$this->description = "Returns images from given page and tags";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index 87d58a38..8bf4e04c 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -8,48 +8,44 @@
 */
 class YoutubeBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
+	public $name = 'YouTube Bridge';
+	public $uri = 'https://www.youtube.com/';
+	public $description = 'Returns the 10 newest videos by username/channel/playlist or search';
+	public $maintainer = 'mitsukarenai';
 
-		$this->name = 'YouTube Bridge';
-		$this->uri = 'https://www.youtube.com/';
-		$this->description = 'Returns the 10 newest videos by username/channel/playlist or search';
-		$this->maintainer = 'mitsukarenai';
-
-        $this->parameters['By username'] = array(
-          'u'=>array(
-            'name'=>'username',
-            'exampleValue'=>'test',
-            'required'=>true
-          )
-        );
-
-        $this->parameters['By channel id'] = array(
-          'c'=>array(
-            'name'=>'channel id',
-            'exampleValue'=>"15",
-            'required'=>true
-          )
-        );
-
-        $this->parameters['By playlist Id'] = array(
-          'p'=>array(
-            'name'=>'playlist id',
-            'exampleValue'=>"15"
-          )
-        );
-
-        $this->parameters['Search result'] = array(
-          's'=>array(
-            'name'=>'search keyword',
-            'exampleValue'=>'test'
-          ),
-          'pa'=>array(
-            'name'=>'page',
-            'type'=>'number',
-            'exampleValue'=>1
-          )
-        );
-	}
+    public $parameters = array(
+        'By username' => array(
+            'u'=>array(
+                'name'=>'username',
+                'exampleValue'=>'test',
+                'required'=>true
+            )
+        ),
+        'By channel id' => array(
+            'c'=>array(
+                'name'=>'channel id',
+                'exampleValue'=>"15",
+                'required'=>true
+            )
+        ),
+        'By playlist Id' => array(
+            'p'=>array(
+                'name'=>'playlist id',
+                'exampleValue'=>"15"
+            )
+        ),
+        'Search result' => array(
+            's'=>array(
+                'name'=>'search keyword',
+                'exampleValue'=>'test'
+            ),
+            'pa'=>array(
+                'name'=>'page',
+                'type'=>'number',
+                'exampleValue'=>1
+            )
+        )
+    );
 
 	private function ytBridgeQueryVideoInfo($vid, &$author, &$desc, &$time) {
 		$html = $this->getSimpleHTMLDOM($this->uri."watch?v=$vid");
diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 989c047f..ce268510 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -1,166 +1,163 @@
 <?php
 class ZDNetBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'ZDNet Bridge';
+    public $uri = 'http://www.zdnet.com/';
+    public $description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
 
-        $this->maintainer = 'ORelio';
-        $this->name = 'ZDNet Bridge';
-        $this->uri = 'http://www.zdnet.com/';
-        $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
-
-        // http://www.zdnet.com/zdnet.opml
-        $this->parameters[] = array(
-          'feed'=>array(
+    //http://www.zdnet.com/zdnet.opml
+    public $parameters = array( array(
+        'feed'=>array(
             'name'=>'Feed',
             'type'=>'list',
             'values'=>array(
-              'Subscribe to ZDNet RSS Feeds'=>array(
-                'All Blogs'=>'blog',
-                'Just News'=>'news',
-                'All Reviews'=>'topic/reviews',
-                'Latest Downloads'=>'downloads!recent',
-                'Latest Articles'=>'/',
-                'Latest Australia Articles'=>'au',
-                'Latest UK Articles'=>'uk',
-                'Latest US Articles'=>'us',
-                'Latest Asia Articles'=>'as'
-              ),
-              'Keep up with ZDNet Blogs RSS:'=>array(
-                'Transforming the Datacenter'=>'blog/transforming-datacenter',
-                'SMB India'=>'blog/smb-india',
-                'Indonesia BizTech'=>'blog/indonesia-biztech',
-                'Hong Kong Techie'=>'blog/hong-kong-techie',
-                'Tech Taiwan'=>'blog/tech-taiwan',
-                'Startup India'=>'blog/startup-india',
-                'Starting Up Asia'=>'blog/starting-up-asia',
-                'Next-Gen Partner'=>'blog/partner',
-                'Post-PC Developments'=>'blog/post-pc',
-                'Benelux'=>'blog/benelux',
-                'Heat Sink'=>'blog/heat-sink',
-                'Italy\'s got tech'=>'blog/italy',
-                'African Enterprise'=>'blog/african-enterprise',
-                'New Tech for Old India'=>'blog/new-india',
-                'Estonia Uncovered'=>'blog/estonia',
-                'IT Iberia'=>'blog/iberia',
-                'Brazil Tech'=>'blog/brazil',
-                '500 words into the future'=>'blog/500-words-into-the-future',
-                'ÜberTech'=>'blog/ubertech',
-                'All About Microsoft'=>'blog/microsoft',
-                'Back office'=>'blog/back-office',
-                'Barker Bites Back'=>'blog/barker-bites-back',
-                'Between the Lines'=>'blog/btl',
-                'Big on Data'=>'blog/big-data',
-                'bootstrappr'=>'blog/bootstrappr',
-                'By The Way'=>'blog/by-the-way',
-                'Central European Processing'=>'blog/central-europe',
-                'Cloud Builders'=>'blog/cloud-builders',
-                'Communication Breakdown'=>'blog/communication-breakdown',
-                'Collaboration 2.0'=>'blog/collaboration',
-                'Constellation Research'=>'blog/constellation',
-                'Consumerization: BYOD'=>'blog/consumerization',
-                'DIY-IT'=>'blog/diy-it',
-                'Enterprise Web 2.0'=>'blog/hinchcliffe',
-                'Five Nines: The Next Gen Datacenter'=>'blog/datacenter',
-                'Forrester Research'=>'blog/forrester',
-                'Full Duplex'=>'blog/full-duplex',
-                'Gen Why?'=>'blog/gen-why',
-                'Hardware 2.0'=>'blog/hardware',
-                'Identity Matters'=>'blog/identity',
-                'iGeneration'=>'blog/igeneration',
-                'Internet of Everything'=>'blog/cisco',
-                'Beyond IT Failure'=>'blog/projectfailures',
-                'Jamie\'s Mostly Linux Stuff'=>'blog/jamies-mostly-linux-stuff',
-                'Jack\'s Blog'=>'blog/jacks-blog',
-                'Laptops & Desktops'=>'blog/computers',
-                'Linux and Open Source'=>'blog/open-source',
-                'London Calling'=>'blog/london',
-                'Mapping Babel'=>'blog/mapping-babel',
-                'Mixed Signals'=>'blog/mixed-signals',
-                'Mobile India'=>'blog/mobile-india',
-                'Mobile News'=>'blog/mobile-news',
-                'Networking'=>'blog/networking',
-                'Norse Code'=>'blog/norse-code',
-                'Null Pointer'=>'blog/null-pointer',
-                'The Full Tilt'=>'blog/the-full-tilt',
-                'Pinoy Post'=>'blog/pinoy-post',
-                'Practically Tech'=>'blog/practically-tech',
-                'Product Central'=>'blog/product-central',
-                'Pulp Tech'=>'blog/violetblue',
-                'Qubits and Pieces'=>'blog/qubits-and-pieces',
-                'Securify This!'=>'blog/securify-this',
-                'Service Oriented'=>'blog/service-oriented',
-                'Small Talk'=>'blog/small-talk',
-                'Small Business Matters'=>'blog/small-business-matters',
-                'Smartphones and Cell Phones'=>'blog/cell-phones',
-                'Social Business'=>'blog/feeds',
-                'Social CRM: The Conversation'=>'blog/crm',
-                'Software & Services Safari'=>'blog/sommer',
-                'Storage Bits'=>'blog/storage',
-                'Stacking up Open Clouds'=>'blog/apac-redhat',
-                'Techie Isles'=>'blog/techie-isles',
-                'Technolatte'=>'blog/technolatte',
-                'Tech Podium'=>'blog/tech-podium',
-                'Tel Aviv Tech'=>'blog/tel-aviv',
-                'Tech Broiler'=>'blog/perlow',
-                'The SANMAN'=>'blog/the-sanman',
-                'The open source revolution'=>'blog/the-open-source-revolution',
-                'The German View'=>'blog/german',
-                'The Ed Bott Report'=>'blog/bott',
-                'The Mobile Gadgeteer'=>'blog/mobile-gadgeteer',
-                'The Apple Core'=>'blog/apple',
-                'Tom Foremski: IMHO'=>'blog/foremski',
-                'Twisted Wire'=>'blog/twisted-wire',
-                'Vive la tech'=>'blog/france',
-                'Virtually Speaking'=>'blog/virtualization',
-                'View from China'=>'blog/china',
-                'Web design & Free Software'=>'blog/web-design-and-free-software',
-                'ZDNet Government'=>'blog/government',
-                'ZDNet UK Book Reviews'=>'blog/zdnet-uk-book-reviews',
-                'ZDNet UK First Take'=>'blog/zdnet-uk-first-take',
-                'Zero Day'=>'blog/security'
-              ),
-              'ZDNet Hot Topics RSS:'=>array(
-                'Apple'=>'topic/apple',
-                'Collaboration'=>'topic/collaboration',
-                'Enterprise Software'=>'topic/enterprise-software',
-                'Google'=>'topic/google',
-                'Great debate'=>'topic/great-debate',
-                'Hardware'=>'topic/hardware',
-                'IBM'=>'topic/ibm',
-                'iOS'=>'topic/ios',
-                'iPhone'=>'topic/iphone',
-                'iPad'=>'topic/ipad',
-                'IT Priorities'=>'topic/it-priorities',
-                'Laptops'=>'topic/laptops',
-                'Legal'=>'topic/legal',
-                'Linux'=>'topic/linux',
-                'Microsoft'=>'topic/microsoft',
-                'Mobile OS'=>'topic/mobile-os',
-                'Mobility'=>'topic/mobility',
-                'Networking'=>'topic/networking',
-                'Oracle'=>'topic/oracle',
-                'Processors'=>'topic/processors',
-                'Samsung'=>'topic/samsung',
-                'Security'=>'topic/security',
-                'Small business: going big on mobility'=>'topic/small-business-going-big-on-mobility'
-              ),
-              'Product Blogs:'=>array(
-                'Digital Cameras & Camcorders'=>'blog/digitalcameras',
-                'Home Theater'=>'blog/home-theater',
-                'Laptops and Desktops'=>'blog/computers',
-                'The Mobile Gadgeteer'=>'blog/mobile-gadgeteer',
-                'Smartphones and Cell Phones'=>'blog/cell-phones',
-                'The ToyBox'=>'blog/gadgetreviews'
-              ),
-              'Vertical Blogs:'=>array(
-                'ZDNet Education'=>'blog/education',
-                'ZDNet Healthcare'=>'blog/healthcare',
-                'ZDNet Government'=>'blog/government'
-              )
+                'Subscribe to ZDNet RSS Feeds'=>array(
+                    'All Blogs'=>'blog',
+                    'Just News'=>'news',
+                    'All Reviews'=>'topic/reviews',
+                    'Latest Downloads'=>'downloads!recent',
+                    'Latest Articles'=>'/',
+                    'Latest Australia Articles'=>'au',
+                    'Latest UK Articles'=>'uk',
+                    'Latest US Articles'=>'us',
+                    'Latest Asia Articles'=>'as'
+                ),
+                'Keep up with ZDNet Blogs RSS:'=>array(
+                    'Transforming the Datacenter'=>'blog/transforming-datacenter',
+                    'SMB India'=>'blog/smb-india',
+                    'Indonesia BizTech'=>'blog/indonesia-biztech',
+                    'Hong Kong Techie'=>'blog/hong-kong-techie',
+                    'Tech Taiwan'=>'blog/tech-taiwan',
+                    'Startup India'=>'blog/startup-india',
+                    'Starting Up Asia'=>'blog/starting-up-asia',
+                    'Next-Gen Partner'=>'blog/partner',
+                    'Post-PC Developments'=>'blog/post-pc',
+                    'Benelux'=>'blog/benelux',
+                    'Heat Sink'=>'blog/heat-sink',
+                    'Italy\'s got tech'=>'blog/italy',
+                    'African Enterprise'=>'blog/african-enterprise',
+                    'New Tech for Old India'=>'blog/new-india',
+                    'Estonia Uncovered'=>'blog/estonia',
+                    'IT Iberia'=>'blog/iberia',
+                    'Brazil Tech'=>'blog/brazil',
+                    '500 words into the future'=>'blog/500-words-into-the-future',
+                    'ÜberTech'=>'blog/ubertech',
+                    'All About Microsoft'=>'blog/microsoft',
+                    'Back office'=>'blog/back-office',
+                    'Barker Bites Back'=>'blog/barker-bites-back',
+                    'Between the Lines'=>'blog/btl',
+                    'Big on Data'=>'blog/big-data',
+                    'bootstrappr'=>'blog/bootstrappr',
+                    'By The Way'=>'blog/by-the-way',
+                    'Central European Processing'=>'blog/central-europe',
+                    'Cloud Builders'=>'blog/cloud-builders',
+                    'Communication Breakdown'=>'blog/communication-breakdown',
+                    'Collaboration 2.0'=>'blog/collaboration',
+                    'Constellation Research'=>'blog/constellation',
+                    'Consumerization: BYOD'=>'blog/consumerization',
+                    'DIY-IT'=>'blog/diy-it',
+                    'Enterprise Web 2.0'=>'blog/hinchcliffe',
+                    'Five Nines: The Next Gen Datacenter'=>'blog/datacenter',
+                    'Forrester Research'=>'blog/forrester',
+                    'Full Duplex'=>'blog/full-duplex',
+                    'Gen Why?'=>'blog/gen-why',
+                    'Hardware 2.0'=>'blog/hardware',
+                    'Identity Matters'=>'blog/identity',
+                    'iGeneration'=>'blog/igeneration',
+                    'Internet of Everything'=>'blog/cisco',
+                    'Beyond IT Failure'=>'blog/projectfailures',
+                    'Jamie\'s Mostly Linux Stuff'=>'blog/jamies-mostly-linux-stuff',
+                    'Jack\'s Blog'=>'blog/jacks-blog',
+                    'Laptops & Desktops'=>'blog/computers',
+                    'Linux and Open Source'=>'blog/open-source',
+                    'London Calling'=>'blog/london',
+                    'Mapping Babel'=>'blog/mapping-babel',
+                    'Mixed Signals'=>'blog/mixed-signals',
+                    'Mobile India'=>'blog/mobile-india',
+                    'Mobile News'=>'blog/mobile-news',
+                    'Networking'=>'blog/networking',
+                    'Norse Code'=>'blog/norse-code',
+                    'Null Pointer'=>'blog/null-pointer',
+                    'The Full Tilt'=>'blog/the-full-tilt',
+                    'Pinoy Post'=>'blog/pinoy-post',
+                    'Practically Tech'=>'blog/practically-tech',
+                    'Product Central'=>'blog/product-central',
+                    'Pulp Tech'=>'blog/violetblue',
+                    'Qubits and Pieces'=>'blog/qubits-and-pieces',
+                    'Securify This!'=>'blog/securify-this',
+                    'Service Oriented'=>'blog/service-oriented',
+                    'Small Talk'=>'blog/small-talk',
+                    'Small Business Matters'=>'blog/small-business-matters',
+                    'Smartphones and Cell Phones'=>'blog/cell-phones',
+                    'Social Business'=>'blog/feeds',
+                    'Social CRM: The Conversation'=>'blog/crm',
+                    'Software & Services Safari'=>'blog/sommer',
+                    'Storage Bits'=>'blog/storage',
+                    'Stacking up Open Clouds'=>'blog/apac-redhat',
+                    'Techie Isles'=>'blog/techie-isles',
+                    'Technolatte'=>'blog/technolatte',
+                    'Tech Podium'=>'blog/tech-podium',
+                    'Tel Aviv Tech'=>'blog/tel-aviv',
+                    'Tech Broiler'=>'blog/perlow',
+                    'The SANMAN'=>'blog/the-sanman',
+                    'The open source revolution'=>'blog/the-open-source-revolution',
+                    'The German View'=>'blog/german',
+                    'The Ed Bott Report'=>'blog/bott',
+                    'The Mobile Gadgeteer'=>'blog/mobile-gadgeteer',
+                    'The Apple Core'=>'blog/apple',
+                    'Tom Foremski: IMHO'=>'blog/foremski',
+                    'Twisted Wire'=>'blog/twisted-wire',
+                    'Vive la tech'=>'blog/france',
+                    'Virtually Speaking'=>'blog/virtualization',
+                    'View from China'=>'blog/china',
+                    'Web design & Free Software'=>'blog/web-design-and-free-software',
+                    'ZDNet Government'=>'blog/government',
+                    'ZDNet UK Book Reviews'=>'blog/zdnet-uk-book-reviews',
+                    'ZDNet UK First Take'=>'blog/zdnet-uk-first-take',
+                    'Zero Day'=>'blog/security'
+                ),
+                'ZDNet Hot Topics RSS:'=>array(
+                    'Apple'=>'topic/apple',
+                    'Collaboration'=>'topic/collaboration',
+                    'Enterprise Software'=>'topic/enterprise-software',
+                    'Google'=>'topic/google',
+                    'Great debate'=>'topic/great-debate',
+                    'Hardware'=>'topic/hardware',
+                    'IBM'=>'topic/ibm',
+                    'iOS'=>'topic/ios',
+                    'iPhone'=>'topic/iphone',
+                    'iPad'=>'topic/ipad',
+                    'IT Priorities'=>'topic/it-priorities',
+                    'Laptops'=>'topic/laptops',
+                    'Legal'=>'topic/legal',
+                    'Linux'=>'topic/linux',
+                    'Microsoft'=>'topic/microsoft',
+                    'Mobile OS'=>'topic/mobile-os',
+                    'Mobility'=>'topic/mobility',
+                    'Networking'=>'topic/networking',
+                    'Oracle'=>'topic/oracle',
+                    'Processors'=>'topic/processors',
+                    'Samsung'=>'topic/samsung',
+                    'Security'=>'topic/security',
+                    'Small business: going big on mobility'=>'topic/small-business-going-big-on-mobility'
+                ),
+                'Product Blogs:'=>array(
+                    'Digital Cameras & Camcorders'=>'blog/digitalcameras',
+                    'Home Theater'=>'blog/home-theater',
+                    'Laptops and Desktops'=>'blog/computers',
+                    'The Mobile Gadgeteer'=>'blog/mobile-gadgeteer',
+                    'Smartphones and Cell Phones'=>'blog/cell-phones',
+                    'The ToyBox'=>'blog/gadgetreviews'
+                ),
+                'Vertical Blogs:'=>array(
+                    'ZDNet Education'=>'blog/education',
+                    'ZDNet Healthcare'=>'blog/healthcare',
+                    'ZDNet Government'=>'blog/government'
+                )
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/bridges/ZatazBridge.php b/bridges/ZatazBridge.php
index ce80054f..e1a87f58 100644
--- a/bridges/ZatazBridge.php
+++ b/bridges/ZatazBridge.php
@@ -1,14 +1,10 @@
 <?php
 class ZatazBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "aledeg";
-		$this->name = 'Zataz Magazine';
-		$this->uri = 'http://www.zataz.com';
-		$this->description = "ZATAZ Magazine - S'informer, c'est déjà se sécuriser";
-
-	}
+	public $maintainer = "aledeg";
+	public $name = 'Zataz Magazine';
+	public $uri = 'http://www.zataz.com';
+	public $description = "ZATAZ Magazine - S'informer, c'est déjà se sécuriser";
 
 	public function collectData(){
 		$html = $this->getSimpleHTMLDOM($this->uri) or $this->returnServerError('Could not request ' . $this->uri);
diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php
index 7ff7d3ee..4bbd464d 100644
--- a/bridges/ZoneTelechargementBridge.php
+++ b/bridges/ZoneTelechargementBridge.php
@@ -1,17 +1,14 @@
 <?php
 class ZoneTelechargementBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'Zone Telechargement Bridge';
+    public $uri = 'https://www.zone-telechargement.com/';
+    public $description = 'RSS proxy returning the newest releases.<br />You may specify a category found in RSS URLs, else main feed is selected.';
 
-        $this->maintainer = 'ORelio';
-        $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->parameters[] = array(
-          'category'=>array('name'=>'Category')
-        );
-    }
+    public $parameters = array( array(
+        'category'=>array('name'=>'Category')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];
diff --git a/index.php b/index.php
index 2e84ab31..610c19a8 100644
--- a/index.php
+++ b/index.php
@@ -126,7 +126,7 @@ try{
                     if(defined('PROXY_URL') && PROXY_BYBRIDGE && $noproxy){
                       $bridge->useProxy=false;
                     }
-					$bridge->loadMetadatas();
+
                     $params=$_GET;
                     unset($params['action']);
                     unset($params['bridge']);
diff --git a/lib/Bridge.php b/lib/Bridge.php
index ff08d629..b7445319 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -105,7 +105,6 @@ EOD;
 interface BridgeInterface {
     public function collectData();
     public function getCacheDuration();
-    public function loadMetadatas();
     public function getName();
     public function getURI();
 }
@@ -182,7 +181,7 @@ abstract class BridgeAbstract implements BridgeInterface {
                         }
                         break;
                     default:
-                    case'text':
+                    case 'text':
                         if(isset($set[$name]['pattern'])){
                             $data[$name]=filter_var($value,FILTER_VALIDATE_REGEXP,
                                 array('options'=>array(
@@ -401,7 +400,7 @@ abstract class BridgeAbstract implements BridgeInterface {
 
 /**
  * Extension of BridgeAbstract allowing caching of files downloaded over http.
- * TODO allow file cache invalidation by touching files on access, and removing 
+ * TODO allow file cache invalidation by touching files on access, and removing
  * files/directories which have not been touched since ... a long time
  */
 abstract class HttpCachingBridgeAbstract extends BridgeAbstract {
@@ -461,8 +460,8 @@ abstract class HttpCachingBridgeAbstract extends BridgeAbstract {
 
     private function buildCacheFilePath($url, $cacheDir){
         $simplified_url = str_replace(
-            ['http://', 'https://', '?', '&', '='], 
-            ['', '', '/', '/', '/'], 
+            ['http://', 'https://', '?', '&', '='],
+            ['', '', '/', '/', '/'],
             $url);
 
         if(substr($cacheDir, -1) !== '/'){
diff --git a/lib/HTMLUtils.php b/lib/HTMLUtils.php
index 9384753d..cbfa0afa 100644
--- a/lib/HTMLUtils.php
+++ b/lib/HTMLUtils.php
@@ -7,8 +7,6 @@ class HTMLUtils {
 		if($bridgeElement == false)
 			return "";
 
-		$bridgeElement->loadMetadatas();
-
 		$name = '<a href="' . $bridgeElement->uri . '">' . $bridgeElement->name . '</a>';
 		$description = $bridgeElement->description;
 

From 701aff420d947fb76d816f154931c48d272a03ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sat, 27 Aug 2016 23:52:59 +0200
Subject: [PATCH 21/62] [core] code simplification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index b7445319..2c23cdf3 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -256,55 +256,72 @@ abstract class BridgeAbstract implements BridgeInterface {
 
         if($time !== false && (time() - $this->getCacheDuration() < $time)){
             $this->items = $this->cache->loadData();
-        } else {
-            if($this->validateData($param)){
-                foreach($param as $name=>$value){
-                    foreach($this->parameters as $context=>$set){
-                        if(isset($this->parameters[$context][$name]))
-                            $this->parameters[$context][$name]['value']=$value;
-                    }
-                }
-                if(!empty($this->parameters)){
-                    $queriedContext=$this->getQueriedContext();
-                    if(is_null($queriedContext)){
-                        $this->returnClientError('Required parameter(s) missing');
-                    }else if($queriedContext===false){
-                        $this->returnClientError('Mixed context parameters');
-                    }else{
-                        $this->queriedContext=$queriedContext;
-                        $contexts=array($this->queriedContext);
-                        if(isset($this->parameters['global'])){
-                            $contexts[]='global';
-                        }
-                        foreach($contexts as $context){
-                            foreach($this->parameters[$context] as $p=>$props){
-                                if(isset($props['type']) &&
-                                    $props['type']==='checkbox' &&
-                                    !isset($props['value'])){
-                                    if(!isset($props['defaultValue'])){
-                                        $this->parameters[$context][$p]['value']=false;
-                                    }else{
-                                        $this->parameters[$context][$p]['value']=$props['defaultValue'];
-                                    }
-                                }
-                            }
-                        }
-                        foreach($param as $name=>$value){
-                            if(isset($this->parameters['global'][$name])){
-                                $this->parameters[$queriedContext][$name]['value']=$value;
-                            }
-                        }
-                    }
-                }
-            }else{
-                $this->returnClientError('Invalid parameters value(s)');
-            }
-            $this->collectData();
+            return;
+        }
 
-            if(!is_null($this->cache)){
-                $this->cache->saveData($this->getDatas());
+        if(empty($this->parameters) && !empty($param)){
+            $this->returnClientError('Invalid parameters value(s)');
+        };
+
+        if(!$this->validateData($param)){
+            $this->returnClientError('Invalid parameters value(s)');
+        }
+
+        // Populate BridgeAbstract::parameters with sanitized data
+        foreach($param as $name=>$value){
+            foreach($this->parameters as $context=>$set){
+                if(isset($this->parameters[$context][$name]))
+                    $this->parameters[$context][$name]['value']=$value;
             }
         }
+
+        // Guess the paramter context from input data
+        $queriedContext=$this->getQueriedContext();
+        if(is_null($queriedContext)){
+            $this->returnClientError('Required parameter(s) missing');
+        }else if($queriedContext===false){
+            $this->returnClientError('Mixed context parameters');
+        }
+
+        $this->queriedContext=$queriedContext;
+
+        // Apply default values to missing data
+        $contexts=array($this->queriedContext);
+        if(isset($this->parameters['global'])){
+            $contexts[]='global';
+        }
+        foreach($contexts as $context){
+            foreach($this->parameters[$context] as $p=>$properties){
+                if(!isset($properties['type'])){
+                    $this->parameters[$context][$p]['type']='text';
+                }
+                if(isset($properties['value'])){
+                    continue;
+                }
+                switch($properties['type']){
+                case 'checkbox':
+                    if(!isset($properties['defaultValue'])){
+                        $this->parameters[$context][$p]['value']=false;
+                    }else{
+                        $this->parameters[$context][$p]['value']=$properties['defaultValue'];
+                    }
+                    break;
+                }
+            }
+        }
+
+        // Copy global parameter values to the guessed context
+        foreach($param as $name=>$value){
+            if(isset($this->parameters['global'][$name])){
+                $this->parameters[$queriedContext][$name]['value']=$value;
+            }
+        }
+
+        $this->collectData();
+
+        if(!is_null($this->cache)){
+            $this->cache->saveData($this->getDatas());
+        }
     }
 
     public function getName(){

From ea1d53a24a269584ee345ee5dd3aaa58032cc2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 00:00:35 +0200
Subject: [PATCH 22/62] [core] fix global parameter values propagatino
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index 2c23cdf3..111d9713 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -311,10 +311,15 @@ abstract class BridgeAbstract implements BridgeInterface {
         }
 
         // Copy global parameter values to the guessed context
-        foreach($param as $name=>$value){
-            if(isset($this->parameters['global'][$name])){
-                $this->parameters[$queriedContext][$name]['value']=$value;
+        foreach($this->parameters['global'] as $name=>$properties){
+            if(isset($param[$name])){
+                $value=$param[$name];
+            }else if(isset($properties['value'])){
+                $value=$properties['value'];
+            }else{
+                continue;
             }
+            $this->parameters[$queriedContext][$name]['value']=$value;
         }
 
         $this->collectData();

From 85625318b1982361152484eeedd793d95c217acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 00:01:00 +0200
Subject: [PATCH 23/62] [core] variable renaming
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index 111d9713..c34e5c81 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -291,9 +291,9 @@ abstract class BridgeAbstract implements BridgeInterface {
             $contexts[]='global';
         }
         foreach($contexts as $context){
-            foreach($this->parameters[$context] as $p=>$properties){
+            foreach($this->parameters[$context] as $name=>$properties){
                 if(!isset($properties['type'])){
-                    $this->parameters[$context][$p]['type']='text';
+                    $this->parameters[$context][$name]['type']='text';
                 }
                 if(isset($properties['value'])){
                     continue;
@@ -301,9 +301,9 @@ abstract class BridgeAbstract implements BridgeInterface {
                 switch($properties['type']){
                 case 'checkbox':
                     if(!isset($properties['defaultValue'])){
-                        $this->parameters[$context][$p]['value']=false;
+                        $this->parameters[$context][$name]['value']=false;
                     }else{
-                        $this->parameters[$context][$p]['value']=$properties['defaultValue'];
+                        $this->parameters[$context][$name]['value']=$properties['defaultValue'];
                     }
                     break;
                 }

From ea46d532dc766e5643d8fcf74d1942c5f454eb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 00:01:42 +0200
Subject: [PATCH 24/62] [TwitterBridge] fix getURI() and simplify code
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/TwitterBridge.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
index f107c35d..a3378e06 100644
--- a/bridges/TwitterBridge.php
+++ b/bridges/TwitterBridge.php
@@ -1,7 +1,7 @@
 <?php
 class TwitterBridge extends BridgeAbstract{
     public $name='Twitter Bridge';
-    public $uri='https://twitter.com';
+    public $uri='https://twitter.com/';
     public $description='returns tweets';
     public $parameters=array(
         'global'=>array(
@@ -53,29 +53,28 @@ class TwitterBridge extends BridgeAbstract{
         $params=$this->parameters[$this->queriedContext];
         switch($this->queriedContext){
         case 'By keyword or hashtag':
-            return $this->uri.'search?q='.urlencode($params['q']['value']);
+            return $this->uri.'search?q='.urlencode($params['q']['value']).'&f=tweets';
         case 'By username':
             return $this->uri.urlencode($params['u']['value']).
-                (isset($params['norep']['value'])?'':'/with_replies');
+                ($params['norep']['value']?'':'/with_replies');
         }
     }
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];
 		$html = '';
-		if (isset($param['q']['value'])) {   /* keyword search mode */
-			$html = $this->getSimpleHTMLDOM('https://twitter.com/search?q='.urlencode($param['q']['value']).'&f=tweets') or $this->returnServerError('No results for this query.');
-		}
-		elseif (isset($param['u']['value'])) {   /* user timeline mode */
-			$html = $this->getSimpleHTMLDOM('https://twitter.com/'.urlencode($param['u']['value']).(isset($param['norep']['value'])?'':'/with_replies')) or $this->returnServerError('Requested username can\'t be found.');
-		}
-		else {
-			$this->returnClientError('You must specify a keyword (?q=...) or a Twitter username (?u=...).');
+
+		$html = $this->getSimpleHTMLDOM($this->getURI());
+		if(!$html){
+			switch($this->queriedContext){
+			case 'By keyword or hashtag':
+				$this->returnServerError('No results for this query.');
+			case 'By username':
+				$this->returnServerError('Requested username can\'t be found.');
+			}
 		}
 
-		$hidePictures = false;
-		if (isset($param['nopic']['value']))
-			$hidePictures = $param['nopic']['value'];
+		$hidePictures = $param['nopic']['value'];
 
 		foreach($html->find('div.js-stream-tweet') as $tweet) {
 			$item = array();

From d1715f6efc45c5c699c952458890a153fe03f8e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 00:06:13 +0200
Subject: [PATCH 25/62] [core] fix missing curly brackets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index c34e5c81..a13442bc 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -270,8 +270,9 @@ abstract class BridgeAbstract implements BridgeInterface {
         // Populate BridgeAbstract::parameters with sanitized data
         foreach($param as $name=>$value){
             foreach($this->parameters as $context=>$set){
-                if(isset($this->parameters[$context][$name]))
+                if(isset($this->parameters[$context][$name])){
                     $this->parameters[$context][$name]['value']=$value;
+                }
             }
         }
 

From 2047955f06dfcebb2effe39f24d60704fde4ef6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 00:17:20 +0200
Subject: [PATCH 26/62] [core] rename $param to $inputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index a13442bc..94d22089 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -246,9 +246,9 @@ abstract class BridgeAbstract implements BridgeInterface {
     * Note : you can define a cache with "setCache"
     * @param array array with expected bridge paramters
     */
-    public function setDatas(array $param){
+    public function setDatas(array $inputs){
         if(!is_null($this->cache)){
-            $this->cache->prepare($param);
+            $this->cache->prepare($inputs);
             $time = $this->cache->getTime();
         } else {
             $time = false;
@@ -259,16 +259,16 @@ abstract class BridgeAbstract implements BridgeInterface {
             return;
         }
 
-        if(empty($this->parameters) && !empty($param)){
+        if(empty($this->parameters) && !empty($inputs)){
             $this->returnClientError('Invalid parameters value(s)');
         };
 
-        if(!$this->validateData($param)){
+        if(!$this->validateData($inputs)){
             $this->returnClientError('Invalid parameters value(s)');
         }
 
         // Populate BridgeAbstract::parameters with sanitized data
-        foreach($param as $name=>$value){
+        foreach($inputs as $name=>$value){
             foreach($this->parameters as $context=>$set){
                 if(isset($this->parameters[$context][$name])){
                     $this->parameters[$context][$name]['value']=$value;
@@ -313,8 +313,8 @@ abstract class BridgeAbstract implements BridgeInterface {
 
         // Copy global parameter values to the guessed context
         foreach($this->parameters['global'] as $name=>$properties){
-            if(isset($param[$name])){
-                $value=$param[$name];
+            if(isset($inputs[$name])){
+                $value=$inputs[$name];
             }else if(isset($properties['value'])){
                 $value=$properties['value'];
             }else{

From a4fd7b8b9827703de5ab095c1a90dfd5efa33d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 00:32:16 +0200
Subject: [PATCH 27/62] [GooglePlusPostBridge] fix uninitialized $param
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/GooglePlusPostBridge.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bridges/GooglePlusPostBridge.php b/bridges/GooglePlusPostBridge.php
index 62414b5b..8e7b2286 100644
--- a/bridges/GooglePlusPostBridge.php
+++ b/bridges/GooglePlusPostBridge.php
@@ -20,6 +20,7 @@ class GooglePlusPostBridge extends BridgeAbstract
 
 	public function collectData()
 	{
+		$param=$this->parameters[$queriedContext];
 		if (!isset($param['username']['value']))
 		{
 			$this->returnClientError('You must specify a username (?username=...).');

From 1b3c8a8aeba5641f3bec9a6a720939df537bfa83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 01:25:33 +0200
Subject: [PATCH 28/62] [core + bridges] add BridgeAbstract::$inputs and
 BridgeAbstract::getInput()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Inputs are not stored in BridgeAbstract::$parameters anymore to separate
static data from dynamic data.
The getInput method allows for more readable code.

Also fix an "undefined index 'global'" notice

Probability of breaking bridges: high !

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/AllocineFRBridge.php         |  8 +------
 bridges/AnimeUltimeBridge.php        |  7 +++---
 bridges/Arte7Bridge.php              |  9 ++++----
 bridges/AskfmBridge.php              |  5 ++--
 bridges/BandcampBridge.php           |  8 +++----
 bridges/BooruprojectBridge.php       | 17 +++++++-------
 bridges/CNETBridge.php               |  6 ++---
 bridges/CastorusBridge.php           |  9 ++++----
 bridges/CpasbienBridge.php           |  5 ++--
 bridges/CryptomeBridge.php           |  5 ++--
 bridges/DailymotionBridge.php        | 18 +++++++--------
 bridges/DanbooruBridge.php           |  9 ++++----
 bridges/DauphineLibereBridge.php     |  5 ++--
 bridges/DollbooruBridge.php          |  9 ++++----
 bridges/DuckDuckGoBridge.php         |  3 +--
 bridges/EZTVBridge.php               |  5 ++--
 bridges/ElsevierBridge.php           |  5 ++--
 bridges/FacebookBridge.php           | 15 ++++++------
 bridges/FlickrTagBridge.php          |  9 ++++----
 bridges/FourchanBridge.php           |  5 ++--
 bridges/FuturaSciencesBridge.php     |  7 +++---
 bridges/GBAtempBridge.php            |  6 ++---
 bridges/GawkerBridge.php             |  7 +++---
 bridges/GelbooruBridge.php           |  9 ++++----
 bridges/GiphyBridge.php              | 11 ++++-----
 bridges/GithubIssueBridge.php        |  7 +++---
 bridges/GitlabCommitsBridge.php      | 13 +++++------
 bridges/GooglePlusPostBridge.php     |  4 ++--
 bridges/GoogleSearchBridge.php       |  6 ++---
 bridges/HDWallpapersBridge.php       |  7 +++---
 bridges/IdenticaBridge.php           |  8 +++----
 bridges/InstagramBridge.php          |  4 +---
 bridges/IsoHuntBridge.php            | 21 ++++++++---------
 bridges/JapanExpoBridge.php          |  3 +--
 bridges/KonachanBridge.php           |  9 ++++----
 bridges/KununuBridge.php             |  9 ++++----
 bridges/LeBonCoinBridge.php          |  7 +++---
 bridges/LinkedInCompany.php          |  3 +--
 bridges/LolibooruBridge.php          |  9 ++++----
 bridges/MangareaderBridge.php        | 15 ++++++------
 bridges/MilbooruBridge.php           |  9 ++++----
 bridges/MspabooruBridge.php          |  9 ++++----
 bridges/NextgovBridge.php            |  3 +--
 bridges/NovelUpdatesBridge.php       |  5 ++--
 bridges/OpenClassroomsBridge.php     |  5 ++--
 bridges/ParuVenduImmoBridge.php      | 30 ++++++++++++------------
 bridges/PickyWallpapersBridge.php    | 11 ++++-----
 bridges/PinterestBridge.php          | 15 ++++++------
 bridges/RTBFBridge.php               |  5 ++--
 bridges/Rule34Bridge.php             |  9 ++++----
 bridges/Rule34pahealBridge.php       |  9 ++++----
 bridges/SafebooruBridge.php          |  9 ++++----
 bridges/SakugabooruBridge.php        |  9 ++++----
 bridges/ScoopItBridge.php            |  5 ++--
 bridges/SensCritiqueBridge.php       | 13 +++++------
 bridges/SoundcloudBridge.php         | 10 ++++----
 bridges/SuperbWallpapersBridge.php   |  7 +++---
 bridges/T411Bridge.php               |  5 ++--
 bridges/TagBoardBridge.php           |  3 +--
 bridges/TbibBridge.php               |  9 ++++----
 bridges/ThePirateBayBridge.php       |  5 ++--
 bridges/TwitchApiBridge.php          | 16 ++++++-------
 bridges/TwitterBridge.php            | 13 ++++-------
 bridges/UnsplashBridge.php           |  7 +++---
 bridges/ViadeoCompany.php            |  3 +--
 bridges/VineBridge.php               |  3 +--
 bridges/VkBridge.php                 |  5 ++--
 bridges/WallpaperStopBridge.php      | 11 ++++-----
 bridges/WhydBridge.php               |  9 ++++----
 bridges/WikipediaBridge.php          | 19 +++++++---------
 bridges/WordPressBridge.php          |  4 +---
 bridges/WorldOfTanksBridge.php       |  9 ++++----
 bridges/XbooruBridge.php             |  9 ++++----
 bridges/YandereBridge.php            |  9 ++++----
 bridges/YoutubeBridge.php            | 17 +++++++-------
 bridges/ZDNetBridge.php              |  3 +--
 bridges/ZoneTelechargementBridge.php |  5 ++--
 lib/Bridge.php                       | 34 ++++++++++++++++++++--------
 78 files changed, 303 insertions(+), 385 deletions(-)

diff --git a/bridges/AllocineFRBridge.php b/bridges/AllocineFRBridge.php
index 4289b0c0..39119551 100644
--- a/bridges/AllocineFRBridge.php
+++ b/bridges/AllocineFRBridge.php
@@ -22,14 +22,8 @@ class AllocineFRBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $params=$this->parameters[$this->queriedContext];
-
-        // Check all parameters
-        if(!isset($params['category']['value']))
-            $this->returnClientError('You must specify a valid category (&category= )!');
-
         $category = '';
-        switch($params['category']['value']){
+        switch($this->getInput('category')){
             case 'faux-raccord':
                 $this->uri = 'http://www.allocine.fr/video/programme-12284/saison-24580/';
                 $category = 'Faux Raccord';
diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php
index 51e74e17..6b65247e 100644
--- a/bridges/AnimeUltimeBridge.php
+++ b/bridges/AnimeUltimeBridge.php
@@ -21,13 +21,12 @@ class AnimeUltimeBridge extends BridgeAbstract {
     private $filter = 'Releases';
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         //Add type filter if provided
         $typeFilter = '';
-        if (!empty($param['type']['value'])) {
-            if ($param['type']['value'] == 'A' || $param['type']['value'] == 'D' || $param['type']['value'] == 'T') {
-                $typeFilter = $param['type']['value'];
+        if (!empty($this->getInput('type'))) {
+            if ($this->getInput('type') == 'A' || $this->getInput('type') == 'D' || $this->getInput('type') == 'T') {
+                $typeFilter = $this->getInput('type');
                 if ($typeFilter == 'A') { $this->filter = 'Anime'; }
                 if ($typeFilter == 'D') { $this->filter = 'Drama'; }
                 if ($typeFilter == 'T') { $this->filter = 'Tokusatsu'; }
diff --git a/bridges/Arte7Bridge.php b/bridges/Arte7Bridge.php
index 2f24b810..9510dd18 100644
--- a/bridges/Arte7Bridge.php
+++ b/bridges/Arte7Bridge.php
@@ -60,13 +60,12 @@
     }
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
       $category='toutes-les-videos'; $lang='fr';
-      if (!empty($param['catfr']['value']))
-         $category=$param['catfr']['value'];
-      if (!empty($param['catde']['value']))
-         { $category=$param['catde']['value']; $lang='de'; }
+      if (!empty($this->getInput('catfr')))
+         $category=$this->getInput('catfr');
+      if (!empty($this->getInput('catde')))
+         { $category=$this->getInput('catde'); $lang='de'; }
       $input_json = $this->extractVideoset($category, $lang);
 
       foreach($input_json['videos'] as $element) {
diff --git a/bridges/AskfmBridge.php b/bridges/AskfmBridge.php
index 0a88d510..785dab26 100644
--- a/bridges/AskfmBridge.php
+++ b/bridges/AskfmBridge.php
@@ -15,10 +15,9 @@ class AskfmBridge extends BridgeAbstract{
     );
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (isset($param['u']['value'])) {
-            $this->request = $param['u']['value'];
+        if (isset($this->getInput('u'))) {
+            $this->request = $this->getInput('u');
             $html = $this->getSimpleHTMLDOM('http://ask.fm/'.urlencode($this->request).'/answers/more?page=0') or $this->returnServerError('Requested username can\'t be found.');
         }
         else {
diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php
index a5666e8c..5434cb59 100644
--- a/bridges/BandcampBridge.php
+++ b/bridges/BandcampBridge.php
@@ -13,10 +13,9 @@ class BandcampBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (isset($param['tag']['value'])) {
-            $html = $this->getSimpleHTMLDOM('http://bandcamp.com/tag/'.urlencode($param['tag']['value']).'?sort_field=date') or $this->returnServerError('No results for this query.');
+        if (isset($this->getInput('tag'))) {
+            $html = $this->getSimpleHTMLDOM('http://bandcamp.com/tag/'.urlencode($this->getInput('tag')).'?sort_field=date') or $this->returnServerError('No results for this query.');
         }
         else {
             $this->returnClientError('You must specify tag (/tag/...)');
@@ -38,9 +37,8 @@ class BandcampBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        $param=$this->parameters[$this->queriedContext];
 
-        return (!empty($param['tag']['value']) ? $param['tag']['value'] .' - ' : '') .'Bandcamp Tag';
+        return (!empty($this->getInput('tag')) ? $this->getInput('tag') .' - ' : '') .'Bandcamp Tag';
     }
 
     public function getCacheDuration(){
diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php
index 36845411..66e25545 100644
--- a/bridges/BooruprojectBridge.php
+++ b/bridges/BooruprojectBridge.php
@@ -17,29 +17,28 @@ class BooruprojectBridge extends BridgeAbstract{
         ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0; $tags = '';
-        if (!empty($param['p']['value'])) {
-		$page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (!empty($this->getInput('p'))) {
+		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
 		$page = $page - 1;
 		$page = $page * 20;
         }
-        if (!empty($param['t']['value'])) {
-            $tags = '&tags='.urlencode($param['t']['value']);
+        if (!empty($this->getInput('t'))) {
+            $tags = '&tags='.urlencode($this->getInput('t'));
         }
-	if (empty($param['i']['value'])) {
+	if (empty($this->getInput('i'))) {
 		$this->returnServerError('Please enter a ***.booru.org instance.');
 	}
-        $html = $this->getSimpleHTMLDOM("http://".$param['i']['value'].".booru.org/index.php?page=post&s=list&pid=".$page.$tags) or $this->returnServerError('Could not request Booruproject.');
+        $html = $this->getSimpleHTMLDOM("http://".$this->getInput('i').".booru.org/index.php?page=post&s=list&pid=".$page.$tags) or $this->returnServerError('Could not request Booruproject.');
 
 
 	foreach($html->find('div[class=content] span') as $element) {
 		$item = array();
-		$item['uri'] = 'http://'.$param['i']['value'].'.booru.org/'.$element->find('a', 0)->href;
+		$item['uri'] = 'http://'.$this->getInput('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['tags'] = $element->find('img', 0)->getAttribute('title');
-		$item['title'] = 'Booruproject '.$param['i']['value'].' | '.$item['postid'];
+		$item['title'] = 'Booruproject '.$this->getInput('i').' | '.$item['postid'];
 		$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 445c1196..b2963914 100644
--- a/bridges/CNETBridge.php
+++ b/bridges/CNETBridge.php
@@ -11,7 +11,6 @@ class CNETBridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         function ExtractFromDelimiters($string, $start, $end) {
             if (strpos($string, $start) !== false) {
@@ -38,7 +37,7 @@ class CNETBridge extends BridgeAbstract {
             return $article_html;
         }
 
-        $pageUrl = 'http://www.cnet.com/'.(empty($param['topic']['value']) ? '' : 'topics/'.$param['topic']['value'].'/');
+        $pageUrl = 'http://www.cnet.com/'.(empty($this->getInput('topic')) ? '' : 'topics/'.$this->getInput('topic').'/');
         $html = $this->getSimpleHTMLDOM($pageUrl) or $this->returnServerError('Could not request CNET: '.$pageUrl);
         $limit = 0;
 
@@ -70,8 +69,7 @@ class CNETBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        $param=$this->parameters[$this->queriedContext];
-        return 'CNET News Bridge'.(empty($param['topic']['value']) ? '' : ' - '.$this->param['topic']['value']);
+        return 'CNET News Bridge'.(empty($this->getInput('topic')) ? '' : ' - '.$this->param['topic']['value']);
     }
 
     public function getCacheDuration() {
diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
index c328293a..453f2b55 100644
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -74,12 +74,11 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	public function collectData(){
-        $params=$this->parameters[$this->queriedContext];
-		if(isset($params['zip']['value']))
-			$zip_filter = trim($params['zip']['value']);
+		if(isset($this->getInput('zip')))
+			$zip_filter = trim($this->getInput('zip'));
 
-		if(isset($params['city']['value']))
-			$city_filter = trim($params['city']['value']);
+		if(isset($this->getInput('city')))
+			$city_filter = trim($this->getInput('city'));
 
 		$html = $this->getSimpleHTMLDOM($this->uri);
 
diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php
index a8e1b5a7..587f84a1 100644
--- a/bridges/CpasbienBridge.php
+++ b/bridges/CpasbienBridge.php
@@ -15,10 +15,9 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (isset($param['q']['value'])) {   /* keyword search mode */
-            $request = str_replace(" ","-",trim($param['q']['value']));
+        if (isset($this->getInput('q'))) {   /* keyword search mode */
+            $request = str_replace(" ","-",trim($this->getInput('q')));
             $html = $this->getSimpleHTMLDOM($this->uri.'/recherche/'.urlencode($request).'.html') or $this->returnServerError('No results for this query.');
         } else {
             $this->returnClientError('You must specify a keyword (?q=...).');
diff --git a/bridges/CryptomeBridge.php b/bridges/CryptomeBridge.php
index b7e5fbbe..77ce4bd1 100644
--- a/bridges/CryptomeBridge.php
+++ b/bridges/CryptomeBridge.php
@@ -15,7 +15,6 @@ class CryptomeBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
         $num = 20;
         $link = 'http://cryptome.org/';
@@ -23,8 +22,8 @@ class CryptomeBridge extends BridgeAbstract{
         //$link = 'https://secure.netsolhost.com/cryptome.org/';
 
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request Cryptome.');
-        if (!empty($param['n']['value'])) {   /* number of documents */
-            $num = min(max(1, $param['n']['value']+0), $num);
+        if (!empty($this->getInput('n'))) {   /* number of documents */
+            $num = min(max(1, $this->getInput('n')+0), $num);
         }
 
 
diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php
index 50c89889..58dfe8f8 100644
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -68,16 +68,15 @@ class DailymotionBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        $param=$this->parameters[$this->queriedContext];
         switch($this->queriedContext){
         case 'By username':
-            $specific=$param['u']['value'];
+            $specific=$this->getInput('u');
             break;
         case 'By playlist id':
-            $specific=strtok($param['p']['value'], '_');
+            $specific=strtok($this->getInput('p'), '_');
             break;
         case 'From search results':
-            $specific=$param['s']['value'];
+            $specific=$this->getInput('s');
             break;
         }
 
@@ -85,21 +84,20 @@ class DailymotionBridge extends BridgeAbstract{
     }
 
     public function getURI(){
-        $param=$this->parameters[$this->queriedContext];
         switch($this->queriedContext){
         case 'By username':
             $uri='http://www.dailymotion.com/user/'
-                .urlencode($param['u']['value']).'/1';
+                .urlencode($this->getInput('u')).'/1';
             break;
         case 'By playlist id':
             $uri='http://www.dailymotion.com/playlist/'
-                .urlencode(strtok($param['p']['value'], '_'));
+                .urlencode(strtok($this->getInput('p'), '_'));
             break;
         case 'From search results':
             $uri='http://www.dailymotion.com/search/'
-                .urlencode($param['s']['value']);
-            if(isset($param['pa']['value'])){
-                $uri.='/'.$param['pa']['value'];
+                .urlencode($this->getInput('s'));
+            if(isset($this->getInput('pa'))){
+                $uri.='/'.$this->getInput('pa');
             }
             break;
         }
diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php
index 0e73967d..4a48004d 100644
--- a/bridges/DanbooruBridge.php
+++ b/bridges/DanbooruBridge.php
@@ -12,13 +12,12 @@ class DanbooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 1;$tags='';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://donmai.us/posts?&page=$page&tags=$tags") or $this->returnServerError('Could not request Danbooru.');
 	foreach($html->find('div[id=posts] article') as $element) {
diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index f55017f9..d4fa6b7d 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -38,7 +38,6 @@ class DauphineLibereBridge extends BridgeAbstract {
 	}
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
 		// Simulate Mozilla user-agent to fix error 403 (Forbidden)
 		$opts = array('http' =>
@@ -50,8 +49,8 @@ class DauphineLibereBridge extends BridgeAbstract {
 
 		$context = stream_context_create($opts);
 
-		if (isset($param['u']['value'])) { /* user timeline mode */
-			$this->request = $param['u']['value'];
+		if (isset($this->getInput('u'))) { /* user timeline mode */
+			$this->request = $this->getInput('u');
 			$html = $this->getSimpleHTMLDOM('http://www.ledauphine.com/'.$this->request.'/rss',false,$context) or $this->returnServerError('Could not request DauphineLibere.');
 		}
 		else {
diff --git a/bridges/DollbooruBridge.php b/bridges/DollbooruBridge.php
index 43faba47..8a4e93af 100644
--- a/bridges/DollbooruBridge.php
+++ b/bridges/DollbooruBridge.php
@@ -16,13 +16,12 @@ class DollbooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://dollbooru.org/post/list/$tags/$page") or $this->returnServerError('Could not request Dollbooru.');
 
diff --git a/bridges/DuckDuckGoBridge.php b/bridges/DuckDuckGoBridge.php
index 143ab9fe..1ca33bb9 100644
--- a/bridges/DuckDuckGoBridge.php
+++ b/bridges/DuckDuckGoBridge.php
@@ -13,9 +13,8 @@ class DuckDuckGoBridge extends BridgeAbstract{
         ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        $link = 'http://duckduckgo.com/html/?q='.$param['u']['value'].'+sort:date';
+        $link = 'http://duckduckgo.com/html/?q='.$this->getInput('u').'+sort:date';
 
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request DuckDuckGo.');
 
diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php
index 5e28413e..39eaab4b 100644
--- a/bridges/EZTVBridge.php
+++ b/bridges/EZTVBridge.php
@@ -15,7 +15,6 @@ class EZTVBridge extends BridgeAbstract{
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         // Make timestamp from relative released time in table
         function makeTimestamp($relativeReleaseTime){
@@ -31,11 +30,11 @@ class EZTVBridge extends BridgeAbstract{
         }
 
         // Check for ID provided
-        if (!isset($param['i']['value']))
+        if (!isset($this->getInput('i')))
 			$this->returnClientError('You must provide a list of ID (?i=showID1,showID2,...)');
 
         // Loop on show ids
-        $showList = explode(",",$param['i']['value']);
+        $showList = explode(",",$this->getInput('i'));
         foreach($showList as $showID){
 
             // Get show page
diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index 6a96a6ce..fa16c8e9 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -56,9 +56,8 @@ class ElsevierBridge extends BridgeAbstract{
 	}
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-		$uri = 'http://www.journals.elsevier.com/' . $param['j']['value'] . '/recent-articles/';
-		$html = $this->getSimpleHTMLDOM($uri) or $this->returnServerError('No results for Elsevier journal '.$param['j']['value']);
+		$uri = 'http://www.journals.elsevier.com/' . $this->getInput('j') . '/recent-articles/';
+		$html = $this->getSimpleHTMLDOM($uri) or $this->returnServerError('No results for Elsevier journal '.$this->getInput('j'));
 
 		foreach($html->find('.pod-listing') as $article){
 			$item = array();
diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php
index d3ef9bf2..0a2554a0 100644
--- a/bridges/FacebookBridge.php
+++ b/bridges/FacebookBridge.php
@@ -14,7 +14,6 @@ class FacebookBridge extends BridgeAbstract{
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
 		//Extract a string using start and end delimiters
 		function ExtractFromDelimiters($string, $start, $end) {
@@ -102,11 +101,11 @@ class FacebookBridge extends BridgeAbstract{
 
 		//Retrieve page contents
 		if (is_null($html)) {
-			if (isset($param['u']['value'])) {
-				if (!strpos($param['u']['value'], "/")) {
-					$html = $this->getSimpleHTMLDOM('https://www.facebook.com/'.urlencode($param['u']['value']).'?_fb_noscript=1') or $this->returnServerError('No results for this query.');
+			if (isset($this->getInput('u'))) {
+				if (!strpos($this->getInput('u'), "/")) {
+					$html = $this->getSimpleHTMLDOM('https://www.facebook.com/'.urlencode($this->getInput('u')).'?_fb_noscript=1') or $this->returnServerError('No results for this query.');
 				} else {
-					$html = $this->getSimpleHTMLDOM('https://www.facebook.com/pages/'.$param['u']['value'].'?_fb_noscript=1') or $this->returnServerError('No results for this query.');
+					$html = $this->getSimpleHTMLDOM('https://www.facebook.com/pages/'.$this->getInput('u').'?_fb_noscript=1') or $this->returnServerError('No results for this query.');
 				}
 			} else {
 				$this->returnClientError('You must specify a Facebook username.');
@@ -146,7 +145,7 @@ class FacebookBridge extends BridgeAbstract{
 		if(isset($element)) {
 
 			$author = str_replace(' | Facebook', '', $html->find('title#pageTitle', 0)->innertext);
-			$profilePic = 'https://graph.facebook.com/'.$param['u']['value'].'/picture?width=200&amp;height=200';
+			$profilePic = 'https://graph.facebook.com/'.$this->getInput('u').'/picture?width=200&amp;height=200';
 			$this->name = $author;
 
 			foreach($element->children() as $post) {
@@ -205,8 +204,8 @@ class FacebookBridge extends BridgeAbstract{
 	}
 
 	public function setDatas(array $param){
-		if (isset($param['captcha_response']['value']))
-			unset($param['captcha_response']['value']);
+		if (isset($this->getInput('captcha_response')))
+			unset($this->getInput('captcha_response'));
 		parent::setDatas($param);
 	}
 
diff --git a/bridges/FlickrTagBridge.php b/bridges/FlickrTagBridge.php
index 43e22d9f..869025ed 100644
--- a/bridges/FlickrTagBridge.php
+++ b/bridges/FlickrTagBridge.php
@@ -17,14 +17,13 @@ class FlickrTagBridge extends BridgeAbstract{
     );
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = $this->getSimpleHTMLDOM('http://www.flickr.com/search/?q=vendee&s=rec') or $this->returnServerError('Could not request Flickr.');
-        if (isset($param['q']['value'])) {   /* keyword search mode */
-            $this->request = $param['q']['value'];
+        if (isset($this->getInput('q'))) {   /* keyword search mode */
+            $this->request = $this->getInput('q');
             $html = $this->getSimpleHTMLDOM('http://www.flickr.com/search/?q='.urlencode($this->request).'&s=rec') or $this->returnServerError('No results for this query.');
         }
-        elseif (isset($param['u']['value'])) {   /* user timeline mode */
-            $this->request = $param['u']['value'];
+        elseif (isset($this->getInput('u'))) {   /* user timeline mode */
+            $this->request = $this->getInput('u');
             $html = $this->getSimpleHTMLDOM('http://www.flickr.com/photos/'.urlencode($this->request).'/') or $this->returnServerError('Requested username can\'t be found.');
         }
 
diff --git a/bridges/FourchanBridge.php b/bridges/FourchanBridge.php
index f5663647..ad92ac10 100644
--- a/bridges/FourchanBridge.php
+++ b/bridges/FourchanBridge.php
@@ -11,12 +11,11 @@ class FourchanBridge extends BridgeAbstract{
     ));
 
   public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
-	if (!isset($param['t']['value']))
+	if (!isset($this->getInput('t')))
 		$this->returnClientError('You must specify the thread URL (?t=...)');
 
-	$thread = parse_url($param['t']['value']) or $this->returnClientError('This URL seems malformed, please check it.');
+	$thread = parse_url($this->getInput('t')) or $this->returnClientError('This URL seems malformed, please check it.');
 	if($thread['host'] !== 'boards.4chan.org')
 		$this->returnClientError('4chan thread URL only.');
 
diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php
index d25d6acc..cc252b86 100644
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -79,7 +79,6 @@ class FuturaSciencesBridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         function StripCDATA($string) {
             $string = str_replace('<![CDATA[', '', $string);
@@ -136,10 +135,10 @@ class FuturaSciencesBridge extends BridgeAbstract {
             return '';
         }
 
-        $url = $this->getURI().'rss/'.$param['feed']['value'].'.xml';
-        if (empty($param['feed']['value']))
+        $url = $this->getURI().'rss/'.$this->getInput('feed').'.xml';
+        if (empty($this->getInput('feed')))
             $this->returnClientError('Please select a feed to display.'.$url);
-        if ($param['feed']['value'] !== preg_replace('/[^a-zA-Z-\/]+/', '', $param['feed']['value']) || substr_count($param['feed']['value'], '/') > 1 || strlen($param['feed']['value'] > 64))
+        if ($this->getInput('feed') !== preg_replace('/[^a-zA-Z-\/]+/', '', $this->getInput('feed')) || substr_count($this->getInput('feed'), '/') > 1 || strlen($this->getInput('feed') > 64))
             $this->returnClientError('Invalid "feed" parameter.'.$url);
 
         $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request Futura-Sciences: '.$url);
diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php
index ef554ada..eccd090a 100644
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -60,11 +60,10 @@ class GBAtempBridge extends BridgeAbstract {
     }
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         $html = $this->getSimpleHTMLDOM($this->uri) or $this->returnServerError('Could not request GBAtemp.');
 
-        switch($param['type']['value']){
+        switch($this->getInput('type')){
         case 'N':
             foreach ($html->find('li[class=news_item full]') as $newsItem) {
                 $url = $this->uri.$newsItem->find('a', 0)->href;
@@ -111,8 +110,7 @@ class GBAtempBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        $param=$this->parameters[$this->queriedContext];
-        $type=array_search($param['type']['value'],$param['type']['values']);
+        $type=array_search($this->getInput('type'),$param['type']['values']);
         return 'GBAtemp '.$type.' Bridge';
     }
 
diff --git a/bridges/GawkerBridge.php b/bridges/GawkerBridge.php
index 3d6bc2b4..7522fbbc 100644
--- a/bridges/GawkerBridge.php
+++ b/bridges/GawkerBridge.php
@@ -22,12 +22,11 @@ class GawkerBridge extends RssExpander{
     }
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-        if (empty($param['site']['value'])) {
+        if (empty($this->getInput('site'))) {
 			trigger_error("If no site is provided, nothing is gonna happen", E_USER_ERROR);
         } else {
-            $this->name = $param['site']['value'];
-			$url = $this->toURI(strtolower($param['site']['value']));
+            $this->name = $this->getInput('site');
+			$url = $this->toURI(strtolower($this->getInput('site')));
         }
         $this->debugMessage("loading feed from ".$this->getURI());
         parent::collectExpandableDatas($url);
diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php
index 486c9ebb..67ec92b3 100644
--- a/bridges/GelbooruBridge.php
+++ b/bridges/GelbooruBridge.php
@@ -15,15 +15,14 @@ class GelbooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;
-        if (isset($param['p']['value'])) {
-		$page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
 		$page = $page - 1;
 		$page = $page * 63;
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://gelbooru.com/index.php?page=post&s=list&tags=$tags&pid=$page") or $this->returnServerError('Could not request Gelbooru.');
 
diff --git a/bridges/GiphyBridge.php b/bridges/GiphyBridge.php
index cf2af65e..6705a0d1 100644
--- a/bridges/GiphyBridge.php
+++ b/bridges/GiphyBridge.php
@@ -17,23 +17,22 @@ class GiphyBridge extends BridgeAbstract{
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 		$html = '';
         $base_url = 'http://giphy.com';
-		if (isset($param['s']['value'])) {   /* keyword search mode */
-			$html = $this->getSimpleHTMLDOM($base_url.'/search/'.urlencode($param['s']['value'].'/')) or $this->returnServerError('No results for this query.');
+		if (isset($this->getInput('s'))) {   /* keyword search mode */
+			$html = $this->getSimpleHTMLDOM($base_url.'/search/'.urlencode($this->getInput('s').'/')) or $this->returnServerError('No results for this query.');
 		}
 		else {
 			$this->returnClientError('You must specify a search worf (?s=...).');
 		}
 
         $max = GIPHY_LIMIT;
-        if (isset($param['n']['value'])) {
-            $max = (integer) $param['n']['value'];
+        if (isset($this->getInput('n'))) {
+            $max = (integer) $this->getInput('n');
         }
 
         $limit = 0;
-        $kw = urlencode($param['s']['value']);
+        $kw = urlencode($this->getInput('s'));
         foreach($html->find('div.hoverable-gif') as $entry) {
             if($limit < $max) {
                 $node = $entry->first_child();
diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php
index 83c98bea..8b520e9b 100644
--- a/bridges/GithubIssueBridge.php
+++ b/bridges/GithubIssueBridge.php
@@ -29,12 +29,11 @@ class GithubIssueBridge extends BridgeAbstract{
   );
 
   public function collectData(){
-    $param=$this->parameters[$this->queriedContext];
-    $uri = 'https://github.com/'.$param['u']['value'].'/'.$param['p']['value'].'/issues/'.(isset($param['i']['value'])?$param['i']['value']:'');
+    $uri = 'https://github.com/'.$this->getInput('u').'/'.$this->getInput('p').'/issues/'.(isset($this->getInput('i'))?$this->getInput('i'):'');
     $html = $this->getSimpleHTMLDOM($uri)
-      or $this->returnServerError('No results for Github Issue '.$param['i']['value'].' in project '.$param['u']['value'].'/'.$param['p']['value']);
+      or $this->returnServerError('No results for Github Issue '.$this->getInput('i').' in project '.$this->getInput('u').'/'.$this->getInput('p'));
 
-    if(isset($param['i']['value'])){
+    if(isset($this->getInput('i'))){
       foreach($html->find('.js-comment-container') as $comment){
 
         $item = array();
diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php
index c8558fec..dd7af0c4 100644
--- a/bridges/GitlabCommitsBridge.php
+++ b/bridges/GitlabCommitsBridge.php
@@ -26,29 +26,28 @@ class GitlabCommitsBridge extends BridgeAbstract{
     ));
 
   public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-    $uri = $param['uri']['value'].'/'.$param['u']['value'].'/'.$param['p']['value'].'/commits/';
-    if(isset($param['b']['value'])){
-      $uri.=$param['b']['value'];
+    $uri = $this->getInput('uri').'/'.$this->getInput('u').'/'.$this->getInput('p').'/commits/';
+    if(isset($this->getInput('b'))){
+      $uri.=$this->getInput('b');
     }else{
       $uri.='master';
     }
 
     $html = $this->getSimpleHTMLDOM($uri)
-      or $this->returnServerError('No results for Gitlab Commits of project '.$param['uri']['value'].'/'.$param['u']['value'].'/'.$param['p']['value']);
+      or $this->returnServerError('No results for Gitlab Commits of project '.$this->getInput('uri').'/'.$this->getInput('u').'/'.$this->getInput('p'));
 
 
     foreach($html->find('li.commit') as $commit){
 
       $item = array();
-      $item['uri']=$param['uri']['value'];
+      $item['uri']=$this->getInput('uri');
 
       foreach($commit->getElementsByTagName('a') as $a){
         $classes=explode(' ',$a->getAttribute("class"));
         if(in_array('commit-short-id',$classes) ||
           in_array('commit_short_id',$classes)){
           $href=$a->getAttribute('href');
-          $item['uri'].=substr($href,strpos($href,'/'.$param['u']['value'].'/'.$param['p']['value']));
+          $item['uri'].=substr($href,strpos($href,'/'.$this->getInput('u').'/'.$this->getInput('p')));
         }
         if(in_array('commit-row-message',$classes)){
           $item['title']=$a->plaintext;
diff --git a/bridges/GooglePlusPostBridge.php b/bridges/GooglePlusPostBridge.php
index 8e7b2286..ad780edc 100644
--- a/bridges/GooglePlusPostBridge.php
+++ b/bridges/GooglePlusPostBridge.php
@@ -21,12 +21,12 @@ class GooglePlusPostBridge extends BridgeAbstract
 	public function collectData()
 	{
 		$param=$this->parameters[$queriedContext];
-		if (!isset($param['username']['value']))
+		if (!isset($this->getInput('username')))
 		{
 			$this->returnClientError('You must specify a username (?username=...).');
 		}
 
-		$this->request = $param['username']['value'];
+		$this->request = $this->getInput('username');
 		// get content parsed
 //		$html = $this->getSimpleHTMLDOM(__DIR__ . '/../posts2.html'
 		$html = $this->getSimpleHTMLDOM(self::GOOGLE_PLUS_BASE_URL . urlencode($this->request) . '/posts'
diff --git a/bridges/GoogleSearchBridge.php b/bridges/GoogleSearchBridge.php
index 9d1cf5c9..2c2ecac8 100644
--- a/bridges/GoogleSearchBridge.php
+++ b/bridges/GoogleSearchBridge.php
@@ -24,10 +24,9 @@ class GoogleSearchBridge extends BridgeAbstract{
 
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
 
-            $html = $this->getSimpleHTMLDOM('https://www.google.com/search?q=' . urlencode($param['q']['value']) . '&num=100&complete=0&tbs=qdr:y,sbd:1') or $this->returnServerError('No results for this query.');
+            $html = $this->getSimpleHTMLDOM('https://www.google.com/search?q=' . urlencode($this->getInput('q')) . '&num=100&complete=0&tbs=qdr:y,sbd:1') or $this->returnServerError('No results for this query.');
 
         $emIsRes = $html->find('div[id=ires]',0);
         if( !is_null($emIsRes) ){
@@ -47,8 +46,7 @@ class GoogleSearchBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        $param=$this->parameters[$this->queriedContext];
-        return $param['q']['value'] .' - Google search';
+        return $this->getInput('q') .' - Google search';
     }
 
     public function getCacheDuration(){
diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php
index 2008e40d..8133c6e8 100644
--- a/bridges/HDWallpapersBridge.php
+++ b/bridges/HDWallpapersBridge.php
@@ -20,12 +20,11 @@ class HDWallpapersBridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
         $baseUri = 'http://www.hdwallpapers.in';
 
-        $this->category   = $param['c']['value'] ?: 'latest_wallpapers'; // Latest default
-        $this->resolution = $param['r']['value'] ?: '1920x1200';         // Wide wallpaper default
+        $this->category   = $this->getInput('c') ?: 'latest_wallpapers'; // Latest default
+        $this->resolution = $this->getInput('r') ?: '1920x1200';         // Wide wallpaper default
 
         $category = $this->category;
         if (strrpos($category, 'wallpapers') !== strlen($category)-strlen('wallpapers')) {
@@ -33,7 +32,7 @@ class HDWallpapersBridge extends BridgeAbstract {
         }
 
         $num = 0;
-        $max = $param['m']['value'] ?: 14;
+        $max = $this->getInput('m') ?: 14;
         $lastpage = 1;
 
         for ($page = 1; $page <= $lastpage; $page++) {
diff --git a/bridges/IdenticaBridge.php b/bridges/IdenticaBridge.php
index 91685231..d0896313 100644
--- a/bridges/IdenticaBridge.php
+++ b/bridges/IdenticaBridge.php
@@ -23,19 +23,17 @@ class IdenticaBridge extends BridgeAbstract{
             $item['uri'] = html_entity_decode($dent->find('a', 0)->href);	// get dent link
             $item['timestamp'] = strtotime($dent->find('abbr.easydate', 0)->plaintext);	// extract dent timestamp
             $item['content'] = trim($dent->find('div.activity-content', 0)->innertext);	// extract dent text
-            $item['title'] = $param['u']['value'] . ' | ' . $item['content'];
+            $item['title'] = $this->getInput('u') . ' | ' . $item['content'];
             $this->items[] = $item;
         }
     }
 
     public function getName(){
-        $param=$this->parameters[$this->queriedContext];
-        return $param['u']['value'] .' - Identica Bridge';
+        return $this->getInput('u') .' - Identica Bridge';
     }
 
     public function getURI(){
-        $param=$this->parameters[$this->queriedContext];
-        return $this->uri.urlencode($param['u']['value']);
+        return $this->uri.urlencode($this->getInput('u'));
     }
 
     public function getCacheDuration(){
diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index 1c7905cc..4551e279 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -61,13 +61,11 @@ class InstagramBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        $param=$this->parameters[$this->queriedContext];
         return $this->param['u']['value'] .' - Instagram Bridge';
     }
 
     public function getURI(){
-        $param=$this->parameters[$this->queriedContext];
-        return $this->uri.urlencode($param['u']['value']);
+        return $this->uri.urlencode($this->getInput('u'));
     }
 }
 
diff --git a/bridges/IsoHuntBridge.php b/bridges/IsoHuntBridge.php
index 5f9cad7b..8defbd86 100644
--- a/bridges/IsoHuntBridge.php
+++ b/bridges/IsoHuntBridge.php
@@ -90,23 +90,22 @@ class IsoHuntBridge extends BridgeAbstract{
     );
 
     public function collectData(){
-        $params=$this->parameters[$this->queriedContext];
         $request_path = '/'; // We'll request the main page by default
 
-        if(isset($params['latest_category']['value'])){ // Requesting one of the latest categories
-            $this->request_latest_category($params['latest_category']['value']);
-        } elseif(isset($params['torrent_category']['value'])){ // Requesting one of the torrent categories
+        if(isset($this->getInput('latest_category'))){ // Requesting one of the latest categories
+            $this->request_latest_category($this->getInput('latest_category'));
+        } elseif(isset($this->getInput('torrent_category'))){ // Requesting one of the torrent categories
             $order_popularity = false;
 
-            if(isset($params['torrent_popularity']['value']))
-                $order_popularity = $params['torrent_popularity']['value'];
+            if(isset($this->getInput('torrent_popularity')))
+                $order_popularity = $this->getInput('torrent_popularity');
 
-            $this->request_torrent_category($params['torrent_category']['value'], $order_popularity);
-        } else if(isset($params['search_name']['value'])){ // Requesting search
-            if(isset($params['search_category']['value']))
-                $this->request_search($params['search_name']['value'], $params['search_category']['value']);
+            $this->request_torrent_category($this->getInput('torrent_category'), $order_popularity);
+        } else if(isset($this->getInput('search_name'))){ // Requesting search
+            if(isset($this->getInput('search_category')))
+                $this->request_search($this->getInput('search_name'), $this->getInput('search_category'));
             else
-                $this->request_search($params['search_name']['value']);
+                $this->request_search($this->getInput('search_name'));
         } else {
             $this->returnClientError('Unknown request!');
         }
diff --git a/bridges/JapanExpoBridge.php b/bridges/JapanExpoBridge.php
index 828593e2..e9536677 100644
--- a/bridges/JapanExpoBridge.php
+++ b/bridges/JapanExpoBridge.php
@@ -17,7 +17,6 @@ class JapanExpoBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         function french_pubdate_to_timestamp($date_to_parse) {
             return strtotime(
@@ -49,7 +48,7 @@ class JapanExpoBridge extends BridgeAbstract{
 
         $link = 'http://www.japan-expo-paris.com/fr/actualites';
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request JapanExpo: '.$link);
-        $fullcontent = (!empty($param['mode']['value']) && $param['mode']['value'] == 'full');
+        $fullcontent = (!empty($this->getInput('mode')) && $this->getInput('mode') == 'full');
         $count = 0;
 
         foreach ($html->find('a._tile2') as $element) {
diff --git a/bridges/KonachanBridge.php b/bridges/KonachanBridge.php
index bda5a961..dcdb9d90 100644
--- a/bridges/KonachanBridge.php
+++ b/bridges/KonachanBridge.php
@@ -15,13 +15,12 @@ class KonachanBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 1;$tags='';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://konachan.com/post?page=$page&tags=$tags") or $this->returnServerError('Could not request Konachan.');
 	$input_json = explode('Post.register(', $html);
diff --git a/bridges/KununuBridge.php b/bridges/KununuBridge.php
index 0fa63c9d..fc49025c 100644
--- a/bridges/KununuBridge.php
+++ b/bridges/KununuBridge.php
@@ -40,21 +40,20 @@ class KununuBridge extends BridgeAbstract{
   );
 
 	public function collectData(){
-        $params=$this->parameters[$this->queriedContext];
 
 		// Get Site
-		$site = strtolower(trim($params['site']['value']));
+		$site = strtolower(trim($this->getInput('site')));
 		if(!isset($site) || empty($site) || !$this->site_is_valid($site))
 			$this->returnClientError('You must specify a valid site (&site=...)!');
 
 		// Get Company (fixing whitespace and umlauts)
-		$company = $this->encode_umlauts(strtolower(str_replace(' ', '-', trim($params['company']['value']))));
+		$company = $this->encode_umlauts(strtolower(str_replace(' ', '-', trim($this->getInput('company')))));
 		if(!isset($company) || empty($company))
 			$this->returnClientError('You must specify a company (&company=...)!');
 
 		$full = false; // By default we'll load only short article
-		if(isset($params['full']['value']))
-			$full = strtolower(trim($params['full']['value']));
+		if(isset($this->getInput('full')))
+			$full = strtolower(trim($this->getInput('full')));
 
 		// Get reviews section name (depends on site)
 		$section = '';
diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php
index 974419ca..3779952e 100755
--- a/bridges/LeBonCoinBridge.php
+++ b/bridges/LeBonCoinBridge.php
@@ -135,14 +135,13 @@ class LeBonCoinBridge extends BridgeAbstract{
   );
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
 		$html = '';
-		if (empty($param['c']['value'])) {
-			$link = 'http://www.leboncoin.fr/annonces/offres/' . $param['r']['value'] . '/?f=a&th=1&q=' . urlencode($param['k']['value']);
+		if (empty($this->getInput('c'))) {
+			$link = 'http://www.leboncoin.fr/annonces/offres/' . $this->getInput('r') . '/?f=a&th=1&q=' . urlencode($this->getInput('k'));
 		}
 		else {
-			$link = 'http://www.leboncoin.fr/' . $param['c']['value'] . '/offres/' . $param['r']['value'] . '/?f=a&th=1&q=' . urlencode($param['k']['value']);
+			$link = 'http://www.leboncoin.fr/' . $this->getInput('c') . '/offres/' . $this->getInput('r') . '/?f=a&th=1&q=' . urlencode($this->getInput('k'));
 		}
 		$html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request LeBonCoin.');
 
diff --git a/bridges/LinkedInCompany.php b/bridges/LinkedInCompany.php
index 9f0560d6..ccdf16c8 100644
--- a/bridges/LinkedInCompany.php
+++ b/bridges/LinkedInCompany.php
@@ -14,9 +14,8 @@ class LinkedInCompany extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        $link = 'https://www.linkedin.com/company/'.$param['c']['value'];
+        $link = 'https://www.linkedin.com/company/'.$this->getInput('c');
 
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request LinkedIn.');
 
diff --git a/bridges/LolibooruBridge.php b/bridges/LolibooruBridge.php
index 5bfec8c3..76288600 100644
--- a/bridges/LolibooruBridge.php
+++ b/bridges/LolibooruBridge.php
@@ -15,13 +15,12 @@ class LolibooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 1; $tags = '';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://lolibooru.moe/post?page=$page&tags=$tags") or $this->returnServerError('Could not request Lolibooru.');
 	$input_json = explode('Post.register(', $html);
diff --git a/bridges/MangareaderBridge.php b/bridges/MangareaderBridge.php
index 8d00f29a..7df542d7 100644
--- a/bridges/MangareaderBridge.php
+++ b/bridges/MangareaderBridge.php
@@ -76,7 +76,6 @@ class MangareaderBridge extends BridgeAbstract{
   );
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         $this->request = '';
 
@@ -84,21 +83,21 @@ class MangareaderBridge extends BridgeAbstract{
         $path = "latest";
         $limit = MANGAREADER_LIMIT;
 
-        if(isset($param['category']['value'])){ // Get popular updates
+        if(isset($this->getInput('category'))){ // Get popular updates
             $type = "popular";
             $path = "popular";
-            if($param['category']['value'] !== "all"){
-                $path .= "/" . $param['category']['value'];
+            if($this->getInput('category') !== "all"){
+                $path .= "/" . $this->getInput('category');
             }
         }
 
-        if(isset($param['path']['value'])){ // Get manga updates
+        if(isset($this->getInput('path'))){ // Get manga updates
             $type = "path";
-            $path = $param['path']['value'];
+            $path = $this->getInput('path');
         }
 
-        if(isset($param['limit']['value']) && $param['limit']['value'] !== ""){ // Get manga updates (optional parameter)
-            $limit = $param['limit']['value'];
+        if(isset($this->getInput('limit')) && $this->getInput('limit') !== ""){ // Get manga updates (optional parameter)
+            $limit = $this->getInput('limit');
         }
 
 		// We'll use the DOM parser for this as it makes navigation easier
diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php
index a0352025..46a84a66 100644
--- a/bridges/MilbooruBridge.php
+++ b/bridges/MilbooruBridge.php
@@ -16,13 +16,12 @@ class MilbooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://sheslostcontrol.net/moe/shimmie/index.php?q=/post/list/$tags/$page") or $this->returnServerError('Could not request Milbooru.');
 
diff --git a/bridges/MspabooruBridge.php b/bridges/MspabooruBridge.php
index 3deca865..5ade1855 100644
--- a/bridges/MspabooruBridge.php
+++ b/bridges/MspabooruBridge.php
@@ -16,15 +16,14 @@ class MspabooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-		$page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
 		$page = $page - 1;
 		$page = $page * 50;
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://mspabooru.com/index.php?page=post&s=list&tags=$tags&pid=$page") or $this->returnServerError('Could not request Mspabooru.');
 
diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
index 622fc65f..9c5f9e39 100644
--- a/bridges/NextgovBridge.php
+++ b/bridges/NextgovBridge.php
@@ -26,7 +26,6 @@ class NextgovBridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         function ExtractFromDelimiters($string, $start, $end) {
             if (strpos($string, $start) !== false) {
@@ -44,7 +43,7 @@ class NextgovBridge extends BridgeAbstract {
             } return $string;
         }
 
-        $category = $param['category']['value'];
+        $category = $this->getInput('category');
         if (empty($category))
             $category = 'all';
         if ($category !== preg_replace('/[^a-z-]+/', '', $category) || strlen($category > 32))
diff --git a/bridges/NovelUpdatesBridge.php b/bridges/NovelUpdatesBridge.php
index b389dac2..de69087d 100644
--- a/bridges/NovelUpdatesBridge.php
+++ b/bridges/NovelUpdatesBridge.php
@@ -13,10 +13,9 @@ class NovelUpdatesBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-        if (!isset($param['n']['value']))
+        if (!isset($this->getInput('n')))
             $this->returnClientError('You must specify the novel URL (/series/...)');
-        $thread = parse_url($param['n']['value']) or $this->returnClientError('This URL seems malformed, please check it.');
+        $thread = parse_url($this->getInput('n')) or $this->returnClientError('This URL seems malformed, please check it.');
         if($thread['host'] !== 'www.novelupdates.com')
             $this->returnClientError('NovelUpdates URL only.');
       	if(strpos($thread['path'], 'series/') === FALSE)
diff --git a/bridges/OpenClassroomsBridge.php b/bridges/OpenClassroomsBridge.php
index d878709f..9e560f9e 100644
--- a/bridges/OpenClassroomsBridge.php
+++ b/bridges/OpenClassroomsBridge.php
@@ -26,14 +26,13 @@ class OpenClassroomsBridge extends BridgeAbstract{
 
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-        if (empty($param['u']['value']))
+        if (empty($this->getInput('u')))
         {
             $this->returnServerError('Error: You must chose a category.');
         }
 
         $html = '';
-        $link = 'https://openclassrooms.com/courses?categories='.$param['u']['value'].'&title=&sort=updatedAt+desc';
+        $link = 'https://openclassrooms.com/courses?categories='.$this->getInput('u').'&title=&sort=updatedAt+desc';
 
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request OpenClassrooms.');
 
diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php
index cd620997..5a1cb5cb 100644
--- a/bridges/ParuVenduImmoBridge.php
+++ b/bridges/ParuVenduImmoBridge.php
@@ -25,27 +25,26 @@ class ParuVenduImmoBridge extends BridgeAbstract
 
     public function collectData()
     {
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
         $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->uri.'/immobilier/annonceimmofo/liste/listeAnnonces?tt=1'.$appartment.$maison;
 
-        if (isset($param['minarea']['value'])) {
-            $link .= '&sur0='.urlencode($param['minarea']['value']);
+        if (isset($this->getInput('minarea'))) {
+            $link .= '&sur0='.urlencode($this->getInput('minarea'));
         }
 
-        if (isset($param['maxprice']['value'])) {
-            $link .= '&px1='.urlencode($param['maxprice']['value']);
+        if (isset($this->getInput('maxprice'))) {
+            $link .= '&px1='.urlencode($this->getInput('maxprice'));
         }
 
-        if (isset($param['pa']['value'])) {
-            $link .= '&pa='.urlencode($param['pa']['value']);
+        if (isset($this->getInput('pa'))) {
+            $link .= '&pa='.urlencode($this->getInput('pa'));
         }
 
-        if (isset($param['lo']['value'])) {
-            $link .= '&lo='.urlencode($param['lo']['value']);
+        if (isset($this->getInput('lo'))) {
+            $link .= '&lo='.urlencode($this->getInput('lo'));
         }
 
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request paruvendu.');
@@ -81,16 +80,15 @@ class ParuVenduImmoBridge extends BridgeAbstract
     }
 
     public function getName(){
-        $param=$this->parameters[$this->queriedContext];
         $request='';
-        if(isset($param['minarea']['value']) &&
-            !empty($param['minarea']['value'])
+        if(isset($this->getInput('minarea')) &&
+            !empty($this->getInput('minarea'))
         ){
-            $request .= ' '.$param['minarea']['value'].' m2';
+            $request .= ' '.$this->getInput('minarea').' m2';
         }
-        if(isset($param['lo']['value']) &&
-            !empty($param['lo']['value'])){
-            $request .= ' In: '.$param['lo']['value'];
+        if(isset($this->getInput('lo')) &&
+            !empty($this->getInput('lo'))){
+            $request .= ' In: '.$this->getInput('lo');
         }
         return 'Paru Vendu Immobilier'.$request;
     }
diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php
index 380a8852..79cedf5c 100644
--- a/bridges/PickyWallpapersBridge.php
+++ b/bridges/PickyWallpapersBridge.php
@@ -26,19 +26,18 @@ class PickyWallpapersBridge extends BridgeAbstract {
 
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (!isset($param['c']['value'])) {
+        if (!isset($this->getInput('c'))) {
             $this->returnClientError('You must specify at least a category (?c=...).');
         } else {
             $baseUri = 'http://www.pickywallpapers.com';
 
-            $this->category = $param['c']['value'];
-            $this->subcategory = $param['s']['value'] ?: '';
-            $this->resolution = $param['r']['value'] ?: '1920x1200';    // Wide wallpaper default
+            $this->category = $this->getInput('c');
+            $this->subcategory = $this->getInput('s') ?: '';
+            $this->resolution = $this->getInput('r') ?: '1920x1200';    // Wide wallpaper default
 
             $num = 0;
-            $max = $param['m']['value'] ?: 12;
+            $max = $this->getInput('m') ?: 12;
             $lastpage = 1;
 
             for ($page = 1; $page <= $lastpage; $page++) {
diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php
index b3ddd8ee..91ff2b25 100644
--- a/bridges/PinterestBridge.php
+++ b/bridges/PinterestBridge.php
@@ -21,27 +21,26 @@ class PinterestBridge extends BridgeAbstract{
     );
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (isset($param['u']['value']) || isset($param['b']['value'])) {
+        if (isset($this->getInput('u')) || isset($this->getInput('b'))) {
 
-            if (empty($param['u']['value']))
+            if (empty($this->getInput('u')))
             {
                 $this->returnClientError('You must specify a Pinterest username (?u=...).');
             }
 
-            if (empty($param['b']['value']))
+            if (empty($this->getInput('b')))
             {
                 $this->returnClientError('You must specify a Pinterest board for this username (?b=...).');
             }
 
-            $this->username = $param['u']['value'];
-            $this->board = $param['b']['value'];
+            $this->username = $this->getInput('u');
+            $this->board = $this->getInput('b');
             $html = $this->getSimpleHTMLDOM($this->getURI().'/'.urlencode($this->username).'/'.urlencode($this->board)) or $this->returnServerError('Username and/or board not found');
 
-        } else if (isset($param['q']['value']))
+        } else if (isset($this->getInput('q')))
         {
-        	$this->query = $param['q']['value'];
+        	$this->query = $this->getInput('q');
         	$html = $this->getSimpleHTMLDOM($this->getURI().'/search/?q='.urlencode($this->query)) or $this->returnServerError('Could not request Pinterest.');
         }
 
diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php
index c669bc9f..2f02d4a8 100644
--- a/bridges/RTBFBridge.php
+++ b/bridges/RTBFBridge.php
@@ -14,13 +14,12 @@ class RTBFBridge extends BridgeAbstract {
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 		$html = '';
 		$limit = 10;
 		$count = 0;
 
-		if (isset($param['c']['value'])) {
-			$html = $this->getSimpleHTMLDOM('http://www.rtbf.be/auvio/emissions/detail?id='.$param['c']['value']) or $this->returnServerError('Could not request RTBF.');
+		if (isset($this->getInput('c'))) {
+			$html = $this->getSimpleHTMLDOM('http://www.rtbf.be/auvio/emissions/detail?id='.$this->getInput('c')) or $this->returnServerError('Could not request RTBF.');
 
 			foreach($html->find('section[id!=widget-ml-avoiraussi-] .rtbf-media-grid article') as $element) {
 				if($count < $limit) {
diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php
index 5a0ebf89..6f72c230 100644
--- a/bridges/Rule34Bridge.php
+++ b/bridges/Rule34Bridge.php
@@ -15,15 +15,14 @@ class Rule34Bridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-		$page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
 		$page = $page - 1;
 		$page = $page * 50;
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://rule34.xxx/index.php?page=post&s=list&tags=$tags&pid=$page") or $this->returnServerError('Could not request Rule34.');
 
diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php
index 2c9b3dad..2f24c8ad 100644
--- a/bridges/Rule34pahealBridge.php
+++ b/bridges/Rule34pahealBridge.php
@@ -16,13 +16,12 @@ class Rule34pahealBridge extends BridgeAbstract{
 
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://rule34.paheal.net/post/list/$tags/$page") or $this->returnServerError('Could not request Rule34paheal.');
 
diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php
index dc4fed78..4fb147c0 100644
--- a/bridges/SafebooruBridge.php
+++ b/bridges/SafebooruBridge.php
@@ -15,15 +15,14 @@ class SafebooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-		$page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
 		$page = $page - 1;
 		$page = $page * 40;
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://safebooru.org/index.php?page=post&s=list&tags=$tags&pid=$page") or $this->returnServerError('Could not request Safebooru.');
 
diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php
index 41ad5166..246b40af 100644
--- a/bridges/SakugabooruBridge.php
+++ b/bridges/SakugabooruBridge.php
@@ -15,13 +15,12 @@ class SakugabooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 1;$tags='';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://sakuga.yshi.org/post?page=$page&tags=$tags") or $this->returnServerError('Could not request Sakugabooru.');
 	$input_json = explode('Post.register(', $html);
diff --git a/bridges/ScoopItBridge.php b/bridges/ScoopItBridge.php
index c9a89716..32bdc471 100644
--- a/bridges/ScoopItBridge.php
+++ b/bridges/ScoopItBridge.php
@@ -14,10 +14,9 @@ class ScoopItBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if ($param['u']['value'] != '') {
-            $this->request = $param['u']['value'];
+        if ($this->getInput('u') != '') {
+            $this->request = $this->getInput('u');
             $link = 'http://scoop.it/search?q=' .urlencode($this->request);
 
             $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request ScoopIt. for : ' . $link);
diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index c1d6986e..f877dcfe 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -34,18 +34,17 @@ class SensCritiqueBridge extends BridgeAbstract {
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
-		if ((isset($param['m']['value']) && $param['m']['value'])) {
+		if ((isset($this->getInput('m')) && $this->getInput('m'))) {
 			$this->collectMoviesData();
-		} else if ((isset($param['s']['value']) && $param['s']['value'])) {
+		} else if ((isset($this->getInput('s')) && $this->getInput('s'))) {
 			$this->collectSeriesData();
-		} else if ((isset($param['g']['value']) && $param['g']['value'])) {
+		} else if ((isset($this->getInput('g')) && $this->getInput('g'))) {
 			$this->collectGamesData();
-		} else if ((isset($param['b']['value']) && $param['b']['value'])) {
+		} else if ((isset($this->getInput('b')) && $this->getInput('b'))) {
 			$this->collectBooksData();
-		} else if ((isset($param['bd']['value']) && $param['bd']['value'])) {
+		} else if ((isset($this->getInput('bd')) && $this->getInput('bd'))) {
 			$this->collectBDsData();
-		} else if ((isset($param['mu']['value']) && $param['mu']['value'])) {
+		} else if ((isset($this->getInput('mu')) && $this->getInput('mu'))) {
 			$this->collectMusicsData();
 		} else {
 			$this->returnClientError('You must choose a category');
diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php
index 46f4529f..be22cd7c 100644
--- a/bridges/SoundcloudBridge.php
+++ b/bridges/SoundcloudBridge.php
@@ -16,11 +16,10 @@ class SoundCloudBridge extends BridgeAbstract{
   	const CLIENT_ID = '0aca19eae3843844e4053c6d8fdb7875';
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         $res = json_decode($this->getContents(
             'https://api.soundcloud.com/resolve?url=http://www.soundcloud.com/'
-            . urlencode($param['u']['value'])
+            . urlencode($this->getInput('u'))
             .'&client_id=' . self::CLIENT_ID
         )) or $this->returnServerError('No results for this query');
         $tracks = json_decode($this->getContents(
@@ -35,18 +34,17 @@ class SoundCloudBridge extends BridgeAbstract{
 		    $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($param['u']['value']) .'/'
+                . urlencode($this->getInput('u')) .'/'
                 . urlencode($tracks[$i]->permalink);
             $item['uri'] = 'https://soundcloud.com/'
-                . urlencode($param['u']['value']) .'/'
+                . urlencode($this->getInput('u')) .'/'
                 . urlencode($tracks[$i]->permalink);
 		    $this->items[] = $item;
 		}
 
     }
 	public function getName(){
-        $param=$this->parameters[$this->queriedContext];
-		return $this->name .' - '. $param['u']['value'];
+		return $this->name .' - '. $this->getInput('u');
 	}
 
 	public function getCacheDuration(){
diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php
index 3e38a2f3..a87bc2f4 100644
--- a/bridges/SuperbWallpapersBridge.php
+++ b/bridges/SuperbWallpapersBridge.php
@@ -22,15 +22,14 @@ class SuperbWallpapersBridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
         $baseUri = 'http://www.superbwallpapers.com';
 
-        $this->category   = $param['c']['value'] ?: '';           // All default
-        $this->resolution = $param['r']['value'] ?: '1920x1200';  // Wide wallpaper default
+        $this->category   = $this->getInput('c') ?: '';           // All default
+        $this->resolution = $this->getInput('r') ?: '1920x1200';  // Wide wallpaper default
 
         $num = 0;
-        $max = $param['m']['value'] ?: 36;
+        $max = $this->getInput('m') ?: 36;
         $lastpage = 1;
 
         // Get last page number
diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php
index 92fa8416..793ea27c 100644
--- a/bridges/T411Bridge.php
+++ b/bridges/T411Bridge.php
@@ -14,7 +14,6 @@ class T411Bridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         //Utility function for retrieving text based on start and end delimiters
         function ExtractFromDelimiters($string, $start, $end) {
@@ -26,12 +25,12 @@ class T411Bridge extends BridgeAbstract {
         }
 
         //Ensure proper parameters have been provided
-        if (empty($param['search']['value'])) {
+        if (empty($this->getInput('search'))) {
             $this->returnClientError('You must specify a search criteria');
         }
 
         //Retrieve torrent listing from search results, which does not contain torrent description
-        $url = $this->uri.'torrents/search/?'.$param['search']['value'].'&order=added&type=desc';
+        $url = $this->uri.'torrents/search/?'.$this->getInput('search').'&order=added&type=desc';
         $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request t411: '.$url);
         $results = $html->find('table.results', 0);
         if (is_null($results))
diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php
index c1c36501..444eb620 100644
--- a/bridges/TagBoardBridge.php
+++ b/bridges/TagBoardBridge.php
@@ -14,9 +14,8 @@ class TagBoardBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        $this->request = $param['u']['value'];
+        $this->request = $this->getInput('u');
         $link = 'https://post-cache.tagboard.com/search/' .$this->request;
 
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request TagBoard for : ' . $link);
diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php
index fdc4c096..4d796a3d 100644
--- a/bridges/TbibBridge.php
+++ b/bridges/TbibBridge.php
@@ -15,15 +15,14 @@ class TbibBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-		$page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
 		$page = $page - 1;
 		$page = $page * 50;
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://tbib.org/index.php?page=post&s=list&tags=$tags&pid=$page") or $this->returnServerError('Could not request Tbib.');
 
diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php
index 1d70b14e..a0473416 100644
--- a/bridges/ThePirateBayBridge.php
+++ b/bridges/ThePirateBayBridge.php
@@ -14,7 +14,6 @@ class ThePirateBayBridge extends BridgeAbstract{
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         function parseDateTimestamp($element){
                 $guessedDate = $element->find('font',0)->plaintext;
@@ -50,10 +49,10 @@ class ThePirateBayBridge extends BridgeAbstract{
         }
 
 
-		if (!isset($param['q']['value']))
+		if (!isset($this->getInput('q')))
 			$this->returnClientError('You must specify keywords (?q=...)');
 
-        $keywordsList = explode(";",$param['q']['value']);
+        $keywordsList = explode(";",$this->getInput('q'));
         foreach($keywordsList as $keywords){
             $html = $this->getSimpleHTMLDOM('https://thepiratebay.org/search/'.rawurlencode($keywords).'/0/3/0') or $this->returnServerError('Could not request TPB.');
 
diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php
index 5852ad98..0f9e5906 100644
--- a/bridges/TwitchApiBridge.php
+++ b/bridges/TwitchApiBridge.php
@@ -26,7 +26,6 @@ class TwitchApiBridge extends BridgeAbstract{
     );
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
 		/* In accordance with API description:
 		 * "When specifying a version for a request to the Twitch API, set the Accept HTTP header to the API version you prefer."
@@ -40,11 +39,11 @@ class TwitchApiBridge extends BridgeAbstract{
 
 		$context = stream_context_create($opts);
 
-		if(!isset($param['limit']['value']) ||
-		   empty($param['limit']['value'])){
+		if(!isset($this->getInput('limit')) ||
+		   empty($this->getInput('limit'))){
 			$limit = TWITCH_LIMIT;
 		}else{
-			$limit = (int)$param['limit']['value'];
+			$limit = (int)$this->getInput('limit');
 		}
 
 		// The Twitch API allows a limit between 1 .. 100. Therefore any value below must be set to 1, any greater must result in multiple requests.
@@ -55,7 +54,7 @@ class TwitchApiBridge extends BridgeAbstract{
 			if($limit % 100 != 0) { $requests++; }
 		}
 
-		if($param['broadcasts']['value']){
+		if($this->getInput('broadcasts')){
 			$broadcasts='true';
 		}else{
 			$broadcasts='false';
@@ -66,9 +65,9 @@ class TwitchApiBridge extends BridgeAbstract{
 		$request = '';
 
 		if($requests == 1) {
-			$request = 'https://api.twitch.tv/kraken/channels/' . $param['channel']['value'] . '/videos?limit=' . $limit . '&broadcasts=' . $broadcasts;
+			$request = 'https://api.twitch.tv/kraken/channels/' . $this->getInput('channel') . '/videos?limit=' . $limit . '&broadcasts=' . $broadcasts;
 		} else {
-			$request = 'https://api.twitch.tv/kraken/channels/' . $param['channel']['value'] . '/videos?limit=100&broadcasts=' . $broadcasts;
+			$request = 'https://api.twitch.tv/kraken/channels/' . $this->getInput('channel') . '/videos?limit=100&broadcasts=' . $broadcasts;
 		}
 
 		/* Finally we're ready to request data from the API. Each response provides information for the next request. */
@@ -106,8 +105,7 @@ class TwitchApiBridge extends BridgeAbstract{
 	}
 
 	public function getName(){
-        $param=$this->parameters[$this->queriedContext];
-		return $param['channel']['value'] . ' - Twitch API Bridge';
+		return $this->getInput('channel') . ' - Twitch API Bridge';
 	}
 
 	public function getCacheDuration(){
diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
index a3378e06..0c8f2a7a 100644
--- a/bridges/TwitterBridge.php
+++ b/bridges/TwitterBridge.php
@@ -45,23 +45,20 @@ class TwitterBridge extends BridgeAbstract{
             $param='u';
             break;
         }
-        return 'Twitter '.$specific
-            .$this->parameters[$this->queriedContext][$param]['value'];
+        return 'Twitter '.$specific.$this->getInput($param);
     }
 
     public function getURI(){
-        $params=$this->parameters[$this->queriedContext];
         switch($this->queriedContext){
         case 'By keyword or hashtag':
-            return $this->uri.'search?q='.urlencode($params['q']['value']).'&f=tweets';
+            return $this->uri.'search?q='.urlencode($this->getInput('q')).'&f=tweets';
         case 'By username':
-            return $this->uri.urlencode($params['u']['value']).
-                ($params['norep']['value']?'':'/with_replies');
+            return $this->uri.urlencode($this->getInput('u')).
+                ($this->getInput('norep')?'':'/with_replies');
         }
     }
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 		$html = '';
 
 		$html = $this->getSimpleHTMLDOM($this->getURI());
@@ -74,7 +71,7 @@ class TwitterBridge extends BridgeAbstract{
 			}
 		}
 
-		$hidePictures = $param['nopic']['value'];
+		$hidePictures = $this->getInput('nopic');
 
 		foreach($html->find('div.js-stream-tweet') as $tweet) {
 			$item = array();
diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php
index e984d528..d12d3782 100644
--- a/bridges/UnsplashBridge.php
+++ b/bridges/UnsplashBridge.php
@@ -22,15 +22,14 @@ class UnsplashBridge extends BridgeAbstract {
       ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
         $baseUri = 'http://unsplash.com';
 
-        $width = $param['w']['value'] ?: '1920';    // Default width
+        $width = $this->getInput('w') ?: '1920';    // Default width
 
         $num = 0;
-        $max = $param['m']['value'] ?: 20;
-        $quality = $param['q']['value'] ?: 75;
+        $max = $this->getInput('m') ?: 20;
+        $quality = $this->getInput('q') ?: 75;
         $lastpage = 1;
 
         for ($page = 1; $page <= $lastpage; $page++) {
diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompany.php
index e7aecbb5..756727b2 100644
--- a/bridges/ViadeoCompany.php
+++ b/bridges/ViadeoCompany.php
@@ -14,9 +14,8 @@ class ViadeoCompany extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        $link = 'http://www.viadeo.com/fr/company/'.$param['c']['value'];
+        $link = 'http://www.viadeo.com/fr/company/'.$this->getInput('c');
 
         $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request Viadeo.');
 
diff --git a/bridges/VineBridge.php b/bridges/VineBridge.php
index de27a0ad..0ad7cb00 100644
--- a/bridges/VineBridge.php
+++ b/bridges/VineBridge.php
@@ -14,9 +14,8 @@ class VineBridge extends BridgeAbstract {
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
     $html = '';
-    $uri = 'http://vine.co/u/'.$param['u']['value'].'?mode=list';
+    $uri = 'http://vine.co/u/'.$this->getInput('u').'?mode=list';
 
     $html = $this->getSimpleHTMLDOM($uri) or $this->returnServerError('No results for this query.');
 
diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php
index acc88b6f..67f13a33 100644
--- a/bridges/VkBridge.php
+++ b/bridges/VkBridge.php
@@ -16,10 +16,9 @@ class VkBridge extends BridgeAbstract {
     );
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (isset($param['u']['value'])) {
-            $text_html = $this->getSimpleHTMLDOM(urldecode($param['u']['value']))
+        if (isset($this->getInput('u'))) {
+            $text_html = $this->getSimpleHTMLDOM(urldecode($this->getInput('u')))
                 or $this->returnServerError('No results for this query.');
             $text_html = iconv('windows-1251', 'utf-8', $text_html);
             $html = str_get_html($text_html);
diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php
index 55628058..c789b8d1 100644
--- a/bridges/WallpaperStopBridge.php
+++ b/bridges/WallpaperStopBridge.php
@@ -25,19 +25,18 @@ class WallpaperStopBridge extends BridgeAbstract {
 
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
         $html = '';
-        if (!isset($param['c']['value'])) {
+        if (!isset($this->getInput('c'))) {
             $this->returnClientError('You must specify at least a category (?c=...).');
         } else {
             $baseUri = 'http://www.wallpaperstop.com';
 
-            $this->category = $param['c']['value'];
-            $this->subcategory = $param['s']['value'] ?: '';
-            $this->resolution = $param['r']['value'] ?: '1920x1200';    // Wide wallpaper default
+            $this->category = $this->getInput('c');
+            $this->subcategory = $this->getInput('s') ?: '';
+            $this->resolution = $this->getInput('r') ?: '1920x1200';    // Wide wallpaper default
 
             $num = 0;
-            $max = $param['m']['value'] ?: 20;
+            $max = $this->getInput('m') ?: 20;
             $lastpage = 1;
 
             for ($page = 1; $page <= $lastpage; $page++) {
diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php
index fa2f634c..5adfc982 100644
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@@ -14,20 +14,19 @@ class WhydBridge extends BridgeAbstract{
     ));
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 		$html = '';
-        if (strlen(preg_replace("/[^0-9a-f]/",'', $param['u']['value'])) == 24){
+        if (strlen(preg_replace("/[^0-9a-f]/",'', $this->getInput('u'))) == 24){
             // is input the userid ?
             $html = $this->getSimpleHTMLDOM(
-                $this->uri.'u/'.preg_replace("/[^0-9a-f]/",'', $param['u']['value'])
+                $this->uri.'u/'.preg_replace("/[^0-9a-f]/",'', $this->getInput('u'))
             ) or $this->returnServerError('No results for this query.');
         } else { // input may be the username
             $html = $this->getSimpleHTMLDOM(
-                $this->uri.'search?q='.urlencode($param['u']['value'])
+                $this->uri.'search?q='.urlencode($this->getInput('u'))
             ) or $this->returnServerError('No results for this query.');
 
             for ($j = 0; $j < 5; $j++) {
-                if (strtolower($html->find('div.user', $j)->find('a',0)->plaintext) == strtolower($param['u']['value'])) {
+                if (strtolower($html->find('div.user', $j)->find('a',0)->plaintext) == strtolower($this->getInput('u'))) {
                     $html = $this->getSimpleHTMLDOM(
                         $this->uri . $html->find('div.user', $j)->find('a', 0)->getAttribute('href')
                     ) or $this->returnServerError('No results for this query');
diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index 0fe53092..4883901f 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -43,13 +43,11 @@ class WikipediaBridge extends BridgeAbstract{
 	));
 
 	public function getURI(){
-		$params=$this->parameters[$this->queriedContext];
-		return 'https://' . strtolower($params['language']['value']) . '.wikipedia.org';
+		return 'https://' . strtolower($this->getInput('language')) . '.wikipedia.org';
     }
 
 	public function getName(){
-		$params=$this->parameters[$this->queriedContext];
-		switch($params['subject']['value']){
+		switch($this->getInput('subject')){
 			case 'tfa':
 				$subject = WIKIPEDIA_SUBJECT_TFA;
 				break;
@@ -63,22 +61,21 @@ class WikipediaBridge extends BridgeAbstract{
 
 		switch($subject){
 			case WIKIPEDIA_SUBJECT_TFA:
-				$name = 'Today\'s featured article from ' . strtolower($params['language']['value']) . '.wikipedia.org';
+				$name = 'Today\'s featured article from ' . strtolower($this->getInput('language')) . '.wikipedia.org';
 				break;
 			case WIKIPEDIA_SUBJECT_DYK:
-				$name = 'Did you know? - articles from ' . strtolower($params['language']['value']) . '.wikipedia.org';
+				$name = 'Did you know? - articles from ' . strtolower($this->getInput('language')) . '.wikipedia.org';
 				break;
 			default:
-				$name = 'Articles from ' . strtolower($params['language']['value']) . '.wikipedia.org';
+				$name = 'Articles from ' . strtolower($this->getInput('language')) . '.wikipedia.org';
 				break;
 		}
         return $name;
     }
 
 	public function collectData(){
-		$params=$this->parameters[$this->queriedContext];
 
-		switch($params['subject']['value']){
+		switch($this->getInput('subject')){
 			case 'tfa':
 				$subject = WIKIPEDIA_SUBJECT_TFA;
 				break;
@@ -90,7 +87,7 @@ class WikipediaBridge extends BridgeAbstract{
 				break;
 		}
 
-		$fullArticle = $params['fullarticle']['value'];
+		$fullArticle = $this->getInput('fullarticle');
 
 		// This will automatically send us to the correct main page in any language (try it!)
 		$html = $this->getSimpleHTMLDOM($this->getURI() . '/wiki');
@@ -103,7 +100,7 @@ class WikipediaBridge extends BridgeAbstract{
 		* 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']['value']);
+		$function = 'GetContents' . strtoupper($this->getInput('language'));
 
 		if(!method_exists($this, $function))
 			$this->returnServerError('A function to get the contents for your language is missing (\'' . $function . '\')!');
diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index cfc21738..16e097b9 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -41,7 +41,6 @@ class WordPressBridge extends BridgeAbstract {
 	}
 
 	public function collectData(){
-		$param=$this->parameters[$this->queriedContext];
 
 		$html = $this->getSimpleHTMLDOM($this->getURI().'/feed/atom')
 				or $this->returnServerError("Could not request ".$this->getURI().'/feed/atom');
@@ -119,8 +118,7 @@ class WordPressBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		$param=$this->parameters[$this->queriedContext];
-		return $param['url']['value'];
+		return $this->getInput('url');
 	}
 
 	public function getName() {
diff --git a/bridges/WorldOfTanksBridge.php b/bridges/WorldOfTanksBridge.php
index e10ce94e..8619653b 100644
--- a/bridges/WorldOfTanksBridge.php
+++ b/bridges/WorldOfTanksBridge.php
@@ -27,15 +27,14 @@ class WorldOfTanksBridge extends HttpCachingBridgeAbstract{
     ));
 
     function getURI(){
-        $param=$this->parameters[$this->queriedContext];
         $lang='fr';
-        if (!empty($param['lang']['value'])) {
-            $lang = $param['lang']['value'];
+        if (!empty($this->getInput('lang'))) {
+            $lang = $this->getInput('lang');
         }
 
         $uri = $this->uri.$lang.'/news/';
-        if(!empty($param['category']['value'])) {
-            $uri .= 'pc-browser/'.$param['category']['value']."/";
+        if(!empty($this->getInput('category'))) {
+            $uri .= 'pc-browser/'.$this->getInput('category')."/";
         }
         return $uri;
     }
diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php
index 6f774e21..4e1e17ea 100644
--- a/bridges/XbooruBridge.php
+++ b/bridges/XbooruBridge.php
@@ -15,15 +15,14 @@ class XbooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 0;$tags='';
-        if (isset($param['p']['value'])) {
-		$page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
 		$page = $page - 1;
 		$page = $page * 50;
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("http://xbooru.com/index.php?page=post&s=list&tags=$tags&pid=$page") or $this->returnServerError('Could not request Xbooru.');
 
diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php
index 607a729b..6a57fdf2 100644
--- a/bridges/YandereBridge.php
+++ b/bridges/YandereBridge.php
@@ -15,13 +15,12 @@ class YandereBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 	$page = 1; $tags = '';
-        if (isset($param['p']['value'])) {
-            $page = (int)preg_replace("/[^0-9]/",'', $param['p']['value']);
+        if (isset($this->getInput('p'))) {
+            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
         }
-        if (isset($param['t']['value'])) {
-            $tags = urlencode($param['t']['value']);
+        if (isset($this->getInput('t'))) {
+            $tags = urlencode($this->getInput('t'));
         }
         $html = $this->getSimpleHTMLDOM("https://yande.re/post?page=$page&tags=$tags") or $this->returnServerError('Could not request Yandere.');
 	$input_json = explode('Post.register(', $html);
diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index 8bf4e04c..a0471a0b 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -102,19 +102,18 @@ class YoutubeBridge extends BridgeAbstract {
 	}
 
 	public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
 		$xml = '';
 		$html = '';
 		$url_feed = '';
 		$url_listing = '';
 
-		if (isset($param['u']['value'])) { /* User and Channel modes */
-			$this->request = $param['u']['value'];
+		if (isset($this->getInput('u'))) { /* User and Channel modes */
+			$this->request = $this->getInput('u');
 			$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']['value'])) {
-			$this->request = $param['c']['value'];
+		} else if (isset($this->getInput('c'))) {
+			$this->request = $this->getInput('c');
 			$url_feed = $this->uri.'feeds/videos.xml?channel_id='.urlencode($this->request);
 			$url_listing = $this->uri.'channel/'.urlencode($this->request).'/videos';
 		}
@@ -126,16 +125,16 @@ class YoutubeBridge extends BridgeAbstract {
 			} else $this->returnServerError("Could not request YouTube. Tried:\n - $url_feed\n - $url_listing");
 		}
 
-		else if (isset($param['p']['value'])) { /* playlist mode */
-			$this->request = $param['p']['value'];
+		else if (isset($this->getInput('p'))) { /* playlist mode */
+			$this->request = $this->getInput('p');
 			$url_listing = $this->uri.'playlist?list='.urlencode($this->request);
 			$html = $this->getSimpleHTMLDOM($url_listing) or $this->returnServerError("Could not request YouTube. Tried:\n - $url_listing");
 			$this->ytBridgeParseHtmlListing($html, 'tr.pl-video', '.pl-video-title a');
 			$this->request = 'Playlist: '.str_replace(' - YouTube', '', $html->find('title', 0)->plaintext);
 		}
 
-		else if (isset($param['s']['value'])) { /* search mode */
-			$this->request = $param['s']['value']; $page = 1; if (isset($param['pa']['value'])) $page = (int)preg_replace("/[^0-9]/",'', $param['pa']['value']);
+		else if (isset($this->getInput('s'))) { /* search mode */
+			$this->request = $this->getInput('s'); $page = 1; if (isset($this->getInput('pa'))) $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('pa'));
 			$url_listing = $this->uri.'results?search_query='.urlencode($this->request).'&page='.$page.'&filters=video&search_sort=video_date_uploaded';
 			$html = $this->getSimpleHTMLDOM($url_listing) or $this->returnServerError("Could not request YouTube. Tried:\n - $url_listing");
 			$this->ytBridgeParseHtmlListing($html, 'div.yt-lockup', 'h3');
diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index ce268510..6925159a 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -160,7 +160,6 @@ class ZDNetBridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         function StripCDATA($string) {
             $string = str_replace('<![CDATA[', '', $string);
@@ -209,7 +208,7 @@ class ZDNetBridge extends BridgeAbstract {
         }
 
         $baseUri = $this->getURI();
-        $feed = $param['feed']['value'];
+        $feed = $this->getInput('feed');
         if (empty($feed))
             $this->returnClientError('Please select a feed to display.');
         if (strpos($feed, 'downloads!') !== false) {
diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php
index 4bbd464d..4a0bf031 100644
--- a/bridges/ZoneTelechargementBridge.php
+++ b/bridges/ZoneTelechargementBridge.php
@@ -11,7 +11,6 @@ class ZoneTelechargementBridge extends BridgeAbstract {
     ));
 
     public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
 
         function StripCDATA($string) {
             $string = str_replace('<![CDATA[', '', $string);
@@ -20,8 +19,8 @@ class ZoneTelechargementBridge extends BridgeAbstract {
         }
 
         $category = '/';
-        if (!empty($param['category']['value']))
-            $category = '/'.$param['category']['value'].'/';
+        if (!empty($this->getInput('category')))
+            $category = '/'.$this->getInput('category').'/';
 
         $url = $this->getURI().$category.'rss.xml';
         $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request Zone Telechargement: '.$url);
diff --git a/lib/Bridge.php b/lib/Bridge.php
index 94d22089..240251c0 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -120,6 +120,7 @@ abstract class BridgeAbstract implements BridgeInterface {
     public $maintainer = 'No maintainer';
     public $useProxy = true;
     public $parameters = array();
+    public $inputs = array();
     protected $queriedContext='';
 
     protected function returnError($message, $code){
@@ -271,6 +272,7 @@ abstract class BridgeAbstract implements BridgeInterface {
         foreach($inputs as $name=>$value){
             foreach($this->parameters as $context=>$set){
                 if(isset($this->parameters[$context][$name])){
+                    $this->inputs[$context][$name]['value']=$value;
                     $this->parameters[$context][$name]['value']=$value;
                 }
             }
@@ -302,9 +304,9 @@ abstract class BridgeAbstract implements BridgeInterface {
                 switch($properties['type']){
                 case 'checkbox':
                     if(!isset($properties['defaultValue'])){
-                        $this->parameters[$context][$name]['value']=false;
+                        $this->inputs[$context][$name]['value']=false;
                     }else{
-                        $this->parameters[$context][$name]['value']=$properties['defaultValue'];
+                        $this->inputs[$context][$name]['value']=$properties['defaultValue'];
                     }
                     break;
                 }
@@ -312,17 +314,22 @@ abstract class BridgeAbstract implements BridgeInterface {
         }
 
         // Copy global parameter values to the guessed context
-        foreach($this->parameters['global'] as $name=>$properties){
-            if(isset($inputs[$name])){
-                $value=$inputs[$name];
-            }else if(isset($properties['value'])){
-                $value=$properties['value'];
-            }else{
-                continue;
+        if(isset($this->parameters['global'])){
+            foreach($this->parameters['global'] as $name=>$properties){
+                if(isset($inputs[$name])){
+                    $value=$inputs[$name];
+                }else if(isset($properties['value'])){
+                    $value=$properties['value'];
+                }else{
+                    continue;
+                }
+                $this->inputs[$queriedContext][$name]['value']=$value;
             }
-            $this->parameters[$queriedContext][$name]['value']=$value;
         }
 
+        // Only keep guessed context parameters values
+        $this->inputs=array($this->queriedContext=>$this->inputs[$this->queriedContext]);
+
         $this->collectData();
 
         if(!is_null($this->cache)){
@@ -330,6 +337,13 @@ abstract class BridgeAbstract implements BridgeInterface {
         }
     }
 
+    function getInput($input){
+        if(!isset($this->inputs[$this->queriedContext][$input]['value'])){
+            return null;
+        }
+        return $this->inputs[$this->queriedContext][$input]['value'];
+    }
+
     public function getName(){
         return $this->name;
     }

From fa7cd4a7393c3fcde2f0138e24c031c2d34e8c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 01:38:43 +0200
Subject: [PATCH 29/62] [AllocineFRBridge] fix and simplify code
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/AllocineFRBridge.php | 51 ++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/bridges/AllocineFRBridge.php b/bridges/AllocineFRBridge.php
index 39119551..f180f5d1 100644
--- a/bridges/AllocineFRBridge.php
+++ b/bridges/AllocineFRBridge.php
@@ -16,34 +16,45 @@ class AllocineFRBridge extends BridgeAbstract{
             'values'=>array(
                 'Faux Raccord'=>'faux-raccord',
                 'Top 5'=>'top-5',
-                'Tueurs En Serie'=>'tuers-en-serie'
+                'Tueurs en Séries'=>'tueurs-en-serie'
             )
         )
     ));
 
-    public function collectData(){
-        $category = '';
+    public function getURI(){
         switch($this->getInput('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->returnClientError('You must select a valid category!');
+        case 'faux-raccord':
+            $uri = 'http://www.allocine.fr/video/programme-12284/saison-24580/';
+            break;
+        case 'top-5':
+            $uri = 'http://www.allocine.fr/video/programme-12299/saison-22542/';
+            break;
+        case 'tueurs-en-serie':
+            $uri = 'http://www.allocine.fr/video/programme-12286/saison-22938/';
+            break;
         }
 
-        // Update bridge name to match selection
-        $this->name .= ' : ' . $category;
+        return $uri;
+    }
+
+    public function getName(){
+        return $this->name.' : '
+            .array_search(
+                $this->getInput('category'),
+                $this->parameters[$this->queriedContext]['category']['values']
+            );
+    }
+
+    public function collectData(){
+
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+            or $this->returnServerError("Could not request ".$this->getURI()." !");
+
+        $category=array_search(
+                $this->getInput('category'),
+                $this->parameters[$this->queriedContext]['category']['values']
+            );
 
-        $html = $this->getSimpleHTMLDOM($this->uri) or $this->returnServerError("Could not request {$this->uri}!");
 
         foreach($html->find('figure.media-meta-fig') as $element)
         {

From 16dc7fcb6fb6eaf552c6e23811f44434686eff3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 01:42:09 +0200
Subject: [PATCH 30/62] [core] fix bridges without 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>
---
 lib/Bridge.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/Bridge.php b/lib/Bridge.php
index 240251c0..9d16ff54 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -260,9 +260,12 @@ abstract class BridgeAbstract implements BridgeInterface {
             return;
         }
 
-        if(empty($this->parameters) && !empty($inputs)){
-            $this->returnClientError('Invalid parameters value(s)');
-        };
+        if(empty($this->parameters)){
+            if(!empty($inputs)){
+                $this->returnClientError('Invalid parameters value(s)');
+            }
+            return;
+        }
 
         if(!$this->validateData($inputs)){
             $this->returnClientError('Invalid parameters value(s)');

From e9ff7b32f17d60e0f29a511461a327f8902b300c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 01:48:57 +0200
Subject: [PATCH 31/62] [AskfmBridge] remove useless code and fix getName() and
 getURI()
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/AskfmBridge.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/bridges/AskfmBridge.php b/bridges/AskfmBridge.php
index 785dab26..6de8f54f 100644
--- a/bridges/AskfmBridge.php
+++ b/bridges/AskfmBridge.php
@@ -16,13 +16,8 @@ class AskfmBridge extends BridgeAbstract{
 
     public function collectData(){
         $html = '';
-        if (isset($this->getInput('u'))) {
-            $this->request = $this->getInput('u');
-            $html = $this->getSimpleHTMLDOM('http://ask.fm/'.urlencode($this->request).'/answers/more?page=0') or $this->returnServerError('Requested username can\'t be found.');
-        }
-        else {
-            $this->returnClientError('You must specify a username (?u=...).');
-        }
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+            or $this->returnServerError('Requested username can\'t be found.');
 
         foreach($html->find('div.streamItem-answer') as $element) {
             $item = array();
@@ -48,11 +43,11 @@ class AskfmBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        return empty($this->request) ? $this->name : $this->request;
+        return $this->name.' : '.$this->getInput('u');
     }
 
     public function getURI(){
-        return empty($this->request) ? $this->uri : 'http://ask.fm/'.urlencode($this->request);
+        return $this->uri.urlencode($this->getInput('u')).'/answers/more?page=0';
     }
 
     public function getCacheDuration(){

From 3fed12af1db4364c646c80ca85697a7a57e3a329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 01:54:17 +0200
Subject: [PATCH 32/62] [BandcampBridge] fix parameter 'tag' required status
 and fix the rest
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/BandcampBridge.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php
index 5434cb59..4e110915 100644
--- a/bridges/BandcampBridge.php
+++ b/bridges/BandcampBridge.php
@@ -8,18 +8,14 @@ class BandcampBridge extends BridgeAbstract{
     public $parameters = array( array(
         'tag'=>array(
             'name'=>'tag',
-            'type'=>'text'
+            'type'=>'text',
+            'required'=>true
         )
     ));
 
     public function collectData(){
-        $html = '';
-        if (isset($this->getInput('tag'))) {
-            $html = $this->getSimpleHTMLDOM('http://bandcamp.com/tag/'.urlencode($this->getInput('tag')).'?sort_field=date') or $this->returnServerError('No results for this query.');
-        }
-        else {
-            $this->returnClientError('You must specify tag (/tag/...)');
-        }
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+            or $this->returnServerError('No results for this query.');
 
         foreach($html->find('li.item') as $release) {
             $script = $release->find('div.art', 0)->getAttribute('onclick');
@@ -36,9 +32,12 @@ class BandcampBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
+    public function getURI(){
+        return $this->uri.'tag/'.urlencode($this->getInput('tag')).'?sort_field=date';
+    }
 
-        return (!empty($this->getInput('tag')) ? $this->getInput('tag') .' - ' : '') .'Bandcamp Tag';
+    public function getName(){
+        return $this->getInput('tag') .' - '.'Bandcamp Tag';
     }
 
     public function getCacheDuration(){

From 93634ada3a650162a83d0bdddac035715b2cbb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 10:38:56 +0200
Subject: [PATCH 33/62] [core] really fix bridges without 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>
---
 lib/Bridge.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Bridge.php b/lib/Bridge.php
index 9d16ff54..cab2701f 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -264,6 +264,11 @@ abstract class BridgeAbstract implements BridgeInterface {
             if(!empty($inputs)){
                 $this->returnClientError('Invalid parameters value(s)');
             }
+
+            $this->collectData();
+            if(!is_null($this->cache)){
+                $this->cache->saveData($this->getDatas());
+            }
             return;
         }
 

From c37aee408d8b0ed65d3f854f65dc2cefc7a174c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 10:40:52 +0200
Subject: [PATCH 34/62] [AcrimedBridge] fix method calling
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/AcrimedBridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridges/AcrimedBridge.php b/bridges/AcrimedBridge.php
index abf10832..a0bf4551 100644
--- a/bridges/AcrimedBridge.php
+++ b/bridges/AcrimedBridge.php
@@ -9,7 +9,7 @@ class AcrimedBridge extends RssExpander{
 
        public function collectData(){
 
-			parent::collectExpandableDatas("http://www.acrimed.org/spip.php?page=backend");
+			$this->collectExpandableDatas("http://www.acrimed.org/spip.php?page=backend");
 
 		}
 

From 806f38b42dccffdce9480f5f2f2e6eb17c901c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 10:41:24 +0200
Subject: [PATCH 35/62] [StripeAPIChangeLogBridge] fix unknown class Item
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/StripeAPIChangeLogBridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridges/StripeAPIChangeLogBridge.php b/bridges/StripeAPIChangeLogBridge.php
index 6d625973..48735a5e 100644
--- a/bridges/StripeAPIChangeLogBridge.php
+++ b/bridges/StripeAPIChangeLogBridge.php
@@ -11,7 +11,7 @@ class StripeAPIChangeLogBridge extends BridgeAbstract{
 
 
     foreach($html->find('h3') as $change){
-      $item=new \Item();
+      $item=array();
       $item['title']=trim($change->plaintext);
       $item['uri']='https://stripe.com/docs/upgrades#'.$item['title'];
       $item['author']='stripe';

From 74d876b585c4f1ba7ed182e4c67b0b66d693c92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 11:03:30 +0200
Subject: [PATCH 36/62] [core] add explicit support for list default value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and implicit support for text and number parameters

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index cab2701f..fc09b63e 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -317,6 +317,18 @@ abstract class BridgeAbstract implements BridgeInterface {
                         $this->inputs[$context][$name]['value']=$properties['defaultValue'];
                     }
                     break;
+                case 'list':
+                    if(!isset($properties['defaultValue'])){
+                        $this->inputs[$context][$name]['value']=reset($properties['values']);
+                    }else{
+                        $this->inputs[$context][$name]['value']=$properties['defaultValue'];
+                    }
+                    break;
+                default:
+                    if(isset($properties['defaultValue'])){
+                        $this->inputs[$context][$name]['value']=$properties['defaultValue'];
+                    }
+                    break;
                 }
             }
         }

From e74f526c19547a2af022fb10670993388376d5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 11:04:04 +0200
Subject: [PATCH 37/62] [AnimeUltimeBridge] remove useless code and fix
 getName()
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/AnimeUltimeBridge.php | 51 ++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php
index 6b65247e..629f459b 100644
--- a/bridges/AnimeUltimeBridge.php
+++ b/bridges/AnimeUltimeBridge.php
@@ -23,15 +23,10 @@ class AnimeUltimeBridge extends BridgeAbstract {
     public function collectData(){
 
         //Add type filter if provided
-        $typeFilter = '';
-        if (!empty($this->getInput('type'))) {
-            if ($this->getInput('type') == 'A' || $this->getInput('type') == 'D' || $this->getInput('type') == 'T') {
-                $typeFilter = $this->getInput('type');
-                if ($typeFilter == 'A') { $this->filter = 'Anime'; }
-                if ($typeFilter == 'D') { $this->filter = 'Drama'; }
-                if ($typeFilter == 'T') { $this->filter = 'Tokusatsu'; }
-            } else $this->returnClientError('The provided type filter is invalid. Expecting A, D, T, or no filter');
-        }
+        $typeFilter = array_search(
+            $this->getInput('type'),
+            $this->parameters[$this->queriedContext]['type']['values']
+        );
 
         //Build date and filters for making requests
         $thismonth = date('mY').$typeFilter;
@@ -42,9 +37,9 @@ class AnimeUltimeBridge extends BridgeAbstract {
         foreach (array($thismonth, $lastmonth) as $requestFilter) {
 
             //Retrive page contents
-            $website = 'http://www.anime-ultime.net/';
-            $url = $website.'history-0-1/'.$requestFilter;
-            $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request Anime-Ultime: '.$url);
+            $url = $this->uri.'history-0-1/'.$requestFilter;
+            $html = $this->getSimpleHTMLDOM($url)
+                or $this->returnServerError('Could not request Anime-Ultime: '.$url);
 
             //Relases are sorted by day : process each day individually
             foreach ($html->find('div.history', 0)->find('h3') as $daySection) {
@@ -52,7 +47,9 @@ class AnimeUltimeBridge extends BridgeAbstract {
                 //Retrieve day and build date information
                 $dateString = $daySection->plaintext;
                 $day = intval(substr($dateString, strpos($dateString, ' ') + 1, 2));
-                $item_date = strtotime(str_pad($day, 2, '0', STR_PAD_LEFT).'-'.substr($requestFilter, 0, 2).'-'.substr($requestFilter, 2, 4));
+                $item_date = strtotime(str_pad($day, 2, '0', STR_PAD_LEFT).'-'
+                    .substr($requestFilter, 0, 2).'-'
+                    .substr($requestFilter, 2, 4));
                 $release = $daySection->next_sibling()->next_sibling()->first_child(); //<h3>day</h3><br /><table><tr> <-- useful data in table rows
 
                 //Process each release of that day, ignoring first table row: contains table headers
@@ -61,7 +58,7 @@ class AnimeUltimeBridge extends BridgeAbstract {
 
                         //Retrieve metadata from table columns
                         $item_link_element = $release->find('td', 0)->find('a', 0);
-                        $item_uri = $website.$item_link_element->href;
+                        $item_uri = $this->uri.$item_link_element->href;
                         $item_name = html_entity_decode($item_link_element->plaintext);
                         $item_episode = html_entity_decode(str_pad($release->find('td', 1)->plaintext, 2, '0', STR_PAD_LEFT));
                         $item_fansub = $release->find('td', 2)->plaintext;
@@ -70,10 +67,21 @@ class AnimeUltimeBridge extends BridgeAbstract {
                         if (!empty($item_uri)) {
 
                             //Retrieve description from description page and convert relative image src info absolute image src
-                            $html_item = $this->getContents($item_uri) or $this->returnServerError('Could not request Anime-Ultime: '.$item_uri);
-                            $item_description = substr($html_item, strpos($html_item, 'class="principal_contain" align="center">') + 41);
-                            $item_description = substr($item_description, 0, strpos($item_description, '<div id="table">'));
-                            $item_description = str_replace('src="images', 'src="'.$website.'images', $item_description);
+                            $html_item = $this->getContents($item_uri)
+                                or $this->returnServerError('Could not request Anime-Ultime: '.$item_uri);
+                            $item_description = substr(
+                                $html_item,
+                                strpos($html_item, 'class="principal_contain" align="center">')
+                                + 41
+                            );
+                            $item_description = substr($item_description,
+                                0,
+                                strpos($item_description, '<div id="table">')
+                            );
+                            $item_description = str_replace(
+                                'src="images', 'src="'.$this->uri.'images',
+                                $item_description
+                            );
                             $item_description = str_replace("\r", '', $item_description);
                             $item_description = str_replace("\n", '', $item_description);
                             $item_description = utf8_encode($item_description);
@@ -99,7 +107,12 @@ class AnimeUltimeBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Latest '.$this->filter.' - Anime-Ultime Bridge';
+        $typeFilter = array_search(
+            $this->getInput('type'),
+            $this->parameters[$this->queriedContext]['type']['values']
+        );
+
+        return 'Latest '.$typeFilter.' - Anime-Ultime Bridge';
     }
 
     public function getCacheDuration() {

From fb05976fa681610e8e855ec42eedbb3a00e492b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 11:08:32 +0200
Subject: [PATCH 38/62] [core] fix two-levels list default value support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/Bridge.php b/lib/Bridge.php
index fc09b63e..7ee4fc7f 100644
--- a/lib/Bridge.php
+++ b/lib/Bridge.php
@@ -319,7 +319,11 @@ abstract class BridgeAbstract implements BridgeInterface {
                     break;
                 case 'list':
                     if(!isset($properties['defaultValue'])){
-                        $this->inputs[$context][$name]['value']=reset($properties['values']);
+                        $firstItem=reset($properties['values']);
+                        if(is_array($firstItem)){
+                            $firstItem=reset($firstItem);
+                        }
+                        $this->inputs[$context][$name]['value']=$firstItem;
                     }else{
                         $this->inputs[$context][$name]['value']=$properties['defaultValue'];
                     }

From ff5ac1659f9010ec333a4a8ac851c0a8a0769b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 11:50:01 +0200
Subject: [PATCH 39/62] [Arte7bridge] code simplification
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/Arte7Bridge.php | 45 +++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/bridges/Arte7Bridge.php b/bridges/Arte7Bridge.php
index 9510dd18..19e039f8 100644
--- a/bridges/Arte7Bridge.php
+++ b/bridges/Arte7Bridge.php
@@ -43,30 +43,31 @@
             )
         );
 
-    protected  function extractVideoset($category='toutes-les-videos', $lang='fr'){
-        $url = 'http://www.arte.tv/guide/'.$lang.'/plus7/'.$category;
-        $input = $this->getContents($url) or die('Could not request ARTE.');
-        if(strpos($input, 'categoryVideoSet') !== FALSE){
-            $input = explode('categoryVideoSet: ', $input);
-            $input = explode('}},', $input[1]);
-            $input = $input[0].'}}';
-        }else{
-            $input = explode('videoSet: ', $input);
-            $input = explode('}]},', $input[1]);
-            $input = $input[0].'}]}';
-        }
-        $input = json_decode($input, TRUE);
-        return $input;
-    }
-
     public function collectData(){
 
-      $category='toutes-les-videos'; $lang='fr';
-      if (!empty($this->getInput('catfr')))
-         $category=$this->getInput('catfr');
-      if (!empty($this->getInput('catde')))
-         { $category=$this->getInput('catde'); $lang='de'; }
-      $input_json = $this->extractVideoset($category, $lang);
+      switch($this->queriedContext){
+      case 'Catégorie (Français)':
+        $category=$this->getInput('catfr');
+        $lang='fr';
+        break;
+      case 'Catégorie (Allemand)':
+        $category=$this->getInput('catde');
+        $lang='de';
+        break;
+      }
+
+      $url = $this->uri.'guide/'.$lang.'/plus7/'.$category;
+      $input = $this->getContents($url) or die('Could not request ARTE.');
+      if(strpos($input, 'categoryVideoSet') !== FALSE){
+        $input = explode('categoryVideoSet: ', $input);
+        $input = explode('}},', $input[1]);
+        $input = $input[0].'}}';
+      }else{
+        $input = explode('videoSet: ', $input);
+        $input = explode('}]},', $input[1]);
+        $input = $input[0].'}]}';
+      }
+      $input_json = json_decode($input, TRUE);
 
       foreach($input_json['videos'] as $element) {
             $item = array();

From efb6ad9ff2a850a646f472deef980779995516c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 11:52:41 +0200
Subject: [PATCH 40/62] [AskfmBridge] code simplification
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/AskfmBridge.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bridges/AskfmBridge.php b/bridges/AskfmBridge.php
index 6de8f54f..7a8b9e21 100644
--- a/bridges/AskfmBridge.php
+++ b/bridges/AskfmBridge.php
@@ -15,13 +15,12 @@ class AskfmBridge extends BridgeAbstract{
     );
 
     public function collectData(){
-        $html = '';
         $html = $this->getSimpleHTMLDOM($this->getURI())
             or $this->returnServerError('Requested username can\'t be found.');
 
         foreach($html->find('div.streamItem-answer') as $element) {
             $item = array();
-            $item['uri'] = 'http://ask.fm'.$element->find('a.streamItemsAge',0)->href;
+            $item['uri'] = $this->uri.$element->find('a.streamItemsAge',0)->href;
             $question = trim($element->find('h1.streamItemContent-question',0)->innertext);
             $item['title'] = trim(htmlspecialchars_decode($element->find('h1.streamItemContent-question',0)->plaintext, ENT_QUOTES));
             $answer = trim($element->find('p.streamItemContent-answer',0)->innertext);
@@ -36,7 +35,7 @@ class AskfmBridge extends BridgeAbstract{
             }
             $content = '<p>' . $question . '</p><p>' . $answer . '</p><p>' . $visual . '</p>';
             // Fix relative links without breaking // scheme used by YouTube stuff
-            $content = preg_replace('#href="\/(?!\/)#', 'href="http://ask.fm/',$content);
+            $content = preg_replace('#href="\/(?!\/)#', 'href="'.$this->uri,$content);
             $item['content'] = $content;
             $this->items[] = $item;
         }

From 1068f313039c69fc9b57e17cc82403689476a616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 11:57:18 +0200
Subject: [PATCH 41/62] [BastaBridge] code simplification
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/BastaBridge.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php
index e91f9fa8..a7a7c829 100644
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -8,10 +8,11 @@ class BastaBridge extends BridgeAbstract{
 	public function collectData(){
 		// 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);
+			return preg_replace('/src=["\']{1}([^"\']+)/ims', 'src=\''.$this->uri.'$1\'', $content);
 		}
 
-		$html = $this->getSimpleHTMLDOM('http://www.bastamag.net/spip.php?page=backend') or $this->returnServerError('Could not request Bastamag.');
+        $html = $this->getSimpleHTMLDOM($this->uri.'spip.php?page=backend')
+            or $this->returnServerError('Could not request Bastamag.');
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {

From 88521f188e8444ef2e5591ecc55599f10148cc2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 11:59:34 +0200
Subject: [PATCH 42/62] [BlaguesDeMerdeBridge] code simplification
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/BlaguesDeMerdeBridge.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php
index 5d1b277c..e0f65e19 100644
--- a/bridges/BlaguesDeMerdeBridge.php
+++ b/bridges/BlaguesDeMerdeBridge.php
@@ -8,7 +8,8 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{
 
 
     public function collectData(){
-        $html = $this->getSimpleHTMLDOM('http://www.blaguesdemerde.fr/') or $this->returnServerError('Could not request BDM.');
+        $html = $this->getSimpleHTMLDOM($this->uri)
+            or $this->returnServerError('Could not request BDM.');
 
         foreach($html->find('article.joke_contener') as $element) {
             $item = array();

From 6b97ca29918d943b399f268e7bb1511f348a25ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 12:14:36 +0200
Subject: [PATCH 43/62] [BooruprojectBridge] implement getURI() and code
 simplifications
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/BooruprojectBridge.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php
index 66e25545..eb3f5ac5 100644
--- a/bridges/BooruprojectBridge.php
+++ b/bridges/BooruprojectBridge.php
@@ -1,7 +1,6 @@
 <?php
 class BooruprojectBridge extends BridgeAbstract{
 
-
 	public $maintainer = "mitsukarenai";
 	public $name = "Booruproject";
 	public $uri = "http://booru.org/";
@@ -12,29 +11,28 @@ class BooruprojectBridge extends BridgeAbstract{
             'name'=>'instance (required)',
             'required'=>true
           ),
-          'p'=>array('name'=>'page'),
+          'p'=>array(
+              'name'=>'page',
+              'type'=>'number'
+          ),
           't'=>array('name'=>'tags')
         ));
 
+    function getURI(){
+        return 'http://'.$this->getInput('i').'.booru.org/';
+    }
+
     public function collectData(){
-	$page = 0; $tags = '';
-        if (!empty($this->getInput('p'))) {
-		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-		$page = $page - 1;
-		$page = $page * 20;
-        }
-        if (!empty($this->getInput('t'))) {
-            $tags = '&tags='.urlencode($this->getInput('t'));
-        }
-	if (empty($this->getInput('i'))) {
-		$this->returnServerError('Please enter a ***.booru.org instance.');
-	}
-        $html = $this->getSimpleHTMLDOM("http://".$this->getInput('i').".booru.org/index.php?page=post&s=list&pid=".$page.$tags) or $this->returnServerError('Could not request Booruproject.');
+        $html = $this->getSimpleHTMLDOM(
+            $this->getURI().'index.php?page=post&s=list'
+            .'&pid='.($this->getInput('p')?($this->getInput('p') -1)*20:'')
+            .'&tags='.urlencode($this->getInput('t'))
+        ) or $this->returnServerError('Could not request Booruprojec.');
 
 
 	foreach($html->find('div[class=content] span') as $element) {
 		$item = array();
-		$item['uri'] = 'http://'.$this->getInput('i').'.booru.org/'.$element->find('a', 0)->href;
+		$item['uri'] = $this->getURI().$element->find('a', 0)->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->find('a', 0)->getAttribute('id'));
 		$item['timestamp'] = time();
 		$item['tags'] = $element->find('img', 0)->getAttribute('title');

From 3d76ac5d17965f559a4a2129ab5b38b2b091e1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 12:22:41 +0200
Subject: [PATCH 44/62] [CNETBridge] fix getName() and code simplification
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/CNETBridge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php
index b2963914..e9519766 100644
--- a/bridges/CNETBridge.php
+++ b/bridges/CNETBridge.php
@@ -37,7 +37,7 @@ class CNETBridge extends BridgeAbstract {
             return $article_html;
         }
 
-        $pageUrl = 'http://www.cnet.com/'.(empty($this->getInput('topic')) ? '' : 'topics/'.$this->getInput('topic').'/');
+        $pageUrl = $this->uri.(empty($this->getInput('topic')) ? '' : 'topics/'.$this->getInput('topic').'/');
         $html = $this->getSimpleHTMLDOM($pageUrl) or $this->returnServerError('Could not request CNET: '.$pageUrl);
         $limit = 0;
 
@@ -45,7 +45,7 @@ class CNETBridge extends BridgeAbstract {
             if ($limit < 8) {
 
                 $article_title = trim($element->find('h2', 0)->plaintext);
-                $article_uri = 'http://www.cnet.com'.($element->find('a', 0)->href);
+                $article_uri = $this->uri.($element->find('a', 0)->href);
                 $article_timestamp = strtotime($element->find('time.assetTime', 0)->plaintext);
                 $article_author = trim($element->find('a[rel=author]', 0)->plaintext);
 
@@ -69,7 +69,7 @@ class CNETBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'CNET News Bridge'.(empty($this->getInput('topic')) ? '' : ' - '.$this->param['topic']['value']);
+        return 'CNET News Bridge'.(empty($this->getInput('topic')) ? '' : ' - '.$this->getInput('topic'));
     }
 
     public function getCacheDuration() {

From 7710613e6253d7d4eeb006f29d57bd0d10b4d2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 12:26:21 +0200
Subject: [PATCH 45/62] [Castorus] fix and code simplification
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/CastorusBridge.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php
index 453f2b55..35736b80 100644
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -74,11 +74,8 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	public function collectData(){
-		if(isset($this->getInput('zip')))
-			$zip_filter = trim($this->getInput('zip'));
-
-		if(isset($this->getInput('city')))
-			$city_filter = trim($this->getInput('city'));
+        $zip_filter = trim($this->getInput('zip'));
+        $city_filter = trim($this->getInput('city'));
 
 		$html = $this->getSimpleHTMLDOM($this->uri);
 

From 58f6a4357499a46e22db581a916aef495e0a52d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:00:12 +0200
Subject: [PATCH 46/62] [CollegeDeFranceBridge] code simplification
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/CollegeDeFranceBridge.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/bridges/CollegeDeFranceBridge.php b/bridges/CollegeDeFranceBridge.php
index fc695335..3d9a21c1 100644
--- a/bridges/CollegeDeFranceBridge.php
+++ b/bridges/CollegeDeFranceBridge.php
@@ -30,7 +30,8 @@ class CollegeDeFranceBridge extends BridgeAbstract{
 		 * 	</a>
 		 * </li>
 		 */
-		$html = $this->getSimpleHTMLDOM('http://www.college-de-france.fr/components/search-audiovideo.jsp?fulltext=&siteid=1156951719600&lang=FR&type=all') or $this->returnServerError('Could not request CollegeDeFrance.');
+        $html = $this->getSimpleHTMLDOM($this->uri.'components/search-audiovideo.jsp?fulltext=&siteid=1156951719600&lang=FR&type=all')
+            or $this->returnServerError('Could not request CollegeDeFrance.');
 		foreach($html->find('a[data-target]') as $element) {
 			$item = array();
 			$item['title'] = $element->find('.title', 0)->plaintext;
@@ -43,10 +44,25 @@ class CollegeDeFranceBridge extends BridgeAbstract{
 			// <a href="/site/institut-physique/The-Mysteries-of-Decoherence-Sebastien-Gleyzes-[Video-3-35].htm" data-target="after">
 			$timezone = new DateTimeZone('Europe/Paris');
 			// strpos($element->href, '201') will break in 2020 but it'll probably break prior to then due to site changes anyway
-			$d = DateTime::createFromFormat('!Y-m-d-H\hi', substr($element->href, strpos($element->href, '201'), 16), $timezone) ?: DateTime::createFromFormat('!d m Y', trim(str_replace(array_values($months), array_keys($months), $element->find('.date', 0)->plaintext)), $timezone);
-			$item['timestamp'] = $d->format('U');
+            $d = DateTime::createFromFormat(
+                '!Y-m-d-H\hi',
+                substr($element->href, strpos($element->href, '201'), 16),
+                $timezone
+            );
+            if(!$d){
+                $d=DateTime::createFromFormat(
+                    '!d m Y',
+                    trim(str_replace(
+                        array_values($months),
+                        array_keys($months),
+                        $element->find('.date', 0)->plaintext
+                    )),
+                    $timezone
+                );
+            }
+            $item['timestamp'] = $d->format('U');
 			$item['content'] =  $element->find('.lecturer', 0)->innertext . ' - ' . $element->find('.title', 0)->innertext;
-			$item['uri'] = 'http://www.college-de-france.fr' . $element->href;
+			$item['uri'] = $this->uri . $element->href;
 			$this->items[] = $item;
 		}
 	}

From 6f8a773260ee2edd7e8d7a01f8d44eb393028d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:12:14 +0200
Subject: [PATCH 47/62] [CopieDoubleBridge] code simplification
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/CopieDoubleBridge.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bridges/CopieDoubleBridge.php b/bridges/CopieDoubleBridge.php
index 7c06d95a..6e787dbe 100644
--- a/bridges/CopieDoubleBridge.php
+++ b/bridges/CopieDoubleBridge.php
@@ -7,13 +7,13 @@ class CopieDoubleBridge extends BridgeAbstract{
     public $description = "CopieDouble";
 
     public function collectData(){
-        $html = $this->getSimpleHTMLDOM('http://www.copie-double.com/') or $this->returnServerError('Could not request CopieDouble.');
+        $html = $this->getSimpleHTMLDOM($this->uri)
+            or $this->returnServerError('Could not request CopieDouble.');
         $table = $html->find('table table', 2);
 
         foreach($table->find('tr') as $element)
         {
             $td = $element->find('td', 0);
-             $cpt++;
             if($td->class == "couleur_1")
             {
                 $item = array();
@@ -26,10 +26,10 @@ class CopieDoubleBridge extends BridgeAbstract{
             elseif(strpos($element->innertext, "/images/suivant.gif") === false)
             {
                 $a=$element->find("a", 0);
-                $item['uri'] = "http://www.copie-double.com" . $a->href;
+                $item['uri'] = $this->uri . $a->href;
 
-                $content = str_replace('src="/', 'src="http://www.copie-double.com/',$element->find("td", 0)->innertext);
-                $content = str_replace('href="/', 'href="http://www.copie-double.com/',$content);
+                $content = str_replace('src="/', 'src="/'.$this->uri,$element->find("td", 0)->innertext);
+                $content = str_replace('href="/', 'href="'.$this->uri,$content);
                 $item['content'] = $content;
                 $this->items[] = $item;
             }

From 963bbcc40239c772a404606b8bbc9c26e4800df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:14:56 +0200
Subject: [PATCH 48/62] [CourrierInternationalBridge] fix uri value and code
 simplification
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/CourrierInternationalBridge.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/bridges/CourrierInternationalBridge.php b/bridges/CourrierInternationalBridge.php
index 634b88cb..09d1aa6d 100644
--- a/bridges/CourrierInternationalBridge.php
+++ b/bridges/CourrierInternationalBridge.php
@@ -3,16 +3,13 @@ class CourrierInternationalBridge extends BridgeAbstract{
 
     public $maintainer = "teromene";
     public $name = "Courrier International Bridge";
-    public $uri = "http://CourrierInternational.fr/";
+    public $uri = "http://CourrierInternational.com/";
     public $description = "Courrier International bridge";
 
     public function collectData(){
 
-        $html = '';
-
-        $html = $this->getSimpleHTMLDOM('http://www.courrierinternational.com/') or $this->returnServerError('Error.');
-
-
+        $html = $this->getSimpleHTMLDOM($this->uri)
+            or $this->returnServerError('Error.');
 
         $element = $html->find("article");
 
@@ -25,7 +22,7 @@ class CourrierInternationalBridge extends BridgeAbstract{
             $item['uri'] = $article->parent->getAttribute("href");
 
             if(strpos($item['uri'], "http") === FALSE) {
-                $item['uri'] = "http://courrierinternational.fr/".$item['uri'];
+                $item['uri'] = $this->uri.$item['uri'];
             }
 
             $page = $this->getSimpleHTMLDOM($item['uri']);

From a80246a2b3866d6f0070beb7c0245cd403bb1c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:17:28 +0200
Subject: [PATCH 49/62] [CpasbienBridge] fix and code simplification
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/CpasbienBridge.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php
index 587f84a1..b91f3ae5 100644
--- a/bridges/CpasbienBridge.php
+++ b/bridges/CpasbienBridge.php
@@ -15,18 +15,14 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
     ));
 
     public function collectData(){
-        $html = '';
-        if (isset($this->getInput('q'))) {   /* keyword search mode */
-            $request = str_replace(" ","-",trim($this->getInput('q')));
-            $html = $this->getSimpleHTMLDOM($this->uri.'/recherche/'.urlencode($request).'.html') or $this->returnServerError('No results for this query.');
-        } else {
-            $this->returnClientError('You must specify a keyword (?q=...).');
-        }
+        $request = str_replace(" ","-",trim($this->getInput('q')));
+        $html = $this->getSimpleHTMLDOM($this->uri.'/recherche/'.urlencode($request).'.html')
+            or $this->returnServerError('No results for this query.');
 
         foreach ($html->find('#gauche',0)->find('div') as $episode) {
-            if ($episode->getAttribute('class')=='ligne0' || $episode->getAttribute('class')=='ligne1')
+            if ($episode->getAttribute('class')=='ligne0' ||
+                $episode->getAttribute('class')=='ligne1')
             {
-
                 $htmlepisode=str_get_html($this->get_cached($episode->find('a', 0)->getAttribute('href')));
 
                 $item = array();
@@ -52,8 +48,7 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{
 
 
     public function getName(){
-        return $this->parameters[$this->queriedContext]['q']['value']
-            .' : '.$this->name;
+        return $this->getInput('q').' : '.$this->name;
     }
 
     public function getCacheDuration(){

From f1a3ed297e3976faf81a60877aaf3d2922a96408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:28:50 +0200
Subject: [PATCH 50/62] [CryptomeBridge] use https source + code simplification
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/CryptomeBridge.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/bridges/CryptomeBridge.php b/bridges/CryptomeBridge.php
index 77ce4bd1..072fbd59 100644
--- a/bridges/CryptomeBridge.php
+++ b/bridges/CryptomeBridge.php
@@ -3,36 +3,32 @@ class CryptomeBridge extends BridgeAbstract{
 
     public $maintainer = "BoboTiG";
     public $name = "Cryptome";
-    public $uri = "http://cryptome.org/";
+    public $uri = "https://cryptome.org/";
     public $description = "Returns the N most recent documents.";
 
     public $parameters = array( array(
         'n'=>array(
             'name'=>'number of elements',
             'type'=>'number',
+            'defaultValue'=>20,
             'exampleValue'=>10
         )
     ));
 
     public function collectData(){
-        $html = '';
-        $num = 20;
-        $link = 'http://cryptome.org/';
-        // If you want HTTPS access instead, uncomment the following line:
-        //$link = 'https://secure.netsolhost.com/cryptome.org/';
-
-        $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request Cryptome.');
+        $html = $this->getSimpleHTMLDOM($this->uri)
+            or $this->returnServerError('Could not request Cryptome.');
         if (!empty($this->getInput('n'))) {   /* number of documents */
-            $num = min(max(1, $this->getInput('n')+0), $num);
+            $num = min($this->getInput('n'), 20);
         }
 
 
         foreach($html->find('pre') as $element) {
             for ( $i = 0; $i < $num; ++$i ) {
                 $item = array();
-                $item['uri'] = $link.substr($element->find('a', $i)->href, 20);
+                $item['uri'] = $this->uri.substr($element->find('a', $i)->href, 20);
                 $item['title'] = substr($element->find('b', $i)->plaintext, 22);
-                $item['content'] = preg_replace('#http://cryptome.org/#', $link, $element->find('b', $i)->innertext);
+                $item['content'] = preg_replace('#http://cryptome.org/#', $this->uri, $element->find('b', $i)->innertext);
                 $this->items[] = $item;
             }
             break;

From 2238e8998a6a2bef95f683fd49490921d4f99dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:38:01 +0200
Subject: [PATCH 51/62] [DailymotionBridge] fix + code simplification
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/DailymotionBridge.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php
index 58dfe8f8..7849ba64 100644
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -35,8 +35,11 @@ class DailymotionBridge extends BridgeAbstract{
 
     function getMetadata($id) {
         $metadata=array();
-        $html2 = $this->getSimpleHTMLDOM('http://www.dailymotion.com/video/'.$id)
-            or $this->returnServerError('Could not request Dailymotion.');
+        $html2 = $this->getSimpleHTMLDOM($this->uri.'video/'.$id);
+        if(!$html2){
+            return $metadata;
+        }
+
         $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');
@@ -57,6 +60,9 @@ class DailymotionBridge extends BridgeAbstract{
                 $item = array();
                 $item['id'] = str_replace('/video/', '', strtok($element->href, '_'));
                 $metadata = $this->getMetadata($item['id']);
+                if(empty($metadata)){
+                    continue;
+                }
                 $item['uri'] = $metadata['uri'];
                 $item['title'] = $metadata['title'];
                 $item['timestamp'] = $metadata['timestamp'];
@@ -84,19 +90,20 @@ class DailymotionBridge extends BridgeAbstract{
     }
 
     public function getURI(){
+        $uri=$this->uri;
         switch($this->queriedContext){
         case 'By username':
-            $uri='http://www.dailymotion.com/user/'
+            $uri.='user/'
                 .urlencode($this->getInput('u')).'/1';
             break;
         case 'By playlist id':
-            $uri='http://www.dailymotion.com/playlist/'
+            $uri.='playlist/'
                 .urlencode(strtok($this->getInput('p'), '_'));
             break;
         case 'From search results':
-            $uri='http://www.dailymotion.com/search/'
+            $uri.='search/'
                 .urlencode($this->getInput('s'));
-            if(isset($this->getInput('pa'))){
+            if($this->getInput('pa')){
                 $uri.='/'.$this->getInput('pa');
             }
             break;

From ebe7084cc2f73cf068177a6ddb11e4776597c3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:48:26 +0200
Subject: [PATCH 52/62] [DanbooruBridge] fix + code simplification
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/DanbooruBridge.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php
index 4a48004d..9f6f63aa 100644
--- a/bridges/DanbooruBridge.php
+++ b/bridges/DanbooruBridge.php
@@ -7,25 +7,25 @@ class DanbooruBridge extends BridgeAbstract{
 	public $description = "Returns images from given page";
 
     public $parameters = array( array(
-        'p'=>array('name'=>'page'),
+        'p'=>array(
+            'name'=>'page',
+            'type'=>'number'
+        ),
         't'=>array('name'=>'tags')
     ));
 
     public function collectData(){
-	$page = 1;$tags='';
-        if (isset($this->getInput('p'))) {
-            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-        }
-        if (isset($this->getInput('t'))) {
-            $tags = urlencode($this->getInput('t'));
-        }
-        $html = $this->getSimpleHTMLDOM("http://donmai.us/posts?&page=$page&tags=$tags") or $this->returnServerError('Could not request Danbooru.');
+        $page = $this->getInput('p')?$this->getInput('p'):1;
+        $tags = urlencode($this->getInput('t'));
+
+        $html = $this->getSimpleHTMLDOM($this->uri."posts?&page=$page&tags=$tags")
+            or $this->returnServerError('Could not request Danbooru.');
 	foreach($html->find('div[id=posts] article') as $element) {
 		$item = array();
-		$item['uri'] = 'http://donmai.us'.$element->find('a', 0)->href;
+		$item['uri'] = $this->uri.$element->find('a', 0)->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('data-id'));
 		$item['timestamp'] = time();
-		$thumbnailUri = 'http://donmai.us'.$element->find('img', 0)->src;
+		$thumbnailUri = $this->uri.$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="' . $thumbnailUri . '" /></a><br>Tags: '.$item['tags'];

From c9d89aface2e51682110a5b2dca99f510582178a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:50:46 +0200
Subject: [PATCH 53/62] [DansTonChatBridge] code simplification
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/DansTonChatBridge.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bridges/DansTonChatBridge.php b/bridges/DansTonChatBridge.php
index 32bfe234..f94f1cee 100644
--- a/bridges/DansTonChatBridge.php
+++ b/bridges/DansTonChatBridge.php
@@ -3,14 +3,13 @@ class DansTonChatBridge extends BridgeAbstract{
 
 	public $maintainer = "Astalaseven";
 	public $name = "DansTonChat Bridge";
-	public $uri = "http://danstonchat.com";
+	public $uri = "http://danstonchat.com/";
 	public $description = "Returns latest quotes from DansTonChat.";
 
     public function collectData(){
-        $html = '';
-        $link = 'http://danstonchat.com/latest.html';
 
-        $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request DansTonChat.');
+        $html = $this->getSimpleHTMLDOM($this->uri.'latest.html')
+            or $this->returnServerError('Could not request DansTonChat.');
 
         foreach($html->find('div.item') as $element) {
                 $item = array();

From c3086fa20bc6021bc1c2b4ceeda6b976be730771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:57:40 +0200
Subject: [PATCH 54/62] [DauphineLibereBridge] code simplification
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/DauphineLibereBridge.php | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php
index d4fa6b7d..1084969d 100644
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -31,7 +31,7 @@ class DauphineLibereBridge extends BridgeAbstract {
     ));
 
 	private function ExtractContent($url, $context) {
-		$html2 = $this->getSimpleHTMLDOM($url,false,$context);
+		$html2 = $this->getSimpleHTMLDOM($url);
 		$text = $html2->find('div.column', 0)->innertext;
 		$text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
 		return $text;
@@ -39,22 +39,14 @@ class DauphineLibereBridge extends BridgeAbstract {
 
 	public function collectData(){
 
-		// 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($this->getInput('u'))) { /* user timeline mode */
-			$this->request = $this->getInput('u');
-			$html = $this->getSimpleHTMLDOM('http://www.ledauphine.com/'.$this->request.'/rss',false,$context) or $this->returnServerError('Could not request DauphineLibere.');
-		}
-		else {
-			$html = $this->getSimpleHTMLDOM('http://www.ledauphine.com/rss',false,$context) or $this->returnServerError('Could not request DauphineLibere.');
+		if (empty($this->getInput('u'))) {
+            $html = $this->getSimpleHTMLDOM($this->uri.$this->getInput('u').'/rss')
+                or $this->returnServerError('Could not request DauphineLibere.');
+		} else {
+            $html = $this->getSimpleHTMLDOM($this->uri.'rss')
+                or $this->returnServerError('Could not request DauphineLibere.');
 		}
 		$limit = 0;
 

From 7cfc35d20caec8a91c2b4ed4034c0aaac8e351c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 13:58:43 +0200
Subject: [PATCH 55/62] [DemoBridge] fix uris
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/DemoBridge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridges/DemoBridge.php b/bridges/DemoBridge.php
index feddc32a..2fff948a 100644
--- a/bridges/DemoBridge.php
+++ b/bridges/DemoBridge.php
@@ -3,7 +3,7 @@ class DemoBridge extends BridgeAbstract{
 
     public $maintainer = "teromene";
     public $name = "DemoBridge";
-    public $uri = "http://github.com/sebsauvage/rss-bridge";
+    public $uri = "http://github.com/rss-bridge/rss-bridge";
     public $description = "Bridge used for demos";
 
     public $parameters = array(
@@ -41,7 +41,7 @@ class DemoBridge extends BridgeAbstract{
         $item['title'] = "Test";
         $item['content'] = "Awesome content !";
         $item['id'] = "Lalala";
-        $item['uri'] = "http://test.test/test";
+        $item['uri'] = "http://example.com/test";
 
         $this->items[] = $item;
 

From b1e5c7870f46bb4f69eb784dcdd4ca488a9bc258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 14:00:40 +0200
Subject: [PATCH 56/62] [DeveloppezDotComBridge] code simplification
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/DeveloppezDotComBridge.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php
index d1453fae..a7958e67 100644
--- a/bridges/DeveloppezDotComBridge.php
+++ b/bridges/DeveloppezDotComBridge.php
@@ -39,7 +39,8 @@ class DeveloppezDotComBridge extends BridgeAbstract{
 	}
 
 	public function collectData(){
-		$rssFeed = $this->getSimpleHTMLDOM('http://www.developpez.com/index/rss') or $this->returnServerError('Could not request http://www.developpez.com/index/rss');
+        $rssFeed = $this->getSimpleHTMLDOM($this->uri.'index/rss')
+            or $this->returnServerError('Could not request '.$this->uri.'index/rss');
 		$limit = 0;
 
 		foreach($rssFeed->find('item') as $element) {

From 3df0f299defe443dbc6614dc7ce73a79894c2d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 14:04:19 +0200
Subject: [PATCH 57/62] [DollbooruBridge] fix + code simplification
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/DollbooruBridge.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/bridges/DollbooruBridge.php b/bridges/DollbooruBridge.php
index 8a4e93af..73f2c196 100644
--- a/bridges/DollbooruBridge.php
+++ b/bridges/DollbooruBridge.php
@@ -16,22 +16,18 @@ class DollbooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-	$page = 0;$tags='';
-        if (isset($this->getInput('p'))) {
-            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-        }
-        if (isset($this->getInput('t'))) {
-            $tags = urlencode($this->getInput('t'));
-        }
-        $html = $this->getSimpleHTMLDOM("http://dollbooru.org/post/list/$tags/$page") or $this->returnServerError('Could not request Dollbooru.');
+        $page=$this->getInput('p');
+        $tags = urlencode($this->getInput('t'));
+        $html = $this->getSimpleHTMLDOM($this->uri."post/list/$tags/$page")
+            or $this->returnServerError('Could not request Dollbooru.');
 
 
 	foreach($html->find('div[class=shm-image-list] a') as $element) {
 		$item = array();
-		$item['uri'] = 'http://dollbooru.org'.$element->href;
+		$item['uri'] = $this->uri.$element->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('data-post-id'));
 		$item['timestamp'] = time();
-		$thumbnailUri = 'http://dollbooru.org'.$element->find('img', 0)->src;
+		$thumbnailUri = $this->uri.$element->find('img', 0)->src;
 		$item['tags'] = $element->getAttribute('data-tags');
 		$item['title'] = 'Dollbooru | '.$item['postid'];
 		$item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item['tags'];

From d0cfeed3cf3e6dc12ae9571714140963c804338b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 14:05:39 +0200
Subject: [PATCH 58/62] [DuckDuckGoBridge] code simplification
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/DuckDuckGoBridge.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bridges/DuckDuckGoBridge.php b/bridges/DuckDuckGoBridge.php
index 1ca33bb9..29719a91 100644
--- a/bridges/DuckDuckGoBridge.php
+++ b/bridges/DuckDuckGoBridge.php
@@ -13,10 +13,8 @@ class DuckDuckGoBridge extends BridgeAbstract{
         ));
 
     public function collectData(){
-        $html = '';
-        $link = 'http://duckduckgo.com/html/?q='.$this->getInput('u').'+sort:date';
-
-        $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request DuckDuckGo.');
+        $html = $this->getSimpleHTMLDOM($this->uri.'html/?q='.$this->getInput('u').'+sort:date')
+            or $this->returnServerError('Could not request DuckDuckGo.');
 
         foreach($html->find('div.results_links') as $element) {
                 $item = array();

From cee272ba6ec031ec17c9924835568dab291434c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 14:08:12 +0200
Subject: [PATCH 59/62] [EZTVBridge] fix + code simplification
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/EZTVBridge.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php
index 39eaab4b..a6ab15eb 100644
--- a/bridges/EZTVBridge.php
+++ b/bridges/EZTVBridge.php
@@ -29,16 +29,13 @@ class EZTVBridge extends BridgeAbstract{
                 return mktime(date('h')-$relativeHours,0,0,date('m'),date('d')-$relativeDays,date('Y'));
         }
 
-        // Check for ID provided
-        if (!isset($this->getInput('i')))
-			$this->returnClientError('You must provide a list of ID (?i=showID1,showID2,...)');
-
         // Loop on show ids
         $showList = explode(",",$this->getInput('i'));
         foreach($showList as $showID){
 
             // Get show page
-            $html = $this->getSimpleHTMLDOM('https://eztv.ch/shows/'.rawurlencode($showID).'/') or $this->returnServerError('Could not request EZTV for id "'.$showID.'"');
+            $html = $this->getSimpleHTMLDOM($this->uri.'shows/'.rawurlencode($showID).'/')
+                or $this->returnServerError('Could not request EZTV for id "'.$showID.'"');
 
             // Loop on each element that look like an episode entry...
             foreach($html->find('.forum_header_border') as $element) {
@@ -56,7 +53,7 @@ class EZTVBridge extends BridgeAbstract{
 
                 // Fill item
                 $item = array();
-                $item['uri'] = 'https://eztv.ch/'.$epinfo->href;
+                $item['uri'] = $this->uri.$epinfo->href;
                 $item['id'] = $item['uri'];
                 $item['timestamp'] = makeTimestamp($released->plaintext);
                 $item['title'] = $epinfo->plaintext;

From d4d635a7d2ea78d5b6f922662281458b3332840a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 14:13:45 +0200
Subject: [PATCH 60/62] [EliteDangerousGalnetBridge] code simplification
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/EliteDangerousGalnetBridge.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bridges/EliteDangerousGalnetBridge.php b/bridges/EliteDangerousGalnetBridge.php
index 26f091f1..a15718a2 100644
--- a/bridges/EliteDangerousGalnetBridge.php
+++ b/bridges/EliteDangerousGalnetBridge.php
@@ -3,17 +3,18 @@ class EliteDangerousGalnetBridge extends BridgeAbstract
 {
 	public $maintainer = "corenting";
 	public $name = "Elite: Dangerous Galnet";
-	public $uri = "https://community.elitedangerous.com/galnet";
+	public $uri = "https://community.elitedangerous.com/galnet/";
 	public $description = "Returns the latest page of news from Galnet";
 
 	public function collectData()
 	{
-		$html = $this->getSimpleHTMLDOM('https://community.elitedangerous.com/galnet') or $this->returnServerError('Error while downloading the website content');
+        $html = $this->getSimpleHTMLDOM($this->uri)
+            or $this->returnServerError('Error while downloading the website content');
 		foreach($html->find('div.article') as $element) {
 			$item = array();
 
 			$uri = $element->find('h3 a', 0)->href;
-			$uri = 'https://community.elitedangerous.com' . $uri;
+			$uri = $this->uri . substr($uri,strlen('/galnet/'));
 			$item['uri'] = $uri;
 
 			$title = $element->find('h3 a', 0)->plaintext;

From 342de7744bbfb025f3ccd8b23d8f2223693becab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 14:15:38 +0200
Subject: [PATCH 61/62] [ElsevierBridge] code simplification
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/ElsevierBridge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php
index fa16c8e9..0444f63c 100644
--- a/bridges/ElsevierBridge.php
+++ b/bridges/ElsevierBridge.php
@@ -2,7 +2,7 @@
 class ElsevierBridge extends BridgeAbstract{
 	public $maintainer = 'Pierre Mazière';
 	public $name = 'Elsevier journals recent articles';
-	public $uri = 'http://www.journals.elsevier.com';
+	public $uri = 'http://www.journals.elsevier.com/';
 	public $description = 'Returns the recent articles published in Elsevier journals';
 
     public $parameters = array( array(
@@ -56,7 +56,7 @@ class ElsevierBridge extends BridgeAbstract{
 	}
 
 	public function collectData(){
-		$uri = 'http://www.journals.elsevier.com/' . $this->getInput('j') . '/recent-articles/';
+		$uri = $this->uri . $this->getInput('j') . '/recent-articles/';
 		$html = $this->getSimpleHTMLDOM($uri) or $this->returnServerError('No results for Elsevier journal '.$this->getInput('j'));
 
 		foreach($html->find('.pod-listing') as $article){

From 8c7b53b883283fce7c07936095d5984132cec209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 14:24:17 +0200
Subject: [PATCH 62/62] [FacebookBridge] fix + code simplification
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/FacebookBridge.php | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php
index 0a2554a0..2c179909 100644
--- a/bridges/FacebookBridge.php
+++ b/bridges/FacebookBridge.php
@@ -3,7 +3,7 @@ class FacebookBridge extends BridgeAbstract{
 
 	public $maintainer = "teromene";
 	public $name = "Facebook";
-	public $uri = "http://www.facebook.com/";
+	public $uri = "https://www.facebook.com/";
 	public $description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117";
 
     public $parameters =array( array(
@@ -13,6 +13,8 @@ class FacebookBridge extends BridgeAbstract{
         )
     ));
 
+    private $authorName='';
+
 	public function collectData(){
 
 		//Extract a string using start and end delimiters
@@ -29,7 +31,7 @@ class FacebookBridge extends BridgeAbstract{
 			if (is_array($matches) && count($matches) > 1) {
 				$link = $matches[1];
 				if (strpos($link, '/') === 0)
-					$link = 'https://www.facebook.com'.$link.'"';
+					$link = $this->uri.$link.'"';
 				if (strpos($link, 'facebook.com/l.php?u=') !== false)
 					$link = urldecode(ExtractFromDelimiters($link, 'facebook.com/l.php?u=', '&'));
 				return ' href="'.$link.'"';
@@ -101,14 +103,12 @@ class FacebookBridge extends BridgeAbstract{
 
 		//Retrieve page contents
 		if (is_null($html)) {
-			if (isset($this->getInput('u'))) {
-				if (!strpos($this->getInput('u'), "/")) {
-					$html = $this->getSimpleHTMLDOM('https://www.facebook.com/'.urlencode($this->getInput('u')).'?_fb_noscript=1') or $this->returnServerError('No results for this query.');
-				} else {
-					$html = $this->getSimpleHTMLDOM('https://www.facebook.com/pages/'.$this->getInput('u').'?_fb_noscript=1') or $this->returnServerError('No results for this query.');
-				}
+			if (!strpos($this->getInput('u'), "/")) {
+                $html = $this->getSimpleHTMLDOM($this->uri.urlencode($this->getInput('u')).'?_fb_noscript=1')
+                    or $this->returnServerError('No results for this query.');
 			} else {
-				$this->returnClientError('You must specify a Facebook username.');
+                $html = $this->getSimpleHTMLDOM($this->uri.'pages/'.$this->getInput('u').'?_fb_noscript=1')
+                    or $this->returnServerError('No results for this query.');
 			}
 		}
 
@@ -123,7 +123,7 @@ class FacebookBridge extends BridgeAbstract{
 			foreach ($captcha->find('input, button') as $input)
 				$captcha_fields[$input->name] = $input->value;
 			$_SESSION['captcha_fields'] = $captcha_fields;
-			$_SESSION['captcha_action'] = 'https://www.facebook.com'.$captcha->find('form', 0)->action;
+			$_SESSION['captcha_action'] = $this->uri.$captcha->find('form', 0)->action;
 
 			//Show captcha filling form to the viewer, proxying the captcha image
 			$img = base64_encode($this->getContents($captcha->find('img', 0)->src));
@@ -146,7 +146,7 @@ class FacebookBridge extends BridgeAbstract{
 
 			$author = str_replace(' | Facebook', '', $html->find('title#pageTitle', 0)->innertext);
 			$profilePic = 'https://graph.facebook.com/'.$this->getInput('u').'/picture?width=200&amp;height=200';
-			$this->name = $author;
+			$this->authorName = $author;
 
 			foreach($element->children() as $post) {
 
@@ -192,7 +192,7 @@ class FacebookBridge extends BridgeAbstract{
 						$title = substr($title, 0, strpos(wordwrap($title, 64), "\n")).'...';
 
 					//Build and add final item
-					$item['uri'] = 'https://facebook.com'.$post->find('abbr')[0]->parent()->getAttribute('href');
+					$item['uri'] = $this->uri.$post->find('abbr')[0]->parent()->getAttribute('href');
 					$item['content'] = $content;
 					$item['title'] = $title;
 					$item['author'] = $author;
@@ -203,14 +203,8 @@ class FacebookBridge extends BridgeAbstract{
 		}
 	}
 
-	public function setDatas(array $param){
-		if (isset($this->getInput('captcha_response')))
-			unset($this->getInput('captcha_response'));
-		parent::setDatas($param);
-	}
-
 	public function getName() {
-		return (isset($this->name) ? $this->name.' - ' : '').'Facebook Bridge';
+		return (isset($this->authorName) ? $this->authorName.' - ' : '').'Facebook Bridge';
 	}
 
 	public function getCacheDuration() {