Browse Source

[core + bridges] get rid of loadMetadata

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

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
Pierre Mazière 7 years ago
parent
commit
de1b39c8e5
100 changed files with 972 additions and 1282 deletions
  1. 4 8
      bridges/ABCTabsBridge.php
  2. 4 7
      bridges/AcrimedBridge.php
  3. 11 14
      bridges/AllocineFRBridge.php
  4. 8 12
      bridges/AnimeUltimeBridge.php
  5. 4 8
      bridges/ArstechnicaBridge.php
  6. 40 42
      bridges/Arte7Bridge.php
  7. 12 14
      bridges/AskfmBridge.php
  8. 8 12
      bridges/BandcampBridge.php
  9. 4 6
      bridges/BastaBridge.php
  10. 4 7
      bridges/BlaguesDeMerdeBridge.php
  11. 6 9
      bridges/BooruprojectBridge.php
  12. 4 6
      bridges/CADBridge.php
  13. 8 11
      bridges/CNETBridge.php
  14. 26 26
      bridges/CastorusBridge.php
  15. 4 6
      bridges/CollegeDeFranceBridge.php
  16. 4 6
      bridges/CommonDreamsBridge.php
  17. 4 9
      bridges/CopieDoubleBridge.php
  18. 4 8
      bridges/CourrierInternationalBridge.php
  19. 8 13
      bridges/CpasbienBridge.php
  20. 8 12
      bridges/CryptomeBridge.php
  21. 26 27
      bridges/DailymotionBridge.php
  22. 8 11
      bridges/DanbooruBridge.php
  23. 4 8
      bridges/DansTonChatBridge.php
  24. 23 26
      bridges/DauphineLibereBridge.php
  25. 41 42
      bridges/DemoBridge.php
  26. 4 6
      bridges/DeveloppezDotComBridge.php
  27. 4 8
      bridges/DilbertBridge.php
  28. 9 12
      bridges/DollbooruBridge.php
  29. 7 10
      bridges/DuckDuckGoBridge.php
  30. 8 11
      bridges/EZTVBridge.php
  31. 4 8
      bridges/EliteDangerousGalnetBridge.php
  32. 8 11
      bridges/ElsevierBridge.php
  33. 4 6
      bridges/EstCeQuonMetEnProdBridge.php
  34. 8 11
      bridges/FacebookBridge.php
  35. 5 9
      bridges/FierPandaBridge.php
  36. 4 8
      bridges/FlickrExploreBridge.php
  37. 14 15
      bridges/FlickrTagBridge.php
  38. 4 8
      bridges/FootitoBridge.php
  39. 8 12
      bridges/FourchanBridge.php
  40. 4 7
      bridges/FreenewsBridge.php
  41. 71 74
      bridges/FuturaSciencesBridge.php
  42. 12 15
      bridges/GBAtempBridge.php
  43. 10 13
      bridges/GawkerBridge.php
  44. 9 13
      bridges/GelbooruBridge.php
  45. 11 15
      bridges/GiphyBridge.php
  46. 12 12
      bridges/GithubIssueBridge.php
  47. 6 14
      bridges/GitlabCommitsBridge.php
  48. 4 8
      bridges/GizmodoFRBridge.php
  49. 11 15
      bridges/GooglePlusPostBridge.php
  50. 11 14
      bridges/GoogleSearchBridge.php
  51. 4 6
      bridges/GuruMedBridge.php
  52. 10 12
      bridges/HDWallpapersBridge.php
  53. 4 8
      bridges/HentaiHavenBridge.php
  54. 11 15
      bridges/IdenticaBridge.php
  55. 11 15
      bridges/InstagramBridge.php
  56. 79 79
      bridges/IsoHuntBridge.php
  57. 10 12
      bridges/JapanExpoBridge.php
  58. 9 12
      bridges/KonachanBridge.php
  59. 4 6
      bridges/KoreusBridge.php
  60. 10 10
      bridges/KununuBridge.php
  61. 4 14
      bridges/LWNprevBridge.php
  62. 8 12
      bridges/LeBonCoinBridge.php
  63. 4 6
      bridges/LeJournalDuGeekBridge.php
  64. 4 8
      bridges/LeMondeInformatiqueBridge.php
  65. 4 8
      bridges/Les400CulsBridge.php
  66. 4 8
      bridges/LesJoiesDuCodeBridge.php
  67. 4 7
      bridges/LichessBridge.php
  68. 8 11
      bridges/LinkedInCompany.php
  69. 9 12
      bridges/LolibooruBridge.php
  70. 12 13
      bridges/MangareaderBridge.php
  71. 9 11
      bridges/MilbooruBridge.php
  72. 4 6
      bridges/MondeDiploBridge.php
  73. 4 6
      bridges/MsnMondeBridge.php
  74. 9 12
      bridges/MspabooruBridge.php
  75. 4 6
      bridges/NakedSecurityBridge.php
  76. 4 8
      bridges/NasaApodBridge.php
  77. 4 6
      bridges/NeuviemeArtBridge.php
  78. 4 6
      bridges/NextInpactBridge.php
  79. 18 21
      bridges/NextgovBridge.php
  80. 4 6
      bridges/NiceMatinBridge.php
  81. 8 11
      bridges/NovelUpdatesBridge.php
  82. 4 8
      bridges/NumeramaBridge.php
  83. 17 21
      bridges/OpenClassroomsBridge.php
  84. 13 17
      bridges/ParuVenduImmoBridge.php
  85. 12 15
      bridges/PickyWallpapersBridge.php
  86. 14 16
      bridges/PinterestBridge.php
  87. 4 6
      bridges/PlanetLibreBridge.php
  88. 4 8
      bridges/ProjectMGameBridge.php
  89. 8 10
      bridges/RTBFBridge.php
  90. 4 8
      bridges/Releases3DSBridge.php
  91. 4 6
      bridges/ReporterreBridge.php
  92. 4 8
      bridges/Rue89Bridge.php
  93. 9 13
      bridges/Rule34Bridge.php
  94. 9 12
      bridges/Rule34pahealBridge.php
  95. 9 13
      bridges/SafebooruBridge.php
  96. 9 13
      bridges/SakugabooruBridge.php
  97. 4 8
      bridges/ScmbBridge.php
  98. 8 12
      bridges/ScoopItBridge.php
  99. 18 22
      bridges/SensCritiqueBridge.php
  100. 4 8
      bridges/Sexactu.php

+ 4 - 8
bridges/ABCTabsBridge.php

@@ -1,14 +1,10 @@
 <?php
 class ABCTabsBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-
-		$this->maintainer = "kranack";
-		$this->name = "ABC Tabs Bridge";
-		$this->uri = "http://www.abc-tabs.com/";
-		$this->description = "Returns 22 newest tabs";
-
-	}
+	public $maintainer = "kranack";
+	public $name = "ABC Tabs Bridge";
+	public $uri = "http://www.abc-tabs.com/";
+	public $description = "Returns 22 newest tabs";
 
 	public function collectData(){
 		$html = '';

+ 4 - 7
bridges/AcrimedBridge.php

@@ -1,14 +1,11 @@
 <?php
 class AcrimedBridge extends RssExpander{
 
-		public function loadMetadatas() {
 
-			$this->maintainer = "qwertygc";
-			$this->name = "Acrimed Bridge";
-			$this->uri = "http://www.acrimed.org/";
-			$this->description = "Returns the newest articles.";
-
-		}
+	public $maintainer = "qwertygc";
+	public $name = "Acrimed Bridge";
+	public $uri = "http://www.acrimed.org/";
+	public $description = "Returns the newest articles.";
 
        public function collectData(){
 

+ 11 - 14
bridges/AllocineFRBridge.php

@@ -1,28 +1,25 @@
 <?php
 class AllocineFRBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
 
-        $this->maintainer = "superbaillot.net";
-        $this->name = "Allo Cine Bridge";
-        $this->uri = "http://www.allocine.fr";
-        $this->description = "Bridge for allocine.fr";
-
-        $this->parameters[] = array(
-          'category'=>array(
+    public $maintainer = "superbaillot.net";
+    public $name = "Allo Cine Bridge";
+    public $uri = "http://www.allocine.fr";
+    public $description = "Bridge for allocine.fr";
+    public $parameters = array( array(
+        'category'=>array(
             'name'=>'category',
             'type'=>'list',
             'required'=>true,
             'exampleValue'=>'Faux Raccord',
             'title'=>'Select your category',
             'values'=>array(
-              'Faux Raccord'=>'faux-raccord',
-              'Top 5'=>'top-5',
-              'Tueurs En Serie'=>'tuers-en-serie'
+                'Faux Raccord'=>'faux-raccord',
+                'Top 5'=>'top-5',
+                'Tueurs En Serie'=>'tuers-en-serie'
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $params=$this->parameters[$this->queriedContext];

+ 8 - 12
bridges/AnimeUltimeBridge.php

@@ -1,16 +1,11 @@
 <?php
 class AnimeUltimeBridge extends BridgeAbstract {
 
-    private $filter = 'Releases';
-
-    public function loadMetadatas() {
-
-        $this->maintainer = 'ORelio';
-        $this->name = 'Anime-Ultime';
-        $this->uri = 'http://www.anime-ultime.net/';
-        $this->description = 'Returns the 10 newest releases posted on Anime-Ultime';
-
-        $this->parameters[] = array(
+        public $maintainer = 'ORelio';
+        public $name = 'Anime-Ultime';
+        public $uri = 'http://www.anime-ultime.net/';
+        public $description = 'Returns the 10 newest releases posted on Anime-Ultime';
+        public $parameters = array( array(
           'type'=>array(
             'name'=>'Type',
             'type'=>'list',
@@ -21,8 +16,9 @@ class AnimeUltimeBridge extends BridgeAbstract {
               'Tokusatsu'=>'T'
             )
           )
-        );
-    }
+        ));
+
+    private $filter = 'Releases';
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/ArstechnicaBridge.php

@@ -3,14 +3,10 @@
 #error_reporting(E_ALL);
 class ArstechnicaBridge extends BridgeAbstract {
 
-  public function loadMetadatas() {
-
-    $this->maintainer = "prysme";
-    $this->name = "ArstechnicaBridge";
-    $this->uri = "http://arstechnica.com";
-    $this->description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
-
-  }
+  public $maintainer = "prysme";
+  public $name = "ArstechnicaBridge";
+  public $uri = "http://arstechnica.com";
+  public $description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion";
 
   function StripWithDelimiters($string, $start, $end) {
     while (strpos($string, $start) !== false) {

+ 40 - 42
bridges/Arte7Bridge.php

@@ -1,49 +1,47 @@
-<?php
-class Arte7Bridge extends BridgeAbstract{
+    <?php
+    class Arte7Bridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+        public $maintainer = "mitsukarenai";
+        public $name = "Arte +7";
+        public $uri = "http://www.arte.tv/";
+        public $description = "Returns newest videos from ARTE +7";
+        public $parameters = array(
+            'Catégorie (Français)' => array(
+                'catfr'=>array(
+                    'type'=>'list',
+                    'name'=>'Catégorie',
+                    'values'=>array(
+                        'Toutes les vidéos (français)'=>'toutes-les-videos',
+                        'Actu & société'=>'actu-société',
+                        'Séries & fiction'=>'séries-fiction',
+                        'Cinéma'=>'cinéma',
+                        'Arts & spectacles classiques'=>'arts-spectacles-classiques',
+                        'Culture pop'=>'culture-pop',
+                        'Découverte'=>'découverte',
+                        'Histoire'=>'histoire',
+                        'Junior'=>'junior'
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Arte +7";
-		$this->uri = "http://www.arte.tv/";
-		$this->description = "Returns newest videos from ARTE +7";
-        $this->parameters["Catégorie (Français)"] = array(
-          'catfr'=>array(
-            'type'=>'list',
-            'name'=>'Catégorie',
-            'values'=>array(
-              'Toutes les vidéos (français)'=>'toutes-les-videos',
-              'Actu & société'=>'actu-société',
-              'Séries & fiction'=>'séries-fiction',
-              'Cinéma'=>'cinéma',
-              'Arts & spectacles classiques'=>'arts-spectacles-classiques',
-              'Culture pop'=>'culture-pop',
-              'Découverte'=>'découverte',
-              'Histoire'=>'histoire',
-              'Junior'=>'junior'
-
-            )
-          )
-        );
-
-        $this->parameters["Catégorie (Allemand)"] = array(
-          'catde'=>array(
-            'type'=>'list',
-            'name'=>'Catégorie',
-            'values'=>array(
-              'Alle Videos (deutsch)'=>'alle-videos',
-              'Aktuelles & Gesellschaft'=>'aktuelles-gesellschaft',
-              'Fernsehfilme & Serien'=>'fernsehfilme-serien',
-              'Kino'=>'kino',
-              'Kunst & Kultur'=>'kunst-kultur',
-              'Popkultur & Alternativ'=>'popkultur-alternativ',
-              'Entdeckung'=>'entdeckung',
-              'Geschichte'=>'geschichte',
-              'Junior'=>'junior'
+                    )
+                )
+            ),
+            'Catégorie (Allemand)' => array(
+                'catde'=>array(
+                    'type'=>'list',
+                    'name'=>'Catégorie',
+                    'values'=>array(
+                        'Alle Videos (deutsch)'=>'alle-videos',
+                        'Aktuelles & Gesellschaft'=>'aktuelles-gesellschaft',
+                        'Fernsehfilme & Serien'=>'fernsehfilme-serien',
+                        'Kino'=>'kino',
+                        'Kunst & Kultur'=>'kunst-kultur',
+                        'Popkultur & Alternativ'=>'popkultur-alternativ',
+                        'Entdeckung'=>'entdeckung',
+                        'Geschichte'=>'geschichte',
+                        'Junior'=>'junior'
+                    )
+                )
             )
-          )
         );
-	}
 
     protected  function extractVideoset($category='toutes-les-videos', $lang='fr'){
         $url = 'http://www.arte.tv/guide/'.$lang.'/plus7/'.$category;

+ 12 - 14
bridges/AskfmBridge.php

@@ -1,20 +1,18 @@
 <?php
 class AskfmBridge extends BridgeAbstract{
 
-        public function loadMetadatas() {
-
-                $this->maintainer = "az5he6ch";
-                $this->name = "Ask.fm Answers";
-                $this->uri = "http://ask.fm/";
-                $this->description = "Returns answers from an Ask.fm user";
-
-                $this->parameters["Ask.fm username"] = array(
-                  'u'=>array(
-                      'name'=>'Username',
-                      'required'=>true
-                  )
-                );
-        }
+    public $maintainer = "az5he6ch";
+    public $name = "Ask.fm Answers";
+    public $uri = "http://ask.fm/";
+    public $description = "Returns answers from an Ask.fm user";
+    public $parameters = array(
+        'Ask.fm username'=>array(
+            'u'=>array(
+                'name'=>'Username',
+                'required'=>true
+            )
+        )
+    );
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 8 - 12
bridges/BandcampBridge.php

@@ -1,20 +1,16 @@
 <?php
 class BandcampBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "sebsauvage";
-		$this->name = "Bandcamp Tag";
-		$this->uri = "http://bandcamp.com/";
-		$this->description = "New bandcamp release by tag";
-
-        $this->parameters[] = array(
-          'tag'=>array(
+    public $maintainer = "sebsauvage";
+    public $name = "Bandcamp Tag";
+    public $uri = "http://bandcamp.com/";
+    public $description = "New bandcamp release by tag";
+    public $parameters = array( array(
+        'tag'=>array(
             'name'=>'tag',
             'type'=>'text'
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/BastaBridge.php

@@ -1,11 +1,9 @@
 <?php
 class BastaBridge extends BridgeAbstract{
-	public function loadMetadatas() {
-		$this->maintainer = "qwertygc";
-		$this->name = "Bastamag Bridge";
-		$this->uri = "http://www.bastamag.net/";
-		$this->description = "Returns the newest articles.";
-	}
+	public $maintainer = "qwertygc";
+	public $name = "Bastamag Bridge";
+	public $uri = "http://www.bastamag.net/";
+	public $description = "Returns the newest articles.";
 
 	public function collectData(){
 		// Replaces all relative image URLs by absolute URLs. Relative URLs always start with 'local/'!

+ 4 - 7
bridges/BlaguesDeMerdeBridge.php

@@ -1,14 +1,11 @@
 <?php
 class BlaguesDeMerdeBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "superbaillot.net";
+    public $name = "Blagues De Merde";
+    public $uri = "http://www.blaguesdemerde.fr/";
+    public $description = "Blagues De Merde";
 
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Blagues De Merde";
-		$this->uri = "http://www.blaguesdemerde.fr/";
-		$this->description = "Blagues De Merde";
-
-	}
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://www.blaguesdemerde.fr/') or $this->returnServerError('Could not request BDM.');

+ 6 - 9
bridges/BooruprojectBridge.php

@@ -1,23 +1,20 @@
 <?php
 class BooruprojectBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Booruproject";
-		$this->uri = "http://booru.org/";
-		$this->description = "Returns images from given page and booruproject instance (****.booru.org)";
+	public $maintainer = "mitsukarenai";
+	public $name = "Booruproject";
+	public $uri = "http://booru.org/";
+	public $description = "Returns images from given page and booruproject instance (****.booru.org)";
 
-        $this->parameters[] = array(
+    public $parameters = array( array(
           'i'=>array(
             'name'=>'instance (required)',
             'required'=>true
           ),
           'p'=>array('name'=>'page'),
           't'=>array('name'=>'tags')
-        );
-	}
-
+        ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/CADBridge.php

@@ -1,11 +1,9 @@
 <?php
 class CADBridge extends BridgeAbstract{
-	public function loadMetadatas() {
-		$this->maintainer = "nyutag";
-		$this->name = "CAD Bridge";
-		$this->uri = "http://www.cad-comic.com/";
-		$this->description = "Returns the newest articles.";
-	}
+	public $maintainer = "nyutag";
+	public $name = "CAD Bridge";
+	public $uri = "http://www.cad-comic.com/";
+	public $description = "Returns the newest articles.";
 
 	private function CADExtractContent($url) {
 		$html3 = $this->getSimpleHTMLDOM($url);

+ 8 - 11
bridges/CNETBridge.php

@@ -1,17 +1,14 @@
 <?php
 class CNETBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = 'ORelio';
-        $this->name = 'CNET News';
-        $this->uri = 'http://www.cnet.com/';
-        $this->description = 'Returns the newest articles. <br /> You may specify a topic found in some section URLs, else all topics are selected.';
-
-        $this->parameters[] = array(
-          'topic'=>array('name'=>'Topic name')
-        );
-    }
+    public $maintainer = 'ORelio';
+    public $name = 'CNET News';
+    public $uri = 'http://www.cnet.com/';
+    public $description = 'Returns the newest articles. <br /> You may specify a topic found in some section URLs, else all topics are selected.';
+
+    public $parameters = array( array(
+        'topic'=>array('name'=>'Topic name')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 26 - 26
bridges/CastorusBridge.php

@@ -1,31 +1,31 @@
 <?php
 class CastorusBridge extends BridgeAbstract {
-	public function loadMetadatas(){
-		$this->maintainer = "logmanoriginal";
-		$this->name = "Castorus Bridge";
-		$this->uri = 'http://www.castorus.com';
-		$this->description = "Returns the latest changes";
-
-		$this->parameters["Get latest changes"] = array();
-        $this->parameters["Get latest changes via ZIP code"] = array(
-          'zip'=>array(
-            'name'=>'ZIP code',
-            'type'=>'text',
-            'required'=>true,
-            'exampleValue'=>'74910, 74',
-            'title'=>'Insert ZIP code (complete or partial)'
-          )
-        );
-        $this->parameters["Get latest changes via city name"] = array(
-          'city'=>array(
-            'name'=>'City name',
-            'type'=>'text',
-            'required'=>true,
-            'exampleValue'=>'Seyssel, Seys',
-            'title'=>'Insert city name (complete or partial)'
-          )
-        );
-	}
+	public $maintainer = "logmanoriginal";
+	public $name = "Castorus Bridge";
+	public $uri = 'http://www.castorus.com';
+	public $description = "Returns the latest changes";
+
+    public $parameters = array(
+        'Get latest changes' => array(),
+        'Get latest changes via ZIP code' => array(
+            'zip'=>array(
+                'name'=>'ZIP code',
+                'type'=>'text',
+                'required'=>true,
+                'exampleValue'=>'74910, 74',
+                'title'=>'Insert ZIP code (complete or partial)'
+            )
+        ),
+        'Get latest changes via city name' => array(
+            'city'=>array(
+                'name'=>'City name',
+                'type'=>'text',
+                'required'=>true,
+                'exampleValue'=>'Seyssel, Seys',
+                'title'=>'Insert city name (complete or partial)'
+            )
+        )
+    );
 
 	// Extracts the tile from an actitiy
 	private function ExtractActivityTitle($activity){

+ 4 - 6
bridges/CollegeDeFranceBridge.php

@@ -1,12 +1,10 @@
 <?php
 class CollegeDeFranceBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "CollegeDeFrance";
-		$this->uri = "http://www.college-de-france.fr/";
-		$this->description = "Returns the latest audio and video from CollegeDeFrance";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "CollegeDeFrance";
+	public $uri = "http://www.college-de-france.fr/";
+	public $description = "Returns the latest audio and video from CollegeDeFrance";
 
 	public function collectData(){
 		$months = array(

+ 4 - 6
bridges/CommonDreamsBridge.php

@@ -1,12 +1,10 @@
 <?php
 class CommonDreamsBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "nyutag";
-		$this->name = "CommonDreams Bridge";
-		$this->uri = "http://www.commondreams.org/";
-		$this->description = "Returns the newest articles.";
-	}
+	public $maintainer = "nyutag";
+	public $name = "CommonDreams Bridge";
+	public $uri = "http://www.commondreams.org/";
+	public $description = "Returns the newest articles.";
 
 	private function CommonDreamsExtractContent($url) {
 		$html3 = $this->getSimpleHTMLDOM($url);

+ 4 - 9
bridges/CopieDoubleBridge.php

@@ -1,15 +1,10 @@
 <?php
 class CopieDoubleBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "CopieDouble";
-		$this->uri = "http://www.copie-double.com/";
-		$this->description = "CopieDouble";
-
-	}
-
+    public $maintainer = "superbaillot.net";
+    public $name = "CopieDouble";
+    public $uri = "http://www.copie-double.com/";
+    public $description = "CopieDouble";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://www.copie-double.com/') or $this->returnServerError('Could not request CopieDouble.');

+ 4 - 8
bridges/CourrierInternationalBridge.php

@@ -1,14 +1,10 @@
 <?php
 class CourrierInternationalBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "teromene";
-		$this->name = "Courrier International Bridge";
-		$this->uri = "http://CourrierInternational.fr/";
-		$this->description = "Courrier International bridge";
-
-	}
+    public $maintainer = "teromene";
+    public $name = "Courrier International Bridge";
+    public $uri = "http://CourrierInternational.fr/";
+    public $description = "Courrier International bridge";
 
     public function collectData(){
 

+ 8 - 13
bridges/CpasbienBridge.php

@@ -1,23 +1,18 @@
 <?php
 class CpasbienBridge extends HttpCachingBridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "lagaisse";
+    public $name = "Cpasbien Bridge";
+    public $uri = "http://www.cpasbien.io";
+    public $description = "Returns latest torrents from a request query";
 
-		$this->maintainer = "lagaisse";
-		$this->name = "Cpasbien Bridge";
-		$this->uri = "http://www.cpasbien.io";
-		$this->description = "Returns latest torrents from a request query";
-
-        $this->parameters[] = array(
-          'q'=>array(
+    public $parameters = array( array(
+        'q'=>array(
             'name'=>'Search',
             'required'=>true,
             'title'=>'Type your search'
-          )
-        );
-
-	}
-
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 8 - 12
bridges/CryptomeBridge.php

@@ -1,22 +1,18 @@
 <?php
 class CryptomeBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+    public $maintainer = "BoboTiG";
+    public $name = "Cryptome";
+    public $uri = "http://cryptome.org/";
+    public $description = "Returns the N most recent documents.";
 
-		$this->maintainer = "BoboTiG";
-		$this->name = "Cryptome";
-		$this->uri = "http://cryptome.org/";
-		$this->description = "Returns the N most recent documents.";
-
-        $this->parameters[] = array(
-          'n'=>array(
+    public $parameters = array( array(
+        'n'=>array(
             'name'=>'number of elements',
             'type'=>'number',
             'exampleValue'=>10
-          )
-        );
-	}
-
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 26 - 27
bridges/DailymotionBridge.php

@@ -1,38 +1,37 @@
 <?php
 class DailymotionBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
+        public $maintainer = "mitsukarenai";
+        public $name = "Dailymotion Bridge";
+        public $uri = "https://www.dailymotion.com/";
+        public $description = "Returns the 5 newest videos by username/playlist or search";
 
-        $this->maintainer = "mitsukarenai";
-        $this->name = "Dailymotion Bridge";
-        $this->uri = "https://www.dailymotion.com/";
-        $this->description = "Returns the 5 newest videos by username/playlist or search";
-
-        $this->parameters["By username"] = array(
-            'u'=>array(
-                'name'=>'username',
-                'required'=>true
-            )
-        );
-
-        $this->parameters["By playlist id"] = array(
-            'p'=>array(
-                'name'=>'playlist id',
-                'required'=>true
-            )
-        );
+        public $parameters = array (
+            'By username' => array(
+                'u'=>array(
+                    'name'=>'username',
+                    'required'=>true
+                )
+            ),
 
-        $this->parameters["From search results"] = array(
-            's'=>array(
-                'name'=>'Search keyword',
-                'required'=>true
+            'By playlist id' => array(
+                'p'=>array(
+                    'name'=>'playlist id',
+                    'required'=>true
+                )
             ),
-            'pa'=>array(
-                'name'=>'Page',
-                'type'=>'number'
+
+            'From search results' => array(
+                's'=>array(
+                    'name'=>'Search keyword',
+                    'required'=>true
+                ),
+                'pa'=>array(
+                    'name'=>'Page',
+                    'type'=>'number'
+                )
             )
         );
-    }
 
     function getMetadata($id) {
         $metadata=array();

+ 8 - 11
bridges/DanbooruBridge.php

@@ -1,18 +1,15 @@
 <?php
 class DanbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Danbooru";
+	public $uri = "http://donmai.us/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Danbooru";
-		$this->uri = "http://donmai.us/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array('name'=>'page'),
-          't'=>array('name'=>'tags')
-        );
-	}
+    public $parameters = array( array(
+        'p'=>array('name'=>'page'),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/DansTonChatBridge.php

@@ -1,14 +1,10 @@
 <?php
 class DansTonChatBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Astalaseven";
-		$this->name = "DansTonChat Bridge";
-		$this->uri = "http://danstonchat.com";
-		$this->description = "Returns latest quotes from DansTonChat.";
-
-	}
+	public $maintainer = "Astalaseven";
+	public $name = "DansTonChat Bridge";
+	public $uri = "http://danstonchat.com";
+	public $description = "Returns latest quotes from DansTonChat.";
 
     public function collectData(){
         $html = '';

+ 23 - 26
bridges/DauphineLibereBridge.php

@@ -1,37 +1,34 @@
 <?php
 class DauphineLibereBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
+	public $maintainer = "qwertygc";
+	public $name = "Dauphine Bridge";
+	public $uri = "http://www.ledauphine.com/";
+	public $description = "Returns the newest articles.";
 
-		$this->maintainer = "qwertygc";
-		$this->name = "Dauphine Bridge";
-		$this->uri = "http://www.ledauphine.com/";
-		$this->description = "Returns the newest articles.";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'Catégorie de l\'article',
             'type'=>'list',
             'values'=>array(
-              'À la une'=>'',
-              'France Monde'=>'france-monde',
-              'Faits Divers'=>'faits-divers',
-              'Économie et Finance'=>'economie-et-finance',
-              'Politique'=>'politique',
-              'Sport'=>'sport',
-              'Ain'=>'ain',
-              'Alpes-de-Haute-Provence'=>'haute-provence',
-              'Hautes-Alpes'=>'hautes-alpes',
-              'Ardèche'=>'ardeche',
-              'Drôme'=>'drome',
-              'Isère Sud'=>'isere-sud',
-              'Savoie'=>'savoie',
-              'Haute-Savoie'=>'haute-savoie',
-              'Vaucluse'=>'vaucluse'
+                'À la une'=>'',
+                'France Monde'=>'france-monde',
+                'Faits Divers'=>'faits-divers',
+                'Économie et Finance'=>'economie-et-finance',
+                'Politique'=>'politique',
+                'Sport'=>'sport',
+                'Ain'=>'ain',
+                'Alpes-de-Haute-Provence'=>'haute-provence',
+                'Hautes-Alpes'=>'hautes-alpes',
+                'Ardèche'=>'ardeche',
+                'Drôme'=>'drome',
+                'Isère Sud'=>'isere-sud',
+                'Savoie'=>'savoie',
+                'Haute-Savoie'=>'haute-savoie',
+                'Vaucluse'=>'vaucluse'
             )
-          )
-        );
-	}
+        )
+    ));
 
 	private function ExtractContent($url, $context) {
 		$html2 = $this->getSimpleHTMLDOM($url,false,$context);

+ 41 - 42
bridges/DemoBridge.php

@@ -1,54 +1,53 @@
 <?php
 class DemoBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "teromene";
-		$this->name = "DemoBridge";
-		$this->uri = "http://github.com/sebsauvage/rss-bridge";
-		$this->description = "Bridge used for demos";
-
-        $this->parameters['testCheckbox'] = array(
-          'testCheckbox'=>array(
-            'type'=>'checkbox',
-            'name'=>'test des checkbox'
-          )
-        );
-
-        $this->parameters['testList'] = array(
-          'testList'=>array(
-            'type'=>'list',
-            'name'=>'test des listes',
-            'values'=>array(
-              'Test'=>'test',
-              'Test 2'=>'test2'
+    public $maintainer = "teromene";
+    public $name = "DemoBridge";
+    public $uri = "http://github.com/sebsauvage/rss-bridge";
+    public $description = "Bridge used for demos";
+
+    public $parameters = array(
+        'testCheckbox' => array(
+            'testCheckbox'=>array(
+                'type'=>'checkbox',
+                'name'=>'test des checkbox'
             )
-          )
-        );
+        ),
+
+        'testList' => array(
+            'testList'=>array(
+                'type'=>'list',
+                'name'=>'test des listes',
+                'values'=>array(
+                    'Test'=>'test',
+                    'Test 2'=>'test2'
+                )
+            )
+        ),
 
-        $this->parameters['testNumber'] = array(
-          'testNumber'=>array(
-            'type'=>'number',
-            'name'=>'test des numéros',
-            'exampleValue'=>'1515632'
-          )
-        );
-	}
+        'testNumber' => array(
+            'testNumber'=>array(
+                'type'=>'number',
+                'name'=>'test des numéros',
+                'exampleValue'=>'1515632'
+            )
+        )
+    );
 
-	public function collectData(){
+    public function collectData(){
 
-		$item = array();
-	    $item['author'] = "Me!";
-	    $item['title'] = "Test";
-	    $item['content'] = "Awesome content !";
-	    $item['id'] = "Lalala";
-	    $item['uri'] = "http://test.test/test";
+        $item = array();
+        $item['author'] = "Me!";
+        $item['title'] = "Test";
+        $item['content'] = "Awesome content !";
+        $item['id'] = "Lalala";
+        $item['uri'] = "http://test.test/test";
 
-	    $this->items[] = $item;
+        $this->items[] = $item;
 
     }
 
-	public function getCacheDuration(){
-		return 00; // 1 hour
-	}
+    public function getCacheDuration(){
+        return 00; // 1 hour
+    }
 }

+ 4 - 6
bridges/DeveloppezDotComBridge.php

@@ -1,12 +1,10 @@
 <?php
 class DeveloppezDotComBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "polopollo";
-		$this->name = "Developpez.com Actus (FR)";
-		$this->uri = "http://www.developpez.com/";
-		$this->description = "Returns the 15 newest posts from DeveloppezDotCom (full text).";
-	}
+	public $maintainer = "polopollo";
+	public $name = "Developpez.com Actus (FR)";
+	public $uri = "http://www.developpez.com/";
+	public $description = "Returns the 15 newest posts from DeveloppezDotCom (full text).";
 
 	private function DeveloppezDotComStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);

+ 4 - 8
bridges/DilbertBridge.php

@@ -1,14 +1,10 @@
 <?php
 class DilbertBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = 'kranack';
-        $this->name = 'Dilbert Daily Strip';
-        $this->uri = 'http://dilbert.com';
-        $this->description = 'The Unofficial Dilbert Daily Comic Strip';
-
-    }
+    public $maintainer = 'kranack';
+    public $name = 'Dilbert Daily Strip';
+    public $uri = 'http://dilbert.com';
+    public $description = 'The Unofficial Dilbert Daily Comic Strip';
 
     public function collectData(){
 

+ 9 - 12
bridges/DollbooruBridge.php

@@ -1,22 +1,19 @@
 <?php
 class DollbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Dollbooru";
+	public $uri = "http://dollbooru.org/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Dollbooru";
-		$this->uri = "http://dollbooru.org/";
-		$this->description = "Returns images from given page";
 
-
-        $this->parameters[]  = array(
-          'p'=>array(
+    public $parameters  = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 7 - 10
bridges/DuckDuckGoBridge.php

@@ -1,19 +1,16 @@
 <?php
 class DuckDuckGoBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "Astalaseven";
+	public $name = "DuckDuckGo";
+	public $uri = "https://duckduckgo.com/";
+	public $description = "Returns most recent results from DuckDuckGo.";
 
-		$this->maintainer = "Astalaseven";
-		$this->name = "DuckDuckGo";
-		$this->uri = "https://duckduckgo.com/";
-		$this->description = "Returns most recent results from DuckDuckGo.";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'keyword',
             'required'=>true)
-        );
-	}
+        ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 8 - 11
bridges/EZTVBridge.php

@@ -1,21 +1,18 @@
 <?php
 class EZTVBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "alexAubin";
+	public $name = "EZTV";
+	public $uri = "https://eztv.ch/";
+	public $description = "Returns list of *recent* torrents for a specific show on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name.";
 
-		$this->maintainer = "alexAubin";
-		$this->name = "EZTV";
-		$this->uri = "https://eztv.ch/";
-		$this->description = "Returns list of *recent* torrents for a specific show on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name.";
-
-        $this->parameters[] = array(
-          'i'=>array(
+    public $parameters = array( array(
+        'i'=>array(
             'name'=>'Show ids',
             'exampleValue'=>'showID1,showID2,…',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/EliteDangerousGalnetBridge.php

@@ -1,14 +1,10 @@
-
 <?php
 class EliteDangerousGalnetBridge extends BridgeAbstract
 {
-	public function loadMetadatas()
-	{
-		$this->maintainer = "corenting";
-		$this->name = "Elite: Dangerous Galnet";
-		$this->uri = "https://community.elitedangerous.com/galnet";
-		$this->description = "Returns the latest page of news from Galnet";
-	}
+	public $maintainer = "corenting";
+	public $name = "Elite: Dangerous Galnet";
+	public $uri = "https://community.elitedangerous.com/galnet";
+	public $description = "Returns the latest page of news from Galnet";
 
 	public function collectData()
 	{

+ 8 - 11
bridges/ElsevierBridge.php

@@ -1,21 +1,18 @@
 <?php
 class ElsevierBridge extends BridgeAbstract{
-	public function loadMetadatas() {
+	public $maintainer = 'Pierre Mazière';
+	public $name = 'Elsevier journals recent articles';
+	public $uri = 'http://www.journals.elsevier.com';
+	public $description = 'Returns the recent articles published in Elsevier journals';
 
-		$this->maintainer = 'Pierre Mazière';
-		$this->name = 'Elsevier journals recent articles';
-		$this->uri = 'http://www.journals.elsevier.com';
-		$this->description = 'Returns the recent articles published in Elsevier journals';
-
-        $this->parameters[] = array(
-          'j'=>array(
+    public $parameters = array( array(
+        'j'=>array(
             'name'=>'Journal name',
             'required'=>true,
             'exampleValue'=>'academic-pediactrics',
             'title'=>'Insert html-part of your journal'
-          )
-        );
-	}
+        )
+    ));
 
 	// Extracts the list of names from an article as string
 	private function ExtractArticleName ($article){

+ 4 - 6
bridges/EstCeQuonMetEnProdBridge.php

@@ -1,12 +1,10 @@
 <?php
 class EstCeQuonMetEnProdBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = 'ORelio';
-        $this->name = 'Est-ce qu\'on met en prod aujourd\'hui ?';
-        $this->uri = 'https://www.estcequonmetenprodaujourdhui.info/';
-        $this->description = 'Should we put a website in production today? (French)';
-    }
+    public $maintainer = 'ORelio';
+    public $name = 'Est-ce qu\'on met en prod aujourd\'hui ?';
+    public $uri = 'https://www.estcequonmetenprodaujourdhui.info/';
+    public $description = 'Should we put a website in production today? (French)';
 
     public function collectData(){
         function ExtractFromDelimiters($string, $start, $end) {

+ 8 - 11
bridges/FacebookBridge.php

@@ -1,20 +1,17 @@
 <?php
 class FacebookBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "teromene";
+	public $name = "Facebook";
+	public $uri = "http://www.facebook.com/";
+	public $description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117";
 
-		$this->maintainer = "teromene";
-		$this->name = "Facebook";
-		$this->uri = "http://www.facebook.com/";
-		$this->description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117";
-
-        $this->parameters[] =array(
-          'u'=>array(
+    public $parameters =array( array(
+        'u'=>array(
             'name'=>'Username',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 5 - 9
bridges/FierPandaBridge.php

@@ -1,14 +1,10 @@
 <?php
-Class FierPandaBridge extends BridgeAbstract{
+class FierPandaBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = "snroki";
-        $this->name = "Fier Panda Bridge";
-        $this->uri = "http://www.fier-panda.fr/";
-        $this->description = "Returns latest articles from Fier Panda.";
-
-    }
+    public $maintainer = "snroki";
+    public $name = "Fier Panda Bridge";
+    public $uri = "http://www.fier-panda.fr/";
+    public $description = "Returns latest articles from Fier Panda.";
 
     public function collectData(){
         $link = 'http://www.fier-panda.fr/';

+ 4 - 8
bridges/FlickrExploreBridge.php

@@ -1,14 +1,10 @@
 <?php
 class FlickrExploreBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "sebsauvage";
-		$this->name = "Flickr Explore";
-		$this->uri = "https://www.flickr.com/explore";
-		$this->description = "Returns the latest interesting images from Flickr";
-
-	}
+	public $maintainer = "sebsauvage";
+	public $name = "Flickr Explore";
+	public $uri = "https://www.flickr.com/explore";
+	public $description = "Returns the latest interesting images from Flickr";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('https://www.flickr.com/explore') or $this->returnServerError('Could not request Flickr.');

+ 14 - 15
bridges/FlickrTagBridge.php

@@ -1,21 +1,20 @@
 <?php
 class FlickrTagBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "erwang";
-		$this->name = "Flickr TagUser";
-		$this->uri = "http://www.flickr.com/";
-		$this->description = "Returns the tagged or user images from Flickr";
-
-        $this->parameters["By keyword"] = array(
-          'q'=>array('name'=>'keyword')
-        );
-
-        $this->parameters["By username"] = array(
-          'u'=>array('name'=>'Username')
-        );
-	}
+	public $maintainer = "erwang";
+	public $name = "Flickr TagUser";
+	public $uri = "http://www.flickr.com/";
+	public $description = "Returns the tagged or user images from Flickr";
+
+    public $parameters = array(
+        'By keyword' => array(
+            'q'=>array('name'=>'keyword')
+        ),
+
+        'By username' => array(
+            'u'=>array('name'=>'Username')
+        ),
+    );
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/FootitoBridge.php

@@ -1,14 +1,10 @@
 <?php
 class FootitoBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Footito";
-		$this->uri = "http://www.footito.fr/";
-		$this->description = "Footito";
-
-	}
+	public $maintainer = "superbaillot.net";
+	public $name = "Footito";
+	public $uri = "http://www.footito.fr/";
+	public $description = "Footito";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://www.footito.fr/') or $this->returnServerError('Could not request Footito.');

+ 8 - 12
bridges/FourchanBridge.php

@@ -1,18 +1,14 @@
 <?php
 class FourchanBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "4chan";
-		$this->uri = "https://www.4chan.org/";
-		$this->description = "Returns posts from the specified thread";
-
-        $this->parameters[] = array(
-          't'=>array('name'=>'Thread URL')
-        );
-	}
-
+	public $maintainer = "mitsukarenai";
+	public $name = "4chan";
+	public $uri = "https://www.4chan.org/";
+	public $description = "Returns posts from the specified thread";
+
+    public $parameters = array( array(
+        't'=>array('name'=>'Thread URL')
+    ));
 
   public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 7
bridges/FreenewsBridge.php

@@ -2,13 +2,10 @@
 define("FREENEWS_RSS", 'http://feeds.feedburner.com/Freenews-Freebox?format=xml');
 class FreenewsBridge extends RssExpander {
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Freenews";
-		$this->uri = "http://freenews.fr";
-		$this->description = "Un site d'actualité pour les freenautes (mais ne parlant pas que de la freebox). Ne rentrez pas d'id si vous voulez accéder aux actualités générales.";
-	}
+	public $maintainer = "mitsukarenai";
+	public $name = "Freenews";
+	public $uri = "http://freenews.fr";
+	public $description = "Un site d'actualité pour les freenautes (mais ne parlant pas que de la freebox). Ne rentrez pas d'id si vous voulez accéder aux actualités générales.";
 
     public function collectData(){
         parent::collectExpandableDatas(FREENEWS_RSS);

+ 71 - 74
bridges/FuturaSciencesBridge.php

@@ -1,85 +1,82 @@
 <?php
 class FuturaSciencesBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'Futura-Sciences Bridge';
+    public $uri = 'http://www.futura-sciences.com/';
+    public $description = 'Returns the newest articles.';
 
-        $this->maintainer = 'ORelio';
-        $this->name = 'Futura-Sciences Bridge';
-        $this->uri = 'http://www.futura-sciences.com/';
-        $this->description = 'Returns the newest articles.';
-
-        $this->parameters[] = array(
-          'feed'=> array(
+    public $parameters = array( array(
+        'feed'=> array(
             'name'=>'Feed',
             'type'=>'list',
             'values'=>array(
-              'Les flux multi-magazines'=>array(
-                'Les dernières actualités de Futura-Sciences'=>'actualites',
-                'Les dernières définitions de Futura-Sciences'=>'definitions',
-                'Les dernières photos de Futura-Sciences'=>'photos',
-                'Les dernières questions - réponses de Futura-Sciences'=>'questions-reponses',
-                'Les derniers dossiers de Futura-Sciences'=>'dossiers'
-              ),
-              'Les flux Services'=> array(
-                'Les cartes virtuelles de Futura-Sciences'=>'services/cartes-virtuelles',
-                'Les fonds d\'écran de Futura-Sciences'=>'services/fonds-ecran'
-              ),
-              'Les flux Santé'=>array(
-                'Les dernières actualités de Futura-Santé'=>'sante/actualites',
-                'Les dernières définitions de Futura-Santé'=>'sante/definitions',
-                'Les dernières questions-réponses de Futura-Santé'=>'sante/question-reponses',
-                'Les derniers dossiers de Futura-Santé'=>'sante/dossiers'
-              ),
-              'Les flux High-Tech'=>array(
-                'Les dernières actualités de Futura-High-Tech'=>'high-tech/actualites',
-                'Les dernières astuces de Futura-High-Tech'=>'high-tech/question-reponses',
-                'Les dernières définitions de Futura-High-Tech'=>'high-tech/definitions',
-                'Les derniers dossiers de Futura-High-Tech'=>'high-tech/dossiers'
-              ),
-              'Les flux Espace'=>array(
-                'Les dernières actualités de Futura-Espace'=>'espace/actualites',
-                'Les dernières définitions de Futura-Espace'=>'espace/definitions',
-                'Les dernières questions-réponses de Futura-Espace'=>'espace/question-reponses',
-                'Les derniers dossiers de Futura-Espace'=>'espace/dossiers'
-              ),
-              'Les flux Environnement'=>array(
-                'Les dernières actualités de Futura-Environnement'=>'environnement/actualites',
-                'Les dernières définitions de Futura-Environnement'=>'environnement/definitions',
-                'Les dernières questions-réponses de Futura-Environnement'=>'environnement/question-reponses',
-                'Les derniers dossiers de Futura-Environnement'=>'environnement/dossiers'
-              ),
-              'Les flux Maison'=>array(
-                'Les dernières actualités de Futura-Maison'=>'maison/actualites',
-                'Les dernières astuces de Futura-Maison'=>'maison/question-reponses',
-                'Les dernières définitions de Futura-Maison'=>'maison/definitions',
-                'Les derniers dossiers de Futura-Maison'=>'maison/dossiers'
-              ),
-              'Les flux Nature'=>array(
-                'Les dernières actualités de Futura-Nature'=>'nature/actualites',
-                'Les dernières définitions de Futura-Nature'=>'nature/definitions',
-                'Les dernières questions-réponses de Futura-Nature'=>'nature/question-reponses',
-                'Les derniers dossiers de Futura-Nature'=>'nature/dossiers'
-              ),
-              'Les flux Terre'=>array(
-                'Les dernières actualités de Futura-Terre'=>'terre/actualites',
-                'Les dernières définitions de Futura-Terre'=>'terre/definitions',
-                'Les dernières questions-réponses de Futura-Terre'=>'terre/question-reponses',
-                'Les derniers dossiers de Futura-Terre'=>'terre/dossiers'
-              ),
-              'Les flux Matière'=>array(
-                'Les dernières actualités de Futura-Matière'=>'matiere/actualites',
-                'Les dernières définitions de Futura-Matière'=>'matiere/definitions',
-                'Les dernières questions-réponses de Futura-Matière'=>'matiere/question-reponses',
-                'Les derniers dossiers de Futura-Matière'=>'matiere/dossiers'
-              ),
-              'Les flux Mathématiques'=>array(
-                'Les dernières actualités de Futura-Mathématiques'=>'mathematiques/actualites',
-                'Les derniers dossiers de Futura-Mathématiques'=>'mathematiques/dossiers'
-              )
+                'Les flux multi-magazines'=>array(
+                    'Les dernières actualités de Futura-Sciences'=>'actualites',
+                    'Les dernières définitions de Futura-Sciences'=>'definitions',
+                    'Les dernières photos de Futura-Sciences'=>'photos',
+                    'Les dernières questions - réponses de Futura-Sciences'=>'questions-reponses',
+                    'Les derniers dossiers de Futura-Sciences'=>'dossiers'
+                ),
+                'Les flux Services'=> array(
+                    'Les cartes virtuelles de Futura-Sciences'=>'services/cartes-virtuelles',
+                    'Les fonds d\'écran de Futura-Sciences'=>'services/fonds-ecran'
+                ),
+                'Les flux Santé'=>array(
+                    'Les dernières actualités de Futura-Santé'=>'sante/actualites',
+                    'Les dernières définitions de Futura-Santé'=>'sante/definitions',
+                    'Les dernières questions-réponses de Futura-Santé'=>'sante/question-reponses',
+                    'Les derniers dossiers de Futura-Santé'=>'sante/dossiers'
+                ),
+                'Les flux High-Tech'=>array(
+                    'Les dernières actualités de Futura-High-Tech'=>'high-tech/actualites',
+                    'Les dernières astuces de Futura-High-Tech'=>'high-tech/question-reponses',
+                    'Les dernières définitions de Futura-High-Tech'=>'high-tech/definitions',
+                    'Les derniers dossiers de Futura-High-Tech'=>'high-tech/dossiers'
+                ),
+                'Les flux Espace'=>array(
+                    'Les dernières actualités de Futura-Espace'=>'espace/actualites',
+                    'Les dernières définitions de Futura-Espace'=>'espace/definitions',
+                    'Les dernières questions-réponses de Futura-Espace'=>'espace/question-reponses',
+                    'Les derniers dossiers de Futura-Espace'=>'espace/dossiers'
+                ),
+                'Les flux Environnement'=>array(
+                    'Les dernières actualités de Futura-Environnement'=>'environnement/actualites',
+                    'Les dernières définitions de Futura-Environnement'=>'environnement/definitions',
+                    'Les dernières questions-réponses de Futura-Environnement'=>'environnement/question-reponses',
+                    'Les derniers dossiers de Futura-Environnement'=>'environnement/dossiers'
+                ),
+                'Les flux Maison'=>array(
+                    'Les dernières actualités de Futura-Maison'=>'maison/actualites',
+                    'Les dernières astuces de Futura-Maison'=>'maison/question-reponses',
+                    'Les dernières définitions de Futura-Maison'=>'maison/definitions',
+                    'Les derniers dossiers de Futura-Maison'=>'maison/dossiers'
+                ),
+                'Les flux Nature'=>array(
+                    'Les dernières actualités de Futura-Nature'=>'nature/actualites',
+                    'Les dernières définitions de Futura-Nature'=>'nature/definitions',
+                    'Les dernières questions-réponses de Futura-Nature'=>'nature/question-reponses',
+                    'Les derniers dossiers de Futura-Nature'=>'nature/dossiers'
+                ),
+                'Les flux Terre'=>array(
+                    'Les dernières actualités de Futura-Terre'=>'terre/actualites',
+                    'Les dernières définitions de Futura-Terre'=>'terre/definitions',
+                    'Les dernières questions-réponses de Futura-Terre'=>'terre/question-reponses',
+                    'Les derniers dossiers de Futura-Terre'=>'terre/dossiers'
+                ),
+                'Les flux Matière'=>array(
+                    'Les dernières actualités de Futura-Matière'=>'matiere/actualites',
+                    'Les dernières définitions de Futura-Matière'=>'matiere/definitions',
+                    'Les dernières questions-réponses de Futura-Matière'=>'matiere/question-reponses',
+                    'Les derniers dossiers de Futura-Matière'=>'matiere/dossiers'
+                ),
+                'Les flux Mathématiques'=>array(
+                    'Les dernières actualités de Futura-Mathématiques'=>'mathematiques/actualites',
+                    'Les derniers dossiers de Futura-Mathématiques'=>'mathematiques/dossiers'
+                )
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 12 - 15
bridges/GBAtempBridge.php

@@ -1,27 +1,24 @@
 <?php
 class GBAtempBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'GBAtemp';
+    public $uri = 'http://gbatemp.net/';
+    public $description = 'GBAtemp is a user friendly underground video game community.';
 
-        $this->maintainer = 'ORelio';
-        $this->name = 'GBAtemp';
-        $this->uri = 'http://gbatemp.net/';
-        $this->description = 'GBAtemp is a user friendly underground video game community.';
-
-        $this->parameters[] = array(
-          'type'=>array(
+    public $parameters = array( array(
+        'type'=>array(
             'name'=>'Type',
             'type'=>'list',
             'required'=>true,
             'values'=>array(
-              'News'=>'N',
-              'Reviews'=>'R',
-              'Tutorials'=>'T',
-              'Forum'=>'F'
+                'News'=>'N',
+                'Reviews'=>'R',
+                'Tutorials'=>'T',
+                'Forum'=>'F'
             )
-          )
-        );
-    }
+        )
+    ));
 
     private function ExtractFromDelimiters($string, $start, $end) {
         if (strpos($string, $start) !== false) {

+ 10 - 13
bridges/GawkerBridge.php

@@ -4,20 +4,17 @@ define("RSS_SUFFIX", "/full");
 
 class GawkerBridge extends RssExpander{
 
-    public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Gawker media";
+	public $uri = "http://feeds.gawker.com/";
+	public $description = "A bridge allowing access to any of the numerous Gawker media blogs (Lifehacker, deadspin, Kotaku, Jezebel, and so on. Notice you have to give its id to find the RSS stream in gawker maze";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Gawker media";
-		$this->uri = "http://feeds.gawker.com/";
-		$this->description = "A bridge allowing access to any of the numerous Gawker media blogs (Lifehacker, deadspin, Kotaku, Jezebel, and so on. Notice you have to give its id to find the RSS stream in gawker maze";
-
-        $this->parameters[] = array(
-            'site'=>array(
-                'name'=>'site id to put in uri between feeds.gawker.com and /full .. which is obviously not full AT ALL',
-                'required'=>true
-            )
-        );
-	}
+    public $parameters = array( array(
+        'site'=>array(
+            'name'=>'site id to put in uri between feeds.gawker.com and /full .. which is obviously not full AT ALL',
+            'required'=>true
+        )
+    ));
 
 
     private function toURI($name) {

+ 9 - 13
bridges/GelbooruBridge.php

@@ -1,22 +1,18 @@
 <?php
 class GelbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Gelbooru";
+	public $uri = "http://gelbooru.com/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Gelbooru";
-		$this->uri = "http://gelbooru.com/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 11 - 15
bridges/GiphyBridge.php

@@ -3,22 +3,18 @@ define('GIPHY_LIMIT', 10);
 
 class GiphyBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "kraoc";
+	public $name = "Giphy Bridge";
+	public $uri = "http://giphy.com/";
+	public $description = "Bridge for giphy.com";
 
-		$this->maintainer = "kraoc";
-		$this->name = "Giphy Bridge";
-		$this->uri = "http://giphy.com/";
-		$this->description = "Bridge for giphy.com";
-
-        $this->parameters[] = array(
-            's'=>array('name'=>'search tag'),
-            'n'=>array(
-                'name'=>'max number of returned items',
-                'type'=>'number'
-            )
-        );
-
-	}
+    public $parameters = array( array(
+        's'=>array('name'=>'search tag'),
+        'n'=>array(
+            'name'=>'max number of returned items',
+            'type'=>'number'
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 12 - 12
bridges/GithubIssueBridge.php

@@ -1,13 +1,13 @@
 <?php
 class GithubIssueBridge extends BridgeAbstract{
-  public function loadMetadatas() {
 
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'Github Issue';
-    $this->uri = '';
-    $this->description = 'Returns the issues or comments of an issue of a github project';
+  public $maintainer = 'Pierre Mazière';
+  public $name = 'Github Issue';
+  public $uri = '';
+  public $description = 'Returns the issues or comments of an issue of a github project';
 
-    $this->parameters['global']=array (
+  public $parameters=array(
+    'global'=>array (
       'u'=>array(
         'name'=>'User name',
         'required'=>true
@@ -16,20 +16,20 @@ class GithubIssueBridge extends BridgeAbstract{
         'name'=>'Project name',
         'required'=>true
       )
-    );
+    ),
 
-    $this->parameters['Project Issues']=array();
-    $this->parameters['Issue comments']=array(
+    'Project Issues'=>array(),
+    'Issue comments'=>array(
       'i'=>array(
         'name'=>'Issue number',
         'type'=>'number',
         'required'=>'true'
       )
-    );
-  }
+    )
+  );
 
   public function collectData(){
-        $param=$this->parameters[$this->queriedContext];
+    $param=$this->parameters[$this->queriedContext];
     $uri = 'https://github.com/'.$param['u']['value'].'/'.$param['p']['value'].'/issues/'.(isset($param['i']['value'])?$param['i']['value']:'');
     $html = $this->getSimpleHTMLDOM($uri)
       or $this->returnServerError('No results for Github Issue '.$param['i']['value'].' in project '.$param['u']['value'].'/'.$param['p']['value']);

+ 6 - 14
bridges/GitlabCommitsBridge.php

@@ -1,19 +1,12 @@
 <?php
-/**
-* GitlabCommitsBridge
-*
-* @name GitlabCommits Bridge
-* @description Returns the commits of a project hosted on a gitlab instance
- */
 class GitlabCommitsBridge extends BridgeAbstract{
-  public function loadMetadatas() {
 
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'Gitlab Commits';
-    $this->uri = '';
-    $this->description = 'Returns the commits of a project hosted on a gitlab instance';
+    public $maintainer = 'Pierre Mazière';
+    public $name = 'Gitlab Commits';
+    public $uri = '';
+    public $description = 'Returns the commits of a project hosted on a gitlab instance';
 
-    $this->parameters[] = array(
+    public $parameters = array( array(
       'uri'=>array(
         'name'=>'Base URI',
         'defaultValue'=>'https://gitlab.com'
@@ -30,8 +23,7 @@ class GitlabCommitsBridge extends BridgeAbstract{
         'name'=>'Project branch',
         'defaultValue'=>'master'
       )
-    );
-  }
+    ));
 
   public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/GizmodoFRBridge.php

@@ -1,14 +1,10 @@
 <?php
 class GizmodoFRBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "polopollo";
-		$this->name = "GizmodoFR";
-		$this->uri = "http://www.gizmodo.fr/";
-		$this->description = "Returns the 15 newest posts from GizmodoFR (full text).";
-
-	}
+	public $maintainer = "polopollo";
+	public $name = "GizmodoFR";
+	public $uri = "http://www.gizmodo.fr/";
+	public $description = "Returns the 15 newest posts from GizmodoFR (full text).";
 
     public function collectData(){
 

+ 11 - 15
bridges/GooglePlusPostBridge.php

@@ -4,21 +4,17 @@ class GooglePlusPostBridge extends BridgeAbstract
 	protected $_title;
 	protected $_url;
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Grummfy";
-		$this->name = "Google Plus Post Bridge";
-		$this->uri = "http://plus.google.com/";
-		$this->description = "Returns user public post (without API).";
-
-        $this->parameters[] = array(
-            'username'=>array(
-                'name'=>'username or Id',
-                'required'=>true
-            )
-        );
-
-	}
+	public $maintainer = "Grummfy";
+	public $name = "Google Plus Post Bridge";
+	public $uri = "http://plus.google.com/";
+	public $description = "Returns user public post (without API).";
+
+    public $parameters = array( array(
+        'username'=>array(
+            'name'=>'username or Id',
+            'required'=>true
+        )
+    ));
 
 	const GOOGLE_PLUS_BASE_URL = 'https://plus.google.com/';
 

+ 11 - 14
bridges/GoogleSearchBridge.php

@@ -9,21 +9,18 @@
 */
 class GoogleSearchBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
 
-		$this->maintainer = "sebsauvage";
-		$this->name = "Google search";
-		$this->uri = "https://www.google.com/";
-		$this->description = "Returns most recent results from Google search.";
-
-        $this->parameters[] = array(
-            'q'=>array(
-                'name'=>"keyword",
-                'required'=>true
-            )
-        );
-
-	}
+	public $maintainer = "sebsauvage";
+	public $name = "Google search";
+	public $uri = "https://www.google.com/";
+	public $description = "Returns most recent results from Google search.";
+
+    public $parameters = array( array(
+        'q'=>array(
+            'name'=>"keyword",
+            'required'=>true
+        )
+    ));
 
 
     public function collectData(){

+ 4 - 6
bridges/GuruMedBridge.php

@@ -1,12 +1,10 @@
 <?php
 class GuruMedBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "qwertygc";
-		$this->name = "GuruMed";
-		$this->uri = "http://www.gurumed.org";
-		$this->description = "Returns the 5 newest posts from Gurumed (full text)";
-	}
+	public $maintainer = "qwertygc";
+	public $name = "GuruMed";
+	public $uri = "http://www.gurumed.org";
+	public $description = "Returns the 5 newest posts from Gurumed (full text)";
 
 	private function GurumedStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);

+ 10 - 12
bridges/HDWallpapersBridge.php

@@ -4,22 +4,20 @@ class HDWallpapersBridge extends BridgeAbstract {
     private $category;
     private $resolution;
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "nel50n";
-		$this->name = "HD Wallpapers Bridge";
-		$this->uri = "http://www.hdwallpapers.in/";
-		$this->description = "Returns the latests wallpapers from HDWallpapers";
+	public $maintainer = "nel50n";
+	public $name = "HD Wallpapers Bridge";
+	public $uri = "http://www.hdwallpapers.in/";
+	public $description = "Returns the latests wallpapers from HDWallpapers";
 
-        $this->parameters[] = array(
-          'c'=>array('name'=>'category'),
-          'm'=>array('name'=>'max number of wallpapers'),
-          'r'=>array(
+    public $parameters = array( array(
+        'c'=>array('name'=>'category'),
+        'm'=>array('name'=>'max number of wallpapers'),
+        'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…'
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/HentaiHavenBridge.php

@@ -1,14 +1,10 @@
 <?php
 class HentaiHavenBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "albirew";
-		$this->name = "Hentai Haven";
-		$this->uri = "http://hentaihaven.org/";
-		$this->description = "Returns releases from Hentai Haven";
-
-	}
+	public $maintainer = "albirew";
+	public $name = "Hentai Haven";
+	public $uri = "http://hentaihaven.org/";
+	public $description = "Returns releases from Hentai Haven";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://hentaihaven.org/') or $this->returnServerError('Could not request Hentai Haven.');

+ 11 - 15
bridges/IdenticaBridge.php

@@ -1,21 +1,17 @@
 <?php
 class IdenticaBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Identica Bridge";
-		$this->uri = "https://identi.ca/";
-		$this->description = "Returns user timelines";
-
-        $this->parameters[] = array(
-            'u'=>array(
-                'name'=>'username',
-                'required'=>true
-            )
-        );
-
-	}
+	public $maintainer = "mitsukarenai";
+	public $name = "Identica Bridge";
+	public $uri = "https://identi.ca/";
+	public $description = "Returns user timelines";
+
+    public $parameters = array( array(
+        'u'=>array(
+            'name'=>'username',
+            'required'=>true
+        )
+    ));
 
     public function collectData(){
         $html = '';

+ 11 - 15
bridges/InstagramBridge.php

@@ -1,21 +1,17 @@
 <?php
 class InstagramBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-
-		$this->maintainer = "pauder";
-		$this->name = "Instagram Bridge";
-		$this->uri = "http://instagram.com/";
-		$this->description = "Returns the newest images";
-
-        $this->parameters[] = array(
-            'u'=>array(
-                'name'=>'username',
-                'required'=>true
-            )
-        );
-
-	}
+	public $maintainer = "pauder";
+	public $name = "Instagram Bridge";
+	public $uri = "http://instagram.com/";
+	public $description = "Returns the newest images";
+
+    public $parameters = array( array(
+        'u'=>array(
+            'name'=>'username',
+            'required'=>true
+        )
+    ));
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM($this->getURI())

+ 79 - 79
bridges/IsoHuntBridge.php

@@ -1,93 +1,93 @@
 <?php
 class IsoHuntBridge extends BridgeAbstract{
-    public function loadMetadatas(){
-        $this->maintainer = 'logmanoriginal';
-        $this->name = 'isoHunt Bridge'; // Is replaced later!
-        $this->uri = 'https://isohunt.to'; // Is replaced later!
-        $this->description = 'Returns the latest results by category or search result';
+    public $maintainer = 'logmanoriginal';
+    public $name = 'isoHunt Bridge'; // Is replaced later!
+    public $uri = 'https://isohunt.to'; // Is replaced later!
+    public $description = 'Returns the latest results by category or search result';
 
+    public $parameters = array(
         /*
-        * Get feeds for one of the "latest" categories
-        * Notice: The categories "News" and "Top Searches" are received from the main page
-        * Elements are sorted by name ascending!
-        */
-        $this->parameters['By "Latest" category'] = array(
-          'latest_category'=>array(
-            'name'=>'Latest category',
-            'type'=>'list',
-            'required'=>true,
-            'title'=>'Select your category',
-            'defaultValue'=>'News',
-            'values'=>array(
-              'Hot Torrents'=>'hot_torrents',
-              'News'=>'news',
-              'Releases'=>'releases',
-              'Torrents'=>'torrents'
+         * Get feeds for one of the "latest" categories
+         * Notice: The categories "News" and "Top Searches" are received from the main page
+         * Elements are sorted by name ascending!
+         */
+        'By "Latest" category' => array(
+            'latest_category'=>array(
+                'name'=>'Latest category',
+                'type'=>'list',
+                'required'=>true,
+                'title'=>'Select your category',
+                'defaultValue'=>'News',
+                'values'=>array(
+                    'Hot Torrents'=>'hot_torrents',
+                    'News'=>'news',
+                    'Releases'=>'releases',
+                    'Torrents'=>'torrents'
+                )
             )
-          )
-        );
+        ),
 
         /*
-        * Get feeds for one of the "torrent" categories
-        * Make sure to add new categories also to get_torrent_category_index($)!
-        * Elements are sorted by name ascending!
-        */
-        $this->parameters['By "Torrent" category'] = array(
-          'torrent_category'=>array(
-            'name'=>'Torrent category',
-            'type'=>'list',
-            'required'=>true,
-            'title'=>'Select your category',
-            'defaultValue'=>'Anime',
-            'values'=>array(
-              'Adult'=>'adult',
-              'Anime'=>'anime',
-              'Books'=>'books',
-              'Games'=>'games',
-              'Movies'=>'movies',
-              'Music'=>'music',
-              'Other'=>'other',
-              'Series & TV'=>'series_tv',
-              'Software'=>'software'
+         * Get feeds for one of the "torrent" categories
+         * Make sure to add new categories also to get_torrent_category_index($)!
+         * Elements are sorted by name ascending!
+         */
+        'By "Torrent" category' => array(
+            'torrent_category'=>array(
+                'name'=>'Torrent category',
+                'type'=>'list',
+                'required'=>true,
+                'title'=>'Select your category',
+                'defaultValue'=>'Anime',
+                'values'=>array(
+                    'Adult'=>'adult',
+                    'Anime'=>'anime',
+                    'Books'=>'books',
+                    'Games'=>'games',
+                    'Movies'=>'movies',
+                    'Music'=>'music',
+                    'Other'=>'other',
+                    'Series & TV'=>'series_tv',
+                    'Software'=>'software'
+                )
+            ),
+            'torrent_popularity'=>array(
+                'name'=>'Sort by popularity',
+                'type'=>'checkbox',
+                'title'=>'Activate to receive results by popularity'
             )
-          ),
-          'torrent_popularity'=>array(
-            'name'=>'Sort by popularity',
-            'type'=>'checkbox',
-            'title'=>'Activate to receive results by popularity'
-          )
-        );
+        ),
 
         /*
-        * Get feeds for a specific search request
-        */
-        $this->parameters['Search torrent by name'] = array(
-          'search_name'=>array(
-            'name'=>'Name',
-            'required'=>true,
-            'title'=>'Insert your search query',
-            'exampleValue'=>'Bridge'
-          ),
-          'search_category'=>array(
-            'name'=>'Category',
-            'type'=>'list',
-            'title'=>'Select your category',
-            'defaultValue'=>'All',
-            'values'=>array(
-              'Adult'=>'adult',
-              'All'=>'all',
-              'Anime'=>'anime',
-              'Books'=>'books',
-              'Games'=>'games',
-              'Movies'=>'movies',
-              'Music'=>'music',
-              'Other'=>'other',
-              'Series & TV'=>'series_tv',
-              'Software'=>'software'
+         * Get feeds for a specific search request
+         */
+        'Search torrent by name' => array(
+            'search_name'=>array(
+                'name'=>'Name',
+                'required'=>true,
+                'title'=>'Insert your search query',
+                'exampleValue'=>'Bridge'
+            ),
+            'search_category'=>array(
+                'name'=>'Category',
+                'type'=>'list',
+                'title'=>'Select your category',
+                'defaultValue'=>'All',
+                'values'=>array(
+                    'Adult'=>'adult',
+                    'All'=>'all',
+                    'Anime'=>'anime',
+                    'Books'=>'books',
+                    'Games'=>'games',
+                    'Movies'=>'movies',
+                    'Music'=>'music',
+                    'Other'=>'other',
+                    'Series & TV'=>'series_tv',
+                    'Software'=>'software'
+                )
             )
-          )
-        );
-    }
+        )
+    );
 
     public function collectData(){
         $params=$this->parameters[$this->queriedContext];

+ 10 - 12
bridges/JapanExpoBridge.php

@@ -1,22 +1,20 @@
 <?php
 class JapanExpoBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-        $this->maintainer = 'Ginko';
-        $this->name = 'Japan Expo Actualités';
-        $this->uri = 'http://www.japan-expo-paris.com/fr/actualites';
-        $this->description = 'Returns most recent entries from Japan Expo actualités.';
-        $this->parameters[] = array(
-          'mode'=>array(
+    public $maintainer = 'Ginko';
+    public $name = 'Japan Expo Actualités';
+    public $uri = 'http://www.japan-expo-paris.com/fr/actualites';
+    public $description = 'Returns most recent entries from Japan Expo actualités.';
+    public $parameters = array( array(
+        'mode'=>array(
             'name'=>'Mode',
             'type'=>'list',
             'values'=>array(
-              'Titles only'=>'light',
-              'Full Contents'=>'full'
+                'Titles only'=>'light',
+                'Full Contents'=>'full'
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 9 - 12
bridges/KonachanBridge.php

@@ -1,21 +1,18 @@
 <?php
 class KonachanBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Konachan";
+	public $uri = "http://konachan.com/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Konachan";
-		$this->uri = "http://konachan.com/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/KoreusBridge.php

@@ -1,12 +1,10 @@
 <?php
 class KoreusBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "Koreus";
-		$this->uri = "http://www.koreus.com/";
-		$this->description = "Returns the 5 newest posts from Koreus (full text)";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "Koreus";
+	public $uri = "http://www.koreus.com/";
+	public $description = "Returns the 5 newest posts from Koreus (full text)";
 
 	private function KoreusStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);

+ 10 - 10
bridges/KununuBridge.php

@@ -1,12 +1,12 @@
 <?php
 class KununuBridge extends BridgeAbstract{
-	public function loadMetadatas(){
-		$this->maintainer = "logmanoriginal";
-		$this->name = "Kununu Bridge"; /* This will be replaced later! */
-		$this->uri = "https://www.kununu.com"; /* This will be replaced later! */
-		$this->description = "Returns the latest reviews for a company and site of your choice.";
+	public $maintainer = "logmanoriginal";
+	public $name = "Kununu Bridge"; /* This will be replaced later! */
+	public $uri = "https://www.kununu.com"; /* This will be replaced later! */
+	public $description = "Returns the latest reviews for a company and site of your choice.";
 
-        $this->parameters['global'] = array(
+    public $parameters = array(
+        'global' => array(
           'site'=>array(
             'name'=>'Site',
             'type'=>'list',
@@ -27,17 +27,17 @@ class KununuBridge extends BridgeAbstract{
             'exampleValue'=>'checked',
             'title'=>'Activate to load full article'
           )
-        );
+        ),
 
-        $this->parameters[] = array(
+        array(
           'company'=>array(
             'name'=>'Company',
             'required'=>true,
             'exampleValue'=>'kununu-us',
             'title'=>'Insert company name (i.e. Kununu US) or URI path (i.e. kununu-us)'
           )
-        );
-	}
+      )
+  );
 
 	public function collectData(){
         $params=$this->parameters[$this->queriedContext];

+ 4 - 14
bridges/LWNprevBridge.php

@@ -1,19 +1,9 @@
 <?php
-/**
- * RssBridgeLWNprev
- *
- * @name LWNPrev Bridge
- * @description Returns the articles from the previous LWN.net edition
- */
 class LWNprevBridge extends BridgeAbstract{
-  public function loadMetadatas() {
-
-    $this->maintainer = 'Pierre Mazière';
-    $this->name = 'LWN Free Weekly Edition';
-    $this->uri = 'https://lwn.net/free/bigpage';
-    $this->description = 'LWN Free Weekly Edition available one week late';
-
-  }
+    public $maintainer = 'Pierre Mazière';
+    public $name = 'LWN Free Weekly Edition';
+    public $uri = 'https://lwn.net/free/bigpage';
+    public $description = 'LWN Free Weekly Edition available one week late';
 
   private function jumpToNextTag(&$node){
     while($node && $node->nodeType===XML_TEXT_NODE){

+ 8 - 12
bridges/LeBonCoinBridge.php

@@ -1,14 +1,12 @@
 <?php
 class LeBonCoinBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "16mhz";
+	public $name = "LeBonCoin";
+	public $uri = "http://www.leboncoin.fr";
+	public $description = "Returns most recent results from LeBonCoin for a region, and optionally a category and a keyword .";
 
-		$this->maintainer = "16mhz";
-		$this->name = "LeBonCoin";
-		$this->uri = "http://www.leboncoin.fr";
-		$this->description = "Returns most recent results from LeBonCoin for a region, and optionally a category and a keyword .";
-
-        $this->parameters[] = array(
+    public $parameters = array( array(
           'k'=>array('name'=>'Mot Clé'),
           'r'=>array(
             'name'=>'Région',
@@ -132,11 +130,9 @@ class LeBonCoinBridge extends BridgeAbstract{
               ),
               'AUTRES'=>'autres'
             )
-          )
-        );
-
-	}
-
+        )
+      )
+  );
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/LeJournalDuGeekBridge.php

@@ -1,12 +1,10 @@
 <?php
 class LeJournalDuGeekBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "polopollo";
-		$this->name = "journaldugeek.com (FR)";
-		$this->uri = "http://www.journaldugeek.com/";
-		$this->description = "Returns the 5 newest posts from LeJournalDuGeek (full text).";
-	}
+	public $maintainer = "polopollo";
+	public $name = "journaldugeek.com (FR)";
+	public $uri = "http://www.journaldugeek.com/";
+	public $description = "Returns the 5 newest posts from LeJournalDuGeek (full text).";
 
 	private function LeJournalDuGeekStripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);

+ 4 - 8
bridges/LeMondeInformatiqueBridge.php

@@ -1,14 +1,10 @@
 <?php
 class LeMondeInformatiqueBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-
-        $this->maintainer = "ORelio";
-        $this->name = "Le Monde Informatique";
-        $this->uri = "http://www.lemondeinformatique.fr/";
-        $this->description = "Returns the newest articles.";
-
-    }
+    public $maintainer = "ORelio";
+    public $name = "Le Monde Informatique";
+    public $uri = "http://www.lemondeinformatique.fr/";
+    public $description = "Returns the newest articles.";
 
     public function collectData(){
 

+ 4 - 8
bridges/Les400CulsBridge.php

@@ -4,14 +4,10 @@ define("SEXE_FEED", "http://sexes.blogs.liberation.fr/feeds/");
 
 class Les400CulsBridge extends RssExpander{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "unknown";
-		$this->name = "Les 400 Culs";
-		$this->uri = "http://sexes.blogs.liberation.fr";
-		$this->description = "La planete sexe vue par Agnes Girard via rss-bridge";
-
-	}
+	public $maintainer = "unknown";
+	public $name = "Les 400 Culs";
+	public $uri = "http://sexes.blogs.liberation.fr";
+	public $description = "La planete sexe vue par Agnes Girard via rss-bridge";
 
 
     public function collectData(){

+ 4 - 8
bridges/LesJoiesDuCodeBridge.php

@@ -1,14 +1,10 @@
 <?php
 class LesJoiesDuCodeBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "superbaillot.net";
-		$this->name = "Les Joies Du Code";
-		$this->uri = "http://lesjoiesducode.fr/";
-		$this->description = "LesJoiesDuCode";
-
-	}
+	public $maintainer = "superbaillot.net";
+	public $name = "Les Joies Du Code";
+	public $uri = "http://lesjoiesducode.fr/";
+	public $description = "LesJoiesDuCode";
 
     public function collectData(){
         $html = $this->getSimpleHTMLDOM('http://lesjoiesducode.fr/') or $this->returnServerError('Could not request LesJoiesDuCode.');

+ 4 - 7
bridges/LichessBridge.php

@@ -2,13 +2,10 @@
 
 class LichessBridge  extends BridgeAbstract
 {
-    public function loadMetadatas()
-    {
-        $this->maintainer = 'AmauryCarrade';
-        $this->name = 'Lichess Blog';
-        $this->uri = 'http://lichess.org/blog';
-        $this->description = 'Returns the 5 newest posts from the Lichess blog (full text)';
-    }
+    public $maintainer = 'AmauryCarrade';
+    public $name = 'Lichess Blog';
+    public $uri = 'http://lichess.org/blog';
+    public $description = 'Returns the 5 newest posts from the Lichess blog (full text)';
 
     public function collectData()
     {

+ 8 - 11
bridges/LinkedInCompany.php

@@ -1,20 +1,17 @@
 <?php
 class LinkedInCompany extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "regisenguehard";
+	public $name = "LinkedIn Company";
+	public $uri = "https://www.linkedin.com/";
+	public $description = "Returns most recent actus from Company on LinkedIn. (https://www.linkedin.com/company/<strong style=\"font-weight:bold;\">apple</strong>)";
 
-		$this->maintainer = "regisenguehard";
-		$this->name = "LinkedIn Company";
-		$this->uri = "https://www.linkedin.com/";
-		$this->description = "Returns most recent actus from Company on LinkedIn. (https://www.linkedin.com/company/<strong style=\"font-weight:bold;\">apple</strong>)";
-
-        $this->parameters[] = array(
-          'c'=>array(
+    public $parameters = array( array(
+        'c'=>array(
             'name'=>'Company name',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 9 - 12
bridges/LolibooruBridge.php

@@ -1,21 +1,18 @@
 <?php
 class LolibooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Lolibooru";
+	public $uri = "http://lolibooru.moe/";
+	public $description = "Returns images from given page and tags";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Lolibooru";
-		$this->uri = "http://lolibooru.moe/";
-		$this->description = "Returns images from given page and tags";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 12 - 13
bridges/MangareaderBridge.php

@@ -2,15 +2,14 @@
 define('MANGAREADER_LIMIT', 10); // The default limit
 class MangareaderBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "logmanoriginal";
-		$this->name = "Mangareader Bridge";
-		$this->uri = "http://www.mangareader.net";
-		$this->description = "Returns the latest updates, popular mangas or manga updates (new chapters)";
-
-		$this->parameters["Get latest updates"] = array();
-        $this->parameters["Get popular mangas"] = array(
+	public $maintainer = "logmanoriginal";
+	public $name = "Mangareader Bridge";
+	public $uri = "http://www.mangareader.net";
+	public $description = "Returns the latest updates, popular mangas or manga updates (new chapters)";
+
+    public $parameters = array(
+        'Get latest updates' => array(),
+        'Get popular mangas' => array(
           'category'=>array(
             'name'=>'Category',
             'type'=>'list',
@@ -58,8 +57,8 @@ class MangareaderBridge extends BridgeAbstract{
             'exampleValue'=>'All',
             'title'=>'Select your category'
           )
-        );
-        $this->parameters["Get manga updates"] = array(
+        ),
+        'Get manga updates' => array(
           'path'=>array(
             'name'=>'Path',
             'required'=>true,
@@ -73,8 +72,8 @@ class MangareaderBridge extends BridgeAbstract{
             'exampleValue'=>10,
             'title'=>'Number of items to return [-1 returns all]'
           )
-        );
-	}
+      )
+  );
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 9 - 11
bridges/MilbooruBridge.php

@@ -1,21 +1,19 @@
 <?php
 class MilbooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Milbooru";
-		$this->uri = "http://sheslostcontrol.net/moe/shimmie/";
-		$this->description = "Returns images from given page";
+	public $maintainer = "mitsukarenai";
+	public $name = "Milbooru";
+	public $uri = "http://sheslostcontrol.net/moe/shimmie/";
+	public $description = "Returns images from given page";
 
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/MondeDiploBridge.php

@@ -1,12 +1,10 @@
 <?php
 class MondeDiploBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "Pitchoule";
-		$this->name = 'Monde Diplomatique';
-		$this->uri = 'http://www.monde-diplomatique.fr';
-		$this->description = "Returns most recent results from MondeDiplo.";
-	}
+	public $maintainer = "Pitchoule";
+	public $name = 'Monde Diplomatique';
+	public $uri = 'http://www.monde-diplomatique.fr';
+	public $description = "Returns most recent results from MondeDiplo.";
 
 	public function collectData(){
 		$html = $this->getSimpleHTMLDOM($this->uri) or $this->returnServerError('Could not request MondeDiplo. for : ' . $link);

+ 4 - 6
bridges/MsnMondeBridge.php

@@ -1,12 +1,10 @@
 <?php
 class MsnMondeBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "kranack";
-		$this->name = 'MSN Actu Monde';
-		$this->uri = 'http://www.msn.com/fr-fr/actualite/monde';
-		$this->description = "Returns the 10 newest posts from MSN Actualités (full text)";
-	}
+	public $maintainer = "kranack";
+	public $name = 'MSN Actu Monde';
+	public $uri = 'http://www.msn.com/fr-fr/actualite/monde';
+	public $description = "Returns the 10 newest posts from MSN Actualités (full text)";
 
 	private function MsnMondeExtractContent($url, &$item) {
 		$html2 = $this->getSimpleHTMLDOM($url);

+ 9 - 12
bridges/MspabooruBridge.php

@@ -1,22 +1,19 @@
 <?php
 class MspabooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Mspabooru";
-		$this->uri = "http://mspabooru.com/";
-		$this->description = "Returns images from given page";
+	public $maintainer = "mitsukarenai";
+	public $name = "Mspabooru";
+	public $uri = "http://mspabooru.com/";
+	public $description = "Returns images from given page";
 
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/NakedSecurityBridge.php

@@ -1,12 +1,10 @@
 <?php
 class NakedSecurityBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = 'ORelio';
-        $this->name = 'Naked Security';
-        $this->uri = 'https://nakedsecurity.sophos.com/';
-        $this->description = 'Returns the newest articles.';
-    }
+    public $maintainer = 'ORelio';
+    public $name = 'Naked Security';
+    public $uri = 'https://nakedsecurity.sophos.com/';
+    public $description = 'Returns the newest articles.';
 
     public function collectData(){
 

+ 4 - 8
bridges/NasaApodBridge.php

@@ -1,14 +1,10 @@
 <?php
 class NasaApodBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "corenting";
-		$this->name = "NASA APOD Bridge";
-		$this->uri = "http://apod.nasa.gov/apod/astropix.html";
-		$this->description = "Returns the 3 latest NASA APOD pictures and explanations";
-
-	}
+	public $maintainer = "corenting";
+	public $name = "NASA APOD Bridge";
+	public $uri = "http://apod.nasa.gov/apod/astropix.html";
+	public $description = "Returns the 3 latest NASA APOD pictures and explanations";
 
   public function collectData(){
 

+ 4 - 6
bridges/NeuviemeArtBridge.php

@@ -1,12 +1,10 @@
 <?php
 class NeuviemeArtBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
-        $this->maintainer = "ORelio";
-        $this->name = '9ème Art Bridge';
-        $this->uri = "http://www.9emeart.fr/";
-        $this->description = "Returns the newest articles.";
-    }
+    public $maintainer = "ORelio";
+    public $name = '9ème Art Bridge';
+    public $uri = "http://www.9emeart.fr/";
+    public $description = "Returns the newest articles.";
 
     public function collectData(){
 

+ 4 - 6
bridges/NextInpactBridge.php

@@ -1,12 +1,10 @@
 <?php
 class NextInpactBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
-		$this->maintainer = "qwertygc";
-		$this->name = "NextInpact Bridge";
-		$this->uri = "http://www.nextinpact.com/";
-		$this->description = "Returns the newest articles.";
-	}
+	public $maintainer = "qwertygc";
+	public $name = "NextInpact Bridge";
+	public $uri = "http://www.nextinpact.com/";
+	public $description = "Returns the newest articles.";
 
 	private function StripCDATA($string) {
 		$string = str_replace('<![CDATA[', '', $string);

+ 18 - 21
bridges/NextgovBridge.php

@@ -1,32 +1,29 @@
 <?php
 class NextgovBridge extends BridgeAbstract {
 
-    public function loadMetadatas() {
+    public $maintainer = 'ORelio';
+    public $name = 'Nextgov Bridge';
+    public $uri = 'https://www.nextgov.com/';
+    public $description = 'USA Federal technology news, best practices, and web 2.0 tools.';
 
-        $this->maintainer = 'ORelio';
-        $this->name = 'Nextgov Bridge';
-        $this->uri = 'https://www.nextgov.com/';
-        $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.';
-
-        $this->parameters[] = array(
-          'category'=>array(
+    public $parameters = array( array(
+        'category'=>array(
             'name'=>'Category',
             'type'=>'list',
             'values'=>array(
-              'All'=>'all',
-              'Technology News'=>'technology-news',
-              'CIO Briefing'=>'cio-briefing',
-              'Emerging Tech'=>'emerging-tech',
-              'Cloud'=>'cloud-computing',
-              'Cybersecurity'=>'cybersecurity',
-              'Mobile'=>'mobile',
-              'Health'=>'health',
-              'Defense'=>'defense',
-              'Big Data'=>'big-data'
+                'All'=>'all',
+                'Technology News'=>'technology-news',
+                'CIO Briefing'=>'cio-briefing',
+                'Emerging Tech'=>'emerging-tech',
+                'Cloud'=>'cloud-computing',
+                'Cybersecurity'=>'cybersecurity',
+                'Mobile'=>'mobile',
+                'Health'=>'health',
+                'Defense'=>'defense',
+                'Big Data'=>'big-data'
             )
-          )
-        );
-    }
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/NiceMatinBridge.php

@@ -1,12 +1,10 @@
 <?php
 class NiceMatinBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "NiceMatin";
-		$this->uri = "http://www.nicematin.com/";
-		$this->description = "Returns the 10 newest posts from NiceMatin (full text)";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "NiceMatin";
+	public $uri = "http://www.nicematin.com/";
+	public $description = "Returns the 10 newest posts from NiceMatin (full text)";
 
 	private function NiceMatinExtractContent($url) {
 		$html = $this->getSimpleHTMLDOM($url);

+ 8 - 11
bridges/NovelUpdatesBridge.php

@@ -1,19 +1,16 @@
 <?php
 class NovelUpdatesBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "albirew";
-		$this->name = "Novel Updates";
-		$this->uri = "http://www.novelupdates.com/";
-		$this->description = "Returns releases from Novel Updates";
-		$this->parameters[] = array(
-          'n'=>array(
+	public $maintainer = "albirew";
+	public $name = "Novel Updates";
+	public $uri = "http://www.novelupdates.com/";
+	public $description = "Returns releases from Novel Updates";
+	public $parameters = array( array(
+        'n'=>array(
             'name'=>'Novel URL',
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/NumeramaBridge.php

@@ -1,14 +1,10 @@
 <?php
 class NumeramaBridge extends BridgeAbstract{
 
-    public function loadMetadatas() {
-
-        $this->maintainer = 'mitsukarenai';
-        $this->name = 'Numerama';
-        $this->uri = 'http://www.numerama.com/';
-        $this->description = 'Returns the 5 newest posts from Numerama (full text)';
-
-    }
+    public $maintainer = 'mitsukarenai';
+    public $name = 'Numerama';
+    public $uri = 'http://www.numerama.com/';
+    public $description = 'Returns the 5 newest posts from Numerama (full text)';
 
     public function collectData(){
 

+ 17 - 21
bridges/OpenClassroomsBridge.php

@@ -1,32 +1,28 @@
 <?php
 class OpenClassroomsBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "sebsauvage";
+	public $name = "OpenClassrooms Bridge";
+	public $uri = "https://openclassrooms.com/";
+	public $description = "Returns latest tutorials from OpenClassrooms.";
 
-		$this->maintainer = "sebsauvage";
-		$this->name = "OpenClassrooms Bridge";
-		$this->uri = "https://openclassrooms.com/";
-		$this->description = "Returns latest tutorials from OpenClassrooms.";
-
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'Catégorie',
             'type'=>'list',
             'values'=>array(
-              'Arts & Culture'=>'arts',
-              'Code'=>'code',
-              'Design'=>'design',
-              'Entreprise'=>'business',
-              'Numérique'=>'digital',
-              'Sciences'=>'sciences',
-              'Sciences Humaines'=>'humainities',
-              'Systèmes d\'information'=>'it',
-              'Autres'=>'others'
+                'Arts & Culture'=>'arts',
+                'Code'=>'code',
+                'Design'=>'design',
+                'Entreprise'=>'business',
+                'Numérique'=>'digital',
+                'Sciences'=>'sciences',
+                'Sciences Humaines'=>'humainities',
+                'Systèmes d\'information'=>'it',
+                'Autres'=>'others'
             )
-          )
-        );
-	}
+        )
+    ));
 
 
     public function collectData(){

+ 13 - 17
bridges/ParuVenduImmoBridge.php

@@ -1,31 +1,27 @@
 <?php
-
 class ParuVenduImmoBridge extends BridgeAbstract
 {
-	public function loadMetadatas() {
-
-		$this->maintainer = "polo2ro";
-		$this->name = "Paru Vendu Immobilier";
-		$this->uri = "http://www.paruvendu.fr";
-		$this->description = "Returns the ads from the first page of search result.";
+	public $maintainer = "polo2ro";
+	public $name = "Paru Vendu Immobilier";
+	public $uri = "http://www.paruvendu.fr";
+	public $description = "Returns the ads from the first page of search result.";
 
 
-        $this->parameters[] = array(
-          'minarea'=>array(
+    public $parameters = array( array(
+        'minarea'=>array(
             'name'=>'Minimal surface m²',
             'type'=>'number'
-          ),
-          'maxprice'=>array(
+        ),
+        'maxprice'=>array(
             'name'=>'Max price',
             'type'=>'number'
-          ),
-          'pa'=>array(
+        ),
+        'pa'=>array(
             'name'=>'Country code',
             'exampleValue'=>'FR'
-          ),
-          'lo'=>array('name'=>'department numbers or postal codes, comma-separated')
-        );
-	}
+        ),
+        'lo'=>array('name'=>'department numbers or postal codes, comma-separated')
+    ));
 
     public function collectData()
     {

+ 12 - 15
bridges/PickyWallpapersBridge.php

@@ -5,28 +5,25 @@ class PickyWallpapersBridge extends BridgeAbstract {
     private $subcategory;
     private $resolution;
 
-	public function loadMetadatas() {
+	public $maintainer = "nel50n";
+	public $name = "PickyWallpapers Bridge";
+	public $uri = "http://www.pickywallpapers.com/";
+	public $description = "Returns the latests wallpapers from PickyWallpapers";
 
-		$this->maintainer = "nel50n";
-		$this->name = "PickyWallpapers Bridge";
-		$this->uri = "http://www.pickywallpapers.com/";
-		$this->description = "Returns the latests wallpapers from PickyWallpapers";
-
-        $this->parameters[] = array(
-          'c'=>array('name'=>'category'),
-          's'=>array('name'=>'subcategory'),
-          'm'=>array(
+    public $parameters = array( array(
+        'c'=>array('name'=>'category'),
+        's'=>array('name'=>'subcategory'),
+        'm'=>array(
             'name'=>'Max number of wallpapers',
             'type'=>'number'
-          ),
-          'r'=>array(
+        ),
+        'r'=>array(
             'name'=>'resolution',
             'exampleValue'=>'1920x1200, 1680x1050,…',
             'pattern'=>'[0-9]{3,4}x[0-9]{3,4}'
-          )
-        );
+        )
+    ));
 
-	}
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 14 - 16
bridges/PinterestBridge.php

@@ -5,22 +5,20 @@ class PinterestBridge extends BridgeAbstract{
     private $board;
     private $query;
 
-    public function loadMetadatas() {
-
-		$this->maintainer = "pauder";
-		$this->name = "Pinterest Bridge";
-		$this->uri = "http://www.pinterest.com";
-		$this->description = "Returns the newest images on a board";
-
-        $this->parameters["By username and board"] = array(
-          'u'=>array('name'=>'username'),
-          'b'=>array('name'=>'board')
-        );
-
-        $this->parameters["From search"] = array(
-          'q'=>array('name'=>'Keyword')
-        );
-	}
+	public $maintainer = "pauder";
+	public $name = "Pinterest Bridge";
+	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')
+        ),
+        'From search' => array(
+            'q'=>array('name'=>'Keyword')
+        )
+    );
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 6
bridges/PlanetLibreBridge.php

@@ -1,12 +1,10 @@
 <?php
 class PlanetLibreBridge extends BridgeAbstract{
 
-	public function loadMetadatas(){
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "PlanetLibre";
-		$this->uri = "http://www.planet-libre.org";
-		$this->description = "Returns the 5 newest posts from PlanetLibre (full text)";
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "PlanetLibre";
+	public $uri = "http://www.planet-libre.org";
+	public $description = "Returns the 5 newest posts from PlanetLibre (full text)";
 
 	private function PlanetLibreExtractContent($url){
 		$html2 = $this->getSimpleHTMLDOM($url);

+ 4 - 8
bridges/ProjectMGameBridge.php

@@ -1,14 +1,10 @@
 <?php
 class ProjectMGameBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "corenting";
-		$this->name = "Project M Game Bridge";
-		$this->uri = "http://projectmgame.com/en/";
-		$this->description = "Returns the newest articles.";
-
-	}
+	public $maintainer = "corenting";
+	public $name = "Project M Game Bridge";
+	public $uri = "http://projectmgame.com/en/";
+	public $description = "Returns the newest articles.";
 
 
   public function collectData(){

+ 8 - 10
bridges/RTBFBridge.php

@@ -1,19 +1,17 @@
 <?php
 class RTBFBridge extends BridgeAbstract {
-	public function loadMetadatas() {
-		$this->name = "RTBF Bridge";
-		$this->uri = "http://www.rtbf.be/auvio/emissions";
-		$this->description = "Returns the newest RTBF videos by series ID";
-		$this->maintainer = "Frenzie";
+	public $name = "RTBF Bridge";
+	public $uri = "http://www.rtbf.be/auvio/emissions";
+	public $description = "Returns the newest RTBF videos by series ID";
+	public $maintainer = "Frenzie";
 
-        $this->parameters[] = array(
-          'c'=>array(
+    public $parameters = array( array(
+        'c'=>array(
             'name'=>'series id',
             'exampleValue'=>9500,
             'required'=>true
-          )
-        );
-	}
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/Releases3DSBridge.php

@@ -1,14 +1,10 @@
 <?php
 class Releases3DSBridge extends BridgeAbstract {
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "ORelio";
-		$this->name = "3DS Scene Releases";
-		$this->uri = "http://www.3dsdb.com/";
-		$this->description = "Returns the newest scene releases.";
-
-	}
+	public $maintainer = "ORelio";
+	public $name = "3DS Scene Releases";
+	public $uri = "http://www.3dsdb.com/";
+	public $description = "Returns the newest scene releases.";
 
     public function collectData(){
 

+ 4 - 6
bridges/ReporterreBridge.php

@@ -1,12 +1,10 @@
 <?php
 class ReporterreBridge extends BridgeAbstract{
 
-		public function loadMetadatas() {
-			$this->maintainer = "nyutag";
-			$this->name = "Reporterre Bridge";
-			$this->uri = "http://www.reporterre.net/";
-			$this->description = "Returns the newest articles.";
-		}
+		public $maintainer = "nyutag";
+		public $name = "Reporterre Bridge";
+		public $uri = "http://www.reporterre.net/";
+		public $description = "Returns the newest articles.";
 
 		private function ExtractContentReporterre($url) {
 			$html2 = $this->getSimpleHTMLDOM($url);

+ 4 - 8
bridges/Rue89Bridge.php

@@ -1,14 +1,10 @@
 <?php
 class Rue89Bridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "pit-fgfjiudghdf";
-		$this->name = "Rue89";
-		$this->uri = "http://rue89.nouvelobs.com/";
-		$this->description = "Returns the 5 newest posts from Rue89 (full text)";
-
-	}
+	public $maintainer = "pit-fgfjiudghdf";
+	public $name = "Rue89";
+	public $uri = "http://rue89.nouvelobs.com/";
+	public $description = "Returns the 5 newest posts from Rue89 (full text)";
 
 	private function rue89getDatas($url){
 

+ 9 - 13
bridges/Rule34Bridge.php

@@ -1,22 +1,18 @@
 <?php
 class Rule34Bridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Rule34";
+	public $uri = "http://rule34.xxx/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Rule34";
-		$this->uri = "http://rule34.xxx/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 9 - 12
bridges/Rule34pahealBridge.php

@@ -1,21 +1,18 @@
 <?php
 class Rule34pahealBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Rule34paheal";
+	public $uri = "http://rule34.paheal.net/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Rule34paheal";
-		$this->uri = "http://rule34.paheal.net/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
 
     public function collectData(){

+ 9 - 13
bridges/SafebooruBridge.php

@@ -1,22 +1,18 @@
 <?php
 class SafebooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Safebooru";
+	public $uri = "http://safebooru.org/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Safebooru";
-		$this->uri = "http://safebooru.org/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 9 - 13
bridges/SakugabooruBridge.php

@@ -1,22 +1,18 @@
 <?php
 class SakugabooruBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "mitsukarenai";
+	public $name = "Sakugabooru";
+	public $uri = "http://sakuga.yshi.org/";
+	public $description = "Returns images from given page";
 
-		$this->maintainer = "mitsukarenai";
-		$this->name = "Sakugabooru";
-		$this->uri = "http://sakuga.yshi.org/";
-		$this->description = "Returns images from given page";
-
-        $this->parameters[] = array(
-          'p'=>array(
+    public $parameters = array( array(
+        'p'=>array(
             'name'=>'page',
             'type'=>'number'
-          ),
-          't'=>array('name'=>'tags')
-        );
-
-	}
+        ),
+        't'=>array('name'=>'tags')
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/ScmbBridge.php

@@ -1,14 +1,10 @@
 <?php
 class ScmbBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Astalaseven";
-		$this->name = "Se Coucher Moins Bête Bridge";
-		$this->uri = "http://secouchermoinsbete.fr/";
-		$this->description = "Returns the newest anecdotes.";
-
-	}
+	public $maintainer = "Astalaseven";
+	public $name = "Se Coucher Moins Bête Bridge";
+	public $uri = "http://secouchermoinsbete.fr/";
+	public $description = "Returns the newest anecdotes.";
 
     public function collectData(){
         $html = '';

+ 8 - 12
bridges/ScoopItBridge.php

@@ -1,21 +1,17 @@
 <?php
 class ScoopItBridge extends BridgeAbstract{
 
-	public function loadMetadatas() {
+	public $maintainer = "Pitchoule";
+	public $name = "ScoopIt";
+	public $uri = "http://www.scoop.it";
+	public $description = "Returns most recent results from ScoopIt.";
 
-		$this->maintainer = "Pitchoule";
-		$this->name = "ScoopIt";
-		$this->uri = "http://www.scoop.it";
-		$this->description = "Returns most recent results from ScoopIt.";
-
-        $this->parameters[] = array(
-          'u'=>array(
+    public $parameters = array( array(
+        'u'=>array(
             'name'=>'keyword',
             'required'=>true
-          )
-        );
-
-	}
+        )
+    ));
 
     public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 18 - 22
bridges/SensCritiqueBridge.php

@@ -1,41 +1,37 @@
 <?php
 class SensCritiqueBridge extends BridgeAbstract {
 
-	private $request;
+	public $maintainer = "kranack";
+	public $name = "Sens Critique";
+	public $uri = "http://www.senscritique.com";
+	public $description = "Sens Critique news";
 
-  public function loadMetadatas() {
-		$this->maintainer = "kranack";
-		$this->name = "Sens Critique";
-		$this->uri = "http://www.senscritique.com";
-		$this->description = "Sens Critique news";
-
-        $this->parameters[] = array(
-          'm'=>array(
+    public $parameters = array( array(
+        'm'=>array(
             'name'=>'Movies',
             'type'=>'checkbox'
-          ),
-          's'=>array(
+        ),
+        's'=>array(
             'name'=>'Series',
             'type'=>'checkbox'
-          ),
-          'g'=>array(
+        ),
+        'g'=>array(
             'name'=>'Video Games',
             'type'=>'checkbox'
-          ),
-          'b'=>array(
+        ),
+        'b'=>array(
             'name'=>'Books',
             'type'=>'checkbox'
-          ),
-          'bd'=>array(
+        ),
+        'bd'=>array(
             'name'=>'BD',
             'type'=>'checkbox'
-          ),
-          'mu'=>array(
+        ),
+        'mu'=>array(
             'name'=>'Music',
             'type'=>'checkbox'
-          )
-        );
-  }
+        )
+    ));
 
 	public function collectData(){
         $param=$this->parameters[$this->queriedContext];

+ 4 - 8
bridges/Sexactu.php

@@ -1,14 +1,10 @@
 <?php
 class Sexactu extends BridgeAbstract{
 
-	public function loadMetadatas() {
-
-		$this->maintainer = "Riduidel";
-		$this->name = "Sexactu";
-		$this->uri = "http://www.gqmagazine.fr";
-		$this->description = "Sexactu via rss-bridge";
-
-	}
+	public $maintainer = "Riduidel";
+	public $name = "Sexactu";
+	public $uri = "http://www.gqmagazine.fr";
+	public $description = "Sexactu via rss-bridge";
 
     public function collectData(){
 $find = array('janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'novembre', 'décembre');

Some files were not shown because too many files changed in this diff