From 63bb7ef24ded812d6c4b959ddbe0cafe04c83b39 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Tue, 9 Aug 2016 20:01:21 +0200 Subject: [PATCH] bridges: Remove unnecessary functions getName() and getURI() --- bridges/ABCTabsBridge.php | 12 ------------ bridges/AcrimedBridge.php | 14 +------------- bridges/AnimeUltimeBridge.php | 4 ---- bridges/ArstechnicaBridge.php | 9 --------- bridges/Arte7Bridge.php | 8 -------- bridges/BandcampBridge.php | 4 ---- bridges/BastaBridge.php | 10 +--------- bridges/BlaguesDeMerdeBridge.php | 8 -------- bridges/BooruprojectBridge.php | 8 -------- bridges/CADBridge.php | 10 +--------- bridges/CastorusBridge.php | 18 +++++------------- bridges/CollegeDeFranceBridge.php | 10 +--------- bridges/CommonDreamsBridge.php | 10 +--------- bridges/CopieDoubleBridge.php | 10 +--------- bridges/CourrierInternationalBridge.php | 12 ++---------- bridges/CryptomeBridge.php | 10 +--------- bridges/DailymotionBridge.php | 4 ---- bridges/DanbooruBridge.php | 8 -------- bridges/DansTonChatBridge.php | 12 ++---------- bridges/DauphineLibereBridge.php | 12 ++---------- bridges/DemoBridge.php | 12 ------------ bridges/DeveloppezDotComBridge.php | 10 +--------- bridges/DollbooruBridge.php | 8 -------- bridges/DuckDuckGoBridge.php | 10 +--------- bridges/EZTVBridge.php | 10 +--------- bridges/EliteDangerousGalnetBridge.php | 12 +----------- bridges/ElsevierBridge.php | 8 -------- bridges/FierPandaBridge.php | 10 +--------- bridges/FlickrExploreBridge.php | 8 -------- bridges/FlickrTagBridge.php | 8 -------- bridges/FootitoBridge.php | 8 -------- bridges/FourchanBridge.php | 10 +--------- bridges/GBAtempBridge.php | 24 ++++++++++-------------- bridges/GelbooruBridge.php | 8 -------- bridges/GiphyBridge.php | 10 +--------- bridges/GithubIssueBridge.php | 8 -------- bridges/GitlabCommitsBridge.php | 8 -------- bridges/GizmodoFRBridge.php | 10 +--------- bridges/GoogleSearchBridge.php | 6 +----- bridges/GuruMedBridge.php | 10 +--------- bridges/HDWallpapersBridge.php | 4 ---- bridges/HentaiHavenBridge.php | 9 ++------- bridges/InstagramBridge.php | 6 +----- bridges/JapanExpoBridge.php | 10 +--------- bridges/KonachanBridge.php | 8 -------- bridges/KoreusBridge.php | 10 +--------- bridges/LWNprevBridge.php | 8 -------- bridges/LeBonCoinBridge.php | 10 +--------- bridges/LeJournalDuGeekBridge.php | 10 +--------- bridges/LeMondeInformatiqueBridge.php | 8 -------- bridges/LesJoiesDuCodeBridge.php | 8 -------- bridges/LinkedInCompany.php | 8 -------- bridges/LolibooruBridge.php | 8 -------- bridges/MangareaderBridge.php | 4 ---- bridges/MilbooruBridge.php | 8 -------- bridges/MondeDiploBridge.php | 18 +++++------------- bridges/MsnMondeBridge.php | 16 ++++------------ bridges/MspabooruBridge.php | 8 -------- bridges/NasaApodBridge.php | 10 +--------- bridges/NeuviemeArtBridge.php | 12 ++---------- bridges/NextInpactBridge.php | 8 -------- bridges/NiceMatinBridge.php | 10 +--------- bridges/NovelUpdatesBridge.php | 7 +++---- bridges/NumeramaBridge.php | 12 ++---------- bridges/OpenClassroomsBridge.php | 10 +--------- bridges/ParuVenduImmoBridge.php | 12 ++++-------- bridges/PickyWallpapersBridge.php | 4 ---- bridges/PlanetLibreBridge.php | 8 +------- bridges/ProjectMGameBridge.php | 10 +--------- bridges/RTBFBridge.php | 4 ---- bridges/Releases3DSBridge.php | 8 -------- bridges/ReporterreBridge.php | 12 ++---------- bridges/Rue89Bridge.php | 8 +------- bridges/Rule34Bridge.php | 8 -------- bridges/Rule34pahealBridge.php | 8 -------- bridges/SafebooruBridge.php | 8 -------- bridges/SakugabooruBridge.php | 8 -------- bridges/ScmbBridge.php | 10 +--------- bridges/ScoopItBridge.php | 10 +--------- bridges/SensCritiqueBridge.php | 4 ---- bridges/Sexactu.php | 11 +++-------- bridges/SiliconBridge.php | 13 ++----------- bridges/StripeAPIChangeLogBridge.php | 10 +--------- bridges/SuperbWallpapersBridge.php | 4 ---- bridges/T411Bridge.php | 16 ++++------------ bridges/TagBoardBridge.php | 4 ---- bridges/TbibBridge.php | 8 -------- bridges/TheCodingLoveBridge.php | 8 -------- bridges/ThePirateBayBridge.php | 10 +--------- bridges/TwitchApiBridge.php | 4 ---- bridges/TwitterBridge.php | 6 +----- bridges/TwitterBridgeClean.php | 6 +----- bridges/TwitterBridgeCleanExtended.php | 6 +----- bridges/TwitterBridgeExtended.php | 10 +--------- bridges/TwitterBridgeTweaked.php | 10 +--------- bridges/UnsplashBridge.php | 8 -------- bridges/ViadeoCompany.php | 8 -------- bridges/VineBridge.php | 10 +--------- bridges/WallpaperStopBridge.php | 4 ---- bridges/WordPressBridge.php | 6 +----- bridges/XbooruBridge.php | 8 -------- bridges/YandereBridge.php | 8 -------- bridges/YoutubeBridge.php | 24 ++++++++++-------------- bridges/ZatazBridge.php | 16 ++++------------ 104 files changed, 107 insertions(+), 854 deletions(-) diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php index 29b41e02fd9..8e2becca7e4 100644 --- a/bridges/ABCTabsBridge.php +++ b/bridges/ABCTabsBridge.php @@ -29,16 +29,4 @@ public function collectData(array $param){ $this->items[] = $item; } } - - public function getName() { - - return "ABC Tabs Bridge"; - - } - - public function getURI() { - - return "http://www.abc-tabs.com/"; - - } } diff --git a/bridges/AcrimedBridge.php b/bridges/AcrimedBridge.php index 4ef08bd6157..85e93fe71fa 100644 --- a/bridges/AcrimedBridge.php +++ b/bridges/AcrimedBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Acrimed Bridge"; $this->uri = "http://www.acrimed.org/"; $this->description = "Returns the newest articles."; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; } @@ -40,18 +40,6 @@ protected function parseRSSItem($newsItem) { } - public function getName() { - - return "Acrimed Bridge"; - - } - - public function getURI() { - - return "http://www.acrimed.org/"; - - } - public function getCacheDuration(){ return 4800; // 2 hours } diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php index 224f6644d2a..274b64c05fe 100644 --- a/bridges/AnimeUltimeBridge.php +++ b/bridges/AnimeUltimeBridge.php @@ -125,10 +125,6 @@ public function getName() { return 'Latest '.$this->filter.' - Anime-Ultime Bridge'; } - public function getURI() { - return 'http://www.anime-ultime.net/'; - } - public function getCacheDuration() { return 3600*3; // 3 hours } diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php index 3e0b3c4236f..a4a08ce4532 100644 --- a/bridges/ArstechnicaBridge.php +++ b/bridges/ArstechnicaBridge.php @@ -62,17 +62,8 @@ function ExtractContent($url) { } - - public function getName() { - return 'ArsTechnica'; - } - public function getCacheDuration() { return 7200; // 2h } - public function getURI() { - return "http://arstechnica.com"; - } - } diff --git a/bridges/Arte7Bridge.php b/bridges/Arte7Bridge.php index 2c2e2f6f85e..25b7d45d56f 100644 --- a/bridges/Arte7Bridge.php +++ b/bridges/Arte7Bridge.php @@ -156,14 +156,6 @@ function extractVideoset($category='toutes-les-videos', $lang='fr') } } - public function getName(){ - return 'Arte7'; - } - - public function getURI(){ - return 'http://www.arte.tv/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php index 80e3deeadb3..e396e7ee18a 100644 --- a/bridges/BandcampBridge.php +++ b/bridges/BandcampBridge.php @@ -51,10 +51,6 @@ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'Bandcamp Tag'; } - public function getURI(){ - return 'http://bandcamp.com'; - } - public function getCacheDuration(){ return 600; // 10 minutes } diff --git a/bridges/BastaBridge.php b/bridges/BastaBridge.php index acdcd67b82b..5c23ed3d183 100644 --- a/bridges/BastaBridge.php +++ b/bridges/BastaBridge.php @@ -5,7 +5,7 @@ public function loadMetadatas() { $this->name = "Bastamag Bridge"; $this->uri = "http://www.bastamag.net/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-02"; + $this->update = "2016-08-09"; } public function collectData(array $param){ @@ -30,14 +30,6 @@ function ReplaceImageUrl($content){ } } - public function getName(){ - return 'Bastamag Bridge'; - } - - public function getURI(){ - return 'http://bastamag.net/'; - } - public function getCacheDuration(){ return 3600*2; // 2 hours } diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php index d977caef93e..b6c6405b05a 100644 --- a/bridges/BlaguesDeMerdeBridge.php +++ b/bridges/BlaguesDeMerdeBridge.php @@ -32,14 +32,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'blaguesdemerde'; - } - - public function getURI(){ - return 'http://www.blaguesdemerde.fr/'; - } - public function getCacheDuration(){ return 7200; // 2h hours } diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php index 3ed40f296af..34c79d612ab 100644 --- a/bridges/BooruprojectBridge.php +++ b/bridges/BooruprojectBridge.php @@ -58,14 +58,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Booruproject'; - } - - public function getURI(){ - return 'http://booru.org/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php index 299bd108f01..0b57ee5acbc 100644 --- a/bridges/CADBridge.php +++ b/bridges/CADBridge.php @@ -5,7 +5,7 @@ public function loadMetadatas() { $this->name = "CAD Bridge"; $this->uri = "http://www.cad-comic.com/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function CADExtractContent($url) { @@ -63,14 +63,6 @@ function CADUrl($string) { } } - public function getName(){ - return 'CAD Bridge'; - } - - public function getURI(){ - return 'http://www.cad-comic.com/'; - } - public function getCacheDuration(){ return 3600*2; // 2 hours } diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php index a6ac5f46f55..6be65883e5b 100644 --- a/bridges/CastorusBridge.php +++ b/bridges/CastorusBridge.php @@ -3,9 +3,9 @@ class CastorusBridge extends BridgeAbstract { public function loadMetadatas(){ $this->maintainer = "logmanoriginal"; $this->name = "Castorus Bridge"; - $this->uri = $this->getURI(); + $this->uri = 'http://www.castorus.com'; $this->description = "Returns the latest changes"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters["Get latest changes"] = '[]'; $this->parameters["Get latest changes via ZIP code"] = @@ -49,7 +49,7 @@ private function ExtractActivityUrl($activity){ if(!$url) $this->returnError('Cannot find url!', 404); - return $this->getURI() . $url->href; + return $this->uri . $url->href; } // Extracts the time from an activity @@ -85,10 +85,10 @@ public function collectData(array $params){ if(isset($params['city'])) $city_filter = trim($params['city']); - $html = $this->file_get_html($this->getURI()); + $html = $this->file_get_html($this->uri); if(!$html) - $this->returnError('Could not load data from ' . $this->getURI() . '!', 404); + $this->returnError('Could not load data from ' . $this->uri . '!', 404); $activities = $html->find('div#activite/li'); @@ -116,14 +116,6 @@ public function collectData(array $params){ } } - public function getName(){ - return 'Castorus Bridge'; - } - - public function getURI(){ - return 'http://www.castorus.com'; - } - public function getCacheDuration(){ return 600; // 10 minutes } diff --git a/bridges/CollegeDeFranceBridge.php b/bridges/CollegeDeFranceBridge.php index 585cebaf742..5dbd19544ac 100644 --- a/bridges/CollegeDeFranceBridge.php +++ b/bridges/CollegeDeFranceBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "CollegeDeFrance"; $this->uri = "http://www.college-de-france.fr/"; $this->description = "Returns the latest audio and video from CollegeDeFrance"; - $this->update = "2016-05-01"; + $this->update = "2016-08-09"; } public function collectData(array $param) { @@ -54,14 +54,6 @@ public function collectData(array $param) { } } - public function getName(){ - return 'CollegeDeFrance'; - } - - public function getURI(){ - return 'http://www.college-de-france.fr/'; - } - public function getCacheDuration(){ return 3600*3; // 3 hours } diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php index 54cf5261650..08a055c8d2f 100644 --- a/bridges/CommonDreamsBridge.php +++ b/bridges/CommonDreamsBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "CommonDreams Bridge"; $this->uri = "http://www.commondreams.org/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function CommonDreamsExtractContent($url) { @@ -39,12 +39,4 @@ function CommonDreamsUrl($string) { } } } - - public function getName(){ - return 'CommonDreams Bridge'; - } - - public function getURI(){ - return 'http://www.commondreams.org/'; - } } diff --git a/bridges/CopieDoubleBridge.php b/bridges/CopieDoubleBridge.php index d629976f907..62935f60739 100644 --- a/bridges/CopieDoubleBridge.php +++ b/bridges/CopieDoubleBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "CopieDouble"; $this->uri = "http://www.copie-double.com/"; $this->description = "CopieDouble"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -42,14 +42,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'CopieDouble'; - } - - public function getURI(){ - return 'http://www.copie-double.com'; - } - public function getCacheDuration(){ return 14400; // 4 hours } diff --git a/bridges/CourrierInternationalBridge.php b/bridges/CourrierInternationalBridge.php index e35eb470d67..1e8f8cd57a8 100644 --- a/bridges/CourrierInternationalBridge.php +++ b/bridges/CourrierInternationalBridge.php @@ -4,10 +4,10 @@ class CourrierInternationalBridge extends BridgeAbstract{ public function loadMetadatas() { $this->maintainer = "teromene"; - $this->name = "CourrierInternational"; + $this->name = "Courrier International Bridge"; $this->uri = "http://CourrierInternational.fr/"; $this->description = "Courrier International bridge"; - $this->update = "01/09/2015"; + $this->update = "2016-08-09"; } @@ -61,14 +61,6 @@ public function collectData(array $param){ } - public function getName(){ - return 'Courrier International Bridge'; - } - - public function getURI(){ - return 'http://courrierinternational.com'; - } - public function getCacheDuration(){ return 300; // 5 minutes } diff --git a/bridges/CryptomeBridge.php b/bridges/CryptomeBridge.php index 9f80671ba02..74da1073253 100644 --- a/bridges/CryptomeBridge.php +++ b/bridges/CryptomeBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Cryptome"; $this->uri = "http://cryptome.org/"; $this->description = "Returns the N most recent documents."; - $this->update = ""; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -46,14 +46,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Cryptome'; - } - - public function getURI(){ - return 'https://secure.netsolhost.com/cryptome.org/'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php index b9d422734fe..85afc3b57d6 100644 --- a/bridges/DailymotionBridge.php +++ b/bridges/DailymotionBridge.php @@ -96,10 +96,6 @@ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'Dailymotion Bridge'; } - public function getURI(){ - return 'https://www.dailymotion.com/'; - } - public function getCacheDuration(){ return 3600*3; // 3 hours } diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php index 91befb1bf8d..7f4560f53dd 100644 --- a/bridges/DanbooruBridge.php +++ b/bridges/DanbooruBridge.php @@ -45,14 +45,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Danbooru'; - } - - public function getURI(){ - return 'http://donmai.us/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/DansTonChatBridge.php b/bridges/DansTonChatBridge.php index 947ed61db83..5f5d72e6ef4 100644 --- a/bridges/DansTonChatBridge.php +++ b/bridges/DansTonChatBridge.php @@ -5,9 +5,9 @@ public function loadMetadatas() { $this->maintainer = "Astalaseven"; $this->name = "DansTonChat Bridge"; - $this->uri = "http://danstonchat.com/latest.html"; + $this->uri = "http://danstonchat.com"; $this->description = "Returns latest quotes from DansTonChat."; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; } @@ -26,14 +26,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'DansTonChat'; - } - - public function getURI(){ - return 'http://danstonchat.com'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php index 24477a72b4d..7ef41611b12 100644 --- a/bridges/DauphineLibereBridge.php +++ b/bridges/DauphineLibereBridge.php @@ -4,10 +4,10 @@ class DauphineLibereBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = "qwertygc"; - $this->name = "DauphineLibereBridge Bridge"; + $this->name = "Dauphine Bridge"; $this->uri = "http://www.ledauphine.com/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -122,14 +122,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Dauphine Bridge'; - } - - public function getURI(){ - return 'http://ledauphine.com/'; - } - public function getCacheDuration(){ return 3600*2; // 2 hours } diff --git a/bridges/DemoBridge.php b/bridges/DemoBridge.php index 2e576c62160..b772ad1277e 100644 --- a/bridges/DemoBridge.php +++ b/bridges/DemoBridge.php @@ -64,18 +64,6 @@ public function collectData(array $param){ } - public function getName() { - - return "DemoBridge"; - - } - - public function getURI() { - - return "http://github.com/sebsauvage/rss-bridge"; - - } - public function getCacheDuration(){ return 00; // 1 hour } diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php index 66a9b2bcce9..e44160fce08 100644 --- a/bridges/DeveloppezDotComBridge.php +++ b/bridges/DeveloppezDotComBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "Developpez.com Actus (FR)"; $this->uri = "http://www.developpez.com/"; $this->description = "Returns the 15 newest posts from DeveloppezDotCom (full text)."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function DeveloppezDotComStripCDATA($string) { @@ -59,14 +59,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'DeveloppezDotCom'; - } - - public function getURI(){ - return 'http://www.developpez.com/'; - } - public function getCacheDuration(){ return 1800; // 30min } diff --git a/bridges/DollbooruBridge.php b/bridges/DollbooruBridge.php index fe6d6fb7f8c..3f81071a552 100644 --- a/bridges/DollbooruBridge.php +++ b/bridges/DollbooruBridge.php @@ -48,14 +48,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Dollbooru'; - } - - public function getURI(){ - return 'http://dollbooru.org/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/DuckDuckGoBridge.php b/bridges/DuckDuckGoBridge.php index eca63275c6c..999b8e344e7 100644 --- a/bridges/DuckDuckGoBridge.php +++ b/bridges/DuckDuckGoBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "DuckDuckGo"; $this->uri = "https://duckduckgo.com/"; $this->description = "Returns most recent results from DuckDuckGo."; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -33,14 +33,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'DuckDuckGo'; - } - - public function getURI(){ - return 'https://duckduckgo.com'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php index c171aeedb1a..16c106c28eb 100644 --- a/bridges/EZTVBridge.php +++ b/bridges/EZTVBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "EZTV"; $this->uri = "https://eztv.ch/"; $this->description = "Returns list of *recent* torrents for a specific show on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -72,12 +72,4 @@ function makeTimestamp($relativeReleaseTime){ } } } - - public function getName(){ - return 'EZTV'; - } - - public function getURI(){ - return 'https://eztv.ch/'; - } } diff --git a/bridges/EliteDangerousGalnetBridge.php b/bridges/EliteDangerousGalnetBridge.php index f9ff9816819..38490b584ba 100644 --- a/bridges/EliteDangerousGalnetBridge.php +++ b/bridges/EliteDangerousGalnetBridge.php @@ -8,7 +8,7 @@ public function loadMetadatas() $this->name = "Elite: Dangerous Galnet"; $this->uri = "https://community.elitedangerous.com/galnet"; $this->description = "Returns the latest page of news from Galnet"; - $this->update = "2016-04-06"; + $this->update = "2016-08-09"; } public function collectData(array $param) @@ -36,16 +36,6 @@ public function collectData(array $param) } } - public function getName() - { - return 'Elite: Dangerous Galnet'; - } - - public function getURI() - { - return 'https://community.elitedangerous.com/galnet'; - } - public function getCacheDuration() { return 3600 * 2; // 2 hours diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php index cca3d853370..6c44cac3268 100644 --- a/bridges/ElsevierBridge.php +++ b/bridges/ElsevierBridge.php @@ -76,14 +76,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Elsevier journals recent articles'; - } - - public function getURI(){ - return 'http://www.journals.elsevier.com'; - } - public function getCacheDuration(){ return 43200; // 12h } diff --git a/bridges/FierPandaBridge.php b/bridges/FierPandaBridge.php index cba96d32a75..c747a5a8ae8 100644 --- a/bridges/FierPandaBridge.php +++ b/bridges/FierPandaBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Fier Panda Bridge"; $this->uri = "http://www.fier-panda.fr/"; $this->description = "Returns latest articles from Fier Panda."; - $this->update = "2015-12-11"; + $this->update = "2016-08-09"; } @@ -27,14 +27,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Fier Panda'; - } - - public function getURI(){ - return 'http://www.fier-panda.fr'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php index 8e859b16033..96293028ba0 100644 --- a/bridges/FlickrExploreBridge.php +++ b/bridges/FlickrExploreBridge.php @@ -36,14 +36,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Flickr Explore'; - } - - public function getURI(){ - return 'https://www.flickr.com/explore'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/FlickrTagBridge.php b/bridges/FlickrTagBridge.php index 61f59a266ea..700f5fef562 100644 --- a/bridges/FlickrTagBridge.php +++ b/bridges/FlickrTagBridge.php @@ -51,14 +51,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Flickr Tag'; - } - - public function getURI(){ - return 'http://www.flickr.com/search/'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php index ffcba2f758d..48a8cbac8cf 100644 --- a/bridges/FootitoBridge.php +++ b/bridges/FootitoBridge.php @@ -41,12 +41,4 @@ public function collectData(array $param){ $this->items[] = $item; } } - - public function getName(){ - return 'footito'; - } - - public function getURI(){ - return 'http://www.footito.fr/'; - } } diff --git a/bridges/FourchanBridge.php b/bridges/FourchanBridge.php index 2cb8b00d67a..df4efba3bc4 100644 --- a/bridges/FourchanBridge.php +++ b/bridges/FourchanBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "4chan"; $this->uri = "https://www.4chan.org/"; $this->description = "Returns posts from the specified thread"; - $this->update = "2015-02-01"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -60,14 +60,6 @@ public function collectData(array $param){ $this->items = array_reverse($this->items); } - public function getName(){ - return '4chan'; - } - - public function getURI(){ - return 'https://www.4chan.org/'; - } - public function getCacheDuration(){ return 300; // 5min } diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php index b1ac17dd677..94ea2e2f141 100644 --- a/bridges/GBAtempBridge.php +++ b/bridges/GBAtempBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->maintainer = 'ORelio'; $this->name = 'GBAtemp'; - $this->uri = $this->getURI(); + $this->uri = 'http://gbatemp.net/'; $this->description = 'GBAtemp is a user friendly underground video game community.'; $this->update = '2016-08-09'; @@ -91,20 +91,20 @@ public function collectData(array $param) { } else $this->returnError('The provided type filter is invalid. Expecting N, R, T, or F.', 400); } else $this->returnError('Please provide a type filter. Expecting N, R, T, or F.', 400); - $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request GBAtemp.', 500); + $html = $this->file_get_html($this->uri) or $this->returnError('Could not request GBAtemp.', 500); if ($typeFilter == 'N') { foreach ($html->find('li[class=news_item full]') as $newsItem) { - $url = $this->getURI().$newsItem->find('a', 0)->href; + $url = $this->uri.$newsItem->find('a', 0)->href; $time = intval($this->ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"')); $author = $newsItem->find('a.username', 0)->plaintext; $title = $newsItem->find('a', 1)->plaintext; - $content = $this->fetch_post_content($url, $this->getURI()); + $content = $this->fetch_post_content($url, $this->uri); $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } else if ($typeFilter == 'R') { foreach ($html->find('li.portal_review') as $reviewItem) { - $url = $this->getURI().$reviewItem->find('a', 0)->href; + $url = $this->uri.$reviewItem->find('a', 0)->href; $title = $reviewItem->find('span.review_title', 0)->plaintext; $content = $this->file_get_html($url) or $this->returnError('Could not request GBAtemp: '.$uri, 500); $author = $content->find('a.username', 0)->plaintext; @@ -114,25 +114,25 @@ public function collectData(array $param) { $subheader = '

'.$content->find('div.review_subheader', 0)->plaintext.'

'; $procons = $content->find('table.review_procons', 0)->outertext; $scores = $content->find('table.reviewscores', 0)->outertext; - $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->getURI()); + $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->uri); $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } else if ($typeFilter == 'T') { foreach ($html->find('li.portal-tutorial') as $tutorialItem) { - $url = $this->getURI().$tutorialItem->find('a', 0)->href; + $url = $this->uri.$tutorialItem->find('a', 0)->href; $title = $tutorialItem->find('a', 0)->plaintext; $time = intval($this->ExtractFromDelimiters($tutorialItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"')); $author = $tutorialItem->find('a.username', 0)->plaintext; - $content = $this->fetch_post_content($url, $this->getURI()); + $content = $this->fetch_post_content($url, $this->uri); $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } else if ($typeFilter == 'F') { foreach ($html->find('li.rc_item') as $postItem) { - $url = $this->getURI().$postItem->find('a', 1)->href; + $url = $this->uri.$postItem->find('a', 1)->href; $title = $postItem->find('a', 1)->plaintext; $time = intval($this->ExtractFromDelimiters($postItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"')); $author = $postItem->find('a.username', 0)->plaintext; - $content = $this->fetch_post_content($url, $this->getURI()); + $content = $this->fetch_post_content($url, $this->uri); $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } @@ -142,10 +142,6 @@ public function getName() { return 'GBAtemp'.(empty($this->filter) ? '' : ' '.$this->filter).' Bridge'; } - public function getURI() { - return 'http://gbatemp.net/'; - } - public function getCacheDuration() { return ($this->filter === 'Forum') ? 300 : 3600; // 5 minutes / 1 hour } diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php index e4cd2b5631a..59ac38b7616 100644 --- a/bridges/GelbooruBridge.php +++ b/bridges/GelbooruBridge.php @@ -50,14 +50,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Gelbooru'; - } - - public function getURI(){ - return 'http://gelbooru.com/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/GiphyBridge.php b/bridges/GiphyBridge.php index acc01d20a60..4ac77e22782 100644 --- a/bridges/GiphyBridge.php +++ b/bridges/GiphyBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $this->name = "Giphy Bridge"; $this->uri = "http://giphy.com/"; $this->description = "Bridge for giphy.com"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters["By tag"] = '[ @@ -81,14 +81,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Giphy Bridge'; - } - - public function getURI(){ - return 'http://giphy.com/'; - } - public function getCacheDuration(){ return 300; // 5 minutes } diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php index 84b1f56c184..28b19da9ca3 100644 --- a/bridges/GithubIssueBridge.php +++ b/bridges/GithubIssueBridge.php @@ -53,14 +53,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Github Issue'; - } - - public function getURI(){ - return ''; - } - public function getCacheDuration(){ return 600; // ten minutes } diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php index ba1b0020b07..c08bc8d37dd 100644 --- a/bridges/GitlabCommitsBridge.php +++ b/bridges/GitlabCommitsBridge.php @@ -79,12 +79,4 @@ public function collectData(array $param){ $this->items[]=$item; } } - - public function getName(){ - return 'Gitlab Commits'; - } - - public function getURI(){ - return ''; - } } diff --git a/bridges/GizmodoFRBridge.php b/bridges/GizmodoFRBridge.php index 2c4080fd072..1204e9fc536 100644 --- a/bridges/GizmodoFRBridge.php +++ b/bridges/GizmodoFRBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "GizmodoFR"; $this->uri = "http://www.gizmodo.fr/"; $this->description = "Returns the 15 newest posts from GizmodoFR (full text)."; - $this->update = "2014-07-14"; + $this->update = "2016-08-09"; } @@ -43,14 +43,6 @@ function GizmodoFRExtractContent($url) { } - public function getName(){ - return 'GizmodoFR'; - } - - public function getURI(){ - return 'http://www.gizmodo.fr/'; - } - public function getCacheDuration(){ return 1800; // 30min } diff --git a/bridges/GoogleSearchBridge.php b/bridges/GoogleSearchBridge.php index 1745922e647..30e8815174c 100644 --- a/bridges/GoogleSearchBridge.php +++ b/bridges/GoogleSearchBridge.php @@ -17,7 +17,7 @@ public function loadMetadatas() { $this->name = "Google search"; $this->uri = "https://www.google.com/"; $this->description = "Returns most recent results from Google search."; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -62,10 +62,6 @@ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'Google search'; } - public function getURI(){ - return 'http://google.com'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php index 57252a0e528..92a4454bdec 100644 --- a/bridges/GuruMedBridge.php +++ b/bridges/GuruMedBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "GuruMed"; $this->uri = "http://www.gurumed.org"; $this->description = "Returns the 5 newest posts from Gurumed (full text)"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function GurumedStripCDATA($string) { @@ -31,12 +31,4 @@ public function collectData(array $param){ } } } - - public function getName(){ - return 'Gurumed'; - } - - public function getURI(){ - return 'http://gurumed.org/'; - } } diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php index 99161a3c8a2..7a60e5b3480 100644 --- a/bridges/HDWallpapersBridge.php +++ b/bridges/HDWallpapersBridge.php @@ -77,10 +77,6 @@ public function getName(){ return 'HDWallpapers - '.str_replace(['__', '_'], [' & ', ' '], $this->category).' ['.$this->resolution.']'; } - public function getURI(){ - return 'http://www.hdwallpapers.in'; - } - public function getCacheDuration(){ return 43200; // 12 hours } diff --git a/bridges/HentaiHavenBridge.php b/bridges/HentaiHavenBridge.php index ccd1f089acb..b3ea196eff3 100644 --- a/bridges/HentaiHavenBridge.php +++ b/bridges/HentaiHavenBridge.php @@ -15,7 +15,7 @@ public function collectData(array $param){ $html = $this->file_get_html('http://hentaihaven.org/') or $this->returnError('Could not request Hentai Haven.', 404); foreach($html->find('div.zoe-grid') as $element) { $item = new \Item(); - $item->uri = $this->getURI().$element->find('div.brick-content h3 a', 0)->href; + $item->uri = $element->find('div.brick-content h3 a', 0)->href; $thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src'); $item->title = mb_convert_encoding(trim($element->find('div.brick-content h3 a', 0)->innertext), 'UTF-8', 'HTML-ENTITIES'); $item->tags = $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent span.tags', 0)->plaintext; @@ -23,12 +23,7 @@ public function collectData(array $param){ $this->items[] = $item; } } - public function getName(){ - return 'Hentai Haven'; - } - public function getURI(){ - return ''; - } + public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php index 104022bd85d..2c50003ce4d 100644 --- a/bridges/InstagramBridge.php +++ b/bridges/InstagramBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $this->name = "Instagram Bridge"; $this->uri = "http://instagram.com/"; $this->description = "Returns the newest images"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -77,8 +77,4 @@ public function collectData(array $param){ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'Instagram Bridge'; } - - public function getURI(){ - return 'http://instagram.com/'; - } } diff --git a/bridges/JapanExpoBridge.php b/bridges/JapanExpoBridge.php index 1c7afa7a2da..afff948608e 100644 --- a/bridges/JapanExpoBridge.php +++ b/bridges/JapanExpoBridge.php @@ -3,7 +3,7 @@ class JapanExpoBridge extends BridgeAbstract{ public function loadMetadatas() { $this->maintainer = 'Ginko'; - $this->name = 'JapanExpo'; + $this->name = 'Japan Expo Actualités'; $this->uri = 'http://www.japan-expo-paris.com/fr/actualites'; $this->description = 'Returns most recent entries from Japan Expo actualités.'; $this->update = '2016-08-09'; @@ -102,14 +102,6 @@ function french_pubdate_to_timestamp($date_to_parse) { } } - public function getName(){ - return 'Japan Expo Actualités'; - } - - public function getURI(){ - return 'http://www.japan-expo-paris.com/fr/actualites'; - } - public function getCacheDuration(){ return 14400; // 4 hours } diff --git a/bridges/KonachanBridge.php b/bridges/KonachanBridge.php index 1b3a378c9a6..45227a4722b 100644 --- a/bridges/KonachanBridge.php +++ b/bridges/KonachanBridge.php @@ -50,14 +50,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Konachan'; - } - - public function getURI(){ - return 'http://konachan.com/post'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php index 830d75fbdaf..15bcaa1c833 100644 --- a/bridges/KoreusBridge.php +++ b/bridges/KoreusBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "Koreus"; $this->uri = "http://www.koreus.com/"; $this->description = "Returns the 5 newest posts from Koreus (full text)"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function KoreusStripCDATA($string) { @@ -38,12 +38,4 @@ public function collectData(array $param){ } } } - - public function getName(){ - return 'Koreus'; - } - - public function getURI(){ - return 'http://www.koreus.com/'; - } } diff --git a/bridges/LWNprevBridge.php b/bridges/LWNprevBridge.php index 15bc1f2ef88..52d71722e64 100644 --- a/bridges/LWNprevBridge.php +++ b/bridges/LWNprevBridge.php @@ -160,14 +160,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'LWN Free Weekly Edition'; - } - - public function getURI(){ - return 'https://lwn.net/free/bigpage'; - } - public function getCacheDuration(){ return 604800; // one week } diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php index e6d0427ac07..98a45be5965 100755 --- a/bridges/LeBonCoinBridge.php +++ b/bridges/LeBonCoinBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "LeBonCoin"; $this->uri = "http://www.leboncoin.fr"; $this->description = "Returns most recent results from LeBonCoin for a region, and optionally a category and a keyword ."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -275,12 +275,4 @@ public function collectData(array $param){ $this->items[] = $item; } } - - public function getName(){ - return 'LeBonCoin'; - } - - public function getURI(){ - return 'http://www.leboncoin.fr'; - } } \ No newline at end of file diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php index 0b6407be980..d30853c23f5 100644 --- a/bridges/LeJournalDuGeekBridge.php +++ b/bridges/LeJournalDuGeekBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "journaldugeek.com (FR)"; $this->uri = "http://www.journaldugeek.com/"; $this->description = "Returns the 5 newest posts from LeJournalDuGeek (full text)."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function LeJournalDuGeekStripCDATA($string) { @@ -54,14 +54,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'LeJournalDuGeek'; - } - - public function getURI(){ - return 'http://www.journaldugeek.com/'; - } - public function getCacheDuration(){ return 1800; // 30min } diff --git a/bridges/LeMondeInformatiqueBridge.php b/bridges/LeMondeInformatiqueBridge.php index df81b667922..2ee1c426037 100644 --- a/bridges/LeMondeInformatiqueBridge.php +++ b/bridges/LeMondeInformatiqueBridge.php @@ -61,14 +61,6 @@ function CleanArticle($article_html) { } } - public function getName() { - return 'Le Monde Informatique'; - } - - public function getURI() { - return 'http://www.lemondeinformatique.fr/'; - } - public function getCacheDuration() { return 1800; // 30 minutes } diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php index 4ff8e2c167e..ed14be92636 100644 --- a/bridges/LesJoiesDuCodeBridge.php +++ b/bridges/LesJoiesDuCodeBridge.php @@ -48,14 +48,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Les Joies Du Code'; - } - - public function getURI(){ - return 'http://lesjoiesducode.fr/'; - } - public function getCacheDuration(){ return 7200; // 2h hours } diff --git a/bridges/LinkedInCompany.php b/bridges/LinkedInCompany.php index 243f70c8fba..97e36432a11 100644 --- a/bridges/LinkedInCompany.php +++ b/bridges/LinkedInCompany.php @@ -37,14 +37,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'LinkedIn'; - } - - public function getURI(){ - return 'https://www.linkedin.com'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/LolibooruBridge.php b/bridges/LolibooruBridge.php index 74fe9ab6475..3d4745b7b18 100644 --- a/bridges/LolibooruBridge.php +++ b/bridges/LolibooruBridge.php @@ -51,14 +51,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Lolibooru'; - } - - public function getURI(){ - return 'http://lolibooru.moe/post'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/MangareaderBridge.php b/bridges/MangareaderBridge.php index 568eb23752a..e8d53f48eb1 100644 --- a/bridges/MangareaderBridge.php +++ b/bridges/MangareaderBridge.php @@ -328,10 +328,6 @@ public function getName(){ return (!empty($this->request) ? $this->request . ' - ' : '') . 'Mangareader Bridge'; } - public function getURI(){ - return 'http://www.mangareader.net'; - } - public function getCacheDuration(){ return 10800; // 3 hours } diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php index 946a1327bd8..59a7b262503 100644 --- a/bridges/MilbooruBridge.php +++ b/bridges/MilbooruBridge.php @@ -47,14 +47,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Milbooru'; - } - - public function getURI(){ - return 'http://sheslostcontrol.net/moe/shimmie/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/MondeDiploBridge.php b/bridges/MondeDiploBridge.php index 2aad1a4cbae..d6d2d3b1e9b 100644 --- a/bridges/MondeDiploBridge.php +++ b/bridges/MondeDiploBridge.php @@ -3,33 +3,25 @@ class MondeDiploBridge extends BridgeAbstract{ public function loadMetadatas() { $this->maintainer = "Pitchoule"; - $this->name = "MondeDiplo"; - $this->uri = "http://www.monde-diplomatique.fr"; + $this->name = 'Monde Diplomatique'; + $this->uri = 'http://www.monde-diplomatique.fr'; $this->description = "Returns most recent results from MondeDiplo."; - $this->update = "2016-08-03"; + $this->update = "2016-08-09"; } public function collectData(array $param){ - $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request MondeDiplo. for : ' . $link , 404); + $html = $this->file_get_html($this->uri) or $this->returnError('Could not request MondeDiplo. for : ' . $link , 404); foreach($html->find('div.unarticle') as $article) { $element = $article->parent(); $item = new Item(); - $item->uri = $this->getURI() . $element->href; + $item->uri = $this->uri . $element->href; $item->title = $element->find('h3', 0)->plaintext; $item->content = $element->find('div.dates_auteurs', 0)->plaintext . '
' . strstr($element->find('div', 0)->plaintext, $element->find('div.dates_auteurs', 0)->plaintext, true); $this->items[] = $item; } } - public function getName(){ - return 'Monde Diplomatique'; - } - - public function getURI(){ - return 'http://www.monde-diplomatique.fr'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php index 4b833c94ca9..03c3eb6c447 100644 --- a/bridges/MsnMondeBridge.php +++ b/bridges/MsnMondeBridge.php @@ -3,10 +3,10 @@ class MsnMondeBridge extends BridgeAbstract{ public function loadMetadatas() { $this->maintainer = "kranack"; - $this->name = "MSN Actu Monde"; - $this->uri = "http://www.msn.com/fr-fr/actualite/monde"; + $this->name = 'MSN Actu Monde'; + $this->uri = 'http://www.msn.com/fr-fr/actualite/monde'; $this->description = "Returns the 10 newest posts from MSN Actualités (full text)"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function MsnMondeExtractContent($url, &$item) { @@ -16,7 +16,7 @@ private function MsnMondeExtractContent($url, &$item) { } public function collectData(array $param){ - $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request MsnMonde.', 404); + $html = $this->file_get_html($this->uri) or $this->returnError('Could not request MsnMonde.', 404); $limit = 0; foreach($html->find('.smalla') as $article) { if($limit < 10) { @@ -29,12 +29,4 @@ public function collectData(array $param){ } } } - - public function getName(){ - return 'MSN Actu Monde'; - } - - public function getURI(){ - return 'http://www.msn.com/fr-fr/actualite/monde'; - } } diff --git a/bridges/MspabooruBridge.php b/bridges/MspabooruBridge.php index 2ad84d6e118..edd327d5e43 100644 --- a/bridges/MspabooruBridge.php +++ b/bridges/MspabooruBridge.php @@ -50,14 +50,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Mspabooru'; - } - - public function getURI(){ - return 'http://mspabooru.com/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/NasaApodBridge.php b/bridges/NasaApodBridge.php index 9da120a92fa..3c0f2565d8e 100644 --- a/bridges/NasaApodBridge.php +++ b/bridges/NasaApodBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "NASA APOD Bridge"; $this->uri = "http://apod.nasa.gov/apod/astropix.html"; $this->description = "Returns the 3 latest NASA APOD pictures and explanations"; - $this->update = "2014-08-27"; + $this->update = "2016-08-09"; } @@ -45,14 +45,6 @@ public function collectData(array $param) { } } - public function getName(){ - return 'NASA APOD'; - } - - public function getURI(){ - return 'http://apod.nasa.gov/apod/astropix.html'; - } - public function getCacheDuration(){ return 3600*12; // 12 hours } diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php index b772f5d01ba..d26e6f2374b 100644 --- a/bridges/NeuviemeArtBridge.php +++ b/bridges/NeuviemeArtBridge.php @@ -3,7 +3,7 @@ class NeuviemeArtBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = "ORelio"; - $this->name = "9ème Art"; + $this->name = '9ème Art Bridge'; $this->uri = "http://www.9emeart.fr/"; $this->description = "Returns the newest articles."; $this->update = "2016-08-09"; @@ -54,12 +54,4 @@ function StripWithDelimiters($string, $start, $end) { } } } - - public function getName() { - return '9ème Art Bridge'; - } - - public function getURI() { - return 'http://www.9emeart.fr/'; - } -} \ No newline at end of file +} diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php index 52bc9086594..3c8b976af9e 100644 --- a/bridges/NextInpactBridge.php +++ b/bridges/NextInpactBridge.php @@ -43,12 +43,4 @@ public function collectData(array $param) { } } } - - public function getName() { - return 'Nextinpact Bridge'; - } - - public function getURI() { - return 'http://www.nextinpact.com/'; - } } diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php index aa418223177..0a05d067e8f 100644 --- a/bridges/NiceMatinBridge.php +++ b/bridges/NiceMatinBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "NiceMatin"; $this->uri = "http://www.nicematin.com/"; $this->description = "Returns the 10 newest posts from NiceMatin (full text)"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function NiceMatinExtractContent($url) { @@ -45,12 +45,4 @@ public function collectData(array $param){ } } } - - public function getName(){ - return 'NiceMatin'; - } - - public function getURI(){ - return 'http://www.nicematin.com/'; - } } diff --git a/bridges/NovelUpdatesBridge.php b/bridges/NovelUpdatesBridge.php index ff5cd88eb99..e61ebfde7a1 100644 --- a/bridges/NovelUpdatesBridge.php +++ b/bridges/NovelUpdatesBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Novel Updates"; $this->uri = "http://www.novelupdates.com/"; $this->description = "Returns releases from Novel Updates"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ { @@ -44,12 +44,11 @@ public function collectData(array $param){ $this->items[] = $item; } } + public function getName(){ return (!empty($this->request) ? $this->request.' - ' : '') .'Novel Updates'; } - public function getURI(){ - return 'http://www.novelupdates.com/'; - } + public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/NumeramaBridge.php b/bridges/NumeramaBridge.php index c8dcb4cc5eb..d6248a63e6a 100644 --- a/bridges/NumeramaBridge.php +++ b/bridges/NumeramaBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = 'Numerama'; $this->uri = 'http://www.numerama.com/'; $this->description = 'Returns the 5 newest posts from Numerama (full text)'; - $this->update = '2016-07-19'; + $this->update = '2016-08-09'; } @@ -19,7 +19,7 @@ function NumeramaStripCDATA($string) { return $string; } - $feed = $this->getURI().'feed/'; + $feed = $this->uri.'feed/'; $html = $this->file_get_html($feed) or $this->returnError('Could not request Numerama: '.$feed, 500); $limit = 0; @@ -45,14 +45,6 @@ function NumeramaStripCDATA($string) { } - public function getName() { - return 'Numerama'; - } - - public function getURI() { - return 'http://www.numerama.com/'; - } - public function getCacheDuration() { return 1800; // 30min } diff --git a/bridges/OpenClassroomsBridge.php b/bridges/OpenClassroomsBridge.php index f217fa9c0e8..9371b5c38f2 100644 --- a/bridges/OpenClassroomsBridge.php +++ b/bridges/OpenClassroomsBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "OpenClassrooms Bridge"; $this->uri = "https://openclassrooms.com/"; $this->description = "Returns latest tutorials from OpenClassrooms."; - $this->update = "2015-10-30"; + $this->update = "2016-08-09"; $this->parameters[] = @@ -79,14 +79,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'OpenClassrooms'; - } - - public function getURI(){ - return 'https://openclassrooms.com/'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php index 40f4eadebd6..ac9b316eab3 100644 --- a/bridges/ParuVenduImmoBridge.php +++ b/bridges/ParuVenduImmoBridge.php @@ -8,9 +8,9 @@ public function loadMetadatas() { $this->maintainer = "polo2ro"; $this->name = "Paru Vendu Immobilier"; - $this->uri = "http://www.paruvendu.fr/immobilier/"; + $this->uri = "http://www.paruvendu.fr"; $this->description = "Returns the ads from the first page of search result."; - $this->update = "2015-02-02"; + $this->update = "2016-08-09"; $this->parameters[] = @@ -46,7 +46,7 @@ public function collectData(array $param) $num = 20; $appartment = '&tbApp=1&tbDup=1&tbChb=1&tbLof=1&tbAtl=1&tbPla=1'; $maison = '&tbMai=1&tbVil=1&tbCha=1&tbPro=1&tbHot=1&tbMou=1&tbFer=1'; - $link = $this->getURI().'/immobilier/annonceimmofo/liste/listeAnnonces?tt=1'.$appartment.$maison; + $link = $this->uri.'/immobilier/annonceimmofo/liste/listeAnnonces?tt=1'.$appartment.$maison; if (isset($param['minarea'])) { $this->request .= ' '.$param['minarea'].' m2'; @@ -90,7 +90,7 @@ public function collectData(array $param) list($href) = explode('#', $element->href); $item = new \Item(); - $item->uri = $this->getURI().$href; + $item->uri = $this->uri.$href; $item->title = $element->title; $item->content = $img.$desc.$price; $this->items[] = $item; @@ -102,10 +102,6 @@ public function getName(){ return 'Paru Vendu Immobilier'.$this->request; } - public function getURI(){ - return 'http://www.paruvendu.fr'; - } - public function getCacheDuration(){ return 10800; // 3 hours } diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php index b45a61b4d07..29b116cc612 100644 --- a/bridges/PickyWallpapersBridge.php +++ b/bridges/PickyWallpapersBridge.php @@ -83,10 +83,6 @@ public function getName(){ return 'PickyWallpapers - '.$this->category.(!empty($this->subcategory) ? ' > '.$this->subcategory : '').' ['.$this->resolution.']'; } - public function getURI(){ - return 'http://www.pickywallpapers.com'; - } - public function getCacheDuration(){ return 43200; // 12 hours } diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php index cbfa0234960..53250ea587a 100644 --- a/bridges/PlanetLibreBridge.php +++ b/bridges/PlanetLibreBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas(){ $this->name = "PlanetLibre"; $this->uri = "http://www.planet-libre.org"; $this->description = "Returns the 5 newest posts from PlanetLibre (full text)"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function PlanetLibreExtractContent($url){ @@ -31,12 +31,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'PlanetLibre'; - } - public function getURI(){ - return 'http://www.planet-libre.org/'; - } public function getCacheDuration(){ return 3600*2; // 1 hour } diff --git a/bridges/ProjectMGameBridge.php b/bridges/ProjectMGameBridge.php index b9835c95b34..19c2e61890e 100644 --- a/bridges/ProjectMGameBridge.php +++ b/bridges/ProjectMGameBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Project M Game Bridge"; $this->uri = "http://projectmgame.com/en/"; $this->description = "Returns the newest articles."; - $this->update = "2014-08-27"; + $this->update = "2016-08-09"; } @@ -33,14 +33,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Project M Game Bridge'; - } - - public function getURI(){ - return 'http://projectmgame.com/en/'; - } - public function getCacheDuration(){ return 10800; //3 hours } diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php index 2eb2d98407a..d96dd27980d 100644 --- a/bridges/RTBFBridge.php +++ b/bridges/RTBFBridge.php @@ -52,10 +52,6 @@ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'RTBF Bridge'; } - public function getURI(){ - return 'http://www.rtbf.be/auvio/emissions'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/Releases3DSBridge.php b/bridges/Releases3DSBridge.php index 54a5a816cf3..3c5c74e2e43 100644 --- a/bridges/Releases3DSBridge.php +++ b/bridges/Releases3DSBridge.php @@ -118,14 +118,6 @@ function CardToString($card) { } } - public function getName() { - return '3DS Scene Releases'; - } - - public function getURI() { - return 'http://www.3dsdb.com/'; - } - public function getCacheDuration() { return 10800; //3 hours } diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php index 702f13d2cc0..387316e0a11 100644 --- a/bridges/ReporterreBridge.php +++ b/bridges/ReporterreBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = "Reporterre Bridge"; $this->uri = "http://www.reporterre.net/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function ExtractContentReporterre($url) { @@ -20,7 +20,7 @@ private function ExtractContentReporterre($url) { unset ($html2); // Replace all relative urls with absolute ones - $text = preg_replace('/(href|src)(\=[\"\'])(?!http)([^"\']+)/ims', "$1$2" . $this->getURI() . "$3", $text); + $text = preg_replace('/(href|src)(\=[\"\'])(?!http)([^"\']+)/ims', "$1$2" . $this->uri . "$3", $text); $text = strip_tags($text, '


'); return $text; @@ -42,12 +42,4 @@ public function collectData(array $param){ } } } - - public function getName(){ - return 'Reporterre Bridge'; - } - - public function getURI(){ - return 'http://www.reporterre.net/'; - } } diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php index 2a2b8f1d2f2..ae407d3732a 100644 --- a/bridges/Rue89Bridge.php +++ b/bridges/Rue89Bridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Rue89"; $this->uri = "http://rue89.nouvelobs.com/"; $this->description = "Returns the 5 newest posts from Rue89 (full text)"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -44,10 +44,4 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Rue89'; - } - public function getURI(){ - return 'http://rue89.nouvelobs.com/'; - } } diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php index d9ca0669b7c..3b22d432e36 100644 --- a/bridges/Rule34Bridge.php +++ b/bridges/Rule34Bridge.php @@ -49,14 +49,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Rule34'; - } - - public function getURI(){ - return 'http://rule34.xxx/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php index ecffcc580fe..e6e135e6619 100644 --- a/bridges/Rule34pahealBridge.php +++ b/bridges/Rule34pahealBridge.php @@ -48,14 +48,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Rule34paheal'; - } - - public function getURI(){ - return 'http://rule34.paheal.net/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php index b9d2ee1ef88..42272f8bf70 100644 --- a/bridges/SafebooruBridge.php +++ b/bridges/SafebooruBridge.php @@ -50,14 +50,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Safebooru'; - } - - public function getURI(){ - return 'http://safebooru.org/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php index ac6d58dd00f..5e6e52911aa 100644 --- a/bridges/SakugabooruBridge.php +++ b/bridges/SakugabooruBridge.php @@ -50,14 +50,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Sakugabooru'; - } - - public function getURI(){ - return 'http://sakuga.yshi.org/post'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/ScmbBridge.php b/bridges/ScmbBridge.php index 6cf96737b2d..95bd544f9e7 100644 --- a/bridges/ScmbBridge.php +++ b/bridges/ScmbBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Se Coucher Moins Bête Bridge"; $this->uri = "http://secouchermoinsbete.fr/"; $this->description = "Returns the newest anecdotes."; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; } @@ -38,14 +38,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Se Coucher Moins Bête Bridge'; - } - - public function getURI(){ - return 'http://secouchermoinsbete.fr/'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/ScoopItBridge.php b/bridges/ScoopItBridge.php index da439de72eb..449f8d16465 100644 --- a/bridges/ScoopItBridge.php +++ b/bridges/ScoopItBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "ScoopIt"; $this->uri = "http://www.scoop.it"; $this->description = "Returns most recent results from ScoopIt."; - $this->update = "2014-06-13"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -39,14 +39,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'ScooptIt'; - } - - public function getURI(){ - return 'http://Scoop.it'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php index fc2093219d2..1b7a95eebf0 100644 --- a/bridges/SensCritiqueBridge.php +++ b/bridges/SensCritiqueBridge.php @@ -131,10 +131,6 @@ private function extractDataFromList($list) { } } - public function getURI() { - return (trim($this->uri) === "") ? "http://www.senscritique.com" : $this->uri; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/Sexactu.php b/bridges/Sexactu.php index c5480e4bdfa..d9f70c49fbd 100644 --- a/bridges/Sexactu.php +++ b/bridges/Sexactu.php @@ -1,5 +1,4 @@ find('h2', 0)->find('a',0); $titleTimestamp =$titleDetails->find('h4',0); $item->title = $this->correctCase(trim($titleData->innertext)); - $item->uri = GQ.$titleData->href; + $item->uri = $this->uri.$titleData->href; // Fugly date parsing due to the fact my DNS-323 doesn't support php intl extension $dateText = $titleTimestamp->innertext; @@ -46,7 +45,7 @@ public function collectData(array $param){ $elementText = $element->find('.text-container', 0); // don't forget to replace images server url with gq one foreach($elementText->find('img') as $image) { - $image->src = GQ.$image->src; + $image->src = $this->uri.$image->src; } $item->content = $elementText->innertext; $this->items[] = $item; @@ -58,12 +57,8 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Sexactu'; - } - public function getURI(){ - return GQ.'/sexactu'; + return $this->uri.'/sexactu'; } public function getCacheDuration(){ diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php index 4cd7388466e..0805e8db94d 100644 --- a/bridges/SiliconBridge.php +++ b/bridges/SiliconBridge.php @@ -4,8 +4,8 @@ class SiliconBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = "ORelio"; - $this->name = "Silicon.fr"; - $this->uri = "http://www.silicon.fr/"; + $this->name = 'Silicon Bridge'; + $this->uri = 'http://www.silicon.fr/'; $this->description = "Returns the newest articles."; $this->update = "2016-08-09"; @@ -58,16 +58,7 @@ function StripCDATA($string) { } } - public function getName() { - return 'Silicon Bridge'; - } - - public function getURI() { - return 'http://www.silicon.fr/'; - } - public function getCacheDuration() { return 1800; // 30 minutes - // return 0; } } diff --git a/bridges/StripeAPIChangeLogBridge.php b/bridges/StripeAPIChangeLogBridge.php index 1a5b57f92cd..32945a1debe 100644 --- a/bridges/StripeAPIChangeLogBridge.php +++ b/bridges/StripeAPIChangeLogBridge.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $this->maintainer = 'Pierre Mazière'; $this->name = 'Stripe API Changelog'; - $this->uri = ''; + $this->uri = 'https://stripe.com/docs/upgrades'; $this->description = 'Returns the changes made to the stripe.com API'; $this->update = '2016-08-09'; } @@ -31,14 +31,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Stripe API Changelog'; - } - - public function getURI(){ - return 'https://stripe.com/docs/upgrades'; - } - public function getCacheDuration(){ return 86400; // one day } diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php index ed9d78fde14..2d21cfaa8bb 100644 --- a/bridges/SuperbWallpapersBridge.php +++ b/bridges/SuperbWallpapersBridge.php @@ -75,10 +75,6 @@ public function getName(){ return 'HDWallpapers - '.$this->category.' ['.$this->resolution.']'; } - public function getURI(){ - return 'http://www.superbwallpapers.com'; - } - public function getCacheDuration(){ return 43200; // 12 hours } diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php index 5a7e2bca616..0238f335d01 100644 --- a/bridges/T411Bridge.php +++ b/bridges/T411Bridge.php @@ -4,8 +4,8 @@ class T411Bridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = 'T411'; - $this->uri = $this->getURI(); + $this->name = 'T411 Bridge'; + $this->uri = 'https://t411.ch/'; $this->description = 'Returns the 10 newest torrents with specified search terms
Use url part after "?" mark when using their search engine.'; $this->update = '2016-08-09'; @@ -35,7 +35,7 @@ function ExtractFromDelimiters($string, $start, $end) { } //Retrieve torrent listing from search results, which does not contain torrent description - $url = $this->getURI().'torrents/search/?'.$param['search'].'&order=added&type=desc'; + $url = $this->uri.'torrents/search/?'.$param['search'].'&order=added&type=desc'; $html = $this->file_get_html($url) or $this->returnError('Could not request t411: '.$url, 500); $results = $html->find('table.results', 0); if (is_null($results)) @@ -52,7 +52,7 @@ function ExtractFromDelimiters($string, $start, $end) { usleep(500000); //So we need to wait (500ms) //Retrieve data from RSS entry - $item_uri = $this->getURI().'torrents/details/?id='.ExtractFromDelimiters($element->find('a.nfo', 0)->outertext, '?id=', '"'); + $item_uri = $this->uri.'torrents/details/?id='.ExtractFromDelimiters($element->find('a.nfo', 0)->outertext, '?id=', '"'); $item_title = ExtractFromDelimiters($element->outertext, '" title="', '"'); $item_date = strtotime($element->find('dd', 0)->plaintext); @@ -84,13 +84,5 @@ function ExtractFromDelimiters($string, $start, $end) { } } } - - public function getName() { - return "T411 Bridge"; - } - - public function getURI() { - return 'https://t411.ch/'; - } } diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php index 406f64f03f9..b2a94ea6e59 100644 --- a/bridges/TagBoardBridge.php +++ b/bridges/TagBoardBridge.php @@ -45,10 +45,6 @@ public function getName(){ return 'tagboard - ' .$this->request; } - public function getURI(){ - return 'http://TagBoard.com'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php index f0c91c79c9a..e624c698fe9 100644 --- a/bridges/TbibBridge.php +++ b/bridges/TbibBridge.php @@ -49,14 +49,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Tbib'; - } - - public function getURI(){ - return 'http://tbib.org/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/TheCodingLoveBridge.php b/bridges/TheCodingLoveBridge.php index 6e8702b4f87..e2ff36029c6 100644 --- a/bridges/TheCodingLoveBridge.php +++ b/bridges/TheCodingLoveBridge.php @@ -49,14 +49,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'The Coding Love'; - } - - public function getURI(){ - return 'http://thecodinglove.com/'; - } - public function getCacheDuration(){ return 7200; // 2h hours } diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php index c8b8b68722c..4e2bd057710 100644 --- a/bridges/ThePirateBayBridge.php +++ b/bridges/ThePirateBayBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "The Pirate Bay"; $this->uri = "https://thepiratebay.org/"; $this->description = "Returns results for the keywords. You can put several list of keywords by separating them with a semicolon (e.g. \"one show;another show\")"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -80,12 +80,4 @@ function parseDateTimestamp($element){ } } } - - public function getName(){ - return 'The Pirate Bay'; - } - - public function getURI(){ - return 'https://thepiratebay.org/'; - } } diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php index adebd05eafe..789324aad57 100644 --- a/bridges/TwitchApiBridge.php +++ b/bridges/TwitchApiBridge.php @@ -164,10 +164,6 @@ public function getName(){ return (!empty($this->channel) ? $this->channel . ' - ' : '') . 'Twitch API Bridge'; } - public function getURI(){ - return 'https://www.twitch.tv'; - } - public function getCacheDuration(){ return 10800; // 3 hours } diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php index c116713e0a2..4a7ec9d267d 100644 --- a/bridges/TwitterBridge.php +++ b/bridges/TwitterBridge.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $this->name = "Twitter Bridge"; $this->uri = "http://twitter.com/"; $this->description = "Returns user timelines or keyword/hashtag search results (without using their API)."; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters["By keyword or hashtag"] = '[ @@ -74,10 +74,6 @@ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'Twitter Bridge'; } - public function getURI(){ - return 'http://twitter.com'; - } - public function getCacheDuration(){ return 300; // 5 minutes } diff --git a/bridges/TwitterBridgeClean.php b/bridges/TwitterBridgeClean.php index 9f6ccfcdcee..235469ce339 100644 --- a/bridges/TwitterBridgeClean.php +++ b/bridges/TwitterBridgeClean.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $this->name = "Twitter Bridge Clean"; $this->uri = "http://twitter.com/"; $this->description = "Returns user timelines without username in title or search results for keywords/hashtags (without using their API)."; - $this->update = "2015-03-07"; + $this->update = "2016-08-09"; $this->parameters["By keyword or hashtag"] = '[ @@ -75,10 +75,6 @@ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'Twitter Bridge'; } - public function getURI(){ - return 'http://twitter.com'; - } - public function getCacheDuration(){ return 300; // 5 minutes } diff --git a/bridges/TwitterBridgeCleanExtended.php b/bridges/TwitterBridgeCleanExtended.php index 170efff965e..1be4c7b091a 100644 --- a/bridges/TwitterBridgeCleanExtended.php +++ b/bridges/TwitterBridgeCleanExtended.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $this->name = "Twitter Bridge Clean Extended"; $this->uri = "http://twitter.com/"; $this->description = "Returns user timelines showing RTs correctly or search results for keywords/hashtags (without using their API)."; - $this->update = "2016-01-27"; + $this->update = "2016-08-09"; $this->parameters["By keyword or hashtag"] = '[ @@ -80,10 +80,6 @@ public function getName(){ return (!empty($this->request) ? $this->request : ''); } - public function getURI(){ - return 'http://twitter.com'; - } - public function getCacheDuration(){ return 300; // 5 minutes } diff --git a/bridges/TwitterBridgeExtended.php b/bridges/TwitterBridgeExtended.php index e15a0e9b1a9..b824a7267fb 100644 --- a/bridges/TwitterBridgeExtended.php +++ b/bridges/TwitterBridgeExtended.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Twitter Bridge Extended"; $this->uri = "https://twitter.com/"; $this->description = "(same as Twitter Bridge, but with avatar, replies and RTs)"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters["By keyword or hashtag"] = '[ @@ -78,14 +78,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Twitter Bridge Extended'; - } - - public function getURI(){ - return 'http://twitter.com'; - } - public function getCacheDuration(){ return 300; // 5 minutes } diff --git a/bridges/TwitterBridgeTweaked.php b/bridges/TwitterBridgeTweaked.php index 4f55fb9fc4e..5c1e53c89b4 100644 --- a/bridges/TwitterBridgeTweaked.php +++ b/bridges/TwitterBridgeTweaked.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Twitter Bridge Tweaked"; $this->uri = "https://twitter.com/"; $this->description = "(same as Twitter Bridge Extended, but with cleaned title & content)"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters["By keyword or hashtag"] = '[ @@ -147,14 +147,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Twitter Bridge Tweaked'; - } - - public function getURI(){ - return 'http://twitter.com'; - } - public function getCacheDuration(){ return 300; // 5 minutes } diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php index 6fa5c3c9eea..ccbf2a206df 100644 --- a/bridges/UnsplashBridge.php +++ b/bridges/UnsplashBridge.php @@ -71,14 +71,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Unsplash'; - } - - public function getURI(){ - return 'http://unsplash.com'; - } - public function getCacheDuration(){ return 43200; // 12 hours } diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompany.php index d5369a5ba96..eee7a24a8f2 100644 --- a/bridges/ViadeoCompany.php +++ b/bridges/ViadeoCompany.php @@ -37,14 +37,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Viadeo'; - } - - public function getURI(){ - return 'https://www.viadeo.com'; - } - public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/VineBridge.php b/bridges/VineBridge.php index daf520e9691..db6398308a7 100644 --- a/bridges/VineBridge.php +++ b/bridges/VineBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Vine bridge"; $this->uri = "http://vine.co/"; $this->description = "Returns the latests vines from vine user page"; - $this->update = "2016-03-12"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -45,14 +45,6 @@ public function collectData(array $param){ } - public function getName(){ - return 'Vine'; - } - - public function getURI(){ - return 'http://vine.co'; - } - public function getCacheDuration(){ return 10; //seconds } diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php index 2cd3d2d0210..7a70ef2020f 100644 --- a/bridges/WallpaperStopBridge.php +++ b/bridges/WallpaperStopBridge.php @@ -90,10 +90,6 @@ public function getName(){ return 'WallpaperStop - '.$this->category.(!empty($this->subcategory) ? ' > '.$this->subcategory : '').' ['.$this->resolution.']'; } - public function getURI(){ - return 'http://www.wallpaperstop.com'; - } - public function getCacheDuration(){ return 43200; // 12 hours } diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php index 69db32548b8..28e570484ea 100644 --- a/bridges/WordPressBridge.php +++ b/bridges/WordPressBridge.php @@ -12,7 +12,7 @@ public function loadMetadatas() { $this->name = "Wordpress Bridge"; $this->uri = "https://wordpress.org/"; $this->description = "Returns the 3 newest full posts of a Wordpress blog"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -136,10 +136,6 @@ public function getName() { return "{$this->sitename} - Wordpress Bridge"; } - public function getURI() { - return $this->url; - } - public function getCacheDuration() { return 3600*3; // 3 hours } diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php index 74fe4ab121c..2d28f4472e1 100644 --- a/bridges/XbooruBridge.php +++ b/bridges/XbooruBridge.php @@ -49,14 +49,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Xbooru'; - } - - public function getURI(){ - return 'http://xbooru.com/'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php index 088599f0be8..65a6b1a6c76 100644 --- a/bridges/YandereBridge.php +++ b/bridges/YandereBridge.php @@ -50,14 +50,6 @@ public function collectData(array $param){ } } - public function getName(){ - return 'Yande.re'; - } - - public function getURI(){ - return 'http://yande.re/post'; - } - public function getCacheDuration(){ return 1800; // 30 minutes } diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php index bd6baae5caa..08656bc05d6 100644 --- a/bridges/YoutubeBridge.php +++ b/bridges/YoutubeBridge.php @@ -11,7 +11,7 @@ class YoutubeBridge extends BridgeAbstract { public function loadMetadatas() { $this->name = 'YouTube Bridge'; - $this->homepage = $this->getURI(); + $this->homepage = 'https://www.youtube.com/'; $this->description = 'Returns the 10 newest videos by username/channel/playlist or search'; $this->maintainer = 'mitsukarenai'; $this->update = '2016-08-09'; @@ -68,7 +68,7 @@ public function loadMetadatas() { } private function ytBridgeQueryVideoInfo($vid, &$author, &$desc, &$time) { - $html = $this->file_get_html($this->getURI()."watch?v=$vid"); + $html = $this->file_get_html($this->uri."watch?v=$vid"); $author = $html->innertext; $author = substr($author, strpos($author, '"author=') + 8); $author = substr($author, 0, strpos($author, '\u0026')); @@ -82,8 +82,8 @@ private function ytBridgeAddItem($vid, $title, $author, $desc, $time) { $item->title = $title; $item->author = $author; $item->timestamp = $time; - $item->uri = $this->getURI().'watch?v='.$vid; - $thumbnailUri = str_replace('/www.', '/img.', $this->getURI()).'vi/'.$vid.'/0.jpg'; + $item->uri = $this->uri.'watch?v='.$vid; + $thumbnailUri = str_replace('/www.', '/img.', $this->uri).'vi/'.$vid.'/0.jpg'; $item->content = '
'.$desc; $this->items[] = $item; } @@ -130,12 +130,12 @@ public function collectData(array $param) { if (isset($param['u'])) { /* User and Channel modes */ $this->request = $param['u']; - $url_feed = $this->getURI().'feeds/videos.xml?user='.urlencode($this->request); - $url_listing = $this->getURI().'user/'.urlencode($this->request).'/videos'; + $url_feed = $this->uri.'feeds/videos.xml?user='.urlencode($this->request); + $url_listing = $this->uri.'user/'.urlencode($this->request).'/videos'; } else if (isset($param['c'])) { $this->request = $param['c']; - $url_feed = $this->getURI().'feeds/videos.xml?channel_id='.urlencode($this->request); - $url_listing = $this->getURI().'channel/'.urlencode($this->request).'/videos'; + $url_feed = $this->uri.'feeds/videos.xml?channel_id='.urlencode($this->request); + $url_listing = $this->uri.'channel/'.urlencode($this->request).'/videos'; } if (!empty($url_feed) && !empty($url_listing)) { if ($xml = $this->file_get_html($url_feed)) { @@ -147,7 +147,7 @@ public function collectData(array $param) { else if (isset($param['p'])) { /* playlist mode */ $this->request = $param['p']; - $url_listing = $this->getURI().'playlist?list='.urlencode($this->request); + $url_listing = $this->uri.'playlist?list='.urlencode($this->request); $html = $this->file_get_html($url_listing) or $this->returnError("Could not request YouTube. Tried:\n - $url_listing", 500); $this->ytBridgeParseHtmlListing($html, 'tr.pl-video', '.pl-video-title a'); $this->request = 'Playlist: '.str_replace(' - YouTube', '', $html->find('title', 0)->plaintext); @@ -155,7 +155,7 @@ public function collectData(array $param) { else if (isset($param['s'])) { /* search mode */ $this->request = $param['s']; $page = 1; if (isset($param['pa'])) $page = (int)preg_replace("/[^0-9]/",'', $param['pa']); - $url_listing = $this->getURI().'results?search_query='.urlencode($this->request).'&page='.$page.'&filters=video&search_sort=video_date_uploaded'; + $url_listing = $this->uri.'results?search_query='.urlencode($this->request).'&page='.$page.'&filters=video&search_sort=video_date_uploaded'; $html = $this->file_get_html($url_listing) or $this->returnError("Could not request YouTube. Tried:\n - $url_listing", 500); $this->ytBridgeParseHtmlListing($html, 'div.yt-lockup', 'h3'); $this->request = 'Search: '.str_replace(' - YouTube', '', $html->find('title', 0)->plaintext); @@ -170,10 +170,6 @@ public function getName(){ return (!empty($this->request) ? $this->request .' - ' : '') .'YouTube Bridge'; } - public function getURI(){ - return 'https://www.youtube.com/'; - } - public function getCacheDuration(){ return 10800; // 3 hours } diff --git a/bridges/ZatazBridge.php b/bridges/ZatazBridge.php index baf28286681..7a771dafb14 100644 --- a/bridges/ZatazBridge.php +++ b/bridges/ZatazBridge.php @@ -4,15 +4,15 @@ class ZatazBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = "aledeg"; - $this->name = "Zataz"; - $this->uri = "http://www.zataz.com/"; + $this->name = 'Zataz Magazine'; + $this->uri = 'http://www.zataz.com'; $this->description = "ZATAZ Magazine - S'informer, c'est déjà se sécuriser"; - $this->update = "07/02/2015"; + $this->update = "2016-08-09"; } public function collectData(array $param) { - $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request ' . $this->getURI(), 404); + $html = $this->file_get_html($this->uri) or $this->returnError('Could not request ' . $this->uri, 404); $recent_posts = $html->find('#recent-posts-3', 0)->find('ul', 0)->find('li'); foreach ($recent_posts as $article) { @@ -42,16 +42,8 @@ private function getTimestampFromDate($uri) { return $date->format('U'); } - public function getName() { - return 'Zataz Magazine'; - } - public function getCacheDuration() { return 7200; // 2h } - public function getURI() { - return 'http://www.zataz.com'; - } - }