diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md index 748ab3c..efe4286 100644 --- a/CREATE_BRIDGE.md +++ b/CREATE_BRIDGE.md @@ -9,8 +9,8 @@ Read the following chapters an make sure to read the [Guidelines](#guidelines)! A rss bridge must extend the `BridgeAbstract` class and implement the following functions : -* [`loadMetadatas`](#the-loadmetadatas-function) -* [`collectData`](#the-collectdata-function) +* [`loadMetadatas`](#the-loadmetadatas-function) (**required**) +* [`collectData`](#the-collectdata-function) (**required**) * [`getName`](#the-getname-function) * [`getURI`](#the-geturi-function) * [`getCacheDuration`](#the-getcacheduration-function) @@ -149,9 +149,11 @@ Parameter | ATOM | HTML | (M)RSS This function returns the name of the bridge as it will be displayed on the main page of rss-bridge or on top of the feed output (HTML, ATOM, etc...). +**Notice:** rss-bridge will by default return `$this->name` which is defined in the [`loadMetadatas`](#the-loadmetadatas-function) function, so you only have to implement this function if you require different behavior! + ```PHP public function getName(){ - return ''; // Insert your bridge name here! + return $this->name; } ``` @@ -159,9 +161,11 @@ This function returns the name of the bridge as it will be displayed on the main This function returns the URI to the destination site of the bridge. It will be used on the main page of rss-bridge when clicking your bridge name. +**Notice:** rss-bridge will by default return `$this->uri` which is defined in the [`loadMetadatas`](#the-loadmetadatas-function) function, so you only have to implement this function if you require different behavior! + ```PHP public function getURI(){ - return ''; // Insert your URI here! + return $this->uri; } ``` @@ -169,6 +173,8 @@ This function returns the URI to the destination site of the bridge. It will be This function returns the time in **seconds** during which rss-bridge will output cached values instead of re-generating a RSS feed. +**Notice:** rss-bridge will return `3600` seconds (1 hour) by default, so you only have to implement this function if you require different timing! + ```PHP public function getCacheDuration(){ return 3600; // 1 hour @@ -196,7 +202,7 @@ Check the [list of error codes](https://en.wikipedia.org/wiki/List_of_HTTP_statu ## The `file_get_html` function -This function is a wrapper around the simple_html_dom file_get_html function in order to provide context by design. It is considered good practice to use this function. +This function is a wrapper around the [simple_html_dom](http://simplehtmldom.sourceforge.net/) [file_get_html](http://simplehtmldom.sourceforge.net/manual_api.htm#api) function in order to provide context by design. It is considered good practice to use this function. ```PHP $html = $this->file_get_html('your URI'); @@ -214,15 +220,15 @@ $html = $this->file_get_html('your URI'); # Template -This is a template for a new bridge: +This is the minimum template for a new bridge: ```PHP maintainer = 'No maintainer'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'Unnamed bridge'; + $this->uri = ''; $this->description = 'No description provided'; $this->parameters = array(); } @@ -230,18 +236,6 @@ class MySiteBridge extends BridgeAbstract{ public function collectData(array $params){ // Implement your bridge here! } - - public function getName(){ - return ''; // Insert your bridge name here! - } - - public function getURI(){ - return ''; // Insert your URI here! - } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } ``` diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php index 591cca3..9ab3e9c 100644 --- a/bridges/ABCTabsBridge.php +++ b/bridges/ABCTabsBridge.php @@ -9,7 +9,7 @@ class ABCTabsBridge extends BridgeAbstract{ $this->name = "ABC Tabs Bridge"; $this->uri = "http://www.abc-tabs.com/"; $this->description = "Returns 22 newest tabs"; - $this->update = "2014-07-23"; + $this->update = "2016-08-06"; } @@ -41,8 +41,4 @@ class ABCTabsBridge extends BridgeAbstract{ return "http://www.abc-tabs.com/"; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/AllocineFRBridge.php b/bridges/AllocineFRBridge.php index 7270b97..c54edff 100644 --- a/bridges/AllocineFRBridge.php +++ b/bridges/AllocineFRBridge.php @@ -10,7 +10,7 @@ class AllocineFRBridge extends BridgeAbstract{ $this->name = "Allo Cine : Faux Raccord"; $this->uri = "http://www.allocine.fr/video/programme-12284/saison-24580/"; $this->description = "Allo Cine : Faux Raccord"; - $this->update = "07/11/2013"; + $this->update = "2016-08-06"; } @@ -50,8 +50,5 @@ class AllocineFRBridge extends BridgeAbstract{ public function getCacheDuration(){ return 25200; // 7 hours } - public function getDescription(){ - return "Allo Cine : " . $this->_NOM . " via rss-bridge"; - } } ?> diff --git a/bridges/AllocineT5Bridge.php b/bridges/AllocineT5Bridge.php index 4c13cdf..2dd1d81 100644 --- a/bridges/AllocineT5Bridge.php +++ b/bridges/AllocineT5Bridge.php @@ -10,7 +10,7 @@ class AllocineT5Bridge extends BridgeAbstract{ $this->name = "Allo Cine : Top 5"; $this->uri = "http://www.allocine.fr/video/programme-12299/saison-22542/"; $this->description = "Allo Cine : Top 5 via rss-bridge"; - $this->update = "07/11/2013"; + $this->update = "2016-08-06"; } @@ -50,8 +50,5 @@ class AllocineT5Bridge extends BridgeAbstract{ public function getCacheDuration(){ return 25200; // 7 hours } - public function getDescription(){ - return "Allo Cine : " . $this->_NOM . " via rss-bridge"; - } } ?> diff --git a/bridges/AllocineTueursEnSerieBridge.php b/bridges/AllocineTueursEnSerieBridge.php index 6a27e61..d4330ec 100644 --- a/bridges/AllocineTueursEnSerieBridge.php +++ b/bridges/AllocineTueursEnSerieBridge.php @@ -10,7 +10,7 @@ class AllocineTueursEnSerieBridge extends BridgeAbstract{ $this->name = "Allo Cine : Tueurs En Serie"; $this->uri = "http://www.allocine.fr/video/programme-12286/saison-22938/"; $this->description = "Allo Cine : Tueurs En Serie"; - $this->update = "12/11/2013"; + $this->update = "2016-08-06"; } @@ -50,8 +50,5 @@ class AllocineTueursEnSerieBridge extends BridgeAbstract{ public function getCacheDuration(){ return 25200; // 7 hours } - public function getDescription(){ - return "Allo Cine : " . $this->_NOM . " via rss-bridge"; - } } ?> diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php index ca87242..126ca82 100644 --- a/bridges/BlaguesDeMerdeBridge.php +++ b/bridges/BlaguesDeMerdeBridge.php @@ -7,7 +7,7 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{ $this->name = "Blagues De Merde"; $this->uri = "http://www.blaguesdemerde.fr/"; $this->description = "Blagues De Merde"; - $this->update = "16/10/2013"; + $this->update = "2016-08-06"; } @@ -43,8 +43,5 @@ class BlaguesDeMerdeBridge extends BridgeAbstract{ public function getCacheDuration(){ return 7200; // 2h hours } - public function getDescription(){ - return "Blagues De Merde via rss-bridge"; - } } ?> diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php index 90b338c..299bd10 100644 --- a/bridges/CADBridge.php +++ b/bridges/CADBridge.php @@ -5,10 +5,10 @@ class CADBridge extends BridgeAbstract{ $this->name = "CAD Bridge"; $this->uri = "http://www.cad-comic.com/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-02"; + $this->update = "2016-08-06"; } - function CADExtractContent($url) { + private function CADExtractContent($url) { $html3 = $this->file_get_html($url); // The request might fail due to missing https support or wrong URL diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php index ea0898a..5b0a8d5 100644 --- a/bridges/CNETBridge.php +++ b/bridges/CNETBridge.php @@ -9,7 +9,7 @@ class CNETBridge extends BridgeAbstract { $this->name = 'CNET News'; $this->uri = 'http://www.cnet.com/'; $this->description = 'Returns the newest articles.
You may specify a topic found in some section URLs, else all topics are selected.'; - $this->update = '2016-03-16'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -96,12 +96,7 @@ class CNETBridge extends BridgeAbstract { return 'CNET News Bridge'.(empty($this->topicName) ? '' : ' - '.$this->topicName); } - public function getURI() { - return 'http://www.cnet.com/'; - } - public function getCacheDuration() { return 1800; // 30 minutes - // return 0; } } diff --git a/bridges/CastorusBridge.php b/bridges/CastorusBridge.php index 55ff7b7..a6ac5f4 100644 --- a/bridges/CastorusBridge.php +++ b/bridges/CastorusBridge.php @@ -5,7 +5,7 @@ class CastorusBridge extends BridgeAbstract { $this->name = "Castorus Bridge"; $this->uri = $this->getURI(); $this->description = "Returns the latest changes"; - $this->update = "2016-08-05"; + $this->update = "2016-08-06"; $this->parameters["Get latest changes"] = '[]'; $this->parameters["Get latest changes via ZIP code"] = @@ -33,7 +33,7 @@ class CastorusBridge extends BridgeAbstract { } // Extracts the tile from an actitiy - function ExtractActivityTitle($activity){ + private function ExtractActivityTitle($activity){ $title = $activity->find('a', 0); if(!$title) @@ -43,7 +43,7 @@ class CastorusBridge extends BridgeAbstract { } // Extracts the url from an actitiy - function ExtractActivityUrl($activity){ + private function ExtractActivityUrl($activity){ $url = $activity->find('a', 0); if(!$url) @@ -53,7 +53,7 @@ class CastorusBridge extends BridgeAbstract { } // Extracts the time from an activity - function ExtractActivityTime($activity){ + private function ExtractActivityTime($activity){ // Unfortunately the time is part of the parent node, // so we have to clear all child nodes first $nodes = $activity->find('*'); @@ -69,7 +69,7 @@ class CastorusBridge extends BridgeAbstract { } // Extracts the price change - function ExtractActivityPrice($activity){ + private function ExtractActivityPrice($activity){ $price = $activity->find('span', 1); if(!$price) diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php index cf4b589..54cf526 100644 --- a/bridges/CommonDreamsBridge.php +++ b/bridges/CommonDreamsBridge.php @@ -6,10 +6,10 @@ class CommonDreamsBridge extends BridgeAbstract{ $this->name = "CommonDreams Bridge"; $this->uri = "http://www.commondreams.org/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-02"; + $this->update = "2016-08-06"; } - function CommonDreamsExtractContent($url) { + private function CommonDreamsExtractContent($url) { $html3 = $this->file_get_html($url); $text = $html3->find('div[class=field--type-text-with-summary]', 0)->innertext; $html3->clear(); @@ -47,8 +47,4 @@ class CommonDreamsBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.commondreams.org/'; } - - public function getCacheDuration(){ - return 3600; // 1 hours - } } diff --git a/bridges/CopieDoubleBridge.php b/bridges/CopieDoubleBridge.php index 2030979..d629976 100644 --- a/bridges/CopieDoubleBridge.php +++ b/bridges/CopieDoubleBridge.php @@ -7,7 +7,7 @@ class CopieDoubleBridge extends BridgeAbstract{ $this->name = "CopieDouble"; $this->uri = "http://www.copie-double.com/"; $this->description = "CopieDouble"; - $this->update = "12/12/2013"; + $this->update = "2016-08-06"; } @@ -50,13 +50,7 @@ class CopieDoubleBridge extends BridgeAbstract{ return 'http://www.copie-double.com'; } - public function getDescription(){ - return 'CopieDouble via rss-bridge'; - } - public function getCacheDuration(){ return 14400; // 4 hours } } - -?> diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php index 1f67cf3..93649e6 100644 --- a/bridges/CpasbienBridge.php +++ b/bridges/CpasbienBridge.php @@ -24,7 +24,7 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{ $this->name = "Cpasbien Bridge"; $this->uri = "http://www.cpasbien.io"; $this->description = "Returns latest torrents from a request query"; - $this->update = "2016-01-26"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -83,10 +83,6 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{ return (!empty($this->request) ? $this->request .' - ' : '') . $this->name; } - public function getURI(){ - return $this->uri; - } - public function getCacheDuration(){ return 60*60*24; // 24 hours } diff --git a/bridges/DauphineLibereBridge.php b/bridges/DauphineLibereBridge.php index d2fd1d1..24477a7 100644 --- a/bridges/DauphineLibereBridge.php +++ b/bridges/DauphineLibereBridge.php @@ -7,7 +7,7 @@ class DauphineLibereBridge extends BridgeAbstract { $this->name = "DauphineLibereBridge Bridge"; $this->uri = "http://www.ledauphine.com/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-02"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -81,7 +81,7 @@ class DauphineLibereBridge extends BridgeAbstract { ]'; } - function ExtractContent($url, $context) { + private function ExtractContent($url, $context) { $html2 = $this->file_get_html($url, false, $context); $text = $html2->find('div.column', 0)->innertext; $text = preg_replace('@]*?>.*?@si', '', $text); diff --git a/bridges/DeveloppezDotComBridge.php b/bridges/DeveloppezDotComBridge.php index 51dc013..66a9b2b 100644 --- a/bridges/DeveloppezDotComBridge.php +++ b/bridges/DeveloppezDotComBridge.php @@ -6,10 +6,10 @@ class DeveloppezDotComBridge extends BridgeAbstract{ $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-03"; + $this->update = "2016-08-06"; } - function DeveloppezDotComStripCDATA($string) { + private function DeveloppezDotComStripCDATA($string) { $string = str_replace('', '', $string); return $string; @@ -17,7 +17,7 @@ class DeveloppezDotComBridge extends BridgeAbstract{ // F***ing quotes from Microsoft Word badly encoded, here was the trick: // http://stackoverflow.com/questions/1262038/how-to-replace-microsoft-encoded-quotes-in-php - function convert_smart_quotes($string) + private function convert_smart_quotes($string) { $search = array(chr(145), chr(146), @@ -34,7 +34,7 @@ class DeveloppezDotComBridge extends BridgeAbstract{ return str_replace($search, $replace, $string); } - function DeveloppezDotComExtractContent($url) { + private function DeveloppezDotComExtractContent($url) { $articleHTMLContent = $this->file_get_html($url); $text = $this->convert_smart_quotes($articleHTMLContent->find('div.content', 0)->innertext); $text = utf8_encode($text); diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php index 3826028..e4f2c9c 100644 --- a/bridges/DilbertBridge.php +++ b/bridges/DilbertBridge.php @@ -4,10 +4,10 @@ class DilbertBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'kranack'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); - $this->description = $this->getDescription(); - $this->update = "14/05/2016"; + $this->name = 'Dilbert Daily Strip'; + $this->uri = 'http://dilbert.com'; + $this->description = 'The Unofficial Dilbert Daily Comic Strip'; + $this->update = "2016-08-06"; } @@ -38,18 +38,6 @@ class DilbertBridge extends BridgeAbstract { } } - public function getName() { - return 'Dilbert Daily Strip'; - } - - public function getURI() { - return 'http://dilbert.com'; - } - - public function getDescription() { - return 'The Unofficial Dilbert Daily Comic Strip'; - } - public function getCacheDuration() { return 21600; // 6 hours } diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php index 6266977..c171aee 100644 --- a/bridges/EZTVBridge.php +++ b/bridges/EZTVBridge.php @@ -7,7 +7,7 @@ class EZTVBridge extends BridgeAbstract{ $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 = "2014-01-20"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -80,8 +80,4 @@ class EZTVBridge extends BridgeAbstract{ public function getURI(){ return 'https://eztv.ch/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/ElsevierBridge.php b/bridges/ElsevierBridge.php index 4f4cd57..bd35925 100644 --- a/bridges/ElsevierBridge.php +++ b/bridges/ElsevierBridge.php @@ -6,7 +6,7 @@ class ElsevierBridge extends BridgeAbstract{ $this->name = 'Elsevier journals recent articles'; $this->uri = 'http://www.journals.elsevier.com'; $this->description = 'Returns the recent articles published in Elsevier journals'; - $this->update = '2016-08-02'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -21,7 +21,7 @@ class ElsevierBridge extends BridgeAbstract{ } // Extracts the list of names from an article as string - function ExtractArticleName ($article){ + private function ExtractArticleName ($article){ $names = $article->find('small', 0); if($names) return trim($names->plaintext); @@ -29,7 +29,7 @@ class ElsevierBridge extends BridgeAbstract{ } // Extracts the timestamp from an article - function ExtractArticleTimestamp ($article){ + private function ExtractArticleTimestamp ($article){ $time = $article->find('.article-info', 0); if($time){ $timestring = trim($time->plaintext); @@ -53,7 +53,7 @@ class ElsevierBridge extends BridgeAbstract{ } // Extracts the content from an article - function ExtractArticleContent ($article){ + private function ExtractArticleContent ($article){ $content = $article->find('.article-content', 0); if($content){ return trim($content->plaintext); diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php index 7d3e652..5e5d8b4 100644 --- a/bridges/EstCeQuonMetEnProdBridge.php +++ b/bridges/EstCeQuonMetEnProdBridge.php @@ -3,10 +3,10 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); - $this->description = $this->getDescription(); - $this->update = "02/07/2016"; + $this->name = 'Est-ce qu\'on met en prod aujourd\'hui ?'; + $this->uri = 'https://www.estcequonmetenprodaujourdhui.info/'; + $this->description = 'Should we put a website in production today? (French)'; + $this->update = "2016-08-06"; } public function collectData(array $param) { @@ -37,18 +37,6 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract { $this->items[] = $item; } - public function getName() { - return 'Est-ce qu\'on met en prod aujourd\'hui ?'; - } - - public function getURI() { - return 'https://www.estcequonmetenprodaujourdhui.info/'; - } - - public function getDescription() { - return 'Should we put a website in production today? (French)'; - } - public function getCacheDuration() { return 21600; // 6 hours } diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php index 103494f..f1c9406 100644 --- a/bridges/FacebookBridge.php +++ b/bridges/FacebookBridge.php @@ -7,7 +7,7 @@ class FacebookBridge extends BridgeAbstract{ $this->name = "Facebook"; $this->uri = "http://www.facebook.com/"; $this->description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117"; - $this->update = "31/03/2016"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -226,10 +226,6 @@ class FacebookBridge extends BridgeAbstract{ return (isset($this->name) ? $this->name.' - ' : '').'Facebook Bridge'; } - public function getURI() { - return 'http://facebook.com'; - } - public function getCacheDuration() { return 300; // 5 minutes } diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php index bc16d43..a66dd82 100644 --- a/bridges/FootitoBridge.php +++ b/bridges/FootitoBridge.php @@ -7,7 +7,7 @@ class FootitoBridge extends BridgeAbstract{ $this->name = "Footito"; $this->uri = "http://www.footito.fr/"; $this->description = "Footito"; - $this->update = "21/11/2013"; + $this->update = "2016-08-06"; } @@ -49,12 +49,4 @@ class FootitoBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.footito.fr/'; } - - public function getCacheDuration(){ - return 3600; // 1h hours - } - public function getDescription(){ - return "Footito via rss-bridge"; - } } -?> diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php index f8d0398..f22c610 100644 --- a/bridges/FuturaSciencesBridge.php +++ b/bridges/FuturaSciencesBridge.php @@ -4,10 +4,10 @@ class FuturaSciencesBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'Futura-Sciences Bridge'; + $this->uri = 'http://www.futura-sciences.com/'; $this->description = 'Returns the newest articles.'; - $this->update = '2016-08-03'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -218,16 +218,4 @@ class FuturaSciencesBridge extends BridgeAbstract { } } - - public function getName() { - return 'Futura-Sciences Bridge'; - } - - public function getURI() { - return 'http://www.futura-sciences.com/'; - } - - public function getCacheDuration() { - return 3600; - } } diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php index 69c5d09..75217b0 100644 --- a/bridges/GBAtempBridge.php +++ b/bridges/GBAtempBridge.php @@ -9,7 +9,7 @@ class GBAtempBridge extends BridgeAbstract { $this->name = 'GBAtemp'; $this->uri = $this->getURI(); $this->description = 'GBAtemp is a user friendly underground video game community.'; - $this->update = '2016-08-02'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -40,7 +40,7 @@ class GBAtempBridge extends BridgeAbstract { ]'; } - function ExtractFromDelimiters($string, $start, $end) { + private function ExtractFromDelimiters($string, $start, $end) { if (strpos($string, $start) !== false) { $section_retrieved = substr($string, strpos($string, $start) + strlen($start)); $section_retrieved = substr($section_retrieved, 0, strpos($section_retrieved, $end)); @@ -48,7 +48,7 @@ class GBAtempBridge extends BridgeAbstract { } return false; } - function StripWithDelimiters($string, $start, $end) { + private function StripWithDelimiters($string, $start, $end) { while (strpos($string, $start) !== false) { $section_to_remove = substr($string, strpos($string, $start)); $section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end)); @@ -56,7 +56,7 @@ class GBAtempBridge extends BridgeAbstract { } return $string; } - function build_item($uri, $title, $author, $timestamp, $thumnail, $content) { + private function build_item($uri, $title, $author, $timestamp, $thumnail, $content) { $item = new \Item(); $item->uri = $uri; $item->title = $title; @@ -67,14 +67,14 @@ class GBAtempBridge extends BridgeAbstract { return $item; } - function cleanup_post_content($content, $site_url) { + private function cleanup_post_content($content, $site_url) { $content = str_replace(':arrow:', '➤', $content); $content = str_replace('href="attachments/', 'href="'.$site_url.'attachments/', $content); $content = $this->StripWithDelimiters($content, ''); return $content; } - function fetch_post_content($uri, $site_url) { + private function fetch_post_content($uri, $site_url) { $html = $this->file_get_html($uri) or $this->returnError('Could not request GBAtemp: '.$uri, 500); $content = $html->find('div.messageContent', 0)->innertext; return $this->cleanup_post_content($content, $site_url); diff --git a/bridges/GiphyBridge.php b/bridges/GiphyBridge.php index 8f29bad..acc01d2 100644 --- a/bridges/GiphyBridge.php +++ b/bridges/GiphyBridge.php @@ -9,7 +9,7 @@ class GiphyBridge extends BridgeAbstract{ $this->name = "Giphy Bridge"; $this->uri = "http://giphy.com/"; $this->description = "Bridge for giphy.com"; - $this->update = "2014-12-05"; + $this->update = "2016-08-06"; $this->parameters["By tag"] = '[ @@ -92,8 +92,4 @@ class GiphyBridge extends BridgeAbstract{ public function getCacheDuration(){ return 300; // 5 minutes } - - public function getUsername(){ - return $this->items[0]->username; - } } diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php index df04d63..030c74b 100644 --- a/bridges/GitlabCommitsBridge.php +++ b/bridges/GitlabCommitsBridge.php @@ -12,7 +12,7 @@ class GitlabCommitsBridge extends BridgeAbstract{ $this->name = 'Gitlab Commits'; $this->uri = ''; $this->description = 'Returns the commits of a project hosted on a gitlab instance'; - $this->update = '2016-06-19'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -87,8 +87,4 @@ class GitlabCommitsBridge extends BridgeAbstract{ public function getURI(){ return ''; } - - public function getCacheDuration(){ - return 3600; // one hour - } } diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php index fcc91c4..57252a0 100644 --- a/bridges/GuruMedBridge.php +++ b/bridges/GuruMedBridge.php @@ -6,10 +6,10 @@ class GuruMedBridge extends BridgeAbstract{ $this->name = "GuruMed"; $this->uri = "http://www.gurumed.org"; $this->description = "Returns the 5 newest posts from Gurumed (full text)"; - $this->update = "2016-08-03"; + $this->update = "2016-08-06"; } - function GurumedStripCDATA($string) { + private function GurumedStripCDATA($string) { $string = str_replace('', '', $string); return $string; @@ -39,8 +39,4 @@ class GuruMedBridge extends BridgeAbstract{ public function getURI(){ return 'http://gurumed.org/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/HentaiHavenBridge.php b/bridges/HentaiHavenBridge.php index a1e938e..c5ef263 100644 --- a/bridges/HentaiHavenBridge.php +++ b/bridges/HentaiHavenBridge.php @@ -7,7 +7,7 @@ class HentaiHavenBridge extends BridgeAbstract{ $this->name = "Hentai Haven"; $this->uri = "http://hentaihaven.org/"; $this->description = "Returns releases from Hentai Haven"; - $this->update = "2015-01-16"; + $this->update = "2016-08-06"; } @@ -29,9 +29,6 @@ class HentaiHavenBridge extends BridgeAbstract{ public function getURI(){ return ''; } - public function getDescription(){ - return "Hentai Haven | Everything Else is Irrelevant"; - } public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php index b39b7e0..104022b 100644 --- a/bridges/InstagramBridge.php +++ b/bridges/InstagramBridge.php @@ -9,7 +9,7 @@ class InstagramBridge extends BridgeAbstract{ $this->name = "Instagram Bridge"; $this->uri = "http://instagram.com/"; $this->description = "Returns the newest images"; - $this->update = "2014-05-25"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -81,8 +81,4 @@ class InstagramBridge extends BridgeAbstract{ public function getURI(){ return 'http://instagram.com/'; } - - public function getCacheDuration(){ - return 3600; - } } diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php index d605af0..830d75f 100644 --- a/bridges/KoreusBridge.php +++ b/bridges/KoreusBridge.php @@ -6,16 +6,16 @@ class KoreusBridge extends BridgeAbstract{ $this->name = "Koreus"; $this->uri = "http://www.koreus.com/"; $this->description = "Returns the 5 newest posts from Koreus (full text)"; - $this->update = "2016-08-03"; + $this->update = "2016-08-06"; } - function KoreusStripCDATA($string) { + private function KoreusStripCDATA($string) { $string = str_replace('', '', $string); return $string; } - function KoreusExtractContent($url) { + private function KoreusExtractContent($url) { $html2 = $this->file_get_html($url); $text = $html2->find('p[class=itemText]', 0)->innertext; $text = utf8_encode(preg_replace('/(Sur le m.+?)+$/i','',$text)); @@ -46,8 +46,4 @@ class KoreusBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.koreus.com/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php index 14ca16f..e6d0427 100755 --- a/bridges/LeBonCoinBridge.php +++ b/bridges/LeBonCoinBridge.php @@ -7,7 +7,7 @@ class LeBonCoinBridge extends BridgeAbstract{ $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-05-02"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -283,8 +283,4 @@ class LeBonCoinBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.leboncoin.fr'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } \ No newline at end of file diff --git a/bridges/LeJournalDuGeekBridge.php b/bridges/LeJournalDuGeekBridge.php index 69f940a..0b6407b 100644 --- a/bridges/LeJournalDuGeekBridge.php +++ b/bridges/LeJournalDuGeekBridge.php @@ -6,16 +6,16 @@ class LeJournalDuGeekBridge extends BridgeAbstract{ $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-03"; + $this->update = "2016-08-06"; } - function LeJournalDuGeekStripCDATA($string) { + private function LeJournalDuGeekStripCDATA($string) { $string = str_replace('', '', $string); return $string; } - function LeJournalDuGeekExtractContent($url) { + private function LeJournalDuGeekExtractContent($url) { $articleHTMLContent = $this->file_get_html($url); $text = $articleHTMLContent->find('div.post-content', 0)->innertext; diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php index ddacb93..ab759dd 100644 --- a/bridges/LesJoiesDuCodeBridge.php +++ b/bridges/LesJoiesDuCodeBridge.php @@ -7,7 +7,7 @@ class LesJoiesDuCodeBridge extends BridgeAbstract{ $this->name = "Les Joies Du Code"; $this->uri = "http://lesjoiesducode.fr/"; $this->description = "LesJoiesDuCode"; - $this->update = "04/02/2015"; + $this->update = "2016-08-06"; } @@ -59,8 +59,4 @@ class LesJoiesDuCodeBridge extends BridgeAbstract{ public function getCacheDuration(){ return 7200; // 2h hours } - public function getDescription(){ - return "Les Joies Du Code via rss-bridge"; - } } -?> diff --git a/bridges/LichessBridge.php b/bridges/LichessBridge.php index 88aab12..8b49867 100644 --- a/bridges/LichessBridge.php +++ b/bridges/LichessBridge.php @@ -5,10 +5,10 @@ class LichessBridge extends BridgeAbstract public function loadMetadatas() { $this->maintainer = 'AmauryCarrade'; - $this->name = $this->getName() . ' Bridge'; - $this->uri = $this->getURI(); + $this->name = 'Lichess Blog'; + $this->uri = 'http://lichess.org/blog'; $this->description = 'Returns the 5 newest posts from the Lichess blog (full text)'; - $this->update = "2016-03-22"; + $this->update = "2016-08-06"; } public function collectData(array $param) @@ -48,14 +48,4 @@ class LichessBridge extends BridgeAbstract return $content; } - - public function getName() - { - return 'Lichess Blog'; - } - - public function getURI() - { - return 'http://lichess.org/blog'; - } } diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php index 4b0e0ef..4b833c9 100644 --- a/bridges/MsnMondeBridge.php +++ b/bridges/MsnMondeBridge.php @@ -6,10 +6,10 @@ class MsnMondeBridge extends BridgeAbstract{ $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-03"; + $this->update = "2016-08-06"; } - function MsnMondeExtractContent($url, &$item) { + private function MsnMondeExtractContent($url, &$item) { $html2 = $this->file_get_html($url); $item->content = $html2->find('#content', 0)->find('article', 0)->find('section', 0)->plaintext; $item->timestamp = strtotime($html2->find('.authorinfo-txt', 0)->find('time', 0)->datetime); @@ -37,8 +37,4 @@ class MsnMondeBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.msn.com/fr-fr/actualite/monde'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php index b785764..fc3d73a 100644 --- a/bridges/NakedSecurityBridge.php +++ b/bridges/NakedSecurityBridge.php @@ -3,10 +3,10 @@ class NakedSecurityBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'Naked Security'; + $this->uri = 'https://nakedsecurity.sophos.com/'; $this->description = 'Returns the newest articles.'; - $this->update = '2016-04-30'; + $this->update = '2016-08-06'; } public function collectData(array $param) { @@ -69,16 +69,4 @@ class NakedSecurityBridge extends BridgeAbstract { } } } - - public function getName() { - return 'Naked Security'; - } - - public function getURI() { - return 'https://nakedsecurity.sophos.com/'; - } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php index 07b85a9..5ee207a 100644 --- a/bridges/NeuviemeArtBridge.php +++ b/bridges/NeuviemeArtBridge.php @@ -6,7 +6,7 @@ class NeuviemeArtBridge extends BridgeAbstract { $this->name = "9ème Art"; $this->uri = "http://www.9emeart.fr/"; $this->description = "Returns the newest articles."; - $this->update = "2016-02-05"; + $this->update = "2016-08-06"; } public function collectData(array $param) { @@ -63,8 +63,4 @@ class NeuviemeArtBridge extends BridgeAbstract { public function getURI() { return 'http://www.9emeart.fr/'; } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php index e4597e5..ee89ab1 100644 --- a/bridges/NextInpactBridge.php +++ b/bridges/NextInpactBridge.php @@ -6,16 +6,16 @@ class NextInpactBridge extends BridgeAbstract { $this->name = "NextInpact Bridge"; $this->uri = "http://www.nextinpact.com/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-03"; + $this->update = "2016-08-06"; } - function StripCDATA($string) { + private function StripCDATA($string) { $string = str_replace('', '', $string); return $string; } - function ExtractContent($url) { + private function ExtractContent($url) { $html2 = $this->file_get_html($url); $text = '

'.$html2->find('span.sub_title', 0)->innertext.'

' .'

-

' @@ -52,8 +52,4 @@ class NextInpactBridge extends BridgeAbstract { public function getURI() { return 'http://www.nextinpact.com/'; } - - public function getCacheDuration() { - return 3600; // 1 hour - } } diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php index eac7aa1..35ca1fc 100644 --- a/bridges/NextgovBridge.php +++ b/bridges/NextgovBridge.php @@ -4,10 +4,10 @@ class NextgovBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'Nextgov Bridge'; + $this->uri = 'https://www.nextgov.com/'; $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.'; - $this->update = '2016-07-20'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -95,16 +95,4 @@ class NextgovBridge extends BridgeAbstract { } } - - public function getName() { - return 'Nextgov Bridge'; - } - - public function getURI() { - return 'https://www.nextgov.com/'; - } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php index 407b92b..aa41822 100644 --- a/bridges/NiceMatinBridge.php +++ b/bridges/NiceMatinBridge.php @@ -6,10 +6,10 @@ class NiceMatinBridge extends BridgeAbstract{ $this->name = "NiceMatin"; $this->uri = "http://www.nicematin.com/"; $this->description = "Returns the 10 newest posts from NiceMatin (full text)"; - $this->update = "2016-08-03"; + $this->update = "2016-08-06"; } - function NiceMatinExtractContent($url) { + private function NiceMatinExtractContent($url) { $html = $this->file_get_html($url); if(!$html) $this->returnError('Could not acquire content from url: ' . $url . '!', 404); @@ -53,8 +53,4 @@ class NiceMatinBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.nicematin.com/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/NovelUpdatesBridge.php b/bridges/NovelUpdatesBridge.php index b597755..ff5cd88 100644 --- a/bridges/NovelUpdatesBridge.php +++ b/bridges/NovelUpdatesBridge.php @@ -7,7 +7,7 @@ class NovelUpdatesBridge extends BridgeAbstract{ $this->name = "Novel Updates"; $this->uri = "http://www.novelupdates.com/"; $this->description = "Returns releases from Novel Updates"; - $this->update = "2016-05-21"; + $this->update = "2016-08-06"; $this->parameters[] = '[ { @@ -50,9 +50,6 @@ class NovelUpdatesBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.novelupdates.com/'; } - public function getDescription(){ - return "Novel Updates - Directory of Translated Novels"; - } public function getCacheDuration(){ return 21600; // 6 hours } diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php index 7b05511..1a353b1 100644 --- a/bridges/PinterestBridge.php +++ b/bridges/PinterestBridge.php @@ -9,9 +9,9 @@ class PinterestBridge extends BridgeAbstract{ $this->maintainer = "pauder"; $this->name = "Pinterest Bridge"; - $this->uri = "http://www.pinterest.com/"; + $this->uri = "http://www.pinterest.com"; $this->description = "Returns the newest images on a board"; - $this->update = "2014-05-25"; + $this->update = "2016-08-06"; $this->parameters["By username and board"] = '[ @@ -110,12 +110,4 @@ class PinterestBridge extends BridgeAbstract{ return $this->username .' - '. $this->board.' - Pinterest'; } } - - public function getURI(){ - return 'http://www.pinterest.com'; - } - - public function getCacheDuration(){ - return 3600; - } } diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php index 80a703b..cbfa023 100644 --- a/bridges/PlanetLibreBridge.php +++ b/bridges/PlanetLibreBridge.php @@ -6,10 +6,10 @@ class PlanetLibreBridge extends BridgeAbstract{ $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-04"; + $this->update = "2016-08-06"; } - function PlanetLibreExtractContent($url){ + private function PlanetLibreExtractContent($url){ $html2 = $this->file_get_html($url); $text = $html2->find('div[class="post-text"]', 0)->innertext; return $text; diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php index 1f5d021..702f13d 100644 --- a/bridges/ReporterreBridge.php +++ b/bridges/ReporterreBridge.php @@ -6,10 +6,10 @@ class ReporterreBridge extends BridgeAbstract{ $this->name = "Reporterre Bridge"; $this->uri = "http://www.reporterre.net/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-04"; + $this->update = "2016-08-06"; } - function ExtractContentReporterre($url) { + private function ExtractContentReporterre($url) { $html2 = $this->file_get_html($url); foreach($html2->find('div[style=text-align:justify]') as $e) { @@ -50,8 +50,4 @@ class ReporterreBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.reporterre.net/'; } - - public function getCacheDuration(){ - return 3600; // 1 hours - } } diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php index 92bd9e9..2a2b8f1 100644 --- a/bridges/Rue89Bridge.php +++ b/bridges/Rue89Bridge.php @@ -7,7 +7,7 @@ class Rue89Bridge extends BridgeAbstract{ $this->name = "Rue89"; $this->uri = "http://rue89.nouvelobs.com/"; $this->description = "Returns the 5 newest posts from Rue89 (full text)"; - $this->update = "2015-01-30"; + $this->update = "2016-08-06"; } @@ -50,7 +50,4 @@ class Rue89Bridge extends BridgeAbstract{ public function getURI(){ return 'http://rue89.nouvelobs.com/'; } - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php index cfd9e1c..f471602 100644 --- a/bridges/SensCritiqueBridge.php +++ b/bridges/SensCritiqueBridge.php @@ -8,7 +8,7 @@ class SensCritiqueBridge extends BridgeAbstract { $this->name = "Sens Critique"; $this->uri = "http://www.senscritique.com"; $this->description = "Sens Critique news"; - $this->update = "2016-07-29"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -63,7 +63,7 @@ class SensCritiqueBridge extends BridgeAbstract { } } - public function collectMoviesData() { + private function collectMoviesData() { $html = ''; $html = $this->file_get_html('http://www.senscritique.com/films/cette-semaine') or $this->returnError('No results for this query.', 404); $list = $html->find('ul.elpr-list', 0); @@ -71,7 +71,7 @@ class SensCritiqueBridge extends BridgeAbstract { $this->extractDataFromList($list); } - public function collectSeriesData() { + private function collectSeriesData() { $html = ''; $html = $this->file_get_html('http://www.senscritique.com/series/actualite') or $this->returnError('No results for this query.', 404); $list = $html->find('ul.elpr-list', 0); @@ -79,7 +79,7 @@ class SensCritiqueBridge extends BridgeAbstract { $this->extractDataFromList($list); } - public function collectGamesData() { + private function collectGamesData() { $html = ''; $html = $this->file_get_html('http://www.senscritique.com/jeuxvideo/actualite') or $this->returnError('No results for this query.', 404); $list = $html->find('ul.elpr-list', 0); @@ -87,7 +87,7 @@ class SensCritiqueBridge extends BridgeAbstract { $this->extractDataFromList($list); } - public function collectBooksData() { + private function collectBooksData() { $html = ''; $html = $this->file_get_html('http://www.senscritique.com/livres/actualite') or $this->returnError('No results for this query.', 404); $list = $html->find('ul.elpr-list', 0); @@ -95,7 +95,7 @@ class SensCritiqueBridge extends BridgeAbstract { $this->extractDataFromList($list); } - public function collectBDsData() { + private function collectBDsData() { $html = ''; $html = $this->file_get_html('http://www.senscritique.com/bd/actualite') or $this->returnError('No results for this query.', 404); $list = $html->find('ul.elpr-list', 0); @@ -103,7 +103,7 @@ class SensCritiqueBridge extends BridgeAbstract { $this->extractDataFromList($list); } - public function collectMusicsData() { + private function collectMusicsData() { $html = ''; $html = $this->file_get_html('http://www.senscritique.com/musique/actualite') or $this->returnError('No results for this query.', 404); $list = $html->find('ul.elpr-list', 0); @@ -111,7 +111,7 @@ class SensCritiqueBridge extends BridgeAbstract { $this->extractDataFromList($list); } - public function extractDataFromList($list) { + private function extractDataFromList($list) { if ($list === null) { $this->returnError('Cannot extract data from list', 400); } @@ -131,10 +131,6 @@ class SensCritiqueBridge extends BridgeAbstract { } } - public function getName() { - return $this->name; - } - public function getURI() { return (trim($this->uri) === "") ? "http://www.senscritique.com" : $this->uri; } diff --git a/bridges/Sexactu.php b/bridges/Sexactu.php index 92f4d9f..cfa97a7 100644 --- a/bridges/Sexactu.php +++ b/bridges/Sexactu.php @@ -8,7 +8,7 @@ class Sexactu extends BridgeAbstract{ $this->name = "Sexactu"; $this->uri = "http://www.gqmagazine.fr"; $this->description = "Sexactu via rss-bridge"; - $this->update = "04/02/2014"; + $this->update = "2016-08-06"; } @@ -69,11 +69,8 @@ $replace = array('January', 'February', 'March', 'April', 'May', 'June', 'July', public function getCacheDuration(){ return 7200; // 2h hours } - public function getDescription(){ - return "Sexactu via rss-bridge"; - } - public function correctCase($str) { + private function correctCase($str) { $sentences=explode('.', mb_strtolower($str, "UTF-8")); $str=""; $sep=""; diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php index 64c33b6..7d340ce 100644 --- a/bridges/ShanaprojectBridge.php +++ b/bridges/ShanaprojectBridge.php @@ -2,14 +2,14 @@ class ShanaprojectBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'logmanoriginal'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'Shanaproject Bridge'; + $this->uri = 'http://www.shanaproject.com'; $this->description = 'Returns a list of anime from the current Season Anime List'; - $this->update = '2016-08-04'; + $this->update = '2016-08-06'; } // Returns an html object for the Season Anime List (latest season) - function LoadSeasonAnimeList(){ + private function LoadSeasonAnimeList(){ // First we need to find the URI to the latest season from the 'seasons' page searching for 'Season Anime List' $html = $this->file_get_html($this->getURI() . '/seasons'); if(!$html) @@ -27,7 +27,7 @@ class ShanaprojectBridge extends BridgeAbstract { } // Extracts the anime title - function ExtractAnimeTitle($anime){ + private function ExtractAnimeTitle($anime){ $title = $anime->find('a', 0); if(!$title) $this->returnError('Could not find anime title!', 404); @@ -35,7 +35,7 @@ class ShanaprojectBridge extends BridgeAbstract { } // Extracts the anime URI - function ExtractAnimeURI($anime){ + private function ExtractAnimeURI($anime){ $uri = $anime->find('a', 0); if(!$uri) $this->returnError('Could not find anime URI!', 404); @@ -43,7 +43,7 @@ class ShanaprojectBridge extends BridgeAbstract { } // Extracts the anime release date (timestamp) - function ExtractAnimeTimestamp($anime){ + private function ExtractAnimeTimestamp($anime){ $timestamp = $anime->find('span.header_info_block', 1); if(!$timestamp) $this->returnError('Could not find anime timestamp!', 404); @@ -51,7 +51,7 @@ class ShanaprojectBridge extends BridgeAbstract { } // Extracts the anime studio name (author) - function ExtractAnimeAuthor($anime){ + private function ExtractAnimeAuthor($anime){ $author = $anime->find('span.header_info_block', 2); if(!$author) return; // Sometimes the studio is unknown, so leave empty @@ -59,7 +59,7 @@ class ShanaprojectBridge extends BridgeAbstract { } // Extracts the episode information (x of y released) - function ExtractAnimeEpisodeInformation($anime){ + private function ExtractAnimeEpisodeInformation($anime){ $episode = $anime->find('div.header_info_episode', 0); if(!$episode) $this->returnError('Could not find anime episode information!', 404); @@ -67,7 +67,7 @@ class ShanaprojectBridge extends BridgeAbstract { } // Extracts the background image - function ExtractAnimeBackgroundImage($anime){ + private function ExtractAnimeBackgroundImage($anime){ // Getting the picture is a little bit tricky as it is part of the style. // Luckily the style is part of the parent div :) @@ -78,12 +78,12 @@ class ShanaprojectBridge extends BridgeAbstract { } // Builds an URI to search for a specific anime (subber is left empty) - function BuildAnimeSearchURI($anime){ + private function BuildAnimeSearchURI($anime){ return $this->getURI() . '/search/?title=' . urlencode($this->ExtractAnimeTitle($anime)) . '&subber='; } // Builds the content string for a given anime - function BuildAnimeContent($anime){ + private function BuildAnimeContent($anime){ // We'll use a template string to place our contents return ' ' . htmlspecialchars($this->ExtractAnimeTitle($anime)) . ' @@ -109,16 +109,4 @@ class ShanaprojectBridge extends BridgeAbstract { $this->items[] = $item; } } - - public function getName(){ - return 'Shanaproject Bridge'; - } - - public function getURI(){ - return 'http://www.shanaproject.com'; - } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/SoundcloudBridge.php b/bridges/SoundcloudBridge.php index 43e1736..ebc3f8e 100644 --- a/bridges/SoundcloudBridge.php +++ b/bridges/SoundcloudBridge.php @@ -10,7 +10,7 @@ class SoundCloudBridge extends BridgeAbstract{ $this->name = "Soundcloud Bridge"; $this->uri = "http://www.soundcloud.com/"; $this->description = "Returns 10 newest music from user profile"; - $this->update = "2015-09-08"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -53,10 +53,6 @@ class SoundCloudBridge extends BridgeAbstract{ return (!empty($this->name) ? $this->name .' - ' : '') . (!empty($this->request) ? $this->request : ''); } - public function getURI(){ - return 'https://www.soundcloud.com/'; - } - public function getCacheDuration(){ return 600; // 10 minutes } diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php index 9d9ff24..76d7f4a 100644 --- a/bridges/T411Bridge.php +++ b/bridges/T411Bridge.php @@ -7,7 +7,7 @@ class T411Bridge extends BridgeAbstract { $this->name = 'T411'; $this->uri = $this->getURI(); $this->description = 'Returns the 10 newest torrents with specified search terms
Use url part after "?" mark when using their search engine.'; - $this->update = '2016-06-25'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -102,10 +102,5 @@ class T411Bridge extends BridgeAbstract { public function getURI() { return 'https://t411.ch/'; } - - public function getCacheDuration() { - return 3600; // 1 hour - } - } diff --git a/bridges/TheCodingLoveBridge.php b/bridges/TheCodingLoveBridge.php index e9eef5b..b23c6ee 100644 --- a/bridges/TheCodingLoveBridge.php +++ b/bridges/TheCodingLoveBridge.php @@ -7,7 +7,7 @@ class TheCodingLoveBridge extends BridgeAbstract{ $this->name = "The Coding Love"; $this->uri = "http://thecodinglove.com/"; $this->description = "The Coding Love"; - $this->update = "04/02/2015"; + $this->update = "2016-08-06"; } @@ -60,8 +60,4 @@ class TheCodingLoveBridge extends BridgeAbstract{ public function getCacheDuration(){ return 7200; // 2h hours } - public function getDescription(){ - return "The Coding Love via rss-bridge"; - } } -?> diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php index 4081b93..2fb6a1a 100644 --- a/bridges/TheHackerNewsBridge.php +++ b/bridges/TheHackerNewsBridge.php @@ -4,10 +4,10 @@ class TheHackerNewsBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'The Hacker News Bridge'; + $this->uri = 'https://thehackernews.com/'; $this->description = 'Cyber Security, Hacking, Technology News.'; - $this->update = '2016-07-22'; + $this->update = '2016-08-06'; } @@ -75,16 +75,4 @@ class TheHackerNewsBridge extends BridgeAbstract { } } - - public function getName() { - return 'The Hacker News Bridge'; - } - - public function getURI() { - return 'https://thehackernews.com/'; - } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php index 6f6d318..c8b8b68 100644 --- a/bridges/ThePirateBayBridge.php +++ b/bridges/ThePirateBayBridge.php @@ -7,7 +7,7 @@ class ThePirateBayBridge extends BridgeAbstract{ $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 = "2015-01-09"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -88,8 +88,4 @@ class ThePirateBayBridge extends BridgeAbstract{ public function getURI(){ return 'https://thepiratebay.org/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/TwitterBridgeTweaked.php b/bridges/TwitterBridgeTweaked.php index e817ced..4f55fb9 100644 --- a/bridges/TwitterBridgeTweaked.php +++ b/bridges/TwitterBridgeTweaked.php @@ -7,7 +7,7 @@ class TwitterBridgeTweaked extends BridgeAbstract{ $this->name = "Twitter Bridge Tweaked"; $this->uri = "https://twitter.com/"; $this->description = "(same as Twitter Bridge Extended, but with cleaned title & content)"; - $this->update = "2014-12-05"; + $this->update = "2016-08-06"; $this->parameters["By keyword or hashtag"] = '[ @@ -158,8 +158,4 @@ class TwitterBridgeTweaked extends BridgeAbstract{ public function getCacheDuration(){ return 300; // 5 minutes } - - public function getUsername(){ - return $this->items[0]->username; - } } diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php index abaf423..7f5b4ff 100644 --- a/bridges/VkBridge.php +++ b/bridges/VkBridge.php @@ -9,7 +9,7 @@ class VkBridge extends BridgeAbstract { $this->name = "VK.com"; $this->uri = "http://www.vk.com/"; $this->description = "Working with open pages"; - $this->update = "21/02/2016"; + $this->update = "2016-08-06"; $this->parameters["Url on page group or user"] = '[ { "name" : "Url", @@ -53,10 +53,6 @@ class VkBridge extends BridgeAbstract { return(isset($this->name) ? $this->name . ' - ' : '') . 'VK Bridge'; } - public function getURI() { - return 'http://vk.com'; - } - public function getCacheDuration() { return 300; // 5 minutes } diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php index cdb04bd..4fd23ea 100644 --- a/bridges/WeLiveSecurityBridge.php +++ b/bridges/WeLiveSecurityBridge.php @@ -3,10 +3,10 @@ class WeLiveSecurityBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'We Live Security'; + $this->uri = 'http://www.welivesecurity.com/'; $this->description = 'Returns the newest articles.'; - $this->update = '2016-07-19'; + $this->update = '2016-08-06'; } public function collectData(array $param) { @@ -60,16 +60,4 @@ class WeLiveSecurityBridge extends BridgeAbstract { } } } - - public function getName() { - return 'We Live Security'; - } - - public function getURI() { - return 'http://www.welivesecurity.com/'; - } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php index 2b9e1dd..25ab15f 100644 --- a/bridges/WhydBridge.php +++ b/bridges/WhydBridge.php @@ -10,7 +10,7 @@ class WhydBridge extends BridgeAbstract{ $this->name = "Whyd Bridge"; $this->uri = "http://www.whyd.com/"; $this->description = "Returns 10 newest music from user profile"; - $this->update = "2014-07-18"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -60,10 +60,6 @@ class WhydBridge extends BridgeAbstract{ return (!empty($this->name) ? $this->name .' - ' : '') .'Whyd Bridge'; } - public function getURI(){ - return 'http://www.whyd.com/'; - } - public function getCacheDuration(){ return 600; // 10 minutes } diff --git a/bridges/WordPressBridge.php b/bridges/WordPressBridge.php index 35ef3bf..69db325 100644 --- a/bridges/WordPressBridge.php +++ b/bridges/WordPressBridge.php @@ -12,7 +12,7 @@ class WordPressBridge extends BridgeAbstract { $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-04"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -25,7 +25,7 @@ class WordPressBridge extends BridgeAbstract { } // Returns the content type for a given html dom - function DetectContentType($html){ + private function DetectContentType($html){ if($html->find('entry')) return WORDPRESS_TYPE_ATOM; if($html->find('item')) @@ -34,7 +34,7 @@ class WordPressBridge extends BridgeAbstract { } // Replaces all 'link' tags with 'url' for simplehtmldom to actually find 'links' ('url') - function ReplaceLinkTagsWithUrlTags($element){ + private function ReplaceLinkTagsWithUrlTags($element){ // We need to fix the 'link' tag as simplehtmldom cannot parse it (just rename it and load back as dom) $element_text = $element->outertext; $element_text = str_replace('', '', $element_text); @@ -43,13 +43,13 @@ class WordPressBridge extends BridgeAbstract { return str_get_html($element_text); } - function StripCDATA($string) { + private function StripCDATA($string) { $string = str_replace('', '', $string); return $string; } - function ClearContent($content) { + private function ClearContent($content) { $content = preg_replace('/]*>[^<]*<\/script>/', '', $content); $content = preg_replace('/
/', '', $content); diff --git a/bridges/WorldOfTanks.php b/bridges/WorldOfTanks.php index 0d7967c..ae51a0e 100644 --- a/bridges/WorldOfTanks.php +++ b/bridges/WorldOfTanks.php @@ -12,7 +12,7 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{ $this->name = "World of Tanks"; $this->uri = "http://worldoftanks.eu/"; $this->description = "News about the tank slaughter game."; - $this->update = "2015-09-12"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -79,7 +79,7 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{ } } - public function parseLine($infoLink) { + private function parseLine($infoLink) { $item = new Item(); $item->uri = WORLD_OF_TANKS.$infoLink->href; // now load that uri from cache @@ -93,19 +93,4 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{ $item->timestamp = $content->find('.b-statistic_time', 0)->getAttribute("data-timestamp"); $this->items[] = $item; } - - public function getName(){ - return $this->name; - } - - public function getURI(){ - return $this->uri; - } - - public function getCacheDuration(){ - return 3600; // 2h hours - } - public function getDescription(){ - return "Toutes les actualités les plus brulantes de ce simulateur de destruction d'acier."; - } } diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php index 79924aa..1b2b4df 100644 --- a/bridges/ZDNetBridge.php +++ b/bridges/ZDNetBridge.php @@ -4,10 +4,10 @@ class ZDNetBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'ZDNet Bridge'; + $this->uri = 'http://www.zdnet.com/'; $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.'; - $this->update = '2016-07-20'; + $this->update = '2016-08-06'; $this->parameters[] = // http://www.zdnet.com/zdnet.opml @@ -302,16 +302,4 @@ class ZDNetBridge extends BridgeAbstract { } } - - public function getName() { - return 'ZDNet Bridge'; - } - - public function getURI() { - return 'http://www.zdnet.com/'; - } - - public function getCacheDuration() { - return 3600; //1 hour - } } diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php index 07c29b7..2d0c6b6 100644 --- a/bridges/ZoneTelechargementBridge.php +++ b/bridges/ZoneTelechargementBridge.php @@ -4,10 +4,10 @@ class ZoneTelechargementBridge extends BridgeAbstract { public function loadMetadatas() { $this->maintainer = 'ORelio'; - $this->name = $this->getName(); - $this->uri = $this->getURI(); + $this->name = 'Zone Telechargement Bridge'; + $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->update = "2016-03-16"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -43,16 +43,4 @@ class ZoneTelechargementBridge extends BridgeAbstract { $limit++; } } - - public function getName() { - return 'Zone Telechargement Bridge'; - } - - public function getURI() { - return 'https://www.zone-telechargement.com/'; - } - - public function getCacheDuration() { - return 3600; - } } diff --git a/index.php b/index.php index 57cb12f..ec74915 100644 --- a/index.php +++ b/index.php @@ -113,8 +113,8 @@ try{ } else { $bridge->setCache($cache); // just add disable cache to your query to disable caching } - $bridge->setDatas($_REQUEST); $bridge->loadMetadatas(); + $bridge->setDatas($_REQUEST); // Data transformation try { $format = Format::create($format); diff --git a/lib/Bridge.php b/lib/Bridge.php index de9d022..a7ffba3 100644 --- a/lib/Bridge.php +++ b/lib/Bridge.php @@ -23,14 +23,6 @@ abstract class BridgeAbstract implements BridgeInterface{ public $maintainer = 'No maintainer'; public $parameters = array(); - /** - * Loads the Bridge Metadatas - */ - public function loadMetadatas() { - - - } - /** * Launch probative exception */ @@ -74,6 +66,20 @@ abstract class BridgeAbstract implements BridgeInterface{ } } + /** + * Define default bridge name + */ + public function getName(){ + return $this->name; + } + + /** + * Define default bridge URI + */ + public function getURI(){ + return $this->uri; + } + /** * Define default duraction for cache */ @@ -365,15 +371,6 @@ abstract class RssExpander extends HttpCachingBridgeAbstract{ */ abstract protected function parseRSSItem($item); - - public function getName(){ - return $this->name; - } - - public function getURI(){ - return $this->uri; - } - public function getDescription() { return $this->description; }