No updates available
"; - + $this->items[] = $item; - } + } } public function getName(){ @@ -331,4 +211,4 @@ class MangareaderBridge extends BridgeAbstract{ return 10800; // 3 hours } } -?> \ No newline at end of file +?> diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php index 1702cad6..34fa1451 100644 --- a/bridges/MilbooruBridge.php +++ b/bridges/MilbooruBridge.php @@ -8,18 +8,13 @@ class MilbooruBridge extends BridgeAbstract{ $this->uri = "http://sheslostcontrol.net/moe/shimmie/"; $this->description = "Returns images from given page"; - $this->parameters[] = - '[ - { - "name" : "page", - "identifier" : "p", - "type" : "number" - }, - { - "name" : "tags", - "identifier" : "t" - } - ]'; + $this->parameters[] = array( + 'p'=>array( + 'name'=>'page', + 'type'=>'number' + ), + 't'=>array('name'=>'tags') + ); } public function collectData(array $param){ diff --git a/bridges/MspabooruBridge.php b/bridges/MspabooruBridge.php index a33d7a2d..7005a408 100644 --- a/bridges/MspabooruBridge.php +++ b/bridges/MspabooruBridge.php @@ -8,18 +8,13 @@ class MspabooruBridge extends BridgeAbstract{ $this->uri = "http://mspabooru.com/"; $this->description = "Returns images from given page"; - $this->parameters[] = - '[ - { - "name" : "page", - "identifier" : "p", - "type" : "number" - }, - { - "name" : "tags", - "identifier" : "t" - } - ]'; + $this->parameters[] = array( + 'p'=>array( + 'name'=>'page', + 'type'=>'number' + ), + 't'=>array('name'=>'tags') + ); } diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php index b44d766c..5c086a11 100644 --- a/bridges/NextgovBridge.php +++ b/bridges/NextgovBridge.php @@ -8,28 +8,24 @@ class NextgovBridge extends BridgeAbstract { $this->uri = 'https://www.nextgov.com/'; $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.'; - $this->parameters[] = - '[ - { - "name" : "Category", - "type" : "list", - "identifier" : "category", - "values" : - [ - { "name" : "All", "value" : "all" }, - { "name" : "Technology News", "value" : "technology-news" }, - { "name" : "CIO Briefing", "value" : "cio-briefing" }, - { "name" : "Emerging Tech", "value" : "emerging-tech" }, - { "name" : "Cloud", "value" : "cloud-computing" }, - { "name" : "Cybersecurity", "value" : "cybersecurity" }, - { "name" : "Mobile", "value" : "mobile" }, - { "name" : "Health", "value" : "health" }, - { "name" : "Defense", "value" : "defense" }, - { "name" : "Big Data", "value" : "big-data" } - ] - } - ]'; - + $this->parameters[] = 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' + ) + ) + ); } public function collectData(array $param) { diff --git a/bridges/NovelUpdatesBridge.php b/bridges/NovelUpdatesBridge.php index 2a99ad4c..a9dccde8 100644 --- a/bridges/NovelUpdatesBridge.php +++ b/bridges/NovelUpdatesBridge.php @@ -7,14 +7,12 @@ class NovelUpdatesBridge extends BridgeAbstract{ $this->name = "Novel Updates"; $this->uri = "http://www.novelupdates.com/"; $this->description = "Returns releases from Novel Updates"; - $this->parameters[] = - '[ - { - "name" : "Novel URL", - "identifier" : "n", - "required": true - } - ]'; + $this->parameters[] = array( + 'n'=>array( + 'name'=>'Novel URL', + 'required'=>true + ) + ); } public function collectData(array $param){ diff --git a/bridges/OpenClassroomsBridge.php b/bridges/OpenClassroomsBridge.php index d435ef9f..34866937 100644 --- a/bridges/OpenClassroomsBridge.php +++ b/bridges/OpenClassroomsBridge.php @@ -9,52 +9,23 @@ class OpenClassroomsBridge extends BridgeAbstract{ $this->description = "Returns latest tutorials from OpenClassrooms."; - $this->parameters[] = - '[ - { - "name" : "Catégorie", - "identifier" : "u", - "type" : "list", - "values" : [ - { - "name" : "Arts & Culture", - "value" : "arts" - }, - { - "name" : "Code", - "value" : "code" - }, - { - "name" : "Design", - "value" : "design" - }, - { - "name" : "Entreprise", - "value" : "business" - }, - { - "name" : "Numérique", - "value" : "digital" - }, - { - "name" : "Sciences", - "value" : "sciences" - }, - { - "name" : "Sciences Humaines", - "value" : "humainities" - }, - { - "name" : "Systèmes d\'information", - "value" : "it" - }, - { - "name" : "Autres", - "value" : "others" - } - ] - } - ]'; + $this->parameters[] = 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' + ) + ) + ); } diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php index 43149cd7..8cab0112 100644 --- a/bridges/ParuVenduImmoBridge.php +++ b/bridges/ParuVenduImmoBridge.php @@ -12,31 +12,21 @@ class ParuVenduImmoBridge extends BridgeAbstract $this->description = "Returns the ads from the first page of search result."; - $this->parameters[] = - '[ - { - "name": "Minimal surface m²", - "type" : "number", - "identifier" : "minarea" - }, - { - "name" : "Max price", - "type" : "number", - "identifier" : "maxprice" - }, - { - "name" : "Country code", - "type" : "text", - "identifier" : "pa", - "exampleValue" : "FR" - }, - { - "name" : "department numbers or postal codes, comma-separated", - "type" : "text", - "identifier" : "lo" - } - - ]'; + $this->parameters[] = array( + 'minarea'=>array( + 'name'=>'Minimal surface m²', + 'type'=>'number' + ), + 'maxprice'=>array( + 'name'=>'Max price', + 'type'=>'number' + ), + 'pa'=>array( + 'name'=>'Country code', + 'exampleValue'=>'FR' + ), + 'lo'=>array('name'=>'department numbers or postal codes, comma-separated') + ); } public function collectData(array $param) diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php index c26a1ebe..66d97ff6 100644 --- a/bridges/PickyWallpapersBridge.php +++ b/bridges/PickyWallpapersBridge.php @@ -12,29 +12,20 @@ class PickyWallpapersBridge extends BridgeAbstract { $this->uri = "http://www.pickywallpapers.com/"; $this->description = "Returns the latests wallpapers from PickyWallpapers"; - $this->parameters[] = - '[ - { - "name" : "Category", - "identifier" : "c" - }, - { - "name" : "subcategory", - "identifier" : "s" - }, - { - "name" : "Max number of wallpapers", - "identifier" : "m", - "type" : "number" - }, - { - "name" : "resolution", - "identifier" : "r", - "exampleValue" : "1920x1200, 1680x1050, ...", - "pattern" : "[0-9]{3,4}x[0-9]{3,4}" - } + $this->parameters[] = array( + 'c'=>array('name'=>'category'), + 's'=>array('name'=>'subcategory'), + 'm'=>array( + 'name'=>'Max number of wallpapers', + 'type'=>'number' + ), + 'r'=>array( + 'name'=>'resolution', + 'exampleValue'=>'1920x1200, 1680x1050,…', + 'pattern'=>'[0-9]{3,4}x[0-9]{3,4}' + ) + ); - ]'; } public function collectData(array $param){ diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php index 7d4a6684..2cf2f00a 100644 --- a/bridges/PinterestBridge.php +++ b/bridges/PinterestBridge.php @@ -12,26 +12,14 @@ class PinterestBridge extends BridgeAbstract{ $this->uri = "http://www.pinterest.com"; $this->description = "Returns the newest images on a board"; - $this->parameters["By username and board"] = - '[ - { - "name" : "username", - "identifier" : "u" - }, - { - "name" : "board", - "identifier" : "b" + $this->parameters["By username and board"] = array( + 'u'=>array('name'=>'username'), + 'b'=>array('name'=>'board') + ); - } - ]'; - - $this->parameters["From search"] = - '[ - { - "name" : "Keyword", - "identifier" : "q" - } - ]'; + $this->parameters["From search"] = array( + 'q'=>array('name'=>'Keyword') + ); } public function collectData(array $param){ diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php index 310f289f..4c6e6c80 100644 --- a/bridges/RTBFBridge.php +++ b/bridges/RTBFBridge.php @@ -6,16 +6,13 @@ class RTBFBridge extends BridgeAbstract { $this->description = "Returns the newest RTBF videos by series ID"; $this->maintainer = "Frenzie"; - $this->parameters[] = - '[ - { - "type" : "text", - "identifier" : "c", - "name" : "series id", - "exampleValue" : "9500", - "required" : true - } - ]'; + $this->parameters[] = array( + 'c'=>array( + 'name'=>'series id', + 'exampleValue'=>9500, + 'required'=>true + ) + ); } public function collectData(array $param) { diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php index 1e2323d9..96362402 100644 --- a/bridges/Rule34Bridge.php +++ b/bridges/Rule34Bridge.php @@ -8,18 +8,14 @@ class Rule34Bridge extends BridgeAbstract{ $this->uri = "http://rule34.xxx/"; $this->description = "Returns images from given page"; - $this->parameters[] = - '[ - { - "name" : "page", - "identifier" : "p", - "type" : "number" - }, - { - "name" : "tags", - "identifier" : "t" - } - ]'; + $this->parameters[] = array( + 'p'=>array( + 'name'=>'page', + 'type'=>'number' + ), + 't'=>array('name'=>'tags') + ); + } public function collectData(array $param){ diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php index 17209fc7..43d6a71d 100644 --- a/bridges/Rule34pahealBridge.php +++ b/bridges/Rule34pahealBridge.php @@ -8,18 +8,13 @@ class Rule34pahealBridge extends BridgeAbstract{ $this->uri = "http://rule34.paheal.net/"; $this->description = "Returns images from given page"; - $this->parameters[] = - '[ - { - "name" : "page", - "identifier" : "p", - "type" : "number" - }, - { - "name" : "tags", - "identifier" : "t" - } - ]'; + $this->parameters[] = array( + 'p'=>array( + 'name'=>'page', + 'type'=>'number' + ), + 't'=>array('name'=>'tags') + ); } diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php index b4c64f2d..a3e3ec87 100644 --- a/bridges/SafebooruBridge.php +++ b/bridges/SafebooruBridge.php @@ -8,18 +8,13 @@ class SafebooruBridge extends BridgeAbstract{ $this->uri = "http://safebooru.org/"; $this->description = "Returns images from given page"; - $this->parameters[] = - '[ - { - "name" : "page", - "identifier" : "p", - "type" : "number" - }, - { - "name" : "tags", - "identifier" : "t" - } - ]'; + $this->parameters[] = array( + 'p'=>array( + 'name'=>'page', + 'type'=>'number' + ), + 't'=>array('name'=>'tags') + ); } diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php index e1c13a12..e2ce7f95 100644 --- a/bridges/SakugabooruBridge.php +++ b/bridges/SakugabooruBridge.php @@ -8,18 +8,14 @@ class SakugabooruBridge extends BridgeAbstract{ $this->uri = "http://sakuga.yshi.org/"; $this->description = "Returns images from given page"; - $this->parameters[] = - '[ - { - "name" : "page", - "identifier" : "p", - "type" : "number" - }, - { - "name" : "tags", - "identifier" : "t" - } - ]'; + $this->parameters[] = array( + 'p'=>array( + 'name'=>'page', + 'type'=>'number' + ), + 't'=>array('name'=>'tags') + ); + } public function collectData(array $param){ diff --git a/bridges/ScoopItBridge.php b/bridges/ScoopItBridge.php index 248c9357..60d04168 100644 --- a/bridges/ScoopItBridge.php +++ b/bridges/ScoopItBridge.php @@ -8,14 +8,12 @@ class ScoopItBridge extends BridgeAbstract{ $this->uri = "http://www.scoop.it"; $this->description = "Returns most recent results from ScoopIt."; - $this->parameters[] = - '[ - { - "name" : "keyword", - "identifier" : "u", - "required": true - } - ]'; + $this->parameters[] = array( + 'u'=>array( + 'name'=>'keyword', + 'required'=>true + ) + ); } diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php index c51cccb4..a051ea2d 100644 --- a/bridges/SensCritiqueBridge.php +++ b/bridges/SensCritiqueBridge.php @@ -9,40 +9,33 @@ class SensCritiqueBridge extends BridgeAbstract { $this->uri = "http://www.senscritique.com"; $this->description = "Sens Critique news"; - $this->parameters[] = - '[ - { - "name" : "Movies", - "identifier" : "m", - "type": "checkbox" - }, - { - "name" : "Series", - "identifier" : "s", - "type": "checkbox" - }, - { - "name" : "Video Games", - "identifier" : "g", - "type": "checkbox" - }, - { - "name" : "Books", - "identifier" : "b", - "type": "checkbox" - }, - { - "name" : "BD", - "identifier" : "bd", - "type": "checkbox" - }, - { - "name" : "Music", - "identifier" : "mu", - "type": "checkbox" - } - ]'; - } + $this->parameters[] = array( + 'm'=>array( + 'name'=>'Movies', + 'type'=>'checkbox' + ), + 's'=>array( + 'name'=>'Series', + 'type'=>'checkbox' + ), + 'g'=>array( + 'name'=>'Video Games', + 'type'=>'checkbox' + ), + 'b'=>array( + 'name'=>'Books', + 'type'=>'checkbox' + ), + 'bd'=>array( + 'name'=>'BD', + 'type'=>'checkbox' + ), + 'mu'=>array( + 'name'=>'Music', + 'type'=>'checkbox' + ) + ); + } public function collectData(array $param) { if ((isset($param['m']) && $param['m'])) { diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php index 01a60912..64df0790 100644 --- a/bridges/SoundcloudBridge.php +++ b/bridges/SoundcloudBridge.php @@ -11,14 +11,12 @@ class SoundCloudBridge extends BridgeAbstract{ $this->uri = "http://www.soundcloud.com/"; $this->description = "Returns 10 newest music from user profile"; - $this->parameters[] = - '[ - { - "name" : "username", - "identifier" : "u", - "required": true - } - ]'; + $this->parameters[] = array( + 'u'=>array( + 'name'=>'username', + 'required'=>true + ) + ); } diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php index 74eab646..4a6bba08 100644 --- a/bridges/SuperbWallpapersBridge.php +++ b/bridges/SuperbWallpapersBridge.php @@ -11,24 +11,17 @@ class SuperbWallpapersBridge extends BridgeAbstract { $this->uri = "http://www.superbwallpapers.com/"; $this->description = "Returns the latests wallpapers from SuperbWallpapers"; - $this->parameters[] = - '[ - { - "name" : "Category", - "identifier" : "c" - }, - { - "name" : "Max number of wallpapers", - "identifier" : "m", - "type" : "number" - }, - { - "name" : "resolution", - "identifier" : "r", - "exampleValue" : "1920x1200, 1680x1050, ..." - } - - ]'; + $this->parameters[] = array( + 'c'=>array('name'=>'category'), + 'm'=>array( + 'name'=>'Max number of wallpapers', + 'type'=>'number' + ), + 'r'=>array( + 'name'=>'resolution', + 'exampleValue'=>'1920x1200, 1680x1050,…' + ) + ); } diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php index 8d880c5d..0d54062f 100644 --- a/bridges/T411Bridge.php +++ b/bridges/T411Bridge.php @@ -8,14 +8,12 @@ class T411Bridge extends BridgeAbstract { $this->uri = 'https://t411.ch/'; $this->description = 'Returns the 10 newest torrents with specified search termsUse url part after "?" mark when using their search engine.'; - $this->parameters[] = - '[ - { - "name" : "Search criteria", - "identifier" : "search", - "required": true - } - ]'; + $this->parameters[] = array( + 'search'=>array( + 'name'=>'Search criteria', + 'required'=>true + ) + ); } public function collectData(array $param) { diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php index 05c3807a..4fb4f2f6 100644 --- a/bridges/TagBoardBridge.php +++ b/bridges/TagBoardBridge.php @@ -8,14 +8,12 @@ class TagBoardBridge extends BridgeAbstract{ $this->uri = "http://www.TagBoard.com"; $this->description = "Returns most recent results from TagBoard."; - $this->parameters[] = - '[ - { - "name" : "keyword", - "identifier" : "u", - "required" :true - } - ]'; + $this->parameters[] = array( + 'u'=>array( + 'name'=>'keyword', + 'required'=>true + ) + ); } diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php index dfa1a158..eff0f65e 100644 --- a/bridges/TbibBridge.php +++ b/bridges/TbibBridge.php @@ -8,18 +8,13 @@ class TbibBridge extends BridgeAbstract{ $this->uri = "http://tbib.org/"; $this->description = "Returns images from given page"; - $this->parameters[] = - '[ - { - "name" : "page", - "identifier" : "p", - "type" : "number" - }, - { - "name" : "tags", - "identifier" : "t" - } - ]'; + $this->parameters[] = array( + 'p'=>array( + 'name'=>'page', + 'type'=>'number' + ), + 't'=>array('name'=>'tags') + ); } public function collectData(array $param){ diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php index f3de6bf8..77036d37 100644 --- a/bridges/ThePirateBayBridge.php +++ b/bridges/ThePirateBayBridge.php @@ -8,14 +8,12 @@ class ThePirateBayBridge extends BridgeAbstract{ $this->uri = "https://thepiratebay.org/"; $this->description = "Returns results for the keywords. You can put several list of keywords by separating them with a semicolon (e.g. \"one show;another show\")"; - $this->parameters[] = - '[ - { - "name" : "keywords, separated by semicolons", - "identifier" : "q", - "exampleValue" : "first list;second list;..." - } - ]'; + $this->parameters[] = array( + 'q'=>array( + 'name'=>'keywords, separated by semicolons', + 'exampleValue'=>'first list;second list;…' + ) + ); } public function collectData(array $param){ diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php index 35c2920c..f86c616c 100644 --- a/bridges/TwitchApiBridge.php +++ b/bridges/TwitchApiBridge.php @@ -14,64 +14,45 @@ class TwitchApiBridge extends BridgeAbstract{ $this->uri = "http://www.twitch.tv"; $this->description = "Returns the newest broadcasts or highlights by channel name using the Twitch API (v3)"; - $this->parameters["Get channel without limit"] = - '[ - { - "name" : "Channel", - "identifier" : "channel", - "required" : true - }, - { - "name" : "Broadcasts", - "identifier" : "broadcasts", - "type" : "list", - "values" : [ - { - "name" : "Show broadcasts", - "value" : "true" - }, - { - "name" : "Show highlights", - "value" : "false" - } - ] - } - ]'; - $this->parameters["Get channel with limit"] = - '[ - { - "name" : "Channel", - "identifier" : "channel", - "required" : true - }, - { - "name" : "Limit", - "identifier" : "limit", - "type" : "number" - }, - { - "name" : "Broadcasts", - "identifier" : "broadcasts", - "type" : "list", - "values" : [ - { - "name" : "Show broadcasts", - "value" : "true" - }, - { - "name" : "Show highlights", - "value" : "false" - } - ] - } - ]'; + $this->parameters["Get channel without limit"] = array( + 'channel'=>array( + 'name'=>'Channel', + 'required'=>true + ), + 'broadcasts'=>array( + 'name'=>'Broadcasts', + 'type'=>'list', + 'values'=>array( + 'Show broadcasts'=>'true', + 'Show highlights'=>'false' + ) + ) + ); + $this->parameters["Get channel with limit"] = array( + 'channel'=>array( + 'name'=>'Channel', + 'required'=>true + ), + 'limit'=>array( + 'name'=>'Limit', + 'type'=>'number' + ), + 'broadcasts'=>array( + 'name'=>'Broadcasts', + 'type'=>'list', + 'values'=>array( + 'Show broadcasts'=>'true', + 'Show highlights'=>'false' + ) + ) + ); } - + public function collectData(array $param){ - /* In accordance with API description: - * "When specifying a version for a request to the Twitch API, set the Accept HTTP header to the API version you prefer." + /* In accordance with API description: + * "When specifying a version for a request to the Twitch API, set the Accept HTTP header to the API version you prefer." * Now we prefer v3 right now and need to build the context options. */ $opts = array('https' => array( @@ -79,22 +60,22 @@ class TwitchApiBridge extends BridgeAbstract{ 'header' => 'Accept: application/vnd.twitchtv.v3+json' ) ); - + $context = stream_context_create($opts); - + $channel = ''; $limit = TWITCH_LIMIT; $broadcasts = TWITCH_BROADCASTS; $requests = 1; - + if(isset($param['channel'])) { $channel = $param['channel']; } else { $this->returnClientError('You must specify a valid channel name! Received: &channel=' . $param['channel']); } - + $this->channel = $channel; - + if(isset($param['limit'])) { try { $limit = (int)$param['limit']; @@ -104,39 +85,39 @@ class TwitchApiBridge extends BridgeAbstract{ } else { $limit = TWITCH_LIMIT; } - + // The Twitch API allows a limit between 1 .. 100. Therefore any value below must be set to 1, any greater must result in multiple requests. if($limit < 1) { $limit = 1; } - if($limit > 100) { - $requests = (int)($limit / 100); + if($limit > 100) { + $requests = (int)($limit / 100); if($limit % 100 != 0) { $requests++; } } - + if(isset($param['broadcasts']) && ($param['broadcasts'] == 'true' || $param['broadcasts'] == 'false')) { $broadcasts = $param['broadcasts']; } else { $this->returnClientError('The value for broadcasts you specified is not valid! Received: &broadcasts=' . $param['broadcasts'] . ' Expected: &broadcasts=false or &broadcasts=true'); } - + // Build the initial request, see also: https://github.com/justintv/Twitch-API/blob/master/v3_resources/videos.md#get-channelschannelvideos $request = ''; - + if($requests == 1) { $request = 'https://api.twitch.tv/kraken/channels/' . $channel . '/videos?limit=' . $limit . '&broadcasts=' . $broadcasts; } else { $request = 'https://api.twitch.tv/kraken/channels/' . $channel . '/videos?limit=100&broadcasts=' . $broadcasts; } - + /* Finally we're ready to request data from the API. Each response provides information for the next request. */ for($i = 0; $i < $requests; $i++) { $response = $this->getSimpleHTMLDOM($request, false, $context); - - if($response == false) { - $this->returnServerError('Request failed! Check if the channel name is valid!'); + + if($response == false) { + $this->returnServerError('Request failed! Check if the channel name is valid!'); } - + $data = json_decode($response); - + foreach($data->videos as $video) { $item = new \Item(); $item->id = $video->_id; @@ -145,13 +126,13 @@ class TwitchApiBridge extends BridgeAbstract{ $item->timestamp = strtotime($video->recorded_at); $item->content = '
' . $item->title . ''; $this->items[] = $item; - + // Stop once the number of requested items is reached if(count($this->items) >= $limit) { break; } } - + // Get next request (if available) if(isset($data->_links->next)) { $request = $data->_links->next; diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php index 6edfc7a4..3e2a8c36 100644 --- a/bridges/TwitterBridge.php +++ b/bridges/TwitterBridge.php @@ -8,50 +8,36 @@ class TwitterBridge extends BridgeAbstract{ $this->uri = "https://twitter.com/"; $this->description = "Returns tweets by keyword/hashtag or user name"; - $this->parameters["global"] = - '[ - { - "name" : "Hide profile pictures", - "identifier" : "nopic", - "type" : "checkbox", - "required" : false, - "exampleValue" : "checked", - "title" : "Activate to hide profile pictures in content" - } - ]'; + $this->parameters["global"] = array( + 'nopic'=>array( + 'name'=>'Hide profile pictures', + 'type'=>'checkbox', + 'title'=>'Activate to hide profile pictures in content' + ) + ); - $this->parameters["By keyword or hashtag"] = - '[ - { - "name" : "Keyword or #hashtag", - "identifier" : "q", - "type" : "text", - "required" : true, - "exampleValue" : "rss-bridge, #rss-bridge", - "title" : "Insert a keyword or hashtag" - } - ]'; - - $this->parameters["By username"] = - '[ - { - "name" : "username", - "identifier" : "u", - "type" : "text", - "required" : true, - "exampleValue" : "sebsauvage", - "title" : "Insert a user name" - }, - { - "name" : "Without replies", - "identifier" : "norep", - "type" : "checkbox", - "required" : false, - "exampleValue" : "checked", - "title" : "Only return initial tweets" - } - ]'; + $this->parameters["By keyword or hashtag"] = array( + 'q'=>array( + 'name'=>'Keyword or #hashtag', + 'required'=>true, + 'exampleValue'=>'rss-bridge, #rss-bridge', + 'title'=>'Insert a keyword or hashtag' + ) + ); + $this->parameters["By username"] = array( + 'u'=>array( + 'name'=>'username', + 'required'=>true, + 'exampleValue'=>'sebsauvage', + 'title'=>'Insert a user name' + ), + 'norep'=>array( + 'name'=>'Without replies', + 'type'=>'checkbox', + 'title'=>'Only return initial tweets' + ) + ); } public function collectData(array $param){ diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php index 23383d6c..f9d1e34c 100644 --- a/bridges/UnsplashBridge.php +++ b/bridges/UnsplashBridge.php @@ -8,26 +8,20 @@ class UnsplashBridge extends BridgeAbstract { $this->uri = "http://unsplash.com/"; $this->description = "Returns the latests photos from Unsplash"; - $this->parameters[] = - '[ - { - "name" : "Max number of photos", - "identifier" : "m", - "type" : "number" - }, - { - "name" : "Width", - "identifier" : "w", - "exampleValue" : "1920, 1680, ..." - }, - { - "name" : "JPEG quality", - "identifier" : "q", - "type" : "number" - - } - - ]'; + $this->parameters[] = array( + 'm'=>array( + 'name'=>'Max number of photos', + 'type'=>'number' + ), + 'w'=>array( + 'name'=>'Width', + 'exampleValue'=>'1920, 1680, …' + ), + 'q'=>array( + 'name'=>'JPEG quality', + 'type'=>'number' + ) + ); } public function collectData(array $param){ diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompany.php index 88466afd..d491a056 100644 --- a/bridges/ViadeoCompany.php +++ b/bridges/ViadeoCompany.php @@ -8,14 +8,12 @@ class ViadeoCompany extends BridgeAbstract{ $this->uri = "https://www.viadeo.com/"; $this->description = "Returns most recent actus from Company on Viadeo. (http://www.viadeo.com/fr/company/apple)"; - $this->parameters[] = - '[ - { - "name" : "Company name", - "identifier" : "c", - "required" : true - } - ]'; + $this->parameters[] = array( + 'c'=>array( + 'name'=>'Company name', + 'required'=>true + ) + ); } public function collectData(array $param){ diff --git a/bridges/VineBridge.php b/bridges/VineBridge.php index ff16d873..679ff05b 100644 --- a/bridges/VineBridge.php +++ b/bridges/VineBridge.php @@ -8,15 +8,12 @@ class VineBridge extends BridgeAbstract { $this->uri = "http://vine.co/"; $this->description = "Returns the latests vines from vine user page"; - $this->parameters[] = - '[ - { - "name" : "User id", - "identifier" : "u", - "type" : "text", - "required" : true - } - ]'; + $this->parameters[] = array( + 'u'=>array( + 'name'=>'User id', + 'required'=>true + ) + ); } public function collectData(array $param){ diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php index 37194d9b..c936a735 100644 --- a/bridges/VkBridge.php +++ b/bridges/VkBridge.php @@ -9,13 +9,12 @@ class VkBridge extends BridgeAbstract { $this->name = "VK.com"; $this->uri = "http://www.vk.com/"; $this->description = "Working with open pages"; - $this->parameters["Url on page group or user"] = '[ - { - "name" : "Url", - "identifier" : "u", - "required" : true - } - ]'; + $this->parameters["Url on page group or user"] = array( + 'u'=>array( + 'name'=>'Url', + 'required'=>true + ) + ); } public function collectData(array $param) { diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php index 0f5da00d..70c84e40 100644 --- a/bridges/WallpaperStopBridge.php +++ b/bridges/WallpaperStopBridge.php @@ -12,29 +12,18 @@ class WallpaperStopBridge extends BridgeAbstract { $this->uri = "http://www.wallpaperstop.com/"; $this->description = "Returns the latests wallpapers from WallpaperStop"; - $this->parameters[] = - '[ - { - "name" : "Category", - "identifier" : "c" - }, - { - "name" : "subcategory", - "identifier" : "s" - }, - { - "name" : "Max number of wallpapers", - "identifier" : "m", - "type" : "number" - }, - { - "name" : "resolution", - "identifier" : "r", - "exampleValue" : "1920x1200, 1680x1050, ..." - } - - ]'; - + $this->parameters[] = array( + 'c'=>array('name'=>'Category'), + 's'=>array('name'=>'subcategory'), + 'm'=>array( + 'name'=>'Max number of wallpapers', + 'type'=>'number' + ), + 'r'=>array( + 'name'=>'resolution', + 'exampleValue'=>'1920x1200, 1680x1050,…', + ) + ); } diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php index 568e2ded..0e9d82b8 100644 --- a/bridges/WhydBridge.php +++ b/bridges/WhydBridge.php @@ -11,14 +11,12 @@ class WhydBridge extends BridgeAbstract{ $this->uri = "http://www.whyd.com/"; $this->description = "Returns 10 newest music from user profile"; - $this->parameters[] = - '[ - { - "name" : "username/id", - "identifier" : "u", - "required" :true - } - ]'; + $this->parameters[] = array( + 'u'=>array( + 'name'=>'username/id', + 'required'=>true + ) + ); } diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php index 10a74f77..5c6909c6 100644 --- a/bridges/WikipediaBridge.php +++ b/bridges/WikipediaBridge.php @@ -10,73 +10,49 @@ class WikipediaBridge extends BridgeAbstract{ $this->uri = 'https://www.wikipedia.org/'; $this->description = 'Returns articles for a language of your choice'; - $this->parameters[] = - '[ - { - "name": "Language", - "identifier": "language", - "type": "list", - "required": true, - "title": "Select your language", - "exampleValue": "English", - "values": [ - { - "name": "English", - "value": "en" - }, - { - "name": "German", - "value": "de" - }, - { - "name": "French", - "value": "fr" - }, - { - "name": "Esperanto", - "value": "eo" - } - ] - }, - { - "name": "Subject", - "identifier": "subject", - "type": "list", - "required": true, - "title": "What subject are you interested in?", - "exampleValue": "Today\'s featured article", - "values": [ - { - "name": "Today\'s featured article", - "value": "tfa" - }, - { - "name": "Did you know...", - "value": "dyk" - } - ] - }, - { - "name": "Load full article", - "identifier": "fullarticle", - "type": "checkbox", - "required": false, - "title": "Activate to always load the full article", - "exampleValue": "false" - } - ]'; + $this->parameters[] = array( + 'language'=>array( + 'name'=>'Language', + 'type'=>'list', + 'required'=>true, + 'title'=>'Select your language', + 'exampleValue'=>'English', + 'values'=>array( + 'English'=>'en', + 'German'=>'de', + 'French'=>'fr', + 'Esperanto'=>'es' + ) + ), + 'subject'=>array( + 'name'=>'Subject', + 'type'=>'list', + 'required'=>true, + 'title'=>'What subject are you interested in?', + 'exampleValue'=>'Today\'s featured article', + 'values'=>array( + 'Today\'s featured article'=>'tfa', + 'Did you know…'=>'dyk' + ) + ), + 'fullarticle'=>array( + 'name'=>'Load full article', + 'type'=>'checkbox', + 'title'=>'Activate to always load the full article' + ) + ); } public function collectData(array $params){ if(!isset($params['language'])) $this->returnClientError('You must specify a valid language via \'&language=\'!'); - + if(!$this->CheckLanguageCode(strtolower($params['language']))) $this->returnClientError('The language code you provided (\'' . $params['language'] . '\') is not supported!'); - + if(!isset($params['subject'])) $this->returnClientError('You must specify a valid subject via \'&subject=\'!'); - + $subject = WIKIPEDIA_SUBJECT_TFA; switch($params['subject']){ case 'tfa': @@ -116,7 +92,7 @@ class WikipediaBridge extends BridgeAbstract{ if(!$html) $this->returnServerError('Could not load site: ' . $this->uri . '!'); - /* + /* * Now read content depending on the language (make sure to create one function per language!) * We build the function name automatically, just make sure you create a private function ending * with your desired language code, where the language code is upper case! (en -> GetContentsEN). @@ -125,25 +101,24 @@ class WikipediaBridge extends BridgeAbstract{ if(!method_exists($this, $function)) $this->returnServerError('A function to get the contents for your langauage is missing (\'' . $function . '\')!'); - + /* * The method takes care of creating all items. */ $this->$function($html, $subject, $fullArticle); } - /** + /** * Returns true if the language code is part of the parameters list */ private function CheckLanguageCode($languageCode){ - $parameter = json_decode($this->parameters[0], true); - $languages = $parameter[0]['values']; + $languages = $this->parameters[0]['language']['values']; $language_names = array(); - foreach($languages as $language) - $language_names[] = $language['value']; - + foreach($languages as $name=>$value) + $language_names[] = $value; + return in_array($languageCode, $language_names); } @@ -169,7 +144,7 @@ class WikipediaBridge extends BridgeAbstract{ if(strpos($anchor->innertext, '...') !== false){ $target = $anchor; break; - } + } } $item = new \Item(); @@ -178,7 +153,7 @@ class WikipediaBridge extends BridgeAbstract{ if(!$fullArticle) $item->content = strip_tags($this->ReplaceURIInHTMLElement($element), '
');
- else
+ else
$item->content = $this->LoadFullArticle($item->uri);
$this->items[] = $item;
@@ -190,14 +165,14 @@ class WikipediaBridge extends BridgeAbstract{
private function AddDidYouKnowGeneric($element, $fullArticle){
foreach($element->find('ul', 0)->find('li') as $entry){
$item = new \Item();
-
+
// We can only use the first anchor, there is no way of finding the 'correct' one if there are multiple
$item->uri = $this->uri . $entry->find('a', 0)->href;
$item->title = strip_tags($entry->innertext);
if(!$fullArticle)
$item->content = $this->ReplaceURIInHTMLElement($entry);
- else
+ else
$item->content = $this->LoadFullArticle($item->uri);
$this->items[] = $item;
@@ -209,15 +184,15 @@ class WikipediaBridge extends BridgeAbstract{
*/
private function LoadFullArticle($uri){
$content_html = $this->getSimpleHTMLDOM($uri);
-
+
if(!$content_html)
$this->returnServerError('Could not load site: ' . $uri . '!');
-
+
$content = $content_html->find('#mw-content-text', 0);
if(!$content)
$this->returnServerError('Could not find content in page: ' . $uri . '!');
-
+
// Let's remove a couple of things from the article
$table = $content->find('#toc', 0); // Table of contents
if(!$table === false)
@@ -234,7 +209,7 @@ class WikipediaBridge extends BridgeAbstract{
*/
private function GetContentsDE($html, $subject, $fullArticle){
switch($subject){
- case WIKIPEDIA_SUBJECT_TFA:
+ case WIKIPEDIA_SUBJECT_TFA:
$element = $html->find('div[id=mf-tfa]', 0);
$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
break;
@@ -252,7 +227,7 @@ class WikipediaBridge extends BridgeAbstract{
*/
private function GetContentsFR($html, $subject, $fullArticle){
switch($subject){
- case WIKIPEDIA_SUBJECT_TFA:
+ case WIKIPEDIA_SUBJECT_TFA:
$element = $html->find('div[id=accueil-lumieresur]', 0);
$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
break;
@@ -270,7 +245,7 @@ class WikipediaBridge extends BridgeAbstract{
*/
private function GetContentsEN($html, $subject, $fullArticle){
switch($subject){
- case WIKIPEDIA_SUBJECT_TFA:
+ case WIKIPEDIA_SUBJECT_TFA:
$element = $html->find('div[id=mp-tfa]', 0);
$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
break;
@@ -288,7 +263,7 @@ class WikipediaBridge extends BridgeAbstract{
*/
private function GetContentsEO($html, $subject, $fullArticle){
switch($subject){
- case WIKIPEDIA_SUBJECT_TFA:
+ case WIKIPEDIA_SUBJECT_TFA:
$element = $html->find('div[id=mf-artikolo-de-la-semajno]', 0);
$this->AddTodaysFeaturedArticleGeneric($element, $fullArticle);
break;
diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php
index eaa3e647..70e17ee4 100644
--- a/bridges/WordPressBridge.php
+++ b/bridges/WordPressBridge.php
@@ -13,14 +13,12 @@ class WordPressBridge extends BridgeAbstract {
$this->uri = "https://wordpress.org/";
$this->description = "Returns the 3 newest full posts of a Wordpress blog";
- $this->parameters[] =
- '[
- {
- "name" : "blog URL",
- "required" : true,
- "identifier" : "url"
- }
- ]';
+ $this->parameters[] = array(
+ 'url'=>array(
+ 'name'=>'Blog URL',
+ 'required'=>true
+ )
+ );
}
// Returns the content type for a given html dom
diff --git a/bridges/WorldOfTanks.php b/bridges/WorldOfTanks.php
index 5d84b268..5601d834 100644
--- a/bridges/WorldOfTanks.php
+++ b/bridges/WorldOfTanks.php
@@ -13,50 +13,25 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{
$this->uri = "http://worldoftanks.eu/";
$this->description = "News about the tank slaughter game.";
- $this->parameters[] =
- '[
- {
- "name" : "ID de la catégorie",
- "type" : "number",
- "identifier" : "category"
- },
- {
- "name" : "Langue",
- "identifier" : "lang",
- "type" : "list",
- "values" : [
- {
- "name" : "Français",
- "value" : "fr"
- },
- {
- "name" : "English",
- "value" : "en"
- },
- {
- "name" : "Español",
- "value" : "es"
- },
- {
- "name" : "Deutsch",
- "value" : "de"
- },
- {
- "name" : "Čeština",
- "value" : "cs"
- },
- {
- "name" : "Polski",
- "value" : "pl"
- },
- {
- "name" : "Türkçe",
- "value" : "tr"
- }
- ]
-
- }
- ]';
+ $this->parameters[] = array(
+ 'category'=>array(
+ 'name'=>'ID de la catégorie',
+ 'type'=>'number'
+ ),
+ 'lang'=>array(
+ 'name'=>'Langue',
+ 'type'=>'list',
+ 'values'=>array(
+ 'Français'=>'fr',
+ 'English'=>'en',
+ 'Español'=>'es',
+ 'Deutsch'=>'de',
+ 'Čeština'=>'cs',
+ 'Polski'=>'pl',
+ 'Türkçe'=>'tr'
+ )
+ )
+ );
}
diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php
index 4d8543bf..28e6226d 100644
--- a/bridges/XbooruBridge.php
+++ b/bridges/XbooruBridge.php
@@ -8,18 +8,13 @@ class XbooruBridge extends BridgeAbstract{
$this->uri = "http://xbooru.com/";
$this->description = "Returns images from given page";
- $this->parameters[] =
- '[
- {
- "name" : "page",
- "identifier" : "p",
- "type" : "number"
- },
- {
- "name" : "tags",
- "identifier" : "t"
- }
- ]';
+ $this->parameters[] = array(
+ 'p'=>array(
+ 'name'=>'page',
+ 'type'=>'number'
+ ),
+ 't'=>array('name'=>'tags')
+ );
}
public function collectData(array $param){
diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php
index c7aa3090..0b894294 100644
--- a/bridges/YandereBridge.php
+++ b/bridges/YandereBridge.php
@@ -8,18 +8,13 @@ class YandereBridge extends BridgeAbstract{
$this->uri = "https://yande.re/";
$this->description = "Returns images from given page and tags";
- $this->parameters[] =
- '[
- {
- "name" : "page",
- "identifier" : "p",
- "type" : "number"
- },
- {
- "name" : "tags",
- "identifier" : "t"
- }
- ]';
+ $this->parameters[] = array(
+ 'p'=>array(
+ 'name'=>'page',
+ 'type'=>'number'
+ ),
+ 't'=>array('name'=>'tags')
+ );
}
public function collectData(array $param){
diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index 5a46cf51..ed032537 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -15,55 +15,40 @@ class YoutubeBridge extends BridgeAbstract {
$this->description = 'Returns the 10 newest videos by username/channel/playlist or search';
$this->maintainer = 'mitsukarenai';
- $this->parameters['By username'] =
- '[
- {
- "type" : "text",
- "identifier" : "u",
- "name" : "username",
- "exampleValue" : "test",
- "required" : true
- }
- ]';
+ $this->parameters['By username'] = array(
+ 'u'=>array(
+ 'name'=>'username',
+ 'exampleValue'=>'test',
+ 'required'=>true
+ )
+ );
- $this->parameters['By channel id'] =
- '[
- {
- "type" : "text",
- "identifier" : "c",
- "name" : "channel id",
- "exampleValue" : "15",
- "required" : true
- }
- ]';
+ $this->parameters['By channel id'] = array(
+ 'c'=>array(
+ 'name'=>'channel id',
+ 'exampleValue'=>"15",
+ 'required'=>true
+ )
+ );
- $this->parameters['By playlist Id'] =
- '[
- {
- "type" : "text",
- "identifier" : "p",
- "name" : "playlist id",
- "exampleValue" : "15"
- }
- ]';
+ $this->parameters['By playlist Id'] = array(
+ 'p'=>array(
+ 'name'=>'playlist id',
+ 'exampleValue'=>"15"
+ )
+ );
- $this->parameters['Search result'] =
- '[
- {
- "type" : "text",
- "identifier" : "s",
- "name" : "search keyword",
- "exampleValue" : "test"
-
- },
- {
- "type" : "number",
- "identifier" : "pa",
- "name" : "page",
- "exampleValue" : "1"
-
- }
- ]';
+ $this->parameters['Search result'] = array(
+ 's'=>array(
+ 'name'=>'search keyword',
+ 'exampleValue'=>'test'
+ ),
+ 'pa'=>array(
+ 'name'=>'page',
+ 'type'=>'number',
+ 'exampleValue'=>1
+ )
+ );
}
private function ytBridgeQueryVideoInfo($vid, &$author, &$desc, &$time) {
diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php
index 6b14eaa6..1ef71bbf 100644
--- a/bridges/ZDNetBridge.php
+++ b/bridges/ZDNetBridge.php
@@ -8,173 +8,158 @@ class ZDNetBridge extends BridgeAbstract {
$this->uri = 'http://www.zdnet.com/';
$this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
- $this->parameters[] =
// http://www.zdnet.com/zdnet.opml
- '[
- {
- "name" : "Feed",
- "type" : "list",
- "identifier" : "feed",
- "values" :
- [
- { "name" : "---- Select ----", "value" : "" },
-
- { "name" : "", "value" : "" },
- { "name" : "Subscribe to ZDNet RSS Feeds", "value" : "" },
-
- { "name" : " All Blogs", "value" : "blog" },
- { "name" : " Just News", "value" : "news" },
- { "name" : " All Reviews", "value" : "topic/reviews" },
- { "name" : " Latest Downloads", "value" : "downloads!recent" },
- { "name" : " Latest Articles", "value" : "/" },
- { "name" : " Latest Australia Articles", "value" : "au" },
- { "name" : " Latest UK Articles", "value" : "uk" },
- { "name" : " Latest US Articles", "value" : "us" },
- { "name" : " Latest Asia Articles", "value" : "as" },
-
- { "name" : "", "value" : "" },
- { "name" : "Keep up with ZDNet Blogs RSS:", "value" : "" },
-
- { "name" : " Transforming the Datacenter", "value" : "blog/transforming-datacenter" },
- { "name" : " SMB India", "value" : "blog/smb-india" },
- { "name" : " Indonesia BizTech", "value" : "blog/indonesia-biztech" },
- { "name" : " Hong Kong Techie", "value" : "blog/hong-kong-techie" },
- { "name" : " Tech Taiwan", "value" : "blog/tech-taiwan" },
- { "name" : " Startup India", "value" : "blog/startup-india" },
- { "name" : " Starting Up Asia", "value" : "blog/starting-up-asia" },
- { "name" : " Next-Gen Partner", "value" : "blog/partner" },
- { "name" : " Post-PC Developments", "value" : "blog/post-pc" },
- { "name" : " Benelux", "value" : "blog/benelux" },
- { "name" : " Heat Sink", "value" : "blog/heat-sink" },
- { "name" : " Italy's got tech", "value" : "blog/italy" },
- { "name" : " African Enterprise", "value" : "blog/african-enterprise" },
- { "name" : " New Tech for Old India", "value" : "blog/new-india" },
- { "name" : " Estonia Uncovered", "value" : "blog/estonia" },
- { "name" : " IT Iberia", "value" : "blog/iberia" },
- { "name" : " Brazil Tech", "value" : "blog/brazil" },
- { "name" : " 500 words into the future", "value" : "blog/500-words-into-the-future" },
- { "name" : " ÜberTech", "value" : "blog/ubertech" },
- { "name" : " All About Microsoft", "value" : "blog/microsoft" },
- { "name" : " Back office", "value" : "blog/back-office" },
- { "name" : " Barker Bites Back", "value" : "blog/barker-bites-back" },
- { "name" : " Between the Lines", "value" : "blog/btl" },
- { "name" : " Big on Data", "value" : "blog/big-data" },
- { "name" : " bootstrappr", "value" : "blog/bootstrappr" },
- { "name" : " By The Way", "value" : "blog/by-the-way" },
- { "name" : " Central European Processing", "value" : "blog/central-europe" },
- { "name" : " Cloud Builders", "value" : "blog/cloud-builders" },
- { "name" : " Communication Breakdown", "value" : "blog/communication-breakdown" },
- { "name" : " Collaboration 2.0", "value" : "blog/collaboration" },
- { "name" : " Constellation Research", "value" : "blog/constellation" },
- { "name" : " Consumerization: BYOD", "value" : "blog/consumerization" },
- { "name" : " DIY-IT", "value" : "blog/diy-it" },
- { "name" : " Enterprise Web 2.0", "value" : "blog/hinchcliffe" },
- { "name" : " Five Nines: The Next Gen Datacenter", "value" : "blog/datacenter" },
- { "name" : " Forrester Research", "value" : "blog/forrester" },
- { "name" : " Full Duplex", "value" : "blog/full-duplex" },
- { "name" : " Gen Why?", "value" : "blog/gen-why" },
- { "name" : " Hardware 2.0", "value" : "blog/hardware" },
- { "name" : " Identity Matters", "value" : "blog/identity" },
- { "name" : " iGeneration", "value" : "blog/igeneration" },
- { "name" : " Internet of Everything", "value" : "blog/cisco" },
- { "name" : " Beyond IT Failure", "value" : "blog/projectfailures" },
- { "name" : " Jamie's Mostly Linux Stuff", "value" : "blog/jamies-mostly-linux-stuff" },
- { "name" : " Jack's Blog", "value" : "blog/jacks-blog" },
- { "name" : " Laptops & Desktops", "value" : "blog/computers" },
- { "name" : " Linux and Open Source", "value" : "blog/open-source" },
- { "name" : " London Calling", "value" : "blog/london" },
- { "name" : " Mapping Babel", "value" : "blog/mapping-babel" },
- { "name" : " Mixed Signals", "value" : "blog/mixed-signals" },
- { "name" : " Mobile India", "value" : "blog/mobile-india" },
- { "name" : " Mobile News", "value" : "blog/mobile-news" },
- { "name" : " Networking", "value" : "blog/networking" },
- { "name" : " Norse Code", "value" : "blog/norse-code" },
- { "name" : " Null Pointer", "value" : "blog/null-pointer" },
- { "name" : " The Full Tilt", "value" : "blog/the-full-tilt" },
- { "name" : " Pinoy Post", "value" : "blog/pinoy-post" },
- { "name" : " Practically Tech", "value" : "blog/practically-tech" },
- { "name" : " Product Central", "value" : "blog/product-central" },
- { "name" : " Pulp Tech", "value" : "blog/violetblue" },
- { "name" : " Qubits and Pieces", "value" : "blog/qubits-and-pieces" },
- { "name" : " Securify This!", "value" : "blog/securify-this" },
- { "name" : " Service Oriented", "value" : "blog/service-oriented" },
- { "name" : " Small Talk", "value" : "blog/small-talk" },
- { "name" : " Small Business Matters", "value" : "blog/small-business-matters" },
- { "name" : " Smartphones and Cell Phones", "value" : "blog/cell-phones" },
- { "name" : " Social Business", "value" : "blog/feeds" },
- { "name" : " Social CRM: The Conversation", "value" : "blog/crm" },
- { "name" : " Software & Services Safari", "value" : "blog/sommer" },
- { "name" : " Storage Bits", "value" : "blog/storage" },
- { "name" : " Stacking up Open Clouds", "value" : "blog/apac-redhat" },
- { "name" : " Techie Isles", "value" : "blog/techie-isles" },
- { "name" : " Technolatte", "value" : "blog/technolatte" },
- { "name" : " Tech Podium", "value" : "blog/tech-podium" },
- { "name" : " Tel Aviv Tech", "value" : "blog/tel-aviv" },
- { "name" : " Tech Broiler", "value" : "blog/perlow" },
- { "name" : " The SANMAN", "value" : "blog/the-sanman" },
- { "name" : " The open source revolution", "value" : "blog/the-open-source-revolution" },
- { "name" : " The German View", "value" : "blog/german" },
- { "name" : " The Ed Bott Report", "value" : "blog/bott" },
- { "name" : " The Mobile Gadgeteer", "value" : "blog/mobile-gadgeteer" },
- { "name" : " The Apple Core", "value" : "blog/apple" },
- { "name" : " Tom Foremski: IMHO", "value" : "blog/foremski" },
- { "name" : " Twisted Wire", "value" : "blog/twisted-wire" },
- { "name" : " Vive la tech", "value" : "blog/france" },
- { "name" : " Virtually Speaking", "value" : "blog/virtualization" },
- { "name" : " View from China", "value" : "blog/china" },
- { "name" : " Web design & Free Software", "value" : "blog/web-design-and-free-software" },
- { "name" : " ZDNet Government", "value" : "blog/government" },
- { "name" : " ZDNet UK Book Reviews", "value" : "blog/zdnet-uk-book-reviews" },
- { "name" : " ZDNet UK First Take", "value" : "blog/zdnet-uk-first-take" },
- { "name" : " Zero Day", "value" : "blog/security" },
-
- { "name" : "", "value" : "" },
- { "name" : "ZDNet Hot Topics RSS:", "value" : "" },
-
- { "name" : " Apple", "value" : "topic/apple" },
- { "name" : " Collaboration", "value" : "topic/collaboration" },
- { "name" : " Enterprise Software", "value" : "topic/enterprise-software" },
- { "name" : " Google", "value" : "topic/google" },
- { "name" : " Great debate", "value" : "topic/great-debate" },
- { "name" : " Hardware", "value" : "topic/hardware" },
- { "name" : " IBM", "value" : "topic/ibm" },
- { "name" : " iOS", "value" : "topic/ios" },
- { "name" : " iPhone", "value" : "topic/iphone" },
- { "name" : " iPad", "value" : "topic/ipad" },
- { "name" : " IT Priorities", "value" : "topic/it-priorities" },
- { "name" : " Laptops", "value" : "topic/laptops" },
- { "name" : " Legal", "value" : "topic/legal" },
- { "name" : " Linux", "value" : "topic/linux" },
- { "name" : " Microsoft", "value" : "topic/microsoft" },
- { "name" : " Mobile OS", "value" : "topic/mobile-os" },
- { "name" : " Mobility", "value" : "topic/mobility" },
- { "name" : " Networking", "value" : "topic/networking" },
- { "name" : " Oracle", "value" : "topic/oracle" },
- { "name" : " Processors", "value" : "topic/processors" },
- { "name" : " Samsung", "value" : "topic/samsung" },
- { "name" : " Security", "value" : "topic/security" },
- { "name" : " Small business: going big on mobility", "value" : "topic/small-business-going-big-on-mobility" },
-
- { "name" : "", "value" : "" },
- { "name" : "Product Blogs:", "value" : "" },
-
- { "name" : " Digital Cameras & Camcorders", "value" : "blog/digitalcameras" },
- { "name" : " Home Theater", "value" : "blog/home-theater" },
- { "name" : " Laptops and Desktops", "value" : "blog/computers" },
- { "name" : " The Mobile Gadgeteer", "value" : "blog/mobile-gadgeteer" },
- { "name" : " Smartphones and Cell Phones", "value" : "blog/cell-phones" },
- { "name" : " The ToyBox", "value" : "blog/gadgetreviews" },
-
- { "name" : "", "value" : "" },
- { "name" : "Vertical Blogs:", "value" : "" },
-
- { "name" : " ZDNet Education", "value" : "blog/education" },
- { "name" : " ZDNet Healthcare", "value" : "blog/healthcare" },
- { "name" : " ZDNet Government", "value" : "blog/government" }
- ]
- }
- ]';
-
+ $this->parameters[] = array(
+ 'feed'=>array(
+ 'name'=>'Feed',
+ 'type'=>'list',
+ 'values'=>array(
+ 'Subscribe to ZDNet RSS Feeds'=>array(
+ 'All Blogs'=>'blog',
+ 'Just News'=>'news',
+ 'All Reviews'=>'topic/reviews',
+ 'Latest Downloads'=>'downloads!recent',
+ 'Latest Articles'=>'/',
+ 'Latest Australia Articles'=>'au',
+ 'Latest UK Articles'=>'uk',
+ 'Latest US Articles'=>'us',
+ 'Latest Asia Articles'=>'as'
+ ),
+ 'Keep up with ZDNet Blogs RSS:'=>array(
+ 'Transforming the Datacenter'=>'blog/transforming-datacenter',
+ 'SMB India'=>'blog/smb-india',
+ 'Indonesia BizTech'=>'blog/indonesia-biztech',
+ 'Hong Kong Techie'=>'blog/hong-kong-techie',
+ 'Tech Taiwan'=>'blog/tech-taiwan',
+ 'Startup India'=>'blog/startup-india',
+ 'Starting Up Asia'=>'blog/starting-up-asia',
+ 'Next-Gen Partner'=>'blog/partner',
+ 'Post-PC Developments'=>'blog/post-pc',
+ 'Benelux'=>'blog/benelux',
+ 'Heat Sink'=>'blog/heat-sink',
+ 'Italy\'s got tech'=>'blog/italy',
+ 'African Enterprise'=>'blog/african-enterprise',
+ 'New Tech for Old India'=>'blog/new-india',
+ 'Estonia Uncovered'=>'blog/estonia',
+ 'IT Iberia'=>'blog/iberia',
+ 'Brazil Tech'=>'blog/brazil',
+ '500 words into the future'=>'blog/500-words-into-the-future',
+ 'ÜberTech'=>'blog/ubertech',
+ 'All About Microsoft'=>'blog/microsoft',
+ 'Back office'=>'blog/back-office',
+ 'Barker Bites Back'=>'blog/barker-bites-back',
+ 'Between the Lines'=>'blog/btl',
+ 'Big on Data'=>'blog/big-data',
+ 'bootstrappr'=>'blog/bootstrappr',
+ 'By The Way'=>'blog/by-the-way',
+ 'Central European Processing'=>'blog/central-europe',
+ 'Cloud Builders'=>'blog/cloud-builders',
+ 'Communication Breakdown'=>'blog/communication-breakdown',
+ 'Collaboration 2.0'=>'blog/collaboration',
+ 'Constellation Research'=>'blog/constellation',
+ 'Consumerization: BYOD'=>'blog/consumerization',
+ 'DIY-IT'=>'blog/diy-it',
+ 'Enterprise Web 2.0'=>'blog/hinchcliffe',
+ 'Five Nines: The Next Gen Datacenter'=>'blog/datacenter',
+ 'Forrester Research'=>'blog/forrester',
+ 'Full Duplex'=>'blog/full-duplex',
+ 'Gen Why?'=>'blog/gen-why',
+ 'Hardware 2.0'=>'blog/hardware',
+ 'Identity Matters'=>'blog/identity',
+ 'iGeneration'=>'blog/igeneration',
+ 'Internet of Everything'=>'blog/cisco',
+ 'Beyond IT Failure'=>'blog/projectfailures',
+ 'Jamie\'s Mostly Linux Stuff'=>'blog/jamies-mostly-linux-stuff',
+ 'Jack\'s Blog'=>'blog/jacks-blog',
+ 'Laptops & Desktops'=>'blog/computers',
+ 'Linux and Open Source'=>'blog/open-source',
+ 'London Calling'=>'blog/london',
+ 'Mapping Babel'=>'blog/mapping-babel',
+ 'Mixed Signals'=>'blog/mixed-signals',
+ 'Mobile India'=>'blog/mobile-india',
+ 'Mobile News'=>'blog/mobile-news',
+ 'Networking'=>'blog/networking',
+ 'Norse Code'=>'blog/norse-code',
+ 'Null Pointer'=>'blog/null-pointer',
+ 'The Full Tilt'=>'blog/the-full-tilt',
+ 'Pinoy Post'=>'blog/pinoy-post',
+ 'Practically Tech'=>'blog/practically-tech',
+ 'Product Central'=>'blog/product-central',
+ 'Pulp Tech'=>'blog/violetblue',
+ 'Qubits and Pieces'=>'blog/qubits-and-pieces',
+ 'Securify This!'=>'blog/securify-this',
+ 'Service Oriented'=>'blog/service-oriented',
+ 'Small Talk'=>'blog/small-talk',
+ 'Small Business Matters'=>'blog/small-business-matters',
+ 'Smartphones and Cell Phones'=>'blog/cell-phones',
+ 'Social Business'=>'blog/feeds',
+ 'Social CRM: The Conversation'=>'blog/crm',
+ 'Software & Services Safari'=>'blog/sommer',
+ 'Storage Bits'=>'blog/storage',
+ 'Stacking up Open Clouds'=>'blog/apac-redhat',
+ 'Techie Isles'=>'blog/techie-isles',
+ 'Technolatte'=>'blog/technolatte',
+ 'Tech Podium'=>'blog/tech-podium',
+ 'Tel Aviv Tech'=>'blog/tel-aviv',
+ 'Tech Broiler'=>'blog/perlow',
+ 'The SANMAN'=>'blog/the-sanman',
+ 'The open source revolution'=>'blog/the-open-source-revolution',
+ 'The German View'=>'blog/german',
+ 'The Ed Bott Report'=>'blog/bott',
+ 'The Mobile Gadgeteer'=>'blog/mobile-gadgeteer',
+ 'The Apple Core'=>'blog/apple',
+ 'Tom Foremski: IMHO'=>'blog/foremski',
+ 'Twisted Wire'=>'blog/twisted-wire',
+ 'Vive la tech'=>'blog/france',
+ 'Virtually Speaking'=>'blog/virtualization',
+ 'View from China'=>'blog/china',
+ 'Web design & Free Software'=>'blog/web-design-and-free-software',
+ 'ZDNet Government'=>'blog/government',
+ 'ZDNet UK Book Reviews'=>'blog/zdnet-uk-book-reviews',
+ 'ZDNet UK First Take'=>'blog/zdnet-uk-first-take',
+ 'Zero Day'=>'blog/security'
+ ),
+ 'ZDNet Hot Topics RSS:'=>array(
+ 'Apple'=>'topic/apple',
+ 'Collaboration'=>'topic/collaboration',
+ 'Enterprise Software'=>'topic/enterprise-software',
+ 'Google'=>'topic/google',
+ 'Great debate'=>'topic/great-debate',
+ 'Hardware'=>'topic/hardware',
+ 'IBM'=>'topic/ibm',
+ 'iOS'=>'topic/ios',
+ 'iPhone'=>'topic/iphone',
+ 'iPad'=>'topic/ipad',
+ 'IT Priorities'=>'topic/it-priorities',
+ 'Laptops'=>'topic/laptops',
+ 'Legal'=>'topic/legal',
+ 'Linux'=>'topic/linux',
+ 'Microsoft'=>'topic/microsoft',
+ 'Mobile OS'=>'topic/mobile-os',
+ 'Mobility'=>'topic/mobility',
+ 'Networking'=>'topic/networking',
+ 'Oracle'=>'topic/oracle',
+ 'Processors'=>'topic/processors',
+ 'Samsung'=>'topic/samsung',
+ 'Security'=>'topic/security',
+ 'Small business: going big on mobility'=>'topic/small-business-going-big-on-mobility'
+ ),
+ 'Product Blogs:'=>array(
+ 'Digital Cameras & Camcorders'=>'blog/digitalcameras',
+ 'Home Theater'=>'blog/home-theater',
+ 'Laptops and Desktops'=>'blog/computers',
+ 'The Mobile Gadgeteer'=>'blog/mobile-gadgeteer',
+ 'Smartphones and Cell Phones'=>'blog/cell-phones',
+ 'The ToyBox'=>'blog/gadgetreviews'
+ ),
+ 'Vertical Blogs:'=>array(
+ 'ZDNet Education'=>'blog/education',
+ 'ZDNet Healthcare'=>'blog/healthcare',
+ 'ZDNet Government'=>'blog/government'
+ )
+ )
+ )
+ );
}
public function collectData(array $param) {
diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php
index a0338f50..70f10f4e 100644
--- a/bridges/ZoneTelechargementBridge.php
+++ b/bridges/ZoneTelechargementBridge.php
@@ -8,13 +8,9 @@ class ZoneTelechargementBridge extends BridgeAbstract {
$this->uri = 'https://www.zone-telechargement.com/';
$this->description = 'RSS proxy returning the newest releases.
You may specify a category found in RSS URLs, else main feed is selected.';
- $this->parameters[] =
- '[
- {
- "name" : "Category",
- "identifier" : "category"
- }
- ]';
+ $this->parameters[] = array(
+ 'category'=>array('name'=>'Category')
+ );
}
public function collectData(array $param) {