Update README.md

Fixes multi-page article fetching by adding '&seite=all' to  article URL.

.dockerignore

@@ -0,0 +1,14 @@
+.git
+.gitattributes
+.github/*
+.travis.yml
+cache/*
+CONTRIBUTING.md
+DEBUG
+Dockerfile
+phpcompatibility.xml
+phpcs.xml
+phpcs.xml
+scalingo.json
+tests/*
+whitelist.txt

.gitattributes

@@ -20,3 +20,50 @@
 *.PDF   diff=astextplain
 *.rtf   diff=astextplain
 *.RTF   diff=astextplain
+
+# Ignore files in git archive (i.e. GitHub release builds)
+
+## Docker
+Dockerfile                              export-ignore
+.dockerignore                           export-ignore
+
+## Travis
+.travis.yml                             export-ignore
+
+## GitHub
+.github/                                export-ignore
+
+## Git
+.gitattributes                          export-ignore
+.gitignore                              export-ignore
+
+## Scalingo
+scalingo.json                           export-ignore
+
+## RSS-Bridge
+phpunit.xml                             export-ignore
+phpcs.xml                               export-ignore
+phpcompatibility.xml                    export-ignore
+tests/                                  export-ignore
+cache/.gitkeep                          export-ignore
+bridges/DemoBridge.php                  export-ignore
+bridges/FeedExpanderExampleBridge.php   export-ignore
+
+## Composer
+#
+# Keep the following lines commented out. Heroku does
+# not function if the composer files are ignored during
+# export. For more information see
+# https://github.com/rss-bridge/rss-bridge/issues/1165
+#
+# composer.json                         export-ignore
+# composer.lock                         export-ignore
+
+## Heroku
+#
+# Keep the following line commented out. Heroku does
+# not function if app.json is ignored during export.
+# For more information see
+# https://github.com/rss-bridge/rss-bridge/issues/1165
+#
+# app.json                              export-ignore

.github/CONTRIBUTING.md

@@ -0,0 +1,49 @@
+### Pull request policy
+
+* [Fix one issue per pull request](https://github.com/RSS-Bridge/rss-bridge/wiki/Pull-request-policy#fix-one-issue-per-pull-request)
+* [Respect the coding style policy](https://github.com/RSS-Bridge/rss-bridge/wiki/Pull-request-policy#respect-the-coding-style-policy)
+* [Properly name your commits](https://github.com/RSS-Bridge/rss-bridge/wiki/Pull-request-policy#properly-name-your-commits)
+  * When fixing a bridge (located in the `bridges` directory), write `[BridgeName] Feature` <br>(i.e. `[YoutubeBridge] Fix typo in video titles`).
+  * When fixing other files, use `[FileName] Feature` <br>(i.e. `[index.php] Add multilingual support`).
+  * When fixing a general problem that applies to multiple files, write `category: feature` <br>(i.e. `bridges: Fix various typos`).
+
+Note that all pull-requests must pass all tests before they can be merged.
+
+### Coding style
+
+* [Whitespace](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace)
+  * [Add a new line at the end of a file](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace#add-a-new-line-at-the-end-of-a-file)
+  * [Do not add a whitespace before a semicolon](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace#add-a-new-line-at-the-end-of-a-file)
+  * [Do not add whitespace at start or end of a file or end of a line](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace#do-not-add-whitespace-at-start-or-end-of-a-file-or-end-of-a-line)
+* [Indentation](https://github.com/RSS-Bridge/rss-bridge/wiki/Indentation)
+  * [Use tabs for indentation](https://github.com/RSS-Bridge/rss-bridge/wiki/Indentation#use-tabs-for-indentation)
+* [Maximum line length](https://github.com/RSS-Bridge/rss-bridge/wiki/Maximum-line-length)
+  * [The maximum line length should not exceed 80 characters](https://github.com/RSS-Bridge/rss-bridge/wiki/Maximum-line-length#the-maximum-line-length-should-not-exceed-80-characters)
+* [Strings](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings)
+  * [Whenever possible use single quoted strings](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings#whenever-possible-use-single-quote-strings)
+  * [Add spaces around the concatenation operator](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings#add-spaces-around-the-concatenation-operator)
+  * [Use a single string instead of concatenating](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings#use-a-single-string-instead-of-concatenating)
+* [Constants](https://github.com/RSS-Bridge/rss-bridge/wiki/Constants)
+  * [Use UPPERCASE for constants](https://github.com/RSS-Bridge/rss-bridge/wiki/Constants#use-uppercase-for-constants)
+* [Keywords](https://github.com/RSS-Bridge/rss-bridge/wiki/Keywords)
+  * [Use lowercase for `true`, `false` and `null`](https://github.com/RSS-Bridge/rss-bridge/wiki/Keywords#use-lowercase-for-true-false-and-null)
+* [Operators](https://github.com/RSS-Bridge/rss-bridge/wiki/Operators)
+  * [Operators must have a space around them](https://github.com/RSS-Bridge/rss-bridge/wiki/Operators#operators-must-have-a-space-around-them)
+* [Functions](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions)
+  * [Parameters with default values must appear last in functions](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions#parameters-with-default-values-must-appear-last-in-functions)
+  * [Calling functions](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions#calling-functions)
+  * [Do not add spaces after opening or before closing bracket](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions#do-not-add-spaces-after-opening-or-before-closing-bracket)
+* [Structures](https://github.com/RSS-Bridge/rss-bridge/wiki/Structures)
+  * [Structures must always be formatted as multi-line blocks](https://github.com/RSS-Bridge/rss-bridge/wiki/Structures#structures-must-always-be-formatted-as-multi-line-blocks)
+* [If-Statement](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement)
+  * [Use `elseif` instead of `else if`](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement#use-elseif-instead-of-else-if)
+  * [Do not write empty statements](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement#do-not-write-empty-statements)
+  * [Do not write unconditional if-statements](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement#do-not-write-unconditional-if-statements)
+* [Classes](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes)
+  * [Use PascalCase for class names](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#use-pascalcase-for-class-names)
+  * [Do not use final statements inside final classes](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#do-not-use-final-statements-inside-final-classes)
+  * [Do not override methods to call their parent](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#do-not-override-methods-to-call-their-parent)
+  * [abstract and final declarations MUST precede the visibility declaration](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#abstract-and-final-declarations-must-precede-the-visibility-declaration)
+  * [static declaration MUST come after the visibility declaration](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#static-declaration-must-come-after-the-visibility-declaration)
+* [Casting](https://github.com/RSS-Bridge/rss-bridge/wiki/Casting)
+  * [Do not add spaces when casting](https://github.com/RSS-Bridge/rss-bridge/wiki/Casting#do-not-add-spaces-when-casting)

.github/ISSUE_TEMPLATE/bridge-request.md

@@ -0,0 +1,64 @@
+---
+name: Bridge request
+about: Use this template for requesting a new bridge
+title: Bridge request for ...
+labels: Bridge-Request
+assignees: ''
+
+---
+
+# Bridge request
+
+<!--
+This is a bridge request. Start by adding a descriptive title (i.e. `Bridge request for GitHub`). Use the "Preview" button to see a preview of your request. Make sure your request is complete before submitting!
+
+Notice: This comment is only visible to you while you work on your request. Please do not remove any of the lines in the template (you may add your own outside the "<!--" and "- ->" lines!)
+-->
+
+## General information
+
+<!--
+Please describe what you expect from the bridge. Whenever possible provide sample links and screenshots (you can just paste them here) to express your expectations and help others understand your request. If possible, mark relevant areas in your screenshot. Use the following questions for reference:
+-->
+
+- _Host URI for the bridge_ (i.e. `https://github.com`):
+
+- Which information would you like to see?
+
+
+
+- How should the information be displayed/formatted?
+
+
+
+- Which of the following parameters do you expect?
+
+  - [X] Title
+  - [X] URI (link to the original article)
+  - [ ] Author
+  - [ ] Timestamp
+  - [X] Content (the content of the article)
+  - [ ] Enclosures (pictures, videos, etc...)
+  - [ ] Categories (categories, tags, etc...)
+
+## Options
+
+<!--Select options from the list below. Add your own option if one is missing:-->
+
+- [ ] Limit number of returned items
+  - _Default limit_: 5
+- [ ] Load full articles
+  - _Cache articles_ (articles are stored in a local cache on first request): yes
+  - _Cache timeout_ (max = 24 hours): 24 hours
+- [X] Balance requests (RSS-Bridge uses cached versions to reduce bandwith usage)
+  - _Timeout_ (default = 5 minutes, max = 24 hours): 5 minutes
+
+<!--Be aware that some options might not be available for your specific request due to technical limitations!-->
+
+<!--
+## Additional notes
+
+Keep in mind that opening a request does not guarantee the bridge being implemented! That depends entirely on the interest and time of others to make the bridge for you.
+
+You can also implement your own bridge (with support of the community if needed). Find more information in the [RSS-Bridge Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki/For-developers) developer section.
+-->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Bug-Report
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature-Request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -227,8 +227,19 @@ pip-log.txt
 /cache
 /whitelist.txt
 DEBUG
+config.ini.php
 
 ######################
 ## VisualStudioCode ##
 ######################
 .vscode/*
+
+#Builder
+.buildconfig
+
+#Auth
+.htaccess
+.htpasswd
+
+#Crawler
+robots.txt

.travis.yml

@@ -1,19 +1,46 @@
+dist: trusty
 language: php
-php:
-  - '5.6'
-  - '7.0'
-  - hhvm
-  - nightly
 
 install:
-  - pear install PHP_CodeSniffer
+  - composer global require dealerdirect/phpcodesniffer-composer-installer;
+  - composer global require phpcompatibility/php-compatibility;
+  - if [[ "$PHPUNIT" ]]; then
+      composer global require phpunit/phpunit ^$PHPUNIT;
+    fi
 
 script:
   - phpenv rehash
-  - phpcs . --standard=phpcs.xml --warning-severity=0 --extensions=php -p
+  # Run PHP_CodeSniffer on all versions
+  - ~/.config/composer/vendor/bin/phpcs . --standard=phpcs.xml --warning-severity=0 --extensions=php -p;
+  # Check PHP compatibility for the lowest and highest supported version
+  - if [[ $TRAVIS_PHP_VERSION == "5.6" || $TRAVIS_PHP_VERSION == "7.3" ]]; then
+      ~/.config/composer/vendor/bin/phpcs . --standard=phpcompatibility.xml --extensions=php -p;
+    fi
+  # Run unit tests on highest major version
+  - if [[ ${TRAVIS_PHP_VERSION:0:1} == "7" ]]; then
+      ~/.config/composer/vendor/bin/phpunit --configuration=phpunit.xml --include-path=lib/;
+    fi
+
+php:
+  - 7.3
+
+env:
+  - PHPUNIT=6
+  - PHPUNIT=7
+  - PHPUNIT=8
 
 matrix:
   fast_finish: true
+
+  include:
+    - php: 5.6
+      env: PHPUNIT=
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+
   allow_failures:
-    - php: hhvm
-    - php: nightly
+    - php: 7.3
+      env: PHPUNIT=7
+    - php: 7.3
+      env: PHPUNIT=8

CHANGELOG.md

@@ -1,163 +0,0 @@
-rss-bridge Changelog
-===
-
-Alpha 0.1
-===
-* First tagged version.
-* Includes refactoring.
-* Unstable.
-
-Alpha 0.2
-===
-
-## Important changes
-* RSS-Bridge has been [UNLICENSED](UNLICENSE)
-* RSS-Bridge is now a community-managed project on [GitHub](https://github.com/rss-bridge/rss-bridge)
-* RSS-Bridge now has a [Wiki](https://github.com/rss-bridge/rss-bridge/wiki)
-* RSS-Bridge now supports [Travis-CI](https://travis-ci.org)
-
-## General changes
-* Added [CHANGELOG](CHANGELOG.md) (this file)
-* Added [PHP Simple HTML DOM Parser](http://simplehtmldom.sourceforge.net) to [vendor](vendor/simplehtmldom/)
-* Added cache purging function (cache will be force-purged after 24 hours or as defined by bridge)
-* Added new format [MrssFormat](formats/MrssFormat.php)
-* Added parameter `author` - for display of the feed author name - to all formats
-* Added new abstraction of the BridgeInterface:
-  - [FeedExpander](https://github.com/RSS-Bridge/rss-bridge/wiki/Bridge-API)
-* Added optional support for proxy usage on each individual bridge
-* Added support for [custom bridge parameter](https://github.com/RSS-Bridge/rss-bridge/wiki/BridgeAbstract#format-specifications) (text, number, list, checkbox)
-* Changed design of the welcome screen
-* Changed design of HtmlFormat
-* Changed behavior of debug mode:
-  - Enable debug mode by placing a file called "DEBUG" in the root folder
-  - Debug mode automatically disables cache file loading
-* Changed implementation of bridges - see [Wiki](https://github.com/rss-bridge/rss-bridge/wiki)
-  - Changed comment-style metadata to constants
-  - Added support for multiple utilizations per bridge
-  - Changed the parameter loading algorithm to be loaded by RSS-Bridge core
-* Improved checks for PHP version, configuration and extensions
-* Many bug fixes
-
-## Modified Bridges
-* FlickrExploreBridge
-* GoogleSearchBridge
-* TwitterBridge
-
-## New Bridges
-* ABCTabsBridge
-* AcrimedBridge
-* AllocineFRBridge
-* AnimeUltimeBridge
-* Arte7Bridge
-* AskfmBridge
-* BandcampBridge
-* BastaBridge
-* BlaguesDeMerdeBridge
-* BooruprojectBridge
-* CADBridge
-* CNETBridge
-* CastorusBridge
-* CollegeDeFranceBridge
-* CommonDreamsBridge
-* CopieDoubleBridge
-* CourrierInternationalBridge
-* CpasbienBridge
-* CryptomeBridge
-* DailymotionBridge
-* DanbooruBridge
-* DansTonChatBridge
-* DauphineLibereBridge
-* DemoBridge
-* DeveloppezDotComBridge
-* DilbertBridge
-* DollbooruBridge
-* DuckDuckGoBridge
-* EZTVBridge
-* EliteDangerousGalnetBridge
-* ElsevierBridge
-* EstCeQuonMetEnProdBridge
-* FacebookBridge
-* FierPandaBridge
-* FlickrTagBridge
-* FootitoBridge
-* FourchanBridge
-* FuturaSciencesBridge
-* GBAtempBridge
-* GelbooruBridge
-* GiphyBridge
-* GithubIssueBridge
-* GizmodoBridge
-* GooglePlusPostBridge
-* HDWallpapersBridge
-* HentaiHavenBridge
-* IdenticaBridge
-* InstagramBridge
-* IsoHuntBridge
-* JapanExpoBridge
-* KonachanBridge
-* KoreusBridge
-* KununuBridge
-* LWNprevBridge
-* LeBonCoinBridge
-* LegifranceJOBridge
-* LeMondeInformatiqueBridge
-* LesJoiesDuCodeBridge
-* LichessBridge
-* LinkedInCompanyBridge
-* LolibooruBridge
-* MangareaderBridge
-* MilbooruBridge
-* MoebooruBridge
-* MondeDiploBridge
-* MsnMondeBridge
-* MspabooruBridge
-* NasaApodBridge
-* NeuviemeArtBridge
-* NextInpactBridge
-* NextgovBridge
-* NiceMatinBridge
-* NovelUpdatesBridge
-* OpenClassroomsBridge
-* ParuVenduImmoBridge
-* PickyWallpapersBridge
-* PinterestBridge
-* PlanetLibreBridge
-* RTBFBridge
-* ReadComicsBridge
-* Releases3DSBridge
-* ReporterreBridge
-* Rue89Bridge
-* Rule34Bridge
-* Rule34pahealBridge
-* SafebooruBridge
-* SakugabooruBridge
-* ScmbBridge
-* ScoopItBridge
-* SensCritiqueBridge
-* SexactuBridge
-* ShanaprojectBridge
-* Shimmie2Bridge
-* SoundcloudBridge
-* StripeAPIChangeLogBridge
-* SuperbWallpapersBridge
-* T411Bridge
-* TagBoardBridge
-* TbibBridge
-* TheCodingLoveBridge
-* TheHackerNewsBridge
-* ThePirateBayBridge
-* UnsplashBridge
-* ViadeoCompanyBridge
-* VineBridge
-* VkBridge
-* WallpaperStopBridge
-* WebfailBridge
-* WeLiveSecurityBridge
-* WhydBridge
-* WikipediaBridge
-* WordPressBridge
-* WorldOfTanksBridge
-* XbooruBridge
-* YandereBridge
-* YoutubeBridge
-* ZDNetBridge

Dockerfile

@@ -0,0 +1,17 @@
+FROM php:7-apache
+
+ENV APACHE_DOCUMENT_ROOT=/app
+
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
+	&& apt-get --yes update \
+	&& apt-get --yes --no-install-recommends install \
+		zlib1g-dev \
+		libmemcached-dev \
+	&& pecl install memcached \
+	&& docker-php-ext-enable memcached \
+	&& sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
+	&& sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \
+	&& sed -ri -e 's/(MinProtocol\s*=\s*)TLSv1\.2/\1None/' /etc/ssl/openssl.cnf \
+	&& sed -ri -e 's/(CipherString\s*=\s*DEFAULT)@SECLEVEL=2/\1/' /etc/ssl/openssl.cnf
+
+COPY --chown=www-data:www-data ./ /app/

README.md

@@ -1,41 +1,45 @@
-rss-bridge
-===
-[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE)
+![RSS-Bridge](static/logo_600px.png)
+====
+[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE) [![GitHub release](https://img.shields.io/github/release/rss-bridge/rss-bridge.svg?logo=github)](https://github.com/rss-bridge/rss-bridge/releases/latest) [![Debian Release](https://img.shields.io/badge/dynamic/json.svg?logo=debian&label=debian%20release&url=https%3A%2F%2Fsources.debian.org%2Fapi%2Fsrc%2Frss-bridge%2F&query=%24.versions%5B0%5D.version&colorB=blue)](https://tracker.debian.org/pkg/rss-bridge) [![Guix Release](https://img.shields.io/badge/guix%20release-unknown-blue.svg)](https://www.gnu.org/software/guix/packages/R/) [![Build Status](https://travis-ci.org/RSS-Bridge/rss-bridge.svg?branch=master)](https://travis-ci.org/RSS-Bridge/rss-bridge) [![Docker Build Status](https://img.shields.io/docker/build/rssbridge/rss-bridge.svg?logo=docker)](https://hub.docker.com/r/rssbridge/rss-bridge/)
 
-rss-bridge is a PHP project capable of generating ATOM feeds for websites which don't have one.
+RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites that don't have one. It can be used on webservers or as a stand-alone application in CLI mode.
 
-Supported sites/pages (main)
+**Important**: RSS-Bridge is __not__ a feed reader or feed aggregator, but a tool to generate feeds that are consumed by feed readers and feed aggregators. Find a list of feed aggregators on [Wikipedia](https://en.wikipedia.org/wiki/Comparison_of_feed_aggregators).
+
+Supported sites/pages (examples)
 ===
 
- * `FlickrExplore` : [Latest interesting images](http://www.flickr.com/explore) from Flickr
- * `GoogleSearch` : Most recent results from Google Search
- * `GooglePlus` : Most recent posts of user timeline
- * `Twitter` : Return keyword/hashtag search or user timeline
- * `Identi.ca` : Identica user timeline (Should be compatible with other Pump.io instances)
- * `YouTube` : YouTube user channel, playlist or search
- * `Cryptome` : Returns the most recent documents from [Cryptome.org](http://cryptome.org/)
- * `DansTonChat`: Most recent quotes from [danstonchat.com](http://danstonchat.com/)
- * `DuckDuckGo`: Most recent results from [DuckDuckGo.com](https://duckduckgo.com/)
- * `Instagram`: Most recent photos from an Instagram user
- * `OpenClassrooms`: Lastest tutorials from [fr.openclassrooms.com](http://fr.openclassrooms.com/)
- * `Pinterest`: Most recent photos from user or search
- * `ScmbBridge`: Newest stories from [secouchermoinsbete.fr](http://secouchermoinsbete.fr/)
- * `Wikipedia`: highlighted articles from [Wikipedia](https://wikipedia.org/) in English, German, French or Esperanto
- * `Bandcamp` : Returns last release from [bandcamp](https://bandcamp.com/) for a tag
- * `ThePirateBay` : Returns the newest indexed torrents from [The Pirate Bay](https://thepiratebay.se/) with keywords
- * `Facebook` : Returns the latest posts on a page or profile on [Facebook](https://facebook.com/)
+* `Bandcamp` : Returns last release from [bandcamp](https://bandcamp.com/) for a tag
+* `Cryptome` : Returns the most recent documents from [Cryptome.org](http://cryptome.org/)
+* `DansTonChat`: Most recent quotes from [danstonchat.com](http://danstonchat.com/)
+* `DuckDuckGo`: Most recent results from [DuckDuckGo.com](https://duckduckgo.com/)
+* `Facebook` : Returns the latest posts on a page or profile on [Facebook](https://facebook.com/)
+* `FlickrExplore` : [Latest interesting images](http://www.flickr.com/explore) from Flickr
+* `GoogleSearch` : Most recent results from Google Search
+* `Identi.ca` : Identica user timeline (Should be compatible with other Pump.io instances)
+* `Instagram`: Most recent photos from an Instagram user
+* `OpenClassrooms`: Lastest tutorials from [fr.openclassrooms.com](http://fr.openclassrooms.com/)
+* `Pinterest`: Most recent photos from user or search
+* `ScmbBridge`: Newest stories from [secouchermoinsbete.fr](http://secouchermoinsbete.fr/)
+* `ThePirateBay` : Returns the newest indexed torrents from [The Pirate Bay](https://thepiratebay.se/) with keywords
+* `Twitter` : Return keyword/hashtag search or user timeline
+* `Wikipedia`: highlighted articles from [Wikipedia](https://wikipedia.org/) in English, German, French or Esperanto
+* `YouTube` : YouTube user channel, playlist or search
 
-Plus [many other bridges](bridges/) to enable, thanks to the community
+And [many more](bridges/), thanks to the community!
 
 Output format
 ===
-Output format can take several forms:
 
- * `Atom` : ATOM Feed, for use in RSS/Feed readers
- * `Mrss` : MRSS Feed, for use in RSS/Feed readers
- * `Json` : Json, for consumption by other applications.
- * `Html` : Simple html page.
- * `Plaintext` : raw text (php object, as returned by print_r)
+RSS-Bridge is capable of producing several output formats:
+
+* `Atom` : Atom feed, for use in feed readers
+* `Html` : Simple HTML page
+* `Json` : JSON, for consumption by other applications
+* `Mrss` : MRSS feed, for use in feed readers
+* `Plaintext` : Raw text, for consumption by other applications
+
+You can extend RSS-Bridge with your own format, using the [Format API](https://github.com/RSS-Bridge/rss-bridge/wiki/Format-API)!
 
 Screenshot
 ===
@@ -44,87 +48,211 @@ Welcome screen:
 
 ![Screenshot](https://github.com/RSS-Bridge/rss-bridge/wiki/images/screenshot_rss-bridge_welcome.png)
 
-RSS-Bridge hashtag (#rss-bridge) search on Twitter, in ATOM format (as displayed by Firefox):
+***
+
+RSS-Bridge hashtag (#rss-bridge) search on Twitter, in Atom format (as displayed by Firefox):
 
 ![Screenshot](https://github.com/RSS-Bridge/rss-bridge/wiki/images/screenshot_twitterbridge_atom.png)
 
 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`
+RSS-Bridge requires PHP 5.6 or higher with following extensions enabled:
 
-Enabling/Disabling bridges
+  - [`openssl`](https://secure.php.net/manual/en/book.openssl.php)
+  - [`libxml`](https://secure.php.net/manual/en/book.libxml.php)
+  - [`mbstring`](https://secure.php.net/manual/en/book.mbstring.php)
+  - [`simplexml`](https://secure.php.net/manual/en/book.simplexml.php)
+  - [`curl`](https://secure.php.net/manual/en/book.curl.php)
+  - [`json`](https://secure.php.net/manual/en/book.json.php)
+  - [`sqlite3`](http://php.net/manual/en/book.sqlite3.php) (only when using SQLiteCache)
+
+Find more information on our [Wiki](https://github.com/rss-bridge/rss-bridge/wiki)
+
+Enable / Disable bridges
 ===
 
-By default, the script creates `whitelist.txt` and adds the main bridges (see above). `whitelist.txt` is ignored by git, you can edit it:
- * to enable extra bridges (one bridge per line)
- * to disable main bridges (remove the line)
- * to enable all bridges (just one wildcard `*` as file content)
+RSS-Bridge allows you to take full control over which bridges are displayed to the user. That way you can host your own RSS-Bridge service with your favorite collection of bridges!
 
-New bridges are disabled by default, so make sure to check regularly what's new and whitelist what you want!
+Find more information on the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitelisting)
+
+**Notice**: By default, RSS-Bridge will only show a small subset of bridges. Make sure to read up on [whitelisting](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitelisting) to unlock the full potential of RSS-Bridge!
 
 Deploy
 ===
+
+Thanks to the community, hosting your own instance of RSS-Bridge is as easy as clicking a button!
+
 [![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/sebsauvage/rss-bridge)
+[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
+
+Getting involved
+===
+
+There are many ways for you to getting involved with RSS-Bridge. Here are a few things:
+
+- Share RSS-Bridge with your friends (Twitter, Facebook, ..._you name it_...)
+- Report broken bridges or bugs by opening [Issues](https://github.com/RSS-Bridge/rss-bridge/issues) on GitHub
+- Request new features or suggest ideas (via [Issues](https://github.com/RSS-Bridge/rss-bridge/issues))
+- Discuss bugs, features, ideas or [issues](https://github.com/RSS-Bridge/rss-bridge/issues)
+- Add new bridges or improve the API
+- Improve the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki)
+- Host an instance of RSS-Bridge for your personal use or make it available to the community :sparkling_heart:
 
 Authors
 ===
-We are RSS Bridge Community, a group of developers continuing the project initiated by sebsauvage, webmaster of [sebsauvage.net](http://sebsauvage.net), author of [Shaarli](http://sebsauvage.net/wiki/doku.php?id=php:shaarli) and [ZeroBin](http://sebsauvage.net/wiki/doku.php?id=php:zerobin).
 
-Patch/contributors :
+We are RSS-Bridge community, a group of developers continuing the project initiated by sebsauvage, webmaster of [sebsauvage.net](http://sebsauvage.net), author of [Shaarli](http://sebsauvage.net/wiki/doku.php?id=php:shaarli) and [ZeroBin](http://sebsauvage.net/wiki/doku.php?id=php:zerobin).
 
- * Yves ASTIER ([Draeli](https://github.com/Draeli)) : PHP optimizations, fixes, dynamic brigde/format list with all stuff behind and extend cache system. Mail : contact /at\ yves-astier.com
- * [Mitsukarenai](https://github.com/Mitsukarenai) : Initial inspiration, collaborator
- * [ArthurHoaro](https://github.com/ArthurHoaro)
- * [BoboTiG](https://github.com/BoboTiG)
- * [Astalaseven](https://github.com/Astalaseven)
- * [qwertygc](https://github.com/qwertygc)
- * [Djuuu](https://github.com/Djuuu)
- * [Anadrark](https://github.com/Anadrark])
- * [Grummfy](https://github.com/Grummfy)
- * [Polopollo](https://github.com/Polopollo)
- * [16mhz](https://github.com/16mhz)
- * [kranack](https://github.com/kranack)
- * [logmanoriginal](https://github.com/logmanoriginal)
- * [polo2ro](https://github.com/polo2ro)
- * [Riduidel](https://github.com/Riduidel)
- * [superbaillot.net](http://superbaillot.net/)
- * [vinzv](https://github.com/vinzv)
- * [teromene](https://github.com/teromene)
- * [nel50n](https://github.com/nel50n)
- * [nyutag](https://github.com/nyutag)
- * [ORelio](https://github.com/ORelio)
- * [Pitchoule](https://github.com/Pitchoule)
- * [pit-fgfjiudghdf](https://github.com/pit-fgfjiudghdf)
- * [aledeg](https://github.com/aledeg)
- * [alexAubin](https://github.com/alexAubin)
- * [cnlpete](https://github.com/cnlpete)
- * [corenting](https://github.com/corenting)
- * [Daiyousei](https://github.com/Daiyousei)
- * [erwang](https://github.com/erwang)
- * [gsurrel](https://github.com/gsurrel)
- * [kraoc](https://github.com/kraoc)
- * [lagaisse](https://github.com/lagaisse)
- * [az5he6ch](https://github.com/az5he6ch)
- * [niawag](https://github.com/niawag)
- * [JeremyRand](https://github.com/JeremyRand)
- * [mro](https://github.com/mro)
+**Contributors** (sorted alphabetically):
+<!--
+Use this script to generate the list automatically (using the GitHub API):
+https://gist.github.com/LogMANOriginal/da00cd1e5f0ca31cef8e193509b17fd8
+-->
+* [16mhz](https://github.com/16mhz)
+* [86423355844265459587182778](https://github.com/86423355844265459587182778)
+* [adamchainz](https://github.com/adamchainz)
+* [Ahiles3005](https://github.com/Ahiles3005)
+* [Albirew](https://github.com/Albirew)
+* [aledeg](https://github.com/aledeg)
+* [alex73](https://github.com/alex73)
+* [alexAubin](https://github.com/alexAubin)
+* [AmauryCarrade](https://github.com/AmauryCarrade)
+* [AntoineTurmel](https://github.com/AntoineTurmel)
+* [ArthurHoaro](https://github.com/ArthurHoaro)
+* [Astalaseven](https://github.com/Astalaseven)
+* [Astyan-42](https://github.com/Astyan-42)
+* [az5he6ch](https://github.com/az5he6ch)
+* [azdkj532](https://github.com/azdkj532)
+* [b1nj](https://github.com/b1nj)
+* [benasse](https://github.com/benasse)
+* [Binnette](https://github.com/Binnette)
+* [captn3m0](https://github.com/captn3m0)
+* [chemel](https://github.com/chemel)
+* [ckiw](https://github.com/ckiw)
+* [cnlpete](https://github.com/cnlpete)
+* [corenting](https://github.com/corenting)
+* [couraudt](https://github.com/couraudt)
+* [cyberjacob](https://github.com/cyberjacob)
+* [da2x](https://github.com/da2x)
+* [Daiyousei](https://github.com/Daiyousei)
+* [dawidsowa](https://github.com/dawidsowa)
+* [disk0x](https://github.com/disk0x)
+* [DJCrashdummy](https://github.com/DJCrashdummy)
+* [Djuuu](https://github.com/Djuuu)
+* [DnAp](https://github.com/DnAp)
+* [dominik-th](https://github.com/dominik-th)
+* [Draeli](https://github.com/Draeli)
+* [Dreckiger-Dan](https://github.com/Dreckiger-Dan)
+* [em92](https://github.com/em92)
+* [eMerzh](https://github.com/eMerzh)
+* [EtienneM](https://github.com/EtienneM)
+* [floviolleau](https://github.com/floviolleau)
+* [fluffy-critter](https://github.com/fluffy-critter)
+* [Frenzie](https://github.com/Frenzie)
+* [fulmeek](https://github.com/fulmeek)
+* [Ginko-Aloe](https://github.com/Ginko-Aloe)
+* [Glandos](https://github.com/Glandos)
+* [gloony](https://github.com/gloony)
+* [GregThib](https://github.com/GregThib)
+* [griffaurel](https://github.com/griffaurel)
+* [Grummfy](https://github.com/Grummfy)
+* [hunhejj](https://github.com/hunhejj)
+* [husim0](https://github.com/husim0)
+* [IceWreck](https://github.com/IceWreck)
+* [j0k3r](https://github.com/j0k3r)
+* [JackNUMBER](https://github.com/JackNUMBER)
+* [jdesgats](https://github.com/jdesgats)
+* [jdigilio](https://github.com/jdigilio)
+* [JeremyRand](https://github.com/JeremyRand)
+* [Jocker666z](https://github.com/Jocker666z)
+* [johnnygroovy](https://github.com/johnnygroovy)
+* [johnpc](https://github.com/johnpc)
+* [killruana](https://github.com/killruana)
+* [klimplant](https://github.com/klimplant)
+* [kranack](https://github.com/kranack)
+* [kraoc](https://github.com/kraoc)
+* [l1n](https://github.com/l1n)
+* [laBecasse](https://github.com/laBecasse)
+* [lagaisse](https://github.com/lagaisse)
+* [lalannev](https://github.com/lalannev)
+* [ldidry](https://github.com/ldidry)
+* [Leomaradan](https://github.com/Leomaradan)
+* [Limero](https://github.com/Limero)
+* [LogMANOriginal](https://github.com/LogMANOriginal)
+* [lorenzos](https://github.com/lorenzos)
+* [lukasklinger](https://github.com/lukasklinger)
+* [m0zes](https://github.com/m0zes)
+* [matthewseal](https://github.com/matthewseal)
+* [mcbyte-it](https://github.com/mcbyte-it)
+* [mdemoss](https://github.com/mdemoss)
+* [melangue](https://github.com/melangue)
+* [metaMMA](https://github.com/metaMMA)
+* [mitsukarenai](https://github.com/mitsukarenai)
+* [MonsieurPoutounours](https://github.com/MonsieurPoutounours)
+* [mro](https://github.com/mro)
+* [mxmehl](https://github.com/mxmehl)
+* [nel50n](https://github.com/nel50n)
+* [niawag](https://github.com/niawag)
+* [Nono-m0le](https://github.com/Nono-m0le)
+* [ObsidianWitch](https://github.com/ObsidianWitch)
+* [OliverParoczai](https://github.com/OliverParoczai)
+* [oratosquilla-oratoria](https://github.com/oratosquilla-oratoria)
+* [ORelio](https://github.com/ORelio)
+* [PaulVayssiere](https://github.com/PaulVayssiere)
+* [pellaeon](https://github.com/pellaeon)
+* [Piranhaplant](https://github.com/Piranhaplant)
+* [pit-fgfjiudghdf](https://github.com/pit-fgfjiudghdf)
+* [pitchoule](https://github.com/pitchoule)
+* [pmaziere](https://github.com/pmaziere)
+* [Pofilo](https://github.com/Pofilo)
+* [prysme01](https://github.com/prysme01)
+* [quentinus95](https://github.com/quentinus95)
+* [regisenguehard](https://github.com/regisenguehard)
+* [Riduidel](https://github.com/Riduidel)
+* [rogerdc](https://github.com/rogerdc)
+* [Roliga](https://github.com/Roliga)
+* [sebsauvage](https://github.com/sebsauvage)
+* [shutosg](https://github.com/shutosg)
+* [somini](https://github.com/somini)
+* [squeek502](https://github.com/squeek502)
+* [stjohnjohnson](https://github.com/stjohnjohnson)
+* [Strubbl](https://github.com/Strubbl)
+* [sublimz](https://github.com/sublimz)
+* [sunchaserinfo](https://github.com/sunchaserinfo)
+* [sysadminstory](https://github.com/sysadminstory)
+* [tameroski](https://github.com/tameroski)
+* [teromene](https://github.com/teromene)
+* [tgkenney](https://github.com/tgkenney)
+* [thefranke](https://github.com/thefranke)
+* [ThePadawan](https://github.com/ThePadawan)
+* [TheRadialActive](https://github.com/TheRadialActive)
+* [TitiTestScalingo](https://github.com/TitiTestScalingo)
+* [triatic](https://github.com/triatic)
+* [VerifiedJoseph](https://github.com/VerifiedJoseph)
+* [WalterBarrett](https://github.com/WalterBarrett)
+* [wtuuju](https://github.com/wtuuju)
+* [xurxof](https://github.com/xurxof)
+* [yardenac](https://github.com/yardenac)
+* [ZeNairolf](https://github.com/ZeNairolf)
 
 Licenses
 ===
-Code is [Public Domain](UNLICENSE).
 
-Including `PHP Simple HTML DOM Parser` under the [MIT License](http://opensource.org/licenses/MIT)
+The source code for RSS-Bridge is [Public Domain](UNLICENSE).
 
+RSS-Bridge uses third party libraries with their own license:
+
+  * [`Parsedown`](https://github.com/erusev/parsedown) licensed under the [MIT License](http://opensource.org/licenses/MIT)
+  * [`PHP Simple HTML DOM Parser`](http://simplehtmldom.sourceforge.net/) licensed under the [MIT License](http://opensource.org/licenses/MIT)
+  * [`php-urljoin`](https://github.com/fluffy-critter/php-urljoin) licensed under the [MIT License](http://opensource.org/licenses/MIT)
 
 Technical notes
 ===
-  * There is a cache so that source services won't ban you even if you hammer the rss-bridge with requests. Each bridge can have a different duration for the cache. The `cache` subdirectory will be automatically created and cached objects older than 24 hours get purged.
-  * To implement a new Bridge, [follow the specifications](https://github.com/RSS-Bridge/rss-bridge/wiki/Bridge-API) and take a look at existing Bridges for examples.
-  * To enable debug mode (disabling cache and enabling error reporting), create an empty file named `DEBUG` in the root directory (next to `index.php`).
-  * For more information refer to the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki)
+
+  * RSS-Bridge uses caching to prevent services from banning your server for repeatedly updating feeds. The specific cache duration can be different between bridges. Cached files are deleted automatically after 24 hours.
+  * You can implement your own bridge, [following these instructions](https://github.com/RSS-Bridge/rss-bridge/wiki/Bridge-API).
+  * You can enable debug mode to disable caching. Find more information on the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki/Debug-mode)
 
 Rant
 ===
@@ -133,10 +261,10 @@ Rant
 
 Your catchword is "share", but you don't want us to share. You want to keep us within your walled gardens. That's why you've been removing RSS links from webpages, hiding them deep on your website, or removed feeds entirely, replacing it with crippled or demented proprietary API. **FUCK YOU.**
 
-You're not social when you hamper sharing by removing feeds. You're happy to have customers creating content for your ecosystem, but you don't want this content out - a content you do not even own. Google Takeout is just a gimmick. We want our data to flow, we want RSS or ATOM feeds.
+You're not social when you hamper sharing by removing feeds. You're happy to have customers creating content for your ecosystem, but you don't want this content out - a content you do not even own. Google Takeout is just a gimmick. We want our data to flow, we want RSS or Atom feeds.
 
-We want to share with friends, using open protocols: RSS, ATOM, XMPP, whatever. Because no one wants to have *your* service with *your* applications using *your* API force-feeding them. Friends must be free to choose whatever software and service they want.
+We want to share with friends, using open protocols: RSS, Atom, XMPP, whatever. Because no one wants to have *your* service with *your* applications using *your* API force-feeding them. Friends must be free to choose whatever software and service they want.
 
 We are rebuilding bridges you have wilfully destroyed.
 
-Get your shit together: Put RSS/ATOM back in.
+Get your shit together: Put RSS/Atom back in.

actions/ConnectivityAction.php

@@ -0,0 +1,136 @@
+<?php
+/**
+ * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
+ * Atom feeds for websites that don't have one.
+ *
+ * For the full license information, please view the UNLICENSE file distributed
+ * with this source code.
+ *
+ * @package	Core
+ * @license	http://unlicense.org/ UNLICENSE
+ * @link	https://github.com/rss-bridge/rss-bridge
+ */
+
+/**
+ * Checks if the website for a given bridge is reachable.
+ *
+ * **Remarks**
+ * - This action is only available in debug mode.
+ * - Returns the bridge status as Json-formatted string.
+ * - Returns an error if the bridge is not whitelisted.
+ * - Returns a responsive web page that automatically checks all whitelisted
+ * bridges (using JavaScript) if no bridge is specified.
+ */
+class ConnectivityAction extends ActionAbstract {
+	public function execute() {
+
+		if(!Debug::isEnabled()) {
+			returnError('This action is only available in debug mode!');
+		}
+
+		if(!isset($this->userData['bridge'])) {
+			$this->returnEntryPage();
+			return;
+		}
+
+		$bridgeName = $this->userData['bridge'];
+
+		$this->reportBridgeConnectivity($bridgeName);
+
+	}
+
+	/**
+	 * Generates a report about the bridge connectivity status and sends it back
+	 * to the user.
+	 *
+	 * The report is generated as Json-formatted string in the format
+	 * {
+	 *   "bridge": "<bridge-name>",
+	 *   "successful": true/false
+	 * }
+	 *
+	 * @param string $bridgeName Name of the bridge to generate the report for
+	 * @return void
+	 */
+	private function reportBridgeConnectivity($bridgeName) {
+
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
+
+		if(!$bridgeFac->isWhitelisted($bridgeName)) {
+			header('Content-Type: text/html');
+			returnServerError('Bridge is not whitelisted!');
+		}
+
+		header('Content-Type: text/json');
+
+		$retVal = array(
+			'bridge' => $bridgeName,
+			'successful' => false,
+			'http_code' => 200,
+		);
+
+		$bridge = $bridgeFac->create($bridgeName);
+
+		if($bridge === false) {
+			echo json_encode($retVal);
+			return;
+		}
+
+		$curl_opts = array(
+			CURLOPT_CONNECTTIMEOUT => 5
+		);
+
+		try {
+			$reply = getContents($bridge::URI, array(), $curl_opts, true);
+
+			if($reply) {
+				$retVal['successful'] = true;
+				if (isset($reply['header'])) {
+					if (strpos($reply['header'], 'HTTP/1.1 301 Moved Permanently') !== false) {
+						$retVal['http_code'] = 301;
+					}
+				}
+			}
+		} catch(Exception $e) {
+			$retVal['successful'] = false;
+		}
+
+		echo json_encode($retVal);
+
+	}
+
+	private function returnEntryPage() {
+	echo <<<EOD
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<link rel="stylesheet" href="static/bootstrap.min.css">
+		<link
+			rel="stylesheet"
+			href="https://use.fontawesome.com/releases/v5.6.3/css/all.css"
+			integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/"
+			crossorigin="anonymous">
+		<link rel="stylesheet" href="static/connectivity.css">
+		<script src="static/connectivity.js" type="text/javascript"></script>
+	</head>
+	<body>
+		<div id="main-content" class="container">
+			<div class="progress">
+				<div class="progress-bar" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100"></div>
+			</div>
+			<div id="status-message" class="sticky-top alert alert-primary alert-dismissible fade show" role="alert">
+				<i id="status-icon" class="fas fa-sync"></i>
+				<span>...</span>
+				<button type="button" class="close" data-dismiss="alert" aria-label="Close" onclick="stopConnectivityChecks()">
+					<span aria-hidden="true">&times;</span>
+				</button>
+			</div>
+			<input type="text" class="form-control" id="search" onkeyup="search()" placeholder="Search for bridge..">
+		</div>
+	</body>
+</html>
+EOD;
+	}
+}

actions/DetectAction.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
+ * Atom feeds for websites that don't have one.
+ *
+ * For the full license information, please view the UNLICENSE file distributed
+ * with this source code.
+ *
+ * @package	Core
+ * @license	http://unlicense.org/ UNLICENSE
+ * @link	https://github.com/rss-bridge/rss-bridge
+ */
+
+class DetectAction extends ActionAbstract {
+	public function execute() {
+		$targetURL = $this->userData['url']
+			or returnClientError('You must specify a url!');
+
+		$format = $this->userData['format']
+			or returnClientError('You must specify a format!');
+
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
+
+		foreach($bridgeFac->getBridgeNames() as $bridgeName) {
+
+			if(!$bridgeFac->isWhitelisted($bridgeName)) {
+				continue;
+			}
+
+			$bridge = $bridgeFac->create($bridgeName);
+
+			if($bridge === false) {
+				continue;
+			}
+
+			$bridgeParams = $bridge->detectParameters($targetURL);
+
+			if(is_null($bridgeParams)) {
+				continue;
+			}
+
+			$bridgeParams['bridge'] = $bridgeName;
+			$bridgeParams['format'] = $format;
+
+			header('Location: ?action=display&' . http_build_query($bridgeParams), true, 301);
+			die();
+
+		}
+
+		returnClientError('No bridge found for given URL: ' . $targetURL);
+	}
+}

actions/DisplayAction.php

@@ -0,0 +1,258 @@
+<?php
+/**
+ * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
+ * Atom feeds for websites that don't have one.
+ *
+ * For the full license information, please view the UNLICENSE file distributed
+ * with this source code.
+ *
+ * @package	Core
+ * @license	http://unlicense.org/ UNLICENSE
+ * @link	https://github.com/rss-bridge/rss-bridge
+ */
+
+class DisplayAction extends ActionAbstract {
+	private function get_return_code($error) {
+		$returnCode = $error->getCode();
+		if ($returnCode === 301 || $returnCode === 302) {
+			# Don't pass redirect codes to the exterior
+			$returnCode = 508;
+		}
+		return $returnCode;
+	}
+
+	public function execute() {
+		$bridge = array_key_exists('bridge', $this->userData) ? $this->userData['bridge'] : null;
+
+		$format = $this->userData['format']
+			or returnClientError('You must specify a format!');
+
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
+
+		// whitelist control
+		if(!$bridgeFac->isWhitelisted($bridge)) {
+			throw new \Exception('This bridge is not whitelisted', 401);
+			die;
+		}
+
+		// Data retrieval
+		$bridge = $bridgeFac->create($bridge);
+
+		$noproxy = array_key_exists('_noproxy', $this->userData)
+			&& filter_var($this->userData['_noproxy'], FILTER_VALIDATE_BOOLEAN);
+
+		if(defined('PROXY_URL') && PROXY_BYBRIDGE && $noproxy) {
+			define('NOPROXY', true);
+		}
+
+		// Cache timeout
+		$cache_timeout = -1;
+		if(array_key_exists('_cache_timeout', $this->userData)) {
+
+			if(!CUSTOM_CACHE_TIMEOUT) {
+				unset($this->userData['_cache_timeout']);
+				$uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) . '?' . http_build_query($this->userData);
+				header('Location: ' . $uri, true, 301);
+				die();
+			}
+
+			$cache_timeout = filter_var($this->userData['_cache_timeout'], FILTER_VALIDATE_INT);
+
+		} else {
+			$cache_timeout = $bridge->getCacheTimeout();
+		}
+
+		// Remove parameters that don't concern bridges
+		$bridge_params = array_diff_key(
+			$this->userData,
+			array_fill_keys(
+				array(
+					'action',
+					'bridge',
+					'format',
+					'_noproxy',
+					'_cache_timeout',
+					'_error_time'
+				), '')
+		);
+
+		// Remove parameters that don't concern caches
+		$cache_params = array_diff_key(
+			$this->userData,
+			array_fill_keys(
+				array(
+					'action',
+					'format',
+					'_noproxy',
+					'_cache_timeout',
+					'_error_time'
+				), '')
+		);
+
+		// Initialize cache
+		$cacheFac = new CacheFactory();
+		$cacheFac->setWorkingDir(PATH_LIB_CACHES);
+		$cache = $cacheFac->create(Configuration::getConfig('cache', 'type'));
+		$cache->setScope('');
+		$cache->purgeCache(86400); // 24 hours
+		$cache->setKey($cache_params);
+
+		$items = array();
+		$infos = array();
+		$mtime = $cache->getTime();
+
+		if($mtime !== false
+		&& (time() - $cache_timeout < $mtime)
+		&& !Debug::isEnabled()) { // Load cached data
+
+			// Send "Not Modified" response if client supports it
+			// Implementation based on https://stackoverflow.com/a/10847262
+			if(isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
+				$stime = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
+
+				if($mtime <= $stime) { // Cached data is older or same
+					header('Last-Modified: ' . gmdate('D, d M Y H:i:s ', $mtime) . 'GMT', true, 304);
+					die();
+				}
+			}
+
+			$cached = $cache->loadData();
+
+			if(isset($cached['items']) && isset($cached['extraInfos'])) {
+				foreach($cached['items'] as $item) {
+					$items[] = new \FeedItem($item);
+				}
+
+				$infos = $cached['extraInfos'];
+			}
+
+		} else { // Collect new data
+
+			try {
+				$bridge->setDatas($bridge_params);
+				$bridge->collectData();
+
+				$items = $bridge->getItems();
+
+				// Transform "legacy" items to FeedItems if necessary.
+				// Remove this code when support for "legacy" items ends!
+				if(isset($items[0]) && is_array($items[0])) {
+					$feedItems = array();
+
+					foreach($items as $item) {
+						$feedItems[] = new \FeedItem($item);
+					}
+
+					$items = $feedItems;
+				}
+
+				$infos = array(
+					'name' => $bridge->getName(),
+					'uri'  => $bridge->getURI(),
+					'icon' => $bridge->getIcon()
+				);
+			} catch(Error $e) {
+				error_log($e);
+
+				if(logBridgeError($bridge::NAME, $e->getCode()) >= Configuration::getConfig('error', 'report_limit')) {
+					if(Configuration::getConfig('error', 'output') === 'feed') {
+						$item = new \FeedItem();
+
+						// Create "new" error message every 24 hours
+						$this->userData['_error_time'] = urlencode((int)(time() / 86400));
+
+						// Error 0 is a special case (i.e. "trying to get property of non-object")
+						if($e->getCode() === 0) {
+							$item->setTitle(
+								'Bridge encountered an unexpected situation! ('
+								. $this->userData['_error_time']
+								. ')'
+							);
+						} else {
+							$item->setTitle(
+								'Bridge returned error '
+								. $e->getCode()
+								. '! ('
+								. $this->userData['_error_time']
+								. ')'
+							);
+						}
+
+						$item->setURI(
+							(isset($_SERVER['REQUEST_URI']) ? parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) : '')
+							. '?'
+							. http_build_query($this->userData)
+						);
+
+						$item->setTimestamp(time());
+						$item->setContent(buildBridgeException($e, $bridge));
+
+						$items[] = $item;
+					} elseif(Configuration::getConfig('error', 'output') === 'http') {
+						header('Content-Type: text/html', true, $this->get_return_code($e));
+						die(buildTransformException($e, $bridge));
+					}
+				}
+			} catch(Exception $e) {
+				error_log($e);
+
+				if(logBridgeError($bridge::NAME, $e->getCode()) >= Configuration::getConfig('error', 'report_limit')) {
+					if(Configuration::getConfig('error', 'output') === 'feed') {
+						$item = new \FeedItem();
+
+						// Create "new" error message every 24 hours
+						$this->userData['_error_time'] = urlencode((int)(time() / 86400));
+
+						$item->setURI(
+							(isset($_SERVER['REQUEST_URI']) ? parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) : '')
+							. '?'
+							. http_build_query($this->userData)
+						);
+
+						$item->setTitle(
+							'Bridge returned error '
+							. $e->getCode()
+							. '! ('
+							. $this->userData['_error_time']
+							. ')'
+						);
+						$item->setTimestamp(time());
+						$item->setContent(buildBridgeException($e, $bridge));
+
+						$items[] = $item;
+					} elseif(Configuration::getConfig('error', 'output') === 'http') {
+						header('Content-Type: text/html', true, $this->get_return_code($e));
+						die(buildTransformException($e, $bridge));
+					}
+				}
+			}
+
+			// Store data in cache
+			$cache->saveData(array(
+				'items' => array_map(function($i){ return $i->toArray(); }, $items),
+				'extraInfos' => $infos
+			));
+
+		}
+
+		// Data transformation
+		try {
+			$formatFac = new FormatFactory();
+			$formatFac->setWorkingDir(PATH_LIB_FORMATS);
+			$format = $formatFac->create($format);
+			$format->setItems($items);
+			$format->setExtraInfos($infos);
+			$format->setLastModified($cache->getTime());
+			$format->display();
+		} catch(Error $e) {
+			error_log($e);
+			header('Content-Type: text/html', true, $e->getCode());
+			die(buildTransformException($e, $bridge));
+		} catch(Exception $e) {
+			error_log($e);
+			header('Content-Type: text/html', true, $e->getCode());
+			die(buildTransformException($e, $bridge));
+		}
+	}
+}

actions/ListAction.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
+ * Atom feeds for websites that don't have one.
+ *
+ * For the full license information, please view the UNLICENSE file distributed
+ * with this source code.
+ *
+ * @package	Core
+ * @license	http://unlicense.org/ UNLICENSE
+ * @link	https://github.com/rss-bridge/rss-bridge
+ */
+
+class ListAction extends ActionAbstract {
+	public function execute() {
+		$list = new StdClass();
+		$list->bridges = array();
+		$list->total = 0;
+
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
+
+		foreach($bridgeFac->getBridgeNames() as $bridgeName) {
+
+			$bridge = $bridgeFac->create($bridgeName);
+
+			if($bridge === false) { // Broken bridge, show as inactive
+
+				$list->bridges[$bridgeName] = array(
+					'status' => 'inactive'
+				);
+
+				continue;
+
+			}
+
+			$status = $bridgeFac->isWhitelisted($bridgeName) ? 'active' : 'inactive';
+
+			$list->bridges[$bridgeName] = array(
+				'status' => $status,
+				'uri' => $bridge->getURI(),
+				'name' => $bridge->getName(),
+				'icon' => $bridge->getIcon(),
+				'parameters' => $bridge->getParameters(),
+				'maintainer' => $bridge->getMaintainer(),
+				'description' => $bridge->getDescription()
+			);
+
+		}
+
+		$list->total = count($list->bridges);
+
+		header('Content-Type: application/json');
+		echo json_encode($list, JSON_PRETTY_PRINT);
+	}
+}

app.json

@@ -0,0 +1,8 @@
+{
+  "service": "Heroku",
+  "name": "RSS-Bridge",
+  "description": "RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites which don't have one.",
+  "repository": "https://github.com/RSS-Bridge/rss-bridge",
+  "keywords": ["php", "rss-bridge", "rss"]
+}
+

bridges/ABCTabsBridge.php

@@ -1,24 +1,41 @@
 <?php
-class ABCTabsBridge extends BridgeAbstract{
+class ABCTabsBridge extends BridgeAbstract {
 
-	const MAINTAINER = "kranack";
-	const NAME = "ABC Tabs Bridge";
-	const URI = "http://www.abc-tabs.com/";
-	const DESCRIPTION = "Returns 22 newest tabs";
+	const MAINTAINER = 'kranack';
+	const NAME = 'ABC Tabs Bridge';
+	const URI = 'https://www.abc-tabs.com/';
+	const DESCRIPTION = 'Returns 22 newest tabs';
 
 	public function collectData(){
 		$html = '';
-        $html = getSimpleHTMLDOM(static::URI.'tablatures/nouveautes.html') or returnClientError('No results for this query.');
+		$html = getSimpleHTMLDOM(static::URI . 'tablatures/nouveautes.html')
+			or returnClientError('No results for this query.');
+
 		$table = $html->find('table#myTable', 0)->children(1);
 
-		foreach ($table->find('tr') as $tab)
-		{
+		foreach ($table->find('tr') as $tab) {
 			$item = array();
-		    $item['author'] = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext;
-		    $item['title'] = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext;
-		    $item['content'] = 'Le ' . $tab->find('td', 0)->plaintext . '<br> Par: ' . $tab->find('td', 5)->plaintext . '<br> Type: ' . $tab->find('td', 3)->plaintext;
-		    $item['id'] = static::URI . $tab->find('td', 2)->find('a', 0)->getAttribute('href');
-		    $item['uri'] = static::URI . $tab->find('td', 2)->find('a', 0)->getAttribute('href');
+			$item['author'] = $tab->find('td', 1)->plaintext
+			. ' - '
+			. $tab->find('td', 2)->plaintext;
+
+			$item['title'] = $tab->find('td', 1)->plaintext
+			. ' - '
+			. $tab->find('td', 2)->plaintext;
+
+			$item['content'] = 'Le '
+			. $tab->find('td', 0)->plaintext
+			. '<br> Par: '
+			. $tab->find('td', 5)->plaintext
+			. '<br> Type: '
+			. $tab->find('td', 3)->plaintext;
+
+			$item['id'] = static::URI
+			. $tab->find('td', 2)->find('a', 0)->getAttribute('href');
+
+			$item['uri'] = static::URI
+			. $tab->find('td', 2)->find('a', 0)->getAttribute('href');
+
 			$this->items[] = $item;
 		}
 	}

bridges/AO3Bridge.php

@@ -0,0 +1,121 @@
+<?php
+
+class AO3Bridge extends BridgeAbstract {
+	const NAME = 'AO3';
+	const URI = 'https://archiveofourown.org/';
+	const CACHE_TIMEOUT = 1800;
+	const DESCRIPTION = 'Returns works or chapters from Archive of Our Own';
+	const MAINTAINER = 'Obsidienne';
+	const PARAMETERS = array(
+		'List' => array(
+			'url' => array(
+				'name' => 'url',
+				'required' => true,
+				// Example: F/F tag, complete works only
+				'exampleValue' => self::URI
+					. 'works?work_search[complete]=T&tag_id=F*s*F',
+			),
+		),
+		'Bookmarks' => array(
+			'user' => array(
+				'name' => 'user',
+				'required' => true,
+				// Example: Nyaaru's bookmarks
+				'exampleValue' => 'Nyaaru',
+			),
+		),
+		'Work' => array(
+			'id' => array(
+				'name' => 'id',
+				'required' => true,
+				// Example: latest chapters from A Better Past by LysSerris
+				'exampleValue' => '18181853',
+			),
+		)
+	);
+
+	// Feed for lists of works (e.g. recent works, search results, filtered tags,
+	// bookmarks, series, collections).
+	private function collectList($url) {
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('could not request AO3');
+		$html = defaultLinkTo($html, self::URI);
+
+		foreach($html->find('.index.group > li') as $element) {
+			$item = array();
+
+			$title = $element->find('div h4 a', 0);
+			if (!isset($title)) continue; // discard deleted works
+			$item['title'] = $title->plaintext;
+			$item['content'] = $element;
+			$item['uri'] = $title->href;
+
+			$strdate = $element->find('div p.datetime', 0)->plaintext;
+			$item['timestamp'] = strtotime($strdate);
+
+			$chapters = $element->find('dl dd.chapters', 0);
+			// bookmarked series and external works do not have a chapters count
+			$chapters = (isset($chapters) ? $chapters->plaintext : 0);
+			$item['uid'] = $item['uri'] . "/$strdate/$chapters";
+
+			$this->items[] = $item;
+		}
+	}
+
+	// Feed for recent chapters of a specific work.
+	private function collectWork($id) {
+		$url = self::URI . "/works/$id/navigate";
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('could not request AO3');
+		$html = defaultLinkTo($html, self::URI);
+
+		$this->title = $html->find('h2 a', 0)->plaintext;
+
+		foreach($html->find('ol.index.group > li') as $element) {
+			$item = array();
+
+			$item['title'] = $element->find('a', 0)->plaintext;
+			$item['content'] = $element;
+			$item['uri'] = $element->find('a', 0)->href;
+
+			$strdate = $element->find('span.datetime', 0)->plaintext;
+			$strdate = str_replace('(', '', $strdate);
+			$strdate = str_replace(')', '', $strdate);
+			$item['timestamp'] = strtotime($strdate);
+
+			$item['uid'] = $item['uri'] . "/$strdate";
+
+			$this->items[] = $item;
+		}
+
+		$this->items = array_reverse($this->items);
+	}
+
+	public function collectData() {
+		switch($this->queriedContext) {
+			case 'Bookmarks':
+				$user = $this->getInput('user');
+				$this->title = $user;
+				$url = self::URI
+					. '/users/' . $user
+					. '/bookmarks?bookmark_search[sort_column]=bookmarkable_date';
+				return $this->collectList($url);
+			case 'List': return $this->collectList(
+				$this->getInput('url')
+			);
+			case 'Work': return $this->collectWork(
+				$this->getInput('id')
+			);
+		}
+	}
+
+	public function getName() {
+		$name = parent::getName() . " $this->queriedContext";
+		if (isset($this->title)) $name .= " - $this->title";
+		return $name;
+	}
+
+	public function getIcon() {
+		return self::URI . '/favicon.ico';
+	}
+}

bridges/ASRockNewsBridge.php

@@ -0,0 +1,57 @@
+<?php
+class ASRockNewsBridge extends BridgeAbstract {
+	const NAME = 'ASRock News Bridge';
+	const URI = 'https://www.asrock.com';
+	const DESCRIPTION = 'Returns latest news articles';
+	const MAINTAINER = 'VerifiedJoseph';
+	const PARAMETERS = array();
+
+	const CACHE_TIMEOUT = 3600; // 1 hour
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM(self::URI . '/news/index.asp')
+			or returnServerError('Could not request: ' . self::URI . '/news/index.asp');
+
+		$html = defaultLinkTo($html, self::URI . '/news/');
+
+		foreach($html->find('div.inner > a') as $index => $a) {
+			$item = array();
+
+			$articlePath = $a->href;
+
+			$articlePageHtml = getSimpleHTMLDOMCached($articlePath, self::CACHE_TIMEOUT)
+				or returnServerError('Could not request: ' . $articlePath);
+
+			$articlePageHtml = defaultLinkTo($articlePageHtml, self::URI);
+
+			$contents = $articlePageHtml->find('div.Contents', 0);
+
+			$item['uri'] = $articlePath;
+			$item['title'] = $contents->find('h5', 0)->innertext;
+
+			$contents->find('h5', 0)->outertext = '';
+
+			$item['content'] = $contents->innertext;
+			$item['timestamp'] = $this->extractDate($a->plaintext);
+			$item['enclosures'][] = $a->find('img', 0)->src;
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10) {
+				break;
+			}
+		}
+	}
+
+	private function extractDate($text) {
+		$dateRegex = '/^([0-9]{4}\/[0-9]{1,2}\/[0-9]{1,2})/';
+
+		$text = trim($text);
+
+		if (preg_match($dateRegex, $text, $matches)) {
+			return $matches[1];
+		}
+
+		return '';
+	}
+}

bridges/AcrimedBridge.php

@@ -1,14 +1,14 @@
 <?php
 class AcrimedBridge extends FeedExpander {
 
-    const MAINTAINER = "qwertygc";
-    const NAME = "Acrimed Bridge";
-    const URI = "http://www.acrimed.org/";
+	const MAINTAINER = 'qwertygc';
+	const NAME = 'Acrimed Bridge';
+	const URI = 'http://www.acrimed.org/';
 	const CACHE_TIMEOUT = 4800; //2hours
-    const DESCRIPTION = "Returns the newest articles.";
+	const DESCRIPTION = 'Returns the newest articles';
 
 	public function collectData(){
-        $this->collectExpandableDatas(static::URI.'spip.php?page=backend');
+		$this->collectExpandableDatas(static::URI . 'spip.php?page=backend');
 	}
 
 	protected function parseItem($newsItem){
@@ -16,10 +16,9 @@ class AcrimedBridge extends FeedExpander {
 
 		$articlePage = getSimpleHTMLDOM($newsItem->link);
 		$article = sanitize($articlePage->find('article.article1', 0)->innertext);
-        $article = defaultImageSrcTo($article, static::URI);
+		$article = defaultLinkTo($article, static::URI);
 		$item['content'] = $article;
 
 		return $item;
 	}
-
 }

bridges/AirBreizhBridge.php

@@ -0,0 +1,54 @@
+<?php
+class AirBreizhBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'fanch317';
+	const NAME = 'Air Breizh';
+	const URI = 'https://www.airbreizh.asso.fr/';
+	const DESCRIPTION = 'Returns newests publications on Air Breizh';
+	const PARAMETERS = array(
+		'Publications' => array(
+			'theme' => array(
+				'name' => 'Thematique',
+				'type' => 'list',
+				'values' => array(
+					'Tout' => '',
+					'Rapport d\'activite' => 'rapport-dactivite',
+					'Etude' => 'etudes',
+					'Information' => 'information',
+					'Autres documents' => 'autres-documents',
+					'Plan Régional de Surveillance de la qualité de l’air' => 'prsqa',
+					'Transport' => 'transport'
+				)
+			)
+		)
+	);
+
+	public function getIcon() {
+		return 'https://www.airbreizh.asso.fr/voy_content/uploads/2017/11/favicon.png';
+	}
+
+	public function collectData(){
+		$html = '';
+		$html = getSimpleHTMLDOM(static::URI . 'publications/?fwp_publications_thematiques=' . $this->getInput('theme'))
+			or returnClientError('No results for this query.');
+
+		foreach ($html->find('article') as $article) {
+			$item = array();
+			// Title
+			$item['title'] = $article->find('h2', 0)->plaintext;
+			// Author
+			$item['author'] = 'Air Breizh';
+			// Image
+			$imagelink = $article->find('.card__image', 0)->find('img', 0)->getAttribute('src');
+			// Content preview
+			$item['content'] = '<img src="' . $imagelink . '" />
+			<br/>'
+			. $article->find('.card__text', 0)->plaintext;
+			// URL
+			$item['uri'] = $article->find('.publi__buttons', 0)->find('a', 0)->getAttribute('href');
+			// ID
+			$item['id'] = $article->find('.publi__buttons', 0)->find('a', 0)->getAttribute('href');
+			$this->items[] = $item;
+		}
+	}
+}

bridges/AlbionOnlineBridge.php

@@ -0,0 +1,80 @@
+<?php
+class AlbionOnlineBridge extends BridgeAbstract {
+
+	const NAME = 'Albion Online Changelog';
+	const MAINTAINER = 'otakuf';
+	const URI = 'https://albiononline.com';
+	const DESCRIPTION = 'Returns the changes made to the Albion Online';
+	const CACHE_TIMEOUT = 3600; // 60min
+
+	const PARAMETERS = array( array(
+		'postcount' => array(
+			'name' => 'Limit',
+			'type' => 'list',
+			'values' => array(
+				'2' => 2,
+				'5' => 5,
+				'10' => 10,
+				'15' => 15,
+			 ),
+			'title' => 'Maximum number of items to return',
+			'defaultValue' => 5,
+		),
+		'language' => array(
+			'name' => 'Language',
+			'type' => 'list',
+			'values' => array(
+				'English' => 'en',
+				'Deutsch' => 'de',
+				'Polski' => 'pl',
+				'Français' => 'fr',
+				'Русский' => 'ru',
+				'Português' => 'pt',
+				'Español' => 'es',
+			 ),
+			'title' => 'Language of changelog posts',
+			'defaultValue' => 'en',
+		),
+		'full' => array(
+			'name' => 'Full changelog',
+			'type' => 'checkbox',
+			'required' => false,
+			'title' => 'Enable to receive the full changelog post for each item'
+		),
+	));
+
+	public function collectData() {
+		$api = 'https://albiononline.com/';
+		// Example: https://albiononline.com/en/changelog/1/5
+		$url = $api . $this->getInput('language') . '/changelog/1/' . $this->getInput('postcount');
+
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Unable to get changelog data from "' . $url . '"!');
+
+		foreach ($html->find('li') as $data) {
+			$item = array();
+			$item['uri'] = self::URI . $data->find('a', 0)->getAttribute('href');
+			$item['title'] = trim(explode('|', $data->find('span', 0)->plaintext)[0]);
+			// Time below work only with en lang. Need to think about solution. May be separate request like getFullChangelog, but to english list for all language
+			//print_r( date_parse_from_format( 'M j, Y' , 'Sep 9, 2020') );
+			//$item['timestamp'] = $this->extractDate($a->plaintext);
+			$item['author'] = 'albiononline.com';
+			if($this->getInput('full')) {
+				$item['content'] = $this->getFullChangelog($item['uri']);
+			} else {
+				//$item['content'] = trim(preg_replace('/\s+/', ' ', $data->find('span', 0)->plaintext));
+				// Just use title, no info at all or use title and date, see above
+				$item['content'] = $item['title'];
+			}
+			$item['uid'] = hash('sha256', $item['title']);
+			$this->items[] = $item;
+		}
+	}
+
+	private function getFullChangelog($url) {
+		$html = getSimpleHTMLDOMCached($url)
+			or returnServerError('Unable to load changelog post from "' . $url . '"!');
+		$html = defaultLinkTo($html, self::URI);
+		return $html->find('div.small-12.columns', 1)->innertext;
+	}
+}

bridges/AllocineFRBridge.php

@@ -1,82 +1,107 @@
 <?php
-class AllocineFRBridge extends BridgeAbstract{
+class AllocineFRBridge extends BridgeAbstract {
 
-
-    const MAINTAINER = "superbaillot.net";
-    const NAME = "Allo Cine Bridge";
+	const MAINTAINER = 'superbaillot.net';
+	const NAME = 'Allo Cine Bridge';
 	const CACHE_TIMEOUT = 25200; // 7h
-    const URI = "http://www.allocine.fr/";
-    const DESCRIPTION = "Bridge for allocine.fr";
+	const URI = 'http://www.allocine.fr/';
+	const DESCRIPTION = 'Bridge for allocine.fr';
 	const PARAMETERS = array( array(
-        'category'=>array(
-            'name'=>'category',
-            'type'=>'list',
-            'required'=>true,
-            'exampleValue'=>'Faux Raccord',
-            'title'=>'Select your category',
-            'values'=>array(
-                'Faux Raccord'=>'faux-raccord',
-                'Top 5'=>'top-5',
-                'Tueurs en Séries'=>'tueurs-en-serie'
+		'category' => array(
+			'name' => 'Emission',
+			'type' => 'list',
+			'title' => 'Sélectionner l\'emission',
+			'values' => array(
+				'Faux Raccord' => 'faux-raccord',
+				'Fanzone' => 'fanzone',
+				'Game In Ciné' => 'game-in-cine',
+				'Pour la faire courte' => 'pour-la-faire-courte',
+				'Home Cinéma' => 'home-cinema',
+				'PILS - Par Ici Les Sorties' => 'pils-par-ici-les-sorties',
+				'AlloCiné : l\'émission, sur LeStream' => 'allocine-lemission-sur-lestream',
+				'Give Me Five' => 'give-me-five',
+				'Aviez-vous remarqué ?' => 'aviez-vous-remarque',
+				'Et paf, il est mort' => 'et-paf-il-est-mort',
+				'The Big Fan Theory' => 'the-big-fan-theory',
+				'Clichés' => 'cliches',
+				'Complètement...' => 'completement',
+				'#Fun Facts' => 'fun-facts',
+				'Origin Story' => 'origin-story',
 			)
 		)
 	));
 
 	public function getURI(){
-        switch($this->getInput('category')){
-        case 'faux-raccord':
-            $uri = static::URI.'video/programme-12284/saison-27129/';
-            break;
-        case 'top-5':
-            $uri = static::URI.'video/programme-12299/saison-29561/';
-            break;
-        case 'tueurs-en-serie':
-            $uri = static::URI.'video/programme-12286/saison-22938/';
-            break;
+		if(!is_null($this->getInput('category'))) {
+
+			$categories = array(
+				'faux-raccord' => 'video/programme-12284/saison-37054/',
+				'fanzone' => 'video/programme-12298/saison-37059/',
+				'game-in-cine' => 'video/programme-12288/saison-22971/',
+				'pour-la-faire-courte' => 'video/programme-20960/saison-29678/',
+				'home-cinema' => 'video/programme-12287/saison-34703/',
+				'pils-par-ici-les-sorties' => 'video/programme-25789/saison-37253/',
+				'allocine-lemission-sur-lestream' => 'video/programme-25123/saison-36067/',
+				'give-me-five' => 'video/programme-21919/saison-34518/',
+				'aviez-vous-remarque' => 'video/programme-19518/saison-37084/',
+				'et-paf-il-est-mort' => 'video/programme-25113/saison-36657/',
+				'the-big-fan-theory' => 'video/programme-20403/saison-37419/',
+				'cliches' => 'video/programme-24834/saison-35591/',
+				'completement' => 'video/programme-23859/saison-34102/',
+				'fun-facts' => 'video/programme-23040/saison-32686/',
+				'origin-story' => 'video/programme-25667/saison-37041/'
+			);
+
+			$category = $this->getInput('category');
+			if(array_key_exists($category, $categories)) {
+				return static::URI . $categories[$category];
+			} else {
+				returnClientError('Emission inconnue');
+			}
 		}
 
-        return $uri;
+		return parent::getURI();
 	}
 
 	public function getName(){
-        return self::NAME.' : '
-            .array_search(
+		if(!is_null($this->getInput('category'))) {
+			return self::NAME . ' : '
+				. array_search(
 					$this->getInput('category'),
 					self::PARAMETERS[$this->queriedContext]['category']['values']
 				);
 		}
 
+		return parent::getName();
+	}
+
 	public function collectData(){
 
 		$html = getSimpleHTMLDOM($this->getURI())
-            or returnServerError("Could not request ".$this->getURI()." !");
+			or returnServerError('Could not request ' . $this->getURI() . ' !');
 
-        $category=array_search(
+		$category = array_search(
 				$this->getInput('category'),
 				self::PARAMETERS[$this->queriedContext]['category']['values']
 			);
 
-
-        foreach($html->find('figure.media-meta-fig') as $element)
-        {
+		foreach($html->find('div[class=gd-col-left]', 0)->find('div[class*=video-card]') as $element) {
 			$item = array();
 
-            $title = $element->find('div.titlebar h3.title a', 0);
-            $content = trim($element->innertext);
-            $figCaption = strpos($content, $category);
+			$title = $element->find('a[class*=meta-title-link]', 0);
+			$content = trim($element->outertext);
+
+			// Replace image 'src' with the one in 'data-src'
+			$content = preg_replace('@src="data:image/gif;base64,[A-Za-z0-9+\/]*"@', '', $content);
+			$content = preg_replace('@data-src=@', 'src=', $content);
+
+			// Remove date in the content to prevent content update while the video is getting older
+			$content = preg_replace('@<div class="meta-sub light">.*<span>[^<]*</span>[^<]*</div>@', '', $content);
 
-            if($figCaption !== false)
-            {
-                $content = str_replace('src="/', 'src="'.static::URI, $content);
-                $content = str_replace('href="/', 'href="'.static::URI, $content);
-                $content = str_replace('src=\'/', 'src=\''.static::URI, $content);
-                $content = str_replace('href=\'/', 'href=\''.static::URI, $content);
 			$item['content'] = $content;
 			$item['title'] = trim($title->innertext);
-                $item['uri'] = static::URI . $title->href;
+			$item['uri'] = static::URI . substr($title->href, 1);
 			$this->items[] = $item;
 		}
 	}
-    }
-
 }

bridges/AmazonBridge.php

@@ -0,0 +1,95 @@
+<?php
+
+class AmazonBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'Alexis CHEMEL';
+	const NAME = 'Amazon';
+	const URI = 'https://www.amazon.com/';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'Returns products from Amazon search';
+
+	const PARAMETERS = array(array(
+		'q' => array(
+			'name' => 'Keyword',
+			'required' => true,
+		),
+		'sort' => array(
+			'name' => 'Sort by',
+			'type' => 'list',
+			'values' => array(
+				'Relevance' => 'relevanceblender',
+				'Price: Low to High' => 'price-asc-rank',
+				'Price: High to Low' => 'price-desc-rank',
+				'Average Customer Review' => 'review-rank',
+				'Newest Arrivals' => 'date-desc-rank',
+			),
+			'defaultValue' => 'relevanceblender',
+		),
+		'tld' => array(
+			'name' => 'Country',
+			'type' => 'list',
+			'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',
+		),
+	));
+
+	public function getName(){
+		if(!is_null($this->getInput('tld')) && !is_null($this->getInput('q'))) {
+			return 'Amazon.' . $this->getInput('tld') . ': ' . $this->getInput('q');
+		}
+
+		return parent::getName();
+	}
+
+	public function collectData() {
+
+		$uri = 'https://www.amazon.' . $this->getInput('tld') . '/';
+		$uri .= 's/?field-keywords=' . urlencode($this->getInput('q')) . '&sort=' . $this->getInput('sort');
+
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request Amazon.');
+
+		foreach($html->find('li.s-result-item') as $element) {
+
+			$item = array();
+
+			// Title
+			$title = $element->find('h2', 0);
+			if (is_null($title)) {
+				continue;
+			}
+
+			$item['title'] = html_entity_decode($title->innertext, ENT_QUOTES);
+
+			// Url
+			$uri = $title->parent()->getAttribute('href');
+			$uri = substr($uri, 0, strrpos($uri, '/'));
+
+			$item['uri'] = substr($uri, 0, strrpos($uri, '/'));
+
+			// Content
+			$image = $element->find('img', 0);
+			$price = $element->find('span.s-price', 0);
+			$price = ($price) ? $price->innertext : '';
+
+			$item['content'] = '<img src="' . $image->getAttribute('src') . '" /><br />' . $price;
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/AmazonPriceTrackerBridge.php

@@ -0,0 +1,186 @@
+<?php
+
+class AmazonPriceTrackerBridge extends BridgeAbstract {
+	const MAINTAINER = 'captn3m0';
+	const NAME = 'Amazon Price Tracker';
+	const URI = 'https://www.amazon.com/';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'Tracks price for a single product on Amazon';
+
+	const PARAMETERS = array(
+		array(
+		'asin' => 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',
+			'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();
+		}
+	}
+
+	private function parseDynamicImage($attribute) {
+		$json = json_decode(html_entity_decode($attribute), true);
+
+		if ($json and count($json) > 0) {
+			return array_keys($json)[0];
+		}
+	}
+
+	/**
+	 * Returns a generated image tag for the product
+	 */
+	private function getImage($html) {
+		$imageSrc = $html->find('#main-image-container img', 0);
+
+		if ($imageSrc) {
+			$hiresImage = $imageSrc->getAttribute('data-old-hires');
+			$dynamicImageAttribute = $imageSrc->getAttribute('data-a-dynamic-image');
+			$image = $hiresImage ?: $this->parseDynamicImage($dynamicImageAttribute);
+		}
+		$image = $image ?: 'https://placekitten.com/200/300';
+
+		return <<<EOT
+<img width="300" style="max-width:300;max-height:300" src="$image" alt="{$this->title}" />
+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.');
+	}
+
+	private function scrapePriceFromMetrics($html) {
+		$asinData = $html->find('#cerberus-data-metrics', 0);
+
+		// <div id="cerberus-data-metrics" style="display: none;"
+		// 	data-asin="B00WTHJ5SU" data-asin-price="14.99" data-asin-shipping="0"
+		// 	data-asin-currency-code="USD" data-substitute-count="-1" ... />
+		if ($asinData) {
+			return array(
+				'price' 	=> $asinData->getAttribute('data-asin-price'),
+				'currency'	=> $asinData->getAttribute('data-asin-currency-code'),
+				'shipping'	=> $asinData->getAttribute('data-asin-shipping')
+			);
+		}
+
+		return false;
+	}
+
+	private function scrapePriceGeneric($html) {
+		$priceDiv = $html->find('span.offer-price', 0) ?: $html->find('.a-color-price', 0);
+
+		preg_match('/^\s*([A-Z]{3}|£|\$)\s?([\d.,]+)\s*$/', $priceDiv->plaintext, $matches);
+
+		if (count($matches) === 3) {
+			return array(
+				'price' 	=> $matches[2],
+				'currency'	=> $matches[1],
+				'shipping'	=> '0'
+			);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Scrape method for Amazon product page
+	 * @return [type] [description]
+	 */
+	public function collectData() {
+		$html = $this->getHtml();
+		$this->title = $this->getTitle($html);
+		$imageTag = $this->getImage($html);
+
+		$data = $this->scrapePriceFromMetrics($html) ?: $this->scrapePriceGeneric($html);
+
+		$item = array(
+			'title' 	=> $this->title,
+			'uri' 		=> $this->getURI(),
+			'content' 	=> "$imageTag<br/>Price: {$data['price']} {$data['currency']}",
+		);
+
+		if ($data['shipping'] !== '0') {
+			$item['content'] .= "<br>Shipping: {$data['shipping']} {$data['currency']}</br>";
+		}
+
+		$this->items[] = $item;
+	}
+}

bridges/AnidexBridge.php

@@ -0,0 +1,218 @@
+<?php
+class AnidexBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'ORelio';
+	const NAME = 'Anidex';
+	const URI = 'http://anidex.info/'; // anidex.info has ddos-guard so we need to use anidex.moe
+	const ALTERNATE_URI = 'https://anidex.moe/'; // anidex.moe returns 301 unless Host is set to anidex.info
+	const ALTERNATE_HOST = 'anidex.info'; // Correct host for requesting anidex.moe without 301 redirect
+	const DESCRIPTION = 'Returns the newest torrents, with optional search criteria.';
+	const PARAMETERS = array(
+		array(
+			'id' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All categories' => '0',
+					'Anime' => '1,2,3',
+					'Anime - Sub' => '1',
+					'Anime - Raw' => '2',
+					'Anime - Dub' => '3',
+					'Live Action' => '4,5',
+					'Live Action - Sub' => '4',
+					'Live Action - Raw' => '5',
+					'Light Novel' => '6',
+					'Manga' => '7,8',
+					'Manga - Translated' => '7',
+					'Manga - Raw' => '8',
+					'Music' => '9,10,11',
+					'Music - Lossy' => '9',
+					'Music - Lossless' => '10',
+					'Music - Video' => '11',
+					'Games' => '12',
+					'Applications' => '13',
+					'Pictures' => '14',
+					'Adult Video' => '15',
+					'Other' => '16'
+				)
+			),
+			'lang_id' => array(
+				'name' => 'Language',
+				'type' => 'list',
+				'values' => array(
+					'All languages' => '0',
+					'English' => '1',
+					'Japanese' => '2',
+					'Polish' => '3',
+					'Serbo-Croatian' => '4',
+					'Dutch' => '5',
+					'Italian' => '6',
+					'Russian' => '7',
+					'German' => '8',
+					'Hungarian' => '9',
+					'French' => '10',
+					'Finnish' => '11',
+					'Vietnamese' => '12',
+					'Greek' => '13',
+					'Bulgarian' => '14',
+					'Spanish (Spain)' => '15',
+					'Portuguese (Brazil)' => '16',
+					'Portuguese (Portugal)' => '17',
+					'Swedish' => '18',
+					'Arabic' => '19',
+					'Danish' => '20',
+					'Chinese (Simplified)' => '21',
+					'Bengali' => '22',
+					'Romanian' => '23',
+					'Czech' => '24',
+					'Mongolian' => '25',
+					'Turkish' => '26',
+					'Indonesian' => '27',
+					'Korean' => '28',
+					'Spanish (LATAM)' => '29',
+					'Persian' => '30',
+					'Malaysian' => '31'
+				)
+			),
+			'group_id' => array(
+				'name' => 'Group ID',
+				'type' => 'number'
+			),
+			'r' => array(
+				'name' => 'Hide Remakes',
+				'type' => 'checkbox'
+			),
+			'b' => array(
+				'name' => 'Only Batches',
+				'type' => 'checkbox'
+			),
+			'a' => array(
+				'name' => 'Only Authorized',
+				'type' => 'checkbox'
+			),
+			'q' => array(
+				'name' => 'Keyword',
+				'description' => 'Keyword(s)',
+				'type' => 'text'
+			),
+			'h' => array(
+				'name' => 'Adult content',
+				'type' => 'list',
+				'values' => array(
+					'No filter' => '0',
+					'Hide +18' => '1',
+					'Only +18' => '2'
+				)
+			)
+		)
+	);
+
+	public function collectData() {
+
+		// Build Search URL from user-provided parameters
+		$search_url = self::ALTERNATE_URI . '?s=upload_timestamp&o=desc';
+		foreach (array('id', 'lang_id', 'group_id') as $param_name) {
+			$param = $this->getInput($param_name);
+			if (!empty($param) && intval($param) != 0 && ctype_digit(str_replace(',', '', $param))) {
+				$search_url .= '&' . $param_name . '=' . $param;
+			}
+		}
+		foreach (array('r', 'b', 'a') as $param_name) {
+			$param = $this->getInput($param_name);
+			if (!empty($param) && boolval($param)) {
+				$search_url .= '&' . $param_name . '=1';
+			}
+		}
+		$query = $this->getInput('q');
+		if (!empty($query)) {
+			$search_url .= '&q=' . urlencode($query);
+		}
+		$opt = array();
+		$h = $this->getInput('h');
+		if (!empty($h) && intval($h) != 0 && ctype_digit($h)) {
+			$opt[CURLOPT_COOKIE] = 'anidex_h_toggle=' . $h;
+		}
+
+		// We need to use a different Host HTTP header to reach the correct page on ALTERNATE_URI
+		$headers = array('Host: ' . self::ALTERNATE_HOST);
+
+		// The HTTPS certificate presented by anidex.moe is for anidex.info. We need to ignore this.
+		// As a consequence, the bridge is intentionally marked as insecure by setting self::URI to http://
+		$opt[CURLOPT_SSL_VERIFYHOST] = 0;
+		$opt[CURLOPT_SSL_VERIFYPEER] = 0;
+
+		// Retrieve torrent listing from search results, which does not contain torrent description
+		$html = getSimpleHTMLDOM($search_url, $headers, $opt)
+		or returnServerError('Could not request Anidex: ' . $search_url);
+		$links = $html->find('a');
+		$results = array();
+		foreach ($links as $link)
+			if (strpos($link->href, '/torrent/') === 0 && !in_array($link->href, $results))
+				$results[] = $link->href;
+		if (empty($results) && empty($this->getInput('q')))
+			returnServerError('No results from Anidex: ' . $search_url);
+
+		//Process each item individually
+		foreach ($results as $element) {
+
+			//Limit total amount of requests
+			if(count($this->items) >= 20) {
+				break;
+			}
+
+			$torrent_id = str_replace('/torrent/', '', $element);
+
+			//Ignore entries without valid torrent ID
+			if ($torrent_id != 0 && ctype_digit($torrent_id)) {
+
+				//Retrieve data for this torrent ID
+				$item_browse_uri = self::URI . 'torrent/' . $torrent_id;
+				$item_fetch_uri = self::ALTERNATE_URI . 'torrent/' . $torrent_id;
+
+				//Retrieve full description from torrent page (cached for 24 hours: 86400 seconds)
+				if ($item_html = getSimpleHTMLDOMCached($item_fetch_uri, 86400, $headers, $opt)) {
+
+					//Retrieve data from page contents
+					$item_title = str_replace(' (Torrent) - AniDex ', '', $item_html->find('title', 0)->plaintext);
+					$item_desc = $item_html->find('div.panel-body', 0);
+					$item_author = trim($item_html->find('span.fa-user', 0)->parent()->plaintext);
+					$item_date = strtotime(trim($item_html->find('span.fa-clock', 0)->parent()->plaintext));
+					$item_image = $this->getURI() . 'images/user_logos/default.png';
+
+					//Check for description-less torrent andn optionally extract image
+					$desc_title_found = false;
+					foreach ($item_html->find('h3.panel-title') as $h3) {
+						if (strpos($h3, 'Description') !== false) {
+							$desc_title_found = true;
+							break;
+						}
+					}
+					if ($desc_title_found) {
+						//Retrieve image for thumbnail or generic logo fallback
+						foreach ($item_desc->find('img') as $img) {
+							if (strpos($img->src, 'prez') === false) {
+								$item_image = $img->src;
+								break;
+							}
+						}
+						$item_desc = trim($item_desc->innertext);
+					} else {
+						$item_desc = '<em>No description.</em>';
+					}
+
+					//Build and add final item
+					$item = array();
+					$item['uri'] = $item_browse_uri;
+					$item['title'] = $item_title;
+					$item['author'] = $item_author;
+					$item['timestamp'] = $item_date;
+					$item['enclosures'] = array($item_image);
+					$item['content'] = $item_desc;
+					$this->items[] = $item;
+				}
+			}
+			$element = null;
+		}
+		$results = null;
+	}
+}

bridges/AnimeUltimeBridge.php

@@ -5,16 +5,16 @@ class AnimeUltimeBridge extends BridgeAbstract {
 	const NAME = 'Anime-Ultime';
 	const URI = 'http://www.anime-ultime.net/';
 	const CACHE_TIMEOUT = 10800; // 3h
-        const DESCRIPTION = 'Returns the 10 newest releases posted on Anime-Ultime';
+	const DESCRIPTION = 'Returns the newest releases posted on Anime-Ultime.';
 	const PARAMETERS = array( array(
-          'type'=>array(
-            'name'=>'Type',
-            'type'=>'list',
-            'values'=>array(
-              'Everything'=>'',
-              'Anime'=>'A',
-              'Drama'=>'D',
-              'Tokusatsu'=>'T'
+		'type' => array(
+		'name' => 'Type',
+		'type' => 'list',
+		'values' => array(
+			'Everything' => '',
+			'Anime' => 'A',
+			'Drama' => 'D',
+			'Tokusatsu' => 'T'
 			)
 		)
 	));
@@ -30,69 +30,86 @@ class AnimeUltimeBridge extends BridgeAbstract {
 		);
 
 		//Build date and filters for making requests
-        $thismonth = date('mY').$typeFilter;
-        $lastmonth = date('mY', mktime(0, 0, 0, date('n') - 1, 1, date('Y'))).$typeFilter;
+		$thismonth = date('mY') . $typeFilter;
+		$lastmonth = date('mY', mktime(0, 0, 0, date('n') - 1, 1, date('Y'))) . $typeFilter;
 
 		//Process each HTML page until having 10 releases
 		$processedOK = 0;
 		foreach (array($thismonth, $lastmonth) as $requestFilter) {
 
 			//Retrive page contents
-            $url = self::URI.'history-0-1/'.$requestFilter;
+			$url = self::URI . 'history-0-1/' . $requestFilter;
 			$html = getSimpleHTMLDOM($url)
-                or returnServerError('Could not request Anime-Ultime: '.$url);
+				or returnServerError('Could not request Anime-Ultime: ' . $url);
 
 			//Relases are sorted by day : process each day individually
-            foreach ($html->find('div.history', 0)->find('h3') as $daySection) {
+			foreach($html->find('div.history', 0)->find('h3') as $daySection) {
 
 				//Retrieve day and build date information
 				$dateString = $daySection->plaintext;
 				$day = intval(substr($dateString, strpos($dateString, ' ') + 1, 2));
-                $item_date = strtotime(str_pad($day, 2, '0', STR_PAD_LEFT).'-'
-                    .substr($requestFilter, 0, 2).'-'
-                    .substr($requestFilter, 2, 4));
-                $release = $daySection->next_sibling()->next_sibling()->first_child(); //<h3>day</h3><br /><table><tr> <-- useful data in table rows
+				$item_date = strtotime(str_pad($day, 2, '0', STR_PAD_LEFT)
+				. '-'
+				. substr($requestFilter, 0, 2)
+				. '-'
+				. substr($requestFilter, 2, 4));
+
+				//<h3>day</h3><br /><table><tr> <-- useful data in table rows
+				$release = $daySection->next_sibling()->next_sibling()->first_child();
 
 				//Process each release of that day, ignoring first table row: contains table headers
-                while (!is_null($release = $release->next_sibling())) {
-                    if (count($release->find('td')) > 0) {
+				while(!is_null($release = $release->next_sibling())) {
+					if(count($release->find('td')) > 0) {
 
 						//Retrieve metadata from table columns
 						$item_link_element = $release->find('td', 0)->find('a', 0);
-                        $item_uri = self::URI.$item_link_element->href;
+						$item_uri = self::URI . $item_link_element->href;
 						$item_name = html_entity_decode($item_link_element->plaintext);
-                        $item_episode = html_entity_decode(str_pad($release->find('td', 1)->plaintext, 2, '0', STR_PAD_LEFT));
+
+						$item_image = self::URI . substr(
+							$item_link_element->onmouseover,
+							37,
+							strpos($item_link_element->onmouseover, ' ', 37) - 37
+						);
+
+						$item_episode = html_entity_decode(
+							str_pad(
+								$release->find('td', 1)->plaintext,
+								2,
+								'0',
+								STR_PAD_LEFT
+							)
+						);
+
 						$item_fansub = $release->find('td', 2)->plaintext;
 						$item_type = $release->find('td', 4)->plaintext;
 
-                        if (!empty($item_uri)) {
+						if(!empty($item_uri)) {
 
-                            //Retrieve description from description page and convert relative image src info absolute image src
+							// Retrieve description from description page
 							$html_item = getContents($item_uri)
-                                or returnServerError('Could not request Anime-Ultime: '.$item_uri);
+								or returnServerError('Could not request Anime-Ultime: ' . $item_uri);
 							$item_description = substr(
 								$html_item,
-                                strpos($html_item, 'class="principal_contain" align="center">')
-                                + 41
+								strpos($html_item, 'class="principal_contain" align="center">') + 41
 							);
 							$item_description = substr($item_description,
 								0,
 								strpos($item_description, '<div id="table">')
 							);
-                            $item_description = str_replace(
-                                'src="images', 'src="'.self::URI.'images',
-                                $item_description
-                            );
+
+							// Convert relative image src into absolute image src, remove line breaks
+							$item_description = defaultLinkTo($item_description, self::URI);
 							$item_description = str_replace("\r", '', $item_description);
 							$item_description = str_replace("\n", '', $item_description);
-                            $item_description = utf8_encode($item_description);
 
 							//Build and add final item
 							$item = array();
 							$item['uri'] = $item_uri;
-                            $item['title'] = $item_name.' '.$item_type.' '.$item_episode;
+							$item['title'] = $item_name . ' ' . $item_type . ' ' . $item_episode;
 							$item['author'] = $item_fansub;
 							$item['timestamp'] = $item_date;
+							$item['enclosures'] = array($item_image);
 							$item['content'] = $item_description;
 							$this->items[] = $item;
 							$processedOK++;
@@ -108,12 +125,15 @@ class AnimeUltimeBridge extends BridgeAbstract {
 	}
 
 	public function getName() {
+		if(!is_null($this->getInput('type'))) {
 			$typeFilter = array_search(
 				$this->getInput('type'),
 				self::PARAMETERS[$this->queriedContext]['type']['values']
 			);
 
-        return 'Latest '.$typeFilter.' - Anime-Ultime Bridge';
+			return 'Latest ' . $typeFilter . ' - Anime-Ultime Bridge';
 		}
 
+		return parent::getName();
+	}
 }

bridges/AppleAppStoreBridge.php

@@ -0,0 +1,149 @@
+<?php
+
+class AppleAppStoreBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'captn3m0';
+	const NAME = 'Apple App Store';
+	const URI = 'https://apps.apple.com/';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'Returns version updates for a specific application';
+
+	const PARAMETERS = array(array(
+		'id' => array(
+			'name'	=> 'Application ID',
+			'required'	=> true,
+			'exampleValue'	=> '310633997'
+		),
+		'p' => array(
+			'name'	=> 'Platform',
+			'type'	=> 'list',
+			'values'	=> array(
+				'iPad'	=> 'ipad',
+				'iPhone'	=> 'iphone',
+				'Mac'	=> 'mac',
+
+				// The following 2 are present in responses
+				// but not yet tested
+				'Web'	=> 'web',
+				'Apple TV'	=> 'appletv',
+			),
+			'defaultValue'	=> 'iphone',
+		),
+		'country'	=> array(
+			'name'	=> 'Store Country',
+			'type'	=> 'list',
+			'values'	=> array(
+				'US'	=> 'US',
+				'India'	=> 'IN',
+				'Canada'	=> 'CA'
+			),
+			'defaultValue'	=> 'US',
+		),
+	));
+
+	const PLATFORM_MAPPING = array(
+		'iphone'	=> 'ios',
+		'ipad'	=> 'ios',
+	);
+
+	private function makeHtmlUrl($id, $country){
+		return 'https://apps.apple.com/' . $country . '/app/id' . $id;
+	}
+
+	private function makeJsonUrl($id, $platform, $country){
+		return "https://amp-api.apps.apple.com/v1/catalog/$country/apps/$id?platform=$platform&extend=versionHistory";
+	}
+
+	public function getName(){
+		if (isset($this->name)) {
+			return $this->name . ' - AppStore Updates';
+		}
+
+		return parent::getName();
+	}
+
+	/**
+	 * In case of some platforms, the data is present in the initial response
+	 */
+	private function getDataFromShoebox($id, $platform, $country){
+		$uri = $this->makeHtmlUrl($id, $country);
+		$html = getSimpleHTMLDOMCached($uri, 3600);
+		$script = $html->find('script[id="shoebox-ember-data-store"]', 0);
+
+		$json = json_decode($script->innertext, true);
+		return $json['data'];
+	}
+
+	private function getJWTToken($id, $platform, $country){
+		$uri = $this->makeHtmlUrl($id, $country);
+
+		$html = getSimpleHTMLDOMCached($uri, 3600);
+
+		$meta = $html->find('meta[name="web-experience-app/config/environment"]', 0);
+
+		$json = urldecode($meta->content);
+
+		$json = json_decode($json);
+
+		return $json->MEDIA_API->token;
+	}
+
+	private function getAppData($id, $platform, $country, $token){
+		$uri = $this->makeJsonUrl($id, $platform, $country);
+
+		$headers = array(
+			"Authorization: Bearer $token",
+		);
+
+		$json = json_decode(getContents($uri, $headers), true);
+
+		return $json['data'][0];
+	}
+
+	/**
+	 * Parses the version history from the data received
+	 * @return array list of versions with details on each element
+	 */
+	private function getVersionHistory($data, $platform){
+		switch($platform) {
+			case 'mac':
+				return $data['relationships']['platforms']['data'][0]['attributes']['versionHistory'];
+			default:
+				$os = self::PLATFORM_MAPPING[$platform];
+				return $data['attributes']['platformAttributes'][$os]['versionHistory'];
+		}
+	}
+
+	public function collectData() {
+		$id = $this->getInput('id');
+		$country = $this->getInput('country');
+		$platform = $this->getInput('p');
+
+		switch ($platform) {
+			case 'mac':
+				$data = $this->getDataFromShoebox($id, $platform, $country);
+				break;
+
+			default:
+				$token = $this->getJWTToken($id, $platform, $country);
+				$data = $this->getAppData($id, $platform, $country, $token);
+		}
+
+		$versionHistory = $this->getVersionHistory($data, $platform);
+		$name = $this->name = $data['attributes']['name'];
+		$author = $data['attributes']['artistName'];
+
+		foreach ($versionHistory as $row) {
+			$item = array();
+
+			$item['content'] = nl2br($row['releaseNotes']);
+			$item['title'] = $name . ' - ' . $row['versionDisplay'];
+			$item['timestamp'] = $row['releaseDate'];
+			$item['author'] = $author;
+
+			$item['uri'] = $this->makeHtmlUrl($id, $country);
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/AppleMusicBridge.php

@@ -0,0 +1,62 @@
+<?php
+
+class AppleMusicBridge extends BridgeAbstract {
+	const NAME = 'Apple Music';
+	const URI = 'https://www.apple.com';
+	const DESCRIPTION = 'Fetches the latest releases from an artist';
+	const MAINTAINER = 'Limero';
+	const PARAMETERS = array(array(
+		'url' => array(
+			'name' => 'Artist URL',
+			'exampleValue' => 'https://itunes.apple.com/us/artist/dunderpatrullen/329796274',
+			'required' => true,
+		),
+		'imgSize' => array(
+			'name' => 'Image size for thumbnails (in px)',
+			'type' => 'number',
+			'defaultValue' => 512,
+			'required' => true,
+		)
+	));
+	const CACHE_TIMEOUT = 21600; // 6 hours
+
+	public function collectData() {
+		$url = $this->getInput('url');
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Could not request: ' . $url);
+
+		$imgSize = $this->getInput('imgSize');
+
+		// Grab the json data from the page
+		$html = $html->find('script[id=shoebox-ember-data-store]', 0);
+		$html = strstr($html, '{');
+		$html = substr($html, 0, -9);
+		$json = json_decode($html);
+
+		// Loop through each object
+		foreach ($json->included as $obj) {
+			if ($obj->type === 'lockup/album') {
+				$this->items[] = array(
+					'title' => $obj->attributes->artistName . ' - ' . $obj->attributes->name,
+					'uri' => $obj->attributes->url,
+					'timestamp' => $obj->attributes->releaseDate,
+					'enclosures' => $obj->relationships->artwork->data->id,
+				);
+			} elseif ($obj->type === 'image') {
+				$images[$obj->id] = $obj->attributes->url;
+			}
+		}
+
+		// Add the images to each item
+		foreach ($this->items as &$item) {
+			$item['enclosures'] = array(
+				str_replace('{w}x{h}bb.{f}', $imgSize . 'x0w.jpg', $images[$item['enclosures']]),
+			);
+		}
+
+		// Sort the order to put the latest albums first
+		usort($this->items, function($a, $b){
+			return $a['timestamp'] < $b['timestamp'];
+		});
+	}
+}

bridges/ArtStationBridge.php

@@ -0,0 +1,93 @@
+<?php
+class ArtStationBridge extends BridgeAbstract {
+	const NAME = 'ArtStation';
+	const URI = 'https://www.artstation.com';
+	const DESCRIPTION = 'Fetches the latest ten artworks from a search query on ArtStation.';
+	const MAINTAINER = 'thefranke';
+	const CACHE_TIMEOUT = 3600; // 1h
+
+	const PARAMETERS = array(
+		'Search Query' => array(
+			'q' => array(
+				'name' => 'Search term',
+				'required' => true
+			)
+		)
+	);
+
+	public function getIcon() {
+		return 'https://www.artstation.com/assets/favicon-58653022bc38c1905ac7aa1b10bffa6b.ico';
+	}
+
+	public function getName() {
+		return self::NAME . ': ' . $this->getInput('q');
+	}
+
+	private function fetchSearch($searchQuery) {
+		$data = '{"query":"' . $searchQuery . '","page":1,"per_page":50,"sorting":"date",';
+		$data .= '"pro_first":"1","filters":[],"additional_fields":[]}';
+
+		$header = array(
+			'Content-Type: application/json',
+			'Accept: application/json'
+		);
+
+		$opts = array(
+			CURLOPT_POST => true,
+			CURLOPT_POSTFIELDS => $data,
+			CURLOPT_RETURNTRANSFER => true
+		);
+
+		$jsonSearchURL = self::URI . '/api/v2/search/projects.json';
+		$jsonSearchStr = getContents($jsonSearchURL, $header, $opts)
+			or returnServerError('Could not fetch JSON for search query.');
+		return json_decode($jsonSearchStr);
+	}
+
+	private function fetchProject($hashID) {
+		$jsonProjectURL = self::URI . '/projects/' . $hashID . '.json';
+		$jsonProjectStr = getContents($jsonProjectURL)
+			or returnServerError('Could not fetch JSON for project.');
+		return json_decode($jsonProjectStr);
+	}
+
+	public function collectData() {
+		$searchTerm = $this->getInput('q');
+		$jsonQuery = $this->fetchSearch($searchTerm);
+
+		foreach($jsonQuery->data as $media) {
+			// get detailed info about media item
+			$jsonProject = $this->fetchProject($media->hash_id);
+
+			// create item
+			$item = array();
+			$item['title'] = $media->title;
+			$item['uri'] = $media->url;
+			$item['timestamp'] = strtotime($jsonProject->published_at);
+			$item['author'] = $media->user->full_name;
+			$item['categories'] = implode(',', $jsonProject->tags);
+
+			$item['content'] = '<a href="'
+				. $media->url
+				. '"><img style="max-width: 100%" src="'
+				. $jsonProject->cover_url
+				. '"></a><p>'
+				. $jsonProject->description
+				. '</p>';
+
+			$numAssets = count($jsonProject->assets);
+
+			if ($numAssets > 1)
+				$item['content'] .= '<p><a href="'
+					. $media->url
+					. '">Project contains '
+					. ($numAssets - 1)
+					. ' more item(s).</a></p>';
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10)
+				break;
+		}
+	}
+}

bridges/Arte7Bridge.php

@@ -1,91 +1,123 @@
 <?php
-    class Arte7Bridge extends BridgeAbstract{
+class Arte7Bridge extends BridgeAbstract {
 
-        const MAINTAINER = "mitsukarenai";
-        const NAME = "Arte +7";
-        const URI = "http://www.arte.tv/";
+	const MAINTAINER = 'mitsukarenai';
+	const NAME = 'Arte +7';
+	const URI = 'https://www.arte.tv/';
 	const CACHE_TIMEOUT = 1800; // 30min
-        const DESCRIPTION = "Returns newest videos from ARTE +7";
+	const DESCRIPTION = 'Returns newest videos from ARTE +7';
+
+	const API_TOKEN = 'Nzc1Yjc1ZjJkYjk1NWFhN2I2MWEwMmRlMzAzNjI5NmU3NWU3ODg4ODJjOWMxNTMxYzEzZGRjYjg2ZGE4MmIwOA';
+
 	const PARAMETERS = array(
 		'Catégorie (Français)' => array(
-                'catfr'=>array(
-                    'type'=>'list',
-                    'name'=>'Catégorie',
-                    'values'=>array(
-                        'Toutes les vidéos (français)'=>'toutes-les-videos',
-                        'Actu & société'=>'actu-société',
-                        'Séries & fiction'=>'séries-fiction',
-                        'Cinéma'=>'cinéma',
-                        'Arts & spectacles classiques'=>'arts-spectacles-classiques',
-                        'Culture pop'=>'culture-pop',
-                        'Découverte'=>'découverte',
-                        'Histoire'=>'histoire',
-                        'Junior'=>'junior'
-
+			'catfr' => array(
+				'type' => 'list',
+				'name' => 'Catégorie',
+				'values' => array(
+					'Toutes les vidéos (français)' => null,
+					'Actu & société' => 'ACT',
+					'Séries & fiction' => 'SER',
+					'Cinéma' => 'CIN',
+					'Arts & spectacles classiques' => 'ARS',
+					'Culture pop' => 'CPO',
+					'Découverte' => 'DEC',
+					'Histoire' => 'HIST',
+					'Science' => 'SCI',
+					'Autre' => 'AUT'
 				)
 			)
 		),
-            'Catégorie (Allemand)' => array(
-                'catde'=>array(
-                    'type'=>'list',
-                    'name'=>'Catégorie',
-                    'values'=>array(
-                        'Alle Videos (deutsch)'=>'alle-videos',
-                        'Aktuelles & Gesellschaft'=>'aktuelles-gesellschaft',
-                        'Fernsehfilme & Serien'=>'fernsehfilme-serien',
-                        'Kino'=>'kino',
-                        'Kunst & Kultur'=>'kunst-kultur',
-                        'Popkultur & Alternativ'=>'popkultur-alternativ',
-                        'Entdeckung'=>'entdeckung',
-                        'Geschichte'=>'geschichte',
-                        'Junior'=>'junior'
+		'Collection (Français)' => array(
+			'colfr' => array(
+				'name' => 'Collection id',
+				'required' => true,
+				'title' => 'ex. RC-014095 pour https://www.arte.tv/fr/videos/RC-014095/blow-up/'
 			)
+		),
+		'Catégorie (Allemand)' => array(
+			'catde' => array(
+				'type' => 'list',
+				'name' => 'Catégorie',
+				'values' => array(
+					'Alle Videos (deutsch)' => null,
+					'Aktuelles & Gesellschaft' => 'ACT',
+					'Fernsehfilme & Serien' => 'SER',
+					'Kino' => 'CIN',
+					'Kunst & Kultur' => 'ARS',
+					'Popkultur & Alternativ' => 'CPO',
+					'Entdeckung' => 'DEC',
+					'Geschichte' => 'HIST',
+					'Wissenschaft' => 'SCI',
+					'Sonstiges' => 'AUT'
+				)
+			)
+		),
+		'Collection (Allemand)' => array(
+			'colde' => array(
+				'name' => 'Collection id',
+				'required' => true,
+				'title' => 'ex. RC-014095 pour https://www.arte.tv/de/videos/RC-014095/blow-up/'
 			)
 		)
 	);
 
 	public function collectData(){
-
-      switch($this->queriedContext){
+		switch($this->queriedContext) {
 		case 'Catégorie (Français)':
-        $category=$this->getInput('catfr');
-        $lang='fr';
+			$category = $this->getInput('catfr');
+			$lang = 'fr';
+			break;
+		case 'Collection (Français)':
+			$lang = 'fr';
+			$collectionId = $this->getInput('colfr');
 			break;
 		case 'Catégorie (Allemand)':
-        $category=$this->getInput('catde');
-        $lang='de';
+			$category = $this->getInput('catde');
+			$lang = 'de';
+			break;
+		case 'Collection (Allemand)':
+			$lang = 'de';
+			$collectionId = $this->getInput('colde');
 			break;
 		}
 
-      $url = self::URI.'guide/'.$lang.'/plus7/'.$category;
-      $input = getContents($url) or die('Could not request ARTE.');
-      if(strpos($input, 'categoryVideoSet') !== FALSE){
-        $input = explode('categoryVideoSet="', $input);
-        $input = explode('}}', $input[1]);
-        $input = $input[0].'}}';
-      }else{
-        $input = explode('videoSet="', $input);
-        $input = explode('}]}', $input[1]);
-        $input = $input[0].'}]}';
-      }
+		$url = 'https://api.arte.tv/api/opa/v3/videos?sort=-lastModified&limit=10&language='
+			. $lang
+			. ($category != null ? '&category.code=' . $category : '')
+			. ($collectionId != null ? '&collections.collectionId=' . $collectionId : '');
 
-      $input_json = json_decode(html_entity_decode($input, ENT_QUOTES), TRUE);
+		$header = array(
+			'Authorization: Bearer ' . self::API_TOKEN
+		);
+
+		$input = getContents($url, $header)
+			or returnServerError('Could not request ARTE.');
+		$input_json = json_decode($input, true);
 
 		foreach($input_json['videos'] as $element) {
+
 			$item = array();
-            $item['uri'] = str_replace("autoplay=1", "", $element['url']);
+			$item['uri'] = $element['url'];
 			$item['id'] = $element['id'];
-               $hack_broadcast_time = $element['rights_end'];
-               $hack_broadcast_time = strtok($hack_broadcast_time, 'T');
-               $hack_broadcast_time = strtok('T');
-            $item['timestamp'] = strtotime($element['scheduled_on'].'T'.$hack_broadcast_time);
+
+			$item['timestamp'] = strtotime($element['videoRightsBegin']);
 			$item['title'] = $element['title'];
-            if (!empty($element['subtitle']))
-               $item['title'] = $element['title'].' | '.$element['subtitle'];
-            $item['duration'] = round((int)$element['duration']/60);
-            $item['content'] = $element['teaser'].'<br><br>'.$item['duration'].'min<br><a href="'.$item['uri'].'"><img src="' . $element['thumbnail_url'] . '" /></a>';
+
+			if(!empty($element['subtitle']))
+				$item['title'] = $element['title'] . ' | ' . $element['subtitle'];
+
+			$item['duration'] = round((int)$element['durationSeconds'] / 60);
+			$item['content'] = $element['teaserText']
+			. '<br><br>'
+			. $item['duration']
+			. 'min<br><a href="'
+			. $item['uri']
+			. '"><img src="'
+			. $element['mainImage']['url']
+			. '" /></a>';
+
 			$this->items[] = $item;
 		}
 	}
-
 }

bridges/AsahiShimbunAJWBridge.php

@@ -0,0 +1,72 @@
+<?php
+class AsahiShimbunAJWBridge extends BridgeAbstract {
+	const NAME = 'Asahi Shimbun AJW';
+	const BASE_URI = 'http://www.asahi.com';
+	const URI = self::BASE_URI . '/ajw/';
+	const DESCRIPTION = 'Asahi Shimbun - Asia & Japan Watch';
+	const MAINTAINER = 'somini';
+	const PARAMETERS = array(
+		array(
+			'section' => array(
+				'type' => 'list',
+				'name' => 'Section',
+				'values' => array(
+					'Japan » Social Affairs' => 'japan/social',
+					'Japan » People' => 'japan/people',
+					'Japan » 3/11 Disaster' => 'japan/0311disaster',
+					'Japan » Sci & Tech' => 'japan/sci_tech',
+					'Politics' => 'politics',
+					'Business' => 'business',
+					'Culture » Style' => 'culture/style',
+					'Culture » Movies' => 'culture/movies',
+					'Culture » Manga & Anime' => 'culture/manga_anime',
+					'Asia » China' => 'asia/china',
+					'Asia » Korean Peninsula' => 'asia/korean_peninsula',
+					'Asia » Around Asia' => 'asia/around_asia',
+					'Opinion » Editorial' => 'opinion/editorial',
+					'Opinion » Vox Populi' => 'opinion/vox',
+				),
+				'defaultValue' => 'Politics',
+			)
+		)
+	);
+
+	private function getSectionURI($section) {
+		return self::getURI() . $section . '/';
+	}
+
+	public function collectData() {
+		$html = getSimpleHTMLDOM($this->getSectionURI($this->getInput('section')))
+			or returnServerError('Could not load content');
+
+		foreach($html->find('#MainInner li a') as $element) {
+			if ($element->parent()->class == 'HeadlineTopImage-S') {
+				Debug::log('Skip Headline, it is repeated below');
+				continue;
+			}
+			$item = array();
+
+			$item['uri'] = self::BASE_URI . $element->href;
+			$e_lead = $element->find('span.Lead', 0);
+			if ($e_lead) {
+				$item['content'] = $e_lead->innertext;
+				$e_lead->outertext = '';
+			} else {
+				$item['content'] = $element->innertext;
+			}
+			$e_date = $element->find('span.EnDate', 0);
+			if ($e_date) {
+				$item['timestamp'] = strtotime($e_date->innertext);
+				$e_date->outertext = '';
+			}
+			$e_video = $element->find('span.EnVideo', 0);
+			if ($e_video) {
+				$e_video->outertext = '';
+				$element->innertext = "VIDEO: $element->innertext";
+			}
+			$item['title'] = $element->innertext;
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/AskfmBridge.php

@@ -1,16 +1,16 @@
 <?php
-class AskfmBridge extends BridgeAbstract{
+class AskfmBridge extends BridgeAbstract {
 
-    const MAINTAINER = "az5he6ch";
-    const NAME = "Ask.fm Answers";
-    const URI = "http://ask.fm/";
+	const MAINTAINER = 'az5he6ch, logmanoriginal';
+	const NAME = 'Ask.fm Answers';
+	const URI = 'https://ask.fm/';
 	const CACHE_TIMEOUT = 300; //5 min
-    const DESCRIPTION = "Returns answers from an Ask.fm user";
+	const DESCRIPTION = 'Returns answers from an Ask.fm user';
 	const PARAMETERS = array(
-        'Ask.fm username'=>array(
-            'u'=>array(
-                'name'=>'Username',
-                'required'=>true
+		'Ask.fm username' => array(
+			'u' => array(
+				'name' => 'Username',
+				'required' => true
 			)
 		)
 	);
@@ -19,34 +19,56 @@ class AskfmBridge extends BridgeAbstract{
 		$html = getSimpleHTMLDOM($this->getURI())
 			or returnServerError('Requested username can\'t be found.');
 
-        foreach($html->find('div.streamItem-answer') as $element) {
+		$html = defaultLinkTo($html, self::URI);
+
+		foreach($html->find('article.streamItem-answer') as $element) {
 			$item = array();
-            $item['uri'] = self::URI.$element->find('a.streamItemsAge',0)->href;
-            $question = trim($element->find('h1.streamItemContent-question',0)->innertext);
-            $item['title'] = trim(htmlspecialchars_decode($element->find('h1.streamItemContent-question',0)->plaintext, ENT_QUOTES));
-            $answer = trim($element->find('p.streamItemContent-answer',0)->innertext);
-            #$item['update'] = $element->find('a.streamitemsage',0)->data-hint; // Doesn't work, DOM parser doesn't seem to like data-hint, dunno why
-            $visual = $element->find('div.streamItemContent-visual',0)->innertext; // This probably should be cleaned up, especially for YouTube embeds
-            //Fix tracking links, also doesn't work
+			$item['uri'] = $element->find('a.streamItem_meta', 0)->href;
+			$question = trim($element->find('header.streamItem_header', 0)->innertext);
+
+			$item['title'] = trim(
+				htmlspecialchars_decode($element->find('header.streamItem_header', 0)->plaintext,
+				ENT_QUOTES
+				)
+			);
+
+			$item['timestamp'] = strtotime($element->find('time', 0)->datetime);
+
+			$answer = trim($element->find('div.streamItem_content', 0)->innertext);
+
+			// This probably should be cleaned up, especially for YouTube embeds
+			if($visual = $element->find('div.streamItem_visual', 0)) {
+				$visual = $visual->innertext;
+			}
+
+			// Fix tracking links, also doesn't work
 			foreach($element->find('a') as $link) {
-                if (strpos($link->href, 'l.ask.fm') !== false) {
-                    #$link->href = str_replace('#_=_', '', get_headers($link->href, 1)['Location']); // Too slow
+				if(strpos($link->href, 'l.ask.fm') !== false) {
 					$link->href = $link->plaintext;
 				}
 			}
-            $content = '<p>' . $question . '</p><p>' . $answer . '</p><p>' . $visual . '</p>';
-            // Fix relative links without breaking // scheme used by YouTube stuff
-            $content = preg_replace('#href="\/(?!\/)#', 'href="'.self::URI,$content);
-            $item['content'] = $content;
+
+			$item['content'] = '<p>' . $question
+			. '</p><p>' . $answer
+			. '</p><p>' . $visual . '</p>';
+
 			$this->items[] = $item;
 		}
 	}
 
 	public function getName(){
-        return self::NAME.' : '.$this->getInput('u');
+		if(!is_null($this->getInput('u'))) {
+			return self::NAME . ' : ' . $this->getInput('u');
+		}
+
+		return parent::getName();
 	}
 
 	public function getURI(){
-        return self::URI.urlencode($this->getInput('u')).'/answers/more?page=0';
+		if(!is_null($this->getInput('u'))) {
+			return self::URI . urlencode($this->getInput('u'));
+		}
+
+		return parent::getURI();
 	}
 }

bridges/AtmoOccitanieBridge.php

@@ -0,0 +1,58 @@
+<?php
+class AtmoOccitanieBridge extends BridgeAbstract {
+
+	const NAME = 'Atmo Occitanie';
+	const URI = 'https://www.atmo-occitanie.org/';
+	const DESCRIPTION = 'Fetches the latest air polution of cities in Occitanie from Atmo';
+	const MAINTAINER = 'floviolleau';
+	const PARAMETERS = array(array(
+		'city' => array(
+			'name' => 'Ville',
+			'required' => true
+		)
+	));
+	const CACHE_TIMEOUT = 7200;
+
+	public function collectData() {
+		$uri = self::URI . $this->getInput('city');
+
+		$html = getSimpleHTMLDOM($uri)
+				or returnServerError('Could not request ' . $uri);
+
+		$generalMessage = $html->find('.landing-ville .city-banner .iqa-avertissement', 0)->innertext;
+		$recommendationsDom = $html->find('.landing-ville .recommandations', 0);
+		$recommendationsItemDom = $recommendationsDom->find('.recommandation-item .label');
+
+		$recommendationsMessage = '';
+
+		$i = 0;
+		$len = count($recommendationsItemDom);
+		foreach ($recommendationsItemDom as $key => $value) {
+			if ($i == 0) {
+				$recommendationsMessage .= trim($value->innertext) . '.';
+			} else {
+				$recommendationsMessage .= ' ' . trim($value->innertext) . '.';
+			}
+			$i++;
+		}
+
+		$lastRecommendationsDom = $recommendationsDom->find('.col-md-6', -1);
+		$informationHeaderMessage = $lastRecommendationsDom->find('.heading', 0)->innertext;
+		$indice = $lastRecommendationsDom->find('.current-indice .indice div', 0)->innertext;
+		$informationDescriptionMessage = $lastRecommendationsDom->find('.current-indice .description p', 0)->innertext;
+
+		$message = "$generalMessage L'indice est de $indice/10. $informationDescriptionMessage. $recommendationsMessage";
+		$city = $this->getInput('city');
+
+		$item['uri'] = $uri;
+		$today = date('d/m/Y');
+		$item['title'] = "Bulletin de l'air du $today pour la ville : $city.";
+		//$item['title'] .= ' Retrouvez plus d\'informations en allant sur atmo-occitanie.org #QualiteAir. ' . $message;
+		$item['title'] .= ' #QualiteAir. ' . $message;
+		$item['author'] = 'floviolleau';
+		$item['content'] = $message;
+		$item['uid'] = hash('sha256', $item['title']);
+
+		$this->items[] = $item;
+	}
+}

bridges/AutoJMBridge.php

@@ -0,0 +1,145 @@
+<?php
+
+class AutoJMBridge extends BridgeAbstract {
+
+	const NAME = 'AutoJM';
+	const URI = 'https://www.autojm.fr/';
+	const DESCRIPTION = 'Suivre les offres de véhicules proposés par AutoJM en fonction des critères de filtrages';
+	const MAINTAINER = 'sysadminstory';
+	const PARAMETERS = array(
+		'Afficher les offres de véhicules disponible en fonction des critères du site AutoJM' => array(
+			'url' => array(
+				'name' => 'URL du modèle',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'URL d\'une recherche avec filtre de véhicules sans le http://www.autojm.fr/',
+				'exampleValue' => 'achat-voitures-neuves-peugeot-nouvelle-308-5p'
+			),
+			'energy' => array(
+				'name' => 'Carburant',
+				'type' => 'list',
+				'values' => array(
+					'-' => '',
+					'Diesel' => 1,
+					'Essence' => 3,
+					'Hybride' => 5
+				),
+				'title' => 'Carburant'
+			),
+			'transmission' => array(
+				'name' => 'Transmission',
+				'type' => 'list',
+				'values' => array(
+					'-' => '',
+					'Automatique' => 1,
+					'Manuelle' => 2
+				),
+				'title' => 'Transmission'
+			),
+			'priceMin' => array(
+				'name' => 'Prix minimum',
+				'type' => 'number',
+				'required' => false,
+				'title' => 'Prix minimum du véhicule',
+				'exampleValue' => '10000',
+				'defaultValue' => '0'
+			),
+			'priceMax' => array(
+				'name' => 'Prix maximum',
+				'type' => 'number',
+				'required' => false,
+				'title' => 'Prix maximum du véhicule',
+				'exampleValue' => '15000',
+				'defaultValue' => '150000'
+			)
+		)
+	);
+	const CACHE_TIMEOUT = 3600;
+
+	public function getIcon() {
+		return self::URI . 'favicon.ico';
+	}
+
+	public function getName() {
+		switch($this->queriedContext) {
+		case 'Afficher les offres de véhicules disponible en fonction des critères du site AutoJM':
+			$html = getSimpleHTMLDOMCached(self::URI . $this->getInput('url'), 86400);
+			$name = html_entity_decode($html->find('title', 0)->plaintext);
+			return $name;
+			break;
+		default:
+			return parent::getName();
+		}
+
+	}
+
+	public function collectData() {
+
+		$model_url = self::URI . $this->getInput('url');
+
+		// Build the GET data
+		$get_data = 'form[energy]=' . $this->getInput('energy') .
+			'&form[transmission]=' . $this->getInput('transmission') .
+			'&form[priceMin]=' . $this->getInput('priceMin') .
+			'&form[priceMin]=' . $this->getInput('priceMin');
+
+		// Set the header 'X-Requested-With' like the website does it
+		$header = array(
+			'X-Requested-With: XMLHttpRequest'
+		);
+
+		// Get the JSON content of the form
+		$json = getContents($model_url . '?' . $get_data, $header)
+			or returnServerError('Could not request AutoJM.');
+
+		// Extract the HTML content from the JSON result
+		$data = json_decode($json);
+		$html = str_get_html($data->results);
+
+		// Go through every car of the model
+		$list = $html->find('div[class=car-card]');
+		foreach ($list as $car) {
+
+			// Get the Finish name if this car is the first of a new finish
+			$prev_tag = $car->prev_sibling();
+			if($prev_tag->tag == 'div' &&  $prev_tag->class == 'results-title') {
+				$finish_name = $prev_tag->plaintext;
+			}
+
+			// Get the info about the car offer
+			$image = $car->find('div[class=car-card__visual]', 0)->find('img', 0)->src;
+			$serie = $car->find('div[class=car-card__title]', 0)->plaintext;
+			$url = $car->find('a', 0)->href;
+			// Check if the car model is in stock or available only on order
+			if($car->find('span[class*=tag--dispo]', 0) != null) {
+				$availability = 'En Stock';
+			} else {
+				$availability = 'Sur commande';
+			}
+			$discount_html = $car->find('span[class=promo]', 0);
+			// Check if there is any discount dsiplayed
+			if ($discount_html != null) {
+				$discount = $discount_html->plaintext;
+			} else {
+				$discount = 'inconnue';
+			}
+			$price = $car->find('span[class=price]', 0)->plaintext;
+
+			// Construct the new item
+			$item = array();
+			$item['title'] = $finish_name . ' ' . $serie;
+			$item['content'] = '<p><img style="vertical-align:middle ; padding: 10px" src="' . $image . '" />'
+				. $finish_name . ' ' . $serie . '</p>';
+			$item['content'] .= '<ul><li>Disponibilité : ' . $availability . '</li>';
+			$item['content'] .= '<li>Série : ' . $serie . '</li>';
+			$item['content'] .= '<li>Remise : ' . $discount . '</li>';
+			$item['content'] .= '<li>Prix : ' . $price . '</li></ul>';
+
+			// Add a fictionnal anchor to the RSS element URL, based on the item content ;
+			// As the URL could be identical even if the price change, some RSS reader will not show those offers as new items
+			$item['uri'] = $url . '#' . md5($item['content']);
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/AwwwardsBridge.php

@@ -0,0 +1,55 @@
+<?php
+class AwwwardsBridge extends BridgeAbstract {
+	const NAME = 'Awwwards';
+	const URI = 'https://www.awwwards.com/';
+	const DESCRIPTION = 'Fetches the latest ten sites of the day from Awwwards';
+	const MAINTAINER = 'Paroleen';
+	const CACHE_TIMEOUT = 3600;
+
+	const SITESURI = 'https://www.awwwards.com/websites/sites_of_the_day/';
+	const SITEURI = 'https://www.awwwards.com/sites/';
+	const ASSETSURI = 'https://assets.awwwards.com/awards/media/cache/thumb_417_299/';
+
+	private $sites = array();
+
+	public function getIcon() {
+		return 'https://www.awwwards.com/favicon.ico';
+	}
+
+	private function fetchSites() {
+		Debug::log('Fetching all sites');
+		$sites = getSimpleHTMLDOM(self::SITESURI)
+			or returnServerError('Could not fetch JSON for sites.');
+
+		Debug::log('Parsing all JSON data');
+		foreach($sites->find('li[data-model]') as $site) {
+			$decode = html_entity_decode($site->attr['data-model'],
+				ENT_QUOTES, 'utf-8');
+			$decode = json_decode($decode, true);
+			$this->sites[] = $decode;
+		}
+	}
+
+	public function collectData() {
+		$this->fetchSites();
+
+		Debug::log('Building RSS feed');
+		foreach($this->sites as $site) {
+			$item = array();
+			$item['title'] = $site['title'];
+			$item['timestamp'] = $site['createdAt'];
+			$item['categories'] = $site['tags'];
+
+			$item['content'] = '<img src="'
+				. self::ASSETSURI
+				. $site['images']['thumbnail']
+				. '">';
+			$item['uri'] = self::SITEURI . $site['slug'];
+
+			$this->items[] = $item;
+
+			if(count($this->items) >= 10)
+				break;
+		}
+	}
+}

bridges/BAEBridge.php

@@ -0,0 +1,263 @@
+<?php
+class BAEBridge extends BridgeAbstract {
+	const MAINTAINER = 'couraudt';
+	const NAME = 'Bourse Aux Equipiers Bridge';
+	const URI = 'https://www.bourse-aux-equipiers.com';
+	const DESCRIPTION = 'Returns the newest sailing offers.';
+	const PARAMETERS = array(
+		array(
+			'keyword' => array(
+				'name' => 'Filtrer par mots clés',
+				'title' => 'Entrez le mot clé à filtrer ici'
+			),
+			'type' => array(
+				'name' => 'Type de recherche',
+				'title' => 'Afficher seuleument un certain type d\'annonce',
+				'type' => 'list',
+				'values' => array(
+					'Toutes les annonces' => false,
+					'Les embarquements' => 'boat',
+					'Les skippers' => 'skipper',
+					'Les équipiers' => 'crew'
+				)
+			)
+		)
+	);
+
+	public function collectData() {
+		$url = $this->getURI();
+		$html = getSimpleHTMLDOM($url) or returnClientError('No results for this query.');
+
+		$annonces = $html->find('main article');
+		foreach ($annonces as $annonce) {
+			$detail = $annonce->find('footer a', 0);
+
+			$htmlDetail = getSimpleHTMLDOMCached(parent::getURI() . $detail->href);
+			if (!$htmlDetail)
+				continue;
+
+			$item = array();
+
+			$item['title'] = $annonce->find('header h2', 0)->plaintext;
+			$item['uri'] = parent::getURI() . $detail->href;
+
+			$content = $htmlDetail->find('article p', 0)->innertext;
+			if (!empty($this->getInput('keyword'))) {
+				$keyword = $this->remove_accents(strtolower($this->getInput('keyword')));
+				$cleanTitle = $this->remove_accents(strtolower($item['title']));
+				if (strpos($cleanTitle, $keyword) === false) {
+					$cleanContent = $this->remove_accents(strtolower($content));
+					if (strpos($cleanContent, $keyword) === false) {
+						continue;
+					}
+				}
+			}
+
+			$content .= '<hr>';
+			$content .= $htmlDetail->find('section', 0)->innertext;
+			$item['content'] = defaultLinkTo($content, parent::getURI());
+			$image = $htmlDetail->find('#zoom', 0);
+			if ($image) {
+				$item['enclosures'] = array(parent::getURI() . $image->getAttribute('src'));
+			}
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI() {
+		$uri = parent::getURI();
+		if (!empty($this->getInput('type'))) {
+			if ($this->getInput('type') == 'boat') {
+				$uri .= '/embarquements.html';
+			} elseif ($this->getInput('type') == 'skipper') {
+				$uri .= '/skippers.html';
+			} else {
+				$uri .= '/equipiers.html';
+			}
+		}
+
+		return $uri;
+	}
+
+	private function remove_accents($string) {
+		$chars = array(
+			// Decompositions for Latin-1 Supplement
+			'ª' => 'a', 'º' => 'o',
+			'À' => 'A', 'Á' => 'A',
+			'Â' => 'A', 'Ã' => 'A',
+			'Ä' => 'A', 'Å' => 'A',
+			'Æ' => 'AE', 'Ç' => 'C',
+			'È' => 'E', 'É' => 'E',
+			'Ê' => 'E', 'Ë' => 'E',
+			'Ì' => 'I', 'Í' => 'I',
+			'Î' => 'I', 'Ï' => 'I',
+			'Ð' => 'D', 'Ñ' => 'N',
+			'Ò' => 'O', 'Ó' => 'O',
+			'Ô' => 'O', 'Õ' => 'O',
+			'Ö' => 'O', 'Ù' => 'U',
+			'Ú' => 'U', 'Û' => 'U',
+			'Ü' => 'U', 'Ý' => 'Y',
+			'Þ' => 'TH', 'ß' => 's',
+			'à' => 'a', 'á' => 'a',
+			'â' => 'a', 'ã' => 'a',
+			'ä' => 'a', 'å' => 'a',
+			'æ' => 'ae', 'ç' => 'c',
+			'è' => 'e', 'é' => 'e',
+			'ê' => 'e', 'ë' => 'e',
+			'ì' => 'i', 'í' => 'i',
+			'î' => 'i', 'ï' => 'i',
+			'ð' => 'd', 'ñ' => 'n',
+			'ò' => 'o', 'ó' => 'o',
+			'ô' => 'o', 'õ' => 'o',
+			'ö' => 'o', 'ø' => 'o',
+			'ù' => 'u', 'ú' => 'u',
+			'û' => 'u', 'ü' => 'u',
+			'ý' => 'y', 'þ' => 'th',
+			'ÿ' => 'y', 'Ø' => 'O',
+			// Decompositions for Latin Extended-A
+			'Ā' => 'A', 'ā' => 'a',
+			'Ă' => 'A', 'ă' => 'a',
+			'Ą' => 'A', 'ą' => 'a',
+			'Ć' => 'C', 'ć' => 'c',
+			'Ĉ' => 'C', 'ĉ' => 'c',
+			'Ċ' => 'C', 'ċ' => 'c',
+			'Č' => 'C', 'č' => 'c',
+			'Ď' => 'D', 'ď' => 'd',
+			'Đ' => 'D', 'đ' => 'd',
+			'Ē' => 'E', 'ē' => 'e',
+			'Ĕ' => 'E', 'ĕ' => 'e',
+			'Ė' => 'E', 'ė' => 'e',
+			'Ę' => 'E', 'ę' => 'e',
+			'Ě' => 'E', 'ě' => 'e',
+			'Ĝ' => 'G', 'ĝ' => 'g',
+			'Ğ' => 'G', 'ğ' => 'g',
+			'Ġ' => 'G', 'ġ' => 'g',
+			'Ģ' => 'G', 'ģ' => 'g',
+			'Ĥ' => 'H', 'ĥ' => 'h',
+			'Ħ' => 'H', 'ħ' => 'h',
+			'Ĩ' => 'I', 'ĩ' => 'i',
+			'Ī' => 'I', 'ī' => 'i',
+			'Ĭ' => 'I', 'ĭ' => 'i',
+			'Į' => 'I', 'į' => 'i',
+			'İ' => 'I', 'ı' => 'i',
+			'IJ' => 'IJ', 'ij' => 'ij',
+			'Ĵ' => 'J', 'ĵ' => 'j',
+			'Ķ' => 'K', 'ķ' => 'k',
+			'ĸ' => 'k', 'Ĺ' => 'L',
+			'ĺ' => 'l', 'Ļ' => 'L',
+			'ļ' => 'l', 'Ľ' => 'L',
+			'ľ' => 'l', 'Ŀ' => 'L',
+			'ŀ' => 'l', 'Ł' => 'L',
+			'ł' => 'l', 'Ń' => 'N',
+			'ń' => 'n', 'Ņ' => 'N',
+			'ņ' => 'n', 'Ň' => 'N',
+			'ň' => 'n', 'ʼn' => 'n',
+			'Ŋ' => 'N', 'ŋ' => 'n',
+			'Ō' => 'O', 'ō' => 'o',
+			'Ŏ' => 'O', 'ŏ' => 'o',
+			'Ő' => 'O', 'ő' => 'o',
+			'Œ' => 'OE', 'œ' => 'oe',
+			'Ŕ' => 'R', 'ŕ' => 'r',
+			'Ŗ' => 'R', 'ŗ' => 'r',
+			'Ř' => 'R', 'ř' => 'r',
+			'Ś' => 'S', 'ś' => 's',
+			'Ŝ' => 'S', 'ŝ' => 's',
+			'Ş' => 'S', 'ş' => 's',
+			'Š' => 'S', 'š' => 's',
+			'Ţ' => 'T', 'ţ' => 't',
+			'Ť' => 'T', 'ť' => 't',
+			'Ŧ' => 'T', 'ŧ' => 't',
+			'Ũ' => 'U', 'ũ' => 'u',
+			'Ū' => 'U', 'ū' => 'u',
+			'Ŭ' => 'U', 'ŭ' => 'u',
+			'Ů' => 'U', 'ů' => 'u',
+			'Ű' => 'U', 'ű' => 'u',
+			'Ų' => 'U', 'ų' => 'u',
+			'Ŵ' => 'W', 'ŵ' => 'w',
+			'Ŷ' => 'Y', 'ŷ' => 'y',
+			'Ÿ' => 'Y', 'Ź' => 'Z',
+			'ź' => 'z', 'Ż' => 'Z',
+			'ż' => 'z', 'Ž' => 'Z',
+			'ž' => 'z', 'ſ' => 's',
+			// Decompositions for Latin Extended-B
+			'Ș' => 'S', 'ș' => 's',
+			'Ț' => 'T', 'ț' => 't',
+			// Euro Sign
+			'€' => 'E',
+			// GBP (Pound) Sign
+			'£' => '',
+			// Vowels with diacritic (Vietnamese)
+			// unmarked
+			'Ơ' => 'O', 'ơ' => 'o',
+			'Ư' => 'U', 'ư' => 'u',
+			// grave accent
+			'Ầ' => 'A', 'ầ' => 'a',
+			'Ằ' => 'A', 'ằ' => 'a',
+			'Ề' => 'E', 'ề' => 'e',
+			'Ồ' => 'O', 'ồ' => 'o',
+			'Ờ' => 'O', 'ờ' => 'o',
+			'Ừ' => 'U', 'ừ' => 'u',
+			'Ỳ' => 'Y', 'ỳ' => 'y',
+			// hook
+			'Ả' => 'A', 'ả' => 'a',
+			'Ẩ' => 'A', 'ẩ' => 'a',
+			'Ẳ' => 'A', 'ẳ' => 'a',
+			'Ẻ' => 'E', 'ẻ' => 'e',
+			'Ể' => 'E', 'ể' => 'e',
+			'Ỉ' => 'I', 'ỉ' => 'i',
+			'Ỏ' => 'O', 'ỏ' => 'o',
+			'Ổ' => 'O', 'ổ' => 'o',
+			'Ở' => 'O', 'ở' => 'o',
+			'Ủ' => 'U', 'ủ' => 'u',
+			'Ử' => 'U', 'ử' => 'u',
+			'Ỷ' => 'Y', 'ỷ' => 'y',
+			// tilde
+			'Ẫ' => 'A', 'ẫ' => 'a',
+			'Ẵ' => 'A', 'ẵ' => 'a',
+			'Ẽ' => 'E', 'ẽ' => 'e',
+			'Ễ' => 'E', 'ễ' => 'e',
+			'Ỗ' => 'O', 'ỗ' => 'o',
+			'Ỡ' => 'O', 'ỡ' => 'o',
+			'Ữ' => 'U', 'ữ' => 'u',
+			'Ỹ' => 'Y', 'ỹ' => 'y',
+			// acute accent
+			'Ấ' => 'A', 'ấ' => 'a',
+			'Ắ' => 'A', 'ắ' => 'a',
+			'Ế' => 'E', 'ế' => 'e',
+			'Ố' => 'O', 'ố' => 'o',
+			'Ớ' => 'O', 'ớ' => 'o',
+			'Ứ' => 'U', 'ứ' => 'u',
+			// dot below
+			'Ạ' => 'A', 'ạ' => 'a',
+			'Ậ' => 'A', 'ậ' => 'a',
+			'Ặ' => 'A', 'ặ' => 'a',
+			'Ẹ' => 'E', 'ẹ' => 'e',
+			'Ệ' => 'E', 'ệ' => 'e',
+			'Ị' => 'I', 'ị' => 'i',
+			'Ọ' => 'O', 'ọ' => 'o',
+			'Ộ' => 'O', 'ộ' => 'o',
+			'Ợ' => 'O', 'ợ' => 'o',
+			'Ụ' => 'U', 'ụ' => 'u',
+			'Ự' => 'U', 'ự' => 'u',
+			'Ỵ' => 'Y', 'ỵ' => 'y',
+			// Vowels with diacritic (Chinese, Hanyu Pinyin)
+			'ɑ' => 'a',
+			// macron
+			'Ǖ' => 'U', 'ǖ' => 'u',
+			// acute accent
+			'Ǘ' => 'U', 'ǘ' => 'u',
+			// caron
+			'Ǎ' => 'A', 'ǎ' => 'a',
+			'Ǐ' => 'I', 'ǐ' => 'i',
+			'Ǒ' => 'O', 'ǒ' => 'o',
+			'Ǔ' => 'U', 'ǔ' => 'u',
+			'Ǚ' => 'U', 'ǚ' => 'u',
+			// grave accent
+			'Ǜ' => 'U', 'ǜ' => 'u',
+		);
+
+		$string = strtr($string, $chars);
+
+		return $string;
+	}
+}

bridges/BadDragonBridge.php

@@ -0,0 +1,435 @@
+<?php
+class BadDragonBridge extends BridgeAbstract {
+	const NAME = 'Bad Dragon Bridge';
+	const URI = 'https://bad-dragon.com/';
+	const CACHE_TIMEOUT = 300; // 5min
+	const DESCRIPTION = 'Returns sales or new clearance items';
+	const MAINTAINER = 'Roliga';
+	const PARAMETERS = array(
+		'Sales' => array(
+		),
+		'Clearance' => array(
+			'ready_made' => array(
+				'name' => 'Ready Made',
+				'type' => 'checkbox'
+			),
+			'flop' => array(
+				'name' => 'Flops',
+				'type' => 'checkbox'
+			),
+			'skus' => array(
+				'name' => 'Products',
+				'exampleValue' => 'chanceflared, crackers',
+				'title' => 'Comma separated list of product SKUs'
+			),
+			'onesize' => array(
+				'name' => 'One-Size',
+				'type' => 'checkbox'
+			),
+			'mini' => array(
+				'name' => 'Mini',
+				'type' => 'checkbox'
+			),
+			'small' => array(
+				'name' => 'Small',
+				'type' => 'checkbox'
+			),
+			'medium' => array(
+				'name' => 'Medium',
+				'type' => 'checkbox'
+			),
+			'large' => array(
+				'name' => 'Large',
+				'type' => 'checkbox'
+			),
+			'extralarge' => array(
+				'name' => 'Extra Large',
+				'type' => 'checkbox'
+			),
+			'category' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All' => 'all',
+					'Accessories' => 'accessories',
+					'Merchandise' => 'merchandise',
+					'Dildos' => 'insertable',
+					'Masturbators' => 'penetrable',
+					'Packers' => 'packer',
+					'Lil\' Squirts' => 'shooter',
+					'Lil\' Vibes' => 'vibrator',
+					'Wearables' => 'wearable'
+				),
+				'defaultValue' => 'all',
+			),
+			'soft' => array(
+				'name' => 'Soft Firmness',
+				'type' => 'checkbox'
+			),
+			'med_firm' => array(
+				'name' => 'Medium Firmness',
+				'type' => 'checkbox'
+			),
+			'firm' => array(
+				'name' => 'Firm',
+				'type' => 'checkbox'
+			),
+			'split' => array(
+				'name' => 'Split Firmness',
+				'type' => 'checkbox'
+			),
+			'maxprice' => array(
+				'name' => 'Max Price',
+				'type' => 'number',
+				'required' => true,
+				'defaultValue' => 300
+			),
+			'minprice' => array(
+				'name' => 'Min Price',
+				'type' => 'number',
+				'defaultValue' => 0
+			),
+			'cumtube' => array(
+				'name' => 'Cumtube',
+				'type' => 'checkbox'
+			),
+			'suctionCup' => array(
+				'name' => 'Suction Cup',
+				'type' => 'checkbox'
+			),
+			'noAccessories' => array(
+				'name' => 'No Accessories',
+				'type' => 'checkbox'
+			)
+		)
+	);
+
+	/*
+	 * This sets index $strFrom (or $strTo if set) in $outArr to 'on' if
+	 * $inArr[$param] contains $strFrom.
+	 * It is used for translating BD's shop filter URLs into something we can use.
+	 *
+	 * For the query '?type[]=ready_made&type[]=flop' we would have an array like:
+	 * Array (
+	 *     [type] => Array (
+	 *             [0] => ready_made
+	 *             [1] => flop
+	 *         )
+	 * )
+	 * which could be translated into:
+	 * Array (
+	 *     [ready_made] => on
+	 *     [flop] => on
+	 * )
+	 * */
+	private function setParam($inArr, &$outArr, $param, $strFrom, $strTo = null) {
+		if(isset($inArr[$param]) && in_array($strFrom, $inArr[$param])) {
+			$outArr[($strTo ?: $strFrom)] = 'on';
+		}
+	}
+
+	public function detectParameters($url) {
+		$params = array();
+
+		// Sale
+		$regex = '/^(https?:\/\/)?bad-dragon\.com\/sales/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			return $params;
+		}
+
+		// Clearance
+		$regex = '/^(https?:\/\/)?bad-dragon\.com\/shop\/clearance/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			parse_str(parse_url($url, PHP_URL_QUERY), $urlParams);
+
+			$this->setParam($urlParams, $params, 'type', 'ready_made');
+			$this->setParam($urlParams, $params, 'type', 'flop');
+
+			if(isset($urlParams['skus'])) {
+				$skus = array();
+				foreach($urlParams['skus'] as $sku) {
+					is_string($sku) && $skus[] = $sku;
+					is_array($sku) && $skus[] = $sku[0];
+				}
+				$params['skus'] = implode(',', $skus);
+			}
+
+			$this->setParam($urlParams, $params, 'sizes', 'onesize');
+			$this->setParam($urlParams, $params, 'sizes', 'mini');
+			$this->setParam($urlParams, $params, 'sizes', 'small');
+			$this->setParam($urlParams, $params, 'sizes', 'medium');
+			$this->setParam($urlParams, $params, 'sizes', 'large');
+			$this->setParam($urlParams, $params, 'sizes', 'extralarge');
+
+			if(isset($urlParams['category'])) {
+				$params['category'] = strtolower($urlParams['category']);
+			} else{
+				$params['category'] = 'all';
+			}
+
+			$this->setParam($urlParams, $params, 'firmnessValues', 'soft');
+			$this->setParam($urlParams, $params, 'firmnessValues', 'medium', 'med_firm');
+			$this->setParam($urlParams, $params, 'firmnessValues', 'firm');
+			$this->setParam($urlParams, $params, 'firmnessValues', 'split');
+
+			if(isset($urlParams['price'])) {
+				isset($urlParams['price']['max'])
+					&& $params['maxprice'] = $urlParams['price']['max'];
+				isset($urlParams['price']['min'])
+					&& $params['minprice'] = $urlParams['price']['min'];
+			}
+
+			isset($urlParams['cumtube'])
+				&& $urlParams['cumtube'] === '1'
+				&& $params['cumtube'] = 'on';
+			isset($urlParams['suctionCup'])
+				&& $urlParams['suctionCup'] === '1'
+				&& $params['suctionCup'] = 'on';
+			isset($urlParams['noAccessories'])
+				&& $urlParams['noAccessories'] === '1'
+				&& $params['noAccessories'] = 'on';
+
+			return $params;
+		}
+
+		return null;
+	}
+
+	public function getName() {
+		switch($this->queriedContext) {
+		case 'Sales':
+			return 'Bad Dragon Sales';
+		case 'Clearance':
+			return 'Bad Dragon Clearance Search';
+		default:
+			return parent::getName();
+		}
+	}
+
+	public function getURI() {
+		switch($this->queriedContext) {
+		case 'Sales':
+			return self::URI . 'sales';
+		case 'Clearance':
+			return $this->inputToURL();
+		default:
+			return parent::getURI();
+		}
+	}
+
+	public function collectData() {
+		switch($this->queriedContext) {
+		case 'Sales':
+			$sales = json_decode(getContents(self::URI . 'api/sales'))
+				or returnServerError('Failed to query BD API');
+
+			foreach($sales as $sale) {
+				$item = array();
+
+				$item['title'] = $sale->title;
+				$item['timestamp'] = strtotime($sale->startDate);
+
+				$item['uri'] = $this->getURI() . '/' . $sale->slug;
+
+				$contentHTML = '<p><img src="' . $sale->image->url . '"></p>';
+				if(isset($sale->endDate)) {
+					$contentHTML .= '<p><b>This promotion ends on '
+						. gmdate('M j, Y \a\t g:i A T', strtotime($sale->endDate))
+						. '</b></p>';
+				} else {
+					$contentHTML .= '<p><b>This promotion never ends</b></p>';
+				}
+				$ul = false;
+				$content = json_decode($sale->content);
+				foreach($content->blocks as $block) {
+					switch($block->type) {
+					case 'header-one':
+						$contentHTML .= '<h1>' . $block->text . '</h1>';
+						break;
+					case 'header-two':
+						$contentHTML .= '<h2>' . $block->text . '</h2>';
+						break;
+					case 'header-three':
+						$contentHTML .= '<h3>' . $block->text . '</h3>';
+						break;
+					case 'unordered-list-item':
+						if(!$ul) {
+							$contentHTML .= '<ul>';
+							$ul = true;
+						}
+						$contentHTML .= '<li>' . $block->text . '</li>';
+						break;
+					default:
+						if($ul) {
+							$contentHTML .= '</ul>';
+							$ul = false;
+						}
+						$contentHTML .= '<p>' . $block->text . '</p>';
+						break;
+					}
+				}
+				$item['content'] = $contentHTML;
+
+				$this->items[] = $item;
+			}
+			break;
+		case 'Clearance':
+			$toyData = json_decode(getContents($this->inputToURL(true)))
+				or returnServerError('Failed to query BD API');
+
+			$productList = json_decode(getContents(self::URI
+				. 'api/inventory-toy/product-list'))
+				or returnServerError('Failed to query BD API');
+
+			foreach($toyData->toys as $toy) {
+				$item = array();
+
+				$item['uri'] = $this->getURI()
+					. '#'
+					. $toy->id;
+				$item['timestamp'] = strtotime($toy->created);
+
+				foreach($productList as $product) {
+					if($product->sku == $toy->sku) {
+						$item['title'] = $product->name;
+						break;
+					}
+				}
+
+				// images
+				$content = '<p>';
+				foreach($toy->images as $image) {
+					$content .= '<a href="'
+						. $image->fullFilename
+						. '"><img src="'
+						. $image->thumbFilename
+						. '" /></a>';
+				}
+				// price
+				$content .= '</p><p><b>Price:</b> $'
+					. $toy->price
+				// size
+					. '<br /><b>Size:</b> '
+					. $toy->size
+				// color
+					. '<br /><b>Color:</b> '
+					. $toy->color
+				// features
+					. '<br /><b>Features:</b> '
+					. ($toy->suction_cup ? 'Suction cup' : '')
+					. ($toy->suction_cup && $toy->cumtube ? ', ' : '')
+					. ($toy->cumtube ? 'Cumtube' : '')
+					. ($toy->suction_cup || $toy->cumtube ? '' : 'None');
+				// firmness
+				$firmnessTexts = array(
+					'2' => 'Extra soft',
+					'3' => 'Soft',
+					'5' => 'Medium',
+					'8' => 'Firm'
+				);
+				$firmnesses = explode('/', $toy->firmness);
+				if(count($firmnesses) === 2) {
+					$content .= '<br /><b>Firmness:</b> '
+						. $firmnessTexts[$firmnesses[0]]
+						. ', '
+						. $firmnessTexts[$firmnesses[1]];
+				} else{
+					$content .= '<br /><b>Firmness:</b> '
+						. $firmnessTexts[$firmnesses[0]];
+				}
+				// flop
+				if($toy->type === 'flop') {
+					$content .= '<br /><b>Flop reason:</b> '
+						. $toy->flop_reason;
+				}
+				$content .= '</p>';
+				$item['content'] = $content;
+
+				$enclosures = array();
+				foreach($toy->images as $image) {
+					$enclosures[] = $image->fullFilename;
+				}
+				$item['enclosures'] = $enclosures;
+
+				$categories = array();
+				$categories[] = $toy->sku;
+				$categories[] = $toy->type;
+				$categories[] = $toy->size;
+				if($toy->cumtube) {
+					$categories[] = 'cumtube';
+				}
+				if($toy->suction_cup) {
+					$categories[] = 'suction_cup';
+				}
+				$item['categories'] = $categories;
+
+				$this->items[] = $item;
+			}
+			break;
+		}
+	}
+
+	private function inputToURL($api = false) {
+		$url = self::URI;
+		$url .= ($api ? 'api/inventory-toys?' : 'shop/clearance?');
+
+		// Default parameters
+		$url .= 'limit=60';
+		$url .= '&page=1';
+		$url .= '&sort[field]=created';
+		$url .= '&sort[direction]=desc';
+
+		// Product types
+		$url .= ($this->getInput('ready_made') ? '&type[]=ready_made' : '');
+		$url .= ($this->getInput('flop') ? '&type[]=flop' : '');
+
+		// Product names
+		foreach(array_filter(explode(',', $this->getInput('skus'))) as $sku) {
+			$url .= '&skus[]=' . urlencode(trim($sku));
+		}
+
+		// Size
+		$url .= ($this->getInput('onesize') ? '&sizes[]=onesize' : '');
+		$url .= ($this->getInput('mini') ? '&sizes[]=mini' : '');
+		$url .= ($this->getInput('small') ? '&sizes[]=small' : '');
+		$url .= ($this->getInput('medium') ? '&sizes[]=medium' : '');
+		$url .= ($this->getInput('large') ? '&sizes[]=large' : '');
+		$url .= ($this->getInput('extralarge') ? '&sizes[]=extralarge' : '');
+
+		// Category
+		$url .= ($this->getInput('category') ? '&category='
+			. urlencode($this->getInput('category')) : '');
+
+		// Firmness
+		if($api) {
+			$url .= ($this->getInput('soft') ? '&firmnessValues[]=3' : '');
+			$url .= ($this->getInput('med_firm') ? '&firmnessValues[]=5' : '');
+			$url .= ($this->getInput('firm') ? '&firmnessValues[]=8' : '');
+			if($this->getInput('split')) {
+				$url .= '&firmnessValues[]=3/5';
+				$url .= '&firmnessValues[]=3/8';
+				$url .= '&firmnessValues[]=8/3';
+				$url .= '&firmnessValues[]=5/8';
+				$url .= '&firmnessValues[]=8/5';
+			}
+		} else{
+			$url .= ($this->getInput('soft') ? '&firmnessValues[]=soft' : '');
+			$url .= ($this->getInput('med_firm') ? '&firmnessValues[]=medium' : '');
+			$url .= ($this->getInput('firm') ? '&firmnessValues[]=firm' : '');
+			$url .= ($this->getInput('split') ? '&firmnessValues[]=split' : '');
+		}
+
+		// Price
+		$url .= ($this->getInput('maxprice') ? '&price[max]='
+			. $this->getInput('maxprice') : '&price[max]=300');
+		$url .= ($this->getInput('minprice') ? '&price[min]='
+			. $this->getInput('minprice') : '&price[min]=0');
+
+		// Features
+		$url .= ($this->getInput('cumtube') ? '&cumtube=1' : '');
+		$url .= ($this->getInput('suctionCup') ? '&suctionCup=1' : '');
+		$url .= ($this->getInput('noAccessories') ? '&noAccessories=1' : '');
+
+		return $url;
+	}
+}

bridges/BakaUpdatesMangaReleasesBridge.php

@@ -0,0 +1,103 @@
+<?php
+class BakaUpdatesMangaReleasesBridge extends BridgeAbstract {
+	const NAME = 'Baka Updates Manga Releases';
+	const URI = 'https://www.mangaupdates.com/';
+	const DESCRIPTION = 'Get the latest series releases';
+	const MAINTAINER = 'fulmeek';
+	const PARAMETERS = array(array(
+		'series_id' => array(
+			'name'		=> 'Series ID',
+			'type'		=> 'number',
+			'required'	=> true,
+			'exampleValue'	=> '12345'
+		)
+	));
+	const LIMIT_COLS = 5;
+	const LIMIT_ITEMS = 10;
+
+	private $feedName = '';
+
+	public function collectData() {
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Series not found');
+
+		// content is an unstructured pile of divs, ugly to parse
+		$cols = $html->find('div#main_content div.row > div.text');
+		if (!$cols)
+			returnServerError('No releases');
+
+		$rows = array_slice(
+			array_chunk($cols, self::LIMIT_COLS), 0, self::LIMIT_ITEMS
+		);
+
+		if (isset($rows[0][1])) {
+			$this->feedName = $this->filterHTML($rows[0][1]->plaintext);
+		}
+
+		foreach($rows as $cols) {
+			if (count($cols) < self::LIMIT_COLS) continue;
+
+			$item = array();
+			$title = array();
+
+			$item['content'] = '';
+
+			$objDate = $cols[0];
+			if ($objDate)
+				$item['timestamp'] = strtotime($objDate->plaintext);
+
+			$objTitle = $cols[1];
+			if ($objTitle) {
+				$title[] = $this->filterHTML($objTitle->plaintext);
+				$item['content'] .= '<p>Series: ' . $this->filterText($objTitle->innertext) . '</p>';
+			}
+
+			$objVolume = $cols[2];
+			if ($objVolume && !empty($objVolume->plaintext))
+				$title[] = 'Vol.' . $objVolume->plaintext;
+
+			$objChapter = $cols[3];
+			if ($objChapter && !empty($objChapter->plaintext))
+				$title[] = 'Chp.' . $objChapter->plaintext;
+
+			$objAuthor = $cols[4];
+			if ($objAuthor && !empty($objAuthor->plaintext)) {
+				$item['author'] = $this->filterHTML($objAuthor->plaintext);
+				$item['content'] .= '<p>Groups: ' . $this->filterText($objAuthor->innertext) . '</p>';
+			}
+
+			$item['title'] = implode(' ', $title);
+			$item['uri'] = $this->getURI();
+			$item['uid'] = $this->getSanitizedHash($item['title']);
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI(){
+		$series_id = $this->getInput('series_id');
+		if (!empty($series_id)) {
+			return self::URI . 'releases.html?search=' . $series_id . '&stype=series';
+		}
+		return self::URI;
+	}
+
+	public function getName(){
+		if(!empty($this->feedName)) {
+			return $this->feedName . ' - ' . self::NAME;
+		}
+		return parent::getName();
+	}
+
+	private function getSanitizedHash($string) {
+		return hash('sha1', preg_replace('/[^a-zA-Z0-9\-\.]/', '', ucwords(strtolower($string))));
+	}
+
+	private function filterText($text) {
+		return rtrim($text, '* ');
+	}
+
+	private function filterHTML($text) {
+		return $this->filterText(html_entity_decode($text));
+	}
+}

bridges/BandcampBridge.php

@@ -1,43 +1,363 @@
 <?php
-class BandcampBridge extends BridgeAbstract{
+class BandcampBridge extends BridgeAbstract {
 
-    const MAINTAINER = "sebsauvage";
-    const NAME = "Bandcamp Tag";
-    const URI = "http://bandcamp.com/";
+	const MAINTAINER = 'sebsauvage, Roliga';
+	const NAME = 'Bandcamp Bridge';
+	const URI = 'https://bandcamp.com/';
 	const CACHE_TIMEOUT = 600; // 10min
-    const DESCRIPTION = "New bandcamp release by tag";
-    const PARAMETERS = array( array(
-        'tag'=>array(
-            'name'=>'tag',
-            'type'=>'text',
-            'required'=>true
+	const DESCRIPTION = 'New bandcamp releases by tag, band or album';
+	const PARAMETERS = array(
+		'By tag' => array(
+			'tag' => array(
+				'name' => 'tag',
+				'type' => 'text',
+				'required' => true
 			)
-    ));
+		),
+		'By band' => array(
+			'band' => array(
+				'name' => 'band',
+				'type' => 'text',
+				'title' => 'Band name as seen in the band page URL',
+				'required' => true
+			),
+			'type' => array(
+				'name' => 'Articles are',
+				'type' => 'list',
+				'values' => array(
+					'Releases' => 'releases',
+					'Releases, new one when track list changes' => 'changes',
+					'Individual tracks' => 'tracks'
+				),
+				'defaultValue' => 'changes'
+			),
+			'limit' => array(
+				'name' => 'limit',
+				'type' => 'number',
+				'title' => 'Number of releases to return',
+				'defaultValue' => 5
+			)
+		),
+		'By album' => array(
+			'band' => array(
+				'name' => 'band',
+				'type' => 'text',
+				'title' => 'Band name as seen in the album page URL',
+				'required' => true
+			),
+			'album' => array(
+				'name' => 'album',
+				'type' => 'text',
+				'title' => 'Album name as seen in the album page URL',
+				'required' => true
+			),
+			'type' => array(
+				'name' => 'Articles are',
+				'type' => 'list',
+				'values' => array(
+					'Releases' => 'releases',
+					'Releases, new one when track list changes' => 'changes',
+					'Individual tracks' => 'tracks'
+				),
+				'defaultValue' => 'tracks'
+			)
+		)
+	);
+	const IMGURI = 'https://f4.bcbits.com/';
+	const IMGSIZE_300PX = 23;
+	const IMGSIZE_700PX = 16;
+
+	private $feedName;
+
+	public function getIcon() {
+		return 'https://s4.bcbits.com/img/bc_favicon.ico';
+	}
 
 	public function collectData(){
-        $html = getSimpleHTMLDOM($this->getURI())
-            or returnServerError('No results for this query.');
+		switch($this->queriedContext) {
+		case 'By tag':
+			$url = self::URI . 'api/hub/1/dig_deeper';
+			$data = $this->buildRequestJson();
+			$header = array(
+				'Content-Type: application/json',
+				'Content-Length: ' . strlen($data)
+			);
+			$opts = array(
+				CURLOPT_CUSTOMREQUEST => 'POST',
+				CURLOPT_POSTFIELDS => $data
+			);
+			$content = getContents($url, $header, $opts)
+				or returnServerError('Could not complete request to: ' . $url);
 
-        foreach($html->find('li.item') as $release) {
-            $script = $release->find('div.art', 0)->getAttribute('onclick');
-            $uri = ltrim($script, "return 'url(");
-            $uri = rtrim($uri, "')");
+			$json = json_decode($content);
 
-            $item = array();
-            $item['author'] = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext;
-            $item['title'] = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext;
-            $item['content'] = '<img src="' . $uri . '"/><br/>' . $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext;
-            $item['id'] = $release->find('a',0)->getAttribute('href');
-            $item['uri'] = $release->find('a',0)->getAttribute('href');
+			if ($json->ok !== true) {
+				returnServerError('Invalid response');
+			}
+
+			foreach ($json->items as $entry) {
+				$url = $entry->tralbum_url;
+				$artist = $entry->artist;
+				$title = $entry->title;
+				// e.g. record label is the releaser, but not the artist
+				$releaser = $entry->band_name !== $entry->artist ? $entry->band_name : null;
+
+				$full_title = $artist . ' - ' . $title;
+				$full_artist = $artist;
+				if (isset($releaser)) {
+					$full_title .= ' (' . $releaser . ')';
+					$full_artist .= ' (' . $releaser . ')';
+				}
+				$small_img = $this->getImageUrl($entry->art_id, self::IMGSIZE_300PX);
+				$img = $this->getImageUrl($entry->art_id, self::IMGSIZE_700PX);
+
+				$item = array(
+					'uri' => $url,
+					'author' => $full_artist,
+					'title' => $full_title
+				);
+				$item['content'] = "<img src='$small_img' /><br/>$full_title";
+				$item['enclosures'] = array($img);
 				$this->items[] = $item;
 			}
+			break;
+		case 'By band':
+		case 'By album':
+			$html = getSimpleHTMLDOMCached($this->getURI(), 86400);
+
+			$titleElement = $html->find('head meta[name=title]', 0)
+				or returnServerError('Unable to find title on: ' . $this->getURI());
+			$this->feedName = $titleElement->content;
+
+			$regex = '/band_id=(\d+)/';
+			if(preg_match($regex, $html, $matches) == false)
+				returnServerError('Unable to find band ID on: ' . $this->getURI());
+			$band_id = $matches[1];
+
+			$tralbums = array();
+			switch($this->queriedContext) {
+			case 'By band':
+				$query_data = array(
+					'band_id' => $band_id
+				);
+				$band_data = $this->apiGet('mobile/22/band_details', $query_data);
+
+				$num_albums = min(count($band_data->discography), $this->getInput('limit'));
+				for($i = 0; $i < $num_albums; $i++) {
+					$album_basic_data = $band_data->discography[$i];
+
+					// 'a' or 't' for albums and individual tracks respectively
+					$tralbum_type = substr($album_basic_data->item_type, 0, 1);
+
+					$query_data = array(
+						'band_id' => $band_id,
+						'tralbum_type' => $tralbum_type,
+						'tralbum_id' => $album_basic_data->item_id
+					);
+					$tralbums[] = $this->apiGet('mobile/22/tralbum_details', $query_data);
+				}
+				break;
+			case 'By album':
+				$regex = '/album=(\d+)/';
+				if(preg_match($regex, $html, $matches) == false)
+					returnServerError('Unable to find album ID on: ' . $this->getURI());
+				$album_id = $matches[1];
+
+				$query_data = array(
+					'band_id' => $band_id,
+					'tralbum_type' => 'a',
+					'tralbum_id' => $album_id
+				);
+				$tralbums[] = $this->apiGet('mobile/22/tralbum_details', $query_data);
+
+				break;
+			}
+
+			foreach ($tralbums as $tralbum_data) {
+				if ($tralbum_data->type === 'a' && $this->getInput('type') === 'tracks') {
+					foreach ($tralbum_data->tracks as $track) {
+						$query_data = array(
+							'band_id' => $band_id,
+							'tralbum_type' => 't',
+							'tralbum_id' => $track->track_id
+						);
+						$track_data = $this->apiGet('mobile/22/tralbum_details', $query_data);
+
+						$this->items[] = $this->buildTralbumItem($track_data);
+					}
+				} else {
+					$this->items[] = $this->buildTralbumItem($tralbum_data);
+				}
+			}
+			break;
+		}
+	}
+
+	private function buildTralbumItem($tralbum_data){
+		$band_data = $tralbum_data->band;
+
+		// Format title like: ARTIST - ALBUM/TRACK (OPTIONAL RELEASER)
+		// Format artist/author like: ARTIST (OPTIONAL RELEASER)
+		//
+		// If the album/track is released under a label/a band other than the artist
+		// themselves, append that releaser name to the title and artist/author.
+		//
+		// This sadly doesn't always work right for individual tracks as the artist
+		// of the track is always set to the releaser.
+		$artist = $tralbum_data->tralbum_artist;
+		$full_title = $artist . ' - ' . $tralbum_data->title;
+		$full_artist = $artist;
+		if (isset($tralbum_data->label)) {
+			$full_title .= ' (' . $tralbum_data->label . ')';
+			$full_artist .= ' (' . $tralbum_data->label . ')';
+		} elseif ($band_data->name !== $artist) {
+			$full_title .= ' (' . $band_data->name . ')';
+			$full_artist .= ' (' . $band_data->name . ')';
+		}
+
+		$small_img = $this->getImageUrl($tralbum_data->art_id, self::IMGSIZE_300PX);
+		$img = $this->getImageUrl($tralbum_data->art_id, self::IMGSIZE_700PX);
+
+		$item = array(
+			'uri' => $tralbum_data->bandcamp_url,
+			'author' => $full_artist,
+			'title' => $full_title,
+			'enclosures' => array($img),
+			'timestamp' => $tralbum_data->release_date
+		);
+
+		$item['categories'] = array();
+		foreach ($tralbum_data->tags as $tag) {
+			$item['categories'][] = $tag->norm_name;
+		}
+
+		// Give articles a unique UID depending on its track list
+		// Releases should then show up as new articles when tracks are added
+		if ($this->getInput('type') === 'changes') {
+			$item['uid'] = "bandcamp/$band_data->band_id/$tralbum_data->id/";
+			foreach ($tralbum_data->tracks as $track) {
+				$item['uid'] .= $track->track_id;
+			}
+		}
+
+		$item['content'] = "<img src='$small_img' /><br/>$full_title<br/>";
+		if ($tralbum_data->type === 'a') {
+			$item['content'] .= '<ol>';
+			foreach ($tralbum_data->tracks as $track) {
+				$item['content'] .= "<li>$track->title</li>";
+			}
+			$item['content'] .= '</ol>';
+		}
+		if (!empty($tralbum_data->about)) {
+			$item['content'] .= '<p>'
+				. nl2br($tralbum_data->about)
+				. '</p>';
+		}
+
+		return $item;
+	}
+
+	private function buildRequestJson(){
+		$requestJson = array(
+			'tag' => $this->getInput('tag'),
+			'page' => 1,
+			'sort' => 'date'
+		);
+		return json_encode($requestJson);
+	}
+
+	private function getImageUrl($id, $size){
+		return self::IMGURI . 'img/a' . $id . '_' . $size . '.jpg';
+	}
+
+	private function apiGet($endpoint, $query_data) {
+		$url = self::URI . 'api/' . $endpoint . '?' . http_build_query($query_data);
+		$data = json_decode(getContents($url))
+			or returnServerError('API request to "' . $url . '" failed.');
+		return $data;
 	}
 
 	public function getURI(){
-        return self::URI.'tag/'.urlencode($this->getInput('tag')).'?sort_field=date';
+		switch($this->queriedContext) {
+		case 'By tag':
+			if(!is_null($this->getInput('tag'))) {
+				return self::URI
+				. 'tag/'
+				. urlencode($this->getInput('tag'))
+				. '?sort_field=date';
+			}
+			break;
+		case 'By band':
+			if(!is_null($this->getInput('band'))) {
+				return 'https://'
+					. $this->getInput('band')
+					. '.bandcamp.com/music';
+			}
+			break;
+		case 'By album':
+			if(!is_null($this->getInput('band')) && !is_null($this->getInput('album'))) {
+				return 'https://'
+					. $this->getInput('band')
+					. '.bandcamp.com/album/'
+					. $this->getInput('album');
+			}
+			break;
+		}
+
+		return parent::getURI();
 	}
 
 	public function getName(){
-        return $this->getInput('tag') .' - '.'Bandcamp Tag';
+		switch($this->queriedContext) {
+		case 'By tag':
+			if(!is_null($this->getInput('tag'))) {
+				return $this->getInput('tag') . ' - Bandcamp Tag';
+			}
+			break;
+		case 'By band':
+			if(isset($this->feedName)) {
+				return $this->feedName . ' - Bandcamp Band';
+			} elseif(!is_null($this->getInput('band'))) {
+				return $this->getInput('band') . ' - Bandcamp Band';
+			}
+			break;
+		case 'By album':
+			if(isset($this->feedName)) {
+				return $this->feedName . ' - Bandcamp Album';
+			} elseif(!is_null($this->getInput('album'))) {
+				return $this->getInput('album') . ' - Bandcamp Album';
+			}
+			break;
+		}
+
+		return parent::getName();
+	}
+
+	public function detectParameters($url) {
+		$params = array();
+
+		// By tag
+		$regex = '/^(https?:\/\/)?bandcamp\.com\/tag\/([^\/.&?\n]+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['tag'] = urldecode($matches[2]);
+			return $params;
+		}
+
+		// By band
+		$regex = '/^(https?:\/\/)?([^\/.&?\n]+?)\.bandcamp\.com/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['band'] = urldecode($matches[2]);
+			return $params;
+		}
+
+		// By album
+		$regex = '/^(https?:\/\/)?([^\/.&?\n]+?)\.bandcamp\.com\/album\/([^\/.&?\n]+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['band'] = urldecode($matches[2]);
+			$params['album'] = urldecode($matches[3]);
+			return $params;
+		}
+
+		return null;
 	}
 }

bridges/BastaBridge.php

@@ -1,19 +1,16 @@
 <?php
-class BastaBridge extends BridgeAbstract{
-	const MAINTAINER = "qwertygc";
-	const NAME = "Bastamag Bridge";
-	const URI = "http://www.bastamag.net/";
+class BastaBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'qwertygc';
+	const NAME = 'Bastamag Bridge';
+	const URI = 'https://www.bastamag.net/';
 	const CACHE_TIMEOUT = 7200; // 2h
-	const DESCRIPTION = "Returns the newest articles.";
+	const DESCRIPTION = 'Returns the newest articles.';
 
 	public function collectData(){
-		// Replaces all relative image URLs by absolute URLs. Relative URLs always start with 'local/'!
-		function ReplaceImageUrl($content){
-			return preg_replace('/src=["\']{1}([^"\']+)/ims', 'src=\''.self::URI.'$1\'', $content);
-		}
-
-        $html = getSimpleHTMLDOM(self::URI.'spip.php?page=backend')
+		$html = getSimpleHTMLDOM(self::URI . 'spip.php?page=backend')
 			or returnServerError('Could not request Bastamag.');
+
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
@@ -22,11 +19,16 @@ class BastaBridge extends BridgeAbstract{
 				$item['title'] = $element->find('title', 0)->innertext;
 				$item['uri'] = $element->find('guid', 0)->plaintext;
 				$item['timestamp'] = strtotime($element->find('dc:date', 0)->plaintext);
-				$item['content'] = ReplaceImageUrl(getSimpleHTMLDOM($item['uri'])->find('div.texte', 0)->innertext);
+				// Replaces all relative image URLs by absolute URLs.
+				// Relative URLs always start with 'local/'!
+				$item['content'] = preg_replace(
+					'/src=["\']{1}([^"\']+)/ims',
+					'src=\'' . self::URI . '$1\'',
+					getSimpleHTMLDOM($item['uri'])->find('div.texte', 0)->innertext
+				);
 				$this->items[] = $item;
 				$limit++;
 			}
 		}
 	}
 }
-?>

bridges/BinanceBridge.php

@@ -0,0 +1,103 @@
+<?php
+class BinanceBridge extends BridgeAbstract {
+	const NAME = 'Binance';
+	const URI = 'https://www.binance.com';
+	const DESCRIPTION = 'Subscribe to the Binance blog or the Binance Zendesk announcements.';
+	const MAINTAINER = 'thefranke';
+	const CACHE_TIMEOUT = 3600; // 1h
+
+	const PARAMETERS = array( array(
+		'category' => array(
+			'name' => 'category',
+			'type' => 'list',
+			'exampleValue' => 'Blog',
+			'title' => 'Select a category',
+			'values' => array(
+				'Blog' => 'Blog',
+				'Announcements' => 'Announcements'
+			)
+		)
+	));
+
+	public function getIcon() {
+		return 'https://bin.bnbstatic.com/static/images/common/favicon.ico';
+	}
+
+	public function getName() {
+		return self::NAME . ' ' . $this->getInput('category');
+	}
+
+	public function getURI() {
+		if ($this->getInput('category') == 'Blog')
+			return self::URI . '/en/blog';
+		else
+			return 'https://binance.zendesk.com/hc/en-us/categories/115000056351-Announcements';
+	}
+
+	protected function collectBlogData() {
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not fetch Binance blog data.');
+
+		foreach($html->find('div[direction="row"]') as $element) {
+
+			$date = $element->find('div[direction="column"]', 0);
+			$day = $date->find('div', 0)->innertext;
+			$month = $date->find('div', 1)->innertext;
+			$extractedDate = $day . ' ' . $month;
+
+			$abstract = $element->find('div[direction="column"]', 1);
+			$a = $abstract->find('a', 0);
+			$uri = self::URI . $a->href;
+			$title = $a->innertext;
+
+			$full = getSimpleHTMLDOMCached($uri);
+			$content = $full->find('div.desc', 1);
+
+			$item = array();
+			$item['title'] = $title;
+			$item['uri'] = $uri;
+			$item['timestamp'] = strtotime($extractedDate);
+			$item['author'] = 'Binance';
+			$item['content'] = $content;
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10)
+				break;
+		}
+	}
+
+	protected function collectAnnouncementData() {
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not fetch Zendesk announcement data.');
+
+		foreach($html->find('a.article-list-link') as $a) {
+			$title = $a->innertext;
+			$uri = 'https://binance.zendesk.com' . $a->href;
+
+			$full = getSimpleHTMLDOMCached($uri);
+			$content = $full->find('div.article-body', 0);
+			$date = $full->find('time', 0)->getAttribute('datetime');
+
+			$item = array();
+
+			$item['title'] = $title;
+			$item['uri'] = $uri;
+			$item['timestamp'] = strtotime($date);
+			$item['author'] = 'Binance';
+			$item['content'] = $content;
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10)
+				break;
+		}
+	}
+
+	public function collectData() {
+		if ($this->getInput('category') == 'Blog')
+			$this->collectBlogData();
+		else
+			$this->collectAnnouncementData();
+	}
+}

bridges/BingSearchBridge.php

@@ -0,0 +1,119 @@
+<?php
+
+class BingSearchBridge extends BridgeAbstract
+{
+	const NAME = 'Bing search';
+	const URI = 'https://www.bing.com/';
+	const DESCRIPTION = 'Return images from bing search discover';
+	const MAINTAINER = 'DnAp';
+	const PARAMETERS = array(
+		'Image Discover' => array(
+			'category' => array(
+				'name' => 'Categories',
+				'type' => 'list',
+				'values' => self::IMAGE_DISCOVER_CATEGORIES
+			),
+			'image_size' => array(
+				'name' => 'Image size',
+				'type' => 'list',
+				'values' => array(
+					'Small' => 'turl',
+					'Full size' => 'imgurl'
+				)
+			)
+		)
+	);
+
+	const IMAGE_DISCOVER_CATEGORIES = array(
+		'Abstract' => 'abstract',
+		'Animals' => 'animals',
+		'Anime' => 'anime',
+		'Architecture' => 'architecture',
+		'Arts and Crafts' => 'arts-and-crafts',
+		'Beauty' => 'beauty',
+		'Cars and Motorcycles' => 'cars-and-motorcycles',
+		'Cats' => 'cats',
+		'Celebrities' => 'celebrities',
+		'Comics' => 'comics',
+		'DIY' => 'diy',
+		'Dogs' => 'dogs',
+		'Fitness' => 'fitness',
+		'Food and Drink' => 'food-and-drink',
+		'Funny' => 'funny',
+		'Gadgets' => 'gadgets',
+		'Gardening' => 'gardening',
+		'Geeky' => 'geeky',
+		'Hairstyles' => 'hairstyles',
+		'Home Decor' => 'home-decor',
+		'Marine Life' => 'marine-life',
+		'Men\'s Fashion' => 'men%27s-fashion',
+		'Nature' => 'nature',
+		'Outdoors' => 'outdoors',
+		'Parenting' => 'parenting',
+		'Phone Wallpapers' => 'phone-wallpapers',
+		'Photography' => 'photography',
+		'Quotes' => 'quotes',
+		'Recipes' => 'recipes',
+		'Snow' => 'snow',
+		'Tattoos' => 'tattoos',
+		'Travel' => 'travel',
+		'Video Games' => 'video-games',
+		'Weddings' => 'weddings',
+		'Women\'s Fashion' => 'women%27s-fashion',
+	);
+
+	public function getIcon()
+	{
+		return 'https://www.bing.com/sa/simg/bing_p_rr_teal_min.ico';
+	}
+
+	public function collectData()
+	{
+		$this->items = $this->imageDiscover($this->getInput('category'));
+	}
+
+	public function getName()
+	{
+		if ($this->getInput('category')) {
+			if (self::IMAGE_DISCOVER_CATEGORIES[$this->getInput('categories')] !== null) {
+				$category = self::IMAGE_DISCOVER_CATEGORIES[$this->getInput('categories')];
+			} else {
+				$category = 'Unknown';
+			}
+
+			return 'Best ' . $category . ' - Bing Image Discover';
+		}
+		return parent::getName();
+	}
+
+	private function imageDiscover($category)
+	{
+		$html = getSimpleHTMLDOM(self::URI . '/discover/' . $category)
+		or returnServerError('Could not request ' . self::NAME);
+		$sizeKey = $this->getInput('image_size');
+
+		$items = array();
+		foreach ($html->find('a.iusc') as $element) {
+			$data = json_decode(htmlspecialchars_decode($element->getAttribute('m')), true);
+
+			$item = array();
+			$item['title'] = basename(rtrim($data['imgurl'], '/'));
+			$item['uri'] = $data['imgurl'];
+			$item['content'] = '<a href="' . $data['imgurl'] . '">
+				<img src="' . $data[$sizeKey] . '" alt="' . $item['title'] . '"></a>
+				<p>Source: <a href="' . $this->curUrl($data['surl']) . '"> </a></p>';
+			$item['enclosures'] = $data['imgurl'];
+
+			$items[] = $item;
+		}
+		return $items;
+	}
+
+	private function curUrl($url)
+	{
+		if (strlen($url) <= 80) {
+			return $url;
+		}
+		return substr($url, 0, 80) . '...';
+	}
+}

bridges/BlaguesDeMerdeBridge.php

@@ -1,33 +1,46 @@
 <?php
-class BlaguesDeMerdeBridge extends BridgeAbstract{
+class BlaguesDeMerdeBridge extends BridgeAbstract {
 
-    const MAINTAINER = "superbaillot.net";
-    const NAME = "Blagues De Merde";
-    const URI = "http://www.blaguesdemerde.fr/";
+	const MAINTAINER = 'superbaillot.net, logmanoriginal';
+	const NAME = 'Blagues De Merde';
+	const URI = 'http://www.blaguesdemerde.fr/';
 	const CACHE_TIMEOUT = 7200; // 2h
-    const DESCRIPTION = "Blagues De Merde";
+	const DESCRIPTION = 'Blagues De Merde';
 
+	public function getIcon() {
+		return self::URI . 'assets/img/favicon.ico';
+	}
 
 	public function collectData(){
+
 		$html = getSimpleHTMLDOM(self::URI)
 			or returnServerError('Could not request BDM.');
 
-        foreach($html->find('article.joke_contener') as $element) {
+		foreach($html->find('div.blague') as $element) {
+
 			$item = array();
-            $temp = $element->find('a');
-            if(isset($temp[2]))
-            {
-                $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));
-                $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;
-                $item['author'] = $element->find("li.bdm_pseudo",0)->innertext;;
+
+			$item['uri'] = static::URI . '#' . $element->id;
+			$item['author'] = $element->find('div[class="blague-footer"] p strong', 0)->plaintext;
+
+			// Let the title be everything up to the first <br>
+			$item['title'] = trim(explode("\n", $element->find('div.text', 0)->plaintext)[0]);
+
+			$item['content'] = strip_tags($element->find('div.text', 0));
+
+			// timestamp is part of:
+			// <p>Par <strong>{author}</strong> le {date} dans <strong>{category}</strong></p>
+			preg_match(
+				'/.+le(.+)dans.*/',
+				$element->find('div[class="blague-footer"]', 0)->plaintext,
+				$matches
+			);
+
+			$item['timestamp'] = strtotime($matches[1]);
+
 			$this->items[] = $item;
+
 		}
-        }
+
 	}
 }
-?>

bridges/BooruprojectBridge.php

@@ -1,36 +1,45 @@
 <?php
 require_once('GelbooruBridge.php');
 
-class BooruprojectBridge extends GelbooruBridge{
-
-	const MAINTAINER = "mitsukarenai";
-	const NAME = "Booruproject";
-	const URI = "http://booru.org/";
-	const DESCRIPTION = "Returns images from given page of booruproject";
+class BooruprojectBridge extends GelbooruBridge {
 
+	const MAINTAINER = 'mitsukarenai';
+	const NAME = 'Booruproject';
+	const URI = 'http://booru.org/';
+	const DESCRIPTION = 'Returns images from given page of booruproject';
 	const PARAMETERS = array(
-      'global'=>array(
-        'p'=>array(
-          'name'=>'page',
-          'type'=>'number'
+		'global' => array(
+			'p' => array(
+				'name' => 'page',
+				'type' => 'number'
 			),
-        't'=>array('name'=>'tags')
+			't' => array(
+				'name' => 'tags'
+			)
 		),
-      'Booru subdomain (subdomain.booru.org)'=>array(
-        'i'=>array(
-        'name'=>'Subdomain',
-        'required'=>true
+		'Booru subdomain (subdomain.booru.org)' => array(
+			'i' => array(
+				'name' => 'Subdomain',
+				'required' => true
 			)
 		)
 	);
 
-    const PIDBYPAGE=20;
+	const PIDBYPAGE = 20;
 
 	public function getURI(){
-      return 'http://'.$this->getInput('i').'.booru.org/';
+		if(!is_null($this->getInput('i'))) {
+			return 'http://' . $this->getInput('i') . '.booru.org/';
+		}
+
+		return parent::getURI();
 	}
 
 	public function getName(){
+		if(!is_null($this->getInput('i'))) {
 			return static::NAME . ' ' . $this->getInput('i');
 		}
+
+		return parent::getName();
+	}
 }

bridges/BrutBridge.php

@@ -0,0 +1,157 @@
+<?php
+class BrutBridge extends BridgeAbstract {
+	const NAME = 'Brut Bridge';
+	const URI = 'https://www.brut.media';
+	const DESCRIPTION = 'Returns 5 newest videos by category and edition';
+	const MAINTAINER = 'VerifiedJoseph';
+	const PARAMETERS = array(array(
+			'category' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'News' => 'news',
+					'International' => 'international',
+					'Economy' => 'economy',
+					'Science and Technology' => 'science-and-technology',
+					'Entertainment' => 'entertainment',
+					'Sports' => 'sport',
+					'Nature' => 'nature',
+				),
+				'defaultValue' => 'news',
+			),
+			'edition' => array(
+				'name' => ' Edition',
+				'type' => 'list',
+					'values' => array(
+						'United States' => 'us',
+						'United Kingdom' => 'uk',
+						'France' => 'fr',
+						'India' => 'in',
+						'Mexico' => 'mx',
+				),
+				'defaultValue' => 'us',
+			)
+		)
+	);
+
+	const CACHE_TIMEOUT = 1800; // 30 mins
+
+	private $videoId = '';
+	private $videoType = '';
+	private $videoImage = '';
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request: ' . $this->getURI());
+
+		$results = $html->find('div.results', 0);
+
+		foreach($results->find('li.col-6.col-sm-4.col-md-3.col-lg-2.px-2.pb-4') as $index => $li) {
+			$item = array();
+
+			$videoPath = self::URI . $li->children(0)->href;
+
+			$videoPageHtml = getSimpleHTMLDOMCached($videoPath, 3600)
+				or returnServerError('Could not request: ' . $videoPath);
+
+			$this->videoImage = $videoPageHtml->find('meta[name="twitter:image"]', 0)->content;
+
+			$this->processTwitterImage();
+
+			$description = $videoPageHtml->find('div.description', 0);
+
+			$item['uri'] = $videoPath;
+			$item['title'] = $description->find('h1', 0)->plaintext;
+
+			if ($description->find('div.date', 0)->children(0)) {
+				$description->find('div.date', 0)->children(0)->outertext = '';
+			}
+
+			$item['content'] = $this->processContent(
+				$description
+			);
+
+			$item['timestamp'] = $this->processDate($description);
+			$item['enclosures'][] = $this->videoImage;
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 5) {
+				break;
+			}
+		}
+	}
+
+	public function getURI() {
+
+		if (!is_null($this->getInput('edition')) && !is_null($this->getInput('category'))) {
+			return self::URI . '/' . $this->getInput('edition') . '/' . $this->getInput('category');
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+
+		if (!is_null($this->getInput('edition')) && !is_null($this->getInput('category'))) {
+			$parameters = $this->getParameters();
+
+			$editionValues = array_flip($parameters[0]['edition']['values']);
+			$categoryValues = array_flip($parameters[0]['category']['values']);
+
+			return $categoryValues[$this->getInput('category')] . ' - ' .
+				$editionValues[$this->getInput('edition')] . ' - Brut.';
+		}
+
+		return parent::getName();
+	}
+
+	private function processDate($description) {
+
+		if ($this->getInput('edition') === 'uk') {
+			$date = DateTime::createFromFormat('d/m/Y H:i', $description->find('div.date', 0)->innertext);
+			return strtotime($date->format('Y-m-d H:i:s'));
+		}
+
+		return strtotime($description->find('div.date', 0)->innertext);
+	}
+
+	private function processContent($description) {
+
+		$content = '<video controls poster="' . $this->videoImage . '" preload="none">
+			<source src="https://content.brut.media/video/' . $this->videoId . '-' . $this->videoType . '-web.mp4"
+            type="video/mp4">
+			</video>';
+		$content .= '<p>' . $description->find('h2.mb-1', 0)->innertext . '</p>';
+
+		if ($description->find('div.text.pb-3', 0)->children(1)->class != 'date') {
+			$content .= '<p>' . $description->find('div.text.pb-3', 0)->children(1)->innertext . '</p>';
+		}
+
+		return $content;
+	}
+
+	private function processTwitterImage() {
+		/**
+		 * Extract video ID + type from twitter image
+		 *
+		 * Example (wrapped):
+		 *  https://img.brut.media/thumbnail/
+		 *  the-life-of-rita-moreno-2cce75b5-d448-44d2-a97c-ca50d6470dd4-square.jpg
+		 *  ?ts=1559337892
+		 */
+		$fpath = parse_url($this->videoImage, PHP_URL_PATH);
+		$fname = basename($fpath);
+		$fname = substr($fname, 0, strrpos($fname, '.'));
+		$parts = explode('-', $fname);
+
+		if (end($parts) === 'auto') {
+			$key = array_search('auto', $parts);
+			unset($parts[$key]);
+		}
+
+		$this->videoId = implode('-', array_splice($parts, -6, 5));
+		$this->videoType = end($parts);
+	}
+}

bridges/BundesbankBridge.php

@@ -0,0 +1,85 @@
+<?php
+class BundesbankBridge extends BridgeAbstract {
+
+	const PARAM_LANG = 'lang';
+
+	const LANG_EN = 'en';
+	const LANG_DE = 'de';
+
+	const NAME = 'Bundesbank Bridge';
+	const URI = 'https://www.bundesbank.de/';
+	const DESCRIPTION = 'Returns the latest studies of the Bundesbank (Germany)';
+	const MAINTAINER = 'logmanoriginal';
+	const CACHE_TIMEOUT = 86400; // 24 hours
+
+	const PARAMETERS = array(
+		array(
+			self::PARAM_LANG => array(
+				'name' => 'Language',
+				'type' => 'list',
+				'defaultValue' => self::LANG_DE,
+				'values' => array(
+					'English' => self::LANG_EN,
+					'Deutsch' => self::LANG_DE
+				)
+			)
+		)
+	);
+
+	public function getIcon() {
+		return self::URI . 'resource/crblob/1890/a7f48ee0ae35348748121770ba3ca009/mL/favicon-ico-data.ico';
+	}
+
+	public function getURI() {
+		switch($this->getInput(self::PARAM_LANG)) {
+			case self::LANG_EN: return self::URI . 'en/publications/reports/studies';
+			case self::LANG_DE: return self::URI . 'de/publikationen/berichte/studien';
+		}
+
+		return parent::getURI();
+	}
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('No response for ' . $this->getURI());
+
+		$html = defaultLinkTo($html, $this->getURI());
+
+		foreach($html->find('ul.resultlist li') as $study) {
+			$item = array();
+
+			$item['uri'] = $study->find('.teasable__link', 0)->href;
+
+			// Get title without child elements (i.e. subtitle)
+			$title = $study->find('.teasable__title div.h2', 0);
+
+			foreach($title->children as &$child) {
+				$child->outertext = '';
+			}
+
+			$item['title'] = $title->innertext;
+
+			// Add subtitle to the content if it exists
+			$item['content'] = '';
+
+			if($subtitle = $study->find('.teasable__subtitle', 0)) {
+				$item['content'] .= '<strong>' . $study->find('.teasable__subtitle', 0)->plaintext . '</strong>';
+			}
+
+			$item['content'] .= '<p>' . $study->find('.teasable__text', 0)->plaintext . '</p>';
+
+			$item['timestamp'] = strtotime($study->find('.teasable__date', 0)->plaintext);
+
+			// Downloads and older studies don't have images
+			if($study->find('.teasable__image', 0)) {
+				$item['enclosures'] = array(
+					$study->find('.teasable__image img', 0)->src
+				);
+			}
+
+			$this->items[] = $item;
+		}
+
+	}
+}

bridges/CADBridge.php

@@ -1,46 +0,0 @@
-<?php
-class CADBridge extends FeedExpander {
-	const MAINTAINER = "nyutag";
-	const NAME = "CAD Bridge";
-	const URI = "http://www.cad-comic.com/";
-	const CACHE_TIMEOUT = 7200; //2h
-	const DESCRIPTION = "Returns the newest articles.";
-
-	public function collectData(){
-		$this->collectExpandableDatas('http://cdn2.cad-comic.com/rss.xml', 10);
-	}
-
-	protected function parseItem($newsItem){
-		$item = parent::parseItem($newsItem);
-		$item['content'] = $this->CADExtractContent($item['uri']);
-		return $item;
-	}
-
-	private function CADExtractContent($url) {
-		$html3 = getSimpleHTMLDOMCached($url);
-
-		// The request might fail due to missing https support or wrong URL
-		if($html3 == false)
-			return 'Daily comic not released yet';
-
-		$htmlpart = explode("/", $url);
-
-		switch ($htmlpart[3]){
-			case 'cad':
-				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);
-				break;
-			default:
-				return 'Daily comic not released yet';
-		}
-		$img = implode ($url2[0]);
-		$html3->clear();
-		unset ($html3);
-		if ($img == '')
-			return 'Daily comic not released yet';
-		return '<img src="'.$img.'"/>';
-	}
-}
-?>

bridges/CNETBridge.php

@@ -3,74 +3,107 @@ class CNETBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'ORelio';
 	const NAME = 'CNET News';
-    const URI = 'http://www.cnet.com/';
-    const CACHE_TIMEOUT = 1800; // 30min
-    const DESCRIPTION = 'Returns the newest articles. <br /> You may specify a topic found in some section URLs, else all topics are selected.';
+	const URI = 'https://www.cnet.com/';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'Returns the newest articles.';
+	const PARAMETERS = array(
+		array(
+			'topic' => array(
+				'name' => 'Topic',
+				'type' => 'list',
+				'values' => array(
+					'All articles' => '',
+					'Apple' => 'apple',
+					'Google' => 'google',
+					'Microsoft' => 'tags-microsoft',
+					'Computers' => 'topics-computers',
+					'Mobile' => 'topics-mobile',
+					'Sci-Tech' => 'topics-sci-tech',
+					'Security' => 'topics-security',
+					'Internet' => 'topics-internet',
+					'Tech Industry' => 'topics-tech-industry'
+				)
+			)
+		)
+	);
 
-    const PARAMETERS = array( array(
-        'topic'=>array('name'=>'Topic name')
-    ));
-
-    public function collectData(){
-
-        function ExtractFromDelimiters($string, $start, $end) {
-            if (strpos($string, $start) !== false) {
-                $section_retrieved = substr($string, strpos($string, $start) + strlen($start));
-                $section_retrieved = substr($section_retrieved, 0, strpos($section_retrieved, $end));
-                return $section_retrieved;
-            } return false;
-        }
-
-        function StripWithDelimiters($string, $start, $end) {
-            while (strpos($string, $start) !== false) {
-                $section_to_remove = substr($string, strpos($string, $start));
-                $section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
-                $string = str_replace($section_to_remove, '', $string);
-            } return $string;
-        }
-
-        function CleanArticle($article_html) {
-            $article_html = '<p>'.substr($article_html, strpos($article_html, '<p>') + 3);
-            $article_html = StripWithDelimiters($article_html, '<span class="credit">', '</span>');
-            $article_html = StripWithDelimiters($article_html, '<script', '</script>');
-            $article_html = StripWithDelimiters($article_html, '<div class="shortcode related-links', '</div>');
-            $article_html = StripWithDelimiters($article_html, '<a class="clickToEnlarge">', '</a>');
+	private function cleanArticle($article_html) {
+		$offset_p = strpos($article_html, '<p>');
+		$offset_figure = strpos($article_html, '<figure');
+		$offset = ($offset_figure < $offset_p ? $offset_figure : $offset_p);
+		$article_html = substr($article_html, $offset);
+		$article_html = str_replace('href="/', 'href="' . self::URI, $article_html);
+		$article_html = str_replace(' height="0"', '', $article_html);
+		$article_html = str_replace('<noscript>', '', $article_html);
+		$article_html = str_replace('</noscript>', '', $article_html);
+		$article_html = StripWithDelimiters($article_html, '<a class="clickToEnlarge', '</a>');
+		$article_html = stripWithDelimiters($article_html, '<span class="nowPlaying', '</span>');
+		$article_html = stripWithDelimiters($article_html, '<span class="duration', '</span>');
+		$article_html = stripWithDelimiters($article_html, '<script', '</script>');
+		$article_html = stripWithDelimiters($article_html, '<svg', '</svg>');
 		return $article_html;
 	}
 
-        $pageUrl = self::URI.(empty($this->getInput('topic')) ? '' : 'topics/'.$this->getInput('topic').'/');
-        $html = getSimpleHTMLDOM($pageUrl) or returnServerError('Could not request CNET: '.$pageUrl);
-        $limit = 0;
+	public function collectData() {
 
-        foreach($html->find('div.assetBody') as $element) {
-            if ($limit < 8) {
+		// Retrieve and check user input
+		$topic = str_replace('-', '/', $this->getInput('topic'));
+		if (!empty($topic) && (substr_count($topic, '/') > 1 || !ctype_alpha(str_replace('/', '', $topic))))
+			returnClientError('Invalid topic: ' . $topic);
 
-                $article_title = trim($element->find('h2', 0)->plaintext);
-                $article_uri = self::URI.($element->find('a', 0)->href);
-                $article_timestamp = strtotime($element->find('time.assetTime', 0)->plaintext);
-                $article_author = trim($element->find('a[rel=author]', 0)->plaintext);
+		// Retrieve webpage
+		$pageUrl = self::URI . (empty($topic) ? 'news/' : $topic . '/');
+		$html = getSimpleHTMLDOM($pageUrl)
+		or returnServerError('Could not request CNET: ' . $pageUrl);
 
-                if (!empty($article_title) && !empty($article_uri) && strpos($article_uri, '/news/') !== false) {
+		// Process articles
+		foreach($html->find('div.assetBody, div.riverPost') as $element) {
 
-                    $article_html = getSimpleHTMLDOM($article_uri) or returnServerError('Could not request CNET: '.$article_uri);
+			if(count($this->items) >= 10) {
+				break;
+			}
 
-                    $article_content = trim(CleanArticle(ExtractFromDelimiters($article_html, '<div class="articleContent', '<footer>')));
+			$article_title = trim($element->find('h2, h3', 0)->plaintext);
+			$article_uri = self::URI . substr($element->find('a', 0)->href, 1);
+			$article_thumbnail = $element->parent()->find('img[src]', 0)->src;
+			$article_timestamp = strtotime($element->find('time.assetTime, div.timeAgo', 0)->plaintext);
+			$article_author = trim($element->find('a[rel=author], a.name', 0)->plaintext);
+			$article_content = '<p><b>' . trim($element->find('p.dek', 0)->plaintext) . '</b></p>';
+
+			if (is_null($article_thumbnail))
+				$article_thumbnail = extractFromDelimiters($element->innertext, '<img src="', '"');
+
+			if (!empty($article_title) && !empty($article_uri) && strpos($article_uri, self::URI . 'news/') !== false) {
+
+				$article_html = getSimpleHTMLDOMCached($article_uri) or $article_html = null;
+
+				if (!is_null($article_html)) {
+
+					if (empty($article_thumbnail))
+						$article_thumbnail = $article_html->find('div.originalImage', 0);
+					if (empty($article_thumbnail))
+						$article_thumbnail = $article_html->find('span.imageContainer', 0);
+					if (is_object($article_thumbnail))
+						$article_thumbnail = $article_thumbnail->find('img', 0)->src;
+
+					$article_content .= trim(
+						$this->cleanArticle(
+							extractFromDelimiters(
+								$article_html, '<article', '<footer'
+							)
+						)
+					);
+				}
 
 				$item = array();
 				$item['uri'] = $article_uri;
 				$item['title'] = $article_title;
 				$item['author'] = $article_author;
 				$item['timestamp'] = $article_timestamp;
+				$item['enclosures'] = array($article_thumbnail);
 				$item['content'] = $article_content;
 				$this->items[] = $item;
-                    $limit++;
 			}
 		}
 	}
-    }
-
-    public function getName() {
-        $topic=$this->getInput('topic');
-        return 'CNET News Bridge'.(empty($topic) ? '' : ' - '.$topic);
-    }
 }

bridges/CNETFranceBridge.php

@@ -0,0 +1,63 @@
+<?php
+class CNETFranceBridge extends FeedExpander
+{
+	const MAINTAINER = 'leomaradan';
+	const NAME = 'CNET France';
+	const URI = 'https://www.cnetfrance.fr/';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'CNET France RSS with filters';
+	const PARAMETERS = array(
+		'filters' => array(
+			'title' => array(
+				'name' => 'Exclude by title',
+				'required' => false,
+				'title' => 'Title term, separated by semicolon (;)',
+				'defaultValue' => 'bon plan;bons plans;au meilleur prix;des meilleures offres;Amazon Prime Day;RED by SFR ou B&You'
+			),
+			'url' => array(
+				'name' => 'Exclude by url',
+				'required' => false,
+				'title' => 'URL term, separated by semicolon (;)',
+				'defaultValue' => 'bon-plan;bons-plans'
+			)
+		)
+	);
+
+	private $bannedTitle = array();
+	private $bannedURL = array();
+
+	public function collectData()
+	{
+		$title = $this->getInput('title');
+		$url = $this->getInput('url');
+
+		if ($title !== null) {
+			$this->bannedTitle = explode(';', $title);
+		}
+
+		if ($url !== null) {
+			$this->bannedURL = explode(';', $url);
+		}
+
+		$this->collectExpandableDatas('https://www.cnetfrance.fr/feeds/rss/news/');
+	}
+
+	protected function parseItem($feedItem)
+	{
+		$item = parent::parseItem($feedItem);
+
+		foreach ($this->bannedTitle as $term) {
+			if (preg_match('/' . $term . '/mi', $item['title']) === 1) {
+				return null;
+			}
+		}
+
+		foreach ($this->bannedURL as $term) {
+			if (preg_match('/' . $term . '/mi', $item['uri']) === 1) {
+				return null;
+			}
+		}
+
+		return $item;
+	}
+}

bridges/CachetBridge.php

@@ -0,0 +1,134 @@
+<?php
+
+class CachetBridge extends BridgeAbstract {
+	const NAME = 'Cachet Bridge';
+	const URI = 'https://cachethq.io/';
+	const DESCRIPTION = 'Returns status updates from any Cachet installation';
+	const MAINTAINER  = 'klimplant';
+	const PARAMETERS = array(
+		array(
+			'host' => array(
+				'name' => 'Cachet installation',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'The URL of the Cachet installation',
+				'exampleValue' => 'https://demo.cachethq.io/',
+			), 'additional_info' => array(
+				'name' => 'Additional Timestamps',
+				'type' => 'checkbox',
+				'title' => 'Whether to include the given timestamps'
+			)
+		)
+	);
+	const CACHE_TIMEOUT = 300;
+
+	private $componentCache = array();
+
+	public function getURI() {
+		return $this->getInput('host') === null ? 'https://cachethq.io/' : $this->getInput('host');
+	}
+
+	/**
+	 * Validates the ping request to the cache API
+	 *
+	 * @param string $ping
+	 * @return boolean
+	 */
+	private function validatePing($ping) {
+		$ping = json_decode($ping);
+		if ($ping === null) {
+			return false;
+		}
+		return $ping->data === 'Pong!';
+	}
+
+	/**
+	 * Returns the component name of a cachat component
+	 *
+	 * @param integer $id
+	 * @return string
+	 */
+	private function getComponentName($id) {
+		if ($id === 0) {
+			return '';
+		}
+		if (array_key_exists($id, $this->componentCache)) {
+			return $this->componentCache[$id];
+		}
+
+		$component = getContents($this->getURI() . '/api/v1/components/' . $id);
+		$component = json_decode($component);
+		if ($component === null) {
+			return '';
+		}
+		return $component->data->name;
+	}
+
+	public function collectData() {
+		$ping = getContents(urljoin($this->getURI(), '/api/v1/ping'));
+		if (!$this->validatePing($ping)) {
+			returnClientError('Provided URI is invalid!');
+		}
+
+		$url = urljoin($this->getURI(), '/api/v1/incidents?sort=id&order=desc');
+		$incidents = getContents($url);
+		$incidents = json_decode($incidents);
+		if ($incidents === null) {
+			returnClientError('/api/v1/incidents returned no valid json');
+		}
+
+		usort($incidents->data, function ($a, $b) {
+			$timeA = strtotime($a->updated_at);
+			$timeB = strtotime($b->updated_at);
+			return $timeA > $timeB ? -1 : 1;
+		});
+
+		foreach ($incidents->data as $incident) {
+
+			if (isset($incident->permalink)) {
+				$permalink = $incident->permalink;
+			} else {
+				$permalink = urljoin($this->getURI(), '/incident/' . $incident->id);
+			}
+
+			$title = $incident->human_status . ': ' . $incident->name;
+			$message = '';
+			if ($this->getInput('additional_info')) {
+				if (isset($incident->occurred_at)) {
+					$message .= 'Occurred at: ' . $incident->occurred_at . "\r\n";
+				}
+				if (isset($incident->scheduled_at)) {
+					$message .= 'Scheduled at: ' . $incident->scheduled_at . "\r\n";
+				}
+				if (isset($incident->created_at)) {
+					$message .= 'Created at: ' . $incident->created_at . "\r\n";
+				}
+				if (isset($incident->updated_at)) {
+					$message .= 'Updated at: ' . $incident->updated_at . "\r\n\r\n";
+				}
+			}
+
+			$message .= $incident->message;
+			$content = nl2br($message);
+			$componentName = $this->getComponentName($incident->component_id);
+			$uidOrig = $permalink . $incident->created_at;
+			$uid = hash('sha512', $uidOrig);
+			$timestamp = strtotime($incident->created_at);
+			$categories = array();
+			$categories[] = $incident->human_status;
+			if ($componentName !== '') {
+				$categories[] = $componentName;
+			}
+
+			$item = array();
+			$item['uri'] = $permalink;
+			$item['title'] = $title;
+			$item['timestamp'] = $timestamp;
+			$item['content'] = $content;
+			$item['uid'] = $uid;
+			$item['categories'] = $categories;
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/CastorusBridge.php

@@ -1,35 +1,35 @@
 <?php
 class CastorusBridge extends BridgeAbstract {
-	const MAINTAINER = "logmanoriginal";
-	const NAME = "Castorus Bridge";
-	const URI = 'http://www.castorus.com';
+	const MAINTAINER = 'logmanoriginal';
+	const NAME = 'Castorus Bridge';
+	const URI = 'https://www.castorus.com';
 	const CACHE_TIMEOUT = 600; // 10min
-	const DESCRIPTION = "Returns the latest changes";
+	const DESCRIPTION = 'Returns the latest changes';
 
 	const PARAMETERS = array(
 		'Get latest changes' => array(),
 		'Get latest changes via ZIP code' => array(
-            'zip'=>array(
-                'name'=>'ZIP code',
-                'type'=>'text',
-                'required'=>true,
-                'exampleValue'=>'74910, 74',
-                'title'=>'Insert ZIP code (complete or partial)'
+			'zip' => array(
+				'name' => 'ZIP code',
+				'type' => 'text',
+				'required' => true,
+				'exampleValue' => '74910, 74',
+				'title' => 'Insert ZIP code (complete or partial)'
 			)
 		),
 		'Get latest changes via city name' => array(
-            'city'=>array(
-                'name'=>'City name',
-                'type'=>'text',
-                'required'=>true,
-                'exampleValue'=>'Seyssel, Seys',
-                'title'=>'Insert city name (complete or partial)'
+			'city' => array(
+				'name' => 'City name',
+				'type' => 'text',
+				'required' => true,
+				'exampleValue' => 'Seyssel, Seys',
+				'title' => 'Insert city name (complete or partial)'
 			)
 		)
 	);
 
-	// Extracts the tile from an actitiy
-	private function ExtractActivityTitle($activity){
+	// Extracts the title from an actitiy
+	private function extractActivityTitle($activity){
 		$title = $activity->find('a', 0);
 
 		if(!$title)
@@ -39,7 +39,7 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	// Extracts the url from an actitiy
-	private function ExtractActivityUrl($activity){
+	private function extractActivityUrl($activity){
 		$url = $activity->find('a', 0);
 
 		if(!$url)
@@ -49,7 +49,7 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	// Extracts the time from an activity
-	private function ExtractActivityTime($activity){
+	private function extractActivityTime($activity){
 		// Unfortunately the time is part of the parent node,
 		// so we have to clear all child nodes first
 		$nodes = $activity->find('*');
@@ -57,7 +57,7 @@ class CastorusBridge extends BridgeAbstract {
 		if(!$nodes)
 			returnServerError('Cannot find nodes!');
 
-		foreach($nodes as $node){
+		foreach($nodes as $node) {
 			$node->outertext = '';
 		}
 
@@ -65,7 +65,7 @@ class CastorusBridge extends BridgeAbstract {
 	}
 
 	// Extracts the price change
-	private function ExtractActivityPrice($activity){
+	private function extractActivityPrice($activity){
 		$price = $activity->find('span', 1);
 
 		if(!$price)
@@ -83,25 +83,32 @@ class CastorusBridge extends BridgeAbstract {
 		if(!$html)
 			returnServerError('Could not load data from ' . self::URI . '!');
 
-		$activities = $html->find('div#activite/li');
+		$activities = $html->find('div#activite > li');
 
 		if(!$activities)
 			returnServerError('Failed to find activities!');
 
-		foreach($activities as $activity){
+		foreach($activities as $activity) {
 			$item = array();
 
-			$item['title'] = $this->ExtractActivityTitle($activity);
-			$item['uri'] = $this->ExtractActivityUrl($activity);
-			$item['timestamp'] = $this->ExtractActivityTime($activity);
-			$item['content'] = '<a href="' . $item['uri'] . '">' . $item['title'] . '</a><br><p>'
-								. $this->ExtractActivityPrice($activity) . '</p>';
+			$item['title'] = $this->extractActivityTitle($activity);
+			$item['uri'] = $this->extractActivityUrl($activity);
+			$item['timestamp'] = $this->extractActivityTime($activity);
+			$item['content'] = '<a href="'
+			. $item['uri']
+			. '">'
+			. $item['title']
+			. '</a><br><p>'
+			. $this->extractActivityPrice($activity)
+			. '</p>';
 
-			if(isset($zip_filter) && !(substr($item['title'], 0, strlen($zip_filter)) === $zip_filter)){
+			if(isset($zip_filter)
+			&& !(substr($item['title'], 0, strlen($zip_filter)) === $zip_filter)) {
 				continue; // Skip this item
 			}
 
-			if(isset($city_filter) && !(substr($item['title'], strpos($item['title'], ' ') + 1, strlen($city_filter)) === $city_filter)){
+			if(isset($city_filter)
+			&& !(substr($item['title'], strpos($item['title'], ' ') + 1, strlen($city_filter)) === $city_filter)) {
 				continue; // Skip this item
 			}
 

bridges/CeskaTelevizeBridge.php

@@ -0,0 +1,84 @@
+<?php
+
+class CeskaTelevizeBridge extends BridgeAbstract {
+
+	const NAME = 'Česká televize Bridge';
+	const URI = 'https://www.ceskatelevize.cz';
+	const CACHE_TIMEOUT = 3600;
+	const DESCRIPTION = 'Return newest videos';
+	const MAINTAINER = 'kolarcz';
+
+	const PARAMETERS = array(
+		array(
+			'url' => array(
+				'name' => 'url to the show',
+				'required' => true,
+				'exampleValue' => 'https://www.ceskatelevize.cz/porady/1097181328-udalosti/dily/'
+			)
+		)
+	);
+
+	private function fixChars($text) {
+		return html_entity_decode($text, ENT_QUOTES, 'UTF-8');
+	}
+
+	private function getUploadTimeFromString($string) {
+		if (strpos($string, 'dnes') !== false) {
+			return strtotime('today');
+		} elseif (strpos($string, 'včera') !== false) {
+			return strtotime('yesterday');
+		} elseif (!preg_match('/(\d+).\s(\d+).(\s(\d+))?/', $string, $match)) {
+			returnServerError('Could not get date from Česká televize string');
+		}
+
+		$date = sprintf('%04d-%02d-%02d', isset($match[3]) ? $match[3] : date('Y'), $match[2], $match[1]);
+		return strtotime($date);
+	}
+
+	public function collectData() {
+		$url = $this->getInput('url');
+
+		$validUrl = '/^(https:\/\/www\.ceskatelevize\.cz\/porady\/\d+-[a-z0-9-]+\/)(dily\/((nove|vysilani)\/)?)?$/';
+		if (!preg_match($validUrl, $url, $match)) {
+			returnServerError('Invalid url');
+		}
+
+		$category = isset($match[4]) ? $match[4] : 'nove';
+		$fixedUrl = "{$match[1]}dily/{$category}/";
+
+		$html = getSimpleHTMLDOM($fixedUrl)
+			or returnServerError('Could not request Česká televize');
+
+		$this->feedUri = $fixedUrl;
+		$this->feedName = str_replace('Přehled dílů — ', '', $this->fixChars($html->find('title', 0)->plaintext));
+		if ($category !== 'nove') {
+			$this->feedName .= " ({$category})";
+		}
+
+		foreach ($html->find('.episodes-broadcast-content a.episode_list_item') as $element) {
+			$itemTitle = $element->find('.episode_list_item-title', 0);
+			$itemContent = $element->find('.episode_list_item-desc', 0);
+			$itemDate = $element->find('.episode_list_item-date', 0);
+			$itemThumbnail = $element->find('img', 0);
+			$itemUri = self::URI . $element->getAttribute('href');
+
+			$item = array(
+				'title' => $this->fixChars($itemTitle->plaintext),
+				'uri' => $itemUri,
+				'content' => '<img src="https:' . $itemThumbnail->getAttribute('src') . '" /><br />'
+					. $this->fixChars($itemContent->plaintext),
+				'timestamp' => $this->getUploadTimeFromString($itemDate->plaintext)
+			);
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getUri() {
+		return isset($this->feedUri) ? $this->feedUri : parent::getUri();
+	}
+
+	public function getName() {
+		return isset($this->feedName) ? $this->feedName : parent::getName();
+	}
+}

bridges/ChristianDailyReporterBridge.php

@@ -0,0 +1,28 @@
+<?php
+class ChristianDailyReporterBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'rogerdc';
+	const NAME = 'Christian Daily Reporter Unofficial RSS';
+	const URI = 'https://www.christiandailyreporter.com/';
+	const DESCRIPTION = 'The Unofficial Christian Daily Reporter RSS';
+	// const CACHE_TIMEOUT = 86400; // 1 day
+
+	public function getIcon() {
+		return self::URI . 'images/cdrfavicon.png';
+	}
+
+	public function collectData() {
+		$uri = 'https://www.christiandailyreporter.com/';
+
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request Christian Daily Reporter.');
+		foreach($html->find('div.top p a,div.column p a') as $element) {
+			$item = array();
+			// Title
+			$item['title'] = $element->innertext;
+			// URL
+			$item['uri'] = $element->href;
+			$this->items[] = $item;
+		}
+	}
+}

bridges/CollegeDeFranceBridge.php

@@ -1,11 +1,11 @@
 <?php
-class CollegeDeFranceBridge extends BridgeAbstract{
+class CollegeDeFranceBridge extends BridgeAbstract {
 
-	const MAINTAINER = "pit-fgfjiudghdf";
-	const NAME = "CollegeDeFrance";
-	const URI = "http://www.college-de-france.fr/";
+	const MAINTAINER = 'pit-fgfjiudghdf';
+	const NAME = 'CollegeDeFrance';
+	const URI = 'https://www.college-de-france.fr/';
 	const CACHE_TIMEOUT = 10800; // 3h
-	const DESCRIPTION = "Returns the latest audio and video from CollegeDeFrance";
+	const DESCRIPTION = 'Returns the latest audio and video from CollegeDeFrance';
 
 	public function collectData(){
 		$months = array(
@@ -22,36 +22,46 @@ class CollegeDeFranceBridge extends BridgeAbstract{
 			'11' => 'nov.',
 			'12' => 'déc.'
 		);
+
 		// The "API" used by the site returns a list of partial HTML in this form
 		/* <li>
 		 * 	<a href="/site/thomas-romer/guestlecturer-2016-04-15-14h30.htm" data-target="after">
-		 * 		<span class="date"><span class="list-icon list-icon-video"></span><span class="list-icon list-icon-audio"></span>15 avr. 2016</span>
+		 * 		<span class="date"><span class="list-icon list-icon-video"></span>
+		 * 		<span class="list-icon list-icon-audio"></span>15 avr. 2016</span>
 		 * 		<span class="lecturer">Christopher Hays</span>
 		 * 		<span class='title'>Imagery of Divine Suckling in the Hebrew Bible and the Ancient Near East</span>
 		 * 	</a>
 		 * </li>
 		 */
-        $html = getSimpleHTMLDOM(self::URI.'components/search-audiovideo.jsp?fulltext=&siteid=1156951719600&lang=FR&type=all')
+		$html = getSimpleHTMLDOM(self::URI
+		. 'components/search-audiovideo.jsp?fulltext=&siteid=1156951719600&lang=FR&type=all')
 			or returnServerError('Could not request CollegeDeFrance.');
+
 		foreach($html->find('a[data-target]') as $element) {
 			$item = array();
 			$item['title'] = $element->find('.title', 0)->plaintext;
+
 			// Most relative URLs contains an hour in addition to the date, so let's use it
 			// <a href="/site/yann-lecun/course-2016-04-08-11h00.htm" data-target="after">
 			//
-			// Sometimes there's an __1, perhaps it signifies an update "/site/patrick-boucheron/seminar-2016-05-03-18h00__1.htm"
+			// Sometimes there's an __1, perhaps it signifies an update
+			// "/site/patrick-boucheron/seminar-2016-05-03-18h00__1.htm"
 			//
 			// But unfortunately some don't have any hours info
-			// <a href="/site/institut-physique/The-Mysteries-of-Decoherence-Sebastien-Gleyzes-[Video-3-35].htm" data-target="after">
+			// <a href="/site/institut-physique/
+			// The-Mysteries-of-Decoherence-Sebastien-Gleyzes-[Video-3-35].htm" data-target="after">
 			$timezone = new DateTimeZone('Europe/Paris');
-			// strpos($element->href, '201') will break in 2020 but it'll probably break prior to then due to site changes anyway
+
+			// strpos($element->href, '201') will break in 2020 but it'll
+			// probably break prior to then due to site changes anyway
 			$d = DateTime::createFromFormat(
 				'!Y-m-d-H\hi',
 				substr($element->href, strpos($element->href, '201'), 16),
 				$timezone
 			);
-            if(!$d){
-                $d=DateTime::createFromFormat(
+
+			if(!$d) {
+				$d = DateTime::createFromFormat(
 					'!d m Y',
 					trim(str_replace(
 						array_values($months),
@@ -61,8 +71,12 @@ class CollegeDeFranceBridge extends BridgeAbstract{
 					$timezone
 				);
 			}
+
 			$item['timestamp'] = $d->format('U');
-			$item['content'] =  $element->find('.lecturer', 0)->innertext . ' - ' . $element->find('.title', 0)->innertext;
+			$item['content'] = $element->find('.lecturer', 0)->innertext
+			. ' - '
+			. $element->find('.title', 0)->innertext;
+
 			$item['uri'] = self::URI . $element->href;
 			$this->items[] = $item;
 		}

bridges/ComboiosDePortugalBridge.php

@@ -0,0 +1,22 @@
+<?php
+class ComboiosDePortugalBridge extends BridgeAbstract {
+	const NAME = 'CP | Avisos';
+	const BASE_URI = 'https://www.cp.pt';
+	const URI = self::BASE_URI . '/passageiros/pt';
+	const DESCRIPTION = 'Comboios de Portugal | Avisos';
+	const MAINTAINER = 'somini';
+
+	public function collectData() {
+		$html = getSimpleHTMLDOM($this->getURI() . '/consultar-horarios/avisos')
+			or returnServerError('Could not load content');
+
+		foreach($html->find('.warnings-table a') as $element) {
+			$item = array();
+
+			$item['title'] = $element->innertext;
+			$item['uri'] = self::BASE_URI . implode('/', array_map('urlencode', explode('/', $element->href)));
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/ComicsKingdomBridge.php

@@ -0,0 +1,65 @@
+<?php
+class ComicsKingdomBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'stjohnjohnson';
+	const NAME = 'Comics Kingdom Unofficial RSS';
+	const URI = 'https://www.comicskingdom.com/';
+	const CACHE_TIMEOUT = 21600; // 6h
+	const DESCRIPTION = 'Comics Kingdom Unofficial RSS';
+	const PARAMETERS = array( array(
+		'comicname' => array(
+			'name' => 'comicname',
+			'type' => 'text',
+			'required' => true
+		)
+	));
+
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI(), array(), array(), true, false)
+			or returnServerError('Could not request Comics Kingdom: ' . $this->getURI());
+
+		// Get author from first page
+		$author = $html->find('div.author p', 0)->plaintext
+			or returnServerError('Comics Kingdom comic does not exist: ' . $this->getURI());;
+
+		// Get current date/link
+		$link = $html->find('meta[property=og:url]', 0)->content;
+		for($i = 0; $i < 5; $i++) {
+			$item = array();
+
+			$page = getSimpleHTMLDOM($link)
+				or returnServerError('Could not request Comics Kingdom: ' . $link);
+
+			$imagelink = $page->find('meta[property=og:image]', 0)->content;
+			$prevSlug = $page->find('slider-arrow[:is-left-arrow=true]', 0);
+			$link = $this->getURI() . '/' . $prevSlug->getAttribute('date-slug');
+
+			$date = explode('/', $link);
+
+			$item['id'] = $imagelink;
+			$item['uri'] = $link;
+			$item['author'] = $author;
+			$item['title'] = 'Comics Kingdom ' . $this->getInput('comicname');
+			$item['timestamp'] = DateTime::createFromFormat('Y-m-d', $date[count($date) - 1])->getTimestamp();
+			$item['content'] = '<img src="' . $imagelink . '" />';
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('comicname'))) {
+			return self::URI . urlencode($this->getInput('comicname'));
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('comicname'))) {
+			return $this->getInput('comicname') . ' - Comics Kingdom';
+		}
+
+		return parent::getName();
+	}
+}

bridges/CommonDreamsBridge.php

@@ -1,10 +1,10 @@
 <?php
 class CommonDreamsBridge extends FeedExpander {
 
-	const MAINTAINER = "nyutag";
-	const NAME = "CommonDreams Bridge";
-	const URI = "http://www.commondreams.org/";
-	const DESCRIPTION = "Returns the newest articles.";
+	const MAINTAINER = 'nyutag';
+	const NAME = 'CommonDreams Bridge';
+	const URI = 'https://www.commondreams.org/';
+	const DESCRIPTION = 'Returns the newest articles.';
 
 	public function collectData(){
 		$this->collectExpandableDatas('http://www.commondreams.org/rss.xml', 10);
@@ -12,11 +12,11 @@ class CommonDreamsBridge extends FeedExpander {
 
 	protected function parseItem($newsItem){
 		$item = parent::parseItem($newsItem);
-		$item['content'] = $this->CommonDreamsExtractContent($item['uri']);
+		$item['content'] = $this->extractContent($item['uri']);
 		return $item;
 	}
 
-	private function CommonDreamsExtractContent($url) {
+	private function extractContent($url){
 		$html3 = getSimpleHTMLDOMCached($url);
 		$text = $html3->find('div[class=field--type-text-with-summary]', 0)->innertext;
 		$html3->clear();

bridges/ContainerLinuxReleasesBridge.php

@@ -0,0 +1,96 @@
+<?php
+class ContainerLinuxReleasesBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'captn3m0';
+	const NAME = 'Core OS Container Linux Releases Bridge';
+	const URI = 'https://coreos.com/releases/';
+	const DESCRIPTION = 'Returns the releases notes for Container Linux';
+
+	const STABLE = 'stable';
+	const BETA = 'beta';
+	const ALPHA = 'alpha';
+
+	const PARAMETERS = array(
+		array(
+			'channel' => array(
+				'name' => 'Release Channel',
+				'type' => 'list',
+				'defaultValue' => self::STABLE,
+				'values' => array(
+					'Stable' => self::STABLE,
+					'Beta' => self::BETA,
+					'Alpha' => self::ALPHA,
+				),
+			)
+		)
+	);
+
+	private function getReleaseFeed($jsonUrl) {
+		$json = getContents($jsonUrl)
+			or returnServerError('Could not request Core OS Website.');
+		return json_decode($json, true);
+	}
+
+	public function getIcon() {
+		return 'https://coreos.com/assets/ico/favicon.png';
+	}
+
+	public function collectData() {
+		$data = $this->getReleaseFeed($this->getJsonUri());
+
+		foreach ($data as $releaseVersion => $release) {
+			$item = array();
+
+			$item['uri'] = "https://coreos.com/releases/#$releaseVersion";
+			$item['title'] = $releaseVersion;
+
+			$content = $release['release_notes'];
+			$content .= <<<EOT
+
+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']);
+
+			// Based on https://gist.github.com/jbroadway/2836900
+			// Links
+			$regex = '/\[([^\[]+)\]\(([^\)]+)\)/';
+			$replacement = '<a href=\'\2\'>\1</a>';
+			$item['content'] = preg_replace($regex, $replacement, $content);
+
+			// Headings
+			$regex = '/^(.*)\:\s?$/m';
+			$replacement = '<h3>\1</h3>';
+			$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 ('<ul><li>%s</li></ul>', trim ($item));
+			}, $item['content']);
+
+			$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();
+	}
+}

bridges/CopieDoubleBridge.php

@@ -1,36 +1,32 @@
 <?php
-class CopieDoubleBridge extends BridgeAbstract{
+class CopieDoubleBridge extends BridgeAbstract {
 
-    const MAINTAINER = "superbaillot.net";
-    const NAME = "CopieDouble";
-    const URI = "http://www.copie-double.com/";
+	const MAINTAINER = 'superbaillot.net';
+	const NAME = 'CopieDouble';
+	const URI = 'http://www.copie-double.com/';
 	const CACHE_TIMEOUT = 14400; // 4h
-    const DESCRIPTION = "CopieDouble";
+	const DESCRIPTION = 'CopieDouble';
 
 	public function collectData(){
 		$html = getSimpleHTMLDOM(self::URI)
 			or returnServerError('Could not request CopieDouble.');
+
 		$table = $html->find('table table', 2);
 
-        foreach($table->find('tr') as $element)
-        {
+		foreach($table->find('tr') as $element) {
 			$td = $element->find('td', 0);
-            if($td->class == "couleur_1")
-            {
-                $item = array();
 
+			if($td->class === 'couleur_1') {
+				$item = array();
 				$title = $td->innertext;
-                $pos = strpos($title, "<a");
+				$pos = strpos($title, '<a');
 				$title = substr($title, 0, $pos);
 				$item['title'] = $title;
-            }
-            elseif(strpos($element->innertext, "/images/suivant.gif") === false)
-            {
-                $a=$element->find("a", 0);
+			} 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('href="/', 'href="'.self::URI,$content);
+				$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;
 			}

bridges/CourrierInternationalBridge.php

@@ -1,42 +1,40 @@
 <?php
-class CourrierInternationalBridge extends BridgeAbstract{
+class CourrierInternationalBridge extends BridgeAbstract {
 
-    const MAINTAINER = "teromene";
-    const NAME = "Courrier International Bridge";
-    const URI = "http://CourrierInternational.com/";
+	const MAINTAINER = 'teromene';
+	const NAME = 'Courrier International Bridge';
+	const URI = 'https://www.courrierinternational.com/';
 	const CACHE_TIMEOUT = 300; // 5 min
-    const DESCRIPTION = "Courrier International bridge";
+	const DESCRIPTION = 'Courrier International bridge';
 
 	public function collectData(){
-
 		$html = getSimpleHTMLDOM(self::URI)
 			or returnServerError('Error.');
 
-        $element = $html->find("article");
-
+		$element = $html->find('article');
 		$article_count = 1;
 
 		foreach($element as $article) {
-
 			$item = array();
 
-            $item['uri'] = $article->parent->getAttribute("href");
+			$item['uri'] = $article->parent->getAttribute('href');
 
-            if(strpos($item['uri'], "http") === FALSE) {
-                $item['uri'] = self::URI.$item['uri'];
+			if(strpos($item['uri'], 'http') === false) {
+				$item['uri'] = self::URI . $item['uri'];
 			}
 
 			$page = getSimpleHTMLDOMCached($item['uri']);
 
-            $content = $page->find('.article-text',0);
-            if(!$content){
-              $content = $page->find('.depeche-text',0);
+			$content = $page->find('.article-text', 0);
+
+			if(!$content) {
+				$content = $page->find('.depeche-text', 0);
 			}
 
 			$item['content'] = sanitize($content);
-            $item['title'] = strip_tags($article->find(".title",0));
+			$item['title'] = strip_tags($article->find('.title', 0));
 
-            $dateTime = date_parse($page->find("time",0));
+			$dateTime = date_parse($page->find('time', 0));
 
 			$item['timestamp'] = mktime(
 				$dateTime['hour'],
@@ -49,13 +47,9 @@ class CourrierInternationalBridge extends BridgeAbstract{
 
 			$this->items[] = $item;
 			$article_count ++;
-            if($article_count > 5) break;
 
+			if($article_count > 5)
+				break;
 		}
-
-
-
 	}
 }
-
-?>

bridges/CpasbienBridge.php

@@ -1,53 +0,0 @@
-<?php
-class CpasbienBridge extends BridgeAbstract {
-
-    const MAINTAINER = "lagaisse";
-    const NAME = "Cpasbien Bridge";
-    const URI = "http://www.cpasbien.io";
-    const CACHE_TIMEOUT = 86400; // 24h
-    const DESCRIPTION = "Returns latest torrents from a request query";
-
-    const PARAMETERS = array( array(
-        'q'=>array(
-            'name'=>'Search',
-            'required'=>true,
-            'title'=>'Type your search'
-        )
-    ));
-
-    public function collectData(){
-        $request = str_replace(" ","-",trim($this->getInput('q')));
-        $html = getSimpleHTMLDOM(self::URI.'/recherche/'.urlencode($request).'.html')
-            or returnServerError('No results for this query.');
-
-        foreach ($html->find('#gauche',0)->find('div') as $episode) {
-            if ($episode->getAttribute('class')=='ligne0' ||
-                $episode->getAttribute('class')=='ligne1')
-            {
-                $htmlepisode=getSimpleHTMLDOMCached($episode->find('a', 0)->getAttribute('href'));
-
-                $item = array();
-                $item['author'] = $episode->find('a', 0)->text();
-                $item['title'] = $episode->find('a', 0)->text();
-                $textefiche=$htmlepisode->find('#textefiche', 0)->find('p',1);
-                if (isset($textefiche)) {
-                    $item['content'] = $textefiche->text();
-                } else {
-                    $p=$htmlepisode->find('#textefiche',0)->find('p');
-                    if(!empty($p)){
-                        $item['content'] = $htmlepisode->find('#textefiche', 0)->find('p',0)->text();
-                    }
-                }
-
-                $item['id'] = $episode->find('a', 0)->getAttribute('href');
-                $item['uri'] = self::URI . $htmlepisode->find('#telecharger',0)->getAttribute('href');
-                $this->items[] = $item;
-            }
-        }
-    }
-
-
-    public function getName(){
-        return $this->getInput('q').' : '.self::NAME;
-    }
-}

bridges/CrewbayBridge.php

@@ -0,0 +1,227 @@
+<?php
+class CrewbayBridge extends BridgeAbstract {
+	const MAINTAINER = 'couraudt';
+	const NAME = 'Crewbay Bridge';
+	const URI = 'https://www.crewbay.com';
+	const DESCRIPTION = 'Returns the newest sailing offers.';
+	const PARAMETERS = array(
+		array(
+			'keyword' => array(
+				'name' => 'Filter by keyword',
+				'title' => 'Enter the keyword to filter here'
+			),
+			'type' => array(
+				'name' => 'Type of search',
+				'title' => 'Choose between finding a boat or a crew',
+				'type' => 'list',
+				'values' => array(
+					'Find a boat' => 'boats',
+					'Find a crew' => 'crew'
+				)
+			),
+			'status' => array(
+				'name' => 'Status on the boat',
+				'title' => 'Choose between recreational or professional classified ads',
+				'type' => 'list',
+				'values' => array(
+					'Recreational' => 'recreational',
+					'Professional' => 'professional'
+				)
+			),
+			'recreational_position' => array(
+				'name' => 'Recreational position wanted',
+				'title' => 'Filter by recreational position you wanted aboard',
+				'required' => false,
+				'type' => 'list',
+				'values' => array(
+					'' => '',
+					'Amateur Crew' => 'Amateur Crew',
+					'Friendship' => 'Friendship',
+					'Competent Crew' => 'Competent Crew',
+					'Racing' => 'Racing',
+					'Voluntary work' => 'Voluntary work',
+					'Mile building' => 'Mile building'
+				)
+			),
+			'professional_position' => array(
+				'name' => 'Professional position wanted',
+				'title' => 'Filter by professional position you wanted aboard',
+				'required' => false,
+				'type' => 'list',
+				'values' => array(
+					'' => '',
+					'1st Engineer' => '1st Engineer',
+					'1st Mate' => '1st Mate',
+					'Beautician' => 'Beautician',
+					'Bosun' => 'Bosun',
+					'Captain' => 'Captain',
+					'Chef' => 'Chef',
+					'Steward(ess)' => 'Steward(ess)',
+					'Deckhand' => 'Deckhand',
+					'Delivery Crew' => 'Delivery Crew',
+					'Dive Instructor' => 'Dive Instructor',
+					'Masseur' => 'Masseur',
+					'Medical Staff' => 'Medical Staff',
+					'Nanny' => 'Nanny',
+					'Navigator' => 'Navigator',
+					'Racing Crew' => 'Racing Crew',
+					'Teacher' => 'Teacher',
+					'Electrical Engineer' => 'Electrical Engineer',
+					'Fitter' => 'Fitter',
+					'2nd Engineer' => '2nd Engineer',
+					'3rd Engineer' => '3rd Engineer',
+					'Lead Deckhand' => 'Lead Deckhand',
+					'Security Officer' => 'Security Officer',
+					'O.O.W' => 'O.O.W',
+					'1st Officer' => '1st Officer',
+					'2nd Officer' => '2nd Officer',
+					'3rd Officer' => '3rd Officer',
+					'Captain/Engineer' => 'Captain/Engineer',
+					'Hairdresser' => 'Hairdresser',
+					'Fitness Trainer' => 'Fitness Trainer',
+					'Laundry' => 'Laundry',
+					'Solo Steward/ess' => 'Solo Steward/ess',
+					'Stew/Deck' => 'Stew/Deck',
+					'2nd Steward/ess' => '2nd Steward/ess',
+					'3rd Steward/ess' => '3rd Steward/ess',
+					'Chief Steward/ess' => 'Chief Steward/ess',
+					'Head Housekeeper' => 'Head Housekeeper',
+					'Purser' => 'Purser',
+					'Cook' => 'Cook',
+					'Cook/Stew' => 'Cook/Stew',
+					'2nd Chef' => '2nd Chef',
+					'Head Chef' => 'Head Chef',
+					'Administrator' => 'Administrator',
+					'P.A' => 'P.A',
+					'Villa staff' => 'Villa staff',
+					'Housekeeping/Stew' => 'Housekeeping/Stew',
+					'Stew/Beautician' => 'Stew/Beautician',
+					'Stew/Masseuse' => 'Stew/Masseuse',
+					'Manager' => 'Manager',
+					'Sailing instructor' => 'Sailing instructor'
+				)
+			)
+		)
+	);
+
+	public function collectData() {
+		$url = $this->getURI();
+		$html = getSimpleHTMLDOM($url) or returnClientError('No results for this query.');
+
+		$annonces = $html->find('#SearchResults div.result');
+		$limit = 0;
+
+		foreach ($annonces as $annonce) {
+			$detail = $annonce->find('.btn--profile', 0);
+			$htmlDetail = getSimpleHTMLDOMCached($detail->href);
+
+			if (!empty($this->getInput('recreational_position')) || !empty($this->getInput('professional_position'))) {
+				if ($this->getInput('type') == 'boats') {
+					if ($this->getInput('status') == 'professional') {
+						$positions = array($annonce->find('.title .position', 0)->plaintext);
+					} else {
+						$positions = array(str_replace('Wanted:', '', $annonce->find('.content li', 0)->plaintext));
+					}
+				} else {
+					$list = $htmlDetail->find('.viewer-details .viewer-list');
+					$positions = explode("\r\n", end($list)->find('span.value', 0)->plaintext);
+				}
+
+				$found = false;
+				$keyword = $this->getInput('status') == 'professional' ? 'professional_position' : 'recreational_position';
+				foreach ($positions as $position) {
+					if (strpos(trim($position), $this->getInput($keyword)) !== false) {
+						$found = true;
+						break;
+					}
+				}
+
+				if (!$found) {
+					continue;
+				}
+			}
+
+			$item = array();
+
+			if ($this->getInput('type') == 'boats') {
+				$titleSelector = '.title h2';
+			} else {
+				$titleSelector = '.layout__item h2';
+			}
+			$userName = $annonce->find('.result--description a', 0)->plaintext;
+			$annonceTitle = trim($annonce->find($titleSelector, 0)->plaintext);
+			if (empty($annonceTitle)) {
+				$item['title'] = $userName;
+			} else {
+				$item['title'] = $userName . ' - ' . $annonceTitle;
+			}
+
+			$item['uri'] = $detail->href;
+			$images = $annonce->find('.avatar img');
+			$item['enclosures'] = array(end($images)->getAttribute('src'));
+
+			$content = $htmlDetail->find('.viewer-intro--info', 0)->innertext;
+
+			$sections = $htmlDetail->find('.viewer-container .viewer-section');
+			foreach ($sections as $section) {
+				if ($section->find('.viewer-section-title', 0)) {
+					$class = str_replace('viewer-', '', explode(' ', $section->getAttribute('class'))[0]);
+					if (!in_array($class, array('apply', 'photos', 'reviews', 'contact', 'experience', 'qa'))) {
+						// Basic sections
+						$content .= $section->find('.viewer-section-title h3', 0)->outertext;
+						$content .= $section->find('.viewer-section-content', 0)->innertext;
+					}
+				} else {
+					// Info section
+					$content .= $section->find('.viewer-section-content h3', 0)->outertext;
+					$content .= $section->find('.viewer-section-content p', 0)->outertext;
+				}
+			}
+
+			if (!empty($this->getInput('keyword'))) {
+				$keyword = strtolower($this->getInput('keyword'));
+				if (strpos(strtolower($item['title']), $keyword) === false) {
+					if (strpos(strtolower($content), $keyword) === false) {
+						continue;
+					}
+				}
+			}
+
+			$item['content'] = $content;
+
+			$tags = $htmlDetail->find('li.viewer-tags--tag');
+			foreach ($tags as $tag) {
+				if (!isset($item['categories'])) {
+					$item['categories'] = array();
+				}
+				$text = trim($tag->plaintext);
+				if (!in_array($text, $item['categories'])) {
+					$item['categories'][] = $text;
+				}
+			}
+
+			$this->items[] = $item;
+			$limit += 1;
+
+			if ($limit == 10) break;
+		}
+	}
+
+	public function getURI() {
+		$uri = parent::getURI();
+
+		if ($this->getInput('type') == 'boats') {
+			$uri .= '/boats';
+		} else {
+			$uri .= '/crew';
+		}
+
+		if ($this->getInput('status') == 'professional') {
+			$uri .= '/professional';
+		} else {
+			$uri .= '/recreational';
+		}
+
+		return $uri;
+	}
+}

bridges/CryptomeBridge.php

@@ -1,36 +1,42 @@
 <?php
-class CryptomeBridge extends BridgeAbstract{
+class CryptomeBridge extends BridgeAbstract {
 
-    const MAINTAINER = "BoboTiG";
-    const NAME = "Cryptome";
-    const URI = "https://cryptome.org/";
+	const MAINTAINER = 'BoboTiG';
+	const NAME = 'Cryptome';
+	const URI = 'https://cryptome.org/';
 	const CACHE_TIMEOUT = 21600; //6h
-    const DESCRIPTION = "Returns the N most recent documents.";
+	const DESCRIPTION = 'Returns the N most recent documents.';
 
 	const PARAMETERS = array( array(
-        'n'=>array(
-            'name'=>'number of elements',
-            'type'=>'number',
-            'defaultValue'=>20,
-            'exampleValue'=>10
+		'n' => array(
+			'name' => 'number of elements',
+			'type' => 'number',
+			'defaultValue' => 20,
+			'exampleValue' => 10
 		)
 	));
 
 	public function collectData(){
 		$html = getSimpleHTMLDOM(self::URI)
 			or returnServerError('Could not request Cryptome.');
-        $number=$this->getInput('n');
-        if (!empty($number)) {   /* number of documents */
+
+		$number = $this->getInput('n');
+
+		/* number of documents */
+		if(!empty($number)) {
 			$num = min($number, 20);
 		}
 
-
 		foreach($html->find('pre') as $element) {
-            for ( $i = 0; $i < $num; ++$i ) {
+			for($i = 0; $i < $num; ++$i) {
 				$item = array();
-                $item['uri'] = self::URI.substr($element->find('a', $i)->href, 20);
+				$item['uri'] = self::URI . substr($element->find('a', $i)->href, 20);
 				$item['title'] = substr($element->find('b', $i)->plaintext, 22);
-                $item['content'] = preg_replace('#http://cryptome.org/#', self::URI, $element->find('b', $i)->innertext);
+				$item['content'] = preg_replace(
+					'#http://cryptome.org/#',
+					self::URI,
+					$element->find('b', $i)->innertext
+				);
 				$this->items[] = $item;
 			}
 			break;

bridges/CuriousCatBridge.php

@@ -0,0 +1,109 @@
+<?php
+class CuriousCatBridge extends BridgeAbstract {
+	const NAME = 'Curious Cat Bridge';
+	const URI = 'https://curiouscat.me';
+	const DESCRIPTION = 'Returns list of newest questions and answers for a user profile';
+	const MAINTAINER = 'VerifiedJoseph';
+	const PARAMETERS = array(array(
+		'username' => array(
+			'name' => 'Username',
+			'type' => 'text',
+			'required' => true,
+			'exampleValue' => 'koethekoethe',
+		)
+	));
+
+	const CACHE_TIMEOUT = 3600;
+
+	public function collectData() {
+
+		$url = self::URI . '/api/v2/profile?username=' . urlencode($this->getInput('username'));
+
+		$apiJson = getContents($url)
+			or returnServerError('Could not request: ' . $url);
+
+		$apiData = json_decode($apiJson, true);
+
+		foreach($apiData['posts'] as $post) {
+			$item = array();
+
+			$item['author'] = 'Anonymous';
+
+			if ($post['senderData']['id'] !== false) {
+				$item['author'] = $post['senderData']['username'];
+			}
+
+			$item['uri'] = $this->getURI() . '/post/' . $post['id'];
+			$item['title'] = $this->ellipsisTitle($post['comment']);
+
+			$item['content'] = $this->processContent($post);
+			$item['timestamp'] = $post['timestamp'];
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI() {
+
+		if (!is_null($this->getInput('username'))) {
+			return self::URI . '/' . $this->getInput('username');
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+
+		if (!is_null($this->getInput('username'))) {
+			return $this->getInput('username') . ' - Curious Cat';
+		}
+
+		return parent::getName();
+	}
+
+	private function processContent($post) {
+
+		$author = 'Anonymous';
+
+		if ($post['senderData']['id'] !== false) {
+			$authorUrl = self::URI . '/' . $post['senderData']['username'];
+
+			$author = <<<EOD
+<a href="{$authorUrl}">{$post['senderData']['username']}</a>
+EOD;
+		}
+
+		$question = $this->formatUrls($post['comment']);
+		$answer = $this->formatUrls($post['reply']);
+
+		$content = <<<EOD
+<p>{$author} asked:</p>
+<blockquote>{$question}</blockquote><br/>
+<p>{$post['addresseeData']['username']} answered:</p>
+<blockquote>{$answer}</blockquote>
+EOD;
+
+		return $content;
+	}
+
+	private function ellipsisTitle($text) {
+		$length = 150;
+
+		if (strlen($text) > $length) {
+			$text = explode('<br>', wordwrap($text, $length, '<br>'));
+			return $text[0] . '...';
+		}
+
+		return $text;
+	}
+
+	private function formatUrls($content) {
+
+		return preg_replace(
+			'/(http[s]{0,1}\:\/\/[a-zA-Z0-9.\/\?\&=\-_]{4,})/ims',
+			'<a target="_blank" href="$1" target="_blank">$1</a> ',
+			$content
+		);
+
+	}
+}

bridges/DailymotionBridge.php

@@ -1,114 +1,203 @@
 <?php
-class DailymotionBridge extends BridgeAbstract{
+class DailymotionBridge extends BridgeAbstract {
 
-        const MAINTAINER = "mitsukarenai";
-        const NAME = "Dailymotion Bridge";
-        const URI = "https://www.dailymotion.com/";
-        const CACHE_TIMEOUT = 10800; // 3h
-        const DESCRIPTION = "Returns the 5 newest videos by username/playlist or search";
+	const MAINTAINER = 'mitsukarenai';
+	const NAME = 'Dailymotion Bridge';
+	const URI = 'https://www.dailymotion.com/';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'Returns the 5 newest videos by username/playlist or search';
 
 	const PARAMETERS = array (
 		'By username' => array(
-                'u'=>array(
-                    'name'=>'username',
-                    'required'=>true
+			'u' => array(
+				'name' => 'username',
+				'required' => true
 			)
 		),
-
 		'By playlist id' => array(
-                'p'=>array(
-                    'name'=>'playlist id',
-                    'required'=>true
+			'p' => array(
+				'name' => 'playlist id',
+				'required' => true
 			)
 		),
-
 		'From search results' => array(
-                's'=>array(
-                    'name'=>'Search keyword',
-                    'required'=>true
+			's' => array(
+				'name' => 'Search keyword',
+				'required' => true
 			),
-                'pa'=>array(
-                    'name'=>'Page',
-                    'type'=>'number'
+			'pa' => array(
+				'name' => 'Page',
+				'type' => 'number',
+				'defaultValue' => 1,
 			)
 		)
 	);
 
-    function getMetadata($id) {
-        $metadata=array();
-        $html2 = getSimpleHTMLDOM(self::URI.'video/'.$id);
-        if(!$html2){
-            return $metadata;
+	private $feedName = '';
+
+	private $apiUrl = 'https://api.dailymotion.com';
+	private $apiFields = 'created_time,description,id,owner.screenname,tags,thumbnail_url,title,url';
+
+	public function getIcon() {
+		return 'https://static1-ssl.dmcdn.net/images/neon/favicons/android-icon-36x36.png.vf806ca4ed0deed812';
 	}
 
-        $metadata['title'] = $html2->find('meta[property=og:title]', 0)->getAttribute('content');
-        $metadata['timestamp'] = strtotime($html2->find('meta[property=video:release_date]', 0)->getAttribute('content') );
-        $metadata['thumbnailUri'] = $html2->find('meta[property=og:image]', 0)->getAttribute('content');
-        $metadata['uri'] = $html2->find('meta[property=og:url]', 0)->getAttribute('content');
-        return $metadata;
+	public function collectData() {
+
+		if ($this->queriedContext === 'By username' || $this->queriedContext === 'By playlist id') {
+
+			$apiJson = getContents($this->getApiUrl())
+				or returnServerError('Could not request: ' . $this->getApiUrl());
+
+			$apiData = json_decode($apiJson, true);
+
+			$this->feedName = $this->getPlaylistTitle($this->getInput('p'));
+
+			foreach ($apiData['list'] as $apiItem) {
+				$item = array();
+
+				$item['uri'] = $apiItem['url'];
+				$item['uid'] = $apiItem['id'];
+				$item['title'] = $apiItem['title'];
+				$item['timestamp'] = $apiItem['created_time'];
+				$item['author'] = $apiItem['owner.screenname'];
+				$item['content'] = '<p><a href="' . $apiItem['url'] . '">
+					<img src="' . $apiItem['thumbnail_url'] . '"></a></p><p>' . $apiItem['description'] . '</p>';
+				$item['categories'] = $apiItem['tags'];
+				$item['enclosures'][] = $apiItem['thumbnail_url'];
+
+				$this->items[] = $item;
+			}
 		}
 
-    public function collectData(){
-        $html = '';
-        $limit = 5;
-        $count = 0;
+		if ($this->queriedContext === 'From search results') {
 
 			$html = getSimpleHTMLDOM($this->getURI())
 				or returnServerError('Could not request Dailymotion.');
 
 			foreach($html->find('div.media a.preview_link') as $element) {
-            if($count < $limit) {
 				$item = array();
+
 				$item['id'] = str_replace('/video/', '', strtok($element->href, '_'));
 				$metadata = $this->getMetadata($item['id']);
-                if(empty($metadata)){
+
+				if(empty($metadata)) {
 					continue;
 				}
+
 				$item['uri'] = $metadata['uri'];
 				$item['title'] = $metadata['title'];
 				$item['timestamp'] = $metadata['timestamp'];
-                $item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $metadata['thumbnailUri'] . '" /></a><br><a href="' . $item['uri'] . '">' . $item['title'] . '</a>';
+
+				$item['content'] = '<a href="'
+					. $item['uri']
+					. '"><img src="'
+					. $metadata['thumbnailUri']
+					. '" /></a><br><a href="'
+					. $item['uri']
+					. '">'
+					. $item['title']
+					. '</a>';
+
 				$this->items[] = $item;
-                $count++;
+
+				if (count($this->items) >= 5) {
+					break;
+				}
 			}
 		}
 	}
 
-    public function getName(){
-        switch($this->queriedContext){
+	public function getName() {
+		switch($this->queriedContext) {
 		case 'By username':
-            $specific=$this->getInput('u');
+			$specific = $this->getInput('u');
 			break;
 		case 'By playlist id':
-            $specific=strtok($this->getInput('p'), '_');
-            break;
-        case 'From search results':
-            $specific=$this->getInput('s');
-            break;
+			$specific = strtok($this->getInput('p'), '_');
+
+			if ($this->feedName) {
+				$specific = $this->feedName;
 			}
 
-        return $specific.' : Dailymotion Bridge';
+			break;
+		case 'From search results':
+			$specific = $this->getInput('s');
+			break;
+		default: return parent::getName();
+		}
+
+		return $specific . ' : Dailymotion';
 	}
 
 	public function getURI(){
-        $uri=self::URI;
-        switch($this->queriedContext){
+		$uri = self::URI;
+		switch($this->queriedContext) {
 		case 'By username':
-            $uri.='user/'
-                .urlencode($this->getInput('u')).'/1';
+			$uri .= 'user/' . urlencode($this->getInput('u'));
 			break;
 		case 'By playlist id':
-            $uri.='playlist/'
-                .urlencode(strtok($this->getInput('p'), '_'));
+			$uri .= 'playlist/' . urlencode(strtok($this->getInput('p'), '_'));
 			break;
 		case 'From search results':
-            $uri.='search/'
-                .urlencode($this->getInput('s'));
-            if($this->getInput('pa')){
-                $uri.='/'.$this->getInput('pa');
+			$uri .= 'search/' . urlencode($this->getInput('s'));
+
+			if(!is_null($this->getInput('pa'))) {
+				$pa = $this->getInput('pa');
+
+				if ($this->getInput('pa') < 1) {
+					$pa = 1;
+				}
+
+				$uri .= '/' . $pa;
 			}
 			break;
+		default: return parent::getURI();
 		}
 		return $uri;
 	}
+
+	private function getMetadata($id) {
+		$metadata = array();
+
+		$html = getSimpleHTMLDOM(self::URI . 'video/' . $id);
+
+		if(!$html) {
+			return $metadata;
+		}
+
+		$metadata['title'] = $html->find('meta[property=og:title]', 0)->getAttribute('content');
+		$metadata['timestamp'] = strtotime(
+			$html->find('meta[property=video:release_date]', 0)->getAttribute('content')
+		);
+		$metadata['thumbnailUri'] = $html->find('meta[property=og:image]', 0)->getAttribute('content');
+		$metadata['uri'] = $html->find('meta[property=og:url]', 0)->getAttribute('content');
+		return $metadata;
+	}
+
+	private function getPlaylistTitle($id) {
+		$title = '';
+
+		$url = self::URI . 'playlist/' . $id;
+
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Could not request: ' . $url);
+
+		$title = $html->find('meta[property=og:title]', 0)->getAttribute('content');
+		return $title;
+	}
+
+	private function getApiUrl() {
+
+		switch($this->queriedContext) {
+			case 'By username':
+				return $this->apiUrl . '/user/' . $this->getInput('u')
+					. '/videos?fields=' . urlencode($this->apiFields) . '&availability=1&sort=recent&limit=5';
+				break;
+			case 'By playlist id':
+				return $this->apiUrl . '/playlist/' . $this->getInput('p')
+					. '/videos?fields=' . urlencode($this->apiFields) . '&limit=5';
+				break;
+		}
+	}
 }

bridges/DanbooruBridge.php

@@ -1,51 +1,136 @@
 <?php
-class DanbooruBridge extends BridgeAbstract{
+class DanbooruBridge extends BridgeAbstract {
 
-  const MAINTAINER = "mitsukarenai";
-  const NAME = "Danbooru";
-  const URI = "http://donmai.us/";
+	const MAINTAINER = 'mitsukarenai, logmanoriginal';
+	const NAME = 'Danbooru';
+	const URI = 'http://donmai.us/';
 	const CACHE_TIMEOUT = 1800; // 30min
-  const DESCRIPTION = "Returns images from given page";
+	const DESCRIPTION = 'Returns images from given page';
 
 	const PARAMETERS = array(
-    'global'=>array(
-      'p'=>array(
-        'name'=>'page',
-        'defaultValue'=>1,
-        'type'=>'number'
+		'global' => array(
+			'p' => array(
+				'name' => 'page',
+				'defaultValue' => 1,
+				'type' => 'number'
 			),
-      't'=>array('name'=>'tags')
+			't' => array(
+				'name' => 'tags'
+			)
 		),
-    0=>array()
+		0 => array()
 	);
 
-  const PATHTODATA='article';
-  const IDATTRIBUTE='data-id';
+	const PATHTODATA = 'article';
+	const IDATTRIBUTE = 'data-id';
+	const TAGATTRIBUTE = 'alt';
 
 	protected function getFullURI(){
-    return $this->getURI().'posts?'
-      .'&page='.$this->getInput('p')
-      .'&tags='.urlencode($this->getInput('t'));
+		return $this->getURI()
+		. 'posts?&page=' . $this->getInput('p')
+		. '&tags=' . urlencode($this->getInput('t'));
+	}
+
+	protected function getTags($element){
+		return $element->find('img', 0)->getAttribute(static::TAGATTRIBUTE);
 	}
 
 	protected function getItemFromElement($element){
+		// Fix links
+		defaultLinkTo($element, $this->getURI());
+
 		$item = array();
-    $item['uri'] = $this->getURI().$element->find('a', 0)->href;
-    $item['postid'] = (int)preg_replace("/[^0-9]/",'', $element->getAttribute(static::IDATTRIBUTE));
+		$item['uri'] = html_entity_decode($element->find('a', 0)->href);
+		$item['postid'] = (int)preg_replace('/[^0-9]/', '', $element->getAttribute(static::IDATTRIBUTE));
 		$item['timestamp'] = time();
-    $thumbnailUri = $this->getURI().$element->find('img', 0)->src;
-    $item['tags'] = $element->find('img', 0)->getAttribute('alt');
-    $item['title'] = $this->getName().' | '.$item['postid'];
-    $item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $thumbnailUri . '" /></a><br>Tags: '.$item['tags'];
+		$thumbnailUri = $element->find('img', 0)->src;
+		$item['tags'] = $this->getTags($element);
+		$item['title'] = $this->getName() . ' | ' . $item['postid'];
+		$item['content'] = '<a href="'
+		. $item['uri']
+		. '"><img src="'
+		. $thumbnailUri
+		. '" /></a><br>Tags: '
+		. $item['tags'];
+
 		return $item;
 	}
 
 	public function collectData(){
-    $html = getSimpleHTMLDOM($this->getFullURI())
-      or returnServerError('Could not request '.$this->getName());
+		$content = getContents($this->getFullURI())
+			or returnServerError('Could not request ' . $this->getName());
+
+		$html = Fix_Simple_Html_Dom::str_get_html($content);
 
 		foreach($html->find(static::PATHTODATA) as $element) {
 			$this->items[] = $this->getItemFromElement($element);
 		}
 	}
 }
+
+/**
+ * This class is a monkey patch to 'extend' simplehtmldom to recognize <source>
+ * tags (HTML5) as self closing tag. This patch should be removed once
+ * simplehtmldom was fixed. This seems to be a issue with more tags:
+ * https://sourceforge.net/p/simplehtmldom/bugs/83/
+ *
+ * The tag itself is valid according to Mozilla:
+ *
+ * The HTML <picture> element serves as a container for zero or more <source>
+ * elements and one <img> element to provide versions of an image for different
+ * display device scenarios. The browser will consider each of the child <source>
+ * elements and select one corresponding to the best match found; if no matches
+ * are found among the <source> elements, the file specified by the <img>
+ * element's src attribute is selected. The selected image is then presented in
+ * the space occupied by the <img> element.
+ *
+ * -- https://developer.mozilla.org/en-US/docs/Web/HTML/Element/picture
+ *
+ * Notice: This class uses parts of the original simplehtmldom, adjusted to pass
+ * the guidelines of RSS-Bridge (formatting)
+ */
+final class Fix_Simple_Html_Dom extends simple_html_dom {
+
+	/* copy from simple_html_dom, added 'source' at the end */
+	protected $self_closing_tags = array(
+		'img' => 1,
+		'br' => 1,
+		'input' => 1,
+		'meta' => 1,
+		'link' => 1,
+		'hr' => 1,
+		'base' => 1,
+		'embed' => 1,
+		'spacer' => 1,
+		'source' => 1
+	);
+
+	/* copy from simplehtmldom, changed 'simple_html_dom' to 'Fix_Simple_Html_Dom' */
+	public static function str_get_html($str,
+	$lowercase = true,
+	$forceTagsClosed = true,
+	$target_charset = DEFAULT_TARGET_CHARSET,
+	$stripRN = true,
+	$defaultBRText = DEFAULT_BR_TEXT,
+	$defaultSpanText = DEFAULT_SPAN_TEXT)
+	{
+		$dom = new Fix_Simple_Html_Dom(null,
+		$lowercase,
+		$forceTagsClosed,
+		$target_charset,
+		$stripRN,
+		$defaultBRText,
+		$defaultSpanText);
+
+		if (empty($str) || strlen($str) > MAX_FILE_SIZE) {
+
+			$dom->clear();
+			return false;
+
+		}
+
+		$dom->load($str, $lowercase, $stripRN);
+
+		return $dom;
+	}
+}

bridges/DansTonChatBridge.php

@@ -1,22 +1,27 @@
 <?php
-class DansTonChatBridge extends BridgeAbstract{
+class DansTonChatBridge extends BridgeAbstract {
 
-	const MAINTAINER = "Astalaseven";
-	const NAME = "DansTonChat Bridge";
-	const URI = "http://danstonchat.com/";
+	const MAINTAINER = 'Astalaseven';
+	const NAME = 'DansTonChat Bridge';
+	const URI = 'https://danstonchat.com/';
 	const CACHE_TIMEOUT = 21600; //6h
-	const DESCRIPTION = "Returns latest quotes from DansTonChat.";
+	const DESCRIPTION = 'Returns latest quotes from DansTonChat.';
 
 	public function collectData(){
 
-        $html = getSimpleHTMLDOM(self::URI.'latest.html')
+		$html = getSimpleHTMLDOM(self::URI . 'latest.html')
 			or returnServerError('Could not request DansTonChat.');
 
 		foreach($html->find('div.item') as $element) {
 			$item = array();
 			$item['uri'] = $element->find('a', 0)->href;
-                $item['title'] = 'DansTonChat '.$element->find('a', 1)->plaintext;
-                $item['content'] = $element->find('a', 0)->innertext;
+			$titleContent = $element->find('h3 a', 0);
+			if($titleContent) {
+				$item['title'] = 'DansTonChat ' . html_entity_decode($titleContent->plaintext, ENT_QUOTES);
+			} else {
+				$item['title'] = 'DansTonChat';
+			}
+			$item['content'] = $element->find('div.item-content a', 0)->innertext;
 			$this->items[] = $item;
 		}
 	}

bridges/DarkReadingBridge.php

@@ -0,0 +1,81 @@
+<?php
+class DarkReadingBridge extends FeedExpander {
+	const MAINTAINER = 'ORelio';
+	const NAME = 'Dark Reading Bridge';
+	const URI = 'https://www.darkreading.com/';
+	const DESCRIPTION = 'Returns the newest articles from Dark Reading';
+
+	const PARAMETERS = array( array(
+		'feed' => array(
+			'name' => 'Feed',
+			'type' => 'list',
+			'values' => array(
+				'All Dark Reading Stories' => '000_AllArticles',
+				'Attacks/Breaches' => '644_Attacks/Breaches',
+				'Application Security' => '645_Application%20Security',
+				'Database Security' => '646_Database%20Security',
+				'Cloud' => '647_Cloud',
+				'Endpoint' => '648_Endpoint',
+				'Authentication' => '649_Authentication',
+				'Privacy' => '650_Privacy',
+				'Mobile' => '651_Mobile',
+				'Perimeter' => '652_Perimeter',
+				'Risk' => '653_Risk',
+				'Compliance' => '654_Compliance',
+				'Operations' => '655_Operations',
+				'Careers and People' => '656_Careers%20and%20People',
+				'Identity and Access Management' => '657_Identity%20and%20Access%20Management',
+				'Analytics' => '658_Analytics',
+				'Threat Intelligence' => '659_Threat%20Intelligence',
+				'Security Monitoring' => '660_Security%20Monitoring',
+				'Vulnerabilities / Threats' => '661_Vulnerabilities%20/%20Threats',
+				'Advanced Threats' => '662_Advanced%20Threats',
+				'Insider Threats' => '663_Insider%20Threats',
+				'Vulnerability Management' => '664_Vulnerability%20Management',
+			)
+		)
+	));
+
+	public function collectData(){
+		$feed = $this->getInput('feed');
+		$feed_splitted = explode('_', $feed);
+		$feed_id = $feed_splitted[0];
+		$feed_name = $feed_splitted[1];
+		if(empty($feed) || !ctype_digit($feed_id) || !preg_match('/[A-Za-z%20\/]/', $feed_name)) {
+			returnClientError('Invalid feed, please check the "feed" parameter.');
+		}
+		$feed_url = $this->getURI() . 'rss_simple.asp';
+		if ($feed_id != '000') {
+			$feed_url .= '?f_n=' . $feed_id . '&f_ln=' . $feed_name;
+		}
+		$this->collectExpandableDatas($feed_url);
+	}
+
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+		if (empty($item['content']))
+			return null; //ignore dummy articles
+		$article = getSimpleHTMLDOMCached($item['uri'])
+			or returnServerError('Could not request Dark Reading: ' . $item['uri']);
+		$item['content'] = $this->extractArticleContent($article);
+		$item['enclosures'] = array(); //remove author profile picture
+		return $item;
+	}
+
+	private function extractArticleContent($article){
+		$content = $article->find('div#article-main', 0)->innertext;
+
+		foreach (array(
+			'<div class="divsplitter',
+			'<div style="float: left; margin-right: 2px;',
+			'<div class="more-insights',
+			'<div id="more-insights',
+		) as $div_start) {
+			$content = stripRecursiveHTMLSection($content, 'div', $div_start);
+		}
+
+		$content = stripWithDelimiters($content, '<h1 ', '</h1>');
+
+		return $content;
+	}
+}

bridges/DauphineLibereBridge.php

@@ -1,32 +1,32 @@
 <?php
 class DauphineLibereBridge extends FeedExpander {
 
-    const MAINTAINER = "qwertygc";
-    const NAME = "Dauphine Bridge";
-    const URI = "http://www.ledauphine.com/";
+	const MAINTAINER = 'qwertygc';
+	const NAME = 'Dauphine Bridge';
+	const URI = 'https://www.ledauphine.com/';
 	const CACHE_TIMEOUT = 7200; // 2h
-    const DESCRIPTION = "Returns the newest articles.";
+	const DESCRIPTION = 'Returns the newest articles.';
 
 	const PARAMETERS = array( array(
-        'u'=>array(
-            'name'=>'Catégorie de l\'article',
-            'type'=>'list',
-            'values'=>array(
-                'À la une'=>'',
-                'France Monde'=>'france-monde',
-                'Faits Divers'=>'faits-divers',
-                'Économie et Finance'=>'economie-et-finance',
-                'Politique'=>'politique',
-                'Sport'=>'sport',
-                'Ain'=>'ain',
-                'Alpes-de-Haute-Provence'=>'haute-provence',
-                'Hautes-Alpes'=>'hautes-alpes',
-                'Ardèche'=>'ardeche',
-                'Drôme'=>'drome',
-                'Isère Sud'=>'isere-sud',
-                'Savoie'=>'savoie',
-                'Haute-Savoie'=>'haute-savoie',
-                'Vaucluse'=>'vaucluse'
+		'u' => array(
+			'name' => 'Catégorie de l\'article',
+			'type' => 'list',
+			'values' => array(
+				'À la une' => '',
+				'France Monde' => 'france-monde',
+				'Faits Divers' => 'faits-divers',
+				'Économie et Finance' => 'economie-et-finance',
+				'Politique' => 'politique',
+				'Sport' => 'sport',
+				'Ain' => 'ain',
+				'Alpes-de-Haute-Provence' => 'haute-provence',
+				'Hautes-Alpes' => 'hautes-alpes',
+				'Ardèche' => 'ardeche',
+				'Drôme' => 'drome',
+				'Isère Sud' => 'isere-sud',
+				'Savoie' => 'savoie',
+				'Haute-Savoie' => 'haute-savoie',
+				'Vaucluse' => 'vaucluse'
 			)
 		)
 	));
@@ -34,7 +34,7 @@ class DauphineLibereBridge extends FeedExpander {
 	public function collectData(){
 		$url = self::URI . 'rss';
 
-        if (empty($this->getInput('u'))) {
+		if(empty($this->getInput('u'))) {
 			$url = self::URI . $this->getInput('u') . '/rss';
 		}
 
@@ -43,15 +43,15 @@ class DauphineLibereBridge extends FeedExpander {
 
 	protected function parseItem($newsItem){
 		$item = parent::parseItem($newsItem);
-        $item['content'] = $this->ExtractContent($item['uri']);
+		$item['content'] = $this->extractContent($item['uri']);
 		return $item;
 	}
 
-    private function ExtractContent($url) {
+	private function extractContent($url){
 		$html2 = getSimpleHTMLDOMCached($url);
-        $text = $html2->find('div.column', 0)->innertext;
-        $text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
-        return $text;
+		foreach ($html2->find('.noprint, link, script, iframe, .shareTool, .contentInfo') as $remove) {
+			$remove->outertext = '';
+		}
+		return $html2->find('div.content', 0)->innertext;
 	}
 }
-?>

bridges/DaveRamseyBlogBridge.php

@@ -0,0 +1,24 @@
+<?php
+
+class DaveRamseyBlogBridge extends BridgeAbstract {
+	const MAINTAINER = 'johnpc';
+	const NAME = 'Dave Ramsey Blog';
+	const URI = 'https://www.daveramsey.com/blog';
+	const CACHE_TIMEOUT = 7200; // 2h
+	const DESCRIPTION = 'Returns blog posts from daveramsey.com';
+
+	public function collectData()
+	{
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request daveramsey.com.');
+
+		foreach ($html->find('.Post') as $element) {
+			$this->items[] = array(
+				'uri' => 'https://www.daveramsey.com' . $element->find('header > a', 0)->href,
+				'title' => $element->find('header > h2 > a', 0)->plaintext,
+				'tags' => $element->find('.Post-topic', 0)->plaintext,
+				'content' => $element->find('.Post-body', 0)->plaintext,
+			);
+		}
+	}
+}

bridges/DavesTrailerPageBridge.php

@@ -0,0 +1,27 @@
+<?php
+class DavesTrailerPageBridge extends BridgeAbstract {
+	const MAINTAINER = 'johnnygroovy';
+	const NAME = 'Daves Trailer Page Bridge';
+	const URI = 'https://www.davestrailerpage.co.uk/';
+	const DESCRIPTION = 'Last trailers in HD thanks to Dave.';
+
+	public function collectData(){
+	$html = getSimpleHTMLDOM(static::URI)
+	or returnClientError('No results for this query.');
+
+	foreach ($html->find('tr[!align]') as $tr) {
+		$item = array();
+
+		// title
+		$item['title'] = $tr->find('td', 0)->find('b', 0)->plaintext;
+
+		// content
+		$item['content'] = $tr->find('ul', 1);
+
+		// uri
+		$item['uri'] = $tr->find('a', 3)->getAttribute('href');
+
+		$this->items[] = $item;
+		}
+	}
+}

bridges/DemoBridge.php

@@ -1,35 +1,33 @@
 <?php
-class DemoBridge extends BridgeAbstract{
+class DemoBridge extends BridgeAbstract {
 
-    const MAINTAINER = "teromene";
-    const NAME = "DemoBridge";
-    const URI = "http://github.com/rss-bridge/rss-bridge";
-    const DESCRIPTION = "Bridge used for demos";
+	const MAINTAINER = 'teromene';
+	const NAME = 'DemoBridge';
+	const URI = 'http://github.com/rss-bridge/rss-bridge';
+	const DESCRIPTION = 'Bridge used for demos';
 
 	const PARAMETERS = array(
 		'testCheckbox' => array(
-            'testCheckbox'=>array(
-                'type'=>'checkbox',
-                'name'=>'test des checkbox'
+			'testCheckbox' => array(
+				'type' => 'checkbox',
+				'name' => 'test des checkbox'
 			)
 		),
-
 		'testList' => array(
-            'testList'=>array(
-                'type'=>'list',
-                'name'=>'test des listes',
-                'values'=>array(
-                    'Test'=>'test',
-                    'Test 2'=>'test2'
+			'testList' => array(
+				'type' => 'list',
+				'name' => 'test des listes',
+				'values' => array(
+					'Test' => 'test',
+					'Test 2' => 'test2'
 				)
 			)
 		),
-
 		'testNumber' => array(
-            'testNumber'=>array(
-                'type'=>'number',
-                'name'=>'test des numéros',
-                'exampleValue'=>'1515632'
+			'testNumber' => array(
+				'type' => 'number',
+				'name' => 'test des numéros',
+				'exampleValue' => '1515632'
 			)
 		)
 	);
@@ -37,13 +35,12 @@ 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;
-
 	}
 }

bridges/DerpibooruBridge.php

@@ -0,0 +1,113 @@
+<?php
+class DerpibooruBridge extends BridgeAbstract {
+	const NAME = 'Derpibooru Bridge';
+	const URI = 'https://derpibooru.org/';
+	const DESCRIPTION = 'Returns newest posts from a Derpibooru search';
+	const CACHE_TIMEOUT = 300; // 5min
+	const MAINTAINER = 'Roliga';
+
+	const PARAMETERS = array(
+		array(
+			'f' => array(
+				'name' => 'Filter',
+				'type' => 'list',
+				'values' => array(
+					'Everything' => 56027,
+					'18+ R34' => 37432,
+					'Legacy Default' => 37431,
+					'18+ Dark' => 37429,
+					'Maximum Spoilers' => 37430,
+					'Default' => 100073
+				),
+				'defaultValue' => 56027
+
+			),
+			'q' => array(
+				'name' => 'Query',
+				'required' => true
+			)
+		)
+	);
+
+	public function detectParameters($url){
+		$params = array();
+
+		// Search page e.g. https://derpibooru.org/search?q=cute
+		$regex = '/^(https?:\/\/)?(www\.)?derpibooru.org\/search.+q=([^\/&?\n]+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['q'] = urldecode($matches[3]);
+			return $params;
+		}
+
+		// Tag page, e.g. https://derpibooru.org/tags/artist-colon-devinian
+		$regex = '/^(https?:\/\/)?(www\.)?derpibooru.org\/tags\/([^\/&?\n]+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['q'] = str_replace('-colon-', ':', urldecode($matches[3]));
+			return $params;
+		}
+
+		return null;
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('q'))) {
+			return 'Derpibooru search for: '
+				. $this->getInput('q');
+		} else {
+			return parent::getName();
+		}
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('f')) && !is_null($this->getInput('q'))) {
+		return self::URI
+			. 'search?filter_id='
+			. urlencode($this->getInput('f'))
+			. '&q='
+			. urlencode($this->getInput('q'));
+		} else {
+			return parent::getURI();
+		}
+	}
+
+	public function collectData(){
+		$queryJson = json_decode(getContents(
+			self::URI
+			. 'search.json?filter_id='
+			. urlencode($this->getInput('f'))
+			. '&q='
+			. urlencode($this->getInput('q'))
+		)) or returnServerError('Failed to query Derpibooru');
+
+		foreach($queryJson->search as $post) {
+			$item = array();
+
+			$postUri = self::URI . $post->id;
+
+			$item['uri'] = $postUri;
+			$item['title'] = $post->id;
+			$item['timestamp'] = strtotime($post->created_at);
+			$item['author'] = $post->uploader;
+			$item['enclosures'] = array('https:' . $post->image);
+			$item['categories'] = explode(', ', $post->tags);
+
+			$item['content'] = '<p><a href="' // image preview
+				. $postUri
+				. '"><img src="https:'
+				. $post->representations->medium
+				. '"></a></p><p>' // description
+				. $post->description
+				. '</p><p><b>Size:</b> ' // image size
+				. $post->width
+				. 'x'
+				. $post->height
+				. '<br><b>Source:</b> <a href="' // source link
+				. $post->source_url
+				. '">'
+				. $post->source_url
+				. '</a></p>';
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/DesoutterBridge.php

@@ -0,0 +1,246 @@
+<?php
+class DesoutterBridge extends BridgeAbstract {
+
+	const CATEGORY_NEWS = 'News & Events';
+	const CATEGORY_INDUSTRY = 'Industry 4.0 News';
+
+	const NAME = 'Desoutter Bridge';
+	const URI = 'https://www.desouttertools.com';
+	const DESCRIPTION = 'Returns feeds for news from Desoutter';
+	const MAINTAINER = 'logmanoriginal';
+	const CACHE_TIMEOUT = 86400; // 24 hours
+
+	const PARAMETERS = array(
+		self::CATEGORY_NEWS => array(
+			'news_lang' => array(
+				'name' => 'Language',
+				'type' => 'list',
+				'title' => 'Select your language',
+				'defaultValue' => 'Corporate',
+				'values' => array(
+					'Corporate'
+					=> 'https://www.desouttertools.com/about-desoutter/news-events',
+					'Česko'
+					=> 'https://www.desouttertools.cz/o-desoutter/aktuality-udalsoti',
+					'Deutschland'
+					=> 'https://www.desoutter.de/ueber-desoutter/news-events',
+					'España'
+					=> 'https://www.desouttertools.es/sobre-desoutter/noticias-eventos',
+					'México'
+					=> 'https://www.desouttertools.mx/acerca-desoutter/noticias-eventos',
+					'France'
+					=> 'https://www.desouttertools.fr/a-propos-de-desoutter/actualites-evenements',
+					'Magyarország'
+					=> 'https://www.desouttertools.hu/a-desoutter-vallalatrol/hirek-esemenyek',
+					'Italia'
+					=> 'https://www.desouttertools.it/su-desoutter/news-eventi',
+					'日本'
+					=> 'https://www.desouttertools.jp/desotanituite/niyusu-ibento',
+					'대한민국'
+					=> 'https://www.desouttertools.co.kr/desoteoe-daehaeseo/nyuseu-mic-ibenteu',
+					'Polska'
+					=> 'https://www.desouttertools.pl/o-desoutter/aktualnosci-wydarzenia',
+					'Brasil'
+					=> 'https://www.desouttertools.com.br/sobre-desoutter/noti%C2%ADcias-eventos',
+					'Portugal'
+					=> 'https://www.desouttertools.pt/sobre-desoutter/notIcias-eventos',
+					'România'
+					=> 'https://www.desouttertools.ro/despre-desoutter/noutati-evenimente',
+					'Российская Федерация'
+					=> 'https://www.desouttertools.com.ru/o-desoutter/novosti-mieropriiatiia',
+					'Slovensko'
+					=> 'https://www.desouttertools.sk/o-spolocnosti-desoutter/novinky-udalosti',
+					'Slovenija'
+					=> 'https://www.desouttertools.si/o-druzbi-desoutter/novice-dogodki',
+					'Sverige'
+					=> 'https://www.desouttertools.se/om-desoutter/nyheter-evenemang',
+					'Türkiye'
+					=> 'https://www.desoutter.com.tr/desoutter-hakkinda/haberler-etkinlikler',
+					'中国'
+					=> 'https://www.desouttertools.com.cn/guan-yu-ma-tou/xin-wen-he-huo-dong',
+				)
+			),
+		),
+		self::CATEGORY_INDUSTRY => array(
+			'industry_lang' => array(
+				'name' => 'Language',
+				'type' => 'list',
+				'title' => 'Select your language',
+				'defaultValue' => 'Corporate',
+				'values' => array(
+					'Corporate'
+					=> 'https://www.desouttertools.com/industry-4-0/news',
+					'Česko'
+					=> 'https://www.desouttertools.cz/prumysl-4-0/novinky',
+					'Deutschland'
+					=> 'https://www.desoutter.de/industrie-4-0/news',
+					'España'
+					=> 'https://www.desouttertools.es/industria-4-0/noticias',
+					'México'
+					=> 'https://www.desouttertools.mx/industria-4-0/noticias',
+					'France'
+					=> 'https://www.desouttertools.fr/industrie-4-0/actualites',
+					'Magyarország'
+					=> 'https://www.desouttertools.hu/industry-4-0/hirek',
+					'Italia'
+					=> 'https://www.desouttertools.it/industry-4-0/news',
+					'日本'
+					=> 'https://www.desouttertools.jp/industry-4-0/news',
+					'대한민국'
+					=> 'https://www.desouttertools.co.kr/industry-4-0/news',
+					'Polska'
+					=> 'https://www.desouttertools.pl/przemysl-4-0/wiadomosci',
+					'Brasil'
+					=> 'https://www.desouttertools.com.br/industria-4-0/noticias',
+					'Portugal'
+					=> 'https://www.desouttertools.pt/industria-4-0/noticias',
+					'România'
+					=> 'https://www.desouttertools.ro/industry-4-0/noutati',
+					'Российская Федерация'
+					=> 'https://www.desouttertools.com.ru/industry-4-0/news',
+					'Slovensko'
+					=> 'https://www.desouttertools.sk/priemysel-4-0/novinky',
+					'Slovenija'
+					=> 'https://www.desouttertools.si/industrija-4-0/novice',
+					'Sverige'
+					=> 'https://www.desouttertools.se/industri-4-0/nyheter',
+					'Türkiye'
+					=> 'https://www.desoutter.com.tr/endustri-4-0/haberler',
+					'中国'
+					=> 'https://www.desouttertools.com.cn/industry-4-0/news',
+				)
+			),
+		),
+		'global' => array(
+			'full' => array(
+				'name' => 'Load full articles',
+				'type' => 'checkbox',
+				'title' => 'Enable to load the full article for each item'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => 3,
+				'title' => "Maximum number of items to return in the feed.\n0 = unlimited"
+			)
+		)
+	);
+
+	private $title;
+
+	public function getURI() {
+		switch($this->queriedContext) {
+			case self::CATEGORY_NEWS:
+				return $this->getInput('news_lang') ?: parent::getURI();
+			case self::CATEGORY_INDUSTRY:
+				return $this->getInput('industry_lang') ?: parent::getURI();
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+		return isset($this->title) ? $this->title . ' - ' . parent::getName() : parent::getName();
+	}
+
+	public function collectData() {
+
+		// Uncomment to generate list of languages automtically (dev mode)
+		/*
+		switch($this->queriedContext) {
+			case self::CATEGORY_NEWS:
+				$this->extractNewsLanguages(); die;
+			case self::CATEGORY_INDUSTRY:
+				$this->extractIndustryLanguages(); die;
+		}
+		*/
+
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request ' . $this->getURI());
+
+		$html = defaultLinkTo($html, $this->getURI());
+
+		$this->title = html_entity_decode($html->find('title', 0)->plaintext, ENT_QUOTES);
+
+		$limit = $this->getInput('limit') ?: 0;
+
+		foreach($html->find('article') as $article) {
+			$item = array();
+
+			$item['uri'] = $article->find('a', 0)->href;
+			$item['title'] = $article->find('a[title]', 0)->title;
+
+			if($this->getInput('full')) {
+				$item['content'] = $this->getFullNewsArticle($item['uri']);
+			} else {
+				$item['content'] = $article->find('div.tile-body p', 0)->plaintext;
+			}
+
+			$this->items[] = $item;
+
+			if ($limit > 0 && count($this->items) >= $limit) break;
+		}
+
+	}
+
+	private function getFullNewsArticle($uri) {
+		$html = getSimpleHTMLDOMCached($uri)
+			or returnServerError('Unable to load full article!');
+
+		$html = defaultLinkTo($html, $this->getURI());
+
+		return $html->find('section.article', 0);
+	}
+
+	/**
+	 * Generates a HTML page with a PHP formatted array of languages,
+	 * pointing to the corresponding news pages. Implementation is based
+	 * on the 'Corporate' site.
+	 * @return void
+	 */
+	private function extractNewsLanguages() {
+		$html = getSimpleHTMLDOMCached('https://www.desouttertools.com/about-desoutter/news-events')
+			or returnServerError('Error loading news!');
+
+		$html = defaultLinkTo($html, static::URI);
+
+		$items = $html->find('ul[class="dropdown-menu"] li');
+
+		$list = "\t'Corporate'\n\t=> 'https://www.desouttertools.com/about-desoutter/news-events',\n";
+
+		foreach($items as $item) {
+			$lang = trim($item->plaintext);
+			$uri = $item->find('a', 0)->href;
+
+			$list .= "\t'{$lang}'\n\t=> '{$uri}',\n";
+		}
+
+		echo $list;
+	}
+
+	/**
+	 * Generates a HTML page with a PHP formatted array of languages,
+	 * pointing to the corresponding news pages. Implementation is based
+	 * on the 'Corporate' site.
+	 * @return void
+	 */
+	private function extractIndustryLanguages() {
+		$html = getSimpleHTMLDOMCached('https://www.desouttertools.com/industry-4-0/news')
+			or returnServerError('Error loading news!');
+
+		$html = defaultLinkTo($html, static::URI);
+
+		$items = $html->find('ul[class="dropdown-menu"] li');
+
+		$list = "\t'Corporate'\n\t=> 'https://www.desouttertools.com/industry-4-0/news',\n";
+
+		foreach($items as $item) {
+			$lang = trim($item->plaintext);
+			$uri = $item->find('a', 0)->href;
+
+			$list .= "\t'{$lang}'\n\t=> '{$uri}',\n";
+		}
+
+		echo $list;
+	}
+}

bridges/DevToBridge.php

@@ -0,0 +1,109 @@
+<?php
+class DevToBridge extends BridgeAbstract {
+
+	const CONTEXT_BY_TAG = 'By tag';
+
+	const NAME = 'dev.to Bridge';
+	const URI = 'https://dev.to';
+	const DESCRIPTION = 'Returns feeds for tags';
+	const MAINTAINER = 'logmanoriginal';
+	const CACHE_TIMEOUT = 10800; // 15 min.
+
+	const PARAMETERS = array(
+		self::CONTEXT_BY_TAG => array(
+			'tag' => array(
+				'name' => 'Tag',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Insert your tag',
+				'exampleValue' => 'python'
+			),
+			'full' => array(
+				'name' => 'Full article',
+				'type' => 'checkbox',
+				'required' => false,
+				'title' => 'Enable to receive the full article for each item'
+			)
+		)
+	);
+
+	public function getURI() {
+		switch($this->queriedContext) {
+			case self::CONTEXT_BY_TAG:
+				if($tag = $this->getInput('tag')) {
+					return static::URI . '/t/' . urlencode($tag);
+				}
+				break;
+		}
+
+		return parent::getURI();
+	}
+
+	public function getIcon() {
+		return 'https://practicaldev-herokuapp-com.freetls.fastly.net/assets/
+apple-icon-5c6fa9f2bce280428589c6195b7f1924206a53b782b371cfe2d02da932c8c173.png';
+	}
+
+	public function collectData() {
+		$html = getSimpleHTMLDOMCached($this->getURI())
+			or returnServerError('Could not request ' . $this->getURI());
+
+		$html = defaultLinkTo($html, static::URI);
+
+		$articles = $html->find('div.crayons-story')
+			or returnServerError('Could not find articles!');
+
+		foreach($articles as $article) {
+			$item = array();
+
+			$item['uri'] = $article->find('a[id*=article-link]', 0)->href;
+			$item['title'] = $article->find('h2 > a', 0)->plaintext;
+
+			$item['timestamp'] = $article->find('time', 0)->datetime;
+			$item['author'] = $article->find('a.crayons-story__secondary.fw-medium', 0)->plaintext;
+
+			// Profile image
+			$item['enclosures'] = array($article->find('img', 0)->src);
+
+			if($this->getInput('full')) {
+				$fullArticle = $this->getFullArticle($item['uri']);
+				$item['content'] = <<<EOD
+<p>{$fullArticle}</p>
+EOD;
+			} else {
+				$item['content'] = <<<EOD
+<img src="{$item['enclosures'][0]}" alt="{$item['author']}">
+<p>{$item['title']}</p>
+EOD;
+			}
+
+			// categories
+			foreach ($article->find('a.crayons-tag') as $tag) {
+				$item['categories'][] = str_replace('#', '', $tag->plaintext);
+			}
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getName() {
+		if (!is_null($this->getInput('tag'))) {
+			return ucfirst($this->getInput('tag')) . ' - dev.to';
+		}
+
+		return parent::getName();
+	}
+
+	private function getFullArticle($url) {
+		$html = getSimpleHTMLDOMCached($url)
+			or returnServerError('Unable to load article from "' . $url . '"!');
+
+		$html = defaultLinkTo($html, static::URI);
+
+		if ($html->find('div.crayons-article__cover', 0)) {
+			return $html->find('div.crayons-article__cover', 0) . $html->find('[id="article-body"]', 0);
+		}
+
+		return $html->find('[id="article-body"]', 0);
+	}
+}

bridges/DeveloppezDotComBridge.php

@@ -1,11 +1,11 @@
 <?php
 class DeveloppezDotComBridge extends FeedExpander {
 
-	const MAINTAINER = "polopollo";
-	const NAME = "Developpez.com Actus (FR)";
-	const URI = "http://www.developpez.com/";
+	const MAINTAINER = 'polopollo';
+	const NAME = 'Developpez.com Actus (FR)';
+	const URI = 'https://www.developpez.com/';
 	const CACHE_TIMEOUT = 1800; // 30min
-	const DESCRIPTION = "Returns the 15 newest posts from DeveloppezDotCom (full text).";
+	const DESCRIPTION = 'Returns the 15 newest posts from DeveloppezDotCom (full text).';
 
 	public function collectData(){
 		$this->collectExpandableDatas(self::URI . 'index/rss', 15);
@@ -13,19 +13,13 @@ class DeveloppezDotComBridge extends FeedExpander {
 
 	protected function parseItem($newsItem){
 		$item = parent::parseItem($newsItem);
-		$item['content'] = $this->DeveloppezDotComExtractContent($item['uri']);
+		$item['content'] = $this->extractContent($item['uri']);
 		return $item;
 	}
 
-	private function DeveloppezDotComStripCDATA($string) {
-		$string = str_replace('<![CDATA[', '', $string);
-		$string = str_replace(']]>', '', $string);
-		return $string;
-	}
-
 	// F***ing quotes from Microsoft Word badly encoded, here was the trick:
 	// http://stackoverflow.com/questions/1262038/how-to-replace-microsoft-encoded-quotes-in-php
-	private function convert_smart_quotes($string)
+	private function convertSmartQuotes($string)
 	{
 		$search = array(chr(145),
 						chr(146),
@@ -33,18 +27,20 @@ class DeveloppezDotComBridge extends FeedExpander {
 						chr(148),
 						chr(151));
 
-		$replace = array("'",
+		$replace = array(
+			"'",
 			"'",
 			'"',
 			'"',
-							'-');
+			'-'
+		);
 
 		return str_replace($search, $replace, $string);
 	}
 
-	private function DeveloppezDotComExtractContent($url) {
+	private function extractContent($url){
 		$articleHTMLContent = getSimpleHTMLDOMCached($url);
-		$text = $this->convert_smart_quotes($articleHTMLContent->find('div.content', 0)->innertext);
+		$text = $this->convertSmartQuotes($articleHTMLContent->find('div.content', 0)->innertext);
 		$text = utf8_encode($text);
 		return trim($text);
 	}

bridges/DiarioDeNoticiasBridge.php

@@ -0,0 +1,83 @@
+<?php
+class DiarioDeNoticiasBridge extends BridgeAbstract {
+	const NAME = 'Diário de Notícias (PT)';
+	const URI = 'https://dn.pt';
+	const DESCRIPTION = 'Diário de Notícias (DN.PT)';
+	const MAINTAINER = 'somini';
+	const PARAMETERS = array(
+		'Tag' => array(
+			'n' => array(
+				'name' => 'Tag Name',
+				'exampleValue' => 'rogerio-casanova',
+			)
+		)
+	);
+
+	const MONPT = array(
+		'jan',
+		'fev',
+		'mar',
+		'abr',
+		'mai',
+		'jun',
+		'jul',
+		'ago',
+		'set',
+		'out',
+		'nov',
+		'dez',
+	);
+
+	public function getIcon() {
+		return 'https://static.globalnoticias.pt/dn/common/images/favicons/favicon-128.png';
+	}
+
+	public function getName() {
+		switch($this->queriedContext) {
+		case 'Tag':
+			$name = self::NAME . ' | Tag | ' . $this->getInput('n');
+			break;
+		default:
+			$name = self::NAME;
+		}
+		return $name;
+	}
+	public function getURI() {
+		switch($this->queriedContext) {
+		case 'Tag':
+			$url = self::URI . '/tag/' . $this->getInput('n') . '.html';
+			break;
+		default:
+			$url = self::URI;
+		}
+		return $url;
+	}
+
+	public function collectData() {
+		$archives = self::getURI();
+		$html = getSimpleHTMLDOMCached($archives)
+			or returnServerError('Could not load content');
+
+		foreach($html->find('article') as $element) {
+			$item = array();
+
+			$title = $element->find('.t-am-title', 0);
+			$link = $element->find('a.t-am-text', 0);
+
+			$item['title'] = $title->plaintext;
+			$item['uri'] = self::URI . $link->href;
+
+			$snippet = $element->find('.t-am-lead', 0);
+			if ($snippet) {
+				$item['content'] = $snippet->plaintext;
+			}
+			preg_match('|edicao-do-dia\\/(?P<day>\d\d)-(?P<monpt>\w\w\w)-(?P<year>\d\d\d\d)|', $link->href, $d);
+			if ($d) {
+				$item['timestamp'] = sprintf('%s-%s-%s', $d['year'], array_search($d['monpt'], self::MONPT) + 1, $d['day']);
+			}
+
+			$this->items[] = $item;
+		}
+
+	}
+}

bridges/DiarioDoAlentejoBridge.php

@@ -0,0 +1,60 @@
+<?php
+class DiarioDoAlentejoBridge extends BridgeAbstract {
+	const MAINTAINER = 'somini';
+	const NAME = 'Diário do Alentejo';
+	const URI = 'https://www.diariodoalentejo.pt';
+	const DESCRIPTION = 'Semanário Regionalista Independente';
+	const CACHE_TIMEOUT = 28800; // 8h
+
+	/* This is used to hack around obtaining a timestamp. It's just a list of Month names in Portuguese ... */
+	const PT_MONTH_NAMES = array(
+		'janeiro',
+		'fevereiro',
+		'março',
+		'abril',
+		'maio',
+		'junho',
+		'julho',
+		'agosto',
+		'setembro',
+		'outubro',
+		'novembro',
+		'dezembro');
+
+	public function getIcon() {
+		return 'https://www.diariodoalentejo.pt/images/favicon/apple-touch-icon.png';
+	}
+
+	public function collectData(){
+		/* This is slow as molasses (>30s!), keep the cache timeout high to avoid killing the host */
+		$html = getSimpleHTMLDOMCached($this->getURI() . '/pt/noticias-listagem.aspx')
+			or returnServerError('Could not load content');
+
+		foreach($html->find('.list_news .item') as $element) {
+			$item = array();
+
+			$item_link = $element->find('.body h2.title a', 0);
+			/* Another broken URL, see also `bridges/ComboiosDePortugalBridge.php` */
+			$item['uri'] = self::URI . implode('/', array_map('urlencode', explode('/', $item_link->href)));
+			$item['title'] = $item_link->innertext;
+
+			$item['timestamp'] = str_ireplace(
+				array_map(function($name) { return ' ' . $name . ' '; }, self::PT_MONTH_NAMES),
+				array_map(function($num) { return sprintf('-%02d-', $num); }, range(1, sizeof(self::PT_MONTH_NAMES))),
+				$element->find('span.date', 0)->innertext);
+
+			/* Fix the Image URL */
+			$item_image = $element->find('img.thumb', 0);
+			$item_image->src = preg_replace('/.*&img=([^&]+).*/', '\1', $item_image->getAttribute('data-src'));
+
+			/* Content: */
+			/* - Image */
+			/* - Category */
+			$content = $item_image .
+				'<center>' . $element->find('a.category', 0) . '</center>';
+			$item['content'] = defaultLinkTo($content, self::URI);
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/DiceBridge.php

@@ -0,0 +1,124 @@
+<?php
+class DiceBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'rogerdc';
+	const NAME = 'Dice Unofficial RSS';
+	const URI = 'https://www.dice.com/';
+	const DESCRIPTION = 'The Unofficial Dice RSS';
+	// const CACHE_TIMEOUT = 86400; // 1 day
+
+	const PARAMETERS = array(array(
+		'for_one' => array(
+			'name' => 'With at least one of the words',
+			'required' => false,
+		),
+		'for_all' => array(
+			'name' => 'With all of the words',
+			'required' => false,
+		),
+		'for_exact' => array(
+			'name' => 'With the exact phrase',
+			'required' => false,
+		),
+		'for_none' => array(
+			'name' => 'With none of these words',
+			'required' => false,
+		),
+		'for_jt' => array(
+			'name' => 'Within job title',
+			'required' => false,
+		),
+		'for_com' => array(
+			'name' => 'Within company name',
+			'required' => false,
+		),
+		'for_loc' => array(
+			'name' => 'City, State, or ZIP code',
+			'required' => false,
+		),
+		'radius' => array(
+			'name' => 'Radius in miles',
+			'type' => 'list',
+			'required' => false,
+			'values' => array(
+				'Exact Location' => 'El',
+				'Within 5 miles' => '5',
+				'Within 10 miles' => '10',
+				'Within 20 miles' => '20',
+				'Within 30 miles' => '0',
+				'Within 40 miles' => '40',
+				'Within 50 miles' => '50',
+				'Within 75 miles' => '75',
+				'Within 100 miles' => '100',
+			),
+			'defaultValue' => '0',
+		),
+		'jtype' => array(
+			'name' => 'Job type',
+			'type' => 'list',
+			'required' => false,
+			'values' => array(
+				'Full-Time' => 'Full Time',
+				'Part-Time' => 'Part Time',
+				'Contract - Independent' => 'Contract Independent',
+				'Contract - W2' => 'Contract W2',
+				'Contract to Hire - Independent' => 'C2H Independent',
+				'Contract to Hire - W2' => 'C2H W2',
+				'Third Party - Contract - Corp-to-Corp' => 'Contract Corp-To-Corp',
+				'Third Party - Contract to Hire - Corp-to-Corp' => 'C2H Corp-To-Corp',
+			),
+			'defaultValue' => 'Full Time',
+		),
+		'telecommute' => array(
+			'name' => 'Telecommute',
+			'type' => 'checkbox',
+		),
+	));
+
+	public function getIcon() {
+		return 'https://assets.dice.com/techpro/img/favicons/favicon.ico';
+	}
+
+	public function collectData() {
+		$uri = 'https://www.dice.com/jobs/advancedResult.html';
+		$uri .= '?for_one=' . urlencode($this->getInput('for_one'));
+		$uri .= '&for_all=' . urlencode($this->getInput('for_all'));
+		$uri .= '&for_exact=' . urlencode($this->getInput('for_exact'));
+		$uri .= '&for_none=' . urlencode($this->getInput('for_none'));
+		$uri .= '&for_jt=' . urlencode($this->getInput('for_jt'));
+		$uri .= '&for_com=' . urlencode($this->getInput('for_com'));
+		$uri .= '&for_loc=' . urlencode($this->getInput('for_loc'));
+		if ($this->getInput('jtype')) {
+			$uri .= '&jtype=' . urlencode($this->getInput('jtype'));
+		}
+		$uri .= '&sort=date&limit=100';
+		$uri .= '&radius=' . urlencode($this->getInput('radius'));
+		if ($this->getInput('telecommute')) {
+			$uri .= '&telecommute=true';
+		}
+
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request Dice.');
+		foreach($html->find('div.complete-serp-result-div') as $element) {
+			$item = array();
+			// Title
+			$masterLink = $element->find('a[id^=position]', 0);
+			$item['title'] = $masterLink->title;
+			// URL
+			$uri = $masterLink->href;
+			// $uri = substr($uri, 0, strrpos($uri, '?'));
+			$item['uri'] = substr($uri, 0, strrpos($uri, '?'));
+			// ID
+			$item['id'] = $masterLink->value;
+			// Image
+			$image = $element->find('img', 0);
+			if ($image)
+				$item['image'] = $image->getAttribute('src');
+			// Content
+			$shortdesc = $element->find('.shortdesc', '0');
+			$shortdesc = ($shortdesc) ? $shortdesc->innertext : '';
+			$item['content'] = $shortdesc;
+			$this->items[] = $item;
+		}
+	}
+}

bridges/DilbertBridge.php

@@ -3,24 +3,25 @@ class DilbertBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'kranack';
 	const NAME = 'Dilbert Daily Strip';
-    const URI = 'http://dilbert.com';
+	const URI = 'https://dilbert.com';
 	const CACHE_TIMEOUT = 21600; // 6h
 	const DESCRIPTION = 'The Unofficial Dilbert Daily Comic Strip';
 
 	public function collectData(){
 
-        $html = getSimpleHTMLDOM($this->getURI()) or returnServerError('Could not request Dilbert: '.$this->getURI());
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request Dilbert: ' . self::URI);
 
-        foreach ($html->find('section.comic-item') as $element) {
+		foreach($html->find('section.comic-item') as $element) {
 
 			$img = $element->find('img', 0);
 			$link = $element->find('a', 0);
 			$comic = $img->src;
-            $title = $link->alt;
+			$title = $img->alt;
 			$url = $link->href;
-            $date = substr($url, 25);
+			$date = substr(strrchr($url, '/'), 1);
 			if (empty($title))
-                $title = 'Dilbert Comic Strip on '.$date;
+				$title = 'Dilbert Comic Strip on ' . $date;
 			$date = strtotime($date);
 
 			$item = array();
@@ -28,9 +29,8 @@ class DilbertBridge extends BridgeAbstract {
 			$item['title'] = $title;
 			$item['author'] = 'Scott Adams';
 			$item['timestamp'] = $date;
-            $item['content'] = '<img src="'.$comic.'" alt="'.$img->alt.'" />';
+			$item['content'] = '<img src="' . $comic . '" alt="' . $img->alt . '" />';
 			$this->items[] = $item;
 		}
 	}
 }
-?>

bridges/DiscogsBridge.php

@@ -0,0 +1,116 @@
+<?php
+
+class DiscogsBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'teromene';
+	const NAME = 'DiscogsBridge';
+	const URI = 'https://www.discogs.com/';
+	const DESCRIPTION = 'Returns releases from discogs';
+	const PARAMETERS = array(
+		'Artist Releases' => array(
+			'artistid' => array(
+				'name' => 'Artist ID',
+				'type' => 'number',
+			)
+		),
+		'Label Releases' => array(
+			'labelid' => array(
+				'name' => 'Label ID',
+				'type' => 'number',
+			)
+		),
+		'User Wantlist' => array(
+			'username_wantlist' => array(
+				'name' => 'Username',
+				'type' => 'text',
+			)
+		),
+		'User Folder' => array(
+			'username_folder' => array(
+				'name' => 'Username',
+				'type' => 'text',
+			),
+			'folderid' => array(
+				'name' => 'Folder ID',
+				'type' => 'number',
+			)
+		)
+	);
+
+	public function collectData() {
+
+		if(!empty($this->getInput('artistid')) || !empty($this->getInput('labelid'))) {
+
+			if(!empty($this->getInput('artistid'))) {
+				$data = getContents('https://api.discogs.com/artists/'
+						. $this->getInput('artistid')
+						. '/releases?sort=year&sort_order=desc')
+						or returnServerError('Unable to query discogs !');
+			} elseif(!empty($this->getInput('labelid'))) {
+				$data = getContents('https://api.discogs.com/labels/'
+						. $this->getInput('labelid')
+						. '/releases?sort=year&sort_order=desc')
+						or returnServerError('Unable to query discogs !');
+			}
+
+			$jsonData = json_decode($data, true);
+			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;
+
+				if(isset($release['year'])) {
+					$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'))) {
+
+			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'];
+
+			} 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'];
+			}
+			foreach($jsonData as $element) {
+
+				$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'];
+				$this->items[] = $item;
+
+			}
+		}
+
+	}
+
+	public function getURI() {
+		return self::URI;
+	}
+
+	public function getName() {
+		return static::NAME;
+	}
+}

bridges/DollbooruBridge.php

@@ -1,11 +0,0 @@
-<?php
-require_once('Shimmie2Bridge.php');
-
-class DollbooruBridge extends Shimmie2Bridge{
-
-	const MAINTAINER = "mitsukarenai";
-	const NAME = "Dollbooru";
-	const URI = "http://dollbooru.org/";
-	const DESCRIPTION = "Returns images from given page";
-
-}

bridges/DonnonsBridge.php

@@ -0,0 +1,123 @@
+<?php
+/**
+ * Retourne les dons d'une recherche filtrée sur le site Donnons.org
+ * Example: https://donnons.org/Sport/Ile-de-France
+ */
+class DonnonsBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'Binnette';
+	const NAME = 'Donnons.org';
+	const URI = 'https://donnons.org';
+	const CACHE_TIMEOUT = 1800; // 30min
+	const DESCRIPTION = 'Retourne les dons depuis le site Donnons.org.';
+
+	const PARAMETERS = array(
+		array(
+			'q' => array(
+				'name' => 'Url de recherche',
+				'required' => true,
+				'exampleValue' => '/Sport/Ile-de-France',
+				'pattern' => '\/.*',
+				'title' => 'Faites une recherche sur le site. Puis copiez ici la fin de l’url. Doit commencer par /',
+			),
+			'p' => array(
+				'name' => 'Nombre de pages à scanner',
+				'type' => 'number',
+				'defaultValue' => 5,
+				'title' => 'Indique le nombre de pages de donnons.org qui seront scannées'
+			)
+		)
+	);
+
+	public function collectData() {
+		$pages = $this->getInput('p');
+
+		for($i = 1; $i <= $pages; $i++) {
+			$this->collectDataByPage($i);
+		}
+	}
+
+	private function collectDataByPage($page) {
+		$uri = $this->getPageURI($page);
+
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('No results for this query.');
+
+		$searchDiv = $html->find('div[id=search]', 0);
+
+		if(!is_null($searchDiv)) {
+			$elements = $searchDiv->find('a.lst-annonce');
+			foreach($elements as $element) {
+				$item = array();
+
+				// Lien vers le don
+				$item['uri'] = self::URI . $element->href;
+				// Id de l'objet
+				$item['uid'] = $element->getAttribute('data-id');
+
+				// Grab info from json
+				$jsonString = $element->find('script', 0)->innertext;
+				$json = json_decode($jsonString, true);
+
+				$name = $json['name'];
+				$category = $json['category'];
+				$date = $json['availabilityStarts'];
+				$description = $json['description'];
+				$city = $json['availableAtOrFrom']['address']['addressLocality'];
+				$region = $json['availableAtOrFrom']['address']['addressRegion'];
+
+				// Grab info from HTML
+				$imageSrc = $element->find('img.ima-center', 0)->getAttribute('data-src');
+				$image = self::URI . $imageSrc;
+				$author = $element->find('div.avatar-holder', 0)->plaintext;
+
+				$content = '
+					<img style="margin-right:1em;" src="' . $image . '">
+					<div>
+						<h1>' . $name . '</h1>
+						<p>' . $description . '</p>
+						<p>Lieu : <b>' . $city . '</b> - ' . $region . '</p>
+						<p>Par : ' . $author . '</p>
+						<p>Date : ' . $date . '</p>
+					</div>
+				';
+
+				// Titre du don
+				$item['title'] = '[' . $category . '] ' . $name;
+				$item['timestamp'] = $date;
+				$item['author'] = $author;
+				$item['content'] = $content;
+				$item['enclosures'] = array($image);
+
+				$this->items[] = $item;
+			}
+		}
+	}
+
+	private function getPageURI($page) {
+		$uri = $this->getURI();
+		$haveQueryParams = strpos($uri, '?') !== false;
+
+		if($haveQueryParams) {
+			return $uri . '&page=' . $page;
+		} else {
+			return $uri . '?page=' . $page;
+		}
+	}
+
+	public function getURI() {
+		if(!is_null($this->getInput('q'))) {
+			return self::URI . $this->getInput('q');
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+		if(!is_null($this->getInput('q'))) {
+			return 'Donnons.org - ' . $this->getInput('q');
+		}
+
+		return parent::getName();
+	}
+}

bridges/DribbbleBridge.php

@@ -0,0 +1,99 @@
+<?php
+class DribbbleBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'quentinus95';
+	const NAME = 'Dribbble popular shots';
+	const URI = 'https://dribbble.com';
+	const CACHE_TIMEOUT = 1800;
+	const DESCRIPTION = 'Returns the newest popular shots from Dribbble.';
+
+	public function getIcon() {
+		return 'https://cdn.dribbble.com/assets/
+favicon-63b2904a073c89b52b19aa08cebc16a154bcf83fee8ecc6439968b1e6db569c7.ico';
+	}
+
+	public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Error while downloading the website content');
+
+		$json = $this->loadEmbeddedJsonData($html);
+
+		foreach($html->find('li[id^="screenshot-"]') as $shot) {
+			$item = array();
+
+			$additional_data = $this->findJsonForShot($shot, $json);
+			if ($additional_data === null) {
+				$item['uri'] = self::URI . $shot->find('a', 0)->href;
+				$item['title'] = $shot->find('.shot-title', 0)->plaintext;
+			} else {
+				$item['timestamp'] = strtotime($additional_data['published_at']);
+				$item['uri'] = self::URI . $additional_data['path'];
+				$item['title'] = $additional_data['title'];
+			}
+
+			$item['author'] = trim($shot->find('.user-information .display-name', 0)->plaintext);
+
+			$description = $shot->find('.comment', 0);
+			$item['content'] = $description === null ? '' : $description->plaintext;
+
+			$preview_path = $shot->find('figure img', 1)->attr['data-srcset'];
+			$item['content'] .= $this->getImageTag($preview_path, $item['title']);
+			$item['enclosures'] = array($this->getFullSizeImagePath($preview_path));
+
+			$this->items[] = $item;
+		}
+	}
+
+	private function loadEmbeddedJsonData($html){
+		$json = array();
+		$scripts = $html->find('script');
+
+		foreach($scripts as $script) {
+			if(strpos($script->innertext, 'newestShots') !== false) {
+				// fix single quotes
+				$script->innertext = preg_replace('/\'(.*)\'(,?)$/im', '"\1"\2', $script->innertext);
+
+				// fix JavaScript JSON (why do they not adhere to the standard?)
+				$script->innertext = preg_replace('/^(\s*)(\w+):/im', '\1"\2":', $script->innertext);
+
+				// fix relative dates, so they are recognized by strtotime
+				$script->innertext = preg_replace('/"about ([0-9]+ hours? ago)"(,?)$/im', '"\1"\2', $script->innertext);
+
+				// find beginning of JSON array
+				$start = strpos($script->innertext, '[');
+
+				// find end of JSON array, compensate for missing character!
+				$end = strpos($script->innertext, '];') + 1;
+
+				// convert JSON to PHP array
+				$json = json_decode(substr($script->innertext, $start, $end - $start), true);
+				break;
+			}
+		}
+
+		return $json;
+	}
+
+	private function findJsonForShot($shot, $json){
+		foreach($json as $element) {
+			if(strpos($shot->getAttribute('id'), (string)$element['id']) !== false) {
+				return $element;
+			}
+		}
+
+		return null;
+	}
+
+	private function getImageTag($preview_path, $title){
+		return sprintf(
+			'<br /> <a href="%s"><img src="%s" alt="%s" /></a>',
+			$this->getFullSizeImagePath($preview_path),
+			$preview_path,
+			$title
+		);
+	}
+
+	private function getFullSizeImagePath($preview_path){
+		return explode("?compress=1", $preview_path)[0];
+	}
+}

bridges/DuckDuckGoBridge.php

@@ -1,33 +1,34 @@
 <?php
-class DuckDuckGoBridge extends BridgeAbstract{
+class DuckDuckGoBridge extends BridgeAbstract {
 
-	const MAINTAINER = "Astalaseven";
-	const NAME = "DuckDuckGo";
-	const URI = "https://duckduckgo.com/";
+	const MAINTAINER = 'Astalaseven';
+	const NAME = 'DuckDuckGo';
+	const URI = 'https://duckduckgo.com/';
 	const CACHE_TIMEOUT = 21600; // 6h
-	const DESCRIPTION = "Returns results from DuckDuckGo.";
+	const DESCRIPTION = 'Returns results from DuckDuckGo.';
 
 	const SORT_DATE = '+sort:date';
 	const SORT_RELEVANCE = '';
 
 	const PARAMETERS = array( array(
-        'u'=>array(
-            'name'=>'keyword',
-            'required'=>true),
-        'sort'=>array(
-            'name'=>'sort by',
-            'type'=>'list',
-            'required'=>false,
-            'values'=>array(
-                'date'=>self::SORT_DATE,
-                'relevance'=>self::SORT_RELEVANCE
+		'u' => array(
+			'name' => 'keyword',
+			'required' => true
 		),
-            'defaultValue'=>self::SORT_DATE
+		'sort' => array(
+			'name' => 'sort by',
+			'type' => 'list',
+			'required' => false,
+			'values' => array(
+				'date' => self::SORT_DATE,
+				'relevance' => self::SORT_RELEVANCE
+			),
+			'defaultValue' => self::SORT_DATE
 		)
 	));
 
 	public function collectData(){
-        $html = getSimpleHTMLDOM(self::URI.'html/?q='.$this->getInput('u').$this->getInput('sort'))
+		$html = getSimpleHTMLDOM(self::URI . 'html/?kd=-1&q=' . $this->getInput('u') . $this->getInput('sort'))
 			or returnServerError('Could not request DuckDuckGo.');
 
 		foreach($html->find('div.results_links') as $element) {

bridges/ETTVBridge.php

@@ -0,0 +1,161 @@
+<?php
+class ETTVBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'GregThib';
+	const NAME = 'ETTV';
+	const URI = 'https://www.ettv.tv/';
+	const DESCRIPTION = 'Returns list of 20 latest torrents for a specific search.';
+	const CACHE_TIMEOUT = 14400; // 4 hours
+
+	const PARAMETERS = array( array(
+		'query' => array(
+			'name' => 'Keywords',
+			'required' => true
+		),
+		'cat' => array(
+			'type' => 'list',
+			'name' => 'Category',
+			'values' => array(
+				'(ALL TYPES)' => '0',
+				'Anime: Movies' => '73',
+				'Anime: Dubbed/Subbed' => '74',
+				'Anime: Others' => '75',
+				'Books: Ebooks' => '53',
+				'Books: Magazines' => '54',
+				'Books: Comics' => '55',
+				'Books: Audio' => '56',
+				'Books: Others' => '68',
+				'Games: Windows' => '57',
+				'Games: Android' => '58',
+				'Games: Others' => '71',
+				'Movies: HD 1080p' => '1',
+				'Movies: HD 720p' => '2',
+				'Movies: UltraHD/4K' => '3',
+				'Movies: XviD' => '42',
+				'Movies: X264/H264' => '47',
+				'Movies: 3D' => '49',
+				'Movies: Dubs/Dual Audio' => '51',
+				'Movies: CAM/TS' => '65',
+				'Movies: BluRay Disc/Remux' => '66',
+				'Movies: DVDR' => '67',
+				'Movies: HEVC/x265' => '76',
+				'Music: MP3' => '59',
+				'Music: FLAC' => '60',
+				'Music: Music Videos' => '61',
+				'Music: Others' => '69',
+				'Software: Windows' => '62',
+				'Software: Android' => '63',
+				'Software: Mac' => '64',
+				'Software: Others' => '70',
+				'TV: HD/X264/H264' => '41',
+				'TV: SD/X264/H264' => '5',
+				'TV: TV Packs' => '7',
+				'TV: SD/XVID' => '50',
+				'TV: Sport' => '72',
+				'TV: HEVC/x265' => '77',
+				'Unsorted: Unsorted' => '78'
+			),
+			'defaultValue' => '(ALL TYPES)'
+		),
+		'status' => array(
+			'type' => 'list',
+			'name' => 'Status',
+			'values' => array(
+				'Active Transfers' => '0',
+				'Included Dead' => '1',
+				'Only Dead' => '2'
+			),
+			'defaultValue' => 'Included Dead'
+		),
+		'lang' => array(
+			'type' => 'list',
+			'name' => 'Lang',
+			'values' => array(
+				'(ALL)' => '0',
+				'Arabic' => '17',
+				'Chinese ' => '10',
+				'Danish' => '13',
+				'Dutch' => '11',
+				'English' => '1',
+				'Finnish' => '18',
+				'French' => '2',
+				'German' => '3',
+				'Greek' => '15',
+				'Hindi' => '8',
+				'Italian' => '4',
+				'Japanese' => '5',
+				'Korean' => '9',
+				'Polish' => '14',
+				'Russian' => '7',
+				'Spanish' => '6',
+				'Turkish' => '16'
+			),
+			'defaultValue' => '(ALL)'
+		)
+	));
+
+	protected $results_link;
+
+	public function collectData(){
+		// No control on inputs, because all defaultValue are set
+		$query_str = 'torrents-search.php';
+		$query_str .= '?search=' . urlencode('+' . str_replace(' ', ' +', $this->getInput('query')));
+		$query_str .= '&cat=' . $this->getInput('cat');
+		$query_str .= '&incldead=' . $this->getInput('status');
+		$query_str .= '&lang=' . $this->getInput('lang');
+		$query_str .= '&sort=id&order=desc';
+
+		// Get results page
+		$this->results_link = self::URI . $query_str;
+		$html = getSimpleHTMLDOM($this->results_link)
+			or returnServerError('Could not request ' . $this->getName());
+
+		// Loop on each entry
+		foreach($html->find('table.table tr') as $element) {
+			if($element->parent->tag == 'thead') continue;
+			$entry = $element->find('td', 1)->find('a', 0);
+
+			// retrieve result page to get more details
+			$link = rtrim(self::URI, '/') . $entry->href;
+			$page = getSimpleHTMLDOM($link)
+				or returnServerError('Could not request page ' . $link);
+
+			// get details & download links
+			$details = $page->find('fieldset.download table', 0); // WHAT?? It should be the second one…
+			$dllinks = $page->find('div#downloadbox table', 0);
+
+			// fill item
+			$item = array();
+			$item['author'] = $details->children(6)->children(1)->plaintext;
+			$item['title'] = $entry->title;
+			$item['uri'] = $link;
+			$item['timestamp'] = strtotime($details->children(7)->children(1)->plaintext);
+			$item['content'] = '';
+			$item['content'] .= '<br/><b>Name: </b>' . $details->children(0)->children(1)->innertext;
+			$item['content'] .= '<br/><b>Lang: </b>' . $details->children(3)->children(1)->innertext;
+			$item['content'] .= '<br/><b>Size: </b>' . $details->children(4)->children(1)->innertext;
+			$item['content'] .= '<br/><b>Hash: </b>' . $details->children(5)->children(1)->innertext;
+			foreach($dllinks->children(0)->children(1)->find('a') as $dl) {
+				$item['content'] .= '<br/>' . $dl->outertext;
+			}
+			$item['content'] .= '<br/><br/>' . $details->children(1)->children(0)->innertext;
+			$this->items[] = $item;
+		}
+	}
+
+	public function getName(){
+		if($this->getInput('query')) {
+			return '[' . self::NAME . '] ' . $this->getInput('query');
+		}
+
+		return self::NAME;
+	}
+
+	public function getURI(){
+		if(isset($this->results_link) && !empty($this->results_link)) {
+			return $this->results_link;
+		}
+
+		return self::URI;
+	}
+}

bridges/EZTVBridge.php

@@ -1,16 +1,17 @@
 <?php
-class EZTVBridge extends BridgeAbstract{
+class EZTVBridge extends BridgeAbstract {
 
-	const MAINTAINER = "alexAubin";
-	const NAME = "EZTV";
-	const URI = "https://eztv.ch/";
-	const DESCRIPTION = "Returns list of *recent* torrents for a specific show on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name.";
+	const MAINTAINER = 'alexAubin';
+	const NAME = 'EZTV';
+	const URI = 'https://eztv.ch/';
+	const DESCRIPTION = 'Returns list of *recent* torrents for a specific show
+on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name.';
 
 	const PARAMETERS = array( array(
-        'i'=>array(
-            'name'=>'Show ids',
-            'exampleValue'=>'showID1,showID2,…',
-            'required'=>true
+		'i' => array(
+			'name' => 'Show ids',
+			'exampleValue' => 'showID1,showID2,…',
+			'required' => true
 		)
 	));
 
@@ -22,38 +23,38 @@ class EZTVBridge extends BridgeAbstract{
 			$relativeDays = 0;
 			$relativeHours = 0;
 
-                foreach (explode(" ",$relativeReleaseTime) as $relativeTimeElement) {
-                    if (substr($relativeTimeElement,-1) == "d") $relativeDays = substr($relativeTimeElement,0,-1);
-                    if (substr($relativeTimeElement,-1) == "h") $relativeHours = substr($relativeTimeElement,0,-1);
+			foreach(explode(' ', $relativeReleaseTime) as $relativeTimeElement) {
+				if(substr($relativeTimeElement, -1) == 'd') $relativeDays = substr($relativeTimeElement, 0, -1);
+				if(substr($relativeTimeElement, -1) == 'h') $relativeHours = substr($relativeTimeElement, 0, -1);
 			}
-                return mktime(date('h')-$relativeHours,0,0,date('m'),date('d')-$relativeDays,date('Y'));
+			return mktime(date('h') - $relativeHours, 0, 0, date('m'), date('d') - $relativeDays, date('Y'));
 		}
 
 		// Loop on show ids
-        $showList = explode(",",$this->getInput('i'));
-        foreach($showList as $showID){
+		$showList = explode(',', $this->getInput('i'));
+		foreach($showList as $showID) {
 
 			// Get show page
-            $html = getSimpleHTMLDOM(self::URI.'shows/'.rawurlencode($showID).'/')
-                or returnServerError('Could not request EZTV for id "'.$showID.'"');
+			$html = getSimpleHTMLDOM(self::URI . 'shows/' . rawurlencode($showID) . '/')
+				or returnServerError('Could not request EZTV for id "' . $showID . '"');
 
 			// Loop on each element that look like an episode entry...
 			foreach($html->find('.forum_header_border') as $element) {
 
 				// Filter entries that are not episode entries
-                $ep = $element->find('td',1);
-                if (empty($ep)) continue;
-                $epinfo = $ep->find('.epinfo',0);
-                $released = $element->find('td',3);
-                if (empty($epinfo)) continue;
-                if (empty($released->plaintext)) continue;
+				$ep = $element->find('td', 1);
+				if(empty($ep)) continue;
+				$epinfo = $ep->find('.epinfo', 0);
+				$released = $element->find('td', 3);
+				if(empty($epinfo)) continue;
+				if(empty($released->plaintext)) continue;
 
 				// Filter entries that are older than 1 week
-                if ($released->plaintext == '&gt;1 week') continue;
+				if($released->plaintext == '&gt;1 week') continue;
 
 				// Fill item
 				$item = array();
-                $item['uri'] = self::URI.$epinfo->href;
+				$item['uri'] = self::URI . $epinfo->href;
 				$item['id'] = $item['uri'];
 				$item['timestamp'] = makeTimestamp($released->plaintext);
 				$item['title'] = $epinfo->plaintext;

bridges/EconomistBridge.php

@@ -0,0 +1,63 @@
+<?php
+class EconomistBridge extends BridgeAbstract {
+	const NAME = 'The Economist: Latest Updates';
+	const URI = 'https://www.economist.com';
+	const DESCRIPTION = 'Fetches the latest updates from the Economist.';
+	const MAINTAINER = 'thefranke';
+	const CACHE_TIMEOUT = 3600; // 1h
+
+	public function getIcon() {
+		return 'https://www.economist.com/sites/default/files/econfinal_favicon.ico';
+	}
+
+	public function collectData() {
+		$html = getSimpleHTMLDOM(self::URI . '/latest/')
+			or returnServerError('Could not fetch latest updates form The Economist.');
+
+		foreach($html->find('article') as $element) {
+
+			$a = $element->find('a', 0);
+			$href = self::URI . $a->href;
+			$full = getSimpleHTMLDOMCached($href);
+			$article = $full->find('article', 0);
+
+			$header = $article->find('h1', 0);
+			$author = $article->find('span[itemprop="author"]', 0);
+			$time = $article->find('time[itemprop="dateCreated"]', 0);
+			$content = $article->find('div[itemprop="description"]', 0);
+
+			// Remove newsletter subscription box
+			$newsletter = $content->find('div[class="newsletter-form__message"]', 0);
+			if ($newsletter)
+				$newsletter->outertext = '';
+
+			$newsletterForm = $content->find('form', 0);
+			if ($newsletterForm)
+				$newsletterForm->outertext = '';
+
+			// Remove next and previous article URLs at the bottom
+			$nextprev = $content->find('div[class="blog-post__next-previous-wrapper"]', 0);
+			if ($nextprev)
+				$nextprev->outertext = '';
+
+			$section = array( $article->find('h3[itemprop="articleSection"]', 0)->plaintext );
+
+			$item = array();
+			$item['title'] = $header->find('span', 0)->innertext . ': '
+				. $header->find('span', 1)->innertext;
+
+			$item['uri'] = $href;
+			$item['timestamp'] = strtotime($time->datetime);
+			$item['author'] = $author->innertext;
+			$item['categories'] = $section;
+
+			$item['content'] = '<img style="max-width: 100%" src="'
+				. $a->find('img', 0)->src . '">' . $content->innertext;
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10)
+				break;
+		}
+	}
+}

bridges/EliteDangerousGalnetBridge.php

@@ -1,25 +1,41 @@
 <?php
-class EliteDangerousGalnetBridge extends BridgeAbstract
-{
-	const MAINTAINER = "corenting";
-	const NAME = "Elite: Dangerous Galnet";
-	const URI = "https://community.elitedangerous.com/galnet/";
-    const CACHE_TIMEOUT = 7200; // 2h
-	const DESCRIPTION = "Returns the latest page of news from Galnet";
+class EliteDangerousGalnetBridge extends BridgeAbstract {
 
-	public function collectData()
-	{
-        $html = getSimpleHTMLDOM(self::URI)
+	const MAINTAINER = 'corenting';
+	const NAME = 'Elite: Dangerous Galnet';
+	const URI = 'https://community.elitedangerous.com/galnet/';
+	const CACHE_TIMEOUT = 7200; // 2h
+	const DESCRIPTION = 'Returns the latest page of news from Galnet';
+	const PARAMETERS = array(
+		array(
+			'language' => array(
+				'name' => 'Language',
+				'type' => 'list',
+				'values' => array(
+					'English' => 'en',
+					'French' => 'fr',
+					'German' => 'de'
+				),
+				'defaultValue' => 'en'
+			)
+		)
+	);
+
+	public function collectData(){
+		$language = $this->getInput('language');
+		$url = 'https://community.elitedangerous.com/';
+		$url = $url . $language . '/galnet';
+		$html = getSimpleHTMLDOM($url)
 			or returnServerError('Error while downloading the website content');
+
 		foreach($html->find('div.article') as $element) {
 			$item = array();
 
 			$uri = $element->find('h3 a', 0)->href;
-			$uri = self::URI . substr($uri,strlen('/galnet/'));
+			$uri = 'https://community.elitedangerous.com/' . $language . $uri;
 			$item['uri'] = $uri;
 
-			$title = $element->find('h3 a', 0)->plaintext;
-			$item['title'] = substr($title, 1); //remove the space between icon and title
+			$item['title'] = $element->find('h3 a', 0)->plaintext;
 
 			$content = $element->find('p', -1)->innertext;
 			$item['content'] = $content;
@@ -31,5 +47,8 @@ class EliteDangerousGalnetBridge extends BridgeAbstract
 
 			$this->items[] = $item;
 		}
+
+		//Remove duplicates that sometimes show up on the website
+		$this->items = array_unique($this->items, SORT_REGULAR);
 	}
 }

bridges/ElloBridge.php

@@ -0,0 +1,148 @@
+<?php
+class ElloBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'teromene';
+	const NAME = 'Ello Bridge';
+	const URI = 'https://ello.co/';
+	const CACHE_TIMEOUT = 4800; //2hours
+	const DESCRIPTION = 'Returns the newest posts for Ello';
+
+	const PARAMETERS = array(
+		'By User' => array(
+			'u' => array(
+				'name' => 'Username',
+				'required' => true,
+				'title' => 'Username'
+			)
+		),
+		'Search' => array(
+			's' => array(
+				'name' => 'Search',
+				'required' => true,
+				'title' => 'Search'
+			)
+		)
+	);
+
+	public function collectData() {
+
+		$header = array(
+			'Authorization: Bearer ' . $this->getAPIKey()
+		);
+
+		if(!empty($this->getInput('u'))) {
+			$postData = getContents(self::URI . 'api/v2/users/~' . urlencode($this->getInput('u')) . '/posts', $header) or
+				returnServerError('Unable to query Ello API.');
+		} else {
+			$postData = getContents(self::URI . 'api/v2/posts?terms=' . urlencode($this->getInput('s')), $header) or
+				returnServerError('Unable to query Ello API.');
+		}
+
+		$postData = json_decode($postData);
+		$count = 0;
+		foreach($postData->posts as $post) {
+
+			$item = array();
+			$item['author'] = $this->getUsername($post, $postData);
+			$item['timestamp'] = strtotime($post->created_at);
+			$item['title'] = strip_tags($this->findText($post->summary));
+			$item['content'] = $this->getPostContent($post->body);
+			$item['enclosures'] = $this->getEnclosures($post, $postData);
+			$item['uri'] = self::URI . $item['author'] . '/post/' . $post->token;
+			$content = $post->body;
+
+			$this->items[] = $item;
+			$count += 1;
+
+		}
+
+	}
+
+	private function findText($path) {
+
+		foreach($path as $summaryElement) {
+
+			if($summaryElement->kind == 'text') {
+				return $summaryElement->data;
+			}
+
+		}
+
+		return '';
+
+	}
+
+	private function getPostContent($path) {
+
+		$content = '';
+		foreach($path as $summaryElement) {
+
+			if($summaryElement->kind == 'text') {
+				$content .= $summaryElement->data;
+			} elseif ($summaryElement->kind == 'image') {
+				$alt = '';
+				if(property_exists($summaryElement->data, 'alt')) {
+					$alt = $summaryElement->data->alt;
+				}
+				$content .= '<img src="' . $summaryElement->data->url . '" alt="' . $alt . '" />';
+			}
+
+		}
+
+		return $content;
+
+	}
+
+	private function getEnclosures($post, $postData) {
+
+		$assets = array();
+		foreach($post->links->assets as $asset) {
+			foreach($postData->linked->assets as $assetLink) {
+				if($asset == $assetLink->id) {
+					$assets[] = $assetLink->attachment->original->url;
+					break;
+				}
+			}
+		}
+
+		return $assets;
+
+	}
+
+	private function getUsername($post, $postData) {
+
+		foreach($postData->linked->users as $user) {
+			if($user->id == $post->links->author->id) {
+				return $user->username;
+			}
+		}
+
+	}
+
+	private function getAPIKey() {
+		$cacheFac = new CacheFactory();
+		$cacheFac->setWorkingDir(PATH_LIB_CACHES);
+		$cache = $cacheFac->create(Configuration::getConfig('cache', 'type'));
+		$cache->setScope(get_called_class());
+		$cache->setKey(array('key'));
+		$key = $cache->loadData();
+
+		if($key == null) {
+			$keyInfo = getContents(self::URI . 'api/webapp-token') or
+				returnServerError('Unable to get token.');
+			$key = json_decode($keyInfo)->token->access_token;
+			$cache->saveData($key);
+		}
+
+		return $key;
+
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('u'))) {
+			return $this->getInput('u') . ' - Ello Bridge';
+		}
+
+		return parent::getName();
+	}
+}

bridges/ElsevierBridge.php

@@ -1,22 +1,23 @@
 <?php
-class ElsevierBridge extends BridgeAbstract{
+class ElsevierBridge extends BridgeAbstract {
+
 	const MAINTAINER = 'Pierre Mazière';
 	const NAME = 'Elsevier journals recent articles';
-	const URI = 'http://www.journals.elsevier.com/';
+	const URI = 'https://www.journals.elsevier.com/';
 	const CACHE_TIMEOUT = 43200; //12h
 	const DESCRIPTION = 'Returns the recent articles published in Elsevier journals';
 
 	const PARAMETERS = array( array(
-        'j'=>array(
-            'name'=>'Journal name',
-            'required'=>true,
-            'exampleValue'=>'academic-pediactrics',
-            'title'=>'Insert html-part of your journal'
+		'j' => array(
+			'name' => 'Journal name',
+			'required' => true,
+			'exampleValue' => 'academic-pediactrics',
+			'title' => 'Insert html-part of your journal'
 		)
 	));
 
 	// Extracts the list of names from an article as string
-	private function ExtractArticleName ($article){
+	private function extractArticleName($article){
 		$names = $article->find('small', 0);
 		if($names)
 			return trim($names->plaintext);
@@ -24,9 +25,9 @@ class ElsevierBridge extends BridgeAbstract{
 	}
 
 	// Extracts the timestamp from an article
-	private function ExtractArticleTimestamp ($article){
+	private function extractArticleTimestamp($article){
 		$time = $article->find('.article-info', 0);
-		if($time){
+		if($time) {
 			$timestring = trim($time->plaintext);
 			/*
 				The format depends on the age of an article:
@@ -34,11 +35,11 @@ class ElsevierBridge extends BridgeAbstract{
 				- July 2016
 				- May–June 2016
 			*/
-			if(preg_match('/\S*(\d+\s\S+\s\d{4})/ims', $timestring, $matches)){
+			if(preg_match('/\S*(\d+\s\S+\s\d{4})/ims', $timestring, $matches)) {
 				return strtotime($matches[0]);
-			} elseif (preg_match('/[A-Za-z]+\-([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
+			} elseif (preg_match('/[A-Za-z]+\-([A-Za-z]+\s\d{4})/ims', $timestring, $matches)) {
 				return strtotime($matches[0]);
-			} elseif (preg_match('/([A-Za-z]+\s\d{4})/ims', $timestring, $matches)){
+			} elseif (preg_match('/([A-Za-z]+\s\d{4})/ims', $timestring, $matches)) {
 				return strtotime($matches[0]);
 			} else {
 				return 0;
@@ -48,27 +49,31 @@ class ElsevierBridge extends BridgeAbstract{
 	}
 
 	// Extracts the content from an article
-	private function ExtractArticleContent ($article){
+	private function extractArticleContent($article){
 		$content = $article->find('.article-content', 0);
-		if($content){
+		if($content) {
 			return trim($content->plaintext);
 		}
 		return '';
 	}
 
+	public function getIcon() {
+		return 'https://cdn.elsevier.io/verona/includes/favicons/favicon-32x32.png';
+	}
+
 	public function collectData(){
 		$uri = self::URI . $this->getInput('j') . '/recent-articles/';
-		$html = getSimpleHTMLDOM($uri) or returnServerError('No results for Elsevier journal '.$this->getInput('j'));
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('No results for Elsevier journal ' . $this->getInput('j'));
 
-		foreach($html->find('.pod-listing') as $article){
+		foreach($html->find('.pod-listing') as $article) {
 			$item = array();
-			$item['uri'] = $article->find('.pod-listing-header>a',0)->getAttribute('href').'?np=y';
-			$item['title'] = $article->find('.pod-listing-header>a',0)->plaintext;
-			$item['author'] = $this->ExtractArticleName($article);
-			$item['timestamp'] = $this->ExtractArticleTimestamp($article);
-			$item['content'] = $this->ExtractArticleContent($article);
+			$item['uri'] = $article->find('.pod-listing-header>a', 0)->getAttribute('href') . '?np=y';
+			$item['title'] = $article->find('.pod-listing-header>a', 0)->plaintext;
+			$item['author'] = $this->extractArticleName($article);
+			$item['timestamp'] = $this->extractArticleTimestamp($article);
+			$item['content'] = $this->extractArticleContent($article);
 			$this->items[] = $item;
 		}
 	}
 }
-?>

bridges/EngadgetBridge.php

@@ -0,0 +1,26 @@
+<?php
+class EngadgetBridge extends FeedExpander {
+
+	const MAINTAINER = 'IceWreck';
+	const NAME = 'Engadget Bridge';
+	const URI = 'https://www.engadget.com/';
+	const CACHE_TIMEOUT = 3600;
+	const DESCRIPTION = 'Article content for Engadget.';
+
+	public function collectData(){
+		$this->collectExpandableDatas(static::URI . 'rss.xml', 15);
+	}
+
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+		// $articlePage gets the entire page's contents
+		$articlePage = getSimpleHTMLDOM($newsItem->link);
+		// figure contain's the main article image
+		$article = $articlePage->find('figure', 0);
+		// .article-text has the actual article
+		foreach($articlePage->find('.article-text') as $element)
+			$article = $article . $element;
+		$item['content'] = $article;
+		return $item;
+	}
+}

bridges/EpicgamesBridge.php

@@ -0,0 +1,100 @@
+<?php
+class EpicgamesBridge extends BridgeAbstract {
+
+	const NAME = 'Epic Games Store News';
+	const MAINTAINER = 'otakuf';
+	const URI = 'https://www.epicgames.com';
+	const DESCRIPTION = 'Returns the latest posts from epicgames.com';
+	const CACHE_TIMEOUT = 3600; // 60min
+
+	const PARAMETERS = array( array(
+		'postcount' => array(
+			'name' => 'Limit',
+			'type' => 'list',
+			'values' => array(
+				'5' => 5,
+				'10' => 10,
+				'15' => 15,
+				'20' => 20,
+				'25' => 25,
+			 ),
+			'title' => 'Maximum number of items to return',
+			'defaultValue' => 10,
+		),
+		'language' => array(
+			'name' => 'Language',
+			'type' => 'list',
+			'values' => array(
+				'English' => 'en',
+				'العربية' => 'ar',
+				'Deutsch' => 'de',
+				'Español (Spain)' => 'es-ES',
+				'Español (LA)' => 'es-MX',
+				'Français' => 'fr',
+				'Italiano' => 'it',
+				'日本語' => 'ja',
+				'한국어' => 'ko',
+				'Polski' => 'pl',
+				'Português (Brasil)' => 'pt-BR',
+				'Русский' => 'ru',
+				'ไทย' => 'th',
+				'Türkçe' => 'tr',
+				'简体中文' => 'zh-CN',
+				'繁體中文' => 'zh-Hant',
+			 ),
+			'title' => 'Language of blog posts',
+			'defaultValue' => 'en',
+		),
+	));
+
+	public function collectData() {
+		$api = 'https://store-content.ak.epicgames.com/api/';
+
+		// Get sticky posts first
+		// Example: https://store-content.ak.epicgames.com/api/ru/content/blog/sticky?locale=ru
+		$urlSticky = $api . $this->getInput('language') . '/content/blog/sticky';
+		// Then get posts
+		// Example: https://store-content.ak.epicgames.com/api/ru/content/blog?limit=25
+		$urlBlog = $api . $this->getInput('language') . '/content/blog?limit=' . $this->getInput('postcount');
+
+		$dataSticky = getContents($urlSticky)
+			or returnServerError('Unable to get the sticky posts from epicgames.com!');
+		$dataBlog = getContents($urlBlog)
+			or returnServerError('Unable to get the news posts from epicgames.com!');
+
+		// Merge data
+		$decodedData = array_merge(json_decode($dataSticky), json_decode($dataBlog));
+
+		foreach($decodedData as $key => $value) {
+			$item = array();
+			$item['uri'] = self::URI . $value->url;
+			$item['title'] = $value->title;
+			$item['timestamp'] = $value->date;
+			$item['author'] = 'Epic Games Store';
+			if(!empty($value->author)) {
+				$item['author'] = $value->author;
+			}
+			if(!empty($value->content)) {
+				$item['content'] = defaultLinkTo($value->content, self::URI);
+			}
+			if(!empty($value->image)) {
+				$item['enclosures'][] = $value->image;
+			}
+			$item['uid'] = $value->_id;
+			$item['id'] = $value->_id;
+
+			$this->items[] = $item;
+		}
+
+		// Sort data
+		usort($this->items, function ($item1, $item2) {
+			if ($item2['timestamp'] == $item1['timestamp']) {
+				return 0;
+			}
+			return ($item2['timestamp'] < $item1['timestamp']) ? -1 : 1;
+		});
+
+		// Limit data
+		$this->items = array_slice($this->items, 0, $this->getInput('postcount'));
+	}
+}

bridges/EsquerdaNetBridge.php

@@ -0,0 +1,70 @@
+<?php
+class EsquerdaNetBridge extends FeedExpander {
+	const MAINTAINER = 'somini';
+	const NAME = 'Esquerda.net';
+	const URI = 'https://www.esquerda.net';
+	const DESCRIPTION = 'Esquerda.net';
+	const PARAMETERS = array(
+		array(
+			'feed' => array(
+				'name' => 'Feed',
+				'type' => 'list',
+				'defaultValue' => 'Geral',
+				'values' => array(
+					'Geral' => 'geral',
+					'Dossier' => 'artigos-dossier',
+					'Vídeo' => 'video',
+					'Opinião' => 'opinioes',
+					'Rádio' => 'radio',
+				)
+			)
+		)
+	);
+
+	public function getURI() {
+		$type = $this->getInput('feed');
+		return self::URI . '/rss/' . $type;
+	}
+
+	public function getIcon() {
+		return 'https://www.esquerda.net/sites/default/files/favicon_0.ico';
+	}
+
+	public function collectData(){
+		parent::collectExpandableDatas($this->getURI());
+	}
+
+	protected function parseItem($newsItem){
+		# Fix Publish date
+		$badDate = $newsItem->pubDate;
+		preg_match('|(?P<day>\d\d)/(?P<month>\d\d)/(?P<year>\d\d\d\d) - (?P<hour>\d\d):(?P<minute>\d\d)|', $badDate, $d);
+		$newsItem->pubDate = sprintf('%s-%s-%sT%s:%s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['minute']);
+		$item = parent::parseItem($newsItem);
+		# Include all the content
+		$uri = $item['uri'];
+		$html = getSimpleHTMLDOMCached($uri)
+			or returnServerError('Could not load content for ' . $uri);
+		$content = $html->find('div#content div.content', 0);
+		## Fix author
+		$authorHTML = $html->find('.field-name-field-op-author a', 0);
+		if ($authorHTML) {
+			$item['author'] = $authorHTML->innertext;
+			$authorHTML->remove();
+		}
+		## Remove crap
+		$content->find('.field-name-addtoany', 0)->remove();
+		## Fix links
+		$content = defaultLinkTo($content, self::URI);
+		## Fix Images
+		foreach($content->find('img') as $img) {
+			$altSrc = $img->getAttribute('data-src');
+			if ($altSrc) {
+				$img->setAttribute('src', $altSrc);
+			}
+			$img->width = null;
+			$img->height = null;
+		}
+		$item['content'] = $content;
+		return $item;
+	}
+}

bridges/EstCeQuonMetEnProdBridge.php

@@ -7,24 +7,21 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
 	const CACHE_TIMEOUT = 21600; // 6h
 	const DESCRIPTION = 'Should we put a website in production today? (French)';
 
-    public function collectData(){
-        function ExtractFromDelimiters($string, $start, $end) {
-            if (strpos($string, $start) !== false) {
-                $section_retrieved = substr($string, strpos($string, $start) + strlen($start));
-                $section_retrieved = substr($section_retrieved, 0, strpos($section_retrieved, $end));
-                return $section_retrieved;
-            } return false;
-        }
-
-        $html = getSimpleHTMLDOM($this->getURI()) or returnServerError('Could not request EstCeQuonMetEnProd: '.$this->getURI());
+	public function collectData() {
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request EstCeQuonMetEnProd: ' . self::URI);
 
 		$item = array();
-        $item['uri'] = $this->getURI().'#'.date('Y-m-d');
+		$item['uri'] = $this->getURI() . '#' . date('Y-m-d');
 		$item['title'] = $this->getName();
 		$item['author'] = 'Nicolas Hoffmann';
 		$item['timestamp'] = strtotime('today midnight');
-        $item['content'] = str_replace('src="/', 'src="'.$this->getURI(), trim(ExtractFromDelimiters($html->outertext, '<body role="document">', '<br /><br />')));
+		$item['content'] = str_replace(
+			'src="/',
+			'src="' . self::URI,
+			trim(extractFromDelimiters($html->outertext, '<body role="document">', '<div id="share'))
+		);
+
 		$this->items[] = $item;
 	}
 }
-?>

bridges/EtsyBridge.php

@@ -0,0 +1,84 @@
+<?php
+class EtsyBridge extends BridgeAbstract {
+
+	const NAME = 'Etsy search';
+	const URI = 'https://www.etsy.com';
+	const DESCRIPTION = 'Returns feeds for search results';
+	const MAINTAINER = 'logmanoriginal';
+	const PARAMETERS = array(
+		array(
+			'query' => array(
+				'name' => 'Search query',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Insert your search term here',
+				'exampleValue' => 'Enter your search term'
+			),
+			'queryextension' => array(
+				'name' => 'Query extension',
+				'type' => 'text',
+				'required' => false,
+				'title' => 'Insert additional query parts here
+(anything after ?search=<your search query>)',
+				'exampleValue' => '&explicit=1&locationQuery=2921044'
+			),
+			'showimage' => array(
+				'name' => 'Show image in content',
+				'type' => 'checkbox',
+				'required' => false,
+				'title' => 'Activate to show the image in the content',
+				'defaultValue' => 'checked'
+			)
+		)
+	);
+
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Failed to receive ' . $this->getURI());
+
+		$results = $html->find('li.block-grid-item');
+
+		foreach($results as $result) {
+			// Skip banner cards (ads for categories)
+			if($result->find('span.ad-indicator'))
+				continue;
+
+			$item = array();
+
+			$item['title'] = $result->find('a', 0)->title;
+			$item['uri'] = $result->find('a', 0)->href;
+			$item['author'] = $result->find('p.text-gray-lighter', 0)->plaintext;
+
+			$item['content'] = '<p>'
+			. $result->find('span.currency-value', 0)->plaintext . ' '
+			. $result->find('span.currency-symbol', 0)->plaintext
+			. '</p><p>'
+			. $result->find('a', 0)->title
+			. '</p>';
+
+			$image = $result->find('img.display-block', 0)->src;
+
+			if($this->getInput('showimage')) {
+				$item['content'] .= '<img src="' . $image . '">';
+			}
+
+			$item['enclosures'] = array($image);
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('query'))) {
+			$uri = self::URI . '/search?q=' . urlencode($this->getInput('query'));
+
+			if(!is_null($this->getInput('queryextension'))) {
+				$uri .= $this->getInput('queryextension');
+			}
+
+			return $uri;
+		}
+
+		return parent::getURI();
+	}
+}