From 50924b92138a3f60ccc5a73e591e1930ff5021d5 Mon Sep 17 00:00:00 2001 From: Joe Digilio Date: Fri, 15 Jun 2018 14:02:06 -0500 Subject: [PATCH 001/146] Abort on parse error of config.default.ini.php (#714) If there is an error parsing the default config file, then abort. --- index.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.php b/index.php index f61f884d..bcf1dae2 100644 --- a/index.php +++ b/index.php @@ -14,6 +14,8 @@ if(!file_exists('config.default.ini.php')) die('The default configuration file "config.default.ini.php" is missing!'); $config = parse_ini_file('config.default.ini.php', true, INI_SCANNER_TYPED); +if(!$config) + die('Error parsing config.default.ini.php'); if(file_exists('config.ini.php')) { // Replace default configuration with custom settings From 8e468a9ca7fdf7c919aec2ef52249ddc5a21f72d Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Fri, 15 Jun 2018 21:05:31 +0200 Subject: [PATCH 002/146] [SuperSmashBlogBridge] Added bridge (#716) --- bridges/SuperSmashBlogBridge.php | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 bridges/SuperSmashBlogBridge.php diff --git a/bridges/SuperSmashBlogBridge.php b/bridges/SuperSmashBlogBridge.php new file mode 100644 index 00000000..06c58fca --- /dev/null +++ b/bridges/SuperSmashBlogBridge.php @@ -0,0 +1,45 @@ +'); + } else { + $picture = ''; + } + + $video = $article['acf']['link_url']; + if (strlen($video) != 0) { + $video = str_get_html('Youtube video'); + } else { + $video = ''; + } + $text = str_get_html($article['acf']['editor']); + $content = $picture . $video . $text; + + // Build final item + $item = array(); + $item['title'] = $article['title']['rendered']; + $item['timestamp'] = strtotime($article['date']); + $item['content'] = $content; + $item['uri'] = self::URI . '?post=' . $article['id']; + + $this->items[] = $item; + } + } +} From 7493e2b5b8466b6702e775663abacb518349b724 Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Fri, 15 Jun 2018 21:09:09 +0200 Subject: [PATCH 003/146] [GrandComicsDatabaseBridge] Add bridge (#717) closes #709 --- bridges/GrandComicsDatabaseBridge.php | 61 +++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 bridges/GrandComicsDatabaseBridge.php diff --git a/bridges/GrandComicsDatabaseBridge.php b/bridges/GrandComicsDatabaseBridge.php new file mode 100644 index 00000000..2b2fdfe1 --- /dev/null +++ b/bridges/GrandComicsDatabaseBridge.php @@ -0,0 +1,61 @@ + array( + 'name' => 'Series id (from the timeline URL)', + 'required' => true, + 'exampleValue' => '63051', + ), + )); + + public function collectData(){ + + $url = self::URI . 'series/' . $this->getInput('series') . '/details/timeline/'; + $html = getSimpleHTMLDOM($url) + or returnServerError('Error while downloading the website content'); + + $table = $html->find('table', 0); + $list = array_reverse($table->find('[class^=row_even]')); + $seriesName = $html->find('span[id=series_name]', 0)->innertext; + + // Get row headers + $rowHeaders = $table->find('th'); + foreach($list as $article) { + + // Skip empty rows + $emptyRow = $article->find('td.empty_month'); + if (count($emptyRow) != 0) { + continue; + } + + $rows = $article->find('td'); + $key_date = $rows[0]->innertext; + + // Get URL too + $uri = 'https://www.comics.org' . $article->find('a')[0]->href; + + // Build content + $content = ''; + for($i = 0; $i < count($rowHeaders); $i++) { + $headerItem = $rowHeaders[$i]->innertext; + $rowItem = $rows[$i]->innertext; + $content = $content . $headerItem . ': ' . $rowItem . '
'; + } + + // Build final item + $item = array(); + $item['title'] = $seriesName . ' - ' . $key_date; + $item['timestamp'] = strtotime($key_date); + $item['content'] = str_get_html($content); + $item['uri'] = $uri; + + $this->items[] = $item; + } + } +} From 9fa74a36c63b8f006f9a524d21b40f9ebca696c8 Mon Sep 17 00:00:00 2001 From: Nemo Date: Wed, 20 Jun 2018 00:09:08 +0530 Subject: [PATCH 004/146] Adds Container Linux releases RSS Feed (#718) * Adds Container Linux releases RSS Feed --- bridges/ContainerLinuxReleasesBridge.php | 76 ++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 bridges/ContainerLinuxReleasesBridge.php diff --git a/bridges/ContainerLinuxReleasesBridge.php b/bridges/ContainerLinuxReleasesBridge.php new file mode 100644 index 00000000..c5f64a15 --- /dev/null +++ b/bridges/ContainerLinuxReleasesBridge.php @@ -0,0 +1,76 @@ + [ + 'name' => 'Release Channel', + 'type' => 'list', + 'required' => true, + 'defaultValue' => self::STABLE, + 'values' => [ + 'Stable' => self::STABLE, + 'Beta' => self::BETA, + 'Alpha' => self::ALPHA, + ], + ] + ] + ]; + + public function getReleaseFeed($jsonUrl) { + $json = getContents($jsonUrl) + or returnServerError('Could not request Core OS Website.'); + return json_decode($json, true); + } + + public function collectData() { + $data = $this->getReleaseFeed($this->getJsonUri()); + + foreach ($data as $releaseVersion => $release) { + $item = []; + + $item['uri'] = "https://coreos.com/releases/#$releaseVersion"; + $item['title'] = $releaseVersion; + $item['content'] = nl2br($release['release_notes']); + + $item['content'] .= << +Major Software: +
+- Kernel: {$release['major_software']['kernel'][0]}
+- Docker: {$release['major_software']['docker'][0]}
+- etcd: {$release['major_software']['etcd'][0]}
+EOT; + $item['timestamp'] = strtotime($release['release_date']); + + $this->items[] = $item; + } + } + + private function getJsonUri() { + $channel = $this->getInput('channel'); + + return "https://coreos.com/releases/releases-$channel.json"; + } + + public function getURI() { + return self::URI; + } + + public function getName(){ + if(!is_null($this->getInput('channel'))) { + return 'Container Linux Releases: ' . $this->getInput('channel') . ' Channel'; + } + + return parent::getName(); + } +} From 1b08bce77911af2469ea0ed1a21170cca4d9ba76 Mon Sep 17 00:00:00 2001 From: sysadminstory Date: Thu, 21 Jun 2018 14:14:59 +0200 Subject: [PATCH 005/146] [DealabsBridge] Follow site changes (#721) - Changed some CSS class to follow the website changes (again) --- bridges/DealabsBridge.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bridges/DealabsBridge.php b/bridges/DealabsBridge.php index 0381d885..2876aab2 100644 --- a/bridges/DealabsBridge.php +++ b/bridges/DealabsBridge.php @@ -178,10 +178,9 @@ class DealabsBridge extends BridgeAbstract { ' ', /* Notice this is a space! */ array( 'cept-description-container', - 'userHtml', 'overflow--wrap-break', 'size--all-s', - 'size--fromW3-m', + 'size--fromW3-m' ) ); @@ -191,7 +190,6 @@ class DealabsBridge extends BridgeAbstract { array( 'size--all-s', 'flex', - 'flex--wrap', 'flex--justify-e', 'flex--grow-1', ) @@ -223,11 +221,11 @@ class DealabsBridge extends BridgeAbstract { . $this->getExpedition($deal) . $this->getLivraison($deal) . $this->getOrigine($deal) - . $deal->find('div[class='. $selectorDescription .']', 0)->innertext + . $deal->find('div[class*='. $selectorDescription .']', 0)->innertext . '' . $deal->find('div[class='. $selectorHot .']', 0)->children(0)->outertext . ''; - $dealDateDiv = $deal->find('div[class='. $selectorDate .']', 0) + $dealDateDiv = $deal->find('div[class*='. $selectorDate .']', 0) ->find('span[class=hide--toW3]'); $itemDate = end($dealDateDiv)->plaintext; if(substr( $itemDate, 0, 6 ) === 'il y a') { From f4a60c1777dc6726dd3ce5ea34b54f643ae3fb07 Mon Sep 17 00:00:00 2001 From: Nemo Date: Sat, 23 Jun 2018 20:21:48 +0530 Subject: [PATCH 006/146] Add dockerfile to create an official docker image (#720) --- .dockerignore | 8 ++++++++ Dockerfile | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..15154f0d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +.git +cache/* +DEBUG +Dockerfile +whitelist.txt +phpcs.xml +CHANGELOG.md +CONTRIBUTING.md \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..35caac84 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM ulsmith/alpine-apache-php7 + +COPY ./ /app/public/ + +RUN chown -R apache:root /app/public \ No newline at end of file From 01a27467156a79e1254761c26f64d095a1634eea Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sat, 23 Jun 2018 21:28:27 +0200 Subject: [PATCH 007/146] [YoutubeBridge] Fix sniff violation This is a fix for a sniff violation not detected by newer versions of phpcs (not sure why though, it's detected in version 2.7.1). --- bridges/YoutubeBridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php index 302a59a5..043d965e 100644 --- a/bridges/YoutubeBridge.php +++ b/bridges/YoutubeBridge.php @@ -226,5 +226,5 @@ class YoutubeBridge extends BridgeAbstract { default: return parent::getName(); } - } + } } From 4a5f190e0e2dd83f89bf60a6c7598d6c64e4a5c3 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 24 Jun 2018 10:52:00 +0200 Subject: [PATCH 008/146] [FacebookBridge] Add option to skip reviews Reviews are provided the same way as summary posts and therefore returned as separate feed item for each review. This commit adds a new option '&skip_reviews=on' to skip reviews entirely. References #706 --- bridges/FacebookBridge.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php index a5b328dc..63c93467 100644 --- a/bridges/FacebookBridge.php +++ b/bridges/FacebookBridge.php @@ -23,6 +23,13 @@ class FacebookBridge extends BridgeAbstract { 'No Video' => 'novideo' ), 'defaultValue' => 'all' + ), + 'skip_reviews' => array( + 'name' => 'Skip reviews', + 'type' => 'checkbox', + 'required' => false, + 'defaultValue' => false, + 'title' => 'Feed includes reviews when checked' ) )); @@ -195,6 +202,12 @@ EOD; $posts = array($cell); } + // Optionally skip reviews + if($this->getInput('skip_reviews') + && !is_null($cell->find('#review_composer_container', 0))) { + continue; + } + foreach($posts as $post) { // Check media type switch($this->getInput('media_type')) { From 5087f5f79e64c648765384fdc952efc68c57243a Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 24 Jun 2018 11:03:43 +0200 Subject: [PATCH 009/146] [FacebookBridge] Support facebook links as user name Allows users to paste facebook links as user name. The link must contain the correct host (www.facebook.com) and a valid path (/user-name/...). The first part of the path is used for the user name. Errors are returned in case something went wrong. References #706 --- bridges/FacebookBridge.php | 45 ++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php index 63c93467..ce3275ea 100644 --- a/bridges/FacebookBridge.php +++ b/bridges/FacebookBridge.php @@ -127,17 +127,44 @@ application/x-www-form-urlencoded\r\nReferer: $captcha_action\r\nCookie: noscrip if(is_null($html)) { $header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE') . "\r\n"); - // First character cannot be a forward slash - if(strpos($this->getInput('u'), "/") === 0) { - returnClientError('Remove leading slash "/" from the username!'); - } + // Check if the user provided a fully qualified URL + if (filter_var($this->getInput('u'), FILTER_VALIDATE_URL)) { + + $urlparts = parse_url($this->getInput('u')); + + if($urlparts['host'] !== parse_url(self::URI)['host']) { + returnClientError('The host you provided is invalid! Received "' + . $urlparts['host'] + . '", expected "' + . parse_url(self::URI)['host'] + . '"!'); + } + + if(!array_key_exists('path', $urlparts) + || $urlparts['path'] === '/') { + returnClientError('The URL you provided doesn\'t contain the user name!'); + } + + $user = explode('/', $urlparts['path'])[1]; + + $html = getSimpleHTMLDOM(self::URI . urlencode($user) . '?_fb_noscript=1', $header) + or returnServerError('No results for this query.'); - if(!strpos($this->getInput('u'), "/")) { - $html = getSimpleHTMLDOM(self::URI . urlencode($this->getInput('u')) . '?_fb_noscript=1', $header) - or returnServerError('No results for this query.'); } else { - $html = getSimpleHTMLDOM(self::URI . 'pages/' . $this->getInput('u') . '?_fb_noscript=1', $header) - or returnServerError('No results for this query.'); + + // First character cannot be a forward slash + if(strpos($this->getInput('u'), "/") === 0) { + returnClientError('Remove leading slash "/" from the username!'); + } + + if(!strpos($this->getInput('u'), "/")) { + $html = getSimpleHTMLDOM(self::URI . urlencode($this->getInput('u')) . '?_fb_noscript=1', $header) + or returnServerError('No results for this query.'); + } else { + $html = getSimpleHTMLDOM(self::URI . 'pages/' . $this->getInput('u') . '?_fb_noscript=1', $header) + or returnServerError('No results for this query.'); + } + } } From 95686b803c073c653a5cfad45d81c6e6980e5dbf Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 24 Jun 2018 18:27:11 +0200 Subject: [PATCH 010/146] [IsoHuntBridge] Remove bridge isoHunt has discontinued services due to legal reasons and is now accessible via https://isohunts.to While it is certainly possible to rewrite the bridge to fetch some information from the new site, it wouldn't be able to provide as much functionality as before. This is due to isoHunt having removed all searching and filtering options, only providing static HTML pages for general categories (anime, movies, etc...). Those pages, however, are heavily broken. Unless someone is interested in monitoring the general categories the effort of upgrading the bridge to the new site is not worth taking time for. Users of isoHunt are asked to make use of their client application, as they don't provide online services anymore (it's now in the darknet) Here is the statement from isoHunt: "Due to hard regulations and security issues for bittorrent users, we have moved into a more secure and even faster district of the internet! [...] Torrent Downloads have a high risk of getting legal problems. That is why we do not offer torrentfiles any more. [...]" -- source: https://isohunts.to --- bridges/IsoHuntBridge.php | 465 -------------------------------------- 1 file changed, 465 deletions(-) delete mode 100644 bridges/IsoHuntBridge.php diff --git a/bridges/IsoHuntBridge.php b/bridges/IsoHuntBridge.php deleted file mode 100644 index 57038fcc..00000000 --- a/bridges/IsoHuntBridge.php +++ /dev/null @@ -1,465 +0,0 @@ - array( - 'latest_category' => array( - 'name' => 'Latest category', - 'type' => 'list', - 'required' => true, - 'title' => 'Select your category', - 'defaultValue' => 'news', - 'values' => array( - 'Hot Torrents' => 'hot_torrents', - 'News' => 'news', - 'Releases' => 'releases', - 'Torrents' => 'torrents' - ) - ) - ), - - /* - * Get feeds for one of the "torrent" categories - * Make sure to add new categories also to get_torrent_category_index($)! - * Elements are sorted by name ascending! - */ - 'By "Torrent" category' => array( - 'torrent_category' => array( - 'name' => 'Torrent category', - 'type' => 'list', - 'required' => true, - 'title' => 'Select your category', - 'defaultValue' => 'anime', - 'values' => array( - 'Adult' => 'adult', - 'Anime' => 'anime', - 'Books' => 'books', - 'Games' => 'games', - 'Movies' => 'movies', - 'Music' => 'music', - 'Other' => 'other', - 'Series & TV' => 'series_tv', - 'Software' => 'software' - ) - ), - 'torrent_popularity' => array( - 'name' => 'Sort by popularity', - 'type' => 'checkbox', - 'title' => 'Activate to receive results by popularity' - ) - ), - - /* - * Get feeds for a specific search request - */ - 'Search torrent by name' => array( - 'search_name' => array( - 'name' => 'Name', - 'required' => true, - 'title' => 'Insert your search query', - 'exampleValue' => 'Bridge' - ), - 'search_category' => array( - 'name' => 'Category', - 'type' => 'list', - 'title' => 'Select your category', - 'defaultValue' => 'all', - 'values' => array( - 'Adult' => 'adult', - 'All' => 'all', - 'Anime' => 'anime', - 'Books' => 'books', - 'Games' => 'games', - 'Movies' => 'movies', - 'Music' => 'music', - 'Other' => 'other', - 'Series & TV' => 'series_tv', - 'Software' => 'software' - ) - ) - ) - ); - - public function getURI(){ - $uri = self::URI; - switch($this->queriedContext) { - case 'By "Latest" category': - switch($this->getInput('latest_category')) { - case 'hot_torrents': - $uri .= 'statistic/hot/torrents'; - break; - case 'news': - break; - case 'releases': - $uri .= 'releases.php'; - break; - case 'torrents': - $uri .= 'latest.php'; - break; - } - break; - case 'By "Torrent" category': - $uri .= $this->buildCategoryUri( - $this->getInput('torrent_category'), - $this->getInput('torrent_popularity') - ); - break; - case 'Search torrent by name': - $category = $this->getInput('search_category'); - $uri .= $this->buildCategoryUri($category); - if($category !== 'movies') - $uri .= '&ihq=' . urlencode($this->getInput('search_name')); - break; - - default: parent::getURI(); - } - - return $uri; - } - - public function getName(){ - switch($this->queriedContext) { - case 'By "Latest" category': - $categoryName = array_search( - $this->getInput('latest_category'), - self::PARAMETERS['By "Latest" category']['latest_category']['values'] - ); - $name = 'Latest ' . $categoryName . ' - ' . self::NAME; - break; - case 'By "Torrent" category': - $categoryName = array_search( - $this->getInput('torrent_category'), - self::PARAMETERS['By "Torrent" category']['torrent_category']['values'] - ); - $name = 'Category: ' . $categoryName . ' - ' . self::NAME; - break; - case 'Search torrent by name': - $categoryName = array_search( - $this->getInput('search_category'), - self::PARAMETERS['Search torrent by name']['search_category']['values'] - ); - $name = 'Search: "' - . $this->getInput('search_name') - . '" in category: ' - . $categoryName . ' - ' - . self::NAME; - break; - default: return parent::getName(); - } - - return $name; - } - - public function collectData(){ - $html = $this->loadHtml($this->getURI()); - - switch($this->queriedContext) { - case 'By "Latest" category': - switch($this->getInput('latest_category')) { - case 'hot_torrents': - $this->getLatestHotTorrents($html); - break; - case 'news': - $this->getLatestNews($html); - break; - case 'releases': - case 'torrents': - $this->getLatestTorrents($html); - break; - } - break; - case 'By "Torrent" category': - if($this->getInput('torrent_category') === 'movies') { - // This one is special (content wise) - $this->getMovieTorrents($html); - } else { - $this->getLatestTorrents($html); - } - break; - case 'Search torrent by name': - if($this->getInput('search_category') === 'movies') { - // This one is special (content wise) - $this->getMovieTorrents($html); - } else { - $this->getLatestTorrents($html); - } - break; - } - } - - #region Helper functions for "Movie Torrents" - - private function getMovieTorrents($html){ - $container = $html->find('div#w0', 0); - if(!$container) - returnServerError('Unable to find torrent container!'); - - $torrents = $container->find('article'); - if(!$torrents) - returnServerError('Unable to find torrents!'); - - foreach($torrents as $torrent) { - - $anchor = $torrent->find('a', 0); - if(!$anchor) - returnServerError('Unable to find anchor!'); - - $date = $torrent->find('small', 0); - if(!$date) - returnServerError('Unable to find date!'); - - $item = array(); - - $item['uri'] = $this->fixRelativeUri($anchor->href); - $item['title'] = $anchor->title; - // $item['author'] = - $item['timestamp'] = strtotime($date->plaintext); - $item['content'] = $this->fixRelativeUri($torrent->innertext); - - $this->items[] = $item; - } - } - - #endregion - - #region Helper functions for "Latest Hot Torrents" - - private function getLatestHotTorrents($html){ - $container = $html->find('div#serps', 0); - if(!$container) - returnServerError('Unable to find torrent container!'); - - $torrents = $container->find('tr'); - if(!$torrents) - returnServerError('Unable to find torrents!'); - - // Remove first element (header row) - $torrents = array_slice($torrents, 1); - - foreach($torrents as $torrent) { - - $cell = $torrent->find('td', 0); - if(!$cell) - returnServerError('Unable to find cell!'); - - $element = $cell->find('a', 0); - if(!$element) - returnServerError('Unable to find element!'); - - $item = array(); - - $item['uri'] = $element->href; - $item['title'] = $element->plaintext; - // $item['author'] = - // $item['timestamp'] = - // $item['content'] = - - $this->items[] = $item; - } - } - - #endregion - - #region Helper functions for "Latest News" - - private function getLatestNews($html){ - $container = $html->find('div#postcontainer', 0); - if(!$container) - returnServerError('Unable to find post container!'); - - $posts = $container->find('div.index-post'); - if(!$posts) - returnServerError('Unable to find posts!'); - - foreach($posts as $post) { - $item = array(); - - $item['uri'] = $this->latestNewsExtractUri($post); - $item['title'] = $this->latestNewsExtractTitle($post); - $item['author'] = $this->latestNewsExtractAuthor($post); - $item['timestamp'] = $this->latestNewsExtractTimestamp($post); - $item['content'] = $this->latestNewsExtractContent($post); - - $this->items[] = $item; - } - } - - private function latestNewsExtractAuthor($post){ - $author = $post->find('small', 0); - if(!$author) - returnServerError('Unable to find author!'); - - // The author is hidden within a string like: 'Posted by {author} on {date}' - preg_match('/Posted\sby\s(.*)\son/i', $author->innertext, $matches); - - return $matches[1]; - } - - private function latestNewsExtractTimestamp($post){ - $date = $post->find('small', 0); - if(!$date) - returnServerError('Unable to find date!'); - - // The date is hidden within a string like: 'Posted by {author} on {date}' - preg_match('/Posted\sby\s.*\son\s(.*)/i', $date->innertext, $matches); - - $timestamp = strtotime($matches[1]); - - // Make sure date is not in the future (dates are given like 'Nov. 20' without year) - if($timestamp > time()) { - $timestamp = strtotime('-1 year', $timestamp); - } - - return $timestamp; - } - - private function latestNewsExtractTitle($post){ - $title = $post->find('a', 0); - if(!$title) - returnServerError('Unable to find title!'); - - return $title->plaintext; - } - - private function latestNewsExtractUri($post){ - $uri = $post->find('a', 0); - if(!$uri) - returnServerError('Unable to find uri!'); - - return $uri->href; - } - - private function latestNewsExtractContent($post){ - $content = $post->find('div', 0); - if(!$content) - returnServerError('Unable to find content!'); - - // Remove

...

(title) - foreach($content->find('h2') as $element) { - $element->outertext = ''; - } - - // Remove ... (author) - foreach($content->find('small') as $element) { - $element->outertext = ''; - } - - return $content->innertext; - } - - #endregion - - #region Helper functions for "Latest Torrents", "Latest Releases" and "Torrent Category" - - private function getLatestTorrents($html){ - $container = $html->find('div#serps', 0); - if(!$container) - returnServerError('Unable to find torrent container!'); - - $torrents = $container->find('tr[data-key]'); - if(!$torrents) - returnServerError('Unable to find torrents!'); - - foreach($torrents as $torrent) { - $item = array(); - - $item['uri'] = $this->latestTorrentsExtractUri($torrent); - $item['title'] = $this->latestTorrentsExtractTitle($torrent); - $item['author'] = $this->latestTorrentsExtractAuthor($torrent); - $item['timestamp'] = $this->latestTorrentsExtractTimestamp($torrent); - $item['content'] = ''; // There is no valuable content - - $this->items[] = $item; - } - } - - private function latestTorrentsExtractTitle($torrent){ - $cell = $torrent->find('td.title-row', 0); - if(!$cell) - returnServerError('Unable to find title cell!'); - - $title = $cell->find('span', 0); - if(!$title) - returnServerError('Unable to find title!'); - - return $title->plaintext; - } - - private function latestTorrentsExtractUri($torrent){ - $cell = $torrent->find('td.title-row', 0); - if(!$cell) - returnServerError('Unable to find title cell!'); - - $uri = $cell->find('a', 0); - if(!$uri) - returnServerError('Unable to find uri!'); - - return $this->fixRelativeUri($uri->href); - } - - private function latestTorrentsExtractAuthor($torrent){ - $cell = $torrent->find('td.user-row', 0); - if(!$cell) - return; // No author - - $user = $cell->find('a', 0); - if(!$user) - returnServerError('Unable to find user!'); - - return $user->plaintext; - } - - private function latestTorrentsExtractTimestamp($torrent){ - $cell = $torrent->find('td.date-row', 0); - if(!$cell) - returnServerError('Unable to find date cell!'); - - return strtotime('-' . $cell->plaintext, time()); - } - - #endregion - - #region Generic helper functions - - private function loadHtml($uri){ - $html = getSimpleHTMLDOM($uri); - if(!$html) - returnServerError('Unable to load ' . $uri . '!'); - - return $html; - } - - private function fixRelativeUri($uri){ - return preg_replace('/\//i', self::URI, $uri, 1); - } - - private function buildCategoryUri($category, $order_popularity = false){ - switch($category) { - case 'anime': $index = 1; break; - case 'software' : $index = 2; break; - case 'games' : $index = 3; break; - case 'adult' : $index = 4; break; - case 'movies' : $index = 5; break; - case 'music' : $index = 6; break; - case 'other' : $index = 7; break; - case 'series_tv' : $index = 8; break; - case 'books': $index = 9; break; - case 'all': - default: $index = 0; break; - } - - return 'torrents/?iht=' . $index . '&ihs=' . ($order_popularity ? 1 : 0) . '&age=0'; - } - - #endregion -} From 937ea492716b9251211a2a0f73f3afd1ac871505 Mon Sep 17 00:00:00 2001 From: Teromene Date: Wed, 27 Jun 2018 18:09:41 +0100 Subject: [PATCH 011/146] Add basic authentication support (#728) * Move configuration in its own class in order to reduce the verbosity of index.php * Add authentication mechanism using HTTP auth * Add a method to get the config parameters * Remove the installation checks from the index page * Log all failed authentication attempts --- config.default.ini.php | 19 +++++++- index.php | 96 ++++--------------------------------- lib/Authentication.php | 31 ++++++++++++ lib/Configuration.php | 105 +++++++++++++++++++++++++++++++++++++++++ lib/RssBridge.php | 2 + 5 files changed, 164 insertions(+), 89 deletions(-) create mode 100644 lib/Authentication.php create mode 100644 lib/Configuration.php diff --git a/config.default.ini.php b/config.default.ini.php index d27ead18..5909ad88 100644 --- a/config.default.ini.php +++ b/config.default.ini.php @@ -24,4 +24,21 @@ name = "Hidden proxy name" ; Allow users to disable proxy usage for specific requests. ; true = enabled ; false = disabled (default) -by_bridge = false \ No newline at end of file +by_bridge = false + +[authentication] + +; Enables authentication for all requests to this RSS-Bridge instance. +; +; Warning: You'll have to upgrade existing feeds after enabling this option! +; +; true = enabled +; false = disabled (default) +enable = false + +; The username for authentication. Insert this name when prompted for login. +username = "" + +; The password for authentication. Insert this password when prompted for login. +; Use a strong password to prevent others from guessing your login! +password = "" diff --git a/index.php b/index.php index bcf1dae2..8cb8908e 100644 --- a/index.php +++ b/index.php @@ -1,67 +1,21 @@ $section) { - foreach($section as $key => $value) { - // Skip unknown sections and keys - if(array_key_exists($header, $config) && array_key_exists($key, $config[$header])) { - $config[$header][$key] = $value; - } - } - } -} - -if(!is_string($config['proxy']['url'])) - die('Parameter [proxy] => "url" is not a valid string! Please check "config.ini.php"!'); - -if(!empty($config['proxy']['url'])) - define('PROXY_URL', $config['proxy']['url']); - -if(!is_bool($config['proxy']['by_bridge'])) - die('Parameter [proxy] => "by_bridge" is not a valid Boolean! Please check "config.ini.php"!'); - -define('PROXY_BYBRIDGE', $config['proxy']['by_bridge']); - -if(!is_string($config['proxy']['name'])) - die('Parameter [proxy] => "name" is not a valid string! Please check "config.ini.php"!'); - -define('PROXY_NAME', $config['proxy']['name']); - -if(!is_bool($config['cache']['custom_timeout'])) - die('Parameter [cache] => "custom_timeout" is not a valid Boolean! Please check "config.ini.php"!'); - -define('CUSTOM_CACHE_TIMEOUT', $config['cache']['custom_timeout']); - -// Defines the minimum required PHP version for RSS-Bridge define('PHP_VERSION_REQUIRED', '5.6.0'); -date_default_timezone_set('UTC'); -error_reporting(0); - // Specify directory for cached files (using FileCache) define('CACHE_DIR', __DIR__ . '/cache'); // Specify path for whitelist file define('WHITELIST_FILE', __DIR__ . '/whitelist.txt'); +Configuration::verifyInstallation(); +Configuration::loadConfiguration(); + +Authentication::showPromptIfNeeded(); + +date_default_timezone_set('UTC'); +error_reporting(0); /* Move the CLI arguments to the $_GET array, in order to be able to use @@ -91,40 +45,6 @@ if(file_exists('DEBUG')) { } } -require_once __DIR__ . '/lib/RssBridge.php'; - -// Check PHP version -if(version_compare(PHP_VERSION, PHP_VERSION_REQUIRED) === -1) - die('RSS-Bridge requires at least PHP version ' . PHP_VERSION_REQUIRED . '!'); - -// extensions check -if(!extension_loaded('openssl')) - die('"openssl" extension not loaded. Please check "php.ini"'); - -if(!extension_loaded('libxml')) - die('"libxml" extension not loaded. Please check "php.ini"'); - -if(!extension_loaded('mbstring')) - die('"mbstring" extension not loaded. Please check "php.ini"'); - -if(!extension_loaded('simplexml')) - die('"simplexml" extension not loaded. Please check "php.ini"'); - -if(!extension_loaded('curl')) - die('"curl" extension not loaded. Please check "php.ini"'); - -// configuration checks -if(ini_get('allow_url_fopen') !== "1") - die('"allow_url_fopen" is not set to "1". Please check "php.ini'); - -// Check cache folder permissions (write permissions required) -if(!is_writable(CACHE_DIR)) - die('RSS-Bridge does not have write permissions for ' . CACHE_DIR . '!'); - -// Check whitelist file permissions (only in DEBUG mode) -if(!file_exists(WHITELIST_FILE) && !is_writable(dirname(WHITELIST_FILE))) - die('RSS-Bridge does not have write permissions for ' . WHITELIST_FILE . '!'); - // FIXME : beta test UA spoofing, please report any blacklisting by PHP-fopen-unfriendly websites $userAgent = 'Mozilla/5.0(X11; Linux x86_64; rv:30.0)'; diff --git a/lib/Authentication.php b/lib/Authentication.php new file mode 100644 index 00000000..dc75d28e --- /dev/null +++ b/lib/Authentication.php @@ -0,0 +1,31 @@ + $section) { + foreach($section as $key => $value) { + // Skip unknown sections and keys + if(array_key_exists($header, Configuration::$config) && array_key_exists($key, Configuration::$config[$header])) { + Configuration::$config[$header][$key] = $value; + } + } + } + } + + if(!is_string(self::getConfig('proxy', 'url'))) + die('Parameter [proxy] => "url" is not a valid string! Please check "config.ini.php"!'); + + if(!empty(self::getConfig('proxy', 'url'))) + define('PROXY_URL', self::getConfig('proxy', 'url')); + + if(!is_bool(self::getConfig('proxy', 'by_bridge'))) + die('Parameter [proxy] => "by_bridge" is not a valid Boolean! Please check "config.ini.php"!'); + + define('PROXY_BYBRIDGE', self::getConfig('proxy', 'by_bridge')); + + if(!is_string(self::getConfig('proxy', 'name'))) + die('Parameter [proxy] => "name" is not a valid string! Please check "config.ini.php"!'); + + define('PROXY_NAME', self::getConfig('proxy', 'name')); + + if(!is_bool(self::getConfig('cache', 'custom_timeout'))) + die('Parameter [cache] => "custom_timeout" is not a valid Boolean! Please check "config.ini.php"!'); + + define('CUSTOM_CACHE_TIMEOUT', self::getConfig('cache', 'custom_timeout')); + + if(!is_bool(self::getConfig('authentication', 'enable'))) + die('Parameter [authentication] => "enable" is not a valid Boolean! Please check "config.ini.php"!'); + + if(!is_string(self::getConfig('authentication', 'username'))) + die('Parameter [authentication] => "username" is not a valid string! Please check "config.ini.php"!'); + + if(!is_string(self::getConfig('authentication', 'password'))) + die('Parameter [authentication] => "password" is not a valid string! Please check "config.ini.php"!'); + + } + + public static function getConfig($category, $key) { + + if(array_key_exists($category, self::$config) && array_key_exists($key, self::$config[$category])) { + return self::$config[$category][$key]; + } + + return null; + + } + +} diff --git a/lib/RssBridge.php b/lib/RssBridge.php index e2f9be3a..8d0ef902 100644 --- a/lib/RssBridge.php +++ b/lib/RssBridge.php @@ -14,6 +14,8 @@ require __DIR__ . '/Bridge.php'; require __DIR__ . '/BridgeAbstract.php'; require __DIR__ . '/FeedExpander.php'; require __DIR__ . '/Cache.php'; +require __DIR__ . '/Authentication.php'; +require __DIR__ . '/Configuration.php'; require __DIR__ . '/validation.php'; require __DIR__ . '/html.php'; From 5ea79ac1fc488ce0e57de9f9c44f9dbd5f9f1e26 Mon Sep 17 00:00:00 2001 From: Nemo Date: Fri, 29 Jun 2018 00:24:42 +0530 Subject: [PATCH 012/146] Add markdown support to Container Linux Feed (#730) --- bridges/ContainerLinuxReleasesBridge.php | 31 ++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/bridges/ContainerLinuxReleasesBridge.php b/bridges/ContainerLinuxReleasesBridge.php index c5f64a15..bcb421d2 100644 --- a/bridges/ContainerLinuxReleasesBridge.php +++ b/bridges/ContainerLinuxReleasesBridge.php @@ -40,18 +40,35 @@ class ContainerLinuxReleasesBridge extends BridgeAbstract { $item['uri'] = "https://coreos.com/releases/#$releaseVersion"; $item['title'] = $releaseVersion; - $item['content'] = nl2br($release['release_notes']); - $item['content'] .= << + $content = $release['release_notes']; + $content .= << -- Kernel: {$release['major_software']['kernel'][0]}
-- Docker: {$release['major_software']['docker'][0]}
-- etcd: {$release['major_software']['etcd'][0]}
+* Kernel: {$release['major_software']['kernel'][0]} +* Docker: {$release['major_software']['docker'][0]} +* etcd: {$release['major_software']['etcd'][0]} EOT; $item['timestamp'] = strtotime($release['release_date']); + // Based on https://gist.github.com/jbroadway/2836900 + // Links + $regex = '/\[([^\[]+)\]\(([^\)]+)\)/'; + $replacement = '\1'; + $item['content'] = preg_replace($regex, $replacement, $content); + + // Headings + $regex = '/^(.*)\:\s?$/m'; + $replacement = '

\1

'; + $item['content'] = preg_replace($regex, $replacement, $item['content']); + + // Lists + $regex = '/\n\s*[\*|\-](.*)/'; + $item['content'] = preg_replace_callback ($regex, function($regs) { + $item = $regs[1]; + return sprintf ("
  • %s
", trim ($item)); + }, $item['content']); + $this->items[] = $item; } } From 193ca87afae84bf50730ae8d006949efe5c251ea Mon Sep 17 00:00:00 2001 From: LogMANOriginal Date: Fri, 29 Jun 2018 23:55:33 +0200 Subject: [PATCH 013/146] [phpcs] enforce single quotes (#732) * [phpcs] Add rule to enforce single quoted strings --- bridges/BlaguesDeMerdeBridge.php | 2 +- bridges/CADBridge.php | 6 +- bridges/CopieDoubleBridge.php | 2 +- bridges/CourrierInternationalBridge.php | 2 +- bridges/CpasbienBridge.php | 2 +- bridges/DanbooruBridge.php | 2 +- bridges/DemoBridge.php | 10 +- bridges/DiscogsBridge.php | 68 ++++----- bridges/ETTVBridge.php | 4 +- bridges/EZTVBridge.php | 10 +- bridges/FB2Bridge.php | 52 +++---- bridges/FacebookBridge.php | 8 +- bridges/FootitoBridge.php | 18 +-- bridges/FourchanBridge.php | 2 +- bridges/GithubIssueBridge.php | 2 +- bridges/GoComicsBridge.php | 12 +- bridges/GoogleSearchBridge.php | 2 +- bridges/InstagramBridge.php | 2 +- bridges/KununuBridge.php | 4 +- bridges/LeBonCoinBridge.php | 2 +- bridges/LesJoiesDuCodeBridge.php | 6 +- bridges/MangareaderBridge.php | 26 ++-- bridges/NasaApodBridge.php | 4 +- bridges/NotAlwaysBridge.php | 2 +- bridges/PinterestBridge.php | 6 +- bridges/PixivBridge.php | 28 ++-- bridges/RainbowSixSiegeBridge.php | 6 +- bridges/ReadComicsBridge.php | 2 +- bridges/ReporterreBridge.php | 2 +- bridges/Rue89Bridge.php | 6 +- bridges/SexactuBridge.php | 2 +- bridges/ShanaprojectBridge.php | 2 +- bridges/Shimmie2Bridge.php | 2 +- bridges/SuperSmashBlogBridge.php | 2 +- bridges/VkBridge.php | 48 +++---- bridges/WhydBridge.php | 4 +- bridges/YGGTorrentBridge.php | 180 ++++++++++++------------ bridges/YoutubeBridge.php | 6 +- caches/FileCache.php | 2 +- lib/Configuration.php | 2 +- lib/FeedExpander.php | 6 +- lib/html.php | 2 +- phpcs.xml | 4 + 43 files changed, 283 insertions(+), 279 deletions(-) diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php index 25c018a8..3ae59a10 100644 --- a/bridges/BlaguesDeMerdeBridge.php +++ b/bridges/BlaguesDeMerdeBridge.php @@ -19,7 +19,7 @@ class BlaguesDeMerdeBridge extends BridgeAbstract { $item['content'] = trim($element->find('div.joke_text_contener', 0)->innertext); $uri = $temp[2]->href; $item['uri'] = $uri; - $item['title'] = substr($uri, (strrpos($uri, "/") + 1)); + $item['title'] = substr($uri, (strrpos($uri, '/') + 1)); $date = $element->find('li.bdm_date', 0)->innertext; $time = mktime(0, 0, 0, substr($date, 3, 2), substr($date, 0, 2), substr($date, 6, 4)); $item['timestamp'] = $time; diff --git a/bridges/CADBridge.php b/bridges/CADBridge.php index 09e3e65a..e88cbbb2 100644 --- a/bridges/CADBridge.php +++ b/bridges/CADBridge.php @@ -23,14 +23,14 @@ class CADBridge extends FeedExpander { if($html3 == false) return 'Daily comic not released yet'; - $htmlpart = explode("/", $url); + $htmlpart = explode('/', $url); switch ($htmlpart[3]) { case 'cad': - preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/cad-\S*png/", $html3, $url2); + preg_match_all('/http:\/\/cdn2\.cad-comic\.com\/comics\/cad-\S*png/', $html3, $url2); break; case 'sillies': - preg_match_all("/http:\/\/cdn2\.cad-comic\.com\/comics\/sillies-\S*gif/", $html3, $url2); + preg_match_all('/http:\/\/cdn2\.cad-comic\.com\/comics\/sillies-\S*gif/', $html3, $url2); break; default: return 'Daily comic not released yet'; diff --git a/bridges/CopieDoubleBridge.php b/bridges/CopieDoubleBridge.php index 767cdce3..3545c6fc 100644 --- a/bridges/CopieDoubleBridge.php +++ b/bridges/CopieDoubleBridge.php @@ -25,7 +25,7 @@ class CopieDoubleBridge extends BridgeAbstract { } elseif(strpos($element->innertext, '/images/suivant.gif') === false) { $a = $element->find('a', 0); $item['uri'] = self::URI . $a->href; - $content = str_replace('src="/', 'src="/' . self::URI, $element->find("td", 0)->innertext); + $content = str_replace('src="/', 'src="/' . self::URI, $element->find('td', 0)->innertext); $content = str_replace('href="/', 'href="' . self::URI, $content); $item['content'] = $content; $this->items[] = $item; diff --git a/bridges/CourrierInternationalBridge.php b/bridges/CourrierInternationalBridge.php index 15738633..1e7c93e8 100644 --- a/bridges/CourrierInternationalBridge.php +++ b/bridges/CourrierInternationalBridge.php @@ -11,7 +11,7 @@ class CourrierInternationalBridge extends BridgeAbstract { $html = getSimpleHTMLDOM(self::URI) or returnServerError('Error.'); - $element = $html->find("article"); + $element = $html->find('article'); $article_count = 1; foreach($element as $article) { diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php index 19efd84a..f9b4b502 100644 --- a/bridges/CpasbienBridge.php +++ b/bridges/CpasbienBridge.php @@ -16,7 +16,7 @@ class CpasbienBridge extends BridgeAbstract { )); public function collectData(){ - $request = str_replace(" ", "-", trim($this->getInput('q'))); + $request = str_replace(' ', '-', trim($this->getInput('q'))); $html = getSimpleHTMLDOM(self::URI . '/recherche/' . urlencode($request) . '.html') or returnServerError('No results for this query.'); diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php index 36b8c08a..82f21674 100644 --- a/bridges/DanbooruBridge.php +++ b/bridges/DanbooruBridge.php @@ -41,7 +41,7 @@ class DanbooruBridge extends BridgeAbstract { $item = array(); $item['uri'] = $element->find('a', 0)->href; - $item['postid'] = (int)preg_replace("/[^0-9]/", '', $element->getAttribute(static::IDATTRIBUTE)); + $item['postid'] = (int)preg_replace('/[^0-9]/', '', $element->getAttribute(static::IDATTRIBUTE)); $item['timestamp'] = time(); $thumbnailUri = $element->find('img', 0)->src; $item['tags'] = $this->getTags($element); diff --git a/bridges/DemoBridge.php b/bridges/DemoBridge.php index ea2088eb..f48b4510 100644 --- a/bridges/DemoBridge.php +++ b/bridges/DemoBridge.php @@ -35,11 +35,11 @@ class DemoBridge extends BridgeAbstract { public function collectData(){ $item = array(); - $item['author'] = "Me!"; - $item['title'] = "Test"; - $item['content'] = "Awesome content !"; - $item['id'] = "Lalala"; - $item['uri'] = "http://example.com/test"; + $item['author'] = 'Me!'; + $item['title'] = 'Test'; + $item['content'] = 'Awesome content !'; + $item['id'] = 'Lalala'; + $item['uri'] = 'http://example.com/test'; $this->items[] = $item; } diff --git a/bridges/DiscogsBridge.php b/bridges/DiscogsBridge.php index 1fa58405..9fe4f51f 100644 --- a/bridges/DiscogsBridge.php +++ b/bridges/DiscogsBridge.php @@ -42,59 +42,59 @@ class DiscogsBridge extends BridgeAbstract { if(!empty($this->getInput('artistid')) || !empty($this->getInput('labelid'))) { if(!empty($this->getInput('artistid'))) { - $data = getContents("https://api.discogs.com/artists/" + $data = getContents('https://api.discogs.com/artists/' . $this->getInput('artistid') - . "/releases?sort=year&sort_order=desc") - or returnServerError("Unable to query discogs !"); + . '/releases?sort=year&sort_order=desc') + or returnServerError('Unable to query discogs !'); } elseif(!empty($this->getInput('labelid'))) { - $data = getContents("https://api.discogs.com/labels/" + $data = getContents('https://api.discogs.com/labels/' . $this->getInput('labelid') - . "/releases?sort=year&sort_order=desc") - or returnServerError("Unable to query discogs !"); + . '/releases?sort=year&sort_order=desc') + or returnServerError('Unable to query discogs !'); } $jsonData = json_decode($data, true); - foreach($jsonData["releases"] as $release) { + foreach($jsonData['releases'] as $release) { $item = array(); - $item["author"] = $release["artist"]; - $item["title"] = $release["title"]; - $item["id"] = $release["id"]; - $resId = array_key_exists("main_release", $release) ? $release["main_release"] : $release["id"]; - $item["uri"] = self::URI . $this->getInput('artistid') . "/release/" . $resId; - $item["timestamp"] = DateTime::createFromFormat("Y", $release["year"])->getTimestamp(); - $item["content"] = $item["author"] . " - " . $item["title"]; + $item['author'] = $release['artist']; + $item['title'] = $release['title']; + $item['id'] = $release['id']; + $resId = array_key_exists('main_release', $release) ? $release['main_release'] : $release['id']; + $item['uri'] = self::URI . $this->getInput('artistid') . '/release/' . $resId; + $item['timestamp'] = DateTime::createFromFormat('Y', $release['year'])->getTimestamp(); + $item['content'] = $item['author'] . ' - ' . $item['title']; $this->items[] = $item; } - } elseif(!empty($this->getInput("username_wantlist")) || !empty($this->getInput("username_folder"))) { + } elseif(!empty($this->getInput('username_wantlist')) || !empty($this->getInput('username_folder'))) { - if(!empty($this->getInput("username_wantlist"))) { - $data = getContents("https://api.discogs.com/users/" + if(!empty($this->getInput('username_wantlist'))) { + $data = getContents('https://api.discogs.com/users/' . $this->getInput('username_wantlist') - . "/wants?sort=added&sort_order=desc") - or returnServerError("Unable to query discogs !"); - $jsonData = json_decode($data, true)["wants"]; + . '/wants?sort=added&sort_order=desc') + or returnServerError('Unable to query discogs !'); + $jsonData = json_decode($data, true)['wants']; - } elseif(!empty($this->getInput("username_folder"))) { - $data = getContents("https://api.discogs.com/users/" + } elseif(!empty($this->getInput('username_folder'))) { + $data = getContents('https://api.discogs.com/users/' . $this->getInput('username_folder') - . "/collection/folders/" - . $this->getInput("folderid") - ."/releases?sort=added&sort_order=desc") - or returnServerError("Unable to query discogs !"); - $jsonData = json_decode($data, true)["releases"]; + . '/collection/folders/' + . $this->getInput('folderid') + .'/releases?sort=added&sort_order=desc') + or returnServerError('Unable to query discogs !'); + $jsonData = json_decode($data, true)['releases']; } foreach($jsonData as $element) { - $infos = $element["basic_information"]; + $infos = $element['basic_information']; $item = array(); - $item["title"] = $infos["title"]; - $item["author"] = $infos["artists"][0]["name"]; - $item["id"] = $infos["artists"][0]["id"]; - $item["uri"] = self::URI . $infos["artists"][0]["id"] . "/release/" . $infos["id"]; - $item["timestamp"] = strtotime($element["date_added"]); - $item["content"] = $item["author"] . " - " . $item["title"]; + $item['title'] = $infos['title']; + $item['author'] = $infos['artists'][0]['name']; + $item['id'] = $infos['artists'][0]['id']; + $item['uri'] = self::URI . $infos['artists'][0]['id'] . '/release/' . $infos['id']; + $item['timestamp'] = strtotime($element['date_added']); + $item['content'] = $item['author'] . ' - ' . $item['title']; $this->items[] = $item; } diff --git a/bridges/ETTVBridge.php b/bridges/ETTVBridge.php index 6da6d5e8..ab90bf7f 100644 --- a/bridges/ETTVBridge.php +++ b/bridges/ETTVBridge.php @@ -1,7 +1,7 @@ find('td', 1)->find('a', 0); // retrieve result page to get more details - $link = rtrim(self::URI, "/") . $entry->href; + $link = rtrim(self::URI, '/') . $entry->href; $page = getSimpleHTMLDOM($link) or returnServerError('Could not request page ' . $link); diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php index 4fb9e578..c016ff33 100644 --- a/bridges/EZTVBridge.php +++ b/bridges/EZTVBridge.php @@ -1,7 +1,7 @@ getInput('i')); + $showList = explode(',', $this->getInput('i')); foreach($showList as $showID) { // Get show page diff --git a/bridges/FB2Bridge.php b/bridges/FB2Bridge.php index 7d78b87f..d8fb6b41 100644 --- a/bridges/FB2Bridge.php +++ b/bridges/FB2Bridge.php @@ -103,19 +103,19 @@ EOD; $html = $this->buildContent($fileContent); $author = $this->getInput('u'); - foreach($html->find("article") as $content) { + foreach($html->find('article') as $content) { $item = array(); - $item['uri'] = "http://touch.facebook.com" - . $content->find("div[class='_52jc _5qc4 _24u0 _36xo']", 0)->find("a", 0)->getAttribute("href"); + $item['uri'] = 'http://touch.facebook.com' + . $content->find("div[class='_52jc _5qc4 _24u0 _36xo']", 0)->find('a', 0)->getAttribute('href'); - if($content->find("header", 0) !== null) { - $content->find("header", 0)->innertext = ""; + if($content->find('header', 0) !== null) { + $content->find('header', 0)->innertext = ''; } - if($content->find("footer", 0) !== null) { - $content->find("footer", 0)->innertext = ""; + if($content->find('footer', 0) !== null) { + $content->find('footer', 0)->innertext = ''; } //Remove html nodes, keep only img, links, basic formatting @@ -168,7 +168,7 @@ EOD; $regex = implode( '', array( - "/timeline_unit", + '/timeline_unit', "\\\\\\\\u00253A1", "\\\\\\\\u00253A([0-9]*)", "\\\\\\\\u00253A([0-9]*)", @@ -182,18 +182,18 @@ EOD; return implode( '', array( - "https://touch.facebook.com/pages_reaction_units/more/?page_id=", + 'https://touch.facebook.com/pages_reaction_units/more/?page_id=', $pageID, - "&cursor=%7B%22timeline_cursor%22%3A%22timeline_unit%3A1%3A", + '&cursor=%7B%22timeline_cursor%22%3A%22timeline_unit%3A1%3A', $result[1], - "%3A", + '%3A', $result[2], - "%3A", + '%3A', $result[3], - "%3A", + '%3A', $result[4], - "%22%2C%22timeline_section_cursor%22%3A%7B%7D%2C%22", - "has_next_page%22%3Atrue%7D&surface=mobile_page_home&unit_count=3" + '%22%2C%22timeline_section_cursor%22%3A%7B%7D%2C%22', + 'has_next_page%22%3Atrue%7D&surface=mobile_page_home&unit_count=3' ) ); } @@ -201,7 +201,7 @@ EOD; //Builds the HTML from the encoded JS that Facebook provides. private function buildContent($pageContent){ - $regex = "/\\\"html\\\":\\\"(.*?)\\\",\\\"replace/"; + $regex = '/\\"html\\":\\"(.*?)\\",\\"replace/'; preg_match($regex, $pageContent, $result); return str_get_html(html_entity_decode(json_decode('"' . $result[1] . '"'))); @@ -214,7 +214,7 @@ EOD; $ctx = stream_context_create(array( 'http' => array( - 'user_agent' => "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0", + 'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0', 'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' ) ) @@ -222,12 +222,12 @@ EOD; $a = file_get_contents($pageURL, 0, $ctx); //First request to get the cookie - $cookies = ""; + $cookies = ''; foreach($http_response_header as $hdr) { - if(strpos($hdr, "Set-Cookie") !== false) { - $cLine = explode(":", $hdr)[1]; - $cLine = explode(";", $cLine)[0]; - $cookies .= ";" . $cLine; + if(strpos($hdr, 'Set-Cookie') !== false) { + $cLine = explode(':', $hdr)[1]; + $cLine = explode(';', $cLine)[0]; + $cookies .= ';' . $cLine; } } @@ -239,7 +239,7 @@ EOD; $context = stream_context_create(array( 'http' => array( - 'user_agent' => "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0", + 'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0', 'header' => 'Cookie: ' . $cookies ) ) @@ -247,12 +247,12 @@ EOD; $pageContent = file_get_contents($page, 0, $context); - if(strpos($pageContent, "signup-button") != false) { + if(strpos($pageContent, 'signup-button') != false) { return -1; } //Get the page ID if we don't have a captcha - $regex = "/page_id=([0-9]*)&/"; + $regex = '/page_id=([0-9]*)&/'; preg_match($regex, $pageContent, $matches); if(count($matches) > 0) { @@ -260,7 +260,7 @@ EOD; } //Get the page ID if we do have a captcha - $regex = "/\"pageID\":\"([0-9]*)\"/"; + $regex = '/"pageID":"([0-9]*)"/'; preg_match($regex, $pageContent, $matches); return $matches[1]; diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php index ce3275ea..4771225a 100644 --- a/bridges/FacebookBridge.php +++ b/bridges/FacebookBridge.php @@ -102,7 +102,7 @@ class FacebookBridge extends BridgeAbstract { if (isset($_SESSION['captcha_fields'], $_SESSION['captcha_action'])) { $captcha_action = $_SESSION['captcha_action']; $captcha_fields = $_SESSION['captcha_fields']; - $captcha_fields['captcha_response'] = preg_replace("/[^a-zA-Z0-9]+/", "", $_POST['captcha_response']); + $captcha_fields['captcha_response'] = preg_replace('/[^a-zA-Z0-9]+/', '', $_POST['captcha_response']); $header = array("Content-type: application/x-www-form-urlencoded\r\nReferer: $captcha_action\r\nCookie: noscript=1\r\n"); @@ -153,11 +153,11 @@ application/x-www-form-urlencoded\r\nReferer: $captcha_action\r\nCookie: noscrip } else { // First character cannot be a forward slash - if(strpos($this->getInput('u'), "/") === 0) { + if(strpos($this->getInput('u'), '/') === 0) { returnClientError('Remove leading slash "/" from the username!'); } - if(!strpos($this->getInput('u'), "/")) { + if(!strpos($this->getInput('u'), '/')) { $html = getSimpleHTMLDOM(self::URI . urlencode($this->getInput('u')) . '?_fb_noscript=1', $header) or returnServerError('No results for this query.'); } else { @@ -305,7 +305,7 @@ EOD; ); //Retrieve date of the post - $date = $post->find("abbr")[0]; + $date = $post->find('abbr')[0]; if(isset($date) && $date->hasAttribute('data-utime')) { $date = $date->getAttribute('data-utime'); } else { diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php index ac06cd53..22aead4a 100644 --- a/bridges/FootitoBridge.php +++ b/bridges/FootitoBridge.php @@ -15,47 +15,47 @@ class FootitoBridge extends BridgeAbstract { $content = trim($element->innertext); $content = str_replace( - "getURI()) - or returnServerError("Could not request 4chan, thread not found"); + or returnServerError('Could not request 4chan, thread not found'); foreach($html->find('div.postContainer') as $element) { $item = array(); diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php index 4f121d8a..0ed775de 100644 --- a/bridges/GithubIssueBridge.php +++ b/bridges/GithubIssueBridge.php @@ -106,7 +106,7 @@ class GithubIssueBridge extends BridgeAbstract { $content = $comment->parent()->innertext; } else { $title .= ' / ' . trim($comment->firstChild()->plaintext); - $content = "
" . $comment->find('.comment-body', 0)->innertext . "
"; + $content = '
' . $comment->find('.comment-body', 0)->innertext . '
'; } $item = array(); diff --git a/bridges/GoComicsBridge.php b/bridges/GoComicsBridge.php index 7a103f4b..3223d19a 100644 --- a/bridges/GoComicsBridge.php +++ b/bridges/GoComicsBridge.php @@ -19,26 +19,26 @@ class GoComicsBridge extends BridgeAbstract { or returnServerError('Could not request GoComics: ' . $this->getURI()); //Get info from first page - $author = preg_replace('/By /', '', $html->find(".media-subheading", 0)->plaintext); + $author = preg_replace('/By /', '', $html->find('.media-subheading', 0)->plaintext); - $link = self::URI . $html->find(".gc-deck--cta-0", 0)->find('a', 0)->href; + $link = self::URI . $html->find('.gc-deck--cta-0', 0)->find('a', 0)->href; for($i = 0; $i < 5; $i++) { $item = array(); $page = getSimpleHTMLDOM($link) or returnServerError('Could not request GoComics: ' . $link); - $imagelink = $page->find(".img-fluid", 1)->src; - $date = explode("/", $link); + $imagelink = $page->find('.img-fluid', 1)->src; + $date = explode('/', $link); $item['id'] = $imagelink; $item['uri'] = $link; $item['author'] = $author; $item['title'] = 'GoComics ' . $this->getInput('comicname'); - $item['timestamp'] = DateTime::createFromFormat("Ymd", $date[5] . $date[6] . $date[7])->getTimestamp(); + $item['timestamp'] = DateTime::createFromFormat('Ymd', $date[5] . $date[6] . $date[7])->getTimestamp(); $item['content'] = ''; - $link = self::URI . $page->find(".js-previous-comic", 0)->href; + $link = self::URI . $page->find('.js-previous-comic', 0)->href; $this->items[] = $item; } } diff --git a/bridges/GoogleSearchBridge.php b/bridges/GoogleSearchBridge.php index 2c4a5f1b..2eb58411 100644 --- a/bridges/GoogleSearchBridge.php +++ b/bridges/GoogleSearchBridge.php @@ -17,7 +17,7 @@ class GoogleSearchBridge extends BridgeAbstract { const PARAMETERS = array(array( 'q' => array( - 'name' => "keyword", + 'name' => 'keyword', 'required' => true ) )); diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php index c763128f..2539da25 100644 --- a/bridges/InstagramBridge.php +++ b/bridges/InstagramBridge.php @@ -85,7 +85,7 @@ class InstagramBridge extends BridgeAbstract { $item['content'] = $data[0]; $item['enclosures'] = $data[1]; } else { - $item['content'] = ''. $item['; + $item['content'] = ''. $item['title'] . ''; $item['enclosures'] = array($media->display_url); } diff --git a/bridges/KununuBridge.php b/bridges/KununuBridge.php index e99e1350..c0cf68a8 100644 --- a/bridges/KununuBridge.php +++ b/bridges/KununuBridge.php @@ -135,8 +135,8 @@ class KununuBridge extends BridgeAbstract { * Encodes unmlauts in the given text */ private function encodeUmlauts($text){ - $umlauts = Array("/ä/","/ö/","/ü/","/Ä/","/Ö/","/Ü/","/ß/"); - $replace = Array("ae","oe","ue","Ae","Oe","Ue","ss"); + $umlauts = Array('/ä/','/ö/','/ü/','/Ä/','/Ö/','/Ü/','/ß/'); + $replace = Array('ae','oe','ue','Ae','Oe','Ue','ss'); return preg_replace($umlauts, $replace, $text); } diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php index d4da546e..bb89d612 100644 --- a/bridges/LeBonCoinBridge.php +++ b/bridges/LeBonCoinBridge.php @@ -172,7 +172,7 @@ region, and optionally a category and a keyword .'; if($content_image !== null) { $content = 'thumbnail'; } else { - $content = ""; + $content = ''; } $date = $element->find('aside.item_absolute', 0)->find('p.item_sup', 0); diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php index 34145a1d..5f61f955 100644 --- a/bridges/LesJoiesDuCodeBridge.php +++ b/bridges/LesJoiesDuCodeBridge.php @@ -22,16 +22,16 @@ class LesJoiesDuCodeBridge extends BridgeAbstract { // retrieve .gif instead of static .jpg $images = $temp->find('p img'); foreach($images as $image) { - $img_src = str_replace(".jpg", ".gif", $image->src); + $img_src = str_replace('.jpg', '.gif', $image->src); $image->src = $img_src; } $content = $temp->innertext; $auteur = $temp->find('i', 0); - $pos = strpos($auteur->innertext, "by"); + $pos = strpos($auteur->innertext, 'by'); if($pos > 0) { - $auteur = trim(str_replace("*/", "", substr($auteur->innertext, ($pos + 2)))); + $auteur = trim(str_replace('*/', '', substr($auteur->innertext, ($pos + 2)))); $item['author'] = $auteur; } diff --git a/bridges/MangareaderBridge.php b/bridges/MangareaderBridge.php index cd7dddc1..91537069 100644 --- a/bridges/MangareaderBridge.php +++ b/bridges/MangareaderBridge.php @@ -100,7 +100,7 @@ class MangareaderBridge extends BridgeAbstract { case 'Get popular mangas': // Find manga name within "Popular mangas for ..." $pagetitle = $xpath->query(".//*[@id='bodyalt']/h1")->item(0)->nodeValue; - $this->request = substr($pagetitle, 0, strrpos($pagetitle, " -")); + $this->request = substr($pagetitle, 0, strrpos($pagetitle, ' -')); $this->getPopularMangas($xpath); break; case 'Get manga updates': @@ -120,7 +120,7 @@ class MangareaderBridge extends BridgeAbstract { // Return some dummy-data if no content available if(empty($this->items)) { $item = array(); - $item['content'] = "

No updates available

"; + $item['content'] = '

No updates available

'; $this->items[] = $item; } @@ -143,18 +143,18 @@ class MangareaderBridge extends BridgeAbstract { $item['title'] = htmlspecialchars($manga->nodeValue); // Add each chapter to the feed - $item['content'] = ""; + $item['content'] = ''; foreach ($chapters as $chapter) { - if($item['content'] <> "") { - $item['content'] .= "
"; + if($item['content'] <> '') { + $item['content'] .= '
'; } $item['content'] .= "" . htmlspecialchars($chapter->nodeValue) - . ""; + . ''; } $this->items[] = $item; @@ -211,13 +211,13 @@ EOD; foreach ($chapters as $chapter) { $item = array(); - $item['title'] = htmlspecialchars($xpath->query("td[1]", $chapter) + $item['title'] = htmlspecialchars($xpath->query('td[1]', $chapter) ->item(0) ->nodeValue); - $item['uri'] = self::URI . $xpath->query("td[1]/a", $chapter) + $item['uri'] = self::URI . $xpath->query('td[1]/a', $chapter) ->item(0) ->getAttribute('href'); - $item['timestamp'] = strtotime($xpath->query("td[2]", $chapter) + $item['timestamp'] = strtotime($xpath->query('td[2]', $chapter) ->item(0) ->nodeValue); array_unshift($this->items, $item); @@ -227,12 +227,12 @@ EOD; public function getURI(){ switch($this->queriedContext) { case 'Get latest updates': - $path = "latest"; + $path = 'latest'; break; case 'Get popular mangas': - $path = "popular"; - if($this->getInput('category') !== "all") { - $path .= "/" . $this->getInput('category'); + $path = 'popular'; + if($this->getInput('category') !== 'all') { + $path .= '/' . $this->getInput('category'); } break; case 'Get manga updates': diff --git a/bridges/NasaApodBridge.php b/bridges/NasaApodBridge.php index 74fd219b..8e293e0f 100644 --- a/bridges/NasaApodBridge.php +++ b/bridges/NasaApodBridge.php @@ -12,7 +12,7 @@ class NasaApodBridge extends BridgeAbstract { $html = getSimpleHTMLDOM(self::URI . 'archivepix.html') or returnServerError('Error while downloading the website content'); - $list = explode("
", $html->find('b', 0)->innertext); + $list = explode('
', $html->find('b', 0)->innertext); for($i = 0; $i < 3; $i++) { $line = $list[$i]; @@ -32,7 +32,7 @@ class NasaApodBridge extends BridgeAbstract { $explanation = $picture_html->find('p', 2)->innertext; //Extract date from the picture page - $date = explode(" ", $picture_html->find('p', 1)->innertext); + $date = explode(' ', $picture_html->find('p', 1)->innertext); $item['timestamp'] = strtotime($date[4] . $date[3] . $date[2]); //Other informations diff --git a/bridges/NotAlwaysBridge.php b/bridges/NotAlwaysBridge.php index 45727a70..f5efff4c 100644 --- a/bridges/NotAlwaysBridge.php +++ b/bridges/NotAlwaysBridge.php @@ -49,7 +49,7 @@ class NotAlwaysBridge extends BridgeAbstract { public function getURI(){ if(!is_null($this->getInput('filter'))) { - return self::URI . $this->getInput('filter') . "/"; + return self::URI . $this->getInput('filter') . '/'; } return parent::getURI(); diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php index 7eeafc1a..d2dd8907 100644 --- a/bridges/PinterestBridge.php +++ b/bridges/PinterestBridge.php @@ -44,7 +44,7 @@ class PinterestBridge extends FeedExpander { $pattern = '/https\:\/\/i\.pinimg\.com\/[a-zA-Z0-9]*x\//'; foreach($this->items as $item) { - $item["content"] = preg_replace($pattern, 'https://i.pinimg.com/originals/', $item["content"]); + $item['content'] = preg_replace($pattern, 'https://i.pinimg.com/originals/', $item['content']); $newitems[] = $item; } $this->items = $newitems; @@ -64,10 +64,10 @@ class PinterestBridge extends FeedExpander { // provide even less info. Thus we attempt multiple options. $item['title'] = trim($result['title']); - if($item['title'] === "") + if($item['title'] === '') $item['title'] = trim($result['rich_summary']['display_name']); - if($item['title'] === "") + if($item['title'] === '') $item['title'] = trim($result['grid_description']); $item['timestamp'] = strtotime($result['created_at']); diff --git a/bridges/PixivBridge.php b/bridges/PixivBridge.php index 2f15b4b4..3a4cc930 100644 --- a/bridges/PixivBridge.php +++ b/bridges/PixivBridge.php @@ -33,40 +33,40 @@ class PixivBridge extends BridgeAbstract { $count++; $item = array(); - $item["id"] = $result["illustId"]; - $item["uri"] = "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=" . $result["illustId"]; - $item["title"] = $result["illustTitle"]; - $item["author"] = $result["userName"]; + $item['id'] = $result['illustId']; + $item['uri'] = 'https://www.pixiv.net/member_illust.php?mode=medium&illust_id=' . $result['illustId']; + $item['title'] = $result['illustTitle']; + $item['author'] = $result['userName']; - preg_match_all($timeRegex, $result["url"], $dt, PREG_SET_ORDER, 0); - $elementDate = DateTime::createFromFormat("YmdHis", + preg_match_all($timeRegex, $result['url'], $dt, PREG_SET_ORDER, 0); + $elementDate = DateTime::createFromFormat('YmdHis', $dt[0][1] . $dt[0][2] . $dt[0][3] . $dt[0][4] . $dt[0][5] . $dt[0][6]); - $item["timestamp"] = $elementDate->getTimestamp(); + $item['timestamp'] = $elementDate->getTimestamp(); - $item["content"] = ""; + $item['content'] = ""; $this->items[] = $item; } } public function cacheImage($url, $illustId) { - $url = str_replace("_master1200", "", $url); - $url = str_replace("c/240x240/img-master/", "img-original/", $url); + $url = str_replace('_master1200', '', $url); + $url = str_replace('c/240x240/img-master/', 'img-original/', $url); $path = CACHE_DIR . '/pixiv_img'; if(!is_dir($path)) mkdir($path, 0755, true); if(!is_file($path . '/' . $illustId . '.jpeg')) { - $headers = array("Referer: https://www.pixiv.net/member_illust.php?mode=medium&illust_id=" . $illustId); + $headers = array('Referer: https://www.pixiv.net/member_illust.php?mode=medium&illust_id=' . $illustId); $illust = getContents($url, $headers); - if(strpos($illust, "404 Not Found") !== false) { - $illust = getContents(str_replace("jpg", "png", $url), $headers); + if(strpos($illust, '404 Not Found') !== false) { + $illust = getContents(str_replace('jpg', 'png', $url), $headers); } file_put_contents($path . '/' . $illustId . '.jpeg', $illust); } - return 'cache/pixiv_img/' . $illustId . ".jpeg"; + return 'cache/pixiv_img/' . $illustId . '.jpeg'; } diff --git a/bridges/RainbowSixSiegeBridge.php b/bridges/RainbowSixSiegeBridge.php index 302bb896..d362bbda 100644 --- a/bridges/RainbowSixSiegeBridge.php +++ b/bridges/RainbowSixSiegeBridge.php @@ -8,9 +8,9 @@ class RainbowSixSiegeBridge extends BridgeAbstract { const DESCRIPTION = 'Latest articles from the Rainbow Six Siege blog'; public function collectData(){ - $dlUrl = "https://prod-tridionservice.ubisoft.com/live/v1/News/Latest?templateId=tcm%3A152-7677"; - $dlUrl .= "8-32&pageIndex=0&pageSize=10&language=en-US&detailPageId=tcm%3A152-194572-64"; - $dlUrl .= "&keywordList=175426&siteId=undefined&useSeoFriendlyUrl=true"; + $dlUrl = 'https://prod-tridionservice.ubisoft.com/live/v1/News/Latest?templateId=tcm%3A152-7677'; + $dlUrl .= '8-32&pageIndex=0&pageSize=10&language=en-US&detailPageId=tcm%3A152-194572-64'; + $dlUrl .= '&keywordList=175426&siteId=undefined&useSeoFriendlyUrl=true'; $jsonString = getContents($dlUrl) or returnServerError('Error while downloading the website content'); $json = json_decode($jsonString, true); diff --git a/bridges/ReadComicsBridge.php b/bridges/ReadComicsBridge.php index 33c8ed9e..739e6ccb 100644 --- a/bridges/ReadComicsBridge.php +++ b/bridges/ReadComicsBridge.php @@ -25,7 +25,7 @@ class ReadComicsBridge extends BridgeAbstract { return $timestamp; } - $keywordsList = explode(";", $this->getInput('q')); + $keywordsList = explode(';', $this->getInput('q')); foreach($keywordsList as $keywords) { $html = $this->getSimpleHTMLDOM(self::URI . 'comic/' . rawurlencode($keywords)) or $this->returnServerError('Could not request readcomics.tv.'); diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php index db1104c1..438c55be 100644 --- a/bridges/ReporterreBridge.php +++ b/bridges/ReporterreBridge.php @@ -19,7 +19,7 @@ class ReporterreBridge extends BridgeAbstract { // Replace all relative urls with absolute ones $text = preg_replace( '/(href|src)(\=[\"\'])(?!http)([^"\']+)/ims', - "$1$2" . self::URI . "$3", + '$1$2' . self::URI . '$3', $text ); diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php index 65991225..72f01eb9 100644 --- a/bridges/Rue89Bridge.php +++ b/bridges/Rue89Bridge.php @@ -9,9 +9,9 @@ class Rue89Bridge extends FeedExpander { protected function parseItem($item){ $item = parent::parseItem($item); - $url = "http://api.rue89.nouvelobs.com/export/mobile2/node/" - . str_replace(" ", "", substr($item['uri'], -8)) - . "/full"; + $url = 'http://api.rue89.nouvelobs.com/export/mobile2/node/' + . str_replace(' ', '', substr($item['uri'], -8)) + . '/full'; $datas = json_decode(getContents($url), true); $item['content'] = $datas['node']['body']; diff --git a/bridges/SexactuBridge.php b/bridges/SexactuBridge.php index 5bc552ab..b0a71745 100644 --- a/bridges/SexactuBridge.php +++ b/bridges/SexactuBridge.php @@ -32,7 +32,7 @@ class SexactuBridge extends BridgeAbstract { $item = array(); $item['author'] = self::AUTHOR; $item['title'] = $title->plaintext; - $urlAttribute = "data-href"; + $urlAttribute = 'data-href'; $uri = $title->$urlAttribute; if($uri === false) continue; diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php index e86f7729..6eadcb12 100644 --- a/bridges/ShanaprojectBridge.php +++ b/bridges/ShanaprojectBridge.php @@ -73,7 +73,7 @@ class ShanaprojectBridge extends BridgeAbstract { // Getting the picture is a little bit tricky as it is part of the style. // Luckily the style is part of the parent div :) - if(preg_match("/url\(\/\/([^\)]+)\)/i", $anime->parent->style, $matches)) + if(preg_match('/url\(\/\/([^\)]+)\)/i', $anime->parent->style, $matches)) return $matches[1]; returnServerError('Could not extract background image!'); diff --git a/bridges/Shimmie2Bridge.php b/bridges/Shimmie2Bridge.php index efbcd9b7..bdbc504a 100644 --- a/bridges/Shimmie2Bridge.php +++ b/bridges/Shimmie2Bridge.php @@ -21,7 +21,7 @@ class Shimmie2Bridge extends DanbooruBridge { protected function getItemFromElement($element){ $item = array(); $item['uri'] = $this->getURI() . $element->href; - $item['id'] = (int)preg_replace("/[^0-9]/", '', $element->getAttribute(static::IDATTRIBUTE)); + $item['id'] = (int)preg_replace('/[^0-9]/', '', $element->getAttribute(static::IDATTRIBUTE)); $item['timestamp'] = time(); $thumbnailUri = $this->getURI() . $element->find('img', 0)->src; $item['tags'] = $element->getAttribute('data-tags'); diff --git a/bridges/SuperSmashBlogBridge.php b/bridges/SuperSmashBlogBridge.php index 06c58fca..9216ef6e 100644 --- a/bridges/SuperSmashBlogBridge.php +++ b/bridges/SuperSmashBlogBridge.php @@ -8,7 +8,7 @@ class SuperSmashBlogBridge extends BridgeAbstract { const DESCRIPTION = 'Latest articles from the Super Smash Blog blog'; public function collectData(){ - $dlUrl = "https://www.smashbros.com/data/bs/en_US/json/en_US.json"; + $dlUrl = 'https://www.smashbros.com/data/bs/en_US/json/en_US.json'; $jsonString = getContents($dlUrl) or returnServerError('Error while downloading the website content'); $json = json_decode($jsonString, true); diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php index 0110754d..70c0db41 100644 --- a/bridges/VkBridge.php +++ b/bridges/VkBridge.php @@ -66,7 +66,7 @@ class VkBridge extends BridgeAbstract $post->find('a.wall_post_more', 0)->outertext = ''; } - $content_suffix = ""; + $content_suffix = ''; // looking for external links $external_link_selectors = array( @@ -81,8 +81,8 @@ class VkBridge extends BridgeAbstract $innertext = $a->innertext; $parsed_url = parse_url($a->getAttribute('href')); if (strpos($parsed_url['path'], '/away.php') !== 0) continue; - parse_str($parsed_url["query"], $parsed_query); - $content_suffix .= "
External link: $innertext"; + parse_str($parsed_url['query'], $parsed_query); + $content_suffix .= "
External link: $innertext"; } } @@ -100,17 +100,17 @@ class VkBridge extends BridgeAbstract } // looking for article - $article = $post->find("a.article_snippet", 0); + $article = $post->find('a.article_snippet', 0); if (is_object($article)) { - if (strpos($article->getAttribute('class'), "article_snippet_mini") !== false) { - $article_title_selector = "div.article_snippet_mini_title"; - $article_author_selector = "div.article_snippet_mini_info > .mem_link, - div.article_snippet_mini_info > .group_link"; - $article_thumb_selector = "div.article_snippet_mini_thumb"; + if (strpos($article->getAttribute('class'), 'article_snippet_mini') !== false) { + $article_title_selector = 'div.article_snippet_mini_title'; + $article_author_selector = 'div.article_snippet_mini_info > .mem_link, + div.article_snippet_mini_info > .group_link'; + $article_thumb_selector = 'div.article_snippet_mini_thumb'; } else { - $article_title_selector = "div.article_snippet__title"; - $article_author_selector = "div.article_snippet__author"; - $article_thumb_selector = "div.article_snippet__image"; + $article_title_selector = 'div.article_snippet__title'; + $article_author_selector = 'div.article_snippet__author'; + $article_thumb_selector = 'div.article_snippet__image'; } $article_title = $article->find($article_title_selector, 0)->innertext; $article_author = $article->find($article_author_selector, 0)->innertext; @@ -136,7 +136,7 @@ class VkBridge extends BridgeAbstract // get all other videos foreach($post->find('a.page_post_thumb_video') as $a) { $video_title = $a->getAttribute('aria-label'); - $temp = explode(" ", $video_title, 2); + $temp = explode(' ', $video_title, 2); if (count($temp) > 1) $video_title = $temp[1]; $video_link = self::URI . ltrim( $a->getAttribute('href'), '/' ); $content_suffix .= "
Video: $video_title"; @@ -163,8 +163,8 @@ class VkBridge extends BridgeAbstract // get photo documents foreach($post->find('a.page_doc_photo_href') as $a) { $doc_link = self::URI . ltrim($a->getAttribute('href'), '/'); - $doc_gif_label_element = $a->find(".page_gif_label", 0); - $doc_title_element = $a->find(".doc_label", 0); + $doc_gif_label_element = $a->find('.page_gif_label', 0); + $doc_title_element = $a->find('.doc_label', 0); if (is_object($doc_gif_label_element)) { $gif_preview_img = backgroundToImg($a->find('.page_doc_photo', 0)); @@ -184,7 +184,7 @@ class VkBridge extends BridgeAbstract // get other documents foreach($post->find('div.page_doc_row') as $div) { - $doc_title_element = $div->find("a.page_doc_title", 0); + $doc_title_element = $div->find('a.page_doc_title', 0); if (is_object($doc_title_element)) { $doc_title = $doc_title_element->innertext; @@ -204,7 +204,7 @@ class VkBridge extends BridgeAbstract $poll_title = $div->find('.page_media_poll_title', 0)->innertext; $content_suffix .= "
Poll: $poll_title"; foreach($div->find('div.page_poll_text') as $poll_stat_title) { - $content_suffix .= "
- " . $poll_stat_title->innertext; + $content_suffix .= '
- ' . $poll_stat_title->innertext; } $div->outertext = ''; } @@ -231,10 +231,10 @@ class VkBridge extends BridgeAbstract // get post link $post_link = $post->find('a.post_link', 0)->getAttribute('href'); - preg_match("/wall-?\d+_(\d+)/", $post_link, $preg_match_result); + preg_match('/wall-?\d+_(\d+)/', $post_link, $preg_match_result); $item['post_id'] = intval($preg_match_result[1]); if (substr(self::URI, -1) == '/') { - $post_link = self::URI . ltrim($post_link, "/"); + $post_link = self::URI . ltrim($post_link, '/'); } else { $post_link = self::URI . $post_link; } @@ -273,17 +273,17 @@ class VkBridge extends BridgeAbstract $data = json_decode($arg, true); if ($data == null) return; - $thumb = $data['temp']['base'] . $data['temp']['x_'][0] . ".jpg"; + $thumb = $data['temp']['base'] . $data['temp']['x_'][0] . '.jpg'; $original = ''; foreach(array('y_', 'z_', 'w_') as $key) { if (!isset($data['temp'][$key])) continue; if (!isset($data['temp'][$key][0])) continue; - if (substr($data['temp'][$key][0], 0, 4) == "http") { - $base = ""; + if (substr($data['temp'][$key][0], 0, 4) == 'http') { + $base = ''; } else { $base = $data['temp']['base']; } - $original = $base . $data['temp'][$key][0] . ".jpg"; + $original = $base . $data['temp'][$key][0] . '.jpg'; } if ($original) { @@ -296,7 +296,7 @@ class VkBridge extends BridgeAbstract private function getTitle($content) { preg_match('/^["\w\ \p{Cyrillic}\(\)\?#«»-]+/mu', htmlspecialchars_decode($content), $result); - if (count($result) == 0) return "untitled"; + if (count($result) == 0) return 'untitled'; return $result[0]; } diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php index accdb759..347db6ea 100644 --- a/bridges/WhydBridge.php +++ b/bridges/WhydBridge.php @@ -18,10 +18,10 @@ class WhydBridge extends BridgeAbstract { public function collectData(){ $html = ''; - if(strlen(preg_replace("/[^0-9a-f]/", '', $this->getInput('u'))) == 24) { + if(strlen(preg_replace('/[^0-9a-f]/', '', $this->getInput('u'))) == 24) { // is input the userid ? $html = getSimpleHTMLDOM( - self::URI . 'u/' . preg_replace("/[^0-9a-f]/", '', $this->getInput('u')) + self::URI . 'u/' . preg_replace('/[^0-9a-f]/', '', $this->getInput('u')) ) or returnServerError('No results for this query.'); } else { // input may be the username $html = getSimpleHTMLDOM( diff --git a/bridges/YGGTorrentBridge.php b/bridges/YGGTorrentBridge.php index c6d38a57..bc434d34 100644 --- a/bridges/YGGTorrentBridge.php +++ b/bridges/YGGTorrentBridge.php @@ -12,72 +12,72 @@ class YGGTorrentBridge extends BridgeAbstract { const PARAMETERS = array( array( - "cat" => array( - "name" => "category", - "type" => "list", - "values" => array( - "Toute les catégories" => "all.all", - "Film/Vidéo - Toutes les sous-catégories" => "2145.all", - "Film/Vidéo - Animation" => "2145.2178", - "Film/Vidéo - Animation Série" => "2145.2179", - "Film/Vidéo - Concert" => "2145.2180", - "Film/Vidéo - Documentaire" => "2145.2181", - "Film/Vidéo - Émission TV" => "2145.2182", - "Film/Vidéo - Film" => "2145.2183", - "Film/Vidéo - Série TV" => "2145.2184", - "Film/Vidéo - Spectacle" => "2145.2185", - "Film/Vidéo - Sport" => "2145.2186", - "Film/Vidéo - Vidéo-clips" => "2145.2186", - "Audio - Toutes les sous-catégories" => "2139.all", - "Audio - Karaoké" => "2139.2147", - "Audio - Musique" => "2139.2148", - "Audio - Podcast Radio" => "2139.2150", - "Audio - Samples" => "2139.2149", - "Jeu vidéo - Toutes les sous-catégories" => "2142.all", - "Jeu vidéo - Autre" => "2142.2167", - "Jeu vidéo - Linux" => "2142.2159", - "Jeu vidéo - MacOS" => "2142.2160", - "Jeu vidéo - Microsoft" => "2142.2162", - "Jeu vidéo - Nintendo" => "2142.2163", - "Jeu vidéo - Smartphone" => "2142.2165", - "Jeu vidéo - Sony" => "2142.2164", - "Jeu vidéo - Tablette" => "2142.2166", - "Jeu vidéo - Windows" => "2142.2161", - "eBook - Toutes les sous-catégories" => "2140.all", - "eBook - Audio" => "2140.2151", - "eBook - Bds" => "2140.2152", - "eBook - Comics" => "2140.2153", - "eBook - Livres" => "2140.2154", - "eBook - Mangas" => "2140.2155", - "eBook - Presse" => "2140.2156", - "Emulation - Toutes les sous-catégories" => "2141.all", - "Emulation - Emulateurs" => "2141.2157", - "Emulation - Roms" => "2141.2158", - "GPS - Toutes les sous-catégories" => "2141.all", - "GPS - Applications" => "2141.2168", - "GPS - Cartes" => "2141.2169", - "GPS - Divers" => "2141.2170" + 'cat' => array( + 'name' => 'category', + 'type' => 'list', + 'values' => array( + 'Toute les catégories' => 'all.all', + 'Film/Vidéo - Toutes les sous-catégories' => '2145.all', + 'Film/Vidéo - Animation' => '2145.2178', + 'Film/Vidéo - Animation Série' => '2145.2179', + 'Film/Vidéo - Concert' => '2145.2180', + 'Film/Vidéo - Documentaire' => '2145.2181', + 'Film/Vidéo - Émission TV' => '2145.2182', + 'Film/Vidéo - Film' => '2145.2183', + 'Film/Vidéo - Série TV' => '2145.2184', + 'Film/Vidéo - Spectacle' => '2145.2185', + 'Film/Vidéo - Sport' => '2145.2186', + 'Film/Vidéo - Vidéo-clips' => '2145.2186', + 'Audio - Toutes les sous-catégories' => '2139.all', + 'Audio - Karaoké' => '2139.2147', + 'Audio - Musique' => '2139.2148', + 'Audio - Podcast Radio' => '2139.2150', + 'Audio - Samples' => '2139.2149', + 'Jeu vidéo - Toutes les sous-catégories' => '2142.all', + 'Jeu vidéo - Autre' => '2142.2167', + 'Jeu vidéo - Linux' => '2142.2159', + 'Jeu vidéo - MacOS' => '2142.2160', + 'Jeu vidéo - Microsoft' => '2142.2162', + 'Jeu vidéo - Nintendo' => '2142.2163', + 'Jeu vidéo - Smartphone' => '2142.2165', + 'Jeu vidéo - Sony' => '2142.2164', + 'Jeu vidéo - Tablette' => '2142.2166', + 'Jeu vidéo - Windows' => '2142.2161', + 'eBook - Toutes les sous-catégories' => '2140.all', + 'eBook - Audio' => '2140.2151', + 'eBook - Bds' => '2140.2152', + 'eBook - Comics' => '2140.2153', + 'eBook - Livres' => '2140.2154', + 'eBook - Mangas' => '2140.2155', + 'eBook - Presse' => '2140.2156', + 'Emulation - Toutes les sous-catégories' => '2141.all', + 'Emulation - Emulateurs' => '2141.2157', + 'Emulation - Roms' => '2141.2158', + 'GPS - Toutes les sous-catégories' => '2141.all', + 'GPS - Applications' => '2141.2168', + 'GPS - Cartes' => '2141.2169', + 'GPS - Divers' => '2141.2170' ) ), - "nom" => array( - "name" => "Nom", - "description" => "Nom du torrent", - "type" => "text" + 'nom' => array( + 'name' => 'Nom', + 'description' => 'Nom du torrent', + 'type' => 'text' ), - "description" => array( - "name" => "Description", - "description" => "Description du torrent", - "type" => "text" + 'description' => array( + 'name' => 'Description', + 'description' => 'Description du torrent', + 'type' => 'text' ), - "fichier" => array( - "name" => "Fichier", - "description" => "Fichier du torrent", - "type" => "text" + 'fichier' => array( + 'name' => 'Fichier', + 'description' => 'Fichier du torrent', + 'type' => 'text' ), - "uploader" => array( - "name" => "Uploader", - "description" => "Uploader du torrent", - "type" => "text" + 'uploader' => array( + 'name' => 'Uploader', + 'description' => 'Uploader du torrent', + 'type' => 'text' ), ) @@ -85,42 +85,42 @@ class YGGTorrentBridge extends BridgeAbstract { public function collectData() { - $catInfo = explode(".", $this->getInput("cat")); + $catInfo = explode('.', $this->getInput('cat')); $category = $catInfo[0]; $subcategory = $catInfo[1]; - $html = getSimpleHTMLDOM(self::URI . "/engine/search?name=" - . $this->getInput("nom") - . "&description=" - . $this->getInput("description") - . "&fichier=" - . $this->getInput("fichier") - . "&file=" - . $this->getInput("uploader") - . "&category=" + $html = getSimpleHTMLDOM(self::URI . '/engine/search?name=' + . $this->getInput('nom') + . '&description=' + . $this->getInput('description') + . '&fichier=' + . $this->getInput('fichier') + . '&file=' + . $this->getInput('uploader') + . '&category=' . $category - . "&sub_category=" + . '&sub_category=' . $subcategory - . "&do=search") - or returnServerError("Unable to query Yggtorrent !"); + . '&do=search') + or returnServerError('Unable to query Yggtorrent !'); $count = 0; - $results = $html->find(".results", 0); + $results = $html->find('.results', 0); if(!$results) return; - foreach($results->find("tr") as $row) { + foreach($results->find('tr') as $row) { $count++; if($count == 1) continue; if($count == 12) break; $item = array(); - $item["timestamp"] = $row->find(".hidden", 1)->plaintext; - $item["title"] = $row->find("a", 1)->plaintext; - $torrentData = $this->collectTorrentData($row->find("a", 1)->href); - $item["author"] = $torrentData["author"]; - $item["content"] = $torrentData["content"]; - $item["seeders"] = $row->find("td", 7)->plaintext; - $item["leechers"] = $row->find("td", 8)->plaintext; - $item["size"] = $row->find("td", 5)->plaintext; + $item['timestamp'] = $row->find('.hidden', 1)->plaintext; + $item['title'] = $row->find('a', 1)->plaintext; + $torrentData = $this->collectTorrentData($row->find('a', 1)->href); + $item['author'] = $torrentData['author']; + $item['content'] = $torrentData['content']; + $item['seeders'] = $row->find('td', 7)->plaintext; + $item['leechers'] = $row->find('td', 8)->plaintext; + $item['size'] = $row->find('td', 5)->plaintext; $this->items[] = $item; } @@ -130,14 +130,14 @@ class YGGTorrentBridge extends BridgeAbstract { public function collectTorrentData($url) { //For weird reason, the link we get can be invalid, we fix it. - $url_full = explode("/", $url); + $url_full = explode('/', $url); $url_full[4] = urlencode($url_full[4]); $url_full[5] = urlencode($url_full[5]); $url_full[6] = urlencode($url_full[6]); - $url = implode("/", $url_full); - $page = getSimpleHTMLDOM($url) or returnServerError("Unable to query Yggtorrent page !"); - $author = $page->find(".informations", 0)->find("a", 4)->plaintext; - $content = $page->find(".default", 1); - return array("author" => $author, "content" => $content); + $url = implode('/', $url_full); + $page = getSimpleHTMLDOM($url) or returnServerError('Unable to query Yggtorrent page !'); + $author = $page->find('.informations', 0)->find('a', 4)->plaintext; + $content = $page->find('.default', 1); + return array('author' => $author, 'content' => $content); } } diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php index 043d965e..e597fe3a 100644 --- a/bridges/YoutubeBridge.php +++ b/bridges/YoutubeBridge.php @@ -25,14 +25,14 @@ class YoutubeBridge extends BridgeAbstract { 'By channel id' => array( 'c' => array( 'name' => 'channel id', - 'exampleValue' => "15", + 'exampleValue' => '15', 'required' => true ) ), 'By playlist Id' => array( 'p' => array( 'name' => 'playlist id', - 'exampleValue' => "15" + 'exampleValue' => '15' ) ), 'Search result' => array( @@ -195,7 +195,7 @@ class YoutubeBridge extends BridgeAbstract { $this->request = $this->getInput('s'); $page = 1; if($this->getInput('pa')) - $page = (int)preg_replace("/[^0-9]/", '', $this->getInput('pa')); + $page = (int)preg_replace('/[^0-9]/', '', $this->getInput('pa')); $url_listing = self::URI . 'results?search_query=' diff --git a/caches/FileCache.php b/caches/FileCache.php index 0ca36d22..de17d527 100644 --- a/caches/FileCache.php +++ b/caches/FileCache.php @@ -19,7 +19,7 @@ class FileCache implements CacheInterface { $writeStream = file_put_contents($this->getCacheFile(), serialize($datas)); if($writeStream === false) { - throw new \Exception("Cannot write the cache... Do you have the right permissions ?"); + throw new \Exception('Cannot write the cache... Do you have the right permissions ?'); } return $this; diff --git a/lib/Configuration.php b/lib/Configuration.php index d491fc4a..02a908c9 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -26,7 +26,7 @@ class Configuration { die('"curl" extension not loaded. Please check "php.ini"'); // configuration checks - if(ini_get('allow_url_fopen') !== "1") + if(ini_get('allow_url_fopen') !== '1') die('"allow_url_fopen" is not set to "1". Please check "php.ini'); // Check cache folder permissions (write permissions required) diff --git a/lib/FeedExpander.php b/lib/FeedExpander.php index 9702ce32..6e1f16ff 100644 --- a/lib/FeedExpander.php +++ b/lib/FeedExpander.php @@ -24,15 +24,15 @@ abstract class FeedExpander extends BridgeAbstract { switch(true) { case isset($rssContent->item[0]): debugMessage('Detected RSS 1.0 format'); - $this->feedType = "RSS_1_0"; + $this->feedType = 'RSS_1_0'; break; case isset($rssContent->channel[0]): debugMessage('Detected RSS 0.9x or 2.0 format'); - $this->feedType = "RSS_2_0"; + $this->feedType = 'RSS_2_0'; break; case isset($rssContent->entry[0]): debugMessage('Detected ATOM format'); - $this->feedType = "ATOM_1_0"; + $this->feedType = 'ATOM_1_0'; break; default: debugMessage('Unknown feed format/version'); diff --git a/lib/html.php b/lib/html.php index eec47ae0..297ab801 100644 --- a/lib/html.php +++ b/lib/html.php @@ -26,7 +26,7 @@ EOD; $bridge = Bridge::create($bridgeName); if($bridge == false) - return ""; + return ''; $HTTPSWarning = ''; if(strpos($bridge->getURI(), 'https') !== 0) { diff --git a/phpcs.xml b/phpcs.xml index c88b0f50..a67262ce 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -70,4 +70,8 @@ + + + + From 71c29d41920870b4669eb714b022e56be0845a68 Mon Sep 17 00:00:00 2001 From: teromene Date: Fri, 29 Jun 2018 23:15:22 +0100 Subject: [PATCH 014/146] Fix phpcs for master. --- bridges/ContainerLinuxReleasesBridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/ContainerLinuxReleasesBridge.php b/bridges/ContainerLinuxReleasesBridge.php index bcb421d2..ce3235ff 100644 --- a/bridges/ContainerLinuxReleasesBridge.php +++ b/bridges/ContainerLinuxReleasesBridge.php @@ -66,7 +66,7 @@ EOT; $regex = '/\n\s*[\*|\-](.*)/'; $item['content'] = preg_replace_callback ($regex, function($regs) { $item = $regs[1]; - return sprintf ("
  • %s
", trim ($item)); + return sprintf ('
  • %s
', trim ($item)); }, $item['content']); $this->items[] = $item; From da6b98851caa490043893869738f96dd7db35a18 Mon Sep 17 00:00:00 2001 From: Teromene Date: Sat, 30 Jun 2018 09:24:22 +0100 Subject: [PATCH 015/146] Add recuperation of the current version from git if available (#731) * Add recuperation of the current version from git if available * Include version when auto-reporting an error --- index.php | 3 ++- lib/Configuration.php | 19 +++++++++++++++++++ lib/Exceptions.php | 5 ++++- static/style.css | 5 +++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 8cb8908e..4a1e2aa2 100644 --- a/index.php +++ b/index.php @@ -253,7 +253,8 @@ EOD; echo $inactiveBridges; ?>
- RSS-Bridge 2018-06-10 ~ Public Domain
+ RSS-Bridge ~ Public Domain
+

/ active bridges.
getMessage() . "`\nQuery string: `" - . $_SERVER['QUERY_STRING'] . '`'; + . $_SERVER['QUERY_STRING'] + . "`\nVersion: `" + . Configuration::getVersion() + . '`'; $link = buildGitHubIssueQuery($title, $body, 'bug report', $bridge->getMaintainer()); diff --git a/static/style.css b/static/style.css index c7a278db..ac2f4690 100644 --- a/static/style.css +++ b/static/style.css @@ -143,6 +143,11 @@ section.footer:hover { } +section.footer .version { + + font-size: 80%; + +} section > h2 { From 90dc968fd1f199ae886c1ea9c436137e1dab1738 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sat, 30 Jun 2018 10:26:48 +0200 Subject: [PATCH 016/146] Fix PHPCS error --- lib/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Configuration.php b/lib/Configuration.php index 3fe5b7c3..09ab539f 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -1,7 +1,7 @@ Date: Sat, 30 Jun 2018 09:53:01 +0200 Subject: [PATCH 017/146] [KununuBridge] Fix broken page layout and sort reviews --- bridges/KununuBridge.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridges/KununuBridge.php b/bridges/KununuBridge.php index c0cf68a8..85f7c7bc 100644 --- a/bridges/KununuBridge.php +++ b/bridges/KununuBridge.php @@ -58,7 +58,7 @@ class KununuBridge extends BridgeAbstract { break; } - return self::URI . $site . '/' . $company . '/' . $section; + return self::URI . $site . '/' . $company . '/' . $section . '?sort=update_time_desc'; } return parent::getURI(); @@ -190,11 +190,11 @@ class KununuBridge extends BridgeAbstract { * Returns the URI from a given article */ private function extractArticleUri($article){ - $anchor = $article->find('ku-company-review-more', 0); + $anchor = $article->find('h1.review-title a', 0); if(is_null($anchor)) returnServerError('Cannot find article URI!'); - return self::URI . $anchor->{'review-url'}; + return self::URI . $anchor->href; } /** From 2bc8daa101a6a976452b3a6f4d0c59f4ad191578 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sat, 30 Jun 2018 00:19:19 +0200 Subject: [PATCH 018/146] [JustETFBridge] Add new bridge Supports latest news and profiling a given ETF in Englisch, German or Italian language. Cover images are attached as enclosures and not as part of the content. News: Optionally loads the full article for each news item. Some articles may include scripts to provide interactive graphs. These scripts are removed as they would be rendered as pure text and a message is shown instead: "[Content removed! Visit site to see full contents!]" Profile: Optionally includes the ETF strategy and description. --- bridges/JustETFBridge.php | 353 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 353 insertions(+) create mode 100644 bridges/JustETFBridge.php diff --git a/bridges/JustETFBridge.php b/bridges/JustETFBridge.php new file mode 100644 index 00000000..f0223e91 --- /dev/null +++ b/bridges/JustETFBridge.php @@ -0,0 +1,353 @@ + array( + 'full' => array( + 'name' => 'Full Article', + 'type' => 'checkbox', + 'title' => 'Enable to load full articles' + ) + ), + 'Profile' => array( + 'isin' => array( + 'name' => 'ISIN', + 'type' => 'text', + 'required' => true, + 'pattern' => '[a-zA-Z]{2}[a-zA-Z0-9]{10}', + 'title' => 'ISIN, consisting of 2-letter country code, 9-character identifier, check character' + ), + 'strategy' => array( + 'name' => 'Include Strategy', + 'type' => 'checkbox', + 'defaultValue' => 'checked' + ), + 'description' => array( + 'name' => 'Include Description', + 'type' => 'checkbox', + 'defaultValue' => 'checked' + ) + ), + 'global' => array( + 'lang' => array( + 'name' => 'Language', + 'required' => true, + 'type' => 'list', + 'values' => array( + 'Englisch' => 'en', + 'Deutsch' => 'de', + 'Italiano' => 'it' + ), + 'defaultValue' => 'Englisch' + ) + ) + ); + + public function collectData() { + $html = getSimpleHTMLDOM($this->getURI()) + or returnServerError('Failed loading contents from ' . $this->getURI()); + + defaultLinkTo($html, static::URI); + + switch($this->queriedContext) { + case 'News': + $this->collectNews($html); + break; + case 'Profile': + $this->collectProfile($html); + break; + } + } + + public function getURI() { + $uri = static::URI; + + if($this->getInput('lang')) { + $uri .= '/' . $this->getInput('lang'); + } + + switch($this->queriedContext) { + case 'News': + $uri .= '/news'; + break; + case 'Profile': + $uri .= '/etf-profile.html?' . http_build_query(array( + 'isin' => strtoupper($this->getInput('isin')) + )); + break; + } + + return $uri; + } + + public function getName() { + $name = static::NAME; + + $name .= ($this->queriedContext) ? ' - ' . $this->queriedContext : ''; + + switch($this->queriedContext) { + case 'News': break; + case 'Profile': + if($this->getInput('isin')) { + $name .= ' ISIN ' . strtoupper($this->getInput('isin')); + } + } + + if($this->getInput('lang')) { + $name .= ' (' . strtoupper($this->getInput('lang')) . ')'; + } + + return $name; + } + + #region Common + + /** + * Fixes dates depending on the choosen language: + * + * de : dd.mm.yy + * en : dd.mm.yy + * it : dd/mm/yy + * + * Basically strtotime doesn't convert dates correctly due to formats + * being hard to interpret. So we use the DateTime object, manually + * fixing dates and times (set to 00:00:00.000). + * + * We don't know the timezone, so just assume +00:00 (or whatever + * DateTime chooses) + */ + private function fixDate($date) { + switch($this->getInput('lang')) { + case 'en': + case 'de': + $df = date_create_from_format('d.m.y', $date); + break; + case 'it': + $df = date_create_from_format('d/m/y', $date); + break; + } + + date_time_set($df, 0, 0); + + // debugMessage(date_format($df, 'U')); + + return date_format($df, 'U'); + } + + private function extractImages($article) { + // Notice: We can have zero or more images (though it should mostly be 1) + $elements = $article->find('img'); + + $images = array(); + + foreach($elements as $img) { + // Skip the logo (mostly provided part of a hidden div) + if(substr($img->src, strrpos($img->src, '/') + 1) === 'logo.png') + continue; + + $images[] = $img->src; + } + + return $images; + } + + #endregion + + #region News + + private function collectNews($html) { + $articles = $html->find('div.newsTopArticle') + or returnServerError('No articles found! Layout might have changed!'); + + foreach($articles as $article) { + + $item = array(); + + // Common data + + $item['uri'] = $this->extractNewsUri($article); + $item['timestamp'] = $this->extractNewsDate($article); + $item['title'] = $this->extractNewsTitle($article); + + if($this->getInput('full')) { + + $uri = $this->extractNewsUri($article); + + $html = getSimpleHTMLDOMCached($uri) + or returnServerError('Failed loading full article from ' . $uri); + + $fullArticle = $html->find('div.article', 0) + or returnServerError('No content found! Layout might have changed!'); + + defaultLinkTo($fullArticle, static::URI); + + $item['author'] = $this->extractFullArticleAuthor($fullArticle); + $item['content'] = $this->extractFullArticleContent($fullArticle); + $item['enclosures'] = $this->extractImages($fullArticle); + + } else { + + $item['content'] = $this->extractNewsDescription($article); + $item['enclosures'] = $this->extractImages($article); + + } + + $this->items[] = $item; + } + } + + private function extractNewsUri($article) { + $element = $article->find('a', 0) + or returnServerError('Anchor not found!'); + + return $element->href; + } + + private function extractNewsDate($article) { + $element = $article->find('div.subheadline', 0) + or returnServerError('Date not found!'); + + // debugMessage($element->plaintext); + + $date = trim(explode('|', $element->plaintext)[0]); + + return $this->fixDate($date); + } + + private function extractNewsDescription($article) { + $element = $article->find('span.newsText', 0) + or returnServerError('Description not found!'); + + $element->find('a', 0)->onclick = ''; + + // debugMessage($element->innertext); + + return $element->innertext; + } + + private function extractNewsTitle($article) { + $element = $article->find('h3', 0) + or returnServerError('Title not found!'); + + return $element->plaintext; + } + + private function extractFullArticleContent($article) { + $element = $article->find('div.article_body', 0) + or returnServerError('Article body not found!'); + + // Remove teaser image + $element->find('img.teaser-img', 0)->outertext = ''; + + // Remove self advertisements + foreach($element->find('.call-action') as $adv) { + $adv->outertext = ''; + } + + // Remove tips + foreach($element->find('.panel-edu') as $tip) { + $tip->outertext = ''; + } + + // Remove inline scripts (used for i.e. interactive graphs) as they are + // rendered as a long series of strings + foreach($element->find('script') as $script) { + $script->outertext = '[Content removed! Visit site to see full contents!]'; + } + + return $element->innertext; + } + + private function extractFullArticleAuthor($article) { + $element = $article->find('span[itemprop=name]', 0) + or returnServerError('Author not found!'); + + return $element->plaintext; + } + + #endregion + + #region Profile + + private function collectProfile($html) { + $item = array(); + + $item['uri'] = $this->getURI(); + $item['timestamp'] = $this->extractProfileDate($html); + $item['title'] = $this->extractProfiletitle($html); + $item['author'] = $this->extractProfileAuthor($html); + $item['content'] = $this->extractProfileContent($html); + + $this->items[] = $item; + } + + private function extractProfileDate($html) { + $element = $html->find('div.infobox div.vallabel', 0) + or returnServerError('Date not found!'); + + // debugMessage($element->plaintext); + + $date = trim(explode("\r\n", $element->plaintext)[1]); + + return $this->fixDate($date); + } + + private function extractProfileTitle($html) { + $element = $html->find('span.h1', 0) + or returnServerError('Title not found!'); + + return $element->plaintext; + } + + private function extractProfileContent($html) { + // There are a few thins we are interested: + // - Investment Strategy + // - Description + // - Quote + + $strategy = $html->find('div.tab-container div.col-sm-6 p', 0) + or returnServerError('Investment Strategy not found!'); + + // Description requires a bit of cleanup due to lack of propper identification + + $description = $html->find('div.headline', 5) + or returnServerError('Description container not found!'); + + $description = $description->parent(); + + foreach($description->find('div') as $div) { + $div->outertext = ''; + } + + $quote = $html->find('div.infobox div.val', 0) + or returnServerError('Quote not found!'); + + $quote_html = 'Quote

' . $quote . '

'; + $strategy_html = ''; + $description_html = ''; + + if($this->getInput('strategy') === true) { + $strategy_html = 'Strategy

' . $strategy . '


'; + } + + if($this->getInput('description') === true) { + $description_html = 'Description

' . $description . '


'; + } + + return $strategy_html . $description_html . $quote_html; + } + + private function extractProfileAuthor($html) { + // Use ISIN + WKN as author + // Notice: "identfier" is not a typo [sic]! + $element = $html->find('span.identfier', 0) + or returnServerError('Author not found!'); + + return $element->plaintext; + } + + #endregion +} From 42c699f47426fab077dbdca479f5fd5f58a176fa Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sat, 30 Jun 2018 10:16:16 +0200 Subject: [PATCH 019/146] formats: Fix favicon not found if url contains path --- formats/AtomFormat.php | 5 ++++- formats/MrssFormat.php | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php index 82d90106..6ebdf771 100644 --- a/formats/AtomFormat.php +++ b/formats/AtomFormat.php @@ -16,7 +16,10 @@ class AtomFormat extends FormatAbstract{ $extraInfos = $this->getExtraInfos(); $title = $this->xml_encode($extraInfos['name']); $uri = !empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/RSS-Bridge/rss-bridge'; - $icon = $this->xml_encode($uri .'/favicon.ico'); + + $uriparts = parse_url($uri); + $icon = $this->xml_encode($uriparts['scheme'] . '://' . $uriparts['host'] .'/favicon.ico'); + $uri = $this->xml_encode($uri); $entries = ''; diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php index 4e09c5d7..8f54ef0b 100644 --- a/formats/MrssFormat.php +++ b/formats/MrssFormat.php @@ -21,7 +21,8 @@ class MrssFormat extends FormatAbstract { $uri = 'https://github.com/RSS-Bridge/rss-bridge'; } - $icon = $this->xml_encode($uri .'/favicon.ico'); + $uriparts = parse_url($uri); + $icon = $this->xml_encode($uriparts['scheme'] . '://' . $uriparts['host'] .'/favicon.ico'); $items = ''; foreach($this->getItems() as $item) { From 0d80a19e84c2c22da2de3a8b71e67e6970d85d03 Mon Sep 17 00:00:00 2001 From: LogMANOriginal Date: Sun, 8 Jul 2018 17:16:00 +0200 Subject: [PATCH 020/146] [FacebookBridge] Add context for public Facebook groups (#739) The previous context is now labeled 'User', while the new context is labeled 'Group'. The existing code was not changed, instead new group* functions were implemented to handle groups. The general principle of capturing groups is the same as done for users with adjustments to account for different HTML structures. Captcha responses are currently not supported for groups! There doesn't seem to be a way to trigger them consistently, which makes it hard to handle them properly. Features of the group context: - The feed title is based on the group name - The group URI used for capturing is returned for the feed URI - Author names and timestamps are reproduced from the source - Post titles are reproduced from the source if they exist, otherwise the title is build manually from the author name and the content - Original contents are included with the feed - All images are attached as enclosures as well Closes # --- bridges/FacebookBridge.php | 281 +++++++++++++++++++++++++++++++++---- 1 file changed, 255 insertions(+), 26 deletions(-) diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php index 4771225a..c8ea0d7f 100644 --- a/bridges/FacebookBridge.php +++ b/bridges/FacebookBridge.php @@ -1,41 +1,257 @@ array( - 'name' => 'Username', - 'required' => true - ), - 'media_type' => array( - 'name' => 'Media type', - 'type' => 'list', - 'required' => false, - 'values' => array( - 'All' => 'all', - 'Video' => 'video', - 'No Video' => 'novideo' + const PARAMETERS = array( + 'User' => array( + 'u' => array( + 'name' => 'Username', + 'required' => true ), - 'defaultValue' => 'all' + 'media_type' => array( + 'name' => 'Media type', + 'type' => 'list', + 'required' => false, + 'values' => array( + 'All' => 'all', + 'Video' => 'video', + 'No Video' => 'novideo' + ), + 'defaultValue' => 'all' + ), + 'skip_reviews' => array( + 'name' => 'Skip reviews', + 'type' => 'checkbox', + 'required' => false, + 'defaultValue' => false, + 'title' => 'Feed includes reviews when checked' + ) ), - 'skip_reviews' => array( - 'name' => 'Skip reviews', - 'type' => 'checkbox', - 'required' => false, - 'defaultValue' => false, - 'title' => 'Feed includes reviews when checked' + 'Group' => array( + 'g' => array( + 'name' => 'Group', + 'type' => 'text', + 'required' => true, + 'exampleValue' => 'https://www.facebook.com/groups/743149642484225', + 'title' => 'Insert group name or facebook group URL' + ) ) - )); + ); private $authorName = ''; + private $groupName = ''; - public function collectData(){ + public function getURI() { + $uri = self::URI; + + switch($this->queriedContext) { + + case 'Group': + $uri .= 'groups/' . $this->sanitizeGroup(filter_var($this->getInput('g'), FILTER_SANITIZE_URL)); + break; + + } + + return $uri .= '?_fb_noscript=1'; + } + + public function collectData() { + + switch($this->queriedContext) { + + case 'Group': + $this->collectGroupData(); + break; + + case 'User': + $this->collectUserData(); + break; + + default: + returnClientError('Unknown context: "' . $this->queriedContext . '"!'); + + } + + } + + #region Group + + private function collectGroupData() { + + $header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE') . "\r\n"); + + $html = getSimpleHTMLDOM($this->getURI(), $header) + or returnServerError('Failed loading facebook page: ' . $this->getURI()); + + if(!$this->isPublicGroup($html)) { + returnClientError('This group is not public! RSS-Bridge only supports public groups!'); + } + + defaultLinkTo($html, substr(self::URI, 0, strlen(self::URI) - 1)); + + $this->groupName = $this->extractGroupName($html); + + $posts = $html->find('div.userContentWrapper') + or returnServerError('Failed finding posts!'); + + foreach($posts as $post) { + + $item = array(); + + $item['uri'] = $this->extractGroupURI($post); + $item['title'] = $this->extractGroupTitle($post); + $item['author'] = $this->extractGroupAuthor($post); + $item['content'] = $this->extractGroupContent($post); + $item['timestamp'] = $this->extractGroupTimestamp($post); + $item['enclosures'] = $this->extractGroupEnclosures($post); + + $this->items[] = $item; + + } + + } + + private function sanitizeGroup($group) { + + if(filter_var( + $group, + FILTER_VALIDATE_URL, + FILTER_FLAG_HOST_REQUIRED | FILTER_FLAG_PATH_REQUIRED)) { + // User provided a URL + + $urlparts = parse_url($group); + + if($urlparts['host'] !== parse_url(self::URI)['host'] + && 'www.' . $urlparts['host'] !== parse_url(self::URI)['host']) { + + returnClientError('The host you provided is invalid! Received "' + . $urlparts['host'] + . '", expected "' + . parse_url(self::URI)['host'] + . '"!'); + + } + + return explode('/', $urlparts['path'])[2]; + + } elseif(strpos($group, '/') !== false) { + returnClientError('The group you provided is invalid: ' . $group); + } else { + return $group; + } + + } + + private function isPublicGroup($html) { + + // Facebook redirects to the groups about page for non-public groups + $about = $html->find('#pagelet_group_about', 0); + + return !($about); + + } + + private function extractGroupName($html) { + + $ogtitle = $html->find('meta[property="og:title"]', 0) + or returnServerError('Unable to find group title!'); + + return htmlspecialchars_decode($ogtitle->content, ENT_QUOTES); + + } + + private function extractGroupURI($post) { + + $elements = $post->find('a') + or returnServerError('Unable to find URI!'); + + foreach($elements as $anchor) { + + // Find the one that is a permalink + if(strpos($anchor->href, 'permalink') !== false) { + return $anchor->href; + } + + } + + return null; + + } + + private function extractGroupContent($post) { + + $content = $post->find('div.userContent', 0) + or returnServerError('Unable to find user content!'); + + return $content->innertext . $content->next_sibling()->innertext; + + } + + private function extractGroupTimestamp($post) { + + $element = $post->find('abbr[data-utime]', 0) + or returnServerError('Unable to find timestamp!'); + + return $element->getAttribute('data-utime'); + + } + + private function extractGroupAuthor($post) { + + $element = $post->find('img', 0) + or returnServerError('Unable to find author information!'); + + return $element->{'aria-label'}; + + } + + private function extractGroupEnclosures($post) { + + $elements = $post->find('div.userContent', 0)->next_sibling()->find('img'); + + $enclosures = array(); + + foreach($elements as $enclosure) { + $enclosures[] = $enclosure->src; + } + + return empty($enclosures) ? null : $enclosures; + + } + + private function extractGroupTitle($post) { + + $element = $post->find('h5', 0) + or returnServerError('Unable to find title!'); + + if(strpos($element->plaintext, 'shared') === false) { + + $content = strip_tags($this->extractGroupContent($post)); + + return $this->extractGroupAuthor($post) + . ' posted: ' + . substr( + $content, + 0, + strpos(wordwrap($content, 64), "\n") + ) + . '...'; + + } + + return $element->plaintext; + + } + + #endregion + + private function collectUserData(){ //Extract a string using start and end delimiters function extractFromDelimiters($string, $start, $end){ @@ -336,9 +552,22 @@ EOD; } public function getName(){ - if(!empty($this->authorName)) { - return isset($this->extraInfos['name']) ? $this->extraInfos['name'] : $this->authorName - . ' - Facebook Bridge'; + + switch($this->queriedContext) { + + case 'User': + if(!empty($this->authorName)) { + return isset($this->extraInfos['name']) ? $this->extraInfos['name'] : $this->authorName + . ' - Facebook Bridge'; + } + break; + + case 'Group': + if(!empty($this->groupName)) { + return $this->groupName . ' - Facebook Bridge'; + } + break; + } return parent::getName(); From ead7b2e8decf8e4490314bd785f875f99c891347 Mon Sep 17 00:00:00 2001 From: Nemo Date: Tue, 10 Jul 2018 06:59:47 +0530 Subject: [PATCH 021/146] [fb2] Switches to getContents (#742) --- bridges/FB2Bridge.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bridges/FB2Bridge.php b/bridges/FB2Bridge.php index d8fb6b41..1aeb30d5 100644 --- a/bridges/FB2Bridge.php +++ b/bridges/FB2Bridge.php @@ -95,7 +95,7 @@ EOD; . $pageID . '&cursor={"card_id"%3A"videos"%2C"has_next_page"%3Atrue}&surface=mobile_page_home&unit_count=8'; - $fileContent = file_get_contents($requestString); + $fileContent = getContents($requestString); $articleIndex = 0; $maxArticle = 3; @@ -200,11 +200,11 @@ EOD; //Builds the HTML from the encoded JS that Facebook provides. private function buildContent($pageContent){ - - $regex = '/\\"html\\":\\"(.*?)\\",\\"replace/'; + // The html ends with: + // /div>","replaceifexists + $regex = '/\\"html\\":(\".+\/div>"),"replace/'; preg_match($regex, $pageContent, $result); - - return str_get_html(html_entity_decode(json_decode('"' . $result[1] . '"'))); + return str_get_html(html_entity_decode(json_decode($result[1]))); } From 7126f5e8380f05820d668b2728bf454cc67d9efb Mon Sep 17 00:00:00 2001 From: sysadminstory Date: Fri, 13 Jul 2018 01:35:13 +0200 Subject: [PATCH 022/146] [DealabsBridge] First version of the generic "Pepper" Bridge (#726) * [DealabsBridge] First version of the generic "Pepper" Bridge --- bridges/DealabsBridge.php | 323 +++++--- bridges/HotUKDealsBridge.php | 1397 ++++++++++++++++++++++++++++++++++ bridges/MydealsBridge.php | 144 ++++ 3 files changed, 1759 insertions(+), 105 deletions(-) create mode 100644 bridges/HotUKDealsBridge.php create mode 100644 bridges/MydealsBridge.php diff --git a/bridges/DealabsBridge.php b/bridges/DealabsBridge.php index 2876aab2..fb88f37a 100644 --- a/bridges/DealabsBridge.php +++ b/bridges/DealabsBridge.php @@ -1,8 +1,9 @@ array ( @@ -39,7 +40,7 @@ class DealabsBridge extends BridgeAbstract { ), 'Deals par groupe' => array( - 'groupe' => array( + 'group' => array( 'name' => 'Groupe', 'type' => 'list', 'required' => 'true', @@ -61,10 +62,10 @@ class DealabsBridge extends BridgeAbstract { 'Services divers' => 'services-divers', 'Sports & plein air' => 'sports-plein-air', 'Téléphonie' => 'telephonie', - 'Voyages & sorties' => 'voyages-sorties-restaurants' + 'Voyages & sorties' => 'voyages-sorties-restaurants', ) ), - 'ordre' => array( + 'order' => array( 'name' => 'Trier par', 'type' => 'list', 'required' => 'true', @@ -78,37 +79,99 @@ class DealabsBridge extends BridgeAbstract { ) ); + public $lang = array( + 'bridge-uri' => SELF::URI, + 'bridge-name' => SELF::NAME, + 'context-keyword' => 'Recherche par Mot(s) clé(s)', + 'context-group' => 'Deals par groupe', + 'uri-group' => '/groupe/', + 'request-error' => 'Could not request Dealabs', + 'no-results' => 'Il n'y a rien à afficher pour le moment :(', + 'relative-date-indicator' => array( + 'il y a', + ), + 'price' => 'Prix', + 'shipping' => 'Livraison', + 'origin' => 'Origine', + 'discount' => 'Réduction', + 'title-keyword' => 'Recherche', + 'title-group' => 'Groupe', + 'local-months' => array( + 'janvier', + 'février', + 'mars', + 'avril', + 'mai', + 'juin', + 'juillet', + 'août', + 'septembre', + 'octobre', + 'novembre', + 'décembre' + ), + 'local-time-relative' => array( + 'il y a ', + 'min', + 'h', + 'jour', + 'jours', + 'mois', + 'ans', + 'et ' + ), + 'date-prefixes' => array( + 'Actualisé ', + ), + 'relative-date-alt-prefixes' => array( + 'Actualisé ', + ), + 'relative-date-ignore-suffix' => array( + ), + + 'localdeal' => array( + 'Local', + 'Pays d\'expédition' + ), + ); + + + +} + +class PepperBridgeAbstract extends BridgeAbstract { + const CACHE_TIMEOUT = 3600; public function collectData(){ switch($this->queriedContext) { - case 'Recherche par Mot(s) clé(s)': - return $this->collectDataMotsCles(); + case $this->i8n('context-keyword'): + return $this->collectDataKeywords(); break; - case 'Deals par groupe': - return $this->collectDataGroupe(); + case $this->i8n('context-group'): + return $this->collectDataGroup(); break; } } /** - * Get the Deal data from the choosen groupe in the choose order + * Get the Deal data from the choosen group in the choosed order */ - public function collectDataGroupe() + public function collectDataGroup() { - $groupe = $this->getInput('groupe'); - $ordre = $this->getInput('ordre'); + $group = $this->getInput('group'); + $order = $this->getInput('order'); - $url = self::URI - . '/groupe/' . $groupe . $ordre; + $url = $this->i8n('bridge-uri') + . $this->i8n('uri-group') . $group . $order; $this->collectDeals($url); } /** * Get the Deal data from the choosen keywords and parameters */ - public function collectDataMotsCles() + public function collectDataKeywords() { $q = $this->getInput('q'); $hide_expired = $this->getInput('hide_expired'); @@ -117,7 +180,7 @@ class DealabsBridge extends BridgeAbstract { $priceTo = $this->getInput('priceFrom'); /* Even if the original website uses POST with the search page, GET works too */ - $url = self::URI + $url = $this->i8n('bridge-uri') . '/search/advanced?q=' . urlencode($q) . '&hide_expired='. $hide_expired @@ -138,8 +201,8 @@ class DealabsBridge extends BridgeAbstract { */ public function collectDeals($url){ $html = getSimpleHTMLDOM($url) - or returnServerError('Could not request Dealabs.'); - $list = $html->find('article'); + or returnServerError($this->i8n('request-error')); + $list = $html->find('article[id]'); // Deal Image Link CSS Selector $selectorImageLink = implode( @@ -197,40 +260,44 @@ class DealabsBridge extends BridgeAbstract { // If there is no results, we don't parse the content because it display some random deals $noresult = $html->find('h3[class=size--all-l size--fromW2-xl size--fromW3-xxl]', 0); - if($noresult != null && $noresult->plaintext == 'Il n'y a rien à afficher pour le moment :(') { + if ($noresult != null && strpos($noresult->plaintext, $this->i8n('no-results')) !== false) { $this->items = array(); } else { - foreach($list as $deal) { + foreach ($list as $deal) { $item = array(); $item['uri'] = $deal->find('div[class=threadGrid-title]', 0)->find('a', 0)->href; $item['title'] = $deal->find('a[class*='. $selectorLink .']', 0 - )->plaintext; + )->plaintext; $item['author'] = $deal->find('span.thread-username', 0)->plaintext; $item['content'] = '

' - . $deal->find('a[class*='. $selectorLink .']', 0)->innertext - . '

' - . $this->getPrix($deal) - . $this->getReduction($deal) - . $this->getExpedition($deal) - . $this->getLivraison($deal) - . $this->getOrigine($deal) - . $deal->find('div[class*='. $selectorDescription .']', 0)->innertext - . '		' - . $deal->find('div[class='. $selectorHot .']', 0)->children(0)->outertext - . '
'; + . '">

' + . $deal->find('a[class*='. $selectorLink .']', 0)->innertext + . '

' + . $this->getPrice($deal) + . $this->getDiscount($deal) + . $this->getShipsFrom($deal) + . $this->getShippingCost($deal) + . $this->GetSource($deal) + . $deal->find('div[class*='. $selectorDescription .']', 0)->innertext + . '' + . $deal->find('div[class='. $selectorHot .']', 0)->children(0)->outertext + . ''; $dealDateDiv = $deal->find('div[class*='. $selectorDate .']', 0) ->find('span[class=hide--toW3]'); $itemDate = end($dealDateDiv)->plaintext; - if(substr( $itemDate, 0, 6 ) === 'il y a') { + // In case of a Local deal, there is no date, but we can use + // this case for other reason (like date not in the last field) + if ($this->contains($itemDate, $this->i8n('localdeal'))) { + $item['timestamp'] = time(); + } else if ($this->contains($itemDate, $this->i8n('relative-date-indicator'))) { $item['timestamp'] = $this->relativeDateToTimestamp($itemDate); - } else { + } else { $item['timestamp'] = $this->parseDate($itemDate); } $this->items[] = $item; @@ -238,15 +305,29 @@ class DealabsBridge extends BridgeAbstract { } } + /** + * Check if the string $str contains any of the string of the array $arr + * @return boolean true if the string matched anything otherwise false + */ + private function contains($str, array $arr) + { + foreach ($arr as $a) { + if (stripos($str, $a) !== false) { + return true; + } + } + return false; + } + /** * Get the Price from a Deal if it exists * @return string String of the deal price */ - private function getPrix($deal) + private function getPrice($deal) { - if($deal->find( + if ($deal->find( 'span[class*=thread-price]', 0) != null) { - return '
Prix : ' + return '
'.$this->i8n('price') .' : ' . $deal->find( 'span[class*=thread-price]', 0 )->plaintext @@ -261,17 +342,17 @@ class DealabsBridge extends BridgeAbstract { * Get the Shipping costs from a Deal if it exists * @return string String of the deal shipping Cost */ - private function getLivraison($deal) + private function getShippingCost($deal) { - if($deal->find('span[class*=cept-shipping-price]', 0) != null) { - if($deal->find('span[class*=cept-shipping-price]', 0)->children(0) != null) { - return '
Livraison : ' - . $deal->find('span[class*=cept-shipping-price]', 0)->children(0)->innertext - . '
'; + if ($deal->find('span[class*=cept-shipping-price]', 0) != null) { + if ($deal->find('span[class*=cept-shipping-price]', 0)->children(0) != null) { + return '
'. $this->i8n('shipping') .' : ' + . $deal->find('span[class*=cept-shipping-price]', 0)->children(0)->innertext + . '
'; } else { - return '
Livraison : ' - . $deal->find('span[class*=cept-shipping-price]', 0)->innertext - . '
'; + return '
'. $this->i8n('shipping') .' : ' + . $deal->find('span[class*=cept-shipping-price]', 0)->innertext + . '
'; } } else { return ''; @@ -282,10 +363,10 @@ class DealabsBridge extends BridgeAbstract { * Get the source of a Deal if it exists * @return string String of the deal source */ - private function getOrigine($deal) + private function GetSource($deal) { - if($deal->find('a[class=text--color-greyShade]', 0) != null) { - return '
Origine : ' + if ($deal->find('a[class=text--color-greyShade]', 0) != null) { + return '
'. $this->i8n('origin') .' : ' . $deal->find('a[class=text--color-greyShade]', 0)->outertext . '
'; } else { @@ -297,19 +378,19 @@ class DealabsBridge extends BridgeAbstract { * Get the original Price and discout from a Deal if it exists * @return string String of the deal original price and discount */ - private function getReduction($deal) + private function getDiscount($deal) { - if($deal->find('span[class*=mute--text text--lineThrough]', 0) != null) { + if ($deal->find('span[class*=mute--text text--lineThrough]', 0) != null) { $discountHtml = $deal->find('span[class=space--ml-1 size--all-l size--fromW3-xl]', 0); - if($discountHtml != null) { + if ($discountHtml != null) { $discount = $discountHtml->plaintext; } else { $discount = ''; } - return '
Réduction : ' + return '
'. $this->i8n('discount') .' : ' . $deal->find( 'span[class*=mute--text text--lineThrough]', 0 - )->plaintext + )->plaintext . ' ' . $discount . '
'; @@ -324,7 +405,6 @@ class DealabsBridge extends BridgeAbstract { */ private function getImage($deal) { - $selectorLazy = implode( ' ', /* Notice this is a space! */ array( @@ -338,7 +418,7 @@ class DealabsBridge extends BridgeAbstract { ) ); - $selectorPlain = implode( + $selectorPlain = implode( ' ', /* Notice this is a space! */ array( 'thread-image', @@ -348,21 +428,21 @@ class DealabsBridge extends BridgeAbstract { 'cept-thread-img' ) ); - if($deal->find('img[class='. $selectorLazy .']', 0) != null) { + if ($deal->find('img[class='. $selectorLazy .']', 0) != null) { return json_decode( html_entity_decode( $deal->find('img[class='. $selectorLazy .']', 0) - ->getAttribute('data-lazy-img')))->{'src'}; + ->getAttribute('data-lazy-img')))->{'src'}; } else { - return $deal->find('img[class='. $selectorPlain .']', 0 )->src; + return $deal->find('img[class*='. $selectorPlain .']', 0 )->src; } } /** - * Get the originating country from a Deal if it existsa + * Get the originating country from a Deal if it exists * @return string String of the deal originating country */ - private function getExpedition($deal) + private function getShipsFrom($deal) { $selector = implode( ' ', /* Notice this is a space! */ @@ -373,7 +453,7 @@ class DealabsBridge extends BridgeAbstract { 'text--color-greyShade' ) ); - if($deal->find('span[class='. $selector .']', 0) != null) { + if ($deal->find('span[class='. $selector .']', 0) != null) { return '
' . $deal->find('span[class='. $selector .']', 0)->children(2)->plaintext . '
'; @@ -383,25 +463,12 @@ class DealabsBridge extends BridgeAbstract { } /** - * Transforms a French date into a timestam + * Transforms a local date into a timestamp * @return int timestamp of the input date */ private function parseDate($string) { - $month_fr = array( - 'janvier', - 'février', - 'mars', - 'avril', - 'mai', - 'juin', - 'juillet', - 'août', - 'septembre', - 'octobre', - 'novembre', - 'décembre' - ); + $month_local = $this->i8n('local-months'); $month_en = array( 'January', 'February', @@ -416,12 +483,18 @@ class DealabsBridge extends BridgeAbstract { 'November', 'December' ); - $string = str_replace('Actualisé ', '', $string); - $date_str = trim(str_replace($month_fr, $month_en, $string)); - if(!preg_match('/[0-9]{4}/', $string)) { + // A date can be prfixed with some words, we remove theme + $string = $this->removeDatePrefixes($string); + // We translate the local months name in the english one + $date_str = trim(str_replace($month_local, $month_en, $string)); + + // If the date does not contain any year, we add the current year + if (!preg_match('/[0-9]{4}/', $string)) { $date_str .= ' ' . date('Y'); } + + // Add the Hour and minutes $date_str .= ' 00:00'; $date = DateTime::createFromFormat('j F Y H:i', $date_str); @@ -429,21 +502,41 @@ class DealabsBridge extends BridgeAbstract { } /** - * Transforms a relate French date into a timestam + * Remove the prefix of a date if it has one + * @return the date without prefiux + */ + private function removeDatePrefixes($string) + { + $string = str_replace($this->i8n('date-prefixes'), array(), $string); + return $string; + } + + /** + * Remove the suffix of a relative date if it has one + * @return the relative date without suffixes + */ + private function removeRelativeDateSuffixes($string) + { + if (count($this->i8n('relative-date-ignore-suffix')) > 0) { + $string = preg_replace($this->i8n('relative-date-ignore-suffix'), '', $string); + } + return $string; + } + + /** + * Transforms a relative local date into a timestamp * @return int timestamp of the input date */ private function relativeDateToTimestamp($str) { $date = new DateTime(); - $search = array( - 'il y a ', - 'min', - 'h', - 'jour', - 'jours', - 'mois', - 'ans', - 'et ' - ); + + // In case of update date, replace it by the regular relative date first word + $str = str_replace($this->i8n('relative-date-alt-prefixes'), $this->i8n('local-time-relative')[0], $str); + + $str = $this->removeRelativeDateSuffixes($str); + + $search = $this->i8n('local-time-relative'); + $replace = array( '-', 'minute', @@ -458,18 +551,38 @@ class DealabsBridge extends BridgeAbstract { return $date->getTimestamp(); } + /** + * Returns the RSS Feed title according to the parameters + * @return string the RSS feed Tiyle + */ public function getName(){ switch($this->queriedContext) { - case 'Recherche par Mot(s) clé(s)': - return self::NAME . ' - Recherche : '. $this->getInput('q'); + case $this->i8n('context-keyword'): + return $this->i8n('bridge-name') . ' - '. $this->i8n('title-keyword') .' : '. $this->getInput('q'); break; - case 'Deals par groupe': - $values = self::PARAMETERS['Deals par groupe']['groupe']['values']; - $groupe = array_search($this->getInput('groupe'), $values); - return self::NAME . ' - Groupe : '. $groupe; + case $this->i8n('context-group'): + $values = $this->getParameters()[$this->i8n('context-group')]['group']['values']; + $group = array_search($this->getInput('group'), $values); + return $this->i8n('bridge-name') . ' - '. $this->i8n('title-group'). ' : '. $group; break; default: // Return default value - return self::NAME; + return static::NAME; + } + } + + + + /** + * This is some "localisation" function that returns the needed content using + * the "$lang" class variable in the local class + * @return various the local content needed + */ + public function i8n($key) + { + if (array_key_exists($key, $this->lang)) { + return $this->lang[$key]; + } else { + return null; } } diff --git a/bridges/HotUKDealsBridge.php b/bridges/HotUKDealsBridge.php new file mode 100644 index 00000000..a7eebf61 --- /dev/null +++ b/bridges/HotUKDealsBridge.php @@ -0,0 +1,1397 @@ + array ( + 'q' => array( + 'name' => 'Keyword(s)', + 'type' => 'text', + 'required' => true + ), + 'hide_expired' => array( + 'name' => 'Hide expired deals', + 'type' => 'checkbox', + 'required' => 'true' + ), + 'hide_local' => array( + 'name' => 'Hide local deals', + 'type' => 'checkbox', + 'title' => 'Hide deals in physical store', + 'required' => 'true' + ), + 'priceFrom' => array( + 'name' => 'Minimal Price', + 'type' => 'text', + 'title' => 'Minmal Price in Pounds', + 'required' => 'false', + 'defaultValue' => '' + ), + 'priceTo' => array( + 'name' => 'Maximum Price', + 'type' => 'text', + 'title' => 'Maximum Price in Pounds', + 'required' => 'false', + 'defaultValue' => '' + ), + ), + + 'Deals per group' => array( + 'group' => array( + 'name' => 'Group', + 'type' => 'list', + 'required' => 'true', + 'title' => 'Group whose deals must be displayed', + 'values' => array( + '2DS' => '2ds', + '3D Bluray' => '3d-bluray', + '3D Glasses' => '3d-glasses', + '3D Printer' => '3d-printer', + '3DS' => '3ds', + '3DS Games' => '3ds-games', + '3D TV' => '3d-tv', + '4G' => '4g', + '4k Bluray' => '4k-bluray', + '4k Monitor' => '4k-monitor', + '4K TV' => '4k-tv', + '7up' => '7up', + '144Hz Monitor' => '144hz', + 'AA Batteries' => 'aa', + 'Acer' => 'acer', + 'Actifry' => 'actifry', + 'Action Camera' => 'action-camera', + 'Add On Item' => 'add-on-item', + 'Adidas' => 'adidas', + 'Adobe' => 'adobe', + 'Aftershave' => 'aftershave', + 'Air Bed' => 'air-bed', + 'Air Conditioner' => 'air-con', + 'Air Fryer' => 'air-fryer', + 'Airport Parking' => 'airport-parking', + 'AKG' => 'akg', + 'Alarm' => 'alarm', + 'Alcatel' => 'alcatel', + 'Alcohol' => 'alcohol', + 'Alienware' => 'alienware', + 'Alton Towers' => 'alton-towers', + 'Amazon Echo' => 'amazon-echo', + 'Amazon Fire Stick' => 'amazon-fire-stick', + 'Amazon Fire Tv' => 'fire-tv', + 'Amazon Pantry' => 'amazon-pantry', + 'Amazon Prime' => 'amazon-prime', + 'Amazon Warehouse' => 'amazon-warehouse', + 'AMD' => 'amd', + 'Amex' => 'amex', + 'Amiibo' => 'amiibo', + 'Amsterdam' => 'amsterdam', + 'Android' => 'android', + 'Android Tablet' => 'android-tablet', + 'Android TV' => 'android-tv', + 'Anker' => 'anker', + 'Apple' => 'apple', + 'Apple TV' => 'apple-tv', + 'Apple Watch' => 'apple-watch', + 'Armani' => 'armani', + 'Asics' => 'asics', + 'ASUS' => 'asus', + 'Audi' => 'audi', + 'Baby' => 'baby', + 'Baby & Kids' => 'kids', + 'Baby Monitor' => 'baby-monitor', + 'Baby Swing' => 'baby-swing', + 'Backpack' => 'backpack', + 'Bag' => 'bag', + 'Bank' => 'bank', + 'Barbour' => 'barbour', + 'Barcelona' => 'barcelona', + 'Bathroom' => 'bathroom', + 'Batman' => 'batman', + 'Battery' => 'battery', + 'Battlefield' => 'battlefield', + 'Battlefield 1' => 'battlefield-1', + 'BBQ' => 'bbq', + 'Bean To Cup' => 'bean-to-cup', + 'Beard Trimmer' => 'beard-trimmer', + 'Bed' => 'bed', + 'Bedding' => 'bedding', + 'Bed Frame' => 'bed-frame', + 'Beer' => 'beer', + 'Beko' => 'beko', + 'Belfast' => 'belfast', + 'Bench' => 'bench', + 'Berghaus' => 'berghaus', + 'Bike' => 'bike', + 'Bin' => 'bin', + 'Bioshock' => 'bioshock', + 'Black Ops 3' => 'black-ops-3', + 'Blackpool' => 'blackpool', + 'Blender' => 'blender', + 'Blinds' => 'blinds', + 'Bloodborne' => 'bloodborne', + 'Blu-Ray' => 'blu-ray', + 'Bluetooth Headphones' => 'bluetooth-headphones', + 'Bluetooth Speaker' => 'bluetooth-speaker', + 'BMW' => 'bmw', + 'Board Game' => 'board-game', + 'Boiler' => 'boiler', + 'Bosch' => 'bosch', + 'Bose' => 'bose', + 'Bourbon' => 'bourbon', + 'Boxers' => 'boxers', + 'Bra' => 'bra', + 'Braun' => 'braun', + 'Breakdown' => 'breakdown', + 'Brewdog' => 'brewdog', + 'Brita' => 'brita', + 'Broadband' => 'broadband', + 'BT' => 'bt', + 'Bt Sport' => 'bt-sport', + 'Buggy' => 'buggy', + 'Call Of Duty' => 'call-of-duty', + 'Camera' => 'camera', + 'Camera Lens' => 'lens', + 'Camping' => 'camping', + 'Candle' => 'candle', + 'Canon' => 'canon', + 'Canvas' => 'canvas', + 'Car' => 'car', + 'Caravan' => 'caravan', + 'Car Battery' => 'car-battery', + 'Car Hire' => 'car-hire', + 'Car Insurance' => 'car-insurance', + 'Car Lease' => 'car-lease', + 'Car Mats' => 'car-mats', + 'Carpet' => 'carpet', + 'Carpet Cleaner' => 'carpet-cleaner', + 'Car Seat' => 'car-seat', + 'Car Stereo' => 'car-stereo', + 'Casio' => 'casio', + 'Caterpillar Boots' => 'caterpillar', + 'Cat Food' => 'cat-food', + 'CCTV' => 'cctv', + 'Chainsaw' => 'chainsaw', + 'Chair' => 'chair', + 'Champagne' => 'champagne', + 'Charger' => 'charger', + 'Chessington' => 'chessington', + 'Chest Freezer' => 'chest-freezer', + 'Chocolate' => 'chocolate', + 'Chromebook' => 'chromebook', + 'Chromecast' => 'chromecast', + 'Cider' => 'cider', + 'Cinema' => 'cinema', + 'Cineworld' => 'cineworld', + 'Circular Saw' => 'circular-saw', + 'Circulon' => 'circulon', + 'Citizen' => 'citizen', + 'Clarins' => 'clarins', + 'Clarks' => 'clarks', + 'Clinique' => 'clinique', + 'Clothes' => 'clothes', + 'Coat' => 'coat', + 'Coffee' => 'coffee', + 'Coffee Machine' => 'coffee-machine', + 'Coke' => 'coke', + 'Compost' => 'compost', + 'Computers' => 'computers', + 'Converse' => 'converse', + 'Cooker' => 'cooker', + 'Cordless Phone' => 'cordless-phone', + 'Corsair' => 'corsair', + 'Cot' => 'cot', + 'CPU' => 'cpu', + 'Crash Bandicoot' => 'crash-bandicoot', + 'Credit Card' => 'credit-card', + 'Cricket' => 'cricket', + 'Crisps' => 'crisps', + 'Crocs' => 'crocs', + 'Cruise' => 'cruise', + 'Cuprinol' => 'cuprinol', + 'Cutlery' => 'cutlery', + 'Dab Radio' => 'dab-radio', + 'Dark Souls' => 'dark-souls', + 'Dark Souls 3' => 'dark-souls-3', + 'Dash Cam' => 'dash-cam', + 'Days Out' => 'days-out', + 'DDR3' => 'ddr3', + 'DDR4' => 'ddr4', + 'Deezer' => 'deezer', + 'Dehumidifier' => 'dehumidifier', + 'Dell' => 'dell', + 'Delonghi' => 'delonghi', + 'Denon' => 'denon', + 'Desk' => 'desk', + 'Desktop' => 'desktop', + 'Destiny' => 'destiny', + 'Destiny 2' => 'destiny-2', + 'Deus Ex' => 'deus-ex', + 'Dewalt' => 'dewalt', + 'Digital Camera' => 'digital-camera', + 'Dining Table' => 'dining-table', + 'Dinner Set' => 'dinner-set', + 'Dirt 4' => 'dirt-4', + 'Dishonored 2' => 'dishonored-2', + 'Dishwasher' => 'dishwasher', + 'Disney' => 'disney', + 'Disney Infinity' => 'disney-infinity', + 'Disneyland' => 'disneyland', + 'DIY' => 'diy', + 'Doctor Who' => 'doctor-who', + 'Dog' => 'dog', + 'Dog Bed' => 'dog-bed', + 'Dolce Gusto' => 'dolce-gusto', + 'DOOM' => 'doom', + 'Dremel' => 'dremel', + 'Dress' => 'dress', + 'Drill' => 'drill', + 'Drone' => 'drone', + 'Dryer' => 'dryer', + 'DSLR Camera' => 'dslr', + 'Dubai' => 'dubai', + 'Dulux' => 'dulux', + 'Durex' => 'durex', + 'Duvet' => 'duvet', + 'DVD' => 'dvd', + 'DVD Player' => 'dvd-player', + 'Dying Light' => 'dying-light', + 'Dyson' => 'dyson', + 'Dyson V6' => 'dyson-v6', + 'Dyson V8' => 'dyson-v8', + 'E-Cig' => 'e-cig', + 'EA' => 'ea', + 'EA Access' => 'ea-access', + 'Earphones' => 'earphones', + 'Earrings' => 'earrings', + 'Eastpak' => 'eastpak', + 'eBook' => 'ebook', + 'Eco-Drive' => 'eco-drive', + 'Ecobubble' => 'ecobubble', + 'Edifice' => 'edifice', + 'Edinburgh' => 'edinburgh', + 'EE' => 'ee', + 'Egg' => 'egg', + 'Egypt' => 'egypt', + 'Elder Scrolls' => 'elder-scrolls', + 'Electric Bike' => 'electric-bike', + 'Electric Cooker' => 'electric-cooker', + 'Electric Fires' => 'electric-fire', + 'Electric Shower' => 'electric-shower', + 'Electric Toothbrush' => 'electric-toothbrush', + 'Electronics' => 'electronics', + 'Elemis' => 'elemis', + 'Elephone' => 'elephone', + 'Elgato' => 'elgato', + 'Elite Dangerous' => 'elite-dangerous', + 'Emirates' => 'emirates', + 'Eneloop' => 'eneloop', + 'Energy' => 'energy', + 'Engine Oil' => 'engine-oil', + 'Entertainment' => 'entertainment', + 'Epilator' => 'epilator', + 'Epson' => 'epson', + 'eReader' => 'ereader', + 'Espresso' => 'espresso', + 'Estee Lauder' => 'estee-lauder', + 'Ethernet' => 'ethernet', + 'Eurostar' => 'eurostar', + 'Eurotunnel' => 'eurotunnel', + 'EVGA' => 'evga', + 'Extension Lead' => 'extension-lead', + 'External Hard Drive' => 'external-hard-drive', + 'Fairy' => 'fairy', + 'Fallout' => 'fallout', + 'Fallout 4' => 'fallout-4', + 'Fan' => 'fan', + 'Fancy Dress' => 'fancy-dress', + 'Far Cry' => 'far-cry', + 'Far Cry 4' => 'far-cry-4', + 'Far Cry Primal' => 'far-cry-primal', + 'Fashion' => 'fashion', + 'Fathers Day' => 'fathers-day', + 'Felix' => 'felix', + 'Fence' => 'fence', + 'Fender Guitars' => 'fender', + 'Ferrero Rocher' => 'ferrero-rocher', + 'Ferry' => 'ferry', + 'Festival' => 'festival', + 'Fiat' => 'fiat', + 'FIFA' => 'fifa', + 'FIFA 17' => 'fifa-17', + 'FIFA 18' => 'fifa-18', + 'Figures' => 'figures', + 'Final Fantasy' => 'final-fantasy', + 'Finance & Utilities' => 'personal-finance', + 'Finish' => 'finish', + 'Finlux' => 'finlux', + 'Fire Emblem' => 'fire-emblem', + 'Fire Pit' => 'fire-pit', + 'Fireplace' => 'fireplace', + 'Fish' => 'fish', + 'Fisher Price' => 'fisher-price', + 'Fishing' => 'fishing', + 'Fiskars' => 'fiskars', + 'Fitbit' => 'fitbit', + 'Fitbit Alta' => 'fitbit-alta', + 'Fitbit Blaze' => 'fitbit-blaze', + 'Fitbit Charge 2' => 'fitbit-charge-2', + 'Fitness Tracker' => 'fitness-tracker', + 'Flamingo Land' => 'flamingo-land', + 'Flask' => 'flask', + 'Fleece' => 'fleece', + 'Flight' => 'flight', + 'Flip Flops' => 'flip-flops', + 'Floodlight' => 'floodlight', + 'Flooring' => 'flooring', + 'Florida' => 'florida', + 'Flowers' => 'flowers', + 'Flybe' => 'flybe', + 'Flymo' => 'flymo', + 'Food' => 'food', + 'Food Mixer' => 'food-mixer', + 'Food Processor' => 'food-processor', + 'Football' => 'football', + 'Football Boots' => 'football-boots', + 'Football Manager' => 'football-manager', + 'Football Shirt' => 'football-shirt', + 'Ford' => 'ford', + 'For Honor' => 'for-honor', + 'Formula 1' => 'f1', + 'Forza' => 'forza', + 'Forza Horizon' => 'forza-horizon', + 'Forza Horizon 3' => 'forza-horizon-3', + 'Fossil' => 'fossil', + 'Fosters' => 'fosters', + 'Foundation' => 'foundation', + 'France' => 'france', + 'Fred Perry' => 'fred-perry', + 'Freebies' => 'freebies', + 'Freesat' => 'freesat', + 'Freeview' => 'freeview', + 'Freezer' => 'freezer', + 'Fridge' => 'fridge', + 'Fridge Freezer' => 'fridge-freezer', + 'Frozen' => 'frozen', + 'Fruit' => 'fruit', + 'Fryer' => 'fryer', + 'Frying Pan' => 'frying-pan', + 'Fujifilm' => 'fuji', + 'Funko Pop' => 'funko-pop', + 'Furby' => 'furby', + 'Furniture' => 'furniture', + 'Fusion' => 'fusion', + 'G-Shock' => 'g-shock', + 'G-Sync Monitor' => 'g-sync', + 'Game Of Thrones' => 'game-of-thrones', + 'Gaming' => 'gaming', + 'Gaming Chair' => 'gaming-chair', + 'Gaming Controller' => 'controller', + 'Gaming Headset' => 'gaming-headset', + 'Gaming Keyboard' => 'gaming-keyboard', + 'Gaming Laptop' => 'gaming-laptop', + 'Gaming Monitor' => 'gaming-monitor', + 'Gaming PC' => 'gaming-pc', + 'Garage' => 'garage', + 'Garden' => 'garden', + 'Garden Furniture' => 'garden-furniture', + 'Garmin' => 'garmin', + 'Gas' => 'gas', + 'Gas Cooker' => 'gas-cooker', + 'Gatwick' => 'gatwick', + 'Gazebo' => 'gazebo', + 'Gazelle' => 'gazelle', + 'GBK' => 'gbk', + 'Gears Of War' => 'gears-of-war', + 'Gears Of War 4' => 'gears-of-war-4', + 'GeForce' => 'geforce', + 'George Foreman' => 'george-foreman', + 'Geox' => 'geox', + 'GHD' => 'ghd', + 'Ghostbusters' => 'ghostbusters', + 'Ghost Recon' => 'ghost-recon', + 'Gibson Guitars' => 'gibson', + 'Giffgaff' => 'giffgaff', + 'Gift Card' => 'gift-card', + 'Gifts' => 'gifts', + 'Gift Set' => 'gift-set', + 'Gilet' => 'gilet', + 'Gillette' => 'gillette', + 'Gimbal' => 'gimbal', + 'Gin' => 'gin', + 'Glasgow' => 'glasgow', + 'Glasses' => 'glasses', + 'Gloves' => 'gloves', + 'Glue Gun' => 'glue-gun', + 'Gluten Free' => 'gluten-free', + 'Goggles' => 'goggles', + 'Go Kart' => 'go-kart', + 'Golf' => 'golf', + 'Golf Balls' => 'golf-balls', + 'Golf Clubs' => 'golf-clubs', + 'Goodfellas' => 'goodfellas', + 'Google' => 'google', + 'Google Home' => 'google-home', + 'Google Pixel' => 'google-pixel', + 'Go Outdoors' => 'go-outdoors', + 'GoPro' => 'gopro', + 'Graco' => 'graco', + 'Grand National' => 'grand-national', + 'Graphics Card' => 'graphics-card', + 'Gravity Rush' => 'gravity-rush', + 'Graze' => 'graze', + 'Greece' => 'greece', + 'Greenhouse' => 'greenhouse', + 'Greggs' => 'greggs', + 'Grey Goose' => 'grey-goose', + 'Grill' => 'grill', + 'Grinder' => 'grinder', + 'Grobag' => 'grobag', + 'Groceries' => 'groceries', + 'GTA' => 'gta', + 'GTA V' => 'gta-v', + 'Gtx 970' => 'gtx-970', + 'GTX 1060' => 'gtx-1060', + 'GTX 1070' => 'gtx-1070', + 'GTX 1080' => 'gtx-1080', + 'Guardians Of The Galaxy' => 'guardians-of-the-galaxy', + 'Gucci' => 'gucci', + 'Guinness' => 'guinness', + 'Guitar' => 'guitar', + 'Guitar Hero' => 'guitar-hero', + 'Gullivers' => 'gullivers', + 'Gym' => 'gym', + 'Gym Membership' => 'gym-membership', + 'H1z1' => 'h1z1', + 'Habitat' => 'habitat', + 'Hair' => 'hair', + 'Hair Clipper' => 'hair-clipper', + 'Hair Dryer' => 'hair-dryer', + 'Hair Dye' => 'hair-dye', + 'Halifax' => 'halifax', + 'Halo' => 'halo', + 'Halo 5' => 'halo-5', + 'Hammer' => 'hammer', + 'Hammock' => 'hammock', + 'Hamper' => 'hamper', + 'Handbag' => 'handbag', + 'Hand Mixer' => 'hand-mixer', + 'Happyland' => 'happyland', + 'Hard Drive' => 'hard-drive', + 'Haribo' => 'haribo', + 'Harman Kardon' => 'harman-kardon', + 'Harmony' => 'harmony', + 'Harry Potter' => 'harry-potter', + 'Hat' => 'hat', + 'Hatchimals' => 'hatchimals', + 'Hayfever' => 'hayfever', + 'Hdr Tv' => 'hdr-tv', + 'HD TV' => 'hd-tv', + 'Headboard' => 'headboard', + 'Headphones' => 'headphones', + 'Headset' => 'headset', + 'Health & Beauty' => 'beauty', + 'Heater' => 'heater', + 'Hedge Trimmer' => 'hedge-trimmer', + 'Heineken' => 'heineken', + 'Heinz' => 'heinz', + 'Helmet' => 'helmet', + 'Hermes' => 'hermes', + 'Highchair' => 'highchair', + 'Hiking' => 'hiking', + 'Hilton' => 'hilton', + 'Hisense' => 'hisense', + 'Hitachi' => 'hitachi', + 'Hitman' => 'hitman', + 'Hive' => 'hive', + 'Hob' => 'hob', + 'Holiday Inn' => 'holiday-inn', + 'Holidays & Leisure' => 'holiday', + 'Home & Garden' => 'home', + 'Home Cinema' => 'home-cinema', + 'Homedics' => 'homedics', + 'Homefront' => 'homefront', + 'Homeplug' => 'homeplug', + 'Home Security' => 'home-security', + 'Honey' => 'honey', + 'Honeywell' => 'honeywell', + 'Hong Kong' => 'hong-kong', + 'Honor' => 'honor', + 'Honor 6x' => 'honor-6x', + 'Hoodie' => 'hoodie', + 'Hoover' => 'hoover', + 'Horizon Zero Dawn' => 'horizon-zero-dawn', + 'Hornby' => 'hornby', + 'Hose' => 'hose', + 'Hotel' => 'hotel', + 'Hotpoint' => 'hotpoint', + 'Hot Tub' => 'hot-tub', + 'Hot Wheels' => 'hot-wheels', + 'Hozelock' => 'hozelock', + 'HP' => 'hp', + 'HP Envy' => 'hp-envy', + 'HP Laptop' => 'hp-laptop', + 'H Samuel' => 'h-samuel', + 'HTC' => 'htc', + 'HTC 10' => 'htc-10', + 'HTC Vive' => 'htc-vive', + 'Huawei' => 'huawei', + 'Huawei P9' => 'huawei-p9', + 'Huggies' => 'huggies', + 'Hugo Boss' => 'hugo-boss', + 'Humax' => 'humax', + 'Humidifier' => 'humidifier', + 'Hunter' => 'hunter', + 'Hydro 5' => 'hydro-5', + 'Hyperx' => 'hyperx', + 'Hyundai' => 'hyundai', + 'Iams Pet Food' => 'iams', + 'Ibiza' => 'ibiza', + 'Icandy' => 'icandy', + 'Ice Cream' => 'ice-cream', + 'Ice Cream Maker' => 'ice-cream-maker', + 'Imaginext' => 'imaginext', + 'Impact Driver' => 'impact-driver', + 'Indesit' => 'indesit', + 'India' => 'india', + 'Inflatable' => 'inflatable', + 'Injustice' => 'injustice', + 'Ink' => 'ink', + 'Inner Tube' => 'inner-tube', + 'Instant Ink' => 'instant-ink', + 'Insulation' => 'insulation', + 'Insurance' => 'insurance', + 'Intel' => 'intel', + 'Intel Atom' => 'atom', + 'Intel i3' => 'i3', + 'Intel i5' => 'i5', + 'Intel i7' => 'i7', + 'Internal Hard Drive' => 'internal-hard-drive', + 'Internet' => 'internet', + 'In The Night Garden' => 'in-the-night-garden', + 'iOS' => 'ios', + 'iPad' => 'ipad', + 'iPad Air' => 'ipad-air', + 'iPad Case' => 'ipad-case', + 'iPad Mini' => 'ipad-mini', + 'iPad Pro' => 'ipad-pro', + 'Ip Camera' => 'ip-camera', + 'iPhone' => 'iphone', + 'iPhone 5S' => 'iphone-5s', + 'iPhone 6' => 'iphone-6', + 'iPhone 6 Plus' => 'iphone-6-plus', + 'iPhone 6s' => 'iphone-6s', + 'iPhone 6s Plus' => 'iphone-6s-plus', + 'iPhone 7' => 'iphone-7', + 'iPhone 7 Plus' => 'iphone-7-plus', + 'iPhone Case' => 'iphone-case', + 'Iphone SE' => 'iphone-se', + 'iPod' => 'ipod', + 'iPod Nano' => 'ipod-nano', + 'iPod Touch' => 'ipod-touch', + 'Ireland' => 'ireland', + 'Irn Bru' => 'irn-bru', + 'Iron' => 'iron', + 'Ironing Board' => 'ironing-board', + 'Isle Of Wight' => 'isle-of-wight', + 'Isofix' => 'isofix', + 'Issey Miyake' => 'issey-miyake', + 'Italy' => 'italy', + 'iTunes' => 'itunes', + 'ITV' => 'itv', + 'Jabra' => 'jabra', + 'Jack Daniels' => 'jack-daniels', + 'Jacket' => 'jacket', + 'Jack Wills' => 'jack-wills', + 'Jack Wolfskin' => 'jack-wolfskin', + 'Jaguar' => 'jaguar', + 'Jamaica' => 'jamaica', + 'Jameson' => 'jameson', + 'Japan' => 'japan', + 'Jawbone' => 'jawbone', + 'Jaybird' => 'jaybird', + 'JBL' => 'jbl', + 'Jeans' => 'jeans', + 'Jewellery' => 'jewellery', + 'Jigsaw' => 'jigsaw', + 'Jim Beam' => 'jim-beam', + 'Jimmy Choo' => 'jimmy-choo', + 'Joop' => 'joop', + 'Jordan' => 'jordan', + 'Joseph Joseph' => 'joseph-joseph', + 'Joules' => 'joules', + 'Juice' => 'juice', + 'Juicer' => 'juicer', + 'Jumper' => 'jumper', + 'Jumperoo' => 'jumperoo', + 'Jura' => 'jura', + 'Just Cause 3' => 'just-cause-3', + 'Just Dance' => 'just-dance', + 'JVC' => 'jvc', + 'Karcher' => 'karcher', + 'Kaspersky' => 'kaspersky', + 'Kayak' => 'kayak', + 'Keg' => 'keg', + 'Kenwood' => 'kenwood', + 'Kenwood kMix' => 'kmix', + 'Keter' => 'keter', + 'Kettle' => 'kettle', + 'Kettlebell' => 'kettlebell', + 'Keyboard' => 'keyboard', + 'Kia' => 'kia', + 'Kickers' => 'kickers', + 'Kids Bike' => 'kids-bike', + 'Kinder' => 'kinder', + 'Kindle' => 'kindle', + 'Kindle Fire' => 'kindle-fire', + 'Kindle Paperwhite' => 'kindle-paperwhite', + 'Kinect' => 'kinect', + 'Kingdom Hearts' => 'kingdom-hearts', + 'King Size' => 'king-size', + 'Kirby' => 'kirby', + 'Kitchen' => 'kitchen', + 'KitchenAid' => 'kitchenaid', + 'Kitchen Roll' => 'kitchen-roll', + 'Kitsound' => 'kitsound', + 'Knickers' => 'knickers', + 'Knife' => 'knife', + 'Kobo' => 'kobo', + 'Kodi' => 'kodi', + 'Kopparberg' => 'kopparberg', + 'Kraken' => 'kraken', + 'Krakow' => 'krakow', + 'Krispy Kreme' => 'krispy-kreme', + 'Kurt Geiger' => 'kurt-geiger', + 'Lacoste' => 'lacoste', + 'Ladder' => 'ladder', + 'Lamb' => 'lamb', + 'Laminate' => 'laminate', + 'Lamp' => 'lamp', + 'Lancome' => 'lancome', + 'Laptop' => 'laptop', + 'Laser Printer' => 'laser-printer', + 'Laura Ashley' => 'laura-ashley', + 'Lavazza' => 'lavazza', + 'Lavender' => 'lavender', + 'Lawnmower' => 'lawnmower', + 'Lay-Z-Spa' => 'lay-z-spa', + 'Le Creuset' => 'le-creuset', + 'LED Bulbs' => 'led-bulbs', + 'LED TV' => 'led-tv', + 'Leeds' => 'leeds', + 'Lego' => 'lego', + 'Lego City' => 'lego-city', + 'Lego Dimensions' => 'lego-dimensions', + 'Lego Friends' => 'lego-friends', + 'Legoland' => 'legoland', + 'Lego Star Wars' => 'lego-star-wars', + 'Lego Technic' => 'lego-technic', + 'Leicester' => 'leicester', + 'Lenovo' => 'lenovo', + 'Lenovo Tablet' => 'lenovo-tablet', + 'Lenovo Yoga' => 'lenovo-yoga', + 'Levi' => 'levi', + 'LG' => 'lg', + 'LG G5' => 'lg-g5', + 'LG G6' => 'lg-g6', + 'LG TV' => 'lg-tv', + 'Light' => 'light', + 'Lighting' => 'lighting', + 'Lightning Cable' => 'lightning-cable', + 'Lindor' => 'lindor', + 'Lindt' => 'lindt', + 'Lingerie' => 'lingerie', + 'Linx' => 'linx', + 'Little Tikes' => 'little-tikes', + 'Liverpool' => 'liverpool', + 'Logitech' => 'logitech', + 'London' => 'london', + 'London Eye' => 'london-eye', + 'London Zoo' => 'london-zoo', + 'Lottery' => 'lottery', + 'Lounger' => 'lounger', + 'Lurpak' => 'lurpak', + 'Lynx' => 'lynx', + 'MacBook' => 'macbook', + 'MacBook Air' => 'macbook-air', + 'MacBook Pro' => 'macbook-pro', + 'Mac Mini' => 'mac-mini', + 'Mad Max' => 'mad-max', + 'Mafia 3' => 'mafia-3', + 'Magazine' => 'magazine', + 'Magimix' => 'magimix', + 'Majorca' => 'majorca', + 'Make Up' => 'make-up', + 'Makita' => 'makita', + 'Maldives' => 'maldives', + 'Manchester' => 'manchester', + 'Manfrotto' => 'manfrotto', + 'Marc Jacobs' => 'marc-jacobs', + 'Mario' => 'mario', + 'Mario Kart' => 'mario-kart', + 'Mario Kart 8' => 'mario-kart-8', + 'Mario Kart 8 Deluxe' => 'mario-kart-8-deluxe', + 'Marvel' => 'marvel', + 'Mascara' => 'mascara', + 'Massage' => 'massage', + 'Mass Effect' => 'mass-effect', + 'Mass Effect Andromeda' => 'mass-effect-andromeda', + 'Maternity' => 'maternity', + 'Mattress' => 'mattress', + 'Mattress Topper' => 'mattress-topper', + 'Mavic' => 'mavic', + 'Maxi Cosi' => 'maxi-cosi', + 'Meat' => 'meat', + 'Mechanical Keyboard' => 'mechanical-keyboard', + 'Medion' => 'medion', + 'Memory Foam' => 'memory-foam', + 'Mens Boots' => 'mens-boots', + 'Mens Fashion' => 'mens-clothing', + 'Mens Shoes' => 'mens-shoes', + 'Mercedes' => 'mercedes', + 'Merlin' => 'merlin', + 'Merrell' => 'merrell', + 'Mexico' => 'mexico', + 'Michael Kors' => 'michael-kors', + 'Microphone' => 'microphone', + 'Micro SD' => 'micro-sd', + 'Microserver' => 'microserver', + 'Microsoft' => 'microsoft', + 'Microsoft Office' => 'microsoft-office', + 'Microwave' => 'microwave', + 'Miele' => 'miele', + 'Milwaukee' => 'milwaukee', + 'Minecraft' => 'minecraft', + 'Mini' => 'mini', + 'Mini Fridge' => 'mini-fridge', + 'Mini PC' => 'mini-pc', + 'Mirror' => 'mirror', + 'Mitre Saw' => 'mitre-saw', + 'Mobile Broadband' => 'mobile-broadband', + 'Mobile Contract' => 'mobile-contract', + 'Mobile Phone' => 'mobile-phone', + 'Mobiles' => 'mobiles', + 'Molton Brown' => 'molton-brown', + 'Monitor' => 'monitor', + 'Monopoly' => 'monopoly', + 'Monsoon' => 'monsoon', + 'Mop' => 'mop', + 'Morocco' => 'morocco', + 'Mortgage' => 'mortgage', + 'Moses Basket' => 'moses-basket', + 'Mot' => 'mot', + 'Motherboard' => 'motherboard', + 'Moto 360' => 'moto-360', + 'Moto G' => 'moto-g', + 'Moto G4' => 'moto-g4', + 'Moto G5' => 'moto-g5', + 'Motorcycle' => 'motorcycle', + 'Motorola' => 'motorola', + 'Moto Z' => 'moto-z', + 'Mountain Bike' => 'mountain-bike', + 'Mouse' => 'mouse', + 'Mouse Mat' => 'mouse-mat', + 'Movie' => 'movie', + 'MP3 Player' => 'mp3-player', + 'MSI' => 'msi', + 'Mug' => 'mug', + 'Multitool' => 'multitool', + 'Music' => 'music', + 'My Little Pony' => 'my-little-pony', + 'Nandos' => 'nandos', + 'NAS' => 'nas', + 'National Express' => 'national-express', + 'National Trust' => 'national-trust', + 'Necklace' => 'necklace', + 'Nectar' => 'nectar', + 'Neff' => 'neff', + 'Nerf' => 'nerf', + 'Nescafe' => 'nescafe', + 'Nespresso' => 'nespresso', + 'Nest' => 'nest', + 'Netflix' => 'netflix', + 'Netgear' => 'netgear', + 'Netgear Arlo' => 'arlo', + 'New Balance' => 'new-balance', + 'Newcastle' => 'newcastle', + 'New Look' => 'new-look', + 'New York' => 'new-york', + 'Nextbase' => 'nextbase', + 'Nexus' => 'nexus', + 'NFL' => 'nfl', + 'Nier' => 'nier', + 'Nike' => 'nike', + 'Nike Air Max' => 'nike-air-max', + 'Nikon' => 'nikon', + 'Nilfisk' => 'nilfisk', + 'Ninja' => 'ninja', + 'Nintendo' => 'nintendo', + 'Nintendo DS' => 'nintendo-ds', + 'Nintendo eShop' => 'eshop', + 'Nintendo Switch' => 'nintendo-switch', + 'Nioh' => 'nioh', + 'Nissan' => 'nissan', + 'Nivea' => 'nivea', + 'Nokia' => 'nokia', + 'North Face' => 'north-face', + 'Norton' => 'norton', + 'Note 4' => 'note-4', + 'Now TV' => 'now-tv', + 'Nursery' => 'nursery', + 'Nus' => 'nus', + 'Nutella' => 'nutella', + 'Nutribullet' => 'nutribullet', + 'Nutri Ninja' => 'nutri-ninja', + 'NVIDIA' => 'nvidia', + 'O2' => 'o2', + 'O2 Refresh' => 'o2-refresh', + 'Oak' => 'oak', + 'Oakley' => 'oakley', + 'Oculus' => 'oculus', + 'Odeon' => 'odeon', + 'Office' => 'office', + 'Office Chair' => 'office-chair', + 'OLED TV' => 'oled', + 'Olympus' => 'olympus', + 'Oneplus' => 'oneplus', + 'Onkyo' => 'onkyo', + 'Oral-B' => 'oral-b', + 'Origin' => 'origin', + 'Orlando' => 'orlando', + 'Osprey' => 'osprey', + 'Ottoman' => 'ottoman', + 'Outdoor' => 'outdoor', + 'Oven' => 'oven', + 'Overwatch' => 'overwatch', + 'Paddling Pool' => 'paddling-pool', + 'Paint' => 'paint', + 'Pampers' => 'pampers', + 'Pan' => 'pan', + 'Panasonic' => 'panasonic', + 'Panasonic Lumix' => 'lumix', + 'Pandora' => 'pandora', + 'Papa Johns' => 'papa-johns', + 'Parasol' => 'parasol', + 'Parcel' => 'parcel', + 'Paris' => 'paris', + 'Parking' => 'parking', + 'Paw Patrol' => 'paw-patrol', + 'PAYG' => 'payg', + 'Paypal' => 'paypal', + 'PC' => 'pc', + 'PC Case' => 'pc-case', + 'PC Game' => 'pc-game', + 'Pebble' => 'pebble', + 'Peppa Pig' => 'peppa-pig', + 'Pepsi' => 'pepsi', + 'Perfume' => 'perfume', + 'Persona' => 'persona', + 'Persona 5' => 'persona-5', + 'Petrol' => 'petrol', + 'Philips' => 'philips', + 'Philips Hue' => 'philips-hue', + 'Phones' => 'phone', + 'Photo' => 'photo', + 'Piano' => 'piano', + 'Pillow' => 'pillow', + 'Pizza' => 'pizza', + 'Plant' => 'plant', + 'Playhouse' => 'playhouse', + 'Playmobil' => 'playmobil', + 'Playstation' => 'playstation', + 'Playstation Plus' => 'playstation-plus', + 'Playstation VR' => 'playstation-vr', + 'Pokemon' => 'pokemon', + 'Pool' => 'pool', + 'Power Bank' => 'power-bank', + 'Powerline' => 'powerline', + 'Power Rangers' => 'power-rangers', + 'Pram' => 'pram', + 'Pressure Cooker' => 'pressure-cooker', + 'Pressure Washer' => 'pressure-washer', + 'Printer' => 'printer', + 'Projector' => 'projector', + 'Protein' => 'protein', + 'PS3' => 'ps3', + 'PS4' => 'ps4', + 'PS4 Controller' => 'ps4-controller', + 'PS4 Games' => 'ps4-games', + 'PS4 Headset' => 'ps4-headset', + 'PS4 Pro' => 'ps4-pro', + 'PS4 Slim' => 'ps4-slim', + 'PSN' => 'psn', + 'PSU' => 'psu', + 'PS Vita' => 'ps-vita', + 'Puma' => 'puma', + 'Pushchair' => 'pushchair', + 'Qnap' => 'qnap', + 'Quorn' => 'quorn', + 'Rab' => 'rab', + 'Radiator' => 'radiator', + 'Radio' => 'radio', + 'Radley' => 'radley', + 'Railcard' => 'railcard', + 'Ralph Lauren' => 'ralph-lauren', + 'RAM' => 'ram', + 'Raspberry Pi' => 'raspberry-pi', + 'Rattan Garden Furniture' => 'rattan', + 'Ray Ban' => 'ray-ban', + 'Razer' => 'razer', + 'Razor' => 'razor', + 'Reebok' => 'reebok', + 'Resident Evil' => 'resident-evil', + 'Resident Evil 7' => 'resident-evil-7', + 'Rice' => 'rice', + 'Ring' => 'ring', + 'Road Bike' => 'road-bike', + 'Rocket League' => 'rocket-league', + 'Rogue One' => 'rogue-one', + 'Roku' => 'roku', + 'Rolex' => 'rolex', + 'Roof Box' => 'roof-box', + 'Roses' => 'roses', + 'Rotary' => 'rotary', + 'Router' => 'router', + 'Rug' => 'rug', + 'Rum' => 'rum', + 'Running' => 'running', + 'RX 480' => 'rx-480', + 'Ryanair' => 'ryanair', + 'Ryobi' => 'ryobi', + 'Sale' => 'sale', + 'Salmon' => 'salmon', + 'Salomon' => 'salomon', + 'Samsonite' => 'samsonite', + 'Samsung' => 'samsung', + 'Samsung Galaxy' => 'samsung-galaxy', + 'Samsung Galaxy S7' => 'samsung-galaxy-s7', + 'Samsung Galaxy S7 Edge' => 'samsung-galaxy-s7-edge', + 'Samsung Galaxy S8' => 'samsung-galaxy-s8', + 'Samsung Galaxy S8 Plus' => 'samsung-s8-plus', + 'Samsung Gear' => 'samsung-gear', + 'Samsung TV' => 'samsung-tv', + 'Sandals' => 'sandals', + 'Sander' => 'sander', + 'SanDisk' => 'sandisk', + 'Sat Nav' => 'sat-nav', + 'Saw' => 'saw', + 'Scalextric' => 'scalextric', + 'Scooter' => 'scooter', + 'Screenwash' => 'screenwash', + 'Screwdriver' => 'screwdriver', + 'SD Card' => 'sd-card', + 'SDXC' => 'sdxc', + 'Seagate' => 'seagate', + 'Seat' => 'seat', + 'Security Camera' => 'security-camera', + 'Seeds' => 'seeds', + 'Seiko' => 'seiko', + 'Sennheiser' => 'sennheiser', + 'Server' => 'server', + 'Sewing Machine' => 'sewing-machine', + 'Shadow Of Mordor' => 'shadow-of-mordor', + 'Shark' => 'shark', + 'Sharpie' => 'sharpie', + 'Shaver' => 'shaver', + 'Shed' => 'shed', + 'Shelves' => 'shelves', + 'Shirt' => 'shirt', + 'Shoes' => 'shoe', + 'Shopkins' => 'shopkins', + 'Shorts' => 'shorts', + 'Shower' => 'shower', + 'Shredder' => 'shredder', + 'Sideboard' => 'sideboard', + 'Sim' => 'sim', + 'Sim Free' => 'sim-free', + 'Sim Only' => 'sim-only', + 'Sink' => 'sink', + 'Skechers' => 'skechers', + 'Ski' => 'ski', + 'Skoda' => 'skoda', + 'Sky' => 'sky', + 'Skylanders' => 'skylanders', + 'Skyrim' => 'skyrim', + 'Sleeping Bag' => 'sleeping-bag', + 'Slide' => 'slide', + 'Slimming World' => 'slimming-world', + 'Slippers' => 'slippers', + 'Slow Cooker' => 'slow-cooker', + 'SLR Camera' => 'slr', + 'Smart' => 'smart', + 'Smartphone' => 'smartphone', + 'Smartthings' => 'smartthings', + 'Smart TV' => 'smart-tv', + 'Smartwatch' => 'smartwatch', + 'Snapfish' => 'snapfish', + 'Socket Set' => 'socket-set', + 'Socks' => 'socks', + 'Sofa' => 'sofa', + 'Software & Apps' => 'software-apps', + 'Sonicare' => 'sonicare', + 'Sonos' => 'sonos', + 'Sony' => 'sony', + 'Sony TV' => 'sony-tv', + 'Soundbar' => 'soundbar', + 'Soup Maker' => 'soup-maker', + 'Spa' => 'spa', + 'Spain' => 'spain', + 'Speakers' => 'speakers', + 'Spinner' => 'spinner', + 'Spirits' => 'spirits', + 'Splatoon' => 'splatoon', + 'Sports & Fitness' => 'sports-fitness', + 'SSD' => 'ssd', + 'Starbucks' => 'starbucks', + 'Star Trek' => 'star-trek', + 'Star Wars' => 'star-wars', + 'Steak' => 'steak', + 'Steam' => 'steam', + 'Steamer' => 'steamer', + 'Steam Iron' => 'steam-iron', + 'Steam Link' => 'steam-link', + 'Steam Mop' => 'steam-mop', + 'Storage' => 'storage', + 'Storage Box' => 'storage-box', + 'Strimmer' => 'strimmer', + 'Student' => 'student', + 'Suit' => 'suit', + 'Suitcase' => 'suitcase', + 'Sun Cream' => 'sun-cream', + 'Sunglasses' => 'sunglasses', + 'Superdry' => 'superdry', + 'Surface' => 'surface', + 'Surface Book' => 'surface-book', + 'Sweets' => 'sweets', + 'Swing' => 'swing', + 'Synology' => 'synology', + 'T-Shirt' => 't-shirt', + 'Table' => 'table', + 'Tablet' => 'tablet', + 'Table Tennis' => 'table-tennis', + 'Tado' => 'tado', + 'Tag Heuer' => 'tag-heuer', + 'Takeaway' => 'takeaway', + 'Talkmobile' => 'talkmobile', + 'Tap' => 'tap', + 'Tassimo' => 'tassimo', + 'Tastecard' => 'tastecard', + 'Tea' => 'tea', + 'Ted Baker' => 'ted-baker', + 'Tefal' => 'tefal', + 'Tekken' => 'tekken', + 'Tekken 7' => 'tekken-7', + 'Telegraph' => 'telegraph', + 'Telescope' => 'telescope', + 'Tenerife' => 'tenerife', + 'Tennis' => 'tennis', + 'Tent' => 'tent', + 'Tesco Clothing' => 'tesco-clothing', + 'Tesla' => 'tesla', + 'Thailand' => 'thailand', + 'Theatre' => 'theatre', + 'The Body Shop' => 'body-shop', + 'The Last Guardian' => 'the-last-guardian', + 'The Last Of Us' => 'the-last-of-us', + 'Theme Park' => 'theme-park', + 'Thermometer' => 'thermometer', + 'Thermos' => 'thermos', + 'Thermostat' => 'thermostat', + 'The Sun' => 'the-sun', + 'The Witcher 3' => 'the-witcher-3', + 'Thinkpad' => 'thinkpad', + 'Thomas Sabo' => 'thomas-sabo', + 'Thorntons' => 'thorntons', + 'Thorpe Park' => 'thorpe-park', + 'Throw' => 'throw', + 'Thrustmaster' => 'thrustmaster', + 'Thule' => 'thule', + 'Tights' => 'tights', + 'Tile' => 'tile', + 'Timberland' => 'timberland', + 'Tissot' => 'tissot', + 'Titanfall' => 'titanfall', + 'Titanfall 2' => 'titanfall-2', + 'Toaster' => 'toaster', + 'Toddler Bed' => 'toddler-bed', + 'Toilet' => 'toilet', + 'Toilet Roll' => 'toilet-roll', + 'Toilet Seat' => 'toilet-seat', + 'Tomb Raider' => 'tomb-raider', + 'Tom Clancy' => 'tom-clancy', + 'Tom Ford' => 'tom-ford', + 'Tommee Tippee' => 'tommee-tippee', + 'Toms' => 'toms', + 'TomTom' => 'tomtom', + 'Tool' => 'tool', + 'Toothbrush' => 'toothbrush', + 'Toothpaste' => 'toothpaste', + 'Toot Toot' => 'toot-toot', + 'Torch' => 'torch', + 'Torque Wrench' => 'torque-wrench', + 'Toshiba' => 'toshiba', + 'Towel' => 'towel', + 'Toyota' => 'toyota', + 'Toys' => 'toy', + 'Toy Story' => 'toy-story', + 'Tp Link' => 'tp-link', + 'Tracksuit' => 'tracksuit', + 'Train' => 'train', + 'Trainers' => 'trainers', + 'Trampoline' => 'trampoline', + 'Transcend' => 'transcend', + 'Transformers' => 'transformers', + 'Travel' => 'travel', + 'Travel Insurance' => 'travel-insurance', + 'Travelodge' => 'travelodge', + 'Travel System' => 'travel-system', + 'Treadmill' => 'treadmill', + 'Trespass' => 'trespass', + 'Trike' => 'trike', + 'Tripod' => 'tripod', + 'Tripp' => 'tripp', + 'Trolley' => 'trolley', + 'Trousers' => 'trousers', + 'Trunki' => 'trunki', + 'Tumble Dryer' => 'tumble-dryer', + 'Tuna' => 'tuna', + 'Turbo Trainer' => 'turbo-trainer', + 'Turkey' => 'turkey', + 'Turntable' => 'turntable', + 'Turtle Beach' => 'turtle-beach', + 'TV' => 'tv', + 'TV Stand' => 'tv-stand', + 'Tyres' => 'tyres', + 'Ubisoft' => 'ubisoft', + 'Ue Boom' => 'ue-boom', + 'UFC' => 'ufc', + 'UGG' => 'ugg', + 'Ulefone' => 'ulefone', + 'Ultimate Ears UE Boom 2' => 'ue-boom-2', + 'Ultimate Outdoors' => 'ultimate-outdoors', + 'Ultrabook' => 'ultrabook', + 'Ultrawide Monitor' => 'ultrawide', + 'Umbrella' => 'umbrella', + 'Umi' => 'umi', + 'Uncharted' => 'uncharted', + 'Uncharted 4' => 'uncharted-4', + 'Under Armour' => 'under-armour', + 'Underwear' => 'underwear', + 'Unicorn' => 'unicorn', + 'Unidays' => 'unidays', + 'Urban Decay' => 'urban-decay', + 'Usa' => 'usa', + 'USB Hub' => 'usb-hub', + 'USB Memory Stick' => 'flash-drive', + 'Usn' => 'usn', + 'Vacuum Cleaners' => 'vacuum-cleaners', + 'Vango' => 'vango', + 'Vanish' => 'vanish', + 'Vans' => 'vans', + 'Vape' => 'vape', + 'Vauxhall' => 'vauxhall', + 'Vax' => 'vax', + 'Velvet' => 'velvet', + 'Venice' => 'venice', + 'Versace' => 'versace', + 'Vibrator' => 'vibrator', + 'Victorinox' => 'victorinox', + 'Vileda' => 'vileda', + 'Vinyl' => 'vinyl', + 'Virgin' => 'virgin', + 'Vitamix' => 'vitamix', + 'Vodafone' => 'vodafone', + 'Vodka' => 'vodka', + 'Volvo' => 'volvo', + 'VPN' => 'vpn', + 'VR' => 'vr', + 'VTech' => 'vtech', + 'Vue' => 'vue', + 'VW' => 'vw', + 'Wacom' => 'wacom', + 'Waffle Maker' => 'waffle-maker', + 'Wahl' => 'wahl', + 'Walkers' => 'walkers', + 'Walking Boots' => 'walking-boots', + 'Walking Dead' => 'walking-dead', + 'Wallet' => 'wallet', + 'Wallpaper' => 'wallpaper', + 'Walsall' => 'walsall', + 'Wardrobe' => 'wardrobe', + 'Warhammer' => 'warhammer', + 'Washer Dryer' => 'washer-dryer', + 'Washing Machine' => 'washing-machine', + 'Watch' => 'watch', + 'Watch Dogs' => 'watch-dogs', + 'Watch Dogs 2' => 'watch-dogs-2', + 'Water Bottle' => 'water-bottle', + 'Water Butt' => 'water-butt', + 'Water Filter' => 'water-filter', + 'Wayfair' => 'wayfair', + 'Webcam' => 'webcam', + 'Weber' => 'weber', + 'Wedding' => 'wedding', + 'Weed' => 'weed', + 'Weekend Break' => 'weekend-break', + 'Weetabix' => 'weetabix', + 'Weight Watchers' => 'weight-watchers', + 'Wellies' => 'wellies', + 'Wenger' => 'wenger', + 'Western Digital' => 'western-digital', + 'Wetsuit' => 'wetsuit', + 'Wheelbarrow' => 'wheelbarrow', + 'Whey' => 'whey', + 'Whiskas' => 'whiskas', + 'Whisky' => 'whisky', + 'Wifi Camera' => 'wifi-camera', + 'Wifi Extender' => 'wifi-extender', + 'Wii' => 'wii', + 'Wii U' => 'wii-u', + 'Wii U Pro Controller' => 'wii-u-pro-controller', + 'Wileyfox' => 'wileyfox', + 'Wilkinson Sword' => 'wilkinson-sword', + 'Wimbledon' => 'wimbledon', + 'Windows' => 'windows', + 'Windows 10' => 'windows-10', + 'Wine' => 'wine', + 'Wipes' => 'wipes', + 'Wireless Headphones' => 'wireless-headphones', + 'Wireless Keyboard' => 'wireless-keyboard', + 'Witcher' => 'witcher', + 'Wok' => 'wok', + 'Wolfenstein' => 'wolfenstein', + 'Women Fashion' => 'womens-clothes', + 'Workbench' => 'workbench', + 'World Of Warcraft' => 'world-of-warcraft', + 'Worx' => 'worx', + 'Wuaki' => 'wuaki', + 'WWE' => 'wwe', + 'Xbox' => 'xbox', + 'Xbox 360' => 'xbox-360', + 'Xbox 360 Game' => 'xbox-360-game', + 'Xbox Controller' => 'xbox-controller', + 'Xbox Gift Card' => 'xbox-gift-card', + 'Xbox Headset' => 'xbox-headset', + 'Xbox Live' => 'xbox-live', + 'Xbox One' => 'xbox-one', + 'Xbox One Controller' => 'xbox-one-controller', + 'Xbox One Elite Controller' => 'xbox-one-elite-controller', + 'Xbox One Games' => 'xbox-one-games', + 'Xbox One S' => 'xbox-one-s', + 'Xbox One X' => 'xbox-one-x', + 'Xbox Wireless Adapter' => 'xbox-wireless-adapter', + 'Xcom' => 'xcom', + 'XCOM 2' => 'xcom-2', + 'XFX' => 'xfx', + 'Xiaomi' => 'xiaomi', + 'Xiaomi Redmi' => 'redmi', + 'Xperia' => 'xperia', + 'Xperia Z3' => 'xperia-z3', + 'Xperia Z5' => 'xperia-z5', + 'XPS' => 'xps', + 'Yakuza' => 'yakuza', + 'Yale' => 'yale', + 'Yamaha' => 'yamaha', + 'Yankee Candle' => 'yankee-candle', + 'Yoga' => 'yoga', + 'York' => 'york', + 'Yorkshire' => 'yorkshire', + 'Yoshi' => 'yoshi', + 'Youview' => 'youview', + 'Yves Saint Laurent' => 'yves-saint-laurent', + 'Zante' => 'zante', + 'Zanussi' => 'zanussi', + 'Zelda' => 'zelda', + 'Zelda Breath Of The Wild' => 'zelda-breath-of-the-wild', + 'Zenbook' => 'zenbook', + 'Zippo' => 'zippo', + 'Zizzi' => 'zizzi', + 'Zoo' => 'zoo', + 'Zoostorm' => 'zoostorm', + 'ZOTAC' => 'zotac', + 'ZTE' => 'zte', + 'ZyXEL' => 'zyxel', + ) + ), + 'order' => array( + 'name' => 'Order by', + 'type' => 'list', + 'required' => 'true', + 'title' => 'Sort order of deals', + 'values' => array( + 'From the most to the least hot deal' => '-hot', + 'From the most recent deal to the oldest' => '', + 'From the most commented deal to the least commented deal' => '-discussed' + ) + ) + ) + ); + + public $lang = array( + 'bridge-uri' => SELF::URI, + 'bridge-name' => SELF::NAME, + 'context-keyword' => 'Search by keyword(s))', + 'context-group' => 'Deals per group', + 'uri-group' => '/tag/', + 'request-error' => 'Could not request HotUKDeals', + 'no-results' => 'Ooops, looks like we could', + 'relative-date-indicator' => array( + 'ago', + ), + 'price' => 'Price', + 'shipping' => 'Shipping', + 'origin' => 'Origin', + 'discount' => 'Discount', + 'title-keyword' => 'Search', + 'title-group' => 'Group', + 'local-months' => array( + 'Jan', + 'Feb', + 'Mar', + 'Apr', + 'May', + 'Jun', + 'Jul', + 'Aug', + 'Sep', + 'Occ', + 'Nov', + 'Dec', + 'st', + 'nd', + 'rd', + 'th' + ), + 'local-time-relative' => array( + 'Found ', + 'm', + 'h,', + 'day', + 'days', + 'month', + 'year', + 'and ' + ), + 'date-prefixes' => array( + 'Found ', + 'Refreshed ', + 'Made hot ' + ), + 'relative-date-alt-prefixes' => array( + 'Made hot ', + 'Refreshed ', + 'Last updated ' + ), + 'relative-date-ignore-suffix' => array( + '/by.*$/' + ), + 'localdeal' => array( + 'Local', + 'Expires' + ) + ); + +} diff --git a/bridges/MydealsBridge.php b/bridges/MydealsBridge.php new file mode 100644 index 00000000..163cf62e --- /dev/null +++ b/bridges/MydealsBridge.php @@ -0,0 +1,144 @@ + array ( + 'q' => array( + 'name' => 'Stichworten', + 'type' => 'text', + 'required' => true + ), + 'hide_expired' => array( + 'name' => 'Abgelaufenes ausblenden', + 'type' => 'checkbox', + 'required' => 'true' + ), + 'hide_local' => array( + 'name' => 'Lokales ausblenden', + 'type' => 'checkbox', + 'title' => 'Deals im physischen Geschäft ausblenden', + 'required' => 'true' + ), + 'priceFrom' => array( + 'name' => 'Minimaler Preis', + 'type' => 'text', + 'title' => 'Minmaler Preis in Euros', + 'required' => 'false', + 'defaultValue' => '' + ), + 'priceTo' => array( + 'name' => 'Maximaler Preis', + 'type' => 'text', + 'title' => 'maximaler Preis in Euro', + 'required' => 'false', + 'defaultValue' => '' + ), + ), + + 'Deals pro Gruppen' => array( + 'group' => array( + 'name' => 'Gruppen', + 'type' => 'list', + 'required' => 'true', + 'title' => 'Gruppe, deren Deals angezeigt werden müssen', + 'values' => array( + 'Elektronik' => 'elektronik', + 'Handy & Smartphone' => 'smartphone', + 'Gaming' => 'gaming', + 'Software' => 'apps-software', + 'Fashion Frauen' => 'fashion-frauen', + 'Fashion Männer' => 'fashion-accessoires', + 'Beauty & Gesundheit' => 'beauty', + 'Family & Kids' => 'family-kids', + 'Essen & Trinken' => 'food', + 'Freizeit & Reisen' => 'reisen', + 'Haushalt & Garten' => 'home-living', + 'Entertainment' => 'entertainment', + 'Verträge & Finanzen' => 'vertraege-finanzen', + 'Coupons' => 'coupons', + + ) + ), + 'order' => array( + 'name' => 'sortieren nach', + 'type' => 'list', + 'required' => 'true', + 'title' => 'Sortierung der deals', + 'values' => array( + 'Vom heißesten zum kältesten Deal' => '', + 'Vom jüngsten Deal zum ältesten' => '-new', + 'Vom am meisten kommentierten Deal zum am wenigsten kommentierten Deal' => '-discussed' + ) + ) + ) + ); + + public $lang = array( + 'bridge-uri' => SELF::URI, + 'bridge-name' => SELF::NAME, + 'context-keyword' => 'Suche nach Stichworten', + 'context-group' => 'Deals pro Gruppen', + 'uri-group' => '/gruppe/', + 'request-error' => 'Could not request mydeals', + 'no-results' => 'Ups, wir konnten keine Deals zu', + 'relative-date-indicator' => array( + 'vor', + 'seit' + ), + 'price' => 'Preis', + 'shipping' => 'Versand', + 'origin' => 'Ursprung', + 'discount' => 'Rabatte', + 'title-keyword' => 'Suche', + 'title-group' => 'Gruppe', + 'local-months' => array( + 'Jan', + 'Feb', + 'Mär', + 'Apr', + 'Mai', + 'Jun', + 'Jul', + 'Aug', + 'Sep', + 'Okt', + 'Nov', + 'Dez', + '.' + ), + 'local-time-relative' => array( + 'eingestellt vor ', + 'm', + 'h,', + 'day', + 'days', + 'month', + 'year', + 'and ' + ), + 'date-prefixes' => array( + 'eingestellt am ', + 'lokal ', + 'aktualisiert ', + ), + 'relative-date-alt-prefixes' => array( + 'aktualisiert vor ', + 'kommentiert vor ', + 'heiß seit ' + ), + 'relative-date-ignore-suffix' => array( + '/von.*$/' + ), + 'localdeal' => array( + 'Lokal ', + 'Läuft bis ' + ) + ); + +} From 3f41d0593a740502f7446cf1338b631db198048a Mon Sep 17 00:00:00 2001 From: TheRadialActive Date: Mon, 16 Jul 2018 12:02:41 +0200 Subject: [PATCH 023/146] Added RSS bridge for zenodo.org (#749) * added RSS bridge for zenodo.org --- bridges/ZenodoBridge.php | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 bridges/ZenodoBridge.php diff --git a/bridges/ZenodoBridge.php b/bridges/ZenodoBridge.php new file mode 100644 index 00000000..18ef91cd --- /dev/null +++ b/bridges/ZenodoBridge.php @@ -0,0 +1,55 @@ +getURI()) + or returnServerError('zenodo.org not reachable.'); + + foreach($html->find('div.record-elem') as $element) { + $item = array(); + $item['uri'] = self::URI . $element->find('h4', 0)->find('a', 0)->href; + $item['title'] = trim( + htmlspecialchars_decode($element->find('h4', 0)->find('a', 0)->innertext, + ENT_QUOTES + ) + ); + foreach($element->find('p', 0)->find('span') as $authors) { + $item['author'] = $item['author'] . $authors . '; '; + } + $content = $element->find('p.hidden-xs', 0)->find('a', 0)->innertext . '
'; + $type = '
Type: ' . $element->find('span.label-default', 0)->innertext; + + $raw_date = $element->find('small.text-muted', 0)->innertext; + $clean_date = date_parse(str_replace('Uploaded on ', '', $raw_date)); + + $content = $content . date_parse($clean_date); + + $item['timestamp'] = mktime( + $clean_date['hour'], + $clean_date['minute'], + $clean_date['second'], + $clean_date['month'], + $clean_date['day'], + $clean_date['year'] + ); + + $access = ''; + if ($element->find('span.label-success', 0)->innertext) { + $access = 'Open Access'; + } elseif ($element->find('span.label-warning', 0)->innertext) { + $access = 'Embargoed Access'; + } else { + $access = $element->find('span.label-error', 0)->innertext; + } + $access = '
Access: ' . $access; + $publication = '
Publication Date: ' . $element->find('span.label-info', 0)->innertext; + $item['content'] = $content . $type . $access . $publication; + $this->items[] = $item; + } + } +} From 049ee52fb5e044628195425655338c379602435e Mon Sep 17 00:00:00 2001 From: Eugene Molotov Date: Mon, 16 Jul 2018 15:32:24 +0500 Subject: [PATCH 024/146] Implemented feed item categories (#746) --- formats/AtomFormat.php | 11 +++++++++++ formats/HtmlFormat.php | 15 +++++++++++++++ formats/MrssFormat.php | 11 +++++++++++ static/HtmlFormat.css | 4 +++- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php index 6ebdf771..9bd08bd1 100644 --- a/formats/AtomFormat.php +++ b/formats/AtomFormat.php @@ -40,6 +40,16 @@ class AtomFormat extends FormatAbstract{ } } + $entryCategories = ''; + if(isset($item['categories'])) { + foreach($item['categories'] as $category) { + $entryCategories .= '' + . PHP_EOL; + } + } + $entries .= << @@ -52,6 +62,7 @@ class AtomFormat extends FormatAbstract{ {$entryTimestamp} {$entryContent} {$entryEnclosures} + {$entryCategories} EOD; diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php index fc4adcc0..c4c5012a 100644 --- a/formats/HtmlFormat.php +++ b/formats/HtmlFormat.php @@ -47,6 +47,20 @@ class HtmlFormat extends FormatAbstract { $entryEnclosures .= '
'; } + $entryCategories = ''; + if(isset($item['categories'])) { + $entryCategories = '

Categories:

'; + + foreach($item['categories'] as $category) { + + $entryCategories .= '
  • ' + . $this->sanitizeHtml($category) + . '
    • '; + } + + $entryCategories .= '
    '; + } + $entries .= << @@ -55,6 +69,7 @@ class HtmlFormat extends FormatAbstract { {$entryAuthor} {$entryContent} {$entryEnclosures} + {$entryCategories}
    EOD; diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php index 8f54ef0b..6d079288 100644 --- a/formats/MrssFormat.php +++ b/formats/MrssFormat.php @@ -51,6 +51,16 @@ Some media files might not be shown to you. Consider using the ATOM format inste } } + $entryCategories = ''; + if(isset($item['categories'])) { + + foreach($item['categories'] as $category) { + $entryCategories .= '' + . $category . '' + . PHP_EOL; + } + } + $items .= << @@ -61,6 +71,7 @@ Some media files might not be shown to you. Consider using the ATOM format inste {$itemContent}{$entryEnclosuresWarning} {$itemAuthor} {$entryEnclosures} + {$entryCategories} EOD; diff --git a/static/HtmlFormat.css b/static/HtmlFormat.css index 9e0ee13e..195a9b0d 100644 --- a/static/HtmlFormat.css +++ b/static/HtmlFormat.css @@ -69,12 +69,14 @@ a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link, } +section > div.content, section > div.categories, section > div.content, section > div.attachments { padding: 10px; } +section > div.categories > li.category, section > div.attachments > li.enclosure { list-style-type: circle; @@ -114,4 +116,4 @@ img { max-width: 100%; -} \ No newline at end of file +} From fbf874cb295d3adcd79ea8ff7ad72e4da9246964 Mon Sep 17 00:00:00 2001 From: Teromene Date: Mon, 16 Jul 2018 12:37:09 +0200 Subject: [PATCH 025/146] Update README.md Remove allow_url_fopen requirement. This should no longer be necessary. Added requirement for curl. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45bbc6d9..3ca495c4 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Requirements * PHP 5.6, e.g. `AddHandler application/x-httpd-php56 .php` in `.htaccess` * `openssl` extension enabled in PHP config (`php.ini`) - * `allow_url_fopen=1` in `php.ini` + * `curl` extension enabled in PHP config (`php.ini`) Enabling/Disabling bridges === From c7b0c9fd31aa5ce88dbf4d4a0fb7ca71bf8b7f46 Mon Sep 17 00:00:00 2001 From: Nemo Date: Mon, 16 Jul 2018 18:24:52 +0530 Subject: [PATCH 026/146] Amazon Price Tracker Bridge (#741) * [amazonprice] Adds AmazonPriceTracker bridge --- bridges/AmazonPriceTrackerBridge.php | 149 +++++++++++++++++++++++ bridges/ContainerLinuxReleasesBridge.php | 2 +- 2 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 bridges/AmazonPriceTrackerBridge.php diff --git a/bridges/AmazonPriceTrackerBridge.php b/bridges/AmazonPriceTrackerBridge.php new file mode 100644 index 00000000..dd352af1 --- /dev/null +++ b/bridges/AmazonPriceTrackerBridge.php @@ -0,0 +1,149 @@ + array( + 'name' => 'ASIN', + 'required' => true, + 'exampleValue' => 'B071GB1VMQ', + // https://stackoverflow.com/a/12827734 + 'pattern' => 'B[\dA-Z]{9}|\d{9}(X|\d)', + ), + 'tld' => array( + 'name' => 'Country', + 'type' => 'list', + 'required' => true, + 'values' => array( + 'Australia' => 'com.au', + 'Brazil' => 'com.br', + 'Canada' => 'ca', + 'China' => 'cn', + 'France' => 'fr', + 'Germany' => 'de', + 'India' => 'in', + 'Italy' => 'it', + 'Japan' => 'co.jp', + 'Mexico' => 'com.mx', + 'Netherlands' => 'nl', + 'Spain' => 'es', + 'United Kingdom' => 'co.uk', + 'United States' => 'com', + ), + 'defaultValue' => 'com', + ), + )); + + protected $title; + + /** + * Generates domain name given a amazon TLD + */ + private function getDomainName() { + return 'https://www.amazon.' . $this->getInput('tld'); + } + + /** + * Generates URI for a Amazon product page + */ + public function getURI() { + if (!is_null($this->getInput('asin'))) { + return $this->getDomainName() . '/dp/' . $this->getInput('asin') . '/'; + } + return parent::getURI(); + } + + /** + * Scrapes the product title from the html page + * returns the default title if scraping fails + */ + private function getTitle($html) { + $titleTag = $html->find('#productTitle', 0); + + if (!$titleTag) { + return $this->getDefaultTitle(); + } else { + return trim(html_entity_decode($titleTag->innertext, ENT_QUOTES)); + } + } + + /** + * Title used by the feed if none could be found + */ + private function getDefaultTitle() { + return 'Amazon.' . $this->getInput('tld') . ': ' . $this->getInput('asin'); + } + + /** + * Returns name for the feed + * Uses title (already scraped) if it has one + */ + public function getName() { + if (isset($this->title)) { + return $this->title; + } else { + return parent::getName(); + } + } + + /** + * Returns a generated image tag for the product + */ + private function getImage($html) { + $imageSrc = $html->find('#main-image-container img', 0); + + if ($imageSrc) { + $imageSrc = $imageSrc ? $imageSrc->getAttribute('data-old-hires') : ''; + return << +EOT; + } + } + + /** + * Return \simple_html_dom object + * for the entire html of the product page + */ + private function getHtml() { + $uri = $this->getURI(); + + return getSimpleHTMLDOM($uri) ?: returnServerError('Could not request Amazon.'); + } + + /** + * Scrape method for Amazon product page + * @return [type] [description] + */ + public function collectData() { + $html = $this->getHtml(); + $this->title = $this->getTitle($html); + $imageTag = $this->getImage($html); + + $asinData = $html->find('#cerberus-data-metrics', 0); + + //