From 41dfc571037f6966548f534a609e8b7aae59b417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 20:16:00 +0200
Subject: [PATCH 01/39] [OpenClassroomsBridge] add getURI() + 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/OpenClassroomsBridge.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/bridges/OpenClassroomsBridge.php b/bridges/OpenClassroomsBridge.php
index 9e560f9e..39fc87b7 100644
--- a/bridges/OpenClassroomsBridge.php
+++ b/bridges/OpenClassroomsBridge.php
@@ -10,6 +10,7 @@ class OpenClassroomsBridge extends BridgeAbstract{
         'u'=>array(
             'name'=>'Catégorie',
             'type'=>'list',
+            'required'=>true,
             'values'=>array(
                 'Arts & Culture'=>'arts',
                 'Code'=>'code',
@@ -24,21 +25,18 @@ class OpenClassroomsBridge extends BridgeAbstract{
         )
     ));
 
+    public function getURI(){
+      return $this->uri.'/courses?categories='.$this->getInput('u').'&'
+        .'title=&sort=updatedAt+desc';
+    }
 
     public function collectData(){
-        if (empty($this->getInput('u')))
-        {
-            $this->returnServerError('Error: You must chose a category.');
-        }
-
-        $html = '';
-        $link = 'https://openclassrooms.com/courses?categories='.$this->getInput('u').'&title=&sort=updatedAt+desc';
-
-        $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request OpenClassrooms.');
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+          or $this->returnServerError('Could not request OpenClassrooms.');
 
         foreach($html->find('.courseListItem') as $element) {
                 $item = array();
-                $item['uri'] = 'https://openclassrooms.com'.$element->find('a', 0)->href;
+                $item['uri'] = $this->uri.$element->find('a', 0)->href;
                 $item['title'] = $element->find('h3', 0)->plaintext;
                 $item['content'] = $element->find('slidingItem__descriptionContent', 0)->plaintext;
                 $this->items[] = $item;

From 0b4854ccbfacd24c09b1519e99dd36556632d4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 20:23:36 +0200
Subject: [PATCH 02/39] [ParuVenduImmobilierBridge] 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/ParuVenduImmoBridge.php | 62 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php
index d3c38460..9f1cfd42 100644
--- a/bridges/ParuVenduImmoBridge.php
+++ b/bridges/ParuVenduImmoBridge.php
@@ -25,30 +25,8 @@ class ParuVenduImmoBridge extends BridgeAbstract
 
     public function collectData()
     {
-        $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 ($this->getInput('minarea')) {
-            $link .= '&sur0='.urlencode($this->getInput('minarea'));
-        }
-
-        if ($this->getInput('maxprice')) {
-            $link .= '&px1='.urlencode($this->getInput('maxprice'));
-        }
-
-        if ($this->getInput('pa')) {
-            $link .= '&pa='.urlencode($this->getInput('pa'));
-        }
-
-        if ($this->getInput('lo')) {
-            $link .= '&lo='.urlencode($this->getInput('lo'));
-        }
-
-        $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request paruvendu.');
-
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+          or $this->returnServerError('Could not request paruvendu.');
 
         foreach($html->find('div.annonce a') as $element) {
 
@@ -79,16 +57,38 @@ class ParuVenduImmoBridge extends BridgeAbstract
         }
     }
 
+    public function getURI(){
+        $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 ($this->getInput('minarea')) {
+            $link .= '&sur0='.urlencode($this->getInput('minarea'));
+        }
+
+        if ($this->getInput('maxprice')) {
+            $link .= '&px1='.urlencode($this->getInput('maxprice'));
+        }
+
+        if ($this->getInput('pa')) {
+            $link .= '&pa='.urlencode($this->getInput('pa'));
+        }
+
+        if ($this->getInput('lo')) {
+            $link .= '&lo='.urlencode($this->getInput('lo'));
+        }
+        return $link;
+    }
+
     public function getName(){
         $request='';
-        if($this->getInput('minarea') &&
-            !empty($this->getInput('minarea'))
-        ){
-            $request .= ' '.$this->getInput('minarea').' m2';
+        $minarea=$this->getInput('minarea');
+        if(!empty($minarea)){
+            $request .= ' '.$minarea.' m2';
         }
-        if($this->getInput('lo') &&
-            !empty($this->getInput('lo'))){
-            $request .= ' In: '.$this->getInput('lo');
+        $location=$this->getInput('lo');
+        if(!empty($location)){
+            $request .= ' In: '.$location;
         }
         return 'Paru Vendu Immobilier'.$request;
     }

From 5f0b8434534bc5a73c4bdef242763f357a152736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 20:41:15 +0200
Subject: [PATCH 03/39] [PickyWallpapersBridge] add getURI() + 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/PickyWallpapersBridge.php | 74 +++++++++++++++----------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php
index 6fa77ca0..001cd1d2 100644
--- a/bridges/PickyWallpapersBridge.php
+++ b/bridges/PickyWallpapersBridge.php
@@ -1,73 +1,73 @@
 <?php
 class PickyWallpapersBridge extends BridgeAbstract {
 
-    private $category;
-    private $subcategory;
-    private $resolution;
-
 	public $maintainer = "nel50n";
 	public $name = "PickyWallpapers Bridge";
 	public $uri = "http://www.pickywallpapers.com/";
 	public $description = "Returns the latests wallpapers from PickyWallpapers";
 
     public $parameters = array( array(
-        'c'=>array('name'=>'category'),
+      'c'=>array(
+        'name'=>'category',
+        'required'=>true
+      ),
         's'=>array('name'=>'subcategory'),
         'm'=>array(
             'name'=>'Max number of wallpapers',
+            'defaultValue'=>12,
             'type'=>'number'
         ),
         'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…',
+            'defaultValue'=>'1920x1200',
             'pattern'=>'[0-9]{3,4}x[0-9]{3,4}'
         )
     ));
 
 
     public function collectData(){
-        $html = '';
-        if (!$this->getInput('c')) {
-            $this->returnClientError('You must specify at least a category (?c=...).');
-        } else {
-            $baseUri = 'http://www.pickywallpapers.com';
+        $lastpage = 1;
+        $num = 0;
+        $max = $this->getInput('m');
+        $resolution = $this->getInput('r');    // Wide wallpaper default
 
-            $this->category = $this->getInput('c');
-            $this->subcategory = $this->getInput('s') ?: '';
-            $this->resolution = $this->getInput('r') ?: '1920x1200';    // Wide wallpaper default
+        for ($page = 1; $page <= $lastpage; $page++) {
+          $html = $this->getSimpleHTMLDOM($this->getURI().'/page-'.$page.'/')
+            or $this->returnServerError('No results for this query.');
 
-            $num = 0;
-            $max = $this->getInput('m') ?: 12;
-            $lastpage = 1;
+            if ($page === 1) {
+                preg_match('/page-(\d+)\/$/', $html->find('.pages li a', -2)->href, $matches);
+                $lastpage = min($matches[1], ceil($max/12));
+            }
 
-            for ($page = 1; $page <= $lastpage; $page++) {
-                $link = $baseUri.'/'.$this->resolution.'/'.$this->category.'/'.(!empty($this->subcategory)?$this->subcategory.'/':'').'page-'.$page.'/';
-                $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('No results for this query.');
+            foreach($html->find('.items li img') as $element) {
 
-                if ($page === 1) {
-                    preg_match('/page-(\d+)\/$/', $html->find('.pages li a', -2)->href, $matches);
-                    $lastpage = min($matches[1], ceil($max/12));
-                }
+                $item = array();
+                $item['uri'] = str_replace('www', 'wallpaper', $this->uri).'/'.$resolution.'/'.basename($element->src);
+                $item['timestamp'] = time();
+                $item['title'] = $element->alt;
+                $item['content'] = $item['title'].'<br><a href="'.$item['uri'].'">'.$element.'</a>';
+                $this->items[] = $item;
 
-                foreach($html->find('.items li img') as $element) {
-
-                    $item = array();
-                    $item['uri'] = str_replace('www', 'wallpaper', $baseUri).'/'.$this->resolution.'/'.basename($element->src);
-                    $item['timestamp'] = time();
-                    $item['title'] = $element->alt;
-                    $item['content'] = $item['title'].'<br><a href="'.$item['uri'].'">'.$element.'</a>';
-                    $this->items[] = $item;
-
-                    $num++;
-                    if ($num >= $max)
-                        break 2;
-                }
+                $num++;
+                if ($num >= $max)
+                    break 2;
             }
         }
     }
 
+    public function getURI(){
+        $subcategory = $this->getInput('s');
+        $link = $this->uri.$this->getInput('r').'/'.$this->getInput('c').'/'.$subcategory;
+        return $link;
+    }
+
     public function getName(){
-        return 'PickyWallpapers - '.$this->category.(!empty($this->subcategory) ? ' > '.$this->subcategory : '').' ['.$this->resolution.']';
+        $subcategory = $this->getInput('s');
+        return 'PickyWallpapers - '.$this->getInput('c')
+          .($subcategory? ' > '.$subcategory : '')
+          .' ['.$this->getInput('r').']';
     }
 
     public function getCacheDuration(){

From 75f312ea7b36bc5b91baafbe2c2b46b431770cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 21:51:48 +0200
Subject: [PATCH 04/39] [PinterestBridge] add getURI() + 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/PinterestBridge.php | 87 +++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php
index 1bd868ed..8f12e8b2 100644
--- a/bridges/PinterestBridge.php
+++ b/bridges/PinterestBridge.php
@@ -1,53 +1,41 @@
 <?php
 class PinterestBridge extends BridgeAbstract{
 
-    private $username;
-    private $board;
-    private $query;
-
 	public $maintainer = "pauder";
 	public $name = "Pinterest Bridge";
-	public $uri = "http://www.pinterest.com";
+	public $uri = "http://www.pinterest.com/";
 	public $description = "Returns the newest images on a board";
 
     public $parameters = array(
         'By username and board' => array(
-            'u'=>array('name'=>'username'),
-            'b'=>array('name'=>'board')
+          'u'=>array(
+            'name'=>'username',
+            'required'=>true
+          ),
+          'b'=>array(
+            'name'=>'board',
+            'required'=>true
+          )
         ),
         'From search' => array(
-            'q'=>array('name'=>'Keyword')
+          'q'=>array(
+            'name'=>'Keyword',
+            'required'=>true
+          )
         )
     );
 
+
     public function collectData(){
-        $html = '';
-        if ($this->getInput('u') || $this->getInput('b')) {
-
-            if (empty($this->getInput('u')))
-            {
-                $this->returnClientError('You must specify a Pinterest username (?u=...).');
-            }
-
-            if (empty($this->getInput('b')))
-            {
-                $this->returnClientError('You must specify a Pinterest board for this username (?b=...).');
-            }
-
-            $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 ($this->getInput('q'))
-        {
-        	$this->query = $this->getInput('q');
-        	$html = $this->getSimpleHTMLDOM($this->getURI().'/search/?q='.urlencode($this->query)) or $this->returnServerError('Could not request Pinterest.');
+      $html = $this->getSimpleHTMLDOM($this->getURI()) ;
+      if(!$html){
+        switch($this->queriedContext){
+        case 'By username and board':
+          $this->returnServerError('Username and/or board not found');
+        case 'From search':
+          $this->returnServerError('Could not request Pinterest.');
         }
-
-        else {
-            $this->returnClientError('You must specify a Pinterest username and a board name (?u=...&b=...).');
-        }
-
+      }
 
         foreach($html->find('div.pinWrapper') as $div)
         {
@@ -60,7 +48,7 @@ class PinterestBridge extends BridgeAbstract{
         	$item['content'] = '<img src="' . htmlentities(str_replace('/236x/', '/736x/', $img->getAttribute('src'))) . '" alt="" />';
 
 
-        	if (isset($this->query))
+        	if ($this->queriedContext==='From search')
         	{
         		$avatar = $div->find('div.creditImg', 0)->find('img', 0);
 				$avatar = $avatar->getAttribute('data-src');
@@ -86,13 +74,28 @@ class PinterestBridge extends BridgeAbstract{
         }
     }
 
-    public function getName(){
+    public function getURI(){
+      switch($this->queriedContext){
+      case 'By username and board':
+        $uri = $this->uri.urlencode($this->getInput('u')).'/'.urlencode($this->getInput('b'));
+        break;
+      case 'From search':
+        $uri = $this->uri.'search/?q='.urlencode($this->getInput('q'));
+        break;
+      }
 
-    	if (isset($this->query))
-    	{
-    		return $this->query .' - Pinterest';
-    	} else {
-        	return $this->username .' - '. $this->board.' - Pinterest';
-    	}
+      return $uri;
+    }
+
+    public function getName(){
+      switch($this->queriedContext){
+      case 'By username and board':
+            $specific = $this->getInput('u').'-'.$this->getInput('b');
+        break;
+      case 'From search':
+            $specific = $this->getInput('q');
+        break;
+      }
+      return $specific .' - '.$this->name;
     }
 }

From 662c1b6410dbd21ac7308d7de769cd4e034ad451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 21:52:56 +0200
Subject: [PATCH 05/39] [PlanetLibreBridge] 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/PlanetLibreBridge.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php
index bfafb48f..6e2024f5 100644
--- a/bridges/PlanetLibreBridge.php
+++ b/bridges/PlanetLibreBridge.php
@@ -13,7 +13,8 @@ class PlanetLibreBridge extends BridgeAbstract{
 	}
 
 	public function collectData(){
-		$html = $this->getSimpleHTMLDOM('http://www.planet-libre.org/') or $this->returnServerError('Could not request PlanetLibre.');
+      $html = $this->getSimpleHTMLDOM($this->uri)
+        or $this->returnServerError('Could not request PlanetLibre.');
 		$limit = 0;
 		foreach($html->find('div.post') as $element) {
 			if($limit < 5) {

From 08158825d9a41918745459632172763bea060282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 21:54:25 +0200
Subject: [PATCH 06/39] [ProjectMGameBridge] 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/ProjectMGameBridge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bridges/ProjectMGameBridge.php b/bridges/ProjectMGameBridge.php
index b7130a23..dad98ddb 100644
--- a/bridges/ProjectMGameBridge.php
+++ b/bridges/ProjectMGameBridge.php
@@ -8,12 +8,12 @@ class ProjectMGameBridge extends BridgeAbstract{
 
 
   public function collectData(){
-    $html = '';
-    $html = $this->getSimpleHTMLDOM('http://projectmgame.com/en/') or $this->returnServerError('Error while downloading the Project M homepage');
+    $html = $this->getSimpleHTMLDOM($this->uri)
+      or $this->returnServerError('Error while downloading the Project M homepage');
 
     foreach($html->find('article') as $article) {
       $item = array();
-      $item['uri'] = 'http://projectmgame.com/en/'.$article->find('section div.info_block a',0)->href;
+      $item['uri'] = $this->uri.$article->find('section div.info_block a',0)->href;
       $item['title'] = $article->find('h1 p',0)->innertext;
 
       $p_list = $article->find('section p');

From 9f82adc87bca74def1071567bf2b20e3e774a879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:04:26 +0200
Subject: [PATCH 07/39] [RTBFBridge] add getURI() + 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/RTBFBridge.php | 45 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php
index 6097dcfc..cee0f0e9 100644
--- a/bridges/RTBFBridge.php
+++ b/bridges/RTBFBridge.php
@@ -1,7 +1,7 @@
 <?php
 class RTBFBridge extends BridgeAbstract {
 	public $name = "RTBF Bridge";
-	public $uri = "http://www.rtbf.be/auvio/emissions";
+	public $uri = "http://www.rtbf.be/auvio/emissions/";
 	public $description = "Returns the newest RTBF videos by series ID";
 	public $maintainer = "Frenzie";
 
@@ -18,32 +18,33 @@ class RTBFBridge extends BridgeAbstract {
 		$limit = 10;
 		$count = 0;
 
-		if ($this->getInput('c')) {
-			$html = $this->getSimpleHTMLDOM('http://www.rtbf.be/auvio/emissions/detail?id='.$this->getInput('c')) or $this->returnServerError('Could not request RTBF.');
+        $html = $this->getSimpleHTMLDOM($this->getURI())
+          or $this->returnServerError('Could not request RTBF.');
 
-			foreach($html->find('section[id!=widget-ml-avoiraussi-] .rtbf-media-grid article') as $element) {
-				if($count < $limit) {
-					$item = array();
-					$item['id'] = $element->getAttribute('data-id');
-					$item['uri'] = 'http://www.rtbf.be/auvio/detail?id='.$item['id'];
-					$thumbnailUriSrcSet = explode(',', $element->find('figure .www-img-16by9 img', 0)->getAttribute('data-srcset'));
-					$thumbnailUriLastSrc = end($thumbnailUriSrcSet);
-					$thumbnailUri = explode(' ', $thumbnailUriLastSrc)[0];
-					$item['title'] = trim($element->find('h3',0)->plaintext) . ' - ' . trim($element->find('h4',0)->plaintext);
-					$item['timestamp'] = strtotime($element->find('time', 0)->getAttribute('datetime'));
-					$item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $thumbnailUri . '" /></a>';
-					$this->items[] = $item;
-					$count++;
-				}
-			}
-		}
-		else {
-			$this->returnClientError('You must specify a series id.');
+		foreach($html->find('section[id!=widget-ml-avoiraussi-] .rtbf-media-grid article') as $element) {
+			if($count >= $limit) {
+              break;
+            }
+			$item = array();
+			$item['id'] = $element->getAttribute('data-id');
+			$item['uri'] = $this->uri.'detail?id='.$item['id'];
+			$thumbnailUriSrcSet = explode(',', $element->find('figure .www-img-16by9 img', 0)->getAttribute('data-srcset'));
+			$thumbnailUriLastSrc = end($thumbnailUriSrcSet);
+			$thumbnailUri = explode(' ', $thumbnailUriLastSrc)[0];
+			$item['title'] = trim($element->find('h3',0)->plaintext) . ' - ' . trim($element->find('h4',0)->plaintext);
+			$item['timestamp'] = strtotime($element->find('time', 0)->getAttribute('datetime'));
+			$item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $thumbnailUri . '" /></a>';
+			$this->items[] = $item;
+			$count++;
 		}
 	}
 
+    public function getURI(){
+      return $this->uri.'detail?id='.$this->getInput('c');
+    }
+
 	public function getName(){
-		return (!empty($this->request) ? $this->request .' - ' : '') .'RTBF Bridge';
+		return $this->getInput('c') .' - RTBF Bridge';
 	}
 
 	public function getCacheDuration(){

From 75a6f8af8ad116e3ba5d8cb9c54d72bf2468d47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:22:33 +0200
Subject: [PATCH 08/39] [Releases3DSBridge] 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/Releases3DSBridge.php | 150 +++++++++++++++++-----------------
 1 file changed, 77 insertions(+), 73 deletions(-)

diff --git a/bridges/Releases3DSBridge.php b/bridges/Releases3DSBridge.php
index 25ba50be..3e4ccaea 100644
--- a/bridges/Releases3DSBridge.php
+++ b/bridges/Releases3DSBridge.php
@@ -32,84 +32,88 @@ class Releases3DSBridge extends BridgeAbstract {
             }
         }
 
-        $dataUrl = 'http://3dsdb.com/xml.php';
+        $dataUrl = $this->uri.'xml.php';
         $xml = $this->getContents($dataUrl) or $this->returnServerError('Could not request 3dsdb: '.$dataUrl);
         $limit = 0;
 
         foreach (array_reverse(explode('<release>', $xml)) as $element) {
-            if ($limit < 5) {
-                if (strpos($element, '</release>') !== false) {
-
-                    $id = ExtractFromDelimiters($element, '<id>', '</id>');
-                    $name = ExtractFromDelimiters($element, '<name>', '</name>');
-                    $publisher = ExtractFromDelimiters($element, '<publisher>', '</publisher>');
-                    $region = ExtractFromDelimiters($element, '<region>', '</region>');
-                    $group = ExtractFromDelimiters($element, '<group>', '</group>');
-                    $imagesize = ExtractFromDelimiters($element, '<imagesize>', '</imagesize>');
-                    $serial = ExtractFromDelimiters($element, '<serial>', '</serial>');
-                    $titleid = ExtractFromDelimiters($element, '<titleid>', '</titleid>');
-                    $imgcrc = ExtractFromDelimiters($element, '<imgcrc>', '</imgcrc>');
-                    $filename = ExtractFromDelimiters($element, '<filename>', '</filename>');
-                    $releasename = ExtractFromDelimiters($element, '<releasename>', '</releasename>');
-                    $trimmedsize = ExtractFromDelimiters($element, '<trimmedsize>', '</trimmedsize>');
-                    $firmware = ExtractFromDelimiters($element, '<firmware>', '</firmware>');
-                    $type = ExtractFromDelimiters($element, '<type>', '</type>');
-                    $card = ExtractFromDelimiters($element, '<card>', '</card>');
-
-                    if (!empty($releasename)) {
-
-                        //Retrieve cover art and short desc from IGN?
-                        $ignResult = false; $ignDescription = ''; $ignLink = ''; $ignDate = time(); $ignCoverArt = '';
-                        $ignSearchUrl = 'http://www.ign.com/search?q='.urlencode($name);
-                        if ($ignResult = $this->getSimpleHTMLDOM($ignSearchUrl)) {
-                            $ignCoverArt = $ignResult->find('div.search-item-media', 0)->find('img', 0)->src;
-                            $ignDesc = $ignResult->find('div.search-item-description', 0)->plaintext;
-                            $ignLink = $ignResult->find('div.search-item-sub-title', 0)->find('a', 1)->href;
-                            $ignDate = strtotime(trim($ignResult->find('span.publish-date', 0)->plaintext));
-                            $ignDescription = '<div><img src="'.$ignCoverArt.'" /></div><div>'.$ignDesc.' <a href="'.$ignLink.'">More at IGN</a></div>';
-                        }
-
-                        //Main section : Release description from 3DS database
-                        $releaseDescription = '<h3>Release Details</h3>'
-                            .'<b>Release ID: </b>'.$id.'<br />'
-                            .'<b>Game Name: </b>'.$name.'<br />'
-                            .'<b>Publisher: </b>'.$publisher.'<br />'
-                            .'<b>Region: </b>'.$region.'<br />'
-                            .'<b>Group: </b>'.$group.'<br />'
-                            .'<b>Image size: </b>'.(intval($imagesize)/8).'MB<br />'
-                            .'<b>Serial: </b>'.$serial.'<br />'
-                            .'<b>Title ID: </b>'.$titleid.'<br />'
-                            .'<b>Image CRC: </b>'.$imgcrc.'<br />'
-                            .'<b>File Name: </b>'.$filename.'<br />'
-                            .'<b>Release Name: </b>'.$releasename.'<br />'
-                            .'<b>Trimmed size: </b>'.intval(intval($trimmedsize)/1048576).'MB<br />'
-                            .'<b>Firmware: </b>'.$firmware.'<br />'
-                            .'<b>Type: </b>'.TypeToString($type).'<br />'
-                            .'<b>Card: </b>'.CardToString($card).'<br />';
-
-                        //Build search links section to facilitate release search using search engines
-                        $releaseNameEncoded = urlencode(str_replace(' ', '+', $releasename));
-                        $searchLinkGoogle = 'https://google.com/?q='.$releaseNameEncoded;
-                        $searchLinkDuckDuckGo = 'https://duckduckgo.com/?q='.$releaseNameEncoded;
-                        $searchLinkQwant = 'https://lite.qwant.com/?q='.$releaseNameEncoded.'&t=web';
-                        $releaseSearchLinks = '<h3>Search this release</h3><ul>'
-                            .'<li><a href="'.$searchLinkGoogle.'">Search using Google</a></li>'
-                            .'<li><a href="'.$searchLinkDuckDuckGo.'">Search using DuckDuckGo</a></li>'
-                            .'<li><a href="'.$searchLinkQwant.'">Search using Qwant</a></li>'
-                            .'</ul>';
-
-                        //Build and add final item with the above three sections
-                        $item = array();
-                        $item['title'] = $name;
-                        $item['author'] = $publisher;
-                        $item['timestamp'] = $ignDate;
-                        $item['uri'] = empty($ignLink) ? $searchLinkDuckDuckGo : $ignLink;
-                        $item['content'] = $ignDescription.$releaseDescription.$releaseSearchLinks;
-                        $this->items[] = $item;
-                        $limit++;
-                    }
-                }
+            if ($limit >= 5) {
+              break;
             }
+
+            if (strpos($element, '</release>') === false) {
+              continue;
+            }
+
+            $releasename = ExtractFromDelimiters($element, '<releasename>', '</releasename>');
+            if (empty($releasename)) {
+              continue;
+            }
+
+            $id = ExtractFromDelimiters($element, '<id>', '</id>');
+            $name = ExtractFromDelimiters($element, '<name>', '</name>');
+            $publisher = ExtractFromDelimiters($element, '<publisher>', '</publisher>');
+            $region = ExtractFromDelimiters($element, '<region>', '</region>');
+            $group = ExtractFromDelimiters($element, '<group>', '</group>');
+            $imagesize = ExtractFromDelimiters($element, '<imagesize>', '</imagesize>');
+            $serial = ExtractFromDelimiters($element, '<serial>', '</serial>');
+            $titleid = ExtractFromDelimiters($element, '<titleid>', '</titleid>');
+            $imgcrc = ExtractFromDelimiters($element, '<imgcrc>', '</imgcrc>');
+            $filename = ExtractFromDelimiters($element, '<filename>', '</filename>');
+            $trimmedsize = ExtractFromDelimiters($element, '<trimmedsize>', '</trimmedsize>');
+            $firmware = ExtractFromDelimiters($element, '<firmware>', '</firmware>');
+            $type = ExtractFromDelimiters($element, '<type>', '</type>');
+            $card = ExtractFromDelimiters($element, '<card>', '</card>');
+
+            //Retrieve cover art and short desc from IGN?
+            $ignResult = false; $ignDescription = ''; $ignLink = ''; $ignDate = time(); $ignCoverArt = '';
+            $ignSearchUrl = 'http://www.ign.com/search?q='.urlencode($name);
+            if ($ignResult = $this->getSimpleHTMLDOM($ignSearchUrl)) {
+                $ignCoverArt = $ignResult->find('div.search-item-media', 0)->find('img', 0)->src;
+                $ignDesc = $ignResult->find('div.search-item-description', 0)->plaintext;
+                $ignLink = $ignResult->find('div.search-item-sub-title', 0)->find('a', 1)->href;
+                $ignDate = strtotime(trim($ignResult->find('span.publish-date', 0)->plaintext));
+                $ignDescription = '<div><img src="'.$ignCoverArt.'" /></div><div>'.$ignDesc.' <a href="'.$ignLink.'">More at IGN</a></div>';
+            }
+
+            //Main section : Release description from 3DS database
+            $releaseDescription = '<h3>Release Details</h3>'
+                .'<b>Release ID: </b>'.$id.'<br />'
+                .'<b>Game Name: </b>'.$name.'<br />'
+                .'<b>Publisher: </b>'.$publisher.'<br />'
+                .'<b>Region: </b>'.$region.'<br />'
+                .'<b>Group: </b>'.$group.'<br />'
+                .'<b>Image size: </b>'.(intval($imagesize)/8).'MB<br />'
+                .'<b>Serial: </b>'.$serial.'<br />'
+                .'<b>Title ID: </b>'.$titleid.'<br />'
+                .'<b>Image CRC: </b>'.$imgcrc.'<br />'
+                .'<b>File Name: </b>'.$filename.'<br />'
+                .'<b>Release Name: </b>'.$releasename.'<br />'
+                .'<b>Trimmed size: </b>'.intval(intval($trimmedsize)/1048576).'MB<br />'
+                .'<b>Firmware: </b>'.$firmware.'<br />'
+                .'<b>Type: </b>'.TypeToString($type).'<br />'
+                .'<b>Card: </b>'.CardToString($card).'<br />';
+
+            //Build search links section to facilitate release search using search engines
+            $releaseNameEncoded = urlencode(str_replace(' ', '+', $releasename));
+            $searchLinkGoogle = 'https://google.com/?q='.$releaseNameEncoded;
+            $searchLinkDuckDuckGo = 'https://duckduckgo.com/?q='.$releaseNameEncoded;
+            $searchLinkQwant = 'https://lite.qwant.com/?q='.$releaseNameEncoded.'&t=web';
+            $releaseSearchLinks = '<h3>Search this release</h3><ul>'
+                .'<li><a href="'.$searchLinkGoogle.'">Search using Google</a></li>'
+                .'<li><a href="'.$searchLinkDuckDuckGo.'">Search using DuckDuckGo</a></li>'
+                .'<li><a href="'.$searchLinkQwant.'">Search using Qwant</a></li>'
+                .'</ul>';
+
+            //Build and add final item with the above three sections
+            $item = array();
+            $item['title'] = $name;
+            $item['author'] = $publisher;
+            $item['timestamp'] = $ignDate;
+            $item['uri'] = empty($ignLink) ? $searchLinkDuckDuckGo : $ignLink;
+            $item['content'] = $ignDescription.$releaseDescription.$releaseSearchLinks;
+            $this->items[] = $item;
+            $limit++;
         }
     }
 

From 927ae17d5ca8f07ae58da46c2e3e8c2f14713eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:23:24 +0200
Subject: [PATCH 09/39] [ReporterreBridge] 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/ReporterreBridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php
index 8596942c..676604ba 100644
--- a/bridges/ReporterreBridge.php
+++ b/bridges/ReporterreBridge.php
@@ -24,7 +24,7 @@ class ReporterreBridge extends BridgeAbstract{
 		}
 
 	public function collectData(){
-		$html = $this->getSimpleHTMLDOM('http://www.reporterre.net/spip.php?page=backend') or $this->returnServerError('Could not request Reporterre.');
+		$html = $this->getSimpleHTMLDOM($this->uri.'spip.php?page=backend') or $this->returnServerError('Could not request Reporterre.');
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {

From 5704b6e3c4ca72828b390705038b5b9fab014e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:26:06 +0200
Subject: [PATCH 10/39] [Rule34Bridge] 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/Rule34Bridge.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php
index d18297b0..436b9097 100644
--- a/bridges/Rule34Bridge.php
+++ b/bridges/Rule34Bridge.php
@@ -15,21 +15,16 @@ class Rule34Bridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-	$page = 0;$tags='';
-        if ($this->getInput('p')) {
-		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-		$page = $page - 1;
-		$page = $page * 50;
-        }
-        if ($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.');
+        $html = $this->getSimpleHTMLDOM(
+            $this->uri.'index.php?page=post&s=list&'
+            .'&pid='.($this->getInput('p')?($this->getInput('p') -1)*50:'')
+            .'&tags='.urlencode($this->getInput('t'))
+        ) or $this->returnServerError('Could not request Rule34.');
 
 
 	foreach($html->find('div[class=content] span') as $element) {
 		$item = array();
-		$item['uri'] = 'http://rule34.xxx/'.$element->find('a', 0)->href;
+		$item['uri'] = $this->uri.$element->find('a', 0)->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));
 		$item['timestamp'] = time();
 		$thumbnailUri = $element->find('img', 0)->src;

From 10d5bb630fd35affe4de4a7c7a1c6465231a6a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:28:30 +0200
Subject: [PATCH 11/39] [Rule34pahealBridge] 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/Rule34pahealBridge.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php
index 2a4a61db..af3608ed 100644
--- a/bridges/Rule34pahealBridge.php
+++ b/bridges/Rule34pahealBridge.php
@@ -16,19 +16,13 @@ class Rule34pahealBridge extends BridgeAbstract{
 
 
     public function collectData(){
-	$page = 0;$tags='';
-        if ($this->getInput('p')) {
-            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-        }
-        if ($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.');
+      $html = $this->getSimpleHTMLDOM($this->uri.'post/list/'.$tags.'/'.$page)
+        or $this->returnServerError('Could not request Rule34paheal.');
 
 
 	foreach($html->find('div[class=shm-image-list] div[class=shm-thumb]') as $element) {
 		$item = array();
-		$item['uri'] = 'http://rule34.paheal.net'.$element->find('a', 0)->href;
+		$item['uri'] = $this->uri.$element->find('a', 0)->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->find('img', 0)->getAttribute('id'));
 		$item['timestamp'] = time();
 		$thumbnailUri = $element->find('img', 0)->src;

From 1172bea2db0dffdd813c37b946a4a9d4a4c18539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:30:38 +0200
Subject: [PATCH 12/39] [SafebooruBridge] 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/SafebooruBridge.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php
index 495a8391..93975521 100644
--- a/bridges/SafebooruBridge.php
+++ b/bridges/SafebooruBridge.php
@@ -15,21 +15,15 @@ class SafebooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-	$page = 0;$tags='';
-        if ($this->getInput('p')) {
-		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-		$page = $page - 1;
-		$page = $page * 40;
-        }
-        if ($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.');
-
+        $html = $this->getSimpleHTMLDOM(
+            $this->uri.'index.php?page=post&s=list&'
+            .'&pid='.($this->getInput('p')?($this->getInput('p') -1)*40:'')
+            .'&tags='.urlencode($this->getInput('t'))
+        ) or $this->returnServerError('Could not request Safebooru.');
 
 	foreach($html->find('div[class=content] span') as $element) {
 		$item = array();
-		$item['uri'] = 'http://safebooru.org/'.$element->find('a', 0)->href;
+		$item['uri'] = $this->uri.$element->find('a', 0)->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));
 		$item['timestamp'] = time();
 		$thumbnailUri = $element->find('img', 0)->src;

From 92e0bec9256ed9f42aee3882c313ea58349eb382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:33:24 +0200
Subject: [PATCH 13/39] [SakugabooruBridge] 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/SakugabooruBridge.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php
index ab74d6db..c83eee5e 100644
--- a/bridges/SakugabooruBridge.php
+++ b/bridges/SakugabooruBridge.php
@@ -9,20 +9,19 @@ class SakugabooruBridge extends BridgeAbstract{
     public $parameters = array( array(
         'p'=>array(
             'name'=>'page',
+            'defaultValue'=>1,
             'type'=>'number'
         ),
         't'=>array('name'=>'tags')
     ));
 
     public function collectData(){
-	$page = 1;$tags='';
-        if ($this->getInput('p')) {
-            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-        }
-        if ($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.');
+        $html = $this->getSimpleHTMLDOM(
+            $this->uri.'post?'
+            .'&page='.$this->getInput('p')
+            .'&tags='.urlencode($this->getInput('t'))
+        ) or $this->returnServerError('Could not request Sakugabooru.');
+
 	$input_json = explode('Post.register(', $html);
 	foreach($input_json as $element)
 	 $data[] = preg_replace('/}\)(.*)/', '}', $element);
@@ -31,7 +30,7 @@ class SakugabooruBridge extends BridgeAbstract{
         foreach($data as $datai) {
 	    $json = json_decode($datai, TRUE);
             $item = array();
-            $item['uri'] = 'http://sakuga.yshi.org/post/show/'.$json['id'];
+            $item['uri'] = $this->uri.'/post/show/'.$json['id'];
             $item['postid'] = $json['id'];
             $item['timestamp'] = $json['created_at'];
             $item['imageUri'] = $json['file_url'];

From b1d9d887727f2dcbff1596175388bddf098a4259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:34:38 +0200
Subject: [PATCH 14/39] [ScmBridge] 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/ScmbBridge.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bridges/ScmbBridge.php b/bridges/ScmbBridge.php
index 9e5997e1..0e0974b6 100644
--- a/bridges/ScmbBridge.php
+++ b/bridges/ScmbBridge.php
@@ -8,11 +8,12 @@ class ScmbBridge extends BridgeAbstract{
 
     public function collectData(){
         $html = '';
-        $html = $this->getSimpleHTMLDOM('http://secouchermoinsbete.fr/') or $this->returnServerError('Could not request Se Coucher Moins Bete.');
+        $html = $this->getSimpleHTMLDOM($this->uri)
+          or $this->returnServerError('Could not request Se Coucher Moins Bete.');
 
         foreach($html->find('article') as $article) {
         	$item = array();
-			$item['uri'] = 'http://secouchermoinsbete.fr'.$article->find('p.summary a',0)->href;
+			$item['uri'] = $this->uri.$article->find('p.summary a',0)->href;
 			$item['title'] = $article->find('header h1 a',0)->innertext;
 
 			$article->find('span.read-more',0)->outertext=''; // remove text "En savoir plus" from anecdote content

From aed7815f05210eb7a7556d17feecf36564d1e831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:37:19 +0200
Subject: [PATCH 15/39] [ScoopitBridge] 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/ScoopItBridge.php | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/bridges/ScoopItBridge.php b/bridges/ScoopItBridge.php
index 32bdc471..db42428e 100644
--- a/bridges/ScoopItBridge.php
+++ b/bridges/ScoopItBridge.php
@@ -3,7 +3,7 @@ class ScoopItBridge extends BridgeAbstract{
 
 	public $maintainer = "Pitchoule";
 	public $name = "ScoopIt";
-	public $uri = "http://www.scoop.it";
+	public $uri = "http://www.scoop.it/";
 	public $description = "Returns most recent results from ScoopIt.";
 
     public $parameters = array( array(
@@ -14,23 +14,19 @@ class ScoopItBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $html = '';
-        if ($this->getInput('u') != '') {
-            $this->request = $this->getInput('u');
-            $link = 'http://scoop.it/search?q=' .urlencode($this->request);
+       $this->request = $this->getInput('u');
+       $link = $this->uri.'search?q=' .urlencode($this->getInput('u'));
 
-            $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request ScoopIt. for : ' . $link);
+       $html = $this->getSimpleHTMLDOM($link)
+         or $this->returnServerError('Could not request ScoopIt. for : ' . $link);
 
-            foreach($html->find('div.post-view') as $element) {
-                $item = array();
-                $item['uri'] = $element->find('a', 0)->href;
-                $item['title'] = preg_replace('~[[:cntrl:]]~', '', $element->find('div.tCustomization_post_title',0)->plaintext);
-                $item['content'] = preg_replace('~[[:cntrl:]]~', '', $element->find('div.tCustomization_post_description', 0)->plaintext);
-                $this->items[] = $item;
-            }
-        } else {
-            $this->returnServerError('You must specify a keyword');
-        }
+       foreach($html->find('div.post-view') as $element) {
+           $item = array();
+           $item['uri'] = $element->find('a', 0)->href;
+           $item['title'] = preg_replace('~[[:cntrl:]]~', '', $element->find('div.tCustomization_post_title',0)->plaintext);
+           $item['content'] = preg_replace('~[[:cntrl:]]~', '', $element->find('div.tCustomization_post_description', 0)->plaintext);
+           $this->items[] = $item;
+       }
     }
 
     public function getCacheDuration(){

From 82b150baa8c9a2d1211e336404295f594197e96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:53:38 +0200
Subject: [PATCH 16/39] [SensCritiqueBridge] 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/SensCritiqueBridge.php | 84 ++++++++--------------------------
 1 file changed, 20 insertions(+), 64 deletions(-)

diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php
index f3d1a2df..a202e0c9 100644
--- a/bridges/SensCritiqueBridge.php
+++ b/bridges/SensCritiqueBridge.php
@@ -3,7 +3,7 @@ class SensCritiqueBridge extends BridgeAbstract {
 
 	public $maintainer = "kranack";
 	public $name = "Sens Critique";
-	public $uri = "http://www.senscritique.com";
+	public $uri = "http://www.senscritique.com/";
 	public $description = "Sens Critique news";
 
     public $parameters = array( array(
@@ -34,71 +34,27 @@ class SensCritiqueBridge extends BridgeAbstract {
     ));
 
 	public function collectData(){
-		if (($this->getInput('m') && $this->getInput('m'))) {
-			$this->collectMoviesData();
-		} else if (($this->getInput('s') && $this->getInput('s'))) {
-			$this->collectSeriesData();
-		} else if (($this->getInput('g') && $this->getInput('g'))) {
-			$this->collectGamesData();
-		} else if (($this->getInput('b') && $this->getInput('b'))) {
-			$this->collectBooksData();
-		} else if (($this->getInput('bd') && $this->getInput('bd'))) {
-			$this->collectBDsData();
-		} else if (($this->getInput('mu') && $this->getInput('mu'))) {
-			$this->collectMusicsData();
-		} else {
-			$this->returnClientError('You must choose a category');
-		}
+      $categories=array();
+      foreach($this->parameters[$this->queriedContext] as $category=>$properties){
+        if($this->getInput($category)){
+          $uri=$this->uri;
+          switch($category){
+          case 'm': $uri.='films/cette-semaine'; break;
+          case 's': $uri.='series/actualite'; break;
+          case 'g': $uri.='jeuxvideo/actualite'; break;
+          case 'b': $uri.='livres/actualite'; break;
+          case 'bd': $uri.='bd/actualite'; break;
+          case 'mu': $uri.='musique/actualite'; break;
+          }
+          $html = $this->getSimpleHTMLDOM($uri)
+            or $this->returnServerError('No results for this query.');
+          $list = $html->find('ul.elpr-list', 0);
+
+          $this->extractDataFromList($list);
+        }
+      }
   }
 
-	private function collectMoviesData() {
-		$html = '';
-    $html = $this->getSimpleHTMLDOM('http://www.senscritique.com/films/cette-semaine') or $this->returnServerError('No results for this query.');
-		$list = $html->find('ul.elpr-list', 0);
-
-		$this->extractDataFromList($list);
-	}
-
-	private function collectSeriesData() {
-		$html = '';
-		$html = $this->getSimpleHTMLDOM('http://www.senscritique.com/series/actualite') or $this->returnServerError('No results for this query.');
-		$list = $html->find('ul.elpr-list', 0);
-
-		$this->extractDataFromList($list);
-	}
-
-	private function collectGamesData() {
-		$html = '';
-		$html = $this->getSimpleHTMLDOM('http://www.senscritique.com/jeuxvideo/actualite') or $this->returnServerError('No results for this query.');
-		$list = $html->find('ul.elpr-list', 0);
-
-		$this->extractDataFromList($list);
-	}
-
-	private function collectBooksData() {
-		$html = '';
-		$html = $this->getSimpleHTMLDOM('http://www.senscritique.com/livres/actualite') or $this->returnServerError('No results for this query.');
-		$list = $html->find('ul.elpr-list', 0);
-
-		$this->extractDataFromList($list);
-	}
-
-	private function collectBDsData() {
-		$html = '';
-		$html = $this->getSimpleHTMLDOM('http://www.senscritique.com/bd/actualite') or $this->returnServerError('No results for this query.');
-		$list = $html->find('ul.elpr-list', 0);
-
-		$this->extractDataFromList($list);
-	}
-
-	private function collectMusicsData() {
-		$html = '';
-		$html = $this->getSimpleHTMLDOM('http://www.senscritique.com/musique/actualite') or $this->returnServerError('No results for this query.');
-		$list = $html->find('ul.elpr-list', 0);
-
-		$this->extractDataFromList($list);
-	}
-
 	private function extractDataFromList($list) {
 		if ($list === null) {
 			$this->returnClientError('Cannot extract data from list');

From a88ad96ad98bb5515062f96e03d957e7fec3f351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 22:59:26 +0200
Subject: [PATCH 17/39] [SiliconBridge] 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/SiliconBridge.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php
index f821bcf9..fffccaa4 100644
--- a/bridges/SiliconBridge.php
+++ b/bridges/SiliconBridge.php
@@ -14,8 +14,9 @@ class SiliconBridge extends BridgeAbstract {
             return $string;
         }
 
-        $feedUrl = 'http://www.silicon.fr/feed';
-        $html = $this->getSimpleHTMLDOM($feedUrl) or $this->returnServerError('Could not request Silicon: '.$feedUrl);
+        $feedUrl = $this->uri.'feed';
+        $html = $this->getSimpleHTMLDOM($feedUrl)
+          or $this->returnServerError('Could not request Silicon: '.$feedUrl);
         $limit = 0;
 
         foreach($html->find('item') as $element) {
@@ -25,7 +26,8 @@ class SiliconBridge extends BridgeAbstract {
                 $article_uri = $element->innertext;
                 $article_uri = substr($article_uri, strpos($article_uri, '<link>') + 6);
                 $article_uri = substr($article_uri, 0, strpos($article_uri, '</link>'));
-                $article_html = $this->getSimpleHTMLDOM($article_uri) or $this->returnServerError('Could not request Silicon: '.$article_uri);
+                $article_html = $this->getSimpleHTMLDOM($article_uri)
+                  or $this->returnServerError('Could not request Silicon: '.$article_uri);
 
                 //Build article contents from corresponding elements
                 $thumbnailUri = $element->find('enclosure', 0)->url;

From cf70e43f59ad0c95f1dbba8442e0b91056f64ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:03:33 +0200
Subject: [PATCH 18/39] [SoundcloudBridge] 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/SoundcloudBridge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php
index be22cd7c..55304e50 100644
--- a/bridges/SoundcloudBridge.php
+++ b/bridges/SoundcloudBridge.php
@@ -3,7 +3,7 @@ class SoundCloudBridge extends BridgeAbstract{
 
 	public $maintainer = "kranack";
 	public $name = "Soundcloud Bridge";
-	public $uri = "http://www.soundcloud.com/";
+	public $uri = "https://soundcloud.com/";
 	public $description = "Returns 10 newest music from user profile";
 
     public $parameters = array( array(
@@ -33,10 +33,10 @@ class SoundCloudBridge extends BridgeAbstract{
 		    $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/'
+            $item['id'] = $this->uri
                 . urlencode($this->getInput('u')) .'/'
                 . urlencode($tracks[$i]->permalink);
-            $item['uri'] = 'https://soundcloud.com/'
+            $item['uri'] = $this->uri
                 . urlencode($this->getInput('u')) .'/'
                 . urlencode($tracks[$i]->permalink);
 		    $this->items[] = $item;

From 0b482283cb3c22421a8518963dfcb59b912123ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:05:12 +0200
Subject: [PATCH 19/39] [StripeAPIChangeLogBridge] 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/StripeAPIChangeLogBridge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridges/StripeAPIChangeLogBridge.php b/bridges/StripeAPIChangeLogBridge.php
index 48735a5e..d93e18f9 100644
--- a/bridges/StripeAPIChangeLogBridge.php
+++ b/bridges/StripeAPIChangeLogBridge.php
@@ -6,14 +6,14 @@ class StripeAPIChangeLogBridge extends BridgeAbstract{
   public $description = 'Returns the changes made to the stripe.com API';
 
   public function collectData(){
-    $html = $this->getSimpleHTMLDOM('https://stripe.com/docs/upgrades')
+    $html = $this->getSimpleHTMLDOM($this->uri)
       or $this->returnServerError('No results for Stripe API Changelog');
 
 
     foreach($html->find('h3') as $change){
       $item=array();
       $item['title']=trim($change->plaintext);
-      $item['uri']='https://stripe.com/docs/upgrades#'.$item['title'];
+      $item['uri']=$this->uri.'#'.$item['title'];
       $item['author']='stripe';
       $item['content']=$change->nextSibling()->outertext;
       $item['timestamp']=strtotime($item['title']);

From 1f72a34b42df7eb0f6f3cf6d5bc2bef05c5f3763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:11:53 +0200
Subject: [PATCH 20/39] [SuperbWallpapersBridge] 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/SuperbWallpapersBridge.php | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php
index a87bc2f4..a42d2b9a 100644
--- a/bridges/SuperbWallpapersBridge.php
+++ b/bridges/SuperbWallpapersBridge.php
@@ -1,45 +1,46 @@
 <?php
 class SuperbWallpapersBridge extends BridgeAbstract {
 
-    private $category;
-    private $resolution;
-
 	public $maintainer = "nel50n";
 	public $name = "Superb Wallpapers Bridge";
 	public $uri = "http://www.superbwallpapers.com/";
 	public $description = "Returns the latests wallpapers from SuperbWallpapers";
 
     public $parameters = array( array(
-        'c'=>array('name'=>'category'),
+      'c'=>array(
+        'name'=>'category',
+        'required'=>true
+      ),
         'm'=>array(
             'name'=>'Max number of wallpapers',
             'type'=>'number'
         ),
         'r'=>array(
             'name'=>'resolution',
-            'exampleValue'=>'1920x1200, 1680x1050,…'
+            'exampleValue'=>'1920x1200, 1680x1050,…',
+            'defaultValue'=>'1920x1200'
         )
     ));
 
     public function collectData(){
-        $html = '';
-        $baseUri = 'http://www.superbwallpapers.com';
-
-        $this->category   = $this->getInput('c') ?: '';           // All default
-        $this->resolution = $this->getInput('r') ?: '1920x1200';  // Wide wallpaper default
+        $category   = $this->getInput('c');
+        $resolution = $this->getInput('r');  // Wide wallpaper default
 
         $num = 0;
         $max = $this->getInput('m') ?: 36;
         $lastpage = 1;
 
         // Get last page number
-        $link = $baseUri.'/'.$this->category.'/9999.html';
-        $html = $this->getSimpleHTMLDOM($link);
+        $link = $this->uri.'/'.$category.'/9999.html';
+        $html = $this->getSimpleHTMLDOM($link)
+          or $this->returnServerError('Could not load '.$link);
+
         $lastpage = min($html->find('.paging .cpage', 0)->innertext(), ceil($max/36));
 
         for ($page = 1; $page <= $lastpage; $page++) {
-            $link = $baseUri.'/'.$this->category.'/'.$page.'.html';
-            $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('No results for this query.');
+            $link = $this->uri.'/'.$category.'/'.$page.'.html';
+            $html = $this->getSimpleHTMLDOM($link)
+              or $this->returnServerError('No results for this query.');
 
             foreach($html->find('.wpl .i a') as $element) {
                 $thumbnail = $element->find('img', 0);
@@ -59,7 +60,7 @@ class SuperbWallpapersBridge extends BridgeAbstract {
     }
 
     public function getName(){
-        return 'HDWallpapers - '.$this->category.' ['.$this->resolution.']';
+        return $this->name .'- '.$this->getInput('c').' ['.$this->getInput('r').']';
     }
 
     public function getCacheDuration(){

From eae88cf2cfd04710f154331750b2fd5f557309c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:19:59 +0200
Subject: [PATCH 21/39] [T411Bridge] 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/T411Bridge.php | 85 ++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php
index 793ea27c..6bc2b80f 100644
--- a/bridges/T411Bridge.php
+++ b/bridges/T411Bridge.php
@@ -24,14 +24,11 @@ class T411Bridge extends BridgeAbstract {
             } return false;
         }
 
-        //Ensure proper parameters have been provided
-        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/?'.$this->getInput('search').'&order=added&type=desc';
-        $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request t411: '.$url);
+        $html = $this->getSimpleHTMLDOM($url)
+          or $this->returnServerError('Could not request t411: '.$url);
+
         $results = $html->find('table.results', 0);
         if (is_null($results))
             $this->returnServerError('No results from t411: '.$url);
@@ -41,42 +38,48 @@ class T411Bridge extends BridgeAbstract {
         foreach ($results->find('tr') as $element) {
 
             //Limit total amount of requests and ignore table header
-            if ($limit < 10 && !is_object($element->find('th', 0))) {
-
-                //Requests are rate-limited
-                usleep(500000); //So we need to wait (500ms)
-
-                //Retrieve data from RSS entry
-                $item_uri = $this->uri.'torrents/details/?id='.ExtractFromDelimiters($element->find('a.nfo', 0)->outertext, '?id=', '"');
-                $item_title = ExtractFromDelimiters($element->outertext, '" title="', '"');
-                $item_date = strtotime($element->find('dd', 0)->plaintext);
-
-                //Retrieve full description from torrent page
-                if ($item_html = $this->getSimpleHTMLDOM($item_uri)) {
-
-                    //Retrieve data from page contents
-                    $item_desc = $item_html->find('div.description', 0);
-                    $item_author = $item_html->find('a.profile', 0)->innertext;
-
-                    //Cleanup advertisments
-                    $divs = explode('<div class="align-center">', $item_desc->innertext);
-                    $item_desc = '';
-                    foreach ($divs as $text)
-                        if (strpos($text, 'adprovider.adlure.net') === false)
-                            $item_desc = $item_desc.'<div class="align-center">'.$text;
-                    $item_desc = preg_replace('/<h2 class="align-center">LIENS DE T..?L..?CHARGEMENT<\/h2>/i', '', $item_desc);
-
-                    //Build and add final item
-                    $item = array();
-                    $item['uri'] = $item_uri;
-                    $item['title'] = $item_title;
-                    $item['author'] = $item_author;
-                    $item['timestamp'] = $item_date;
-                    $item['content'] = $item_desc;
-                    $this->items[] = $item;
-                    $limit++;
-                }
+            if ($limit >= 10){
+              break;
             }
+            if(is_object($element->find('th', 0))){
+              continue;
+            }
+
+           //Requests are rate-limited
+           usleep(500000); //So we need to wait (500ms)
+
+           //Retrieve data from RSS entry
+           $item_uri = $this->uri.'torrents/details/?id='.ExtractFromDelimiters($element->find('a.nfo', 0)->outertext, '?id=', '"');
+           $item_title = ExtractFromDelimiters($element->outertext, '" title="', '"');
+           $item_date = strtotime($element->find('dd', 0)->plaintext);
+
+           //Retrieve full description from torrent page
+           $item_html = $this->getSimpleHTMLDOM($item_uri);
+           if (!$item_html) {
+             continue;
+           }
+
+          //Retrieve data from page contents
+          $item_desc = $item_html->find('div.description', 0);
+          $item_author = $item_html->find('a.profile', 0)->innertext;
+
+          //Cleanup advertisments
+          $divs = explode('<div class="align-center">', $item_desc->innertext);
+          $item_desc = '';
+          foreach ($divs as $text)
+              if (strpos($text, 'adprovider.adlure.net') === false)
+                  $item_desc = $item_desc.'<div class="align-center">'.$text;
+          $item_desc = preg_replace('/<h2 class="align-center">LIENS DE T..?L..?CHARGEMENT<\/h2>/i', '', $item_desc);
+
+          //Build and add final item
+          $item = array();
+          $item['uri'] = $item_uri;
+          $item['title'] = $item_title;
+          $item['author'] = $item_author;
+          $item['timestamp'] = $item_date;
+          $item['content'] = $item_desc;
+          $this->items[] = $item;
+          $limit++;
         }
     }
 }

From 0f2cfe06d3c3c32c23725314f4449ea0edbe591b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:21:59 +0200
Subject: [PATCH 22/39] [TagBoardBridge] 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/TagBoardBridge.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php
index 444eb620..53b6b417 100644
--- a/bridges/TagBoardBridge.php
+++ b/bridges/TagBoardBridge.php
@@ -3,7 +3,7 @@ class TagBoardBridge extends BridgeAbstract{
 
 	public $maintainer = "Pitchoule";
 	public $name = "TagBoard";
-	public $uri = "http://www.TagBoard.com";
+	public $uri = "http://www.TagBoard.com/";
 	public $description = "Returns most recent results from TagBoard.";
 
     public $parameters = array( array(
@@ -14,11 +14,10 @@ class TagBoardBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-        $html = '';
-        $this->request = $this->getInput('u');
-        $link = 'https://post-cache.tagboard.com/search/' .$this->request;
+        $link = 'https://post-cache.tagboard.com/search/' .$this->getInput('u');
 
-        $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request TagBoard for : ' . $link);
+        $html = $this->getSimpleHTMLDOM($link)
+          or $this->returnServerError('Could not request TagBoard for : ' . $link);
         $parsed_json = json_decode($html);
 
         foreach($parsed_json->{'posts'} as $element) {
@@ -36,7 +35,7 @@ class TagBoardBridge extends BridgeAbstract{
     }
 
     public function getName(){
-        return 'tagboard - ' .$this->request;
+        return 'tagboard - ' .$this->getInput('u');
     }
 
     public function getCacheDuration(){

From 3212c33770433f4520a09766edc973ceadb79c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:23:38 +0200
Subject: [PATCH 23/39] [TbibBridge] 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/TbibBridge.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php
index 3c708464..3d4e4860 100644
--- a/bridges/TbibBridge.php
+++ b/bridges/TbibBridge.php
@@ -15,21 +15,16 @@ class TbibBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-	$page = 0;$tags='';
-        if ($this->getInput('p')) {
-		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-		$page = $page - 1;
-		$page = $page * 50;
-        }
-        if ($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.');
+        $html = $this->getSimpleHTMLDOM(
+            $this->uri.'index.php?page=post&s=list&'
+            .'&pid='.($this->getInput('p')?($this->getInput('p') -1)*50:'')
+            .'&tags='.urlencode($this->getInput('t'))
+        ) or $this->returnServerError('Could not request Tbib.');
 
 
 	foreach($html->find('div[class=content] span') as $element) {
 		$item = array();
-		$item['uri'] = 'http://tbib.org/'.$element->find('a', 0)->href;
+		$item['uri'] = $this->uri.$element->find('a', 0)->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));
 		$item['timestamp'] = time();
 		$thumbnailUri = $element->find('img', 0)->src;

From 5093eadfca6aed9b44325b11c13729697f7c5ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:24:30 +0200
Subject: [PATCH 24/39] [TheCodingLoveBridge] 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/TheCodingLoveBridge.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bridges/TheCodingLoveBridge.php b/bridges/TheCodingLoveBridge.php
index b42690f7..c97f83c4 100644
--- a/bridges/TheCodingLoveBridge.php
+++ b/bridges/TheCodingLoveBridge.php
@@ -7,7 +7,8 @@ class TheCodingLoveBridge extends BridgeAbstract{
 	public $description = "The Coding Love";
 
     public function collectData(){
-        $html = $this->getSimpleHTMLDOM('http://thecodinglove.com/') or $this->returnServerError('Could not request The Coding Love.');
+      $html = $this->getSimpleHTMLDOM($this->uri)
+        or $this->returnServerError('Could not request The Coding Love.');
 
         foreach($html->find('div.post') as $element) {
             $item = array();

From 9b5177eb6882d7420e892cc20334350e405e3df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:26:32 +0200
Subject: [PATCH 25/39] [TheOatMealBridge] 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/TheOatMealBridge.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bridges/TheOatMealBridge.php b/bridges/TheOatMealBridge.php
index aacc63f6..262e9937 100644
--- a/bridges/TheOatMealBridge.php
+++ b/bridges/TheOatMealBridge.php
@@ -1,7 +1,4 @@
 <?php
-define("THE_OATMEAL", "http://theoatmeal.com/");
-define("THE_OATMEAL_RSS", "http://feeds.feedburner.com/oatmealfeed");
-
 class TheOatmealBridge extends RssExpander{
 
 	public $maintainer = "Riduidel";
@@ -10,7 +7,7 @@ class TheOatmealBridge extends RssExpander{
 	public $description = "Un petit site de dessins assez rigolos";
 
     public function collectData(){
-        parent::collectExpandableDatas(THE_OATMEAL_RSS);
+        $this->collectExpandableDatas('http://feeds.feedburner.com/oatmealfeed');
     }
 
 

From f79d699a59b0432c5fb9746541a9fec839deaa4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:28:16 +0200
Subject: [PATCH 26/39] [ThePirateBayBridge] 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/ThePirateBayBridge.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php
index d4e1cd66..8fddc83a 100644
--- a/bridges/ThePirateBayBridge.php
+++ b/bridges/ThePirateBayBridge.php
@@ -9,7 +9,8 @@ class ThePirateBayBridge extends BridgeAbstract{
     public $parameters = array( array(
         'q'=>array(
             'name'=>'keywords, separated by semicolons',
-            'exampleValue'=>'first list;second list;…'
+            'exampleValue'=>'first list;second list;…',
+            'required'=>true
         )
     ));
 
@@ -49,12 +50,10 @@ class ThePirateBayBridge extends BridgeAbstract{
         }
 
 
-		if (!$this->getInput('q'))
-			$this->returnClientError('You must specify keywords (?q=...)');
-
         $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.');
+          $html = $this->getSimpleHTMLDOM($this->uri.'search/'.rawurlencode($keywords).'/0/3/0')
+            or $this->returnServerError('Could not request TPB.');
 
             if ($html->find('table#searchResult', 0) == FALSE)
                 $this->returnServerError('No result for query '.$keywords);
@@ -62,7 +61,7 @@ class ThePirateBayBridge extends BridgeAbstract{
 
             foreach($html->find('tr') as $element) {
                 $item = array();
-                $item['uri'] = 'https://thepiratebay.org/'.$element->find('a.detLink',0)->href;
+                $item['uri'] = $this->uri.$element->find('a.detLink',0)->href;
                 $item['id'] = $item['uri'];
                 $item['timestamp'] = parseDateTimestamp($element);
                 $item['title'] = $element->find('a.detLink',0)->plaintext;

From fa294e2b4c400d5360e5f9d413a0d1afd9bde96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:34:29 +0200
Subject: [PATCH 27/39] [TwitchApiBridge] 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/TwitchApiBridge.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php
index ce31c35d..becdd9f3 100644
--- a/bridges/TwitchApiBridge.php
+++ b/bridges/TwitchApiBridge.php
@@ -39,11 +39,9 @@ class TwitchApiBridge extends BridgeAbstract{
 
 		$context = stream_context_create($opts);
 
-		if(!$this->getInput('limit') ||
-		   empty($this->getInput('limit'))){
+		$limit = $this->getInput('limit');
+		if(!$limit){
 			$limit = TWITCH_LIMIT;
-		}else{
-			$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.

From 351e1e9a6ae77b4fba8e2267b85d778fff5922a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:36:49 +0200
Subject: [PATCH 28/39] [TwitterBridge] 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/TwitterBridge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
index 0c8f2a7a..6a42b54f 100644
--- a/bridges/TwitterBridge.php
+++ b/bridges/TwitterBridge.php
@@ -86,7 +86,7 @@ class TwitterBridge extends BridgeAbstract{
 			// get TweetID
 			$item['id'] = $tweet->getAttribute('data-tweet-id');
 			// get tweet link
-			$item['uri'] = 'https://twitter.com'.$tweet->find('a.js-permalink', 0)->getAttribute('href');
+			$item['uri'] = $this->uri.$tweet->find('a.js-permalink', 0)->getAttribute('href');
 			// extract tweet timestamp
 			$item['timestamp'] = $tweet->find('span.js-short-timestamp', 0)->getAttribute('data-time');
 			// generate the title
@@ -111,7 +111,7 @@ class TwitterBridge extends BridgeAbstract{
 			}
 
 			// get tweet text
-			$cleanedTweet = str_replace('href="/', 'href="https://twitter.com/', $tweet->find('p.js-tweet-text', 0)->innertext);
+			$cleanedTweet = str_replace('href="/', 'href="'.$this->uri, $tweet->find('p.js-tweet-text', 0)->innertext);
 
 			// Add picture to content
 			$picture_html = '';

From 0262162bc3acf4e5a9805007952778d8072eb78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:39:29 +0200
Subject: [PATCH 29/39] [UnsplashBridge] 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/UnsplashBridge.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php
index d12d3782..24ffefe8 100644
--- a/bridges/UnsplashBridge.php
+++ b/bridges/UnsplashBridge.php
@@ -9,32 +9,32 @@ class UnsplashBridge extends BridgeAbstract {
     public $parameters = array( array(
           'm'=>array(
             'name'=>'Max number of photos',
-            'type'=>'number'
+            'type'=>'number',
+            'defaultValue'=>20
           ),
           'w'=>array(
             'name'=>'Width',
-            'exampleValue'=>'1920, 1680, …'
+            'exampleValue'=>'1920, 1680, …',
+            'defaultValue'=>'1920'
           ),
           'q'=>array(
             'name'=>'JPEG quality',
-            'type'=>'number'
+            'type'=>'number',
+            'defaultValue'=>75
           )
       ));
 
     public function collectData(){
-        $html = '';
-        $baseUri = 'http://unsplash.com';
-
-        $width = $this->getInput('w') ?: '1920';    // Default width
-
+        $width = $this->getInput('w') ;
         $num = 0;
-        $max = $this->getInput('m') ?: 20;
-        $quality = $this->getInput('q') ?: 75;
+        $max = $this->getInput('m');
+        $quality = $this->getInput('q');
         $lastpage = 1;
 
         for ($page = 1; $page <= $lastpage; $page++) {
-            $link = $baseUri.'/grid?page='.$page;
-            $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('No results for this query.');
+            $link = $this->uri.'/grid?page='.$page;
+            $html = $this->getSimpleHTMLDOM($link)
+              or $this->returnServerError('No results for this query.');
 
             if ($page === 1) {
                 preg_match('/=(\d+)$/', $html->find('.pagination > a[!class]', -1)->href, $matches);

From 55c406e1b4e1213cf9227cf6c5d50760bc7689b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:42:26 +0200
Subject: [PATCH 30/39] [ViadeoCompanyBridge] add Bridge suffix to class name +
 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/{ViadeoCompany.php => ViadeoCompanyBridge.php} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename bridges/{ViadeoCompany.php => ViadeoCompanyBridge.php} (82%)

diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompanyBridge.php
similarity index 82%
rename from bridges/ViadeoCompany.php
rename to bridges/ViadeoCompanyBridge.php
index 756727b2..f2d96454 100644
--- a/bridges/ViadeoCompany.php
+++ b/bridges/ViadeoCompanyBridge.php
@@ -1,5 +1,5 @@
 <?php
-class ViadeoCompany extends BridgeAbstract{
+class ViadeoCompanyBridge extends BridgeAbstract{
 
 	public $maintainer = "regisenguehard";
 	public $name = "Viadeo Company";
@@ -15,9 +15,10 @@ class ViadeoCompany extends BridgeAbstract{
 
     public function collectData(){
         $html = '';
-        $link = 'http://www.viadeo.com/fr/company/'.$this->getInput('c');
+        $link = $this->uri.'fr/company/'.$this->getInput('c');
 
-        $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('Could not request Viadeo.');
+        $html = $this->getSimpleHTMLDOM($link)
+          or $this->returnServerError('Could not request Viadeo.');
 
         foreach($html->find('//*[@id="company-newsfeed"]/ul/li') as $element) {
             $title = $element->find('p', 0)->innertext;

From 83fad77a08e800913a00718debed72049baca488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:43:19 +0200
Subject: [PATCH 31/39] [VineBridge] 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/VineBridge.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bridges/VineBridge.php b/bridges/VineBridge.php
index 0ad7cb00..e1ae70cf 100644
--- a/bridges/VineBridge.php
+++ b/bridges/VineBridge.php
@@ -15,9 +15,10 @@ class VineBridge extends BridgeAbstract {
 
 	public function collectData(){
     $html = '';
-    $uri = 'http://vine.co/u/'.$this->getInput('u').'?mode=list';
+    $uri = $this->uri.'/u/'.$this->getInput('u').'?mode=list';
 
-    $html = $this->getSimpleHTMLDOM($uri) or $this->returnServerError('No results for this query.');
+    $html = $this->getSimpleHTMLDOM($uri)
+      or $this->returnServerError('No results for this query.');
 
 		foreach($html->find('.post') as $element) {
 			$a = $element->find('a', 0);

From ada5903d68dd91653e1c7ffd24b43ac21a2dbd6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:46:47 +0200
Subject: [PATCH 32/39] [VkBridge] remove getName() + 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/VkBridge.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php
index 0372f0a9..f2abef65 100644
--- a/bridges/VkBridge.php
+++ b/bridges/VkBridge.php
@@ -4,7 +4,7 @@ class VkBridge extends BridgeAbstract {
 
     public $maintainer = "ahiles3005";
     public $name = "VK.com";
-    public $uri = "http://www.vk.com/";
+    public $uri = "http://vk.com/";
     public $description = "Working with open pages";
     public $parameters=array(
         'Url on page group or user' => array(
@@ -16,13 +16,10 @@ class VkBridge extends BridgeAbstract {
     );
 
     public function collectData(){
-        $html = '';
-        if ($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);
-        }
+        $text_html = $this->getContents(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);
         foreach ($html->find('div.post_table') as $post) {
             if (is_object($post->find('a.wall_post_more', 0))) {
                 $post->find('a.wall_post_more', 0)->outertext = ''; //delete link "show full" in content
@@ -36,20 +33,16 @@ class VkBridge extends BridgeAbstract {
             //get video on post
             if (is_object($post->find('span.post_video_title_content', 0))) {
                 $titleVideo = $post->find('span.post_video_title_content', 0)->plaintext;
-                $linkToVideo = 'https://vk.com' . $post->find('a.page_post_thumb_video', 0)->getAttribute('href');
+                $linkToVideo = $this->uri . $post->find('a.page_post_thumb_video', 0)->getAttribute('href');
                 $item['content'] .= "\n\r {$titleVideo}: {$linkToVideo}";
             }
-            $item['uri'] = 'https://vk.com' . $post->find('.reply_link_wrap', 0)->find('a', 0)->getAttribute('href'); // get post link
+            $item['uri'] = $this->uri . $post->find('.reply_link_wrap', 0)->find('a', 0)->getAttribute('href'); // get post link
             $item['date'] = $post->find('span.rel_date', 0)->plaintext;
             $this->items[] = $item;
             // var_dump($item['date']);
         }
     }
 
-    public function getName() {
-        return(isset($this->name) ? $this->name . ' - ' : '') . 'VK Bridge';
-    }
-
     public function getCacheDuration() {
         return 300; // 5 minutes
     }

From 014d016a51bd52c3625d9ed9e98b3b52bacdfac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Tue, 30 Aug 2016 00:03:36 +0200
Subject: [PATCH 33/39] [WallpaperStopBridge] 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/WallpaperStopBridge.php | 81 +++++++++++++++------------------
 1 file changed, 36 insertions(+), 45 deletions(-)

diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php
index e2c7e113..633642c0 100644
--- a/bridges/WallpaperStopBridge.php
+++ b/bridges/WallpaperStopBridge.php
@@ -1,13 +1,9 @@
 <?php
 class WallpaperStopBridge extends BridgeAbstract {
 
-    private $category;
-    private $subcategory;
-    private $resolution;
-
 	public $maintainer = "nel50n";
 	public $name = "WallpaperStop Bridge";
-	public $uri = "http://www.wallpaperstop.com/";
+	public $uri = "http://www.wallpaperstop.com";
 	public $description = "Returns the latests wallpapers from WallpaperStop";
 
     public $parameters = array( array(
@@ -15,64 +11,59 @@ class WallpaperStopBridge extends BridgeAbstract {
         's'=>array('name'=>'subcategory'),
         'm'=>array(
             'name'=>'Max number of wallpapers',
-            'type'=>'number'
+            'type'=>'number',
+            'defaultValue'=>20
         ),
         'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…',
+            'defaultValue'=>'1920x1200'
         )
     ));
 
 
     public function collectData(){
-        $html = '';
-        if (!$this->getInput('c')) {
-            $this->returnClientError('You must specify at least a category (?c=...).');
-        } else {
-            $baseUri = 'http://www.wallpaperstop.com';
+       $category = $this->getInput('c');
+       $subcategory = $this->getInput('s');
+       $resolution = $this->getInput('r');
 
-            $this->category = $this->getInput('c');
-            $this->subcategory = $this->getInput('s') ?: '';
-            $this->resolution = $this->getInput('r') ?: '1920x1200';    // Wide wallpaper default
+       $num = 0;
+       $max = $this->getInput('m');
+       $lastpage = 1;
 
-            $num = 0;
-            $max = $this->getInput('m') ?: 20;
-            $lastpage = 1;
+       for ($page = 1; $page <= $lastpage; $page++) {
+           $link = $this->uri.'/'.$category.'-wallpaper/'.(!empty($subcategory)?$subcategory.'-wallpaper/':'').'desktop-wallpaper-'.$page.'.html';
+           $html = $this->getSimpleHTMLDOM($link)
+             or $this->returnServerError('No results for this query.');
 
-            for ($page = 1; $page <= $lastpage; $page++) {
-                $link = $baseUri.'/'.$this->category.'-wallpaper/'.(!empty($this->subcategory)?$this->subcategory.'-wallpaper/':'').'desktop-wallpaper-'.$page.'.html';
-                $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('No results for this query.');
+           if ($page === 1) {
+               preg_match('/-(\d+)\.html$/', $html->find('.pagination > .last', 0)->href, $matches);
+               $lastpage = min($matches[1], ceil($max/20));
+           }
 
-                if ($page === 1) {
-                    preg_match('/-(\d+)\.html$/', $html->find('.pagination > .last', 0)->href, $matches);
-                    $lastpage = min($matches[1], ceil($max/20));
-                }
+           foreach($html->find('article.item') as $element) {
+               $wplink = $element->getAttribute('data-permalink');
+               if (preg_match('%^'.$this->uri.'/(.+)/([^/]+)-(\d+)\.html$%', $wplink, $matches)) {
+                   $thumbnail = $element->find('img', 0);
 
-                foreach($html->find('article.item') as $element) {
-                    $wplink = $element->getAttribute('data-permalink');
-                    if (preg_match('%^http://www\.wallpaperstop\.com/(.+)/([^/]+)-(\d+)\.html$%', $wplink, $matches)) {
-                        $thumbnail = $element->find('img', 0);
+                   $item = array();
+                   $item['uri'] = $this->uri.'/wallpapers/'.str_replace('wallpaper', 'wallpapers', $matches[1]).'/'.$matches[2].'-'.$resolution.'-'.$matches[3].'.jpg';
+                   $item['id'] = $matches[3];
+                   $item['timestamp'] = time();
+                   $item['title'] = $thumbnail->title;
+                   $item['content'] = $item['title'].'<br><a href="'.$wplink.'"><img src="'.$this->uri.$thumbnail->src.'" /></a>';
+                   $this->items[] = $item;
 
-                        $item = array();
-                        $item['uri'] = $baseUri.'/wallpapers/'.str_replace('wallpaper', 'wallpapers', $matches[1]).'/'.$matches[2].'-'.$this->resolution.'-'.$matches[3].'.jpg';
-                        $item['id'] = $matches[3];
-                        $item['timestamp'] = time();
-                        $item['title'] = $thumbnail->title;
-                        $item['content'] = $item['title'].'<br><a href="'.$wplink.'"><img src="'.$baseUri.$thumbnail->src.'" /></a>';
-                        $this->items[] = $item;
-
-                        $num++;
-                        if ($num >= $max)
-                            break 2;
-                    }
-
-                }
-            }
-        }
+                   $num++;
+                   if ($num >= $max)
+                       break 2;
+               }
+           }
+       }
     }
 
     public function getName(){
-        return 'WallpaperStop - '.$this->category.(!empty($this->subcategory) ? ' > '.$this->subcategory : '').' ['.$this->resolution.']';
+        return 'WallpaperStop - '.$this->getInput('c').(!empty($this->getInput('s')) ? ' > '.$this->getInput('s') : '').' ['.$this->getInput('r').']';
     }
 
     public function getCacheDuration(){

From 23bb5c5dfbb5319e429f3a87ad3217f96e74556e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Tue, 30 Aug 2016 00:07:22 +0200
Subject: [PATCH 34/39] [WhydBridge] fix getName() + 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/WhydBridge.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php
index 5adfc982..bbaee2d2 100644
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@@ -13,6 +13,8 @@ class WhydBridge extends BridgeAbstract{
         )
     ));
 
+    private $userName='';
+
 	public function collectData(){
 		$html = '';
         if (strlen(preg_replace("/[^0-9a-f]/",'', $this->getInput('u'))) == 24){
@@ -34,7 +36,7 @@ class WhydBridge extends BridgeAbstract{
                 }
             }
         }
-        $this->name = $html->find('div#profileTop', 0)->find('h1', 0)->plaintext;
+        $this->userName = $html->find('div#profileTop', 0)->find('h1', 0)->plaintext;
 
 		for($i = 0; $i < 10; $i++) {
 			$track = $html->find('div.post', $i);
@@ -42,13 +44,13 @@ class WhydBridge extends BridgeAbstract{
             $item['author'] = $track->find('h2', 0)->plaintext;
             $item['title'] = $track->find('h2', 0)->plaintext;
             $item['content'] = $track->find('a.thumb',0) . '<br/>' . $track->find('h2', 0)->plaintext;
-            $item['id'] = 'http://www.whyd.com' . $track->find('a.no-ajaxy',0)->getAttribute('href');
-            $item['uri'] = 'http://www.whyd.com' . $track->find('a.no-ajaxy',0)->getAttribute('href');
+            $item['id'] = $this->uri . $track->find('a.no-ajaxy',0)->getAttribute('href');
+            $item['uri'] = $this->uri . $track->find('a.no-ajaxy',0)->getAttribute('href');
             $this->items[] = $item;
         }
     }
 	public function getName(){
-		return (!empty($this->name) ? $this->name .' - ' : '') .'Whyd Bridge';
+		return (!empty($this->userName) ? $this->userName .' - ' : '') .'Whyd Bridge';
 	}
 
 	public function getCacheDuration(){

From 6e3f08e9d32125ff6fcd7cbbabcbe0d59172b655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Tue, 30 Aug 2016 00:11:25 +0200
Subject: [PATCH 35/39] [WorldOfTanksBridge] 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/WorldOfTanksBridge.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/bridges/WorldOfTanksBridge.php b/bridges/WorldOfTanksBridge.php
index 53842217..deda7167 100644
--- a/bridges/WorldOfTanksBridge.php
+++ b/bridges/WorldOfTanksBridge.php
@@ -27,11 +27,7 @@ class WorldOfTanksBridge extends HttpCachingBridgeAbstract{
     ));
 
     function getURI(){
-        $lang='fr';
-        if (!empty($this->getInput('lang'))) {
-            $lang = $this->getInput('lang');
-        }
-
+        $lang = $this->getInput('lang');
         $uri = $this->uri.$lang.'/news/';
         if(!empty($this->getInput('category'))) {
             $uri .= 'pc-browser/'.$this->getInput('category')."/";
@@ -40,7 +36,8 @@ class WorldOfTanksBridge extends HttpCachingBridgeAbstract{
     }
 
     public function collectData(){
-        $html = $this->getSimpleHTMLDOM($this->getURI()) or $this->returnServerError('Could not request '.$this->getURI());
+      $html = $this->getSimpleHTMLDOM($this->getURI())
+        or $this->returnServerError('Could not request '.$this->getURI());
         $this->debugMessage("loaded HTML from ".$this->getURI());
         // customize name
         $this->name = $html->find('title', 0)->innertext;

From 2cda7edcbd200c39f9c7023969adf0aaab06fa5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Tue, 30 Aug 2016 00:13:57 +0200
Subject: [PATCH 36/39] [XbooruBridge] 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/XbooruBridge.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php
index ba06cf60..3ac643f6 100644
--- a/bridges/XbooruBridge.php
+++ b/bridges/XbooruBridge.php
@@ -15,21 +15,16 @@ class XbooruBridge extends BridgeAbstract{
     ));
 
     public function collectData(){
-	$page = 0;$tags='';
-        if ($this->getInput('p')) {
-		$page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-		$page = $page - 1;
-		$page = $page * 50;
-        }
-        if ($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.');
+        $html = $this->getSimpleHTMLDOM(
+            $this->uri.'index.php?page=post&s=list&'
+            .'&pid='.($this->getInput('p')?($this->getInput('p') -1)*50:'')
+            .'&tags='.urlencode($this->getInput('t'))
+        ) or $this->returnServerError('Could not request Xbooru.');
 
 
 	foreach($html->find('div[class=content] span') as $element) {
 		$item = array();
-		$item['uri'] = 'http://xbooru.com/'.$element->find('a', 0)->href;
+		$item['uri'] = $this->uri.$element->find('a', 0)->href;
 		$item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id'));
 		$item['timestamp'] = time();
 		$thumbnailUri = $element->find('img', 0)->src;

From 468aa28a67fc34bc2cd68433b1947b5a79bdd141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Tue, 30 Aug 2016 00:16:21 +0200
Subject: [PATCH 37/39] [YandereBridge] 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/YandereBridge.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php
index 8bea06a2..a26f228e 100644
--- a/bridges/YandereBridge.php
+++ b/bridges/YandereBridge.php
@@ -9,20 +9,19 @@ class YandereBridge extends BridgeAbstract{
     public $parameters = array( array(
         'p'=>array(
             'name'=>'page',
-            'type'=>'number'
+            'type'=>'number',
+            'defaultValue'=>1
         ),
         't'=>array('name'=>'tags')
     ));
 
     public function collectData(){
-	$page = 1; $tags = '';
-        if ($this->getInput('p')) {
-            $page = (int)preg_replace("/[^0-9]/",'', $this->getInput('p'));
-        }
-        if ($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.');
+        $html = $this->getSimpleHTMLDOM(
+            $this->uri.'post?'
+            .'&page='.$this->getInput('p')
+            .'&tags='.urlencode($this->getInput('t'))
+        ) or $this->returnServerError('Could not request Yander.');
+
 	$input_json = explode('Post.register(', $html);
 	foreach($input_json as $element)
 	 $data[] = preg_replace('/}\)(.*)/', '}', $element);
@@ -31,7 +30,7 @@ class YandereBridge extends BridgeAbstract{
         foreach($data as $datai) {
 	    $json = json_decode($datai, TRUE);
             $item = array();
-            $item['uri'] = 'http://yande.re/post/show/'.$json['id'];
+            $item['uri'] = $this->uri.'post/show/'.$json['id'];
             $item['postid'] = $json['id'];
             $item['timestamp'] = $json['created_at'];
             $item['imageUri'] = $json['file_url'];

From abc4f047bf08ed2ff452085cb62355cf944cd72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Tue, 30 Aug 2016 00:20:35 +0200
Subject: [PATCH 38/39] [ZDNnetBridge] 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/ZDNetBridge.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 6925159a..03f63bad 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -207,16 +207,12 @@ class ZDNetBridge extends BridgeAbstract {
             return $string;
         }
 
-        $baseUri = $this->getURI();
+        $baseUri = $this->uri;
         $feed = $this->getInput('feed');
-        if (empty($feed))
-            $this->returnClientError('Please select a feed to display.');
         if (strpos($feed, 'downloads!') !== false) {
             $feed = str_replace('downloads!', '', $feed);
             $baseUri = str_replace('www.', 'downloads.', $baseUri);
         }
-        if ($feed !== preg_replace('/[^a-zA-Z0-9-\/]+/', '', $feed) || substr_count($feed, '/') > 1 || strlen($feed > 64))
-            $this->returnClientError('Invalid "feed" parameter.');
         $url = $baseUri.trim($feed, '/').'/rss.xml';
         $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request ZDNet: '.$url);
         $limit = 0;

From 9d7e64fac0d04e75221ebcadc4c6e643f6115760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Tue, 30 Aug 2016 00:31:59 +0200
Subject: [PATCH 39/39] [WorldOfTanksBridge] 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/WorldOfTanksBridge.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bridges/WorldOfTanksBridge.php b/bridges/WorldOfTanksBridge.php
index deda7167..8b0ec838 100644
--- a/bridges/WorldOfTanksBridge.php
+++ b/bridges/WorldOfTanksBridge.php
@@ -26,6 +26,8 @@ class WorldOfTanksBridge extends HttpCachingBridgeAbstract{
         )
     ));
 
+    private $title='';
+
     function getURI(){
         $lang = $this->getInput('lang');
         $uri = $this->uri.$lang.'/news/';
@@ -35,12 +37,16 @@ class WorldOfTanksBridge extends HttpCachingBridgeAbstract{
         return $uri;
     }
 
+    public function getName(){
+      return $this->title?:$this->name;
+    }
+
     public function collectData(){
       $html = $this->getSimpleHTMLDOM($this->getURI())
         or $this->returnServerError('Could not request '.$this->getURI());
         $this->debugMessage("loaded HTML from ".$this->getURI());
         // customize name
-        $this->name = $html->find('title', 0)->innertext;
+        $this->title = $html->find('title', 0)->innertext;
         foreach($html->find('.b-imgblock_ico') as $infoLink) {
             $this->parseLine($infoLink);
        }