[README] Update list of contributors

Bump version to 2019-01-13
[N26Bridge] Add new bridge (#1006 )
2025-08-16 13:34:11 +02:00 · 2019-01-13 19:18:40 +01:00 · 2019-01-13 19:15:06 +01:00 · 2019-01-13 19:12:31 +01:00 · 2019-01-08 20:02:51 +01:00 · 2019-01-06 20:30:02 +01:00
256 changed files with 29167 additions and 8103 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+.git
+cache/*
+DEBUG
+Dockerfile
+whitelist.txt
+phpcs.xml
+CONTRIBUTING.md
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,3 +20,17 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# Ignore files in git archive (i.e. GitHub release builds)
+Dockerfile              export-ignore
+.travis.yml             export-ignore
+.github/                export-ignore
+.gitattributes          export-ignore
+.gitignore              export-ignore
+.dockerignore           export-ignore
+scalingo.json           export-ignore
+phpunit.xml             export-ignore
+phpcs.xml               export-ignore
+phpcompatibility.xml    export-ignore
+tests/                  export-ignore
+cache/.gitkeep          export-ignore
--- a/.github/CONTRIBUTING.md
+++ b/.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)
--- a/.github/ISSUE_TEMPLATE/bridge-request-template.md
+++ b/.github/ISSUE_TEMPLATE/bridge-request-template.md
@@ -0,0 +1,61 @@
+---
+name: Bridge request template
+about: Use this template for requesting a new bridge
+
+---
+
+# 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.
+-->
--- a/.gitignore
+++ b/.gitignore
@@ -227,8 +227,12 @@ pip-log.txt
 /cache
 /whitelist.txt
 DEBUG
+config.ini.php

 ######################
 ## VisualStudioCode ##
 ######################
-.vscode/*
+.vscode/*
+
+#Builder
+.buildconfig
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,44 @@
+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;
+  # Use PHPUnit 6 for unit tests (stable), requires PHP 7
+  - if [[ $TRAVIS_PHP_VERSION == "7.0" ]]; then
+      composer global require phpunit/phpunit ^6;
+    fi
+  # Use latest PHPUnit on nightly to detect breaking changes
+  - if [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
+      composer global require 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 supported version
+  - if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then
+      ~/.config/composer/vendor/bin/phpcs . --standard=phpcompatibility.xml --extensions=php -p;
+    fi
+  # Run unit tests (stable)
+  - if [[ $TRAVIS_PHP_VERSION == "7.0" ]]; then
+      phpunit --configuration=phpunit.xml --include-path=lib/;
+    fi
+  # Run unit tests (latest/nightly)
+  # Check PHP compatibility for all versions, starting at the lowest supported version in order to detect breaking changes
+  - if [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
+      phpunit --configuration=phpunit.xml --include-path=lib/;
+      ~/.config/composer/vendor/bin/phpcs . --standard=PHPCompatibility --extensions=php -p --runtime-set testVersion 5.6-;
+    fi

 matrix:
  fast_finish: true
+
+  include:
+    - php: 5.6
+    - php: 7.0
+    - php: nightly
+
  allow_failures:
-    - php: hhvm
-    - php: nightly
+    - php: nightly
--- a/CHANGELOG.md
+++ b/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
--- a/5
+++ b/5
@@ -0,0 +1,5 @@
+FROM ulsmith/alpine-apache-php7
+
+COPY ./ /app/public/
+
+RUN chown -R apache:root /app/public
--- a/README.md
+++ b/README.md
@@ -1,130 +1,224 @@
 rss-bridge
 ===
-[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE)
+[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE) [![GitHub release](https://img.shields.io/github/release/rss-bridge/rss-bridge.svg)](https://github.com/rss-bridge/rss-bridge/releases/latest) [![Debian Release](https://img.shields.io/badge/dynamic/json.svg?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-light--gray.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)](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 which don't have one. It can be used on webservers or as 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
+* `GooglePlus` : Most recent posts of user timeline
+* `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
 ===

 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)
+
+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 Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/?repo=https://github.com/rss-bridge/rss-bridge)
+
+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)
+  * [Ahiles3005](https://github.com/Ahiles3005)
+  * [Albirew](https://github.com/Albirew)
+  * [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)
+  * [Daiyousei](https://github.com/Daiyousei)
+  * [Djuuu](https://github.com/Djuuu)
+  * [Draeli](https://github.com/Draeli)
+  * [EtienneM](https://github.com/EtienneM)
+  * [Frenzie](https://github.com/Frenzie)
+  * [Ginko-Aloe](https://github.com/Ginko-Aloe)
+  * [Glandos](https://github.com/Glandos)
+  * [GregThib](https://github.com/GregThib)
+  * [Grummfy](https://github.com/Grummfy)
+  * [JackNUMBER](https://github.com/JackNUMBER)
+  * [JeremyRand](https://github.com/JeremyRand)
+  * [Jocker666z](https://github.com/Jocker666z)
+  * [LogMANOriginal](https://github.com/LogMANOriginal)
+  * [MonsieurPoutounours](https://github.com/MonsieurPoutounours)
+  * [Nono-m0le](https://github.com/Nono-m0le)
+  * [ORelio](https://github.com/ORelio)
+  * [PaulVayssiere](https://github.com/PaulVayssiere)
+  * [Piranhaplant](https://github.com/Piranhaplant)
+  * [Riduidel](https://github.com/Riduidel)
+  * [Roliga](https://github.com/Roliga)
+  * [Strubbl](https://github.com/Strubbl)
+  * [TheRadialActive](https://github.com/TheRadialActive)
+  * [TwizzyDizzy](https://github.com/TwizzyDizzy)
+  * [WalterBarrett](https://github.com/WalterBarrett)
+  * [ZeNairolf](https://github.com/ZeNairolf)
+  * [adamchainz](https://github.com/adamchainz)
+  * [aledeg](https://github.com/aledeg)
+  * [alexAubin](https://github.com/alexAubin)
+  * [az5he6ch](https://github.com/az5he6ch)
+  * [b1nj](https://github.com/b1nj)
+  * [benasse](https://github.com/benasse)
+  * [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)
+  * [da2x](https://github.com/da2x)
+  * [disk0x](https://github.com/disk0x)
+  * [eMerzh](https://github.com/eMerzh)
+  * [em92](https://github.com/em92)
+  * [fluffy-critter](https://github.com/fluffy-critter)
+  * [fulmeek](https://github.com/fulmeek)
+  * [griffaurel](https://github.com/griffaurel)
+  * [hunhejj](https://github.com/hunhejj)
+  * [j0k3r](https://github.com/j0k3r)
+  * [jdigilio](https://github.com/jdigilio)
+  * [kranack](https://github.com/kranack)
+  * [kraoc](https://github.com/kraoc)
+  * [laBecasse](https://github.com/laBecasse)
+  * [lagaisse](https://github.com/lagaisse)
+  * [lalannev](https://github.com/lalannev)
+  * [ldidry](https://github.com/ldidry)
+  * [lorenzos](https://github.com/lorenzos)
+  * [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)
+  * [mickael-bertrand](https://github.com/mickael-bertrand)
+  * [mitsukarenai](https://github.com/mitsukarenai)
+  * [mr-flibble](https://github.com/mr-flibble)
+  * [mro](https://github.com/mro)
+  * [mxmehl](https://github.com/mxmehl)
+  * [nel50n](https://github.com/nel50n)
+  * [niawag](https://github.com/niawag)
+  * [pellaeon](https://github.com/pellaeon)
+  * [pit-fgfjiudghdf](https://github.com/pit-fgfjiudghdf)
+  * [pitchoule](https://github.com/pitchoule)
+  * [pmaziere](https://github.com/pmaziere)
+  * [prysme01](https://github.com/prysme01)
+  * [quentinus95](https://github.com/quentinus95)
+  * [qwertygc](https://github.com/qwertygc)
+  * [regisenguehard](https://github.com/regisenguehard)
+  * [rogerdc](https://github.com/rogerdc)
+  * [sebsauvage](https://github.com/sebsauvage)
+  * [sublimz](https://github.com/sublimz)
+  * [sysadminstory](https://github.com/sysadminstory)
+  * [tameroski](https://github.com/tameroski)
+  * [teromene](https://github.com/teromene)
+  * [triatic](https://github.com/triatic)
+  * [wtuuju](https://github.com/wtuuju)
+  * [yardenac](https://github.com/yardenac)

 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:
+
+  * [`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 +227,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.
--- a/bridges/ABCTabsBridge.php
+++ b/bridges/ABCTabsBridge.php
@@ -1,25 +1,42 @@
 <?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)
-		{
-		    $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');
-		    $this->items[] = $item;
+		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');
+
+			$this->items[] = $item;
 		}
-    }
+	}
 }
--- a/bridges/AcrimedBridge.php
+++ b/bridges/AcrimedBridge.php
@@ -1,25 +1,24 @@
 <?php
 class AcrimedBridge extends FeedExpander {

-    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 MAINTAINER = 'qwertygc';
+	const NAME = 'Acrimed Bridge';
+	const URI = 'http://www.acrimed.org/';
+	const CACHE_TIMEOUT = 4800; //2hours
+	const DESCRIPTION = 'Returns the newest articles';

-    public function collectData(){
-        $this->collectExpandableDatas(static::URI.'spip.php?page=backend');
-    }
+	public function collectData(){
+		$this->collectExpandableDatas(static::URI . 'spip.php?page=backend');
+	}

-    protected function parseItem($newsItem){
-        $item = parent::parseItem($newsItem);
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);

-        $articlePage = getSimpleHTMLDOM($newsItem->link);
-        $article = sanitize($articlePage->find('article.article1', 0)->innertext);
-        $article = defaultImageSrcTo($article, static::URI);
-        $item['content'] = $article;
-
-        return $item;
-    }
+		$articlePage = getSimpleHTMLDOM($newsItem->link);
+		$article = sanitize($articlePage->find('article.article1', 0)->innertext);
+		$article = defaultLinkTo($article, static::URI);
+		$item['content'] = $article;

+		return $item;
+	}
 }
--- a/bridges/AllocineFRBridge.php
+++ b/bridges/AllocineFRBridge.php
@@ -1,82 +1,86 @@
 <?php
-class AllocineFRBridge extends BridgeAbstract{
+class AllocineFRBridge extends BridgeAbstract {

+	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 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'
+			)
+		)
+	));

-    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 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'
-            )
-        )
-    ));
+	public function getURI(){
+		if(!is_null($this->getInput('category'))) {

-    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;
-        }
+			switch($this->getInput('category')) {
+			case 'faux-raccord':
+				$uri = static::URI . 'video/programme-12284/saison-32180/';
+				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;
+			}

-        return $uri;
-    }
+			return $uri;
+		}

-    public function getName(){
-        return self::NAME.' : '
-            .array_search(
-                $this->getInput('category'),
-                self::PARAMETERS[$this->queriedContext]['category']['values']
-            );
-    }
+		return parent::getURI();
+	}

-    public function collectData(){
+	public function getName(){
+		if(!is_null($this->getInput('category'))) {
+			return self::NAME . ' : '
+				. array_search(
+					$this->getInput('category'),
+					self::PARAMETERS[$this->queriedContext]['category']['values']
+				);
+		}

-        $html = getSimpleHTMLDOM($this->getURI())
-            or returnServerError("Could not request ".$this->getURI()." !");
+		return parent::getName();
+	}

-        $category=array_search(
-                $this->getInput('category'),
-                self::PARAMETERS[$this->queriedContext]['category']['values']
-            );
+	public function collectData(){

+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request ' . $this->getURI() . ' !');

-        foreach($html->find('figure.media-meta-fig') as $element)
-        {
-            $item = array();
+		$category = array_search(
+				$this->getInput('category'),
+				self::PARAMETERS[$this->queriedContext]['category']['values']
+			);

-            $title = $element->find('div.titlebar h3.title a', 0);
-            $content = trim($element->innertext);
-            $figCaption = strpos($content, $category);
+		foreach($html->find('.media-meta-list figure.media-meta-fig') as $element) {
+			$item = array();

-            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;
-                $this->items[] = $item;
-            }
-        }
-    }
+			$title = $element->find('div.titlebar h3.title a', 0);
+			$content = trim($element->innertext);
+			$figCaption = strpos($content, $category);

+			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;
+				$this->items[] = $item;
+			}
+		}
+	}
 }
--- a/bridges/AmazonBridge.php
+++ b/bridges/AmazonBridge.php
@@ -0,0 +1,97 @@
+<?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',
+			'required' => false,
+			'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',
+			'required' => true,
+			'values' => array(
+				'Australia' => 'com.au',
+				'Brazil' => 'com.br',
+				'Canada' => 'ca',
+				'China' => 'cn',
+				'France' => 'fr',
+				'Germany' => 'de',
+				'India' => 'in',
+				'Italy' => 'it',
+				'Japan' => 'co.jp',
+				'Mexico' => 'com.mx',
+				'Netherlands' => 'nl',
+				'Spain' => 'es',
+				'United Kingdom' => 'co.uk',
+				'United States' => 'com',
+			),
+			'defaultValue' => 'com',
+		),
+	));
+
+	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;
+		}
+	}
+}
--- a/bridges/AmazonPriceTrackerBridge.php
+++ b/bridges/AmazonPriceTrackerBridge.php
@@ -0,0 +1,187 @@
+<?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',
+			'required' => true,
+			'values' => array(
+				'Australia' 	=> 'com.au',
+				'Brazil' 		=> 'com.br',
+				'Canada' 		=> 'ca',
+				'China' 		=> 'cn',
+				'France' 		=> 'fr',
+				'Germany' 		=> 'de',
+				'India' 		=> 'in',
+				'Italy' 		=> 'it',
+				'Japan' 		=> 'co.jp',
+				'Mexico' 		=> 'com.mx',
+				'Netherlands'	=> 'nl',
+				'Spain' 		=> 'es',
+				'United Kingdom'	=> 'co.uk',
+				'United States'		=> 'com',
+			),
+			'defaultValue' => 'com',
+		),
+	));
+
+	protected $title;
+
+	/**
+	 * Generates domain name given a amazon TLD
+	 */
+	private function getDomainName() {
+		return 'https://www.amazon.' . $this->getInput('tld');
+	}
+
+	/**
+	 * Generates URI for a Amazon product page
+	 */
+	public function getURI() {
+		if (!is_null($this->getInput('asin'))) {
+			return $this->getDomainName() . '/dp/' . $this->getInput('asin') . '/';
+		}
+		return parent::getURI();
+	}
+
+	/**
+	 * Scrapes the product title from the html page
+	 * returns the default title if scraping fails
+	 */
+	private function getTitle($html) {
+		$titleTag = $html->find('#productTitle', 0);
+
+		if (!$titleTag) {
+			return $this->getDefaultTitle();
+		} else {
+			return trim(html_entity_decode($titleTag->innertext, ENT_QUOTES));
+		}
+	}
+
+	/**
+	 * Title used by the feed if none could be found
+	 */
+	private function getDefaultTitle() {
+		return 'Amazon.' . $this->getInput('tld') . ': ' . $this->getInput('asin');
+	}
+
+	/**
+	 * Returns name for the feed
+	 * Uses title (already scraped) if it has one
+	 */
+	public function getName() {
+		if (isset($this->title)) {
+			return $this->title;
+		} else {
+			return parent::getName();
+		}
+	}
+
+	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 [
+				'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 [
+				'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;
+	}
+}
--- a/bridges/AnidexBridge.php
+++ b/bridges/AnidexBridge.php
@@ -0,0 +1,207 @@
+<?php
+class AnidexBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'ORelio';
+	const NAME = 'Anidex';
+	const URI = 'https://anidex.info/';
+	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::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;
+		}
+
+		// Retrieve torrent listing from search results, which does not contain torrent description
+		$html = getSimpleHTMLDOM($search_url, array(), $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_uri = self::URI . 'torrent/' . $torrent_id;
+
+				//Retrieve full description from torrent page
+				if ($item_html = getSimpleHTMLDOMCached($item_uri)) {
+
+					//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_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;
+	}
+}
--- a/bridges/AnimeUltimeBridge.php
+++ b/bridges/AnimeUltimeBridge.php
@@ -1,119 +1,140 @@
 <?php
 class AnimeUltimeBridge extends BridgeAbstract {

-        const MAINTAINER = 'ORelio';
-        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 PARAMETERS = array( array(
-          'type'=>array(
-            'name'=>'Type',
-            'type'=>'list',
-            'values'=>array(
-              'Everything'=>'',
-              'Anime'=>'A',
-              'Drama'=>'D',
-              'Tokusatsu'=>'T'
-            )
-          )
-        ));
+	const MAINTAINER = 'ORelio';
+	const NAME = 'Anime-Ultime';
+	const URI = 'http://www.anime-ultime.net/';
+	const CACHE_TIMEOUT = 10800; // 3h
+	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'
+			)
+		)
+	));

-    private $filter = 'Releases';
+	private $filter = 'Releases';

-    public function collectData(){
+	public function collectData(){

-        //Add type filter if provided
-        $typeFilter = array_search(
-            $this->getInput('type'),
-            self::PARAMETERS[$this->queriedContext]['type']['values']
-        );
+		//Add type filter if provided
+		$typeFilter = array_search(
+			$this->getInput('type'),
+			self::PARAMETERS[$this->queriedContext]['type']['values']
+		);

-        //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;
+		//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;

-        //Process each HTML page until having 10 releases
-        $processedOK = 0;
-        foreach (array($thismonth, $lastmonth) as $requestFilter) {
+		//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;
-            $html = getSimpleHTMLDOM($url)
-                or returnServerError('Could not request Anime-Ultime: '.$url);
+			//Retrive page contents
+			$url = self::URI . 'history-0-1/' . $requestFilter;
+			$html = getSimpleHTMLDOM($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) {
+			//Relases are sorted by day : process each day individually
+			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
+				//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));

-                //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) {
+				//<h3>day</h3><br /><table><tr> <-- useful data in table rows
+				$release = $daySection->next_sibling()->next_sibling()->first_child();

-                        //Retrieve metadata from table columns
-                        $item_link_element = $release->find('td', 0)->find('a', 0);
-                        $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_fansub = $release->find('td', 2)->plaintext;
-                        $item_type = $release->find('td', 4)->plaintext;
+				//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) {

-                        if (!empty($item_uri)) {
+						//Retrieve metadata from table columns
+						$item_link_element = $release->find('td', 0)->find('a', 0);
+						$item_uri = self::URI . $item_link_element->href;
+						$item_name = html_entity_decode($item_link_element->plaintext);

-                            //Retrieve description from description page and convert relative image src info absolute image src
-                            $html_item = getContents($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
-                            );
-                            $item_description = substr($item_description,
-                                0,
-                                strpos($item_description, '<div id="table">')
-                            );
-                            $item_description = str_replace(
-                                'src="images', 'src="'.self::URI.'images',
-                                $item_description
-                            );
-                            $item_description = str_replace("\r", '', $item_description);
-                            $item_description = str_replace("\n", '', $item_description);
-                            $item_description = utf8_encode($item_description);
+						$item_image = self::URI . substr(
+							$item_link_element->onmouseover,
+							37,
+							strpos($item_link_element->onmouseover, ' ', 37) - 37
+						);

-                            //Build and add final item
-                            $item = array();
-                            $item['uri'] = $item_uri;
-                            $item['title'] = $item_name.' '.$item_type.' '.$item_episode;
-                            $item['author'] = $item_fansub;
-                            $item['timestamp'] = $item_date;
-                            $item['content'] = $item_description;
-                            $this->items[] = $item;
-                            $processedOK++;
+						$item_episode = html_entity_decode(
+							str_pad(
+								$release->find('td', 1)->plaintext,
+								2,
+								'0',
+								STR_PAD_LEFT
+							)
+						);

-                            //Stop processing once limit is reached
-                            if ($processedOK >= 10)
-                                return;
-                        }
-                    }
-                }
-            }
-        }
-    }
+						$item_fansub = $release->find('td', 2)->plaintext;
+						$item_type = $release->find('td', 4)->plaintext;

-    public function getName() {
-        $typeFilter = array_search(
-            $this->getInput('type'),
-            self::PARAMETERS[$this->queriedContext]['type']['values']
-        );
+						if(!empty($item_uri)) {

-        return 'Latest '.$typeFilter.' - Anime-Ultime Bridge';
-    }
+							// Retrieve description from description page
+							$html_item = getContents($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
+							);
+							$item_description = substr($item_description,
+								0,
+								strpos($item_description, '<div id="table">')
+							);

+							// 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['author'] = $item_fansub;
+							$item['timestamp'] = $item_date;
+							$item['enclosures'] = array($item_image);
+							$item['content'] = $item_description;
+							$this->items[] = $item;
+							$processedOK++;
+
+							//Stop processing once limit is reached
+							if ($processedOK >= 10)
+								return;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	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 parent::getName();
+	}
 }
--- a/bridges/Arte7Bridge.php
+++ b/bridges/Arte7Bridge.php
@@ -1,91 +1,122 @@
 <?php
-    class Arte7Bridge extends BridgeAbstract{
+class Arte7Bridge extends BridgeAbstract {

-        const MAINTAINER = "mitsukarenai";
-        const NAME = "Arte +7";
-        const URI = "http://www.arte.tv/";
-        const CACHE_TIMEOUT = 1800; // 30min
-        const DESCRIPTION = "Returns newest videos from ARTE +7";
-        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'
+	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';

-                    )
-                )
-            ),
-            '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'
-                    )
-                )
-            )
-        );
+	const API_TOKEN = 'Nzc1Yjc1ZjJkYjk1NWFhN2I2MWEwMmRlMzAzNjI5NmU3NWU3ODg4ODJjOWMxNTMxYzEzZGRjYjg2ZGE4MmIwOA';

-    public function collectData(){
+	const PARAMETERS = array(
+		'Catégorie (Français)' => array(
+			'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'
+				)
+			)
+		),
+		'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/'
+			)
+		)
+	);

-      switch($this->queriedContext){
-      case 'Catégorie (Français)':
-        $category=$this->getInput('catfr');
-        $lang='fr';
-        break;
-      case 'Catégorie (Allemand)':
-        $category=$this->getInput('catde');
-        $lang='de';
-        break;
-      }
+	public function collectData(){
+		switch($this->queriedContext) {
+		case 'Catégorie (Français)':
+			$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';
+			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
+		);

-      foreach($input_json['videos'] as $element) {
-            $item = array();
-            $item['uri'] = str_replace("autoplay=1", "", $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['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>';
-            $this->items[] = $item;
-        }
-    }
+		$input = getContents($url, $header) or die('Could not request ARTE.');
+		$input_json = json_decode($input, true);

+		foreach($input_json['videos'] as $element) {
+
+			$item = array();
+			$item['uri'] = $element['url'];
+			$item['id'] = $element['id'];
+
+			$item['timestamp'] = strtotime($element['videoRightsBegin']);
+			$item['title'] = $element['title'];
+
+			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;
+		}
+	}
 }
--- a/bridges/AskfmBridge.php
+++ b/bridges/AskfmBridge.php
@@ -1,52 +1,74 @@
 <?php
-class AskfmBridge extends BridgeAbstract{
+class AskfmBridge extends BridgeAbstract {

-    const MAINTAINER = "az5he6ch";
-    const NAME = "Ask.fm Answers";
-    const URI = "http://ask.fm/";
-    const CACHE_TIMEOUT = 300; //5 min
-    const DESCRIPTION = "Returns answers from an Ask.fm user";
-    const PARAMETERS = array(
-        'Ask.fm username'=>array(
-            'u'=>array(
-                'name'=>'Username',
-                'required'=>true
-            )
-        )
-    );
+	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 PARAMETERS = array(
+		'Ask.fm username' => array(
+			'u' => array(
+				'name' => 'Username',
+				'required' => true
+			)
+		)
+	);

-    public function collectData(){
-        $html = getSimpleHTMLDOM($this->getURI())
-            or returnServerError('Requested username can\'t be found.');
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Requested username can\'t be found.');

-        foreach($html->find('div.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
-            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
-                    $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;
-            $this->items[] = $item;
-        }
-    }
+		$html = defaultLinkTo($html, self::URI);

-    public function getName(){
-        return self::NAME.' : '.$this->getInput('u');
-    }
+		foreach($html->find('article.streamItem-answer') as $element) {
+			$item = array();
+			$item['uri'] = $element->find('a.streamItem_meta', 0)->href;
+			$question = trim($element->find('header.streamItem_header', 0)->innertext);

-    public function getURI(){
-        return self::URI.urlencode($this->getInput('u')).'/answers/more?page=0';
-    }
+			$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 = $link->plaintext;
+				}
+			}
+
+			$item['content'] = '<p>' . $question
+			. '</p><p>' . $answer
+			. '</p><p>' . $visual . '</p>';
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('u'))) {
+			return self::NAME . ' : ' . $this->getInput('u');
+		}
+
+		return parent::getName();
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('u'))) {
+			return self::URI . urlencode($this->getInput('u'));
+		}
+
+		return parent::getURI();
+	}
 }
--- a/bridges/AutoJMBridge.php
+++ b/bridges/AutoJMBridge.php
@@ -0,0 +1,65 @@
+<?php
+
+class AutoJMBridge extends BridgeAbstract {
+
+	const NAME = 'AutoJM';
+	const URI = 'http://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 de la recherche',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'URL d\'une recherche avec filtre de véhicules sans le http://www.autojm.fr/',
+				'exampleValue' => 'gammes/index/398?order_by=finition_asc&energie[]=3&transmission[]=2&dispo=all'
+			)
+		)
+	);
+	const CACHE_TIMEOUT = 3600;
+
+	public function getIcon() {
+		return self::URI . 'assets/images/favicon.ico';
+	}
+
+	public function collectData() {
+		$html = getSimpleHTMLDOM(self::URI . $this->getInput('url'))
+			or returnServerError('Could not request AutoJM.');
+		$list = $html->find('div[class*=ligne_modele]');
+		foreach($list as $element) {
+			$image = $element->find('img[class=width-100]', 0)->src;
+			$serie = $element->find('div[class=serie]', 0)->find('span', 0)->plaintext;
+			$url = $element->find('div[class=serie]', 0)->find('a[class=btn_ligne color-black]', 0)->href;
+			if($element->find('div[class*=hasStock-info]', 0) != null) {
+				$dispo = 'Disponible';
+			} else {
+				$dispo = 'Sur commande';
+			}
+			$carburant = str_replace('dispo |', '', $element->find('div[class=carburant]', 0)->plaintext);
+			$transmission = $element->find('div[class*=bv]', 0)->plaintext;
+			$places = $element->find('div[class*=places]', 0)->plaintext;
+			$portes = $element->find('div[class*=nb_portes]', 0)->plaintext;
+			$carosserie = $element->find('div[class*=coloris]', 0)->plaintext;
+			$remise = $element->find('div[class*=remise]', 0)->plaintext;
+			$prix = $element->find('div[class*=prixjm]', 0)->plaintext;
+
+			$item = array();
+			$item['uri'] = $url;
+			$item['title'] = $serie;
+			$item['content'] = '<p><img style="vertical-align:middle ; padding: 10px" src="' . $image . '" />' . $serie . '</p>';
+			$item['content'] .= '<ul><li>Disponibilité : ' . $dispo . '</li>';
+			$item['content'] .= '<li>Carburant : ' . $carburant . '</li>';
+			$item['content'] .= '<li>Transmission : ' . $transmission . '</li>';
+			$item['content'] .= '<li>Nombre de places : ' . $places . '</li>';
+			$item['content'] .= '<li>Nombre de portes : ' . $portes . '</li>';
+			$item['content'] .= '<li>Série : ' . $serie . '</li>';
+			$item['content'] .= '<li>Carosserie : ' . $carosserie . '</li>';
+			$item['content'] .= '<li>Remise : ' . $remise . '</li>';
+			$item['content'] .= '<li>Prix : ' . $prix . '</li></ul>';
+
+			$this->items[] = $item;
+		}
+
+	}
+}
--- a/bridges/BAEBridge.php
+++ b/bridges/BAEBridge.php
@@ -0,0 +1,265 @@
+<?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;
+			$content = str_replace('src="/', 'src="' . parent::getURI() . '/', $content);
+			$content = str_replace('href="/', 'href="' . parent::getURI() . '/', $content);
+			$item['content'] = $content;
+			$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',
+			'Ĵ' => 'J', 'ĵ' => 'j',
+			'Ķ' => 'K', 'ķ' => 'k',
+			'ĸ' => 'k', 'Ĺ' => 'L',
+			'ĺ' => 'l', 'Ļ' => 'L',
+			'ļ' => 'l', 'Ľ' => 'L',
+			'ľ' => 'l', 'Ŀ' => 'L',
+			'ŀ' => 'l', 'Ł' => 'L',
+			'ł' => 'l', 'Ń' => '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;
+	}
+}
--- a/bridges/BandcampBridge.php
+++ b/bridges/BandcampBridge.php
@@ -1,43 +1,67 @@
 <?php
-class BandcampBridge extends BridgeAbstract{
+class BandcampBridge extends BridgeAbstract {

-    const MAINTAINER = "sebsauvage";
-    const NAME = "Bandcamp Tag";
-    const URI = "http://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 MAINTAINER = 'sebsauvage';
+	const NAME = 'Bandcamp Tag';
+	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
+		)
+	));

-    public function collectData(){
-        $html = getSimpleHTMLDOM($this->getURI())
-            or returnServerError('No results for this query.');
+	public function getIcon() {
+		return 'https://s4.bcbits.com/img/bc_favicon.ico';
+	}

-        foreach($html->find('li.item') as $release) {
-            $script = $release->find('div.art', 0)->getAttribute('onclick');
-            $uri = ltrim($script, "return 'url(");
-            $uri = rtrim($uri, "')");
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('No results for this query.');

-            $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');
-            $this->items[] = $item;
-        }
-    }
+		foreach($html->find('li.item') as $release) {
+			$script = $release->find('div.art', 0)->getAttribute('onclick');
+			$uri = ltrim($script, "return 'url(");
+			$uri = rtrim($uri, "')");

-    public function getURI(){
-        return self::URI.'tag/'.urlencode($this->getInput('tag')).'?sort_field=date';
-    }
+			$item = array();
+			$item['author'] = $release->find('div.itemsubtext', 0)->plaintext
+			. ' - '
+			. $release->find('div.itemtext', 0)->plaintext;

-    public function getName(){
-        return $this->getInput('tag') .' - '.'Bandcamp Tag';
-    }
+			$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');
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('tag'))) {
+			return self::URI . 'tag/' . urlencode($this->getInput('tag')) . '?sort_field=date';
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('tag'))) {
+			return $this->getInput('tag') . ' - Bandcamp Tag';
+		}
+
+		return parent::getName();
+	}
 }
--- a/bridges/BastaBridge.php
+++ b/bridges/BastaBridge.php
@@ -1,19 +1,22 @@
 <?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 = 'http://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);
+		// 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')
-            or returnServerError('Could not request Bastamag.');
+		$html = getSimpleHTMLDOM(self::URI . 'spip.php?page=backend')
+			or returnServerError('Could not request Bastamag.');
+
 		$limit = 0;

 		foreach($html->find('item') as $element) {
@@ -22,11 +25,10 @@ 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);
+				$item['content'] = replaceImageUrl(getSimpleHTMLDOM($item['uri'])->find('div.texte', 0)->innertext);
 				$this->items[] = $item;
 				$limit++;
 			}
 		}
 	}
 }
-?>
--- a/bridges/BlaguesDeMerdeBridge.php
+++ b/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 CACHE_TIMEOUT = 7200; // 2h
-    const DESCRIPTION = "Blagues De Merde";
+	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';

+	public function getIcon() {
+		return self::URI . 'assets/img/favicon.ico';
+	}

-    public function collectData(){
-        $html = getSimpleHTMLDOM(self::URI)
-            or returnServerError('Could not request BDM.');
+	public function collectData(){

-        foreach($html->find('article.joke_contener') 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;;
-                $this->items[] = $item;
-            }
-        }
-    }
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request BDM.');
+
+		foreach($html->find('div.blague') as $element) {
+
+			$item = array();
+
+			$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;
+
+		}
+
+	}
 }
-?>
--- a/bridges/BloombergBridge.php
+++ b/bridges/BloombergBridge.php
@@ -0,0 +1,69 @@
+<?php
+class BloombergBridge extends BridgeAbstract
+{
+	const NAME = 'Bloomberg';
+	const URI = 'https://www.bloomberg.com/';
+	const DESCRIPTION = 'Trending stories from Bloomberg';
+	const MAINTAINER = 'mdemoss';
+
+	const PARAMETERS = array(
+	'Trending Stories' => array(),
+	'From Search' => array(
+	'q' => array(
+				'name' => 'Keyword',
+				'required' => true
+	)
+	)
+	);
+
+	public function getName()
+	{
+		switch($this->queriedContext) {
+		case 'Trending Stories':
+			return self::NAME . ' Trending Stories';
+		case 'From Search':
+			if (!is_null($this->getInput('q'))) {
+					return self::NAME . ' Search : ' . $this->getInput('q');
+			}
+			break;
+		}
+
+		return parent::getName();
+	}
+
+	public function getIcon() {
+		return 'https://assets.bwbx.io/s3/javelin/public/hub/images/favicon-black-63fe5249d3.png';
+	}
+
+	public function collectData()
+	{
+		switch($this->queriedContext) {
+		case 'Trending Stories': // Get list of top new <article>s from the front page.
+			$html = getSimpleHTMLDOMCached($this->getURI(), 300);
+			$stories = $html->find('ul.top-news-v3__stories article.top-news-v3-story');
+			break;
+		case 'From Search': // Get list of <article> elements from search.
+			$html = getSimpleHTMLDOMCached(
+				$this->getURI() .
+				'search?sort=time:desc&page=1&query=' .
+				urlencode($this->getInput('q')), 300
+			);
+			$stories = $html->find('div.search-result-items article.search-result-story');
+			break;
+		}
+		foreach ($stories as $element) {
+			$item['uri'] = $element->find('h1 a', 0)->href;
+			if (preg_match('#^https://#i', $item['uri']) !== 1) {
+				$item['uri'] = $this->getURI() . $item['uri'];
+			}
+			$articleHtml = getSimpleHTMLDOMCached($item['uri']);
+			if (!$articleHtml) {
+				continue;
+			}
+			$item['title'] = $element->find('h1 a', 0)->plaintext;
+			$item['timestamp'] = strtotime($articleHtml->find('meta[name=iso-8601-publish-date],meta[name=date]', 0)->content);
+			$item['content'] = $articleHtml->find('meta[name=description]', 0)->content;
+			$this->items[] = $item;
+		}
+	}
+}
--- a/bridges/BooruprojectBridge.php
+++ b/bridges/BooruprojectBridge.php
@@ -1,36 +1,45 @@
 <?php
 require_once('GelbooruBridge.php');

-class BooruprojectBridge extends GelbooruBridge{
+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 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'
+			),
+			't' => array(
+				'name' => 'tags'
+			)
+		),
+		'Booru subdomain (subdomain.booru.org)' => array(
+			'i' => array(
+				'name' => 'Subdomain',
+				'required' => true
+			)
+		)
+	);

-    const PARAMETERS = array(
-      'global'=>array(
-        'p'=>array(
-          'name'=>'page',
-          'type'=>'number'
-        ),
-        't'=>array('name'=>'tags')
-      ),
-      'Booru subdomain (subdomain.booru.org)'=>array(
-        'i'=>array(
-        'name'=>'Subdomain',
-        'required'=>true
-        )
-      )
-    );
+	const PIDBYPAGE = 20;

-    const PIDBYPAGE=20;
+	public function getURI(){
+		if(!is_null($this->getInput('i'))) {
+			return 'http://' . $this->getInput('i') . '.booru.org/';
+		}

-    public function getURI(){
-      return 'http://'.$this->getInput('i').'.booru.org/';
-    }
+		return parent::getURI();
+	}

-    public function getName(){
-      return static::NAME . ' ' . $this->getInput('i');
-    }
+	public function getName(){
+		if(!is_null($this->getInput('i'))) {
+			return static::NAME . ' ' . $this->getInput('i');
+		}
+
+		return parent::getName();
+	}
 }
--- a/bridges/BundesbankBridge.php
+++ b/bridges/BundesbankBridge.php
@@ -0,0 +1,86 @@
+<?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',
+				'required' => true,
+				'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;
+		}
+
+	}
+}
--- a/bridges/CADBridge.php
+++ b/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.'"/>';
-	}
-}
-?>
--- a/bridges/CNETBridge.php
+++ b/bridges/CNETBridge.php
@@ -1,76 +1,109 @@
 <?php
 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 MAINTAINER = 'ORelio';
+	const NAME = 'CNET News';
+	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')
-    ));
+	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;
+	}

-    public function collectData(){
+	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;
-        }
+		// 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);

-        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;
-        }
+		// Retrieve webpage
+		$pageUrl = self::URI . (empty($topic) ? 'news/' : $topic . '/');
+		$html = getSimpleHTMLDOM($pageUrl)
+		or returnServerError('Could not request CNET: ' . $pageUrl);

-        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>');
-            return $article_html;
-        }
+		// Process articles
+		foreach($html->find('div.assetBody, div.riverPost') as $element) {

-        $pageUrl = self::URI.(empty($this->getInput('topic')) ? '' : 'topics/'.$this->getInput('topic').'/');
-        $html = getSimpleHTMLDOM($pageUrl) or returnServerError('Could not request CNET: '.$pageUrl);
-        $limit = 0;
+			if(count($this->items) >= 10) {
+				break;
+			}

-        foreach($html->find('div.assetBody') as $element) {
-            if ($limit < 8) {
+			$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>';

-                $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);
+			if (is_null($article_thumbnail))
+				$article_thumbnail = extractFromDelimiters($element->innertext, '<img src="', '"');

-                if (!empty($article_title) && !empty($article_uri) && strpos($article_uri, '/news/') !== false) {
+			if (!empty($article_title) && !empty($article_uri) && strpos($article_uri, self::URI . 'news/') !== false) {

-                    $article_html = getSimpleHTMLDOM($article_uri) or returnServerError('Could not request CNET: '.$article_uri);
+				$article_html = getSimpleHTMLDOMCached($article_uri) or $article_html = null;

-                    $article_content = trim(CleanArticle(ExtractFromDelimiters($article_html, '<div class="articleContent', '<footer>')));
+				if (!is_null($article_html)) {

-                    $item = array();
-                    $item['uri'] = $article_uri;
-                    $item['title'] = $article_title;
-                    $item['author'] = $article_author;
-                    $item['timestamp'] = $article_timestamp;
-                    $item['content'] = $article_content;
-                    $this->items[] = $item;
-                    $limit++;
-                }
-            }
-        }
-    }
+					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;

-    public function getName() {
-        $topic=$this->getInput('topic');
-        return 'CNET News Bridge'.(empty($topic) ? '' : ' - '.$topic);
-    }
+					$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;
+			}
+		}
+	}
 }
--- a/bridges/CastorusBridge.php
+++ b/bridges/CastorusBridge.php
@@ -1,35 +1,35 @@
 <?php
 class CastorusBridge extends BridgeAbstract {
-	const MAINTAINER = "logmanoriginal";
-	const NAME = "Castorus Bridge";
+	const MAINTAINER = 'logmanoriginal';
+	const NAME = 'Castorus Bridge';
 	const URI = 'http://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)'
-            )
-        ),
-        '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)'
-            )
-        )
-    );
+	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)'
+			)
+		),
+		'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)'
+			)
+		)
+	);

-	// 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)
@@ -75,8 +75,8 @@ class CastorusBridge extends BridgeAbstract {
 	}

 	public function collectData(){
-        $zip_filter = trim($this->getInput('zip'));
-        $city_filter = trim($this->getInput('city'));
+		$zip_filter = trim($this->getInput('zip'));
+		$city_filter = trim($this->getInput('city'));

 		$html = getSimpleHTMLDOM(self::URI);

@@ -88,20 +88,27 @@ class CastorusBridge extends BridgeAbstract {
 		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
 			}

--- a/bridges/ChristianDailyReporterBridge.php
+++ b/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;
+		}
+	}
+}
--- a/bridges/CollegeDeFranceBridge.php
+++ b/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 = 'http://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,47 +22,61 @@ 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')
-            or returnServerError('Could not request CollegeDeFrance.');
+		$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
-            $d = DateTime::createFromFormat(
-                '!Y-m-d-H\hi',
-                substr($element->href, strpos($element->href, '201'), 16),
-                $timezone
-            );
-            if(!$d){
-                $d=DateTime::createFromFormat(
-                    '!d m Y',
-                    trim(str_replace(
-                        array_values($months),
-                        array_keys($months),
-                        $element->find('.date', 0)->plaintext
-                    )),
-                    $timezone
-                );
-            }
-            $item['timestamp'] = $d->format('U');
-			$item['content'] =  $element->find('.lecturer', 0)->innertext . ' - ' . $element->find('.title', 0)->innertext;
+
+			// 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(
+					'!d m Y',
+					trim(str_replace(
+						array_values($months),
+						array_keys($months),
+						$element->find('.date', 0)->plaintext
+					)),
+					$timezone
+				);
+			}
+
+			$item['timestamp'] = $d->format('U');
+			$item['content'] = $element->find('.lecturer', 0)->innertext
+			. ' - '
+			. $element->find('.title', 0)->innertext;
+
 			$item['uri'] = self::URI . $element->href;
 			$this->items[] = $item;
 		}
--- a/bridges/CommonDreamsBridge.php
+++ b/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();
--- a/bridges/ContainerLinuxReleasesBridge.php
+++ b/bridges/ContainerLinuxReleasesBridge.php
@@ -0,0 +1,97 @@
+<?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 = [
+		[
+			'channel' => [
+				'name' => 'Release Channel',
+				'type' => 'list',
+				'required' => true,
+				'defaultValue' => self::STABLE,
+				'values' => [
+					'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 = [];
+
+			$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();
+	}
+}
--- a/bridges/CopieDoubleBridge.php
+++ b/bridges/CopieDoubleBridge.php
@@ -1,39 +1,35 @@
 <?php
-class CopieDoubleBridge extends BridgeAbstract{
+class CopieDoubleBridge extends BridgeAbstract {

-    const MAINTAINER = "superbaillot.net";
-    const NAME = "CopieDouble";
-    const URI = "http://www.copie-double.com/";
-    const CACHE_TIMEOUT = 14400; // 4h
-    const DESCRIPTION = "CopieDouble";
+	const MAINTAINER = 'superbaillot.net';
+	const NAME = 'CopieDouble';
+	const URI = 'http://www.copie-double.com/';
+	const CACHE_TIMEOUT = 14400; // 4h
+	const DESCRIPTION = 'CopieDouble';

-    public function collectData(){
-        $html = getSimpleHTMLDOM(self::URI)
-            or returnServerError('Could not request CopieDouble.');
-        $table = $html->find('table table', 2);
+	public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request CopieDouble.');

-        foreach($table->find('tr') as $element)
-        {
-            $td = $element->find('td', 0);
-            if($td->class == "couleur_1")
-            {
-                $item = array();
+		$table = $html->find('table table', 2);

-                $title = $td->innertext;
-                $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);
-                $item['uri'] = self::URI . $a->href;
+		foreach($table->find('tr') as $element) {
+			$td = $element->find('td', 0);

-                $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;
-            }
-        }
-    }
+			if($td->class === 'couleur_1') {
+				$item = array();
+				$title = $td->innertext;
+				$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);
+				$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);
+				$item['content'] = $content;
+				$this->items[] = $item;
+			}
+		}
+	}
 }
--- a/bridges/CourrierInternationalBridge.php
+++ b/bridges/CourrierInternationalBridge.php
@@ -1,61 +1,55 @@
 <?php
-class CourrierInternationalBridge extends BridgeAbstract{
+class CourrierInternationalBridge extends BridgeAbstract {

-    const MAINTAINER = "teromene";
-    const NAME = "Courrier International Bridge";
-    const URI = "http://CourrierInternational.com/";
-    const CACHE_TIMEOUT = 300; // 5 min
-    const DESCRIPTION = "Courrier International bridge";
+	const MAINTAINER = 'teromene';
+	const NAME = 'Courrier International Bridge';
+	const URI = 'http://CourrierInternational.com/';
+	const CACHE_TIMEOUT = 300; // 5 min
+	const DESCRIPTION = 'Courrier International bridge';

-    public function collectData(){
+	public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Error.');

-        $html = getSimpleHTMLDOM(self::URI)
-            or returnServerError('Error.');
+		$element = $html->find('article');
+		$article_count = 1;

-        $element = $html->find("article");
+		foreach($element as $article) {
+			$item = array();

-        $article_count = 1;
+			$item['uri'] = $article->parent->getAttribute('href');

-        foreach($element as $article) {
+			if(strpos($item['uri'], 'http') === false) {
+				$item['uri'] = self::URI . $item['uri'];
+			}

-            $item = array();
+			$page = getSimpleHTMLDOMCached($item['uri']);

-            $item['uri'] = $article->parent->getAttribute("href");
+			$content = $page->find('.article-text', 0);

-            if(strpos($item['uri'], "http") === FALSE) {
-                $item['uri'] = self::URI.$item['uri'];
-            }
+			if(!$content) {
+				$content = $page->find('.depeche-text', 0);
+			}

-            $page = getSimpleHTMLDOMCached($item['uri']);
+			$item['content'] = sanitize($content);
+			$item['title'] = strip_tags($article->find('.title', 0));

-            $content = $page->find('.article-text',0);
-            if(!$content){
-              $content = $page->find('.depeche-text',0);
-            }
+			$dateTime = date_parse($page->find('time', 0));

-            $item['content'] = sanitize($content);
-            $item['title'] = strip_tags($article->find(".title",0));
+			$item['timestamp'] = mktime(
+				$dateTime['hour'],
+				$dateTime['minute'],
+				$dateTime['second'],
+				$dateTime['month'],
+				$dateTime['day'],
+				$dateTime['year']
+			);

-            $dateTime = date_parse($page->find("time",0));
+			$this->items[] = $item;
+			$article_count ++;

-            $item['timestamp'] = mktime(
-       			$dateTime['hour'],
-        		$dateTime['minute'],
-        		$dateTime['second'],
-        		$dateTime['month'],
-        		$dateTime['day'],
-        		$dateTime['year']
-            );
-
-            $this->items[] = $item;
-            $article_count ++;
-            if($article_count > 5) break;
-
-        }
-
-
-
-    }
+			if($article_count > 5)
+				break;
+		}
+	}
 }
-
-?>
--- a/bridges/CpasbienBridge.php
+++ b/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;
-    }
-}
--- a/bridges/CrewbayBridge.php
+++ b/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;
+	}
+}
--- a/bridges/CryptomeBridge.php
+++ b/bridges/CryptomeBridge.php
@@ -1,39 +1,45 @@
 <?php
-class CryptomeBridge extends BridgeAbstract{
+class CryptomeBridge extends BridgeAbstract {

-    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 MAINTAINER = 'BoboTiG';
+	const NAME = 'Cryptome';
+	const URI = 'https://cryptome.org/';
+	const CACHE_TIMEOUT = 21600; //6h
+	const DESCRIPTION = 'Returns the N most recent documents.';

-    const PARAMETERS = array( array(
-        'n'=>array(
-            'name'=>'number of elements',
-            'type'=>'number',
-            'defaultValue'=>20,
-            'exampleValue'=>10
-        )
-    ));
+	const PARAMETERS = array( array(
+		'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 */
-            $num = min($number, 20);
-        }
+	public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request Cryptome.');

+		$number = $this->getInput('n');

-        foreach($html->find('pre') as $element) {
-            for ( $i = 0; $i < $num; ++$i ) {
-                $item = array();
-                $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);
-                $this->items[] = $item;
-            }
-            break;
-        }
-    }
+		/* number of documents */
+		if(!empty($number)) {
+			$num = min($number, 20);
+		}
+
+		foreach($html->find('pre') as $element) {
+			for($i = 0; $i < $num; ++$i) {
+				$item = array();
+				$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
+				);
+				$this->items[] = $item;
+			}
+			break;
+		}
+	}
 }
--- a/bridges/DailymotionBridge.php
+++ b/bridges/DailymotionBridge.php
@@ -1,114 +1,127 @@
 <?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 = 10800; // 3h
+	const DESCRIPTION = 'Returns the 5 newest videos by username/playlist or search';

-        const PARAMETERS = array (
-            'By username' => array(
-                'u'=>array(
-                    'name'=>'username',
-                    'required'=>true
-                )
-            ),
+	const PARAMETERS = array (
+		'By username' => array(
+			'u' => array(
+				'name' => 'username',
+				'required' => true
+			)
+		),
+		'By playlist id' => array(
+			'p' => array(
+				'name' => 'playlist id',
+				'required' => true
+			)
+		),
+		'From search results' => array(
+			's' => array(
+				'name' => 'Search keyword',
+				'required' => true
+			),
+			'pa' => array(
+				'name' => 'Page',
+				'type' => 'number'
+			)
+		)
+	);

-            'By playlist id' => array(
-                'p'=>array(
-                    'name'=>'playlist id',
-                    'required'=>true
-                )
-            ),
+	protected function getMetadata($id){
+		$metadata = array();
+		$html2 = getSimpleHTMLDOM(self::URI . 'video/' . $id);
+		if(!$html2) {
+			return $metadata;
+		}

-            'From search results' => array(
-                's'=>array(
-                    'name'=>'Search keyword',
-                    'required'=>true
-                ),
-                'pa'=>array(
-                    'name'=>'Page',
-                    'type'=>'number'
-                )
-            )
-        );
+		$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;
+	}

-    function getMetadata($id) {
-        $metadata=array();
-        $html2 = getSimpleHTMLDOM(self::URI.'video/'.$id);
-        if(!$html2){
-            return $metadata;
-        }
+	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(){
+		$html = '';
+		$limit = 5;
+		$count = 0;

-    public function collectData(){
-        $html = '';
-        $limit = 5;
-        $count = 0;
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request Dailymotion.');

-        $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)) {
+					continue;
+				}
+				$item['uri'] = $metadata['uri'];
+				$item['title'] = $metadata['title'];
+				$item['timestamp'] = $metadata['timestamp'];

-        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)){
-                    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>';
-                $this->items[] = $item;
-                $count++;
-            }
-        }
-    }
+				$item['content'] = '<a href="'
+				. $item['uri']
+				. '"><img src="'
+				. $metadata['thumbnailUri']
+				. '" /></a><br><a href="'
+				. $item['uri']
+				. '">'
+				. $item['title']
+				. '</a>';

-    public function getName(){
-        switch($this->queriedContext){
-        case 'By username':
-            $specific=$this->getInput('u');
-            break;
-        case 'By playlist id':
-            $specific=strtok($this->getInput('p'), '_');
-            break;
-        case 'From search results':
-            $specific=$this->getInput('s');
-            break;
-        }
+				$this->items[] = $item;
+				$count++;
+			}
+		}
+	}

-        return $specific.' : Dailymotion Bridge';
-    }
+	public function getName(){
+		switch($this->queriedContext) {
+		case 'By username':
+			$specific = $this->getInput('u');
+			break;
+		case 'By playlist id':
+			$specific = strtok($this->getInput('p'), '_');
+			break;
+		case 'From search results':
+			$specific = $this->getInput('s');
+			break;
+		default: return parent::getName();
+		}

-    public function getURI(){
-        $uri=self::URI;
-        switch($this->queriedContext){
-        case 'By username':
-            $uri.='user/'
-                .urlencode($this->getInput('u')).'/1';
-            break;
-        case 'By playlist id':
-            $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');
-            }
-            break;
-        }
-        return $uri;
-    }
+		return $specific . ' : Dailymotion Bridge';
+	}
+
+	public function getURI(){
+		$uri = self::URI;
+		switch($this->queriedContext) {
+		case 'By username':
+			$uri .= 'user/' . urlencode($this->getInput('u')) . '/1';
+			break;
+		case 'By playlist id':
+			$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');
+			}
+			break;
+		default: return parent::getURI();
+		}
+		return $uri;
+	}
 }
--- a/bridges/DanbooruBridge.php
+++ b/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 CACHE_TIMEOUT = 1800; // 30min
-  const DESCRIPTION = "Returns images from given page";
+	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 PARAMETERS = array(
-    'global'=>array(
-      'p'=>array(
-        'name'=>'page',
-        'defaultValue'=>1,
-        'type'=>'number'
-      ),
-      't'=>array('name'=>'tags')
-    ),
-    0=>array()
-  );
+	const PARAMETERS = array(
+		'global' => array(
+			'p' => array(
+				'name' => 'page',
+				'defaultValue' => 1,
+				'type' => 'number'
+			),
+			't' => array(
+				'name' => 'tags'
+			)
+		),
+		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'));
-  }
+	protected function getFullURI(){
+		return $this->getURI()
+		. 'posts?&page=' . $this->getInput('p')
+		. '&tags=' . urlencode($this->getInput('t'));
+	}

-  protected function getItemFromElement($element){
-    $item = array();
-    $item['uri'] = $this->getURI().$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'];
-    return $item;
-  }
+	protected function getTags($element){
+		return $element->find('img', 0)->getAttribute(static::TAGATTRIBUTE);
+	}

-  public function collectData(){
-    $html = getSimpleHTMLDOM($this->getFullURI())
-      or returnServerError('Could not request '.$this->getName());
+	protected function getItemFromElement($element){
+		// Fix links
+		defaultLinkTo($element, $this->getURI());

-    foreach($html->find(static::PATHTODATA) as $element) {
-      $this->items[] = $this->getItemFromElement($element);
-    }
-  }
+		$item = array();
+		$item['uri'] = $element->find('a', 0)->href;
+		$item['postid'] = (int)preg_replace('/[^0-9]/', '', $element->getAttribute(static::IDATTRIBUTE));
+		$item['timestamp'] = time();
+		$thumbnailUri = $element->find('img', 0)->src;
+		$item['tags'] = $this->getTags($element);
+		$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(){
+		$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;
+	}
 }
--- a/bridges/DansTonChatBridge.php
+++ b/bridges/DansTonChatBridge.php
@@ -1,23 +1,28 @@
 <?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(){
+	public function collectData(){

-        $html = getSimpleHTMLDOM(self::URI.'latest.html')
-            or returnServerError('Could not request DansTonChat.');
+		$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;
-                $this->items[] = $item;
-        }
-    }
+		foreach($html->find('div.item') as $element) {
+			$item = array();
+			$item['uri'] = $element->find('a', 0)->href;
+			$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;
+		}
+	}
 }
--- a/bridges/DauphineLibereBridge.php
+++ b/bridges/DauphineLibereBridge.php
@@ -1,57 +1,57 @@
 <?php
 class DauphineLibereBridge extends FeedExpander {

-    const MAINTAINER = "qwertygc";
-    const NAME = "Dauphine Bridge";
-    const URI = "http://www.ledauphine.com/";
-    const CACHE_TIMEOUT = 7200; // 2h
-    const DESCRIPTION = "Returns the newest articles.";
+	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 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'
-            )
-        )
-    ));
+	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'
+			)
+		)
+	));

-    public function collectData(){
-        $url = self::URI . 'rss';
+	public function collectData(){
+		$url = self::URI . 'rss';

-        if (empty($this->getInput('u'))) {
-            $url = self::URI . $this->getInput('u') . '/rss';
-        }
+		if(empty($this->getInput('u'))) {
+			$url = self::URI . $this->getInput('u') . '/rss';
+		}

-        $this->collectExpandableDatas($url, 10);
-    }
+		$this->collectExpandableDatas($url, 10);
+	}

-    protected function parseItem($newsItem){
-        $item = parent::parseItem($newsItem);
-        $item['content'] = $this->ExtractContent($item['uri']);
-        return $item;
-    }
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+		$item['content'] = $this->extractContent($item['uri']);
+		return $item;
+	}

-    private function ExtractContent($url) {
-        $html2 = getSimpleHTMLDOMCached($url);
-        $text = $html2->find('div.column', 0)->innertext;
-        $text = preg_replace('@<script[^>]*?>.*?</script>@si', '', $text);
-        return $text;
-    }
+	private function extractContent($url){
+		$html2 = getSimpleHTMLDOMCached($url);
+		foreach ($html2->find('.noprint, link, script, iframe, .shareTool, .contentInfo') as $remove) {
+			$remove->outertext = '';
+		}
+		return $html2->find('div.content', 0)->innertext;
+	}
 }
-?>
--- a/bridges/DealabsBridge.php
+++ b/bridges/DealabsBridge.php
--- a/bridges/DemoBridge.php
+++ b/bridges/DemoBridge.php
@@ -1,49 +1,46 @@
 <?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'
-            )
-        ),
+	const PARAMETERS = array(
+		'testCheckbox' => array(
+			'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'
+				)
+			)
+		),
+		'testNumber' => array(
+			'testNumber' => array(
+				'type' => 'number',
+				'name' => 'test des numéros',
+				'exampleValue' => '1515632'
+			)
+		)
+	);

-        'testList' => array(
-            'testList'=>array(
-                'type'=>'list',
-                'name'=>'test des listes',
-                'values'=>array(
-                    'Test'=>'test',
-                    'Test 2'=>'test2'
-                )
-            )
-        ),
+	public function collectData(){

-        'testNumber' => array(
-            'testNumber'=>array(
-                'type'=>'number',
-                'name'=>'test des numéros',
-                'exampleValue'=>'1515632'
-            )
-        )
-    );
+		$item = array();
+		$item['author'] = 'Me!';
+		$item['title'] = 'Test';
+		$item['content'] = 'Awesome content !';
+		$item['id'] = 'Lalala';
+		$item['uri'] = 'http://example.com/test';

-    public function collectData(){
-
-        $item = array();
-        $item['author'] = "Me!";
-        $item['title'] = "Test";
-        $item['content'] = "Awesome content !";
-        $item['id'] = "Lalala";
-        $item['uri'] = "http://example.com/test";
-
-        $this->items[] = $item;
-
-    }
+		$this->items[] = $item;
+	}
 }
--- a/bridges/DemonoidBridge.php
+++ b/bridges/DemonoidBridge.php
@@ -0,0 +1,169 @@
+<?php
+class DemonoidBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'metaMMA';
+	const NAME = 'Demonoid';
+	const URI = 'https://www.demonoid.pw/';
+	const DESCRIPTION = 'Returns results from search';
+
+	const PARAMETERS = array(
+		'Keywords' => array(
+			'q' => array(
+				'name' => 'keywords',
+				'exampleValue' => 'keyword1 keyword2…',
+				'required' => true,
+				),
+			'category' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All' => 0,
+					'Movies' => 1,
+					'Music' => 2,
+					'TV' => 3,
+					'Games' => 4,
+					'Applications' => 5,
+					'Pictures' => 8,
+					'Anime' => 9,
+					'Comics' => 10,
+					'Books' => 11,
+					'Audiobooks' => 17
+					)
+				)
+			),
+		'Category Only' => array(
+			'catOnly' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All' => 0,
+					'Movies' => 1,
+					'Music' => 2,
+					'TV' => 3,
+					'Games' => 4,
+					'Applications' => 5,
+					'Pictures' => 8,
+					'Anime' => 9,
+					'Comics' => 10,
+					'Books' => 11,
+					'Audiobooks' => 17
+					)
+				)
+			),
+		'User ID' => array(
+			'userid' => array(
+				'name' => 'user id',
+				'exampleValue' => '00000',
+				'required' => true,
+				'type' => 'number'
+				),
+			'category' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All' => 0,
+					'Movies' => 1,
+					'Music' => 2,
+					'TV' => 3,
+					'Games' => 4,
+					'Applications' => 5,
+					'Pictures' => 8,
+					'Anime' => 9,
+					'Comics' => 10,
+					'Books' => 11,
+					'Audiobooks' => 17
+					)
+				)
+			)
+	);
+
+	public function collectData() {
+
+		if(!empty($this->getInput('q'))) {
+
+			$html = getSimpleHTMLDOM(
+				self::URI .
+				'files/?category=' .
+				rawurlencode($this->getInput('category')) .
+				'&subcategory=All&quality=All&seeded=2&external=2&query=' .
+				urlencode($this->getInput('q')) .
+				'&uid=0&sort='
+				) or returnServerError('Could not request Demonoid.');
+
+		} elseif(!empty($this->getInput('catOnly'))) {
+
+			$html = getSimpleHTMLDOM(
+				self::URI .
+				'files/?uid=0&category=' .
+				rawurlencode($this->getInput('catOnly')) .
+				'&subcategory=0&language=0&seeded=2&quality=0&query=&sort='
+				) or returnServerError('Could not request Demonoid.');
+
+		} elseif(!empty($this->getInput('userid'))) {
+
+			$html = getSimpleHTMLDOM(
+				self::URI .
+				'files/?uid=' .
+				rawurlencode($this->getInput('userid')) .
+				'&seeded=2'
+				) or returnServerError('Could not request Demonoid.');
+
+		} else {
+			returnServerError('Invalid parameters !');
+		}
+
+		if(preg_match('~No torrents found~', $html)) {
+			return;
+		}
+
+		$table = $html->find('td[class=ctable_content_no_pad]', 0);
+		$cursorCount = 4;
+		$elementCount = 0;
+		while($elementCount != 40) {
+			$elementCount++;
+			$currentElement = $table->find('tr', $cursorCount);
+			if(preg_match('~items total~', $currentElement)) {
+				break;
+			}
+			$item = array();
+			//Do we have a date ?
+			if(preg_match('~Added.*?(.*)~', $currentElement->plaintext, $dateStr)) {
+				if(preg_match('~today~', $dateStr[0])) {
+					date_default_timezone_set('UTC');
+					$timestamp = mktime(0, 0, 0, gmdate('n'), gmdate('j'), gmdate('Y'));
+				} else {
+					preg_match('~(?<=ed on ).*\d+~', $currentElement->plaintext, $fullDateStr);
+					date_default_timezone_set('UTC');
+					$dateObj = strptime($fullDateStr[0], '%A, %b %d, %Y');
+					$timestamp = mktime(0, 0, 0, $dateObj['tm_mon'] + 1, $dateObj['tm_mday'], 1900 + $dateObj['tm_year']);
+				}
+				$cursorCount++;
+			}
+
+			$content = $table->find('tr', $cursorCount)->find('a', 1);
+			$cursorCount++;
+			$torrentInfo = $table->find('tr', $cursorCount);
+			$item['timestamp'] = $timestamp;
+			$item['title'] = $content->plaintext;
+			$item['id'] = self::URI . $content->href;
+			$item['uri'] = self::URI . $content->href;
+			$item['author'] = $torrentInfo->find('a[class=user]', 0)->plaintext;
+			$item['seeders'] = $torrentInfo->find('font[class=green]', 0)->plaintext;
+			$item['leechers'] = $torrentInfo->find('font[class=red]', 0)->plaintext;
+			$item['size'] = $torrentInfo->find('td', 3)->plaintext;
+			$item['content'] = 'Uploaded by ' . $item['author']
+				. ' , Size ' . $item['size']
+				. '<br>seeders: '
+				. $item['seeders']
+				. ' | leechers: '
+				. $item['leechers']
+				. '<br><a href="'
+				. $item['id']
+				. '">info page</a>';
+
+			$this->items[] = $item;
+
+			$cursorCount++;
+		}
+	}
+}
--- a/bridges/DerpibooruBridge.php
+++ b/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;
+		}
+	}
+}
--- a/bridges/DesoutterBridge.php
+++ b/bridges/DesoutterBridge.php
@@ -0,0 +1,239 @@
+<?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',
+				'required' => true,
+				'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',
+				'required' => true,
+				'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',
+				'required' => false,
+				'title' => 'Enable to load the full article for each item'
+			)
+		)
+	);
+
+	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);
+
+		foreach($html->find('article') as $article) {
+			$item = array();
+
+			$item['uri'] = $article->find('[itemprop="name"]', 0)->href;
+			$item['title'] = $article->find('[itemprop="name"]', 0)->title;
+
+			if($this->getInput('full')) {
+				$item['content'] = $this->getFullNewsArticle($item['uri']);
+			} else {
+				$item['content'] = $article->find('[itemprop="description"]', 0)->plaintext;
+			}
+
+			$this->items[] = $item;
+		}
+
+	}
+
+	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;
+	}
+}
--- a/bridges/DevToBridge.php
+++ b/bridges/DevToBridge.php
@@ -0,0 +1,103 @@
+<?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[class="single-article"]')
+			or returnServerError('Could not find articles!');
+
+		foreach($articles as $article) {
+
+			if($article->find('[class*="cta"]', 0)) { // Skip ads
+				continue;
+			}
+
+			$item = array();
+
+			$item['uri'] = $article->find('a[id*=article-link]', 0)->href;
+			$item['title'] = $article->find('h3', 0)->plaintext;
+
+			// i.e. "Charlie Harrington・Sep 21"
+			$item['timestamp'] = strtotime(explode('・', $article->find('h4 a', 0)->plaintext, 2)[1]);
+			$item['author'] = explode('・', $article->find('h4 a', 0)->plaintext, 2)[0];
+
+			// Profile image
+			$item['enclosures'] = array($article->find('img', 0)->src);
+
+			if($this->getInput('full')) {
+				$fullArticle = $this->getFullArticle($item['uri']);
+				$item['content'] = <<<EOD
+<img src="{$item['enclosures'][0]}" alt="{$item['author']}">
+<p>{$fullArticle}</p>
+EOD;
+			} else {
+				$item['content'] = <<<EOD
+<img src="{$item['enclosures'][0]}" alt="{$item['author']}">
+<p>{$item['title']}</p>
+EOD;
+			}
+
+			$item['categories'] = array_map(function($e){ return $e->plaintext; }, $article->find('div.tags span.tag'));
+
+			$this->items[] = $item;
+		}
+
+	}
+
+	private function getFullArticle($url) {
+		$html = getSimpleHTMLDOMCached($url)
+			or returnServerError('Unable to load article from "' . $url . '"!');
+
+		$html = defaultLinkTo($html, static::URI);
+
+		return $html->find('[id="article-body"]', 0);
+	}
+}
--- a/bridges/DeveloppezDotComBridge.php
+++ b/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);
 	}
--- a/bridges/DiceBridge.php
+++ b/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;
+		}
+	}
+}
--- a/bridges/DilbertBridge.php
+++ b/bridges/DilbertBridge.php
@@ -1,36 +1,36 @@
 <?php
 class DilbertBridge extends BridgeAbstract {

-    const MAINTAINER = 'kranack';
-    const NAME = 'Dilbert Daily Strip';
-    const URI = 'http://dilbert.com';
-    const CACHE_TIMEOUT = 21600; // 6h
-    const DESCRIPTION = 'The Unofficial Dilbert Daily Comic Strip';
+	const MAINTAINER = 'kranack';
+	const NAME = 'Dilbert Daily Strip';
+	const URI = 'https://dilbert.com';
+	const CACHE_TIMEOUT = 21600; // 6h
+	const DESCRIPTION = 'The Unofficial Dilbert Daily Comic Strip';

-    public function collectData(){
+	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;
-            $url = $link->href;
-            $date = substr($url, 25);
-            if (empty($title))
-                $title = 'Dilbert Comic Strip on '.$date;
-            $date = strtotime($date);
+			$img = $element->find('img', 0);
+			$link = $element->find('a', 0);
+			$comic = $img->src;
+			$title = $img->alt;
+			$url = $link->href;
+			$date = substr(strrchr($url, '/'), 1);
+			if (empty($title))
+				$title = 'Dilbert Comic Strip on ' . $date;
+			$date = strtotime($date);

-            $item = array();
-            $item['uri'] = $url;
-            $item['title'] = $title;
-            $item['author'] = 'Scott Adams';
-            $item['timestamp'] = $date;
-            $item['content'] = '<img src="'.$comic.'" alt="'.$img->alt.'" />';
-            $this->items[] = $item;
-        }
-    }
+			$item = array();
+			$item['uri'] = $url;
+			$item['title'] = $title;
+			$item['author'] = 'Scott Adams';
+			$item['timestamp'] = $date;
+			$item['content'] = '<img src="' . $comic . '" alt="' . $img->alt . '" />';
+			$this->items[] = $item;
+		}
+	}
 }
-?>
--- a/bridges/DiscogsBridge.php
+++ b/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;
+	}
+}
--- a/bridges/DollbooruBridge.php
+++ b/bridges/DollbooruBridge.php
@@ -1,11 +1,9 @@
 <?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";
-
+class DollbooruBridge extends Shimmie2Bridge {
+	const MAINTAINER = 'mitsukarenai';
+	const NAME = 'Dollbooru';
+	const URI = 'http://dollbooru.org/';
+	const DESCRIPTION = 'Returns images from given page';
 }
--- a/bridges/DribbbleBridge.php
+++ b/bridges/DribbbleBridge.php
@@ -0,0 +1,96 @@
+<?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 . '/shots')
+			or returnServerError('Error while downloading the website content');
+
+		$json = $this->loadEmbeddedJsonData($html);
+
+		foreach($html->find('li[id^="screenshot-"]') as $shot) {
+			$item = [];
+
+			$additional_data = $this->findJsonForShot($shot, $json);
+			if ($additional_data === null) {
+				$item['uri'] = self::URI . $shot->find('a', 0)->href;
+				$item['title'] = $shot->find('.dribbble-over strong', 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('.attribution-user a', 0)->plaintext);
+
+			$description = $shot->find('.comment', 0);
+			$item['content'] = $description === null ? '' : $description->plaintext;
+
+			$preview_path = $shot->find('picture source', 0)->attr['srcset'];
+			$item['content'] .= $this->getImageTag($preview_path, $item['title']);
+			$item['enclosures'] = [$this->getFullSizeImagePath($preview_path)];
+
+			$this->items[] = $item;
+		}
+	}
+
+	private function loadEmbeddedJsonData($html){
+		$json = [];
+		$scripts = $html->find('script');
+
+		foreach($scripts as $script) {
+			if(strpos($script->innertext, 'newestShots') !== false) {
+				// fix single quotes
+				$script->innertext = str_replace('\'', '"', $script->innertext);
+
+				// fix JavaScript JSON (why do they not adhere to the standard?)
+				$script->innertext = preg_replace('/(\w+):/i', '"\1":', $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 str_replace('_1x', '', $preview_path);
+	}
+}
--- a/bridges/DuckDuckGoBridge.php
+++ b/bridges/DuckDuckGoBridge.php
@@ -1,41 +1,42 @@
 <?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
-                ),
-            'defaultValue'=>self::SORT_DATE
-            )
-        ));
+	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
+			),
+			'defaultValue' => self::SORT_DATE
+		)
+	));

-    public function collectData(){
-        $html = getSimpleHTMLDOM(self::URI.'html/?q='.$this->getInput('u').$this->getInput('sort'))
-            or returnServerError('Could not request DuckDuckGo.');
+	public function collectData(){
+		$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) {
-                $item = array();
-                $item['uri'] = $element->find('a', 0)->href;
-                $item['title'] = $element->find('a', 1)->innertext;
-                $item['content'] = $element->find('div.snippet', 0)->plaintext;
-                $this->items[] = $item;
-        }
-    }
+		foreach($html->find('div.results_links') as $element) {
+			$item = array();
+			$item['uri'] = $element->find('a', 0)->href;
+			$item['title'] = $element->find('a', 1)->innertext;
+			$item['content'] = $element->find('div.snippet', 0)->plaintext;
+			$this->items[] = $item;
+		}
+	}
 }
--- a/bridges/ETTVBridge.php
+++ b/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;
+	}
+}
--- a/bridges/EZTVBridge.php
+++ b/bridges/EZTVBridge.php
@@ -1,66 +1,67 @@
 <?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
-        )
-    ));
+	const PARAMETERS = array( array(
+		'i' => array(
+			'name' => 'Show ids',
+			'exampleValue' => 'showID1,showID2,…',
+			'required' => true
+		)
+	));

 	public function collectData(){

-        // Make timestamp from relative released time in table
-        function makeTimestamp($relativeReleaseTime){
+		// Make timestamp from relative released time in table
+		function makeTimestamp($relativeReleaseTime){

-                $relativeDays = 0;
-                $relativeHours = 0;
+			$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);
-                }
-                return mktime(date('h')-$relativeHours,0,0,date('m'),date('d')-$relativeDays,date('Y'));
-        }
+			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'));
+		}

-        // Loop on show ids
-        $showList = explode(",",$this->getInput('i'));
-        foreach($showList as $showID){
+		// Loop on show ids
+		$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.'"');
+			// Get show page
+			$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) {
+			// 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;
+				// 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;

-                // Filter entries that are older than 1 week
-                if ($released->plaintext == '&gt;1 week') continue;
+				// Filter entries that are older than 1 week
+				if($released->plaintext == '&gt;1 week') continue;

-                // Fill item
-                $item = array();
-                $item['uri'] = self::URI.$epinfo->href;
-                $item['id'] = $item['uri'];
-                $item['timestamp'] = makeTimestamp($released->plaintext);
-                $item['title'] = $epinfo->plaintext;
-                $item['content'] = $epinfo->alt;
-                if(isset($item['title']))
-                    $this->items[] = $item;
-            }
-        }
+				// Fill item
+				$item = array();
+				$item['uri'] = self::URI . $epinfo->href;
+				$item['id'] = $item['uri'];
+				$item['timestamp'] = makeTimestamp($released->plaintext);
+				$item['title'] = $epinfo->plaintext;
+				$item['content'] = $epinfo->alt;
+				if(isset($item['title']))
+					$this->items[] = $item;
+			}
+		}
 	}
 }
--- a/bridges/EliteDangerousGalnetBridge.php
+++ b/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 {
+
+	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');

-	public function collectData()
-	{
-        $html = getSimpleHTMLDOM(self::URI)
-            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;
--- a/bridges/ElloBridge.php
+++ b/bridges/ElloBridge.php
@@ -0,0 +1,146 @@
+<?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 = [];
+		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() {
+		$cache = Cache::create('FileCache');
+		$cache->setPath(PATH_CACHE);
+		$cache->setParameters(['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();
+	}
+}
--- a/bridges/ElsevierBridge.php
+++ b/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 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'
-        )
-    ));
+	const PARAMETERS = array( array(
+		'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;
 		}
 	}
 }
-?>
--- a/bridges/EstCeQuonMetEnProdBridge.php
+++ b/bridges/EstCeQuonMetEnProdBridge.php
@@ -1,30 +1,27 @@
 <?php
 class EstCeQuonMetEnProdBridge extends BridgeAbstract {

-    const MAINTAINER = 'ORelio';
-    const NAME = 'Est-ce qu\'on met en prod aujourd\'hui ?';
-    const URI = 'https://www.estcequonmetenprodaujourdhui.info/';
-    const CACHE_TIMEOUT = 21600; // 6h
-    const DESCRIPTION = 'Should we put a website in production today? (French)';
+	const MAINTAINER = 'ORelio';
+	const NAME = 'Est-ce qu\'on met en prod aujourd\'hui ?';
+	const URI = 'https://www.estcequonmetenprodaujourdhui.info/';
+	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;
-        }
+	public function collectData() {
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request EstCeQuonMetEnProd: ' . self::URI);

-        $html = getSimpleHTMLDOM($this->getURI()) or returnServerError('Could not request EstCeQuonMetEnProd: '.$this->getURI());
+		$item = array();
+		$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="' . self::URI,
+			trim(extractFromDelimiters($html->outertext, '<body role="document">', '<div id="share'))
+		);

-        $item = array();
-        $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 />')));
-        $this->items[] = $item;
-    }
+		$this->items[] = $item;
+	}
 }
-?>
--- a/bridges/EtsyBridge.php
+++ b/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();
+	}
+}
--- a/bridges/ExtremeDownloadBridge.php
+++ b/bridges/ExtremeDownloadBridge.php
@@ -0,0 +1,103 @@
+<?php
+class ExtremeDownloadBridge extends BridgeAbstract {
+	const NAME = 'Extreme Download';
+	const URI = 'https://ww1.extreme-d0wn.com/';
+	const DESCRIPTION = 'Suivi de série sur Extreme Download';
+	const MAINTAINER = 'sysadminstory';
+	const PARAMETERS = array(
+		'Suivre la publication des épisodes d\'une série en cours de diffusion' => array(
+			'url' => array(
+				'name' => 'URL de la série',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'URL d\'une série sans le https://ww1.extreme-d0wn.com/',
+				'exampleValue' => 'series-hd/hd-series-vostfr/46631-halt-and-catch-fire-saison-04-vostfr-hdtv-720p.html'),
+			'filter' => array(
+				'name' => 'Type de contenu',
+				'type' => 'list',
+				'required' => true,
+				'title' => 'Type de contenu à suivre : Téléchargement, Streaming ou les deux',
+				'values' => array(
+					'Streaming et Téléchargement' => 'both',
+					'Téléchargement' => 'download',
+					'Streaming' => 'streaming'
+					)
+				)
+			)
+		);
+
+	public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI . $this->getInput('url'))
+			or returnServerError('Could not request Extreme Download.');
+
+		$filter = $this->getInput('filter');
+
+		$typesText = array(
+			'download' => 'Téléchargement',
+			'streaming' => 'Streaming'
+		);
+
+		// Get the TV show title
+		$this->showTitle = trim($html->find('span[id=news-title]', 0)->plaintext);
+
+		$list = $html->find('div[class=prez_7]');
+		foreach($list as $element) {
+			$add = false;
+			// Link type is needed is needed to generate an unique link
+			$type = $this->findLinkType($element);
+			if($filter == 'both') {
+				$add = true;
+			} else {
+				if($type == $filter) {
+					$add = true;
+				}
+			}
+			if($add == true) {
+				$item = array();
+
+				// Get the element name
+				$title = $element->plaintext;
+
+				// Get thee element links
+				$links = $element->next_sibling()->innertext;
+
+				$item['content'] = $links;
+				$item['title'] = $this->showTitle . ' ' . $title . ' - ' . $typesText[$type];
+				// As RSS Bridge use the URI as GUID they need to be unique : adding a md5 hash of the title element
+				// should geneerate unique URI to prevent confusion for RSS readers
+				$item['uri'] = self::URI . $this->getInput('url') . '#' . hash('md5', $item['title']);
+
+				$this->items[] = $item;
+			}
+		}
+	}
+
+	public function getName(){
+		switch($this->queriedContext) {
+		case 'Suivre la publication des épisodes d\'une série en cours de diffusion':
+			return $this->showTitle . ' - ' . self::NAME;
+			break;
+		default:
+			return self::NAME;
+		}
+	}
+
+	private function findLinkType($element)
+	{
+		$return = '';
+		// Walk through all elements in the reverse order until finding one with class 'presz_2'
+		while($element->class != 'prez_2') {
+			$element = $element->prev_sibling();
+		}
+		$text = html_entity_decode($element->plaintext);
+
+		// Regarding the text of the element, return the according link type
+		if(stristr($text, 'téléchargement') != false) {
+			$return = 'download';
+		} else if(stristr($text, 'streaming') != false) {
+			$return = 'streaming';
+		}
+
+		return $return;
+	}
+}
--- a/bridges/FB2Bridge.php
+++ b/bridges/FB2Bridge.php
@@ -0,0 +1,290 @@
+<?php
+class FB2Bridge extends BridgeAbstract {
+
+	const MAINTAINER = 'teromene';
+	const NAME = 'Facebook Alternate';
+	const URI = 'https://www.facebook.com/';
+	const CACHE_TIMEOUT = 1000;
+	const DESCRIPTION = 'Input a page title or a profile log. For a profile log,
+ please insert the parameter as follow : myExamplePage/132621766841117';
+
+	const PARAMETERS = array( array(
+		'u' => array(
+			'name' => 'Username',
+			'required' => true
+		)
+	));
+
+	public function getIcon() {
+		return 'https://static.xx.fbcdn.net/rsrc.php/yo/r/iRmz9lCMBD2.ico';
+	}
+
+	public function collectData(){
+
+		//Utility function for cleaning a Facebook link
+		$unescape_fb_link = function($matches){
+			if(is_array($matches) && count($matches) > 1) {
+				$link = $matches[1];
+				if(strpos($link, '/') === 0)
+					$link = self::URI . substr($link, 1);
+				if(strpos($link, 'facebook.com/l.php?u=') !== false)
+					$link = urldecode(extractFromDelimiters($link, 'facebook.com/l.php?u=', '&'));
+				return ' href="' . $link . '"';
+			}
+		};
+
+		//Utility function for converting facebook emoticons
+		$unescape_fb_emote = function($matches){
+			static $facebook_emoticons = array(
+				'smile' => ':)',
+				'frown' => ':(',
+				'tongue' => ':P',
+				'grin' => ':D',
+				'gasp' => ':O',
+				'wink' => ';)',
+				'pacman' => ':<',
+				'grumpy' => '>_<',
+				'unsure' => ':/',
+				'cry' => ':\'(',
+				'kiki' => '^_^',
+				'glasses' => '8-)',
+				'sunglasses' => 'B-)',
+				'heart' => '<3',
+				'devil' => ']:D',
+				'angel' => '0:)',
+				'squint' => '-_-',
+				'confused' => 'o_O',
+				'upset' => 'xD',
+				'colonthree' => ':3',
+				'like' => '&#x1F44D;');
+			$len = count($matches);
+			if ($len > 1)
+				for ($i = 1; $i < $len; $i++)
+					foreach ($facebook_emoticons as $name => $emote)
+						if ($matches[$i] === $name)
+							return $emote;
+			return $matches[0];
+		};
+
+		if($this->getInput('u') !== null) {
+			$page = 'https://touch.facebook.com/' . $this->getInput('u');
+			$cookies = $this->getCookies($page);
+			$pageInfo = $this->getPageInfos($page, $cookies);
+
+			if($pageInfo['userId'] === null) {
+				echo <<<EOD
+Unable to get the page id. You should consider getting the ID by hand, then importing it into FB2Bridge
+EOD;
+				die();
+			} elseif($pageInfo['userId'] == -1) {
+				echo <<<EOD
+This page is not accessible without being logged in.
+EOD;
+				die();
+			}
+		}
+
+		//Build the string for the first request
+		$requestString = 'https://touch.facebook.com/page_content_list_view/more/?page_id='
+		. $pageInfo['userId']
+		. '&start_cursor=1&num_to_fetch=105&surface_type=timeline';
+		$fileContent = getContents($requestString);
+		$html = $this->buildContent($fileContent);
+		$author = $pageInfo['username'];
+
+		foreach($html->find('article') as $content) {
+
+			$item = array();
+			//echo $content; die();
+			preg_match('/publish_time\\\":([0-9]+),/', $content->getAttribute('data-store', 0), $match);
+			if(isset($match[1]))
+				$timestamp = $match[1];
+			else
+				$timestamp = 0;
+
+			$item['uri'] = html_entity_decode('http://touch.facebook.com'
+			. $content->find("div[class='_52jc _5qc4 _78cz _24u0 _36xo']", 0)->find('a', 0)->getAttribute('href'), ENT_QUOTES);
+
+			//Decode images
+			$imagecleaned = preg_replace_callback('/<i [^>]* style="[^"]*url\(\'(.*?)\'\).*?><\/i>/m', function ($matches) {
+					return "<img src='" . str_replace(['\\3a ', '\\3d ', '\\26 '], [':', '=', '&'], $matches[1]) . "' />";
+				}, $content);
+			$content = str_get_html($imagecleaned);
+
+			if($content->find('header', 0) !== null) {
+				$content->find('header', 0)->innertext = '';
+			}
+
+			if($content->find('footer', 0) !== null) {
+				$content->find('footer', 0)->innertext = '';
+			}
+
+			// Replace emoticon images by their textual representation (part of the span)
+			foreach($content->find('span[title*="emoticon"]') as $emoticon) {
+				$emoticon->innertext = $emoticon->find('span[aria-hidden="true"]', 0)->innertext;
+			}
+
+			//Remove html nodes, keep only img, links, basic formatting
+			$content = strip_tags($content, '<a><img><i><u><br><p><h3><h4><section>');
+
+			//Adapt link hrefs: convert relative links into absolute links and bypass external link redirection
+			$content = preg_replace_callback('/ href=\"([^"]+)\"/i', $unescape_fb_link, $content);
+
+			//Clean useless html tag properties and fix link closing tags
+			foreach (array(
+				'onmouseover',
+				'onclick',
+				'target',
+				'ajaxify',
+				'tabindex',
+				'class',
+				'data-[^=]*',
+				'aria-[^=]*',
+				'role',
+				'rel',
+				'id') as $property_name)
+					$content = preg_replace('/ ' . $property_name . '=\"[^"]*\"/i', '', $content);
+			$content = preg_replace('/<\/a [^>]+>/i', '</a>', $content);
+
+			//Convert textual representation of emoticons eg
+			// "<i><u>smile emoticon</u></i>" back to ASCII emoticons eg ":)"
+			$content = preg_replace_callback('/<i><u>([^ <>]+) ([^<>]+)<\/u><\/i>/i', $unescape_fb_emote, $content);
+
+			//Remove the "...Plus" tag
+			$content = preg_replace(
+				'/… (<span>|)<a href="https:\/\/www\.facebook\.com\/story\.php\?story_fbid=.*?<\/a>/m',
+				'', $content, 1);
+
+			//Remove tracking images
+			$content = preg_replace('/<img src=\'.*?safe_image\.php.*?\' \/>/m', '', $content);
+
+			//Remove the double section tags
+			$content = str_replace(['<section><section>', '</section></section>'], ['<section>', '</section>'], $content);
+
+			//Move the section tag link upper, if it is down
+			$content = str_get_html($content);
+			$sectionContent = $content->find('section', 0);
+			if($sectionContent != null) {
+				$sectionLink = $sectionContent->nextSibling();
+				if($sectionLink != null) {
+					$fullLink = '<a href="' . $sectionLink->getAttribute('href') . '">' . $sectionContent->innertext . '</a>';
+					$sectionContent->innertext = $fullLink;
+				}
+			}
+
+			//Move the href tag upper if it is inside the section
+			foreach($content->find('section > a') as $sectionToFix) {
+				$sectionLink = $sectionToFix->getAttribute('href');
+				$section = $sectionToFix->parent();
+				$section->outertext = '<a href="' . $sectionLink . '">' . $section . '</a>';
+			}
+
+			$item['content'] = html_entity_decode($content, ENT_QUOTES);
+
+			$title = $author;
+			if (strlen($title) > 24)
+				$title = substr($title, 0, strpos(wordwrap($title, 24), "\n")) . '...';
+			$title = $title . ' | ' . strip_tags($content);
+			if (strlen($title) > 64)
+				$title = substr($title, 0, strpos(wordwrap($title, 64), "\n")) . '...';
+
+			$item['title'] = html_entity_decode($title, ENT_QUOTES);
+			$item['author'] = html_entity_decode($author, ENT_QUOTES);
+			$item['timestamp'] = html_entity_decode($timestamp, ENT_QUOTES);
+
+			if($item['timestamp'] != 0)
+				array_push($this->items, $item);
+		}
+
+	}
+
+	//Builds the HTML from the encoded JS that Facebook provides.
+	private function buildContent($pageContent){
+		// The html ends with:
+		// /div>","replaceifexists
+		$regex = '/\\"html\\":(\".+\/div>"),"replace/';
+		preg_match($regex, $pageContent, $result);
+
+		$htmlContent = json_decode($result[1]);
+		$htmlContent = preg_replace('/(?<!style)="(.*?)"/', '=\'$1\'', $htmlContent);
+		$htmlContent = html_entity_decode($htmlContent, ENT_QUOTES, 'UTF-8');
+
+		return str_get_html($htmlContent);
+	}
+
+	//Builds the cookie from the page, as Facebook sometimes refuses to give
+	//the page if no cookie is provided.
+	private function getCookies($pageURL){
+
+		$ctx = stream_context_create(array(
+			'http' => array(
+				'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0',
+				'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
+				)
+			)
+		);
+		$a = file_get_contents($pageURL, 0, $ctx);
+
+		//First request to get the cookie
+		$cookies = '';
+		foreach($http_response_header as $hdr) {
+			if(strpos($hdr, 'Set-Cookie') !== false) {
+				$cLine = explode(':', $hdr)[1];
+				$cLine = explode(';', $cLine)[0];
+				$cookies .= ';' . $cLine;
+			}
+		}
+
+		return substr($cookies, 1);
+	}
+
+	//Get the page ID and username from the Facebook page.
+	private function getPageInfos($page, $cookies){
+
+		$context = stream_context_create(array(
+			'http' => array(
+				'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0',
+				'header' => 'Cookie: ' . $cookies
+				)
+			)
+		);
+
+		$pageContent = file_get_contents($page, 0, $context);
+
+		if(strpos($pageContent, 'signup-button') != false) {
+			return -1;
+		}
+
+		//Get the username
+		$usernameRegex = '/data-nt=\"FB:TEXT4\">(.*?)<\/div>/m';
+		preg_match($usernameRegex, $pageContent, $usernameMatches);
+		if(count($usernameMatches) > 0) {
+			$username = strip_tags($usernameMatches[1]);
+		} else {
+			$username = $this->getInput('u');
+		}
+
+		//Get the page ID if we don't have a captcha
+		$regex = '/page_id=([0-9]*)&/';
+		preg_match($regex, $pageContent, $matches);
+
+		if(count($matches) > 0) {
+			return array('userId' => $matches[1], 'username' => $username);
+		}
+
+		//Get the page ID if we do have a captcha
+		$regex = '/"pageID":"([0-9]*)"/';
+		preg_match($regex, $pageContent, $matches);
+
+		return array('userId' => $matches[1], 'username' => $username);
+
+	}
+
+	public function getName(){
+		return (isset($this->name) ? $this->name . ' - ' : '') . 'Facebook Bridge';
+	}
+
+	public function getURI(){
+		return 'http://facebook.com';
+	}
+}
--- a/bridges/FDroidBridge.php
+++ b/bridges/FDroidBridge.php
@@ -0,0 +1,58 @@
+<?php
+class FDroidBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'Mitsukarenai';
+	const NAME = 'F-Droid Bridge';
+	const URI = 'https://f-droid.org/';
+	const CACHE_TIMEOUT = 60 * 60 * 2; // 2 hours
+	const DESCRIPTION = 'Returns latest added/updated apps on the open-source Android apps repository F-Droid';
+
+	const PARAMETERS = array( array(
+		'u' => array(
+			'name' => 'Widget selection',
+			'type' => 'list',
+			'required' => true,
+			'values' => array(
+				'Latest added apps' => 'added',
+				'Latest updated apps' => 'updated'
+			)
+		)
+	));
+
+	public function getIcon() {
+		return self::URI . 'assets/favicon.ico?v=8j6PKzW9Mk';
+	}
+
+	public function collectData(){
+		$url = self::URI;
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Could not request F-Droid.');
+
+		// targetting the corresponding widget based on user selection
+		// "updated" is the 4th widget on the page, "added" is the 5th
+
+		switch($this->getInput('u')) {
+			case 'updated':
+				$html_widget = $html->find('div.sidebar-widget', 4);
+				break;
+			default:
+				$html_widget = $html->find('div.sidebar-widget', 5);
+				break;
+		}
+
+		// and now extracting app info from the selected widget (and yeah turns out icons are of heterogeneous sizes)
+
+		foreach($html_widget->find('a') as $element) {
+				$item = array();
+				$item['uri'] = self::URI . $element->href;
+				$item['title'] = $element->find('h4', 0)->plaintext;
+				$item['icon'] = $element->find('img', 0)->src;
+				$item['summary'] = $element->find('span.package-summary', 0)->plaintext;
+				$item['content'] = '
+					<a href="' . $item['uri'] . '">
+						<img alt="" style="max-height:128px" src="' . $item['icon'] . '">
+					</a><br>' . $item['summary'];
+				$this->items[] = $item;
+		}
+	}
+}
--- a/bridges/FacebookBridge.php
+++ b/bridges/FacebookBridge.php
@@ -1,210 +1,691 @@
 <?php
-class FacebookBridge extends BridgeAbstract{
+class FacebookBridge extends BridgeAbstract {

-	const MAINTAINER = "teromene";
-	const NAME = "Facebook";
-	const URI = "https://www.facebook.com/";
+	const MAINTAINER = 'teromene, logmanoriginal';
+	const NAME = 'Facebook Bridge';
+	const URI = 'https://www.facebook.com/';
 	const CACHE_TIMEOUT = 300; // 5min
-	const DESCRIPTION = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117";
+	const DESCRIPTION = 'Input a page title or a profile log. For a profile log,
+ please insert the parameter as follow : myExamplePage/132621766841117';

-    const PARAMETERS =array( array(
-        'u'=>array(
-            'name'=>'Username',
-            'required'=>true
-        )
-    ));
+	const PARAMETERS = array(
+		'User' => array(
+			'u' => array(
+				'name' => 'Username',
+				'required' => true
+			),
+			'media_type' => array(
+				'name' => 'Media type',
+				'type' => 'list',
+				'required' => false,
+				'values' => array(
+					'All' => 'all',
+					'Video' => 'video',
+					'No Video' => 'novideo'
+				),
+				'defaultValue' => 'all'
+			),
+			'skip_reviews' => array(
+				'name' => 'Skip reviews',
+				'type' => 'checkbox',
+				'required' => false,
+				'defaultValue' => false,
+				'title' => 'Feed includes reviews when checked'
+			)
+		),
+		'Group' => array(
+			'g' => array(
+				'name' => 'Group',
+				'type' => 'text',
+				'required' => true,
+				'exampleValue' => 'https://www.facebook.com/groups/743149642484225',
+				'title' => 'Insert group name or facebook group URL'
+			)
+		),
+		'global' => array(
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'required' => false,
+				'title' => 'Specify the number of items to return (default: -1)',
+				'defaultValue' => -1
+			)
+		)
+	);

-    private $authorName='';
+	private $authorName = '';
+	private $groupName = '';

-	public function collectData(){
+	public function getIcon() {
+		return 'https://static.xx.fbcdn.net/rsrc.php/yo/r/iRmz9lCMBD2.ico';
+	}
+
+	public function getName(){
+
+		switch($this->queriedContext) {
+
+			case 'User':
+				if(!empty($this->authorName)) {
+					return isset($this->extraInfos['name']) ? $this->extraInfos['name'] : $this->authorName
+					. ' - ' . static::NAME;
+				}
+				break;
+
+			case 'Group':
+				if(!empty($this->groupName)) {
+					return $this->groupName . ' - ' . static::NAME;
+				}
+				break;

-		//Extract a string using start and end delimiters
-		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;
 		}

-		//Utility function for cleaning a Facebook link
-		$unescape_fb_link = function ($matches) {
-			if (is_array($matches) && count($matches) > 1) {
-				$link = $matches[1];
-				if (strpos($link, '/') === 0)
-					$link = self::URI.$link.'"';
-				if (strpos($link, 'facebook.com/l.php?u=') !== false)
-					$link = urldecode(ExtractFromDelimiters($link, 'facebook.com/l.php?u=', '&'));
-				return ' href="'.$link.'"';
+		return parent::getName();
+	}
+
+	public function getURI() {
+		$uri = self::URI;
+
+		switch($this->queriedContext) {
+
+			case 'Group':
+				// Discover groups via	https://www.facebook.com/groups/
+				// Example group:		https://www.facebook.com/groups/sailors.worldwide
+				$uri .= 'groups/' . $this->sanitizeGroup(filter_var($this->getInput('g'), FILTER_SANITIZE_URL));
+				break;
+
+			case 'User':
+				// Example user 1:		https://www.facebook.com/artetv/
+				// Example user 2:		artetv
+				$user = $this->sanitizeUser($this->getInput('u'));
+
+				if(!strpos($user, '/')) {
+					$uri .= urlencode($user) . '/posts';
+				} else {
+					$uri .= 'pages/' . $user;
+				}
+
+				break;
+
+		}
+
+		// Request the mobile version to reduce page size (no javascript)
+		// More information: https://stackoverflow.com/a/11103592
+		return $uri .= '?_fb_noscript=1';
+	}
+
+	public function collectData() {
+
+		switch($this->queriedContext) {
+
+			case 'Group':
+				$this->collectGroupData();
+				break;
+
+			case 'User':
+				$this->collectUserData();
+				break;
+
+			default:
+				returnClientError('Unknown context: "' . $this->queriedContext . '"!');
+
+		}
+
+		$limit = $this->getInput('limit') ?: -1;
+
+		if($limit > 0 && count($this->items) > $limit) {
+			$this->items = array_slice($this->items, 0, $limit);
+		}
+
+	}
+
+	#region Group
+
+	private function collectGroupData() {
+
+		$header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE') . "\r\n");
+
+		$html = getSimpleHTMLDOM($this->getURI(), $header)
+			or returnServerError('Failed loading facebook page: ' . $this->getURI());
+
+		if(!$this->isPublicGroup($html)) {
+			returnClientError('This group is not public! RSS-Bridge only supports public groups!');
+		}
+
+		defaultLinkTo($html, substr(self::URI, 0, strlen(self::URI) - 1));
+
+		$this->groupName = $this->extractGroupName($html);
+
+		$posts = $html->find('div.userContentWrapper')
+			or returnServerError('Failed finding posts!');
+
+		foreach($posts as $post) {
+
+			$item = array();
+
+			$item['uri'] = $this->extractGroupURI($post);
+			$item['title'] = $this->extractGroupTitle($post);
+			$item['author'] = $this->extractGroupAuthor($post);
+			$item['content'] = $this->extractGroupContent($post);
+			$item['timestamp'] = $this->extractGroupTimestamp($post);
+			$item['enclosures'] = $this->extractGroupEnclosures($post);
+
+			$this->items[] = $item;
+
+		}
+
+	}
+
+	private function sanitizeGroup($group) {
+
+		if(filter_var(
+			$group,
+			FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)) {
+			// User provided a URL
+
+			$urlparts = parse_url($group);
+
+			if($urlparts['host'] !== parse_url(self::URI)['host']
+			&& 'www.' . $urlparts['host'] !== parse_url(self::URI)['host']) {
+
+				returnClientError('The host you provided is invalid! Received "'
+				. $urlparts['host']
+				. '", expected "'
+				. parse_url(self::URI)['host']
+				. '"!');
+
 			}
-		};

-		//Utility function for converting facebook emoticons
-		$unescape_fb_emote = function ($matches) {
-			static $facebook_emoticons = array(
-				'smile' => ':)',
-				'frown' => ':(',
-				'tongue' => ':P',
-				'grin' => ':D',
-				'gasp' => ':O',
-				'wink' => ';)',
-				'pacman' => ':<',
-				'grumpy' => '>_<',
-				'unsure' => ':/',
-				'cry' => ':\'(',
-				'kiki' => '^_^',
-				'glasses' => '8-)',
-				'sunglasses' => 'B-)',
-				'heart' => '<3',
-				'devil' => ']:D',
-				'angel' => '0:)',
-				'squint' => '-_-',
-				'confused' => 'o_O',
-				'upset' => 'xD',
-				'colonthree' => ':3',
-				'like' => '&#x1F44D;');
-			$len = count($matches);
-			if ($len > 1)
-				for ($i = 1; $i < $len; $i++)
-					foreach ($facebook_emoticons as $name => $emote)
-						if ($matches[$i] === $name)
-							return $emote;
-			return $matches[0];
-		};
+			return explode('/', $urlparts['path'])[2];

-		$html = null;
+		} elseif(strpos($group, '/') !== false) {
+			returnClientError('The group you provided is invalid: ' . $group);
+		} else {
+			return $group;
+		}

-		//Handle captcha response sent by the viewer
-		if (isset($_POST['captcha_response']))
-		{
+	}
+
+	private function isPublicGroup($html) {
+
+		// Facebook redirects to the groups about page for non-public groups
+		$about = $html->find('#pagelet_group_about', 0);
+
+		return !($about);
+
+	}
+
+	private function extractGroupName($html) {
+
+		$ogtitle = $html->find('meta[property="og:title"]', 0)
+			or returnServerError('Unable to find group title!');
+
+		return htmlspecialchars_decode($ogtitle->content, ENT_QUOTES);
+
+	}
+
+	private function extractGroupURI($post) {
+
+		$elements = $post->find('a')
+			or returnServerError('Unable to find URI!');
+
+		foreach($elements as $anchor) {
+
+			// Find the one that is a permalink
+			if(strpos($anchor->href, 'permalink') !== false) {
+				return $anchor->href;
+			}
+
+		}
+
+		return null;
+
+	}
+
+	private function extractGroupContent($post) {
+
+		$content = $post->find('div.userContent', 0)
+			or returnServerError('Unable to find user content!');
+
+		return $content->innertext . $content->next_sibling()->innertext;
+
+	}
+
+	private function extractGroupTimestamp($post) {
+
+		$element = $post->find('abbr[data-utime]', 0)
+			or returnServerError('Unable to find timestamp!');
+
+		return $element->getAttribute('data-utime');
+
+	}
+
+	private function extractGroupAuthor($post) {
+
+		$element = $post->find('img', 0)
+			or returnServerError('Unable to find author information!');
+
+		return $element->{'aria-label'};
+
+	}
+
+	private function extractGroupEnclosures($post) {
+
+		$elements = $post->find('div.userContent', 0)->next_sibling()->find('img');
+
+		$enclosures = array();
+
+		foreach($elements as $enclosure) {
+			$enclosures[] = $enclosure->src;
+		}
+
+		return empty($enclosures) ? null : $enclosures;
+
+	}
+
+	private function extractGroupTitle($post) {
+
+		$element = $post->find('h5', 0)
+			or returnServerError('Unable to find title!');
+
+		if(strpos($element->plaintext, 'shared') === false) {
+
+			$content = strip_tags($this->extractGroupContent($post));
+
+			return $this->extractGroupAuthor($post)
+			. ' posted: '
+			. substr(
+					$content,
+					0,
+					strpos(wordwrap($content, 64), "\n")
+				)
+			. '...';
+
+		}
+
+		return $element->plaintext;
+
+	}
+
+	#endregion (Group)
+
+	#region User
+
+	/**
+	 * Checks if $user is a valid username or URI and returns the username
+	 */
+	private function sanitizeUser($user) {
+		if (filter_var($user, FILTER_VALIDATE_URL)) {
+
+			$urlparts = parse_url($user);
+
+			if($urlparts['host'] !== parse_url(self::URI)['host']) {
+				returnClientError('The host you provided is invalid! Received "'
+				. $urlparts['host']
+				. '", expected "'
+				. parse_url(self::URI)['host']
+				. '"!');
+			}
+
+			if(!array_key_exists('path', $urlparts)
+			|| $urlparts['path'] === '/') {
+				returnClientError('The URL you provided doesn\'t contain the user name!');
+			}
+
+			return explode('/', $urlparts['path'])[1];
+
+		} else {
+
+			// First character cannot be a forward slash
+			if(strpos($user, '/') === 0) {
+				returnClientError('Remove leading slash "/" from the username!');
+			}
+
+			return $user;
+
+		}
+	}
+
+	/**
+	 * Bypass external link redirection
+	 */
+	private function unescape_fb_link($content){
+		return preg_replace_callback('/ href=\"([^"]+)\"/i', function($matches){
+			if(is_array($matches) && count($matches) > 1) {
+
+				$link = $matches[1];
+
+				if(strpos($link, 'facebook.com/l.php?u=') !== false)
+					$link = urldecode(extractFromDelimiters($link, 'facebook.com/l.php?u=', '&'));
+
+				return ' href="' . $link . '"';
+
+			}
+		}, $content);
+	}
+
+	/**
+	 * Remove Facebook's tracking code
+	 */
+	private function remove_tracking_codes($content){
+		return preg_replace_callback('/ href=\"([^"]+)\"/i', function($matches){
+			if(is_array($matches) && count($matches) > 1) {
+
+				$link = $matches[1];
+
+				if(strpos($link, 'facebook.com') !== false) {
+					if(strpos($link, '?') !== false) {
+						$link = substr($link, 0, strpos($link, '?'));
+					}
+				}
+				return ' href="' . $link . '"';
+
+			}
+		}, $content);
+	}
+
+	/**
+	 * Convert textual representation of emoticons back to ASCII emoticons.
+	 * i.e. "<i><u>smile emoticon</u></i>" => ":)"
+	 */
+	private function unescape_fb_emote($content){
+		return preg_replace_callback('/<i><u>([^ <>]+) ([^<>]+)<\/u><\/i>/i', function($matches){
+				static $facebook_emoticons = array(
+					'smile' => ':)',
+					'frown' => ':(',
+					'tongue' => ':P',
+					'grin' => ':D',
+					'gasp' => ':O',
+					'wink' => ';)',
+					'pacman' => ':<',
+					'grumpy' => '>_<',
+					'unsure' => ':/',
+					'cry' => ':\'(',
+					'kiki' => '^_^',
+					'glasses' => '8-)',
+					'sunglasses' => 'B-)',
+					'heart' => '<3',
+					'devil' => ']:D',
+					'angel' => '0:)',
+					'squint' => '-_-',
+					'confused' => 'o_O',
+					'upset' => 'xD',
+					'colonthree' => ':3',
+					'like' => '&#x1F44D;');
+
+				$len = count($matches);
+
+				if ($len > 1)
+					for ($i = 1; $i < $len; $i++)
+						foreach ($facebook_emoticons as $name => $emote)
+							if ($matches[$i] === $name)
+								return $emote;
+
+				return $matches[0];
+			}, $content);
+	}
+
+	/**
+	 * Returns the captcha message for the given captcha
+	 */
+	private function returnCaptchaMessage($captcha) {
+		// Save form for submitting after getting captcha response
+		if (session_status() == PHP_SESSION_NONE) {
+			session_start();
+		}
+
+		$captcha_fields = array();
+
+		foreach ($captcha->find('input, button') as $input) {
+			$captcha_fields[$input->name] = $input->value;
+		}
+
+		$_SESSION['captcha_fields'] = $captcha_fields;
+		$_SESSION['captcha_action'] = $captcha->find('form', 0)->action;
+
+		// Show captcha filling form to the viewer, proxying the captcha image
+		$img = base64_encode(getContents($captcha->find('img', 0)->src));
+
+		header('Content-Type: text/html', true, 500);
+
+		$message = <<<EOD
+<form method="post" action="?{$_SERVER['QUERY_STRING']}">
+<h2>Facebook captcha challenge</h2>
+<p>Unfortunately, rss-bridge cannot fetch the requested page.<br />
+Facebook wants rss-bridge to resolve the following captcha:</p>
+<p><img src="data:image/png;base64,{$img}" /></p>
+<p><b>Response:</b> <input name="captcha_response" placeholder="please fill in" />
+<input type="submit" value="Submit!" /></p>
+</form>
+EOD;
+
+		die($message);
+	}
+
+	/**
+	 * Checks if a capture response was received and tries to load the contents
+	 * @return mixed null if no capture response was received, simplhtmldom document otherwise
+	 */
+	private function handleCaptchaResponse() {
+		if (isset($_POST['captcha_response'])) {
 			if (session_status() == PHP_SESSION_NONE)
 				session_start();
-			if (isset($_SESSION['captcha_fields'], $_SESSION['captcha_action']))
-			{
+
+			if (isset($_SESSION['captcha_fields'], $_SESSION['captcha_action'])) {
 				$captcha_action = $_SESSION['captcha_action'];
 				$captcha_fields = $_SESSION['captcha_fields'];
-				$captcha_fields['captcha_response'] = preg_replace("/[^a-zA-Z0-9]+/", "", $_POST['captcha_response']);
-				$http_options = array(
-					'http' => array(
-						'method'  => 'POST',
-						'user_agent'=> ini_get('user_agent'),
-						'header'=>array("Content-type: application/x-www-form-urlencoded\r\nReferer: $captcha_action\r\nCookie: noscript=1\r\n"),
-						'content' => http_build_query($captcha_fields),
-					),
+				$captcha_fields['captcha_response'] = preg_replace('/[^a-zA-Z0-9]+/', '', $_POST['captcha_response']);
+
+				$header = array(
+					'Content-type: application/x-www-form-urlencoded',
+					'Referer: ' . $captcha_action,
+					'Cookie: noscript=1'
 				);
-				$context  = stream_context_create($http_options);
-				$html = getContents($captcha_action, false, $context);
-				if ($html === FALSE) { returnServerError('Failed to submit captcha response back to Facebook'); }
-				unset($_SESSION['captcha_fields']);
-				$html = str_get_html($html);
+
+				$opts = array(
+					CURLOPT_POST => 1,
+					CURLOPT_POSTFIELDS => http_build_query($captcha_fields)
+				);
+
+				$html = getSimpleHTMLDOM($captcha_action, $header, $opts)
+					or returnServerError('Failed to submit captcha response back to Facebook');
+
+				return $html;
 			}
+
 			unset($_SESSION['captcha_fields']);
 			unset($_SESSION['captcha_action']);
 		}

-		//Retrieve page contents
-		if (is_null($html)) {
-			if (!strpos($this->getInput('u'), "/")) {
-                $html = getSimpleHTMLDOM(self::URI.urlencode($this->getInput('u')).'?_fb_noscript=1')
-                    or returnServerError('No results for this query.');
-			} else {
-                $html = getSimpleHTMLDOM(self::URI.'pages/'.$this->getInput('u').'?_fb_noscript=1')
-                    or returnServerError('No results for this query.');
-			}
+		return null;
+	}
+
+	private function collectUserData(){
+
+		$html = $this->handleCaptchaResponse();
+
+		// Retrieve page contents
+		if(is_null($html)) {
+
+			$header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE'));
+
+			$html = getSimpleHTMLDOM($this->getURI(), $header)
+				or returnServerError('No results for this query.');
+
 		}

-		//Handle captcha form?
+		// Handle captcha form?
 		$captcha = $html->find('div.captcha_interstitial', 0);
-		if (!is_null($captcha))
-		{
-			//Save form for submitting after getting captcha response
-			if (session_status() == PHP_SESSION_NONE)
-				session_start();
-			$captcha_fields = array();
-			foreach ($captcha->find('input, button') as $input)
-				$captcha_fields[$input->name] = $input->value;
-			$_SESSION['captcha_fields'] = $captcha_fields;
-			$_SESSION['captcha_action'] = self::URI.$captcha->find('form', 0)->action;

-			//Show captcha filling form to the viewer, proxying the captcha image
-			$img = base64_encode(getContents($captcha->find('img', 0)->src));
-			header('HTTP/1.1 500 '.Http::getMessageForCode(500));
-			header('Content-Type: text/html');
-			die('<form method="post" action="?'.$_SERVER['QUERY_STRING'].'">'
-				.'<h2>Facebook captcha challenge</h2>'
-				.'<p>Unfortunately, rss-bridge cannot fetch the requested page.<br />'
-				.'Facebook wants rss-bridge to resolve the following captcha:</p>'
-				.'<p><img src="data:image/png;base64,'.$img.'" /></p>'
-				.'<p><b>Response:</b> <input name="captcha_response" placeholder="please fill in" />'
-				.'<input type="submit" value="Submit!" /></p>'
-				.'</form>');
+		if (!is_null($captcha)) {
+			$this->returnCaptchaMessage($captcha);
 		}

-		//No captcha? We can carry on retrieving page contents :)
-		$element = $html->find('#pagelet_timeline_main_column')[0]->children(0)->children(0)->children(0)->next_sibling()->children(0);
+		// No captcha? We can carry on retrieving page contents :)
+		// First, we check wether the page is public or not
+		$loginForm = $html->find('._585r', 0);
+
+		if($loginForm != null) {
+			returnServerError('You must be logged in to view this page. This is not supported by RSS-Bridge.');
+		}
+
+		$element = $html
+		->find('#pagelet_timeline_main_column')[0]
+		->children(0)
+		->children(0)
+		->next_sibling()
+		->children(0);

 		if(isset($element)) {

-			$author = str_replace(' | Facebook', '', $html->find('title#pageTitle', 0)->innertext);
-			$profilePic = 'https://graph.facebook.com/'.$this->getInput('u').'/picture?width=200&amp;height=200';
+			$author = str_replace(' - Posts | Facebook', '', $html->find('title#pageTitle', 0)->innertext);
+
+			$profilePic = $html->find('meta[property="og:image"]', 0)->content;
+
 			$this->authorName = $author;

-			foreach($element->children() as $post) {
+			foreach($element->children() as $cell) {
+				// Manage summary posts
+				if(strpos($cell->class, '_3xaf') !== false) {
+					$posts = $cell->children();
+				} else {
+					$posts = array($cell);
+				}

-				$item = array();
+				// Optionally skip reviews
+				if($this->getInput('skip_reviews')
+				&& !is_null($cell->find('#review_composer_container', 0))) {
+					continue;
+				}

-				if (count($post->find('abbr')) > 0) {
-
-					//Retrieve post contents
-					$content = preg_replace('/(?i)><div class=\"clearfix([^>]+)>(.+?)div\ class=\"userContent\"/i', '', $post);
-					$content = preg_replace('/(?i)><div class=\"_59tj([^>]+)>(.+?)<\/div><\/div><a/i', '', $content);
-					$content = preg_replace('/(?i)><div class=\"_3dp([^>]+)>(.+?)div\ class=\"[^u]+userContent\"/i', '', $content);
-					$content = preg_replace('/(?i)><div class=\"_4l5([^>]+)>(.+?)<\/div>/i', '', $content);
-
-					//Remove html nodes, keep only img, links, basic formatting
-					$content = strip_tags($content,'<a><img><i><u>');
-
-					//Adapt link hrefs: convert relative links into absolute links and bypass external link redirection
-					$content = preg_replace_callback('/ href=\"([^"]+)\"/i', $unescape_fb_link, $content);
-
-					//Clean useless html tag properties and fix link closing tags
-					foreach (array('onmouseover', 'onclick', 'target', 'ajaxify', 'tabindex',
-						'class', 'style', 'data-[^=]*', 'aria-[^=]*', 'role', 'rel', 'id') as $property_name)
-							$content = preg_replace('/ '.$property_name.'=\"[^"]*\"/i', '', $content);
-					$content = preg_replace('/<\/a [^>]+>/i', '</a>', $content);
-
-					//Convert textual representation of emoticons eg "<i><u>smile emoticon</u></i>" back to ASCII emoticons eg ":)"
-					$content = preg_replace_callback('/<i><u>([^ <>]+) ([^<>]+)<\/u><\/i>/i', $unescape_fb_emote, $content);
-
-					//Retrieve date of the post
-					$date = $post->find("abbr")[0];
-					if(isset($date) && $date->hasAttribute('data-utime')) {
-						$date = $date->getAttribute('data-utime');
-					} else {
-						$date = 0;
+				foreach($posts as $post) {
+					// Check media type
+					switch($this->getInput('media_type')) {
+						case 'all': break;
+						case 'video':
+							if(empty($post->find('[aria-label=Video]'))) continue 2;
+							break;
+						case 'novideo':
+							if(!empty($post->find('[aria-label=Video]'))) continue 2;
+							break;
+						default: break;
 					}

-					//Build title from username and content
-					$title = $author;
-					if (strlen($title) > 24)
-						$title = substr($title, 0, strpos(wordwrap($title, 24), "\n")).'...';
-					$title = $title.' | '.strip_tags($content);
-					if (strlen($title) > 64)
-						$title = substr($title, 0, strpos(wordwrap($title, 64), "\n")).'...';
+					$item = array();

-					//Build and add final item
-					$item['uri'] = self::URI.$post->find('abbr')[0]->parent()->getAttribute('href');
-					$item['content'] = $content;
-					$item['title'] = $title;
-					$item['author'] = $author;
-					$item['timestamp'] = $date;
-					$this->items[] = $item;
+					if(count($post->find('abbr')) > 0) {
+
+						$content = $post->find('.userContentWrapper', 0);
+
+						// This array specifies filters applied to all posts in order of appearance
+						$content_filters = array(
+							'._5mly', // Remove embedded videos (the preview image remains)
+							'._2ezg', // Remove "Views ..."
+							'.hidden_elem', // Remove hidden elements (they are hidden anyway)
+						);
+
+						foreach($content_filters as $filter) {
+							foreach($content->find($filter) as $subject) {
+								$subject->outertext = '';
+							}
+						}
+
+						// Change origin tag for embedded media from div to paragraph
+						foreach($content->find('._59tj') as $subject) {
+							$subject->outertext = '<p>' . $subject->innertext . '</p>';
+						}
+
+						// Change title tag for embedded media from anchor to paragraph
+						foreach($content->find('._3n1k a') as $anchor) {
+							$anchor->outertext = '<p>' . $anchor->innertext . '</p>';
+						}
+
+						$content = preg_replace(
+							'/(?i)><div class=\"_3dp([^>]+)>(.+?)div\ class=\"[^u]+userContent\"/i',
+							'',
+							$content);
+
+						$content = preg_replace(
+							'/(?i)><div class=\"_4l5([^>]+)>(.+?)<\/div>/i',
+							'',
+							$content);
+
+						// Remove "SpSonsSoriSsés"
+						$content = preg_replace(
+							'/(?iU)<a [^>]+ href="#" role="link" [^>}]+>.+<\/a>/iU',
+							'',
+							$content);
+
+						// Remove html nodes, keep only img, links, basic formatting
+						$content = strip_tags($content, '<a><img><i><u><br><p>');
+
+						$content = $this->unescape_fb_link($content);
+
+						// Clean useless html tag properties and fix link closing tags
+						foreach (array(
+							'onmouseover',
+							'onclick',
+							'target',
+							'ajaxify',
+							'tabindex',
+							'class',
+							'style',
+							'data-[^=]*',
+							'aria-[^=]*',
+							'role',
+							'rel',
+							'id') as $property_name) {
+							$content = preg_replace('/ ' . $property_name . '=\"[^"]*\"/i', '', $content);
+						}
+
+						$content = preg_replace('/<\/a [^>]+>/i', '</a>', $content);
+
+						$this->unescape_fb_emote($content);
+
+						// Restore links in the post before further parsing
+						$post = defaultLinkTo($post, self::URI);
+
+						// Restore links in the content before adding to the item
+						$content = defaultLinkTo($content, self::URI);
+
+						$content = $this->remove_tracking_codes($content);
+
+						// Retrieve date of the post
+						$date = $post->find('abbr')[0];
+
+						if(isset($date) && $date->hasAttribute('data-utime')) {
+							$date = $date->getAttribute('data-utime');
+						} else {
+							$date = 0;
+						}
+
+						// Build title from content
+						$title = strip_tags($post->find('.userContent', 0)->innertext);
+						if(strlen($title) > 64)
+							$title = substr($title, 0, strpos(wordwrap($title, 64), "\n")) . '...';
+
+						$uri = $post->find('abbr')[0]->parent()->getAttribute('href');
+
+						if (false !== strpos($uri, '?')) {
+							$uri = substr($uri, 0, strpos($uri, '?'));
+						}
+
+						//Build and add final item
+						$item['uri'] = htmlspecialchars_decode($uri, ENT_QUOTES);
+						$item['content'] = htmlspecialchars_decode($content, ENT_QUOTES);
+						$item['title'] = htmlspecialchars_decode($title, ENT_QUOTES);
+						$item['author'] = htmlspecialchars_decode($author, ENT_QUOTES);
+						$item['timestamp'] = $date;
+
+						if(strpos($item['content'], '<img') === false) {
+							$item['enclosures'] = array($profilePic);
+						}
+
+						$this->items[] = $item;
+					}
 				}
 			}
 		}
 	}
+	#endregion (User)

-	public function getName() {
-		return (isset($this->authorName) ? $this->authorName.' - ' : '').'Facebook Bridge';
-	}
 }
--- a/bridges/FeedExpanderExampleBridge.php
+++ b/bridges/FeedExpanderExampleBridge.php
@@ -1,62 +1,62 @@
 <?php
 class FeedExpanderExampleBridge extends FeedExpander {

-    const MAINTAINER = 'logmanoriginal';
-    const NAME = 'FeedExpander Example';
-    const URI = '#';
-    const DESCRIPTION = 'Example bridge to test FeedExpander';
+	const MAINTAINER = 'logmanoriginal';
+	const NAME = 'FeedExpander Example';
+	const URI = 'http://github.com/RSS-Bridge/rss-bridge/';
+	const DESCRIPTION = 'Example bridge to test FeedExpander';

-    const PARAMETERS = array(
-        'Feed' => array(
-            'version' => array(
-                'name' => 'Version',
-                'type' => 'list',
-                'required' => true,
-                'title' => 'Select your feed format/version',
-                'defaultValue' => 'RSS 2.0',
-                'values' => array(
-                    'RSS 0.91' => 'rss_0_9_1',
-                    'RSS 1.0' => 'rss_1_0',
-                    'RSS 2.0' => 'rss_2_0',
-                    'ATOM 1.0' => 'atom_1_0'
-                )
-            )
-        )
-    );
+	const PARAMETERS = array(
+		'Feed' => array(
+			'version' => array(
+				'name' => 'Version',
+				'type' => 'list',
+				'required' => true,
+				'title' => 'Select your feed format/version',
+				'defaultValue' => 'RSS 2.0',
+				'values' => array(
+					'RSS 0.91' => 'rss_0_9_1',
+					'RSS 1.0' => 'rss_1_0',
+					'RSS 2.0' => 'rss_2_0',
+					'ATOM 1.0' => 'atom_1_0'
+				)
+			)
+		)
+	);

-    public function collectData(){
-        switch($this->getInput('version')){
-            case 'rss_0_9_1':
-                parent::collectExpandableDatas('http://static.userland.com/gems/backend/sampleRss.xml');
-                break;
-            case 'rss_1_0':
-                parent::collectExpandableDatas('http://feeds.nature.com/nature/rss/current?format=xml');
-                break;
-            case 'rss_2_0':
-                parent::collectExpandableDatas('http://feeds.rssboard.org/rssboard?format=xml');
-                break;
-            case 'atom_1_0':
-                parent::collectExpandableDatas('http://segfault.linuxmint.com/feed/atom/');
-                break;
-            default: returnClientError('Unknown version ' . $this->getInput('version') . '!');
-        }
-    }
+	public function collectData(){
+		switch($this->getInput('version')) {
+			case 'rss_0_9_1':
+				parent::collectExpandableDatas('http://static.userland.com/gems/backend/sampleRss.xml');
+				break;
+			case 'rss_1_0':
+				parent::collectExpandableDatas('http://feeds.nature.com/nature/rss/current?format=xml');
+				break;
+			case 'rss_2_0':
+				parent::collectExpandableDatas('http://feeds.rssboard.org/rssboard?format=xml');
+				break;
+			case 'atom_1_0':
+				parent::collectExpandableDatas('http://segfault.linuxmint.com/feed/atom/');
+				break;
+			default: returnClientError('Unknown version ' . $this->getInput('version') . '!');
+		}
+	}

-    protected function parseItem($newsItem) {
-        switch($this->getInput('version')){
-            case 'rss_0_9_1':
-                return $this->parseRSS_0_9_1_Item($newsItem);
-                break;
-            case 'rss_1_0':
-                return $this->parseRSS_1_0_Item($newsItem);
-                break;
-            case 'rss_2_0':
-                return $this->parseRSS_2_0_Item($newsItem);
-                break;
-            case 'atom_1_0':
-                return $this->parseATOMItem($newsItem);
-                break;
-            default: returnClientError('Unknown version ' . $this->getInput('version') . '!');
-        }
-    }
+	protected function parseItem($newsItem) {
+		switch($this->getInput('version')) {
+			case 'rss_0_9_1':
+				return $this->parseRSS_0_9_1_Item($newsItem);
+				break;
+			case 'rss_1_0':
+				return $this->parseRSS_1_0_Item($newsItem);
+				break;
+			case 'rss_2_0':
+				return $this->parseRSS_2_0_Item($newsItem);
+				break;
+			case 'atom_1_0':
+				return $this->parseATOMItem($newsItem);
+				break;
+			default: returnClientError('Unknown version ' . $this->getInput('version') . '!');
+		}
+	}
 }
--- a/bridges/FierPandaBridge.php
+++ b/bridges/FierPandaBridge.php
@@ -1,23 +1,33 @@
 <?php
 class FierPandaBridge extends BridgeAbstract {

-    const MAINTAINER = "snroki";
-    const NAME = "Fier Panda Bridge";
-    const URI = "http://www.fier-panda.fr/";
-    const CACHE_TIMEOUT = 21600; // 6h
-    const DESCRIPTION = "Returns latest articles from Fier Panda.";
+	const MAINTAINER = 'snroki';
+	const NAME = 'Fier Panda Bridge';
+	const URI = 'http://www.fier-panda.fr/';
+	const CACHE_TIMEOUT = 21600; // 6h
+	const DESCRIPTION = 'Returns latest articles from Fier Panda.';

-    public function collectData(){
-        $html = getSimpleHTMLDOM(self::URI) or returnServerError('Could not request Fier Panda.');
+	public function getIcon() {
+		return self::URI . 'wp-content/themes/fier-panda/img/favicon.png';
+	}

-        foreach($html->find('div.container-content article') as $element) {
-            $item = array();
-            $item['uri'] = $this->getURI().$element->find('a', 0)->href;
-            $item['title'] = trim($element->find('h1 a', 0)->innertext);
-            // Remove the link at the end of the article
-            $element->find('p a', 0)->outertext = '';
-            $item['content'] = $element->find('p', 0)->innertext;
-            $this->items[] = $item;
-        }
-    }
+	public function collectData(){
+
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request Fier Panda.');
+
+		defaultLinkTo($html, static::URI);
+
+		foreach($html->find('article') as $article) {
+
+			$item = array();
+
+			$item['uri'] = $article->find('a', 0)->href;
+			$item['title'] = $article->find('a', 0)->title;
+
+			$this->items[] = $item;
+
+		}
+
+	}
 }
--- a/bridges/FilterBridge.php
+++ b/bridges/FilterBridge.php
@@ -0,0 +1,101 @@
+<?php
+
+class FilterBridge extends FeedExpander {
+
+	const MAINTAINER = 'Frenzie';
+	const NAME = 'Filter';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'Filters a feed of your choice';
+	const URI = 'https://github.com/rss-bridge/rss-bridge';
+
+	const PARAMETERS = array(array(
+		'url' => array(
+			'name' => 'Feed URL',
+			'required' => true,
+		),
+		'filter' => array(
+			'name' => 'Filter item title (regular expression)',
+			'required' => false,
+		),
+		'filter_type' => array(
+			'name' => 'Filter type',
+			'type' => 'list',
+			'required' => false,
+			'values' => array(
+				'Permit' => 'permit',
+				'Block' => 'block',
+			),
+			'defaultValue' => 'permit',
+		),
+		'title_from_content' => array(
+			'name' => 'Generate title from content',
+			'type' => 'checkbox',
+			'required' => false,
+		)
+	));
+
+	protected function parseItem($newItem){
+		$item = parent::parseItem($newItem);
+
+		if($this->getInput('title_from_content') && array_key_exists('content', $item)) {
+
+			$content = str_get_html($item['content']);
+
+			$pos = strpos($item['content'], ' ', 50);
+
+			$item['title'] = substr(
+				$content->plaintext,
+				0,
+				$pos
+			);
+
+			if(strlen($content->plaintext) >= $pos) {
+				$item['title'] .= '...';
+			}
+
+		}
+
+		switch(true) {
+		case $this->getFilterType() === 'permit':
+			if (preg_match($this->getFilter(), $item['title'])) {
+				return $item;
+			}
+			break;
+		case $this->getFilterType() === 'block':
+			if (!preg_match($this->getFilter(), $item['title'])) {
+				return $item;
+			}
+			break;
+		}
+		return null;
+	}
+
+	protected function getFilter(){
+		return '/' . $this->getInput('filter') . '/';
+	}
+
+	protected function getFilterType(){
+		return $this->getInput('filter_type');
+	}
+
+	public function getURI(){
+		$url = $this->getInput('url');
+
+		if(empty($url)) {
+			$url = parent::getURI();
+		}
+		return $url;
+	}
+
+	public function collectData(){
+		if($this->getInput('url') && substr($this->getInput('url'), 0, strlen('http')) !== 'http') {
+			// just in case someone find a way to access local files by playing with the url
+			returnClientError('The url parameter must either refer to http or https protocol.');
+		}
+		try{
+			$this->collectExpandableDatas($this->getURI());
+		} catch (Exception $e) {
+			$this->collectExpandableDatas($this->getURI());
+		}
+	}
+}
--- a/bridges/FindACrewBridge.php
+++ b/bridges/FindACrewBridge.php
@@ -0,0 +1,82 @@
+<?php
+class FindACrewBridge extends BridgeAbstract {
+	const MAINTAINER = 'couraudt';
+	const NAME = 'Find A Crew Bridge';
+	const URI = 'https://www.findacrew.net';
+	const DESCRIPTION = 'Returns the newest sailing offers.';
+	const PARAMETERS = array(
+		array(
+			'type' => array(
+				'name' => 'Type of search',
+				'title' => 'Choose between finding a boat or a crew',
+				'type' => 'list',
+				'values' => array(
+					'Find a boat' => 'boat',
+					'Find a crew' => 'crew'
+				)
+			),
+			'long' => array(
+				'name' => 'Longitude of the searched location',
+				'title' => 'Center the search at that longitude (e.g: -42.02)'
+			),
+			'lat' => array(
+				'name' => 'Latitude of the searched location',
+				'title' => 'Center the search at that latitude (e.g: 12.42)'
+			),
+			'distance' => array(
+				'name' => 'Limit boundary of search in KM',
+				'title' => 'Boundary of the search in kilometers when using longitude and latitude'
+			)
+		)
+	);
+
+	public function collectData() {
+		$url = $this->getURI();
+
+		if ($this->getInput('type') == 'boat') {
+			$data = array('SrhLstBtAction' => 'Create');
+		} else {
+			$data = array('SrhLstCwAction' => 'Create');
+		}
+
+		if ($this->getInput('long') && $this->getInput('lat')) {
+			$data['real_LocSrh_Lng'] = $this->getInput('long');
+			$data['real_LocSrh_Lat'] = $this->getInput('lat');
+			if ($this->getInput('distance')) {
+				$data['LocDis'] = (int)$this->getInput('distance') * 1000;
+			}
+		}
+
+		$header = array(
+			'Content-Type: application/x-www-form-urlencoded'
+		);
+
+		$opts = array(
+			CURLOPT_CUSTOMREQUEST => 'POST',
+			CURLOPT_POSTFIELDS => http_build_query($data) . "\n"
+		);
+
+		$html = getSimpleHTMLDOM($url, $header, $opts) or returnClientError('No results for this query.');
+
+		$annonces = $html->find('.css_SrhRst');
+		foreach ($annonces as $annonce) {
+			$item = array();
+
+			$img = parent::getURI() . $annonce->find('.css_LstPic img', 0)->getAttribute('src');
+			$item['title'] = $annonce->find('.css_LstCtrls span', 0)->plaintext;
+			$item['uri'] = parent::getURI() . $annonce->find('.css_PnlCtrls a', 0)->href;
+			$content = $annonce->find('.css_LstDtl div', 2)->innertext;
+			$item['content'] = "<img src='$img' /><br>$content";
+			$item['enclosures'] = array($img);
+			$item['categories'] = array($annonce->find('.css_AccLocCur', 0)->plaintext);
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI() {
+		$uri = parent::getURI();
+		// Those params must be in the URL
+		$uri .= '/en/' . $this->getInput('type') . '/search?srhtyp=srhrst&mdl=2';
+		return $uri;
+	}
+}
--- a/bridges/FlickrBridge.php
+++ b/bridges/FlickrBridge.php
@@ -0,0 +1,185 @@
+<?php
+
+/* This is a mashup of FlickrExploreBridge by sebsauvage and FlickrTagBridge
+ * by erwang, providing the functionality of both in one.
+ */
+class FlickrBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'logmanoriginal';
+	const NAME = 'Flickr Bridge';
+	const URI = 'https://www.flickr.com/';
+	const CACHE_TIMEOUT = 21600; // 6 hours
+	const DESCRIPTION = 'Returns images from Flickr';
+
+	const PARAMETERS = array(
+		'Explore' => array(),
+		'By keyword' => array(
+			'q' => array(
+				'name' => 'Keyword',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Insert keyword',
+				'exampleValue' => 'bird'
+			)
+		),
+		'By username' => array(
+			'u' => array(
+				'name' => 'Username',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Insert username (as shown in the address bar)',
+				'exampleValue' => 'flickr'
+			)
+		)
+	);
+
+	public function collectData(){
+
+		switch($this->queriedContext) {
+
+		case 'Explore':
+			$filter = 'photo-lite-models';
+			$html = getSimpleHTMLDOM(self::URI . 'explore')
+				or returnServerError('Could not request Flickr.');
+			break;
+
+		case 'By keyword':
+			$filter = 'photo-lite-models';
+			$html = getSimpleHTMLDOM(self::URI . 'search/?q=' . urlencode($this->getInput('q')) . '&s=rec')
+				or returnServerError('No results for this query.');
+			break;
+
+		case 'By username':
+			$filter = 'photo-models';
+			$html = getSimpleHTMLDOM(self::URI . 'photos/' . urlencode($this->getInput('u')))
+				or returnServerError('Requested username can\'t be found.');
+			break;
+
+		default:
+			returnClientError('Invalid context: ' . $this->queriedContext);
+
+		}
+
+		$model_json = $this->extractJsonModel($html);
+		$photo_models = $this->getPhotoModels($model_json, $filter);
+
+		foreach($photo_models as $model) {
+
+			$item = array();
+
+			/* Author name depends on scope. On a keyword search the
+			* author is part of the picture data. On a username search
+			* the author is part of the owner data.
+			*/
+			if(array_key_exists('username', $model)) {
+				$item['author'] = $model['username'];
+			} elseif (array_key_exists('owner', reset($model_json)[0])) {
+				$item['author'] = reset($model_json)[0]['owner']['username'];
+			}
+
+			$item['title'] = (array_key_exists('title', $model) ? $model['title'] : 'Untitled');
+			$item['uri'] = self::URI . 'photo.gne?id=' . $model['id'];
+
+			$description = (array_key_exists('description', $model) ? $model['description'] : '');
+
+			$item['content'] = '<a href="'
+			. $item['uri']
+			. '"><img src="'
+			. $this->extractContentImage($model)
+			. '" style="max-width: 640px; max-height: 480px;"/></a><br><p>'
+			. $description
+			. '</p>';
+
+			$item['enclosures'] = $this->extractEnclosures($model);
+
+			$this->items[] = $item;
+
+		}
+
+	}
+
+	private function extractJsonModel($html) {
+
+		// Find SCRIPT containing JSON data
+		$model = $html->find('.modelExport', 0);
+		$model_text = $model->innertext;
+
+		// Find start and end of JSON data
+		$start = strpos($model_text, 'modelExport:') + strlen('modelExport:');
+		$end = strpos($model_text, 'auth:') - strlen('auth:');
+
+		// Extract JSON data, remove trailing comma
+		$model_text = trim(substr($model_text, $start, $end - $start));
+		$model_text = substr($model_text, 0, strlen($model_text) - 1);
+
+		return json_decode($model_text, true);
+
+	}
+
+	private function getPhotoModels($json, $filter) {
+
+		// The JSON model contains a "legend" array, where each element contains
+		// the path to an element in the "main" object
+		$photo_models = array();
+
+		foreach($json['legend'] as $legend) {
+
+			$photo_model = $json['main'];
+
+			foreach($legend as $element) { // Traverse tree
+				$photo_model = $photo_model[$element];
+			}
+
+			// We are only interested in content
+			if($photo_model['_flickrModelRegistry'] === $filter) {
+				$photo_models[] = $photo_model;
+			}
+
+		}
+
+		return $photo_models;
+
+	}
+
+	private function extractEnclosures($model) {
+
+		$areas = array();
+
+		foreach($model['sizes'] as $size) {
+			$areas[$size['width'] * $size['height']] = $size['url'];
+		}
+
+		return array($this->fixURL(max($areas)));
+
+	}
+
+	private function extractContentImage($model) {
+
+		$areas = array();
+		$limit = 320 * 240;
+
+		foreach($model['sizes'] as $size) {
+
+			$image_area = $size['width'] * $size['height'];
+
+			if($image_area >= $limit) {
+				$areas[$image_area] = $size['url'];
+			}
+
+		}
+
+		return $this->fixURL(min($areas));
+
+	}
+
+	private function fixURL($url) {
+
+		// For some reason the image URLs don't include the protocol (https)
+		if(strpos($url, '//') === 0) {
+			$url = 'https:' . $url;
+		}
+
+		return $url;
+
+	}
+}
--- a/bridges/FlickrExploreBridge.php
+++ b/bridges/FlickrExploreBridge.php
@@ -1,42 +0,0 @@
-<?php
-class FlickrExploreBridge extends BridgeAbstract{
-
-	const MAINTAINER = "sebsauvage";
-	const NAME = "Flickr Explore";
-	const URI = "https://www.flickr.com/";
-	const CACHE_TIMEOUT = 21600; // 6
-	const DESCRIPTION = "Returns the latest interesting images from Flickr";
-
-    public function collectData(){
-        $html = getSimpleHTMLDOM(self::URI.'explore')
-            or returnServerError('Could not request Flickr.');
-
-        foreach($html->find('.photo-list-photo-view') as $element) {
-						// Get the styles
-						$style = explode(';', $element->style);
-						// Get the background-image style
-						$backgroundImage = explode(':', end($style));
-						// URI type : url(//cX.staticflickr.com/X/XXXXX/XXXXXXXXX.jpg)
-						$imageURI = trim(str_replace(['url(', ')'], '', end($backgroundImage)));
-						// Get the image ID
-						$imageURIs = explode('_', basename($imageURI));
-						$imageID = reset($imageURIs);
-
-						// Get the image JSON via Flickr API
-                        $imageJSON = json_decode(getContents(
-                            'https://api.flickr.com/services/rest/?'
-                            .'method=flickr.photos.getInfo&'
-                            .'api_key=103b574d49bd51f0e18bfe907da44a0f&'
-                            .'photo_id='.$imageID.'&'
-                            .'format=json&'
-                            .'nojsoncallback=1'
-                        )) or returnServerError('Could not request Flickr.'); // FIXME: Request time too long...
-
-            $item = array();
-            $item['uri'] = self::URI.'photo.gne?id='.$imageID;
-            $item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $imageURI . '" /></a>'; // FIXME: Filter javascript ?
-            $item['title'] = $imageJSON->photo->title->_content;
-            $this->items[] = $item;
-        }
-    }
-}
--- a/bridges/FlickrTagBridge.php
+++ b/bridges/FlickrTagBridge.php
@@ -1,48 +0,0 @@
-<?php
-class FlickrTagBridge extends BridgeAbstract{
-
-	const MAINTAINER = "erwang";
-	const NAME = "Flickr TagUser";
-	const URI = "http://www.flickr.com/";
-	const CACHE_TIMEOUT = 21600; //6h
-	const DESCRIPTION = "Returns the tagged or user images from Flickr";
-
-    const PARAMETERS = array(
-        'By keyword' => array(
-            'q'=>array(
-                'name'=>'keyword',
-                'required'=>true
-            )
-        ),
-
-        'By username' => array(
-            'u'=>array(
-                'name'=>'Username',
-                'required'=>true
-            )
-        ),
-    );
-
-    public function collectData(){
-        switch($this->queriedContext){
-        case 'By keyword':
-            $html = getSimpleHTMLDOM(self::URI.'search/?q='.urlencode($this->getInput('q')).'&s=rec')
-                or returnServerError('No results for this query.');
-            break;
-        case 'by username':
-            $html = getSimpleHTMLDOM(self::URI.'photos/'.urlencode($this->getInput('u')).'/')
-                or returnServerError('Requested username can\'t be found.');
-            break;
-        }
-
-        foreach($html->find('span.photo_container') as $element) {
-            $item = array();
-            $item['uri'] = self::URI.$element->find('a',0)->href;
-            $thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src');
-            $item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $thumbnailUri . '" /></a>'; // FIXME: Filter javascript ?
-            $item['title'] = $element->find('a',0)->title;
-            $this->items[] = $item;
-        }
-    }
-}
-
--- a/bridges/FootitoBridge.php
+++ b/bridges/FootitoBridge.php
@@ -1,40 +1,75 @@
 <?php
-class FootitoBridge extends BridgeAbstract{
+class FootitoBridge extends BridgeAbstract {

-	const MAINTAINER = "superbaillot.net";
-	const NAME = "Footito";
-	const URI = "http://www.footito.fr/";
-	const DESCRIPTION = "Footito";
+	const MAINTAINER = 'superbaillot.net';
+	const NAME = 'Footito';
+	const URI = 'http://www.footito.fr/';
+	const DESCRIPTION = 'Footito';

-    public function collectData(){
-        $html = getSimpleHTMLDOM(self::URI)
-            or returnServerError('Could not request Footito.');
+	public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request Footito.');

-        foreach($html->find('div.post') as $element) {
-            $item = array();
+		foreach($html->find('div.post') as $element) {
+			$item = array();

-            $content = trim($element->innertext);
-            $content = str_replace("<img", "<img style='float : left;'", $content );
-            $content = str_replace("class=\"logo\"", "style='float : left;'", $content );
-            $content = str_replace("class=\"contenu\"", "style='margin-left : 60px;'", $content );
-            $content = str_replace("class=\"responsive-comment\"", "style='border-top : 1px #DDD solid; background-color : white; padding : 10px;'", $content );
-            $content = str_replace("class=\"jaime\"", "style='display : none;'", $content );
-            $content = str_replace("class=\"auteur-event responsive\"", "style='display : none;'", $content );
-            $content = str_replace("class=\"report-abuse-button\"", "style='display : none;'", $content );
-            $content = str_replace("class=\"reaction clearfix\"", "style='margin : 10px 0px; padding : 5px; border-bottom : 1px #DDD solid;'", $content );
-            $content = str_replace("class=\"infos\"", "style='font-size : 0.7em;'", $content );
+			$content = trim($element->innertext);
+			$content = str_replace(
+				'<img',
+				"<img style='float : left;'",
+				$content );

-            $item['content'] = $content;
+			$content = str_replace(
+				'class="logo"',
+				"style='float : left;'",
+				$content );

-            $title = $element->find('.contenu .texte ', 0)->plaintext;
-            $item['title'] = $title;
+			$content = str_replace(
+				'class="contenu"',
+				"style='margin-left : 60px;'",
+				$content );

-            $info = $element->find('div.infos', 0);
+			$content = str_replace(
+				'class="responsive-comment"',
+				"style='border-top : 1px #DDD solid; background-color : white; padding : 10px;'",
+				$content );

-            $item['timestamp'] = strtotime($info->find('time', 0)->datetime);
-            $item['author'] = $info->find('a.auteur', 0)->plaintext;
+			$content = str_replace(
+				'class="jaime"',
+				"style='display : none;'",
+				$content );

-            $this->items[] = $item;
-        }
-    }
+			$content = str_replace(
+				'class="auteur-event responsive"',
+				"style='display : none;'",
+				$content );
+
+			$content = str_replace(
+				'class="report-abuse-button"',
+				"style='display : none;'",
+				$content );
+
+			$content = str_replace(
+				'class="reaction clearfix"',
+				"style='margin : 10px 0px; padding : 5px; border-bottom : 1px #DDD solid;'",
+				$content );
+
+			$content = str_replace(
+				'class="infos"',
+				"style='font-size : 0.7em;'",
+				$content );
+
+			$item['content'] = $content;
+
+			$title = $element->find('.contenu .texte ', 0)->plaintext;
+			$item['title'] = $title;
+
+			$info = $element->find('div.infos', 0);
+
+			$item['timestamp'] = strtotime($info->find('time', 0)->datetime);
+			$item['author'] = $info->find('a.auteur', 0)->plaintext;
+
+			$this->items[] = $item;
+		}
+	}
 }
--- a/bridges/ForGifsBridge.php
+++ b/bridges/ForGifsBridge.php
@@ -0,0 +1,40 @@
+<?php
+class ForGifsBridge extends FeedExpander {
+
+	const MAINTAINER = 'logmanoriginal';
+	const NAME = 'forgifs Bridge';
+	const URI = 'https://forgifs.com';
+	const DESCRIPTION = 'Returns the forgifs feed with actual gifs instead of images';
+
+	public function collectData() {
+		$this->collectExpandableDatas('https://forgifs.com/gallery/srss/7');
+	}
+
+	protected function parseItem($feedItem) {
+
+		$item = parent::parseItem($feedItem);
+
+		$content = str_get_html($item['content']);
+		$img = $content->find('img', 0);
+		$poster = $img->src;
+
+		// The actual gif is the same path but its id must be decremented by one.
+		// Example:
+		// http://forgifs.com/gallery/d/279419-2/Reporter-videobombed-shoulder-checks.gif
+		// http://forgifs.com/gallery/d/279418-2/Reporter-videobombed-shoulder-checks.gif
+		// Notice how this changes ----------^
+		// Now let's extract that number and do some math
+		// Notice: Technically we could also load the content page but that would
+		// require unnecessary traffic. As long as it works...
+		$num = substr($img->src, 29, 6);
+		$num -= 1;
+		$img->src = substr_replace($img->src, $num, 29, strlen($num));
+		$img->width = 'auto';
+		$img->height = 'auto';
+
+		$item['content'] = $content;
+
+		return $item;
+
+	}
+}
--- a/bridges/FourchanBridge.php
+++ b/bridges/FourchanBridge.php
@@ -1,68 +1,78 @@
 <?php
-class FourchanBridge extends BridgeAbstract{
+class FourchanBridge extends BridgeAbstract {

-	const MAINTAINER = "mitsukarenai";
-	const NAME = "4chan";
-	const URI = "https://boards.4chan.org/";
+	const MAINTAINER = 'mitsukarenai';
+	const NAME = '4chan';
+	const URI = 'https://boards.4chan.org/';
 	const CACHE_TIMEOUT = 300; // 5min
-	const DESCRIPTION = "Returns posts from the specified thread";
+	const DESCRIPTION = 'Returns posts from the specified thread';

-    const PARAMETERS = array( array(
-          'c'=>array(
-            'name'=>'Thread category',
-            'required'=>true
-          ),
-          't'=>array(
-            'name'=>'Thread number',
-            'type'=>'number',
-            'required'=>true
-          )
-    ));
+	const PARAMETERS = array( array(
+		'c' => array(
+			'name' => 'Thread category',
+			'required' => true
+		),
+		't' => array(
+			'name' => 'Thread number',
+			'type' => 'number',
+			'required' => true
+		)
+	));

-    public function getURI(){
-      return static::URI.$this->getInput('c').'/thread/'.$this->getInput('t');
-
-    }
-
-  public function collectData(){
-
-    $html = getSimpleHTMLDOM($this->getURI())
-      or returnServerError("Could not request 4chan, thread not found");
-
-	foreach($html->find('div.postContainer') as $element) {
-		$item = array();
-		$item['id'] = $element->find('.post', 0)->getAttribute('id');
-		$item['uri'] = $this->getURI().'#'.$item['id'];
-		$item['timestamp'] = $element->find('span.dateTime', 0)->getAttribute('data-utc');
-		$item['author'] = $element->find('span.name', 0)->plaintext;
-
-        $file=$element->find('.file', 0);
-		if(!empty($file) ) {
-			$item['image'] = $element->find('.file a', 0)->href;
-			$item['imageThumb'] = $element->find('.file img', 0)->src;
-			if(!isset($item['imageThumb']) and strpos($item['image'], '.swf') !== FALSE)
-				$item['imageThumb'] = 'http://i.imgur.com/eO0cxf9.jpg';
-		}
-		if(!empty($element->find('span.subject', 0)->innertext )) {
-			$item['subject'] = $element->find('span.subject', 0)->innertext;
+	public function getURI(){
+		if(!is_null($this->getInput('c')) && !is_null($this->getInput('t'))) {
+			return static::URI . $this->getInput('c') . '/thread/' . $this->getInput('t');
 		}

-		$item['title'] = 'reply '.$item['id'].' | '.$item['author'];
-        if(isset($item['subject'])){
-          $item['title'] = $item['subject'].' - '.$item['title'];
-        }
-
-        $content = $element->find('.postMessage', 0)->innertext;
-        $content = str_replace('href="#p','href="'.$this->getURI().'#p',$content);
-		$item['content'] = '<span id="'.$item['id'].'">'.$content.'</span>';
-        if(isset($item['image'])){
-          $item['content'] = '<a href="'.$item['image'].'">'
-            .'<img alt="'.$item['id'].'" src="'.$item['imageThumb'].'" />'
-            .'</a><br>'
-            .$item['content'];
-        }
-		$this->items[] = $item;
+		return parent::getURI();
+	}
+
+	public function collectData(){
+
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request 4chan, thread not found');
+
+		foreach($html->find('div.postContainer') as $element) {
+			$item = array();
+			$item['id'] = $element->find('.post', 0)->getAttribute('id');
+			$item['uri'] = $this->getURI() . '#' . $item['id'];
+			$item['timestamp'] = $element->find('span.dateTime', 0)->getAttribute('data-utc');
+			$item['author'] = $element->find('span.name', 0)->plaintext;
+
+			$file = $element->find('.file', 0);
+
+			if(!empty($file)) {
+				$item['image'] = $element->find('.file a', 0)->href;
+				$item['imageThumb'] = $element->find('.file img', 0)->src;
+				if(!isset($item['imageThumb']) and strpos($item['image'], '.swf') !== false)
+					$item['imageThumb'] = 'http://i.imgur.com/eO0cxf9.jpg';
+			}
+
+			if(!empty($element->find('span.subject', 0)->innertext)) {
+				$item['subject'] = $element->find('span.subject', 0)->innertext;
+			}
+
+			$item['title'] = 'reply ' . $item['id'] . ' | ' . $item['author'];
+				if(isset($item['subject'])) {
+					$item['title'] = $item['subject'] . ' - ' . $item['title'];
+				}
+
+			$content = $element->find('.postMessage', 0)->innertext;
+			$content = str_replace('href="#p', 'href="' . $this->getURI() . '#p', $content);
+			$item['content'] = '<span id="' . $item['id'] . '">' . $content . '</span>';
+
+			if(isset($item['image'])) {
+				$item['content'] = '<a href="'
+				. $item['image']
+				. '"><img alt="'
+				. $item['id']
+				. '" src="'
+				. $item['imageThumb']
+				. '" /></a><br>'
+				. $item['content'];
+			}
+			$this->items[] = $item;
+		}
+		$this->items = array_reverse($this->items);
 	}
-	$this->items = array_reverse($this->items);
-  }
 }
--- a/bridges/FuturaSciencesBridge.php
+++ b/bridges/FuturaSciencesBridge.php
@@ -1,166 +1,144 @@
 <?php
 class FuturaSciencesBridge extends FeedExpander {

-    const MAINTAINER = 'ORelio';
-    const NAME = 'Futura-Sciences Bridge';
-    const URI = 'http://www.futura-sciences.com/';
-    const DESCRIPTION = 'Returns the newest articles.';
+	const MAINTAINER = 'ORelio';
+	const NAME = 'Futura-Sciences Bridge';
+	const URI = 'https://www.futura-sciences.com/';
+	const DESCRIPTION = 'Returns the newest articles.';

-    const PARAMETERS = array( array(
-        'feed'=> array(
-            'name'=>'Feed',
-            'type'=>'list',
-            'values'=>array(
-                'Les flux multi-magazines'=>array(
-                    'Les dernières actualités de Futura-Sciences'=>'actualites',
-                    'Les dernières définitions de Futura-Sciences'=>'definitions',
-                    'Les dernières photos de Futura-Sciences'=>'photos',
-                    'Les dernières questions - réponses de Futura-Sciences'=>'questions-reponses',
-                    'Les derniers dossiers de Futura-Sciences'=>'dossiers'
-                ),
-                'Les flux Services'=> array(
-                    'Les cartes virtuelles de Futura-Sciences'=>'services/cartes-virtuelles',
-                    'Les fonds d\'écran de Futura-Sciences'=>'services/fonds-ecran'
-                ),
-                'Les flux Santé'=>array(
-                    'Les dernières actualités de Futura-Santé'=>'sante/actualites',
-                    'Les dernières définitions de Futura-Santé'=>'sante/definitions',
-                    'Les dernières questions-réponses de Futura-Santé'=>'sante/question-reponses',
-                    'Les derniers dossiers de Futura-Santé'=>'sante/dossiers'
-                ),
-                'Les flux High-Tech'=>array(
-                    'Les dernières actualités de Futura-High-Tech'=>'high-tech/actualites',
-                    'Les dernières astuces de Futura-High-Tech'=>'high-tech/question-reponses',
-                    'Les dernières définitions de Futura-High-Tech'=>'high-tech/definitions',
-                    'Les derniers dossiers de Futura-High-Tech'=>'high-tech/dossiers'
-                ),
-                'Les flux Espace'=>array(
-                    'Les dernières actualités de Futura-Espace'=>'espace/actualites',
-                    'Les dernières définitions de Futura-Espace'=>'espace/definitions',
-                    'Les dernières questions-réponses de Futura-Espace'=>'espace/question-reponses',
-                    'Les derniers dossiers de Futura-Espace'=>'espace/dossiers'
-                ),
-                'Les flux Environnement'=>array(
-                    'Les dernières actualités de Futura-Environnement'=>'environnement/actualites',
-                    'Les dernières définitions de Futura-Environnement'=>'environnement/definitions',
-                    'Les dernières questions-réponses de Futura-Environnement'=>'environnement/question-reponses',
-                    'Les derniers dossiers de Futura-Environnement'=>'environnement/dossiers'
-                ),
-                'Les flux Maison'=>array(
-                    'Les dernières actualités de Futura-Maison'=>'maison/actualites',
-                    'Les dernières astuces de Futura-Maison'=>'maison/question-reponses',
-                    'Les dernières définitions de Futura-Maison'=>'maison/definitions',
-                    'Les derniers dossiers de Futura-Maison'=>'maison/dossiers'
-                ),
-                'Les flux Nature'=>array(
-                    'Les dernières actualités de Futura-Nature'=>'nature/actualites',
-                    'Les dernières définitions de Futura-Nature'=>'nature/definitions',
-                    'Les dernières questions-réponses de Futura-Nature'=>'nature/question-reponses',
-                    'Les derniers dossiers de Futura-Nature'=>'nature/dossiers'
-                ),
-                'Les flux Terre'=>array(
-                    'Les dernières actualités de Futura-Terre'=>'terre/actualites',
-                    'Les dernières définitions de Futura-Terre'=>'terre/definitions',
-                    'Les dernières questions-réponses de Futura-Terre'=>'terre/question-reponses',
-                    'Les derniers dossiers de Futura-Terre'=>'terre/dossiers'
-                ),
-                'Les flux Matière'=>array(
-                    'Les dernières actualités de Futura-Matière'=>'matiere/actualites',
-                    'Les dernières définitions de Futura-Matière'=>'matiere/definitions',
-                    'Les dernières questions-réponses de Futura-Matière'=>'matiere/question-reponses',
-                    'Les derniers dossiers de Futura-Matière'=>'matiere/dossiers'
-                ),
-                'Les flux Mathématiques'=>array(
-                    'Les dernières actualités de Futura-Mathématiques'=>'mathematiques/actualites',
-                    'Les derniers dossiers de Futura-Mathématiques'=>'mathematiques/dossiers'
-                )
-            )
-        )
-    ));
+	const PARAMETERS = array( array(
+		'feed' => array(
+			'name' => 'Feed',
+			'type' => 'list',
+			'values' => array(
+				'Les flux multi-magazines' => array(
+					'Les dernières actualités de Futura-Sciences' => 'actualites',
+					'Les dernières définitions de Futura-Sciences' => 'definitions',
+					'Les dernières photos de Futura-Sciences' => 'photos',
+					'Les dernières questions - réponses de Futura-Sciences' => 'questions-reponses',
+					'Les derniers dossiers de Futura-Sciences' => 'dossiers'
+				),
+				'Les flux Services' => array(
+					'Les cartes virtuelles de Futura-Sciences' => 'services/cartes-virtuelles',
+					'Les fonds d\'écran de Futura-Sciences' => 'services/fonds-ecran'
+				),
+				'Les flux Santé' => array(
+					'Les dernières actualités de Futura-Santé' => 'sante/actualites',
+					'Les dernières définitions de Futura-Santé' => 'sante/definitions',
+					'Les dernières questions-réponses de Futura-Santé' => 'sante/question-reponses',
+					'Les derniers dossiers de Futura-Santé' => 'sante/dossiers'
+				),
+				'Les flux High-Tech' => array(
+					'Les dernières actualités de Futura-High-Tech' => 'high-tech/actualites',
+					'Les dernières astuces de Futura-High-Tech' => 'high-tech/question-reponses',
+					'Les dernières définitions de Futura-High-Tech' => 'high-tech/definitions',
+					'Les derniers dossiers de Futura-High-Tech' => 'high-tech/dossiers'
+				),
+				'Les flux Espace' => array(
+					'Les dernières actualités de Futura-Espace' => 'espace/actualites',
+					'Les dernières définitions de Futura-Espace' => 'espace/definitions',
+					'Les dernières questions-réponses de Futura-Espace' => 'espace/question-reponses',
+					'Les derniers dossiers de Futura-Espace' => 'espace/dossiers'
+				),
+				'Les flux Environnement' => array(
+					'Les dernières actualités de Futura-Environnement' => 'environnement/actualites',
+					'Les dernières définitions de Futura-Environnement' => 'environnement/definitions',
+					'Les dernières questions-réponses de Futura-Environnement' => 'environnement/question-reponses',
+					'Les derniers dossiers de Futura-Environnement' => 'environnement/dossiers'
+				),
+				'Les flux Maison' => array(
+					'Les dernières actualités de Futura-Maison' => 'maison/actualites',
+					'Les dernières astuces de Futura-Maison' => 'maison/question-reponses',
+					'Les dernières définitions de Futura-Maison' => 'maison/definitions',
+					'Les derniers dossiers de Futura-Maison' => 'maison/dossiers'
+				),
+				'Les flux Nature' => array(
+					'Les dernières actualités de Futura-Nature' => 'nature/actualites',
+					'Les dernières définitions de Futura-Nature' => 'nature/definitions',
+					'Les dernières questions-réponses de Futura-Nature' => 'nature/question-reponses',
+					'Les derniers dossiers de Futura-Nature' => 'nature/dossiers'
+				),
+				'Les flux Terre' => array(
+					'Les dernières actualités de Futura-Terre' => 'terre/actualites',
+					'Les dernières définitions de Futura-Terre' => 'terre/definitions',
+					'Les dernières questions-réponses de Futura-Terre' => 'terre/question-reponses',
+					'Les derniers dossiers de Futura-Terre' => 'terre/dossiers'
+				),
+				'Les flux Matière' => array(
+					'Les dernières actualités de Futura-Matière' => 'matiere/actualites',
+					'Les dernières définitions de Futura-Matière' => 'matiere/definitions',
+					'Les dernières questions-réponses de Futura-Matière' => 'matiere/question-reponses',
+					'Les derniers dossiers de Futura-Matière' => 'matiere/dossiers'
+				),
+				'Les flux Mathématiques' => array(
+					'Les dernières actualités de Futura-Mathématiques' => 'mathematiques/actualites',
+					'Les derniers dossiers de Futura-Mathématiques' => 'mathematiques/dossiers'
+				)
+			)
+		)
+	));

-    public function collectData(){
-        $url = self::URI . 'rss/' . $this->getInput('feed') . '.xml';
-        $this->collectExpandableDatas($url, 10);
-    }
+	public function collectData(){
+		$url = self::URI . 'rss/' . $this->getInput('feed') . '.xml';
+		$this->collectExpandableDatas($url, 10);
+	}

-    protected function parseItem($newsItem){
-        $item = parent::parseItem($newsItem);
-        $item['uri'] = str_replace('#xtor=RSS-8', '', $item['uri']);
-        $article = getSimpleHTMLDOMCached($item['uri'])
-            or returnServerError('Could not request Futura-Sciences: ' . $item['uri']);
-        $item['content'] = $this->ExtractArticleContent($article);
-        $item['author'] = empty($this->ExtractAuthor($article)) ? $item['author'] : $this->ExtractAuthor($article);
-        return $item;
-    }
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+		$item['uri'] = str_replace('#xtor=RSS-8', '', $item['uri']);
+		$article = getSimpleHTMLDOMCached($item['uri'])
+			or returnServerError('Could not request Futura-Sciences: ' . $item['uri']);
+		$item['content'] = $this->extractArticleContent($article);
+		$author = $this->extractAuthor($article);
+		if (!empty($author))
+			$item['author'] = $author;
+		return $item;
+	}

-    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;
-    }
+	private function extractArticleContent($article){
+		$contents = $article->find('section.article-text-classic', 0)->innertext;
+		$headline = trim($article->find('p.description', 0)->plaintext);
+		if(!empty($headline))
+			$headline = '<p><b>' . $headline . '</b></p>';

-    function StripRecursiveHTMLSection($string, $tag_name, $tag_start) {
-        $open_tag = '<'.$tag_name;
-        $close_tag = '</'.$tag_name.'>';
-        $close_tag_length = strlen($close_tag);
-        if (strpos($tag_start, $open_tag) === 0) {
-            while (strpos($string, $tag_start) !== false) {
-                $max_recursion = 100;
-                $section_to_remove = null;
-                $section_start = strpos($string, $tag_start);
-                $search_offset = $section_start;
-                do {
-                    $max_recursion--;
-                    $section_end = strpos($string, $close_tag, $search_offset);
-                    $search_offset = $section_end + $close_tag_length;
-                    $section_to_remove = substr($string, $section_start, $section_end - $section_start + $close_tag_length);
-                    $open_tag_count = substr_count($section_to_remove, $open_tag);
-                    $close_tag_count = substr_count($section_to_remove, $close_tag);
-                } while ($open_tag_count > $close_tag_count && $max_recursion > 0);
-                $string = str_replace($section_to_remove, '', $string);
-            }
-        }
-        return $string;
-    }
+		foreach (array(
+			'<div class="clear',
+			'<div class="sharebar2',
+			'<div class="diaporamafullscreen"',
+			'<div class="module social-button',
+			'<div class="module social-share',
+			'<div style="margin-bottom:10px;" class="noprint"',
+			'<div class="ficheprevnext',
+			'<div class="bar noprint',
+			'<div class="toolbar noprint',
+			'<div class="addthis_toolbox',
+			'<div class="noprint',
+			'<div class="bg bglight border border-full noprint',
+			'<div class="httplogbar-wrapper noprint',
+			'<div id="forumcomments',
+			'<div ng-if="active"'
+		) as $div_start) {
+			$contents = stripRecursiveHTMLSection($contents, 'div', $div_start);
+		}

-    function ExtractArticleContent($article){
-        $contents = $article->find('div.content', 0)->innertext;
+		$contents = stripWithDelimiters($contents, '<hr ', '/>');
+		$contents = stripWithDelimiters($contents, '<p class="content-date', '</p>');
+		$contents = stripWithDelimiters($contents, '<h1 class="content-title', '</h1>');
+		$contents = stripWithDelimiters($contents, 'fs:definition="', '"');
+		$contents = stripWithDelimiters($contents, 'fs:xt:clicktype="', '"');
+		$contents = stripWithDelimiters($contents, 'fs:xt:clickname="', '"');
+		$contents = StripWithDelimiters($contents, '<section class="module-toretain module-propal-nl', '</section>');
+		$contents = stripWithDelimiters($contents, '<script ', '</script>');

-        foreach (array(
-            '<div class="clear',
-            '<div class="sharebar2',
-            '<div class="diaporamafullscreen"',
-            '<div style="margin-bottom:10px;" class="noprint"',
-            '<div class="ficheprevnext',
-            '<div class="bar noprint',
-            '<div class="toolbar noprint',
-            '<div class="addthis_toolbox',
-            '<div class="noprint',
-            '<div class="bg bglight border border-full noprint',
-            '<div class="httplogbar-wrapper noprint',
-            '<div id="forumcomments'
-        ) as $div_start) {
-            $contents = $this->StripRecursiveHTMLSection($contents , 'div', $div_start);
-        }
+		return $headline . trim($contents);
+	}

-        $contents = $this->StripWithDelimiters($contents, '<hr ', '/>');
-        $contents = $this->StripWithDelimiters($contents, '<p class="content-date', '</p>');
-        $contents = $this->StripWithDelimiters($contents, '<h1 class="content-title', '</h1>');
-        $contents = $this->StripWithDelimiters($contents, 'fs:definition="', '"');
-        $contents = $this->StripWithDelimiters($contents, 'fs:xt:clicktype="', '"');
-        $contents = $this->StripWithDelimiters($contents, 'fs:xt:clickname="', '"');
-
-        return $contents;
-    }
-
-    // Extracts the author from an article or element
-    function ExtractAuthor($article){
-        $article_author = $article->find('span.author', 0);
-        if($article_author){
-            return trim(str_replace(', Futura-Sciences', '', $article_author->plaintext));
-        }
-        return '';
-    }
+	// Extracts the author from an article or element
+	private function extractAuthor($article){
+		$article_author = $article->find('h3.epsilon', 0);
+		if($article_author) {
+			return trim(str_replace(', Futura-Sciences', '', $article_author->plaintext));
+		}
+		return '';
+	}
 }
--- a/bridges/GBAtempBridge.php
+++ b/bridges/GBAtempBridge.php
@@ -1,124 +1,151 @@
 <?php
 class GBAtempBridge extends BridgeAbstract {

-    const MAINTAINER = 'ORelio';
-    const NAME = 'GBAtemp';
-    const URI = 'http://gbatemp.net/';
-    const DESCRIPTION = 'GBAtemp is a user friendly underground video game community.';
+	const MAINTAINER = 'ORelio';
+	const NAME = 'GBAtemp';
+	const URI = 'https://gbatemp.net/';
+	const DESCRIPTION = 'GBAtemp is a user friendly underground video game community.';

-    const PARAMETERS = array( array(
-        'type'=>array(
-            'name'=>'Type',
-            'type'=>'list',
-            'required'=>true,
-            'values'=>array(
-                'News'=>'N',
-                'Reviews'=>'R',
-                'Tutorials'=>'T',
-                'Forum'=>'F'
-            )
-        )
-    ));
+	const PARAMETERS = array( array(
+		'type' => array(
+			'name' => 'Type',
+			'type' => 'list',
+			'required' => true,
+			'values' => array(
+				'News' => 'N',
+				'Reviews' => 'R',
+				'Tutorials' => 'T',
+				'Forum' => 'F'
+			)
+		)
+	));

-    private function ExtractFromDelimiters($string, $start, $end) {
-        if (strpos($string, $start) !== false) {
-            $section_retrieved = substr($string, strpos($string, $start) + strlen($start));
-            $section_retrieved = substr($section_retrieved, 0, strpos($section_retrieved, $end));
-            return $section_retrieved;
-        } return false;
-    }
+	private function buildItem($uri, $title, $author, $timestamp, $thumbnail, $content){
+		$item = array();
+		$item['uri'] = $uri;
+		$item['title'] = $title;
+		$item['author'] = $author;
+		$item['timestamp'] = $timestamp;
+		$item['content'] = $content;
+		if (!empty($thumbnail)) {
+			$item['enclosures'] = array($thumbnail);
+		}
+		return $item;
+	}

-    private function StripWithDelimiters($string, $start, $end) {
-        while (strpos($string, $start) !== false) {
-            $section_to_remove = substr($string, strpos($string, $start));
-            $section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
-            $string = str_replace($section_to_remove, '', $string);
-        } return $string;
-    }
+	private function cleanupPostContent($content, $site_url){
+		$content = str_replace(':arrow:', '&#x27a4;', $content);
+		$content = str_replace('href="attachments/', 'href="' . $site_url . 'attachments/', $content);
+		$content = stripWithDelimiters($content, '<script', '</script>');
+		return $content;
+	}

-    private function build_item($uri, $title, $author, $timestamp, $content) {
-        $item = array();
-        $item['uri'] = $uri;
-        $item['title'] = $title;
-        $item['author'] = $author;
-        $item['timestamp'] = $timestamp;
-        $item['content'] = $content;
-        return $item;
-    }
+	private function findItemDate($item){
+		$time = 0;
+		$dateField = $item->find('abbr.DateTime', 0);
+		if (is_object($dateField)) {
+			$time = intval(
+				extractFromDelimiters(
+					$dateField->outertext,
+					'data-time="',
+					'"'
+				)
+			);
+		} else {
+			$dateField = $item->find('span.DateTime', 0);
+			$time = DateTime::createFromFormat(
+				'M j, Y \a\t g:i A',
+				extractFromDelimiters(
+					$dateField->outertext,
+					'title="',
+					'"'
+				)
+			)->getTimestamp();
+		}
+		return $time;
+	}

-    private function cleanup_post_content($content, $site_url) {
-        $content = str_replace(':arrow:', '&#x27a4;', $content);
-        $content = str_replace('href="attachments/', 'href="'.$site_url.'attachments/', $content);
-        $content = $this->StripWithDelimiters($content, '<script', '</script>');
-        return $content;
-    }
+	private function fetchPostContent($uri, $site_url){
+		$html = getSimpleHTMLDOMCached($uri);
+		if(!$html) {
+			return 'Could not request GBAtemp: ' . $uri;
+		}

-    private function fetch_post_content($uri, $site_url) {
-        $html = getSimpleHTMLDOM($uri);
-        if(!$html){
-            return 'Could not request GBAtemp '.$uri;
-        }
+		$content = $html->find('div.messageContent, blockquote.baseHtml', 0)->innertext;
+		return $this->cleanupPostContent($content, $site_url);
+	}

-        $content = $html->find('div.messageContent', 0)->innertext;
-        return $this->cleanup_post_content($content, $site_url);
-    }
+	public function collectData(){

-    public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request GBAtemp.');

-        $html = getSimpleHTMLDOM(self::URI)
-            or returnServerError('Could not request GBAtemp.');
+		switch($this->getInput('type')) {
+		case 'N':
+			foreach($html->find('li[class=news_item full]') as $newsItem) {
+				$url = self::URI . $newsItem->find('a', 0)->href;
+				$img = $this->getURI() . $newsItem->find('img', 0)->src . '#.image';
+				$time = $this->findItemDate($newsItem);
+				$author = $newsItem->find('a.username', 0)->plaintext;
+				$title = $newsItem->find('a', 1)->plaintext;
+				$content = $this->fetchPostContent($url, self::URI);
+				$this->items[] = $this->buildItem($url, $title, $author, $time, $img, $content);
+				unset($newsItem); // Some items are heavy, freeing the item proactively helps saving memory
+			}
+			break;
+		case 'R':
+			foreach($html->find('li.portal_review') as $reviewItem) {
+				$url = self::URI . $reviewItem->find('a', 0)->href;
+				$img = $this->getURI() . extractFromDelimiters($reviewItem->find('a', 0)->style, 'image:url(', ')');
+				$title = $reviewItem->find('span.review_title', 0)->plaintext;
+				$content = getSimpleHTMLDOM($url)
+					or returnServerError('Could not request GBAtemp: ' . $uri);
+				$author = $content->find('a.username', 0)->plaintext;
+				$time = $this->findItemDate($content);
+				$intro = '<p><b>' . ($content->find('div#review_intro', 0)->plaintext) . '</b></p>';
+				$review = $content->find('div#review_main', 0)->innertext;
+				$subheader = '<p><b>' . $content->find('div.review_subheader', 0)->plaintext . '</b></p>';
+				$procons = $content->find('table.review_procons', 0)->outertext;
+				$scores = $content->find('table.reviewscores', 0)->outertext;
+				$content = $this->cleanupPostContent($intro . $review . $subheader . $procons . $scores, self::URI);
+				$this->items[] = $this->buildItem($url, $title, $author, $time, $img, $content);
+				unset($reviewItem); // Free up memory
+			}
+			break;
+		case 'T':
+			foreach($html->find('li.portal-tutorial') as $tutorialItem) {
+				$url = self::URI . $tutorialItem->find('a', 0)->href;
+				$title = $tutorialItem->find('a', 0)->plaintext;
+				$time = $this->findItemDate($tutorialItem);
+				$author = $tutorialItem->find('a.username', 0)->plaintext;
+				$content = $this->fetchPostContent($url, self::URI);
+				$this->items[] = $this->buildItem($url, $title, $author, $time, null, $content);
+				unset($tutorialItem); // Free up memory
+			}
+			break;
+		case 'F':
+			foreach($html->find('li.rc_item') as $postItem) {
+				$url = self::URI . $postItem->find('a', 1)->href;
+				$title = $postItem->find('a', 1)->plaintext;
+				$time = $this->findItemDate($postItem);
+				$author = $postItem->find('a.username', 0)->plaintext;
+				$content = $this->fetchPostContent($url, self::URI);
+				$this->items[] = $this->buildItem($url, $title, $author, $time, null, $content);
+				unset($postItem); // Free up memory
+			}
+			break;
+		}
+	}

-        switch($this->getInput('type')){
-        case 'N':
-            foreach ($html->find('li[class=news_item full]') as $newsItem) {
-                $url = self::URI.$newsItem->find('a', 0)->href;
-                $time = intval($this->ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
-                $author = $newsItem->find('a.username', 0)->plaintext;
-                $title = $newsItem->find('a', 1)->plaintext;
-                $content = $this->fetch_post_content($url, self::URI);
-                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
-            }
-        case 'R':
-            foreach ($html->find('li.portal_review') as $reviewItem) {
-                $url = self::URI.$reviewItem->find('a', 0)->href;
-                $title = $reviewItem->find('span.review_title', 0)->plaintext;
-                $content = getSimpleHTMLDOM($url) or returnServerError('Could not request GBAtemp: '.$uri);
-                $author = $content->find('a.username', 0)->plaintext;
-                $time = intval($this->ExtractFromDelimiters($content->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
-                $intro = '<p><b>'.($content->find('div#review_intro', 0)->plaintext).'</b></p>';
-                $review = $content->find('div#review_main', 0)->innertext;
-                $subheader = '<p><b>'.$content->find('div.review_subheader', 0)->plaintext.'</b></p>';
-                $procons = $content->find('table.review_procons', 0)->outertext;
-                $scores = $content->find('table.reviewscores', 0)->outertext;
-                $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, self::URI);
-                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
-            }
-        case 'T':
-            foreach ($html->find('li.portal-tutorial') as $tutorialItem) {
-                $url = self::URI.$tutorialItem->find('a', 0)->href;
-                $title = $tutorialItem->find('a', 0)->plaintext;
-                $time = intval($this->ExtractFromDelimiters($tutorialItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
-                $author = $tutorialItem->find('a.username', 0)->plaintext;
-                $content = $this->fetch_post_content($url, self::URI);
-                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
-            }
-        case 'F':
-            foreach ($html->find('li.rc_item') as $postItem) {
-                $url = self::URI.$postItem->find('a', 1)->href;
-                $title = $postItem->find('a', 1)->plaintext;
-                $time = intval($this->ExtractFromDelimiters($postItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"'));
-                $author = $postItem->find('a.username', 0)->plaintext;
-                $content = $this->fetch_post_content($url, self::URI);
-                $this->items[] = $this->build_item($url, $title, $author, $time, $content);
-            }
-        }
-    }
+	public function getName() {
+		if(!is_null($this->getInput('type'))) {
+			$type = array_search(
+				$this->getInput('type'),
+				self::PARAMETERS[$this->queriedContext]['type']['values']
+			);
+			return 'GBAtemp ' . $type . ' Bridge';
+		}

-    public function getName() {
-        $type=array_search(
-            $this->getInput('type'),
-            self::PARAMETERS[$this->queriedContext]['type']['values']
-        );
-        return 'GBAtemp '.$type.' Bridge';
-    }
+		return parent::getName();
+	}
 }
--- a/bridges/GOGBridge.php
+++ b/bridges/GOGBridge.php
@@ -0,0 +1,65 @@
+<?php
+class GOGBridge extends BridgeAbstract {
+
+	const NAME = 'GOGBridge';
+	const MAINTAINER = 'teromene';
+	const URI = 'https://gog.com';
+	const DESCRIPTION = 'Returns the latest releases from GOG.com';
+
+	public function collectData() {
+
+		$values = getContents('https://www.gog.com/games/ajax/filtered?limit=25&sort=new') or
+			die('Unable to get the news pages from GOG !');
+		$decodedValues = json_decode($values);
+
+		$limit = 0;
+		foreach($decodedValues->products as $game) {
+
+			$item = array();
+			$item['author'] = $game->developer . ' / ' . $game->publisher;
+			$item['title'] = $game->title;
+			$item['id'] = $game->id;
+			$item['uri'] = self::URI . $game->url;
+			$item['content'] = $this->buildGameContentPage($game);
+			$item['timestamp'] = $game->globalReleaseDate;
+
+			foreach($game->gallery as $image) {
+				$item['enclosures'][] = $image . '.jpg';
+			}
+
+			$this->items[] = $item;
+			$limit += 1;
+
+			if($limit == 10) break;
+
+		}
+
+	}
+
+	private function buildGameContentPage($game) {
+
+		$gameDescriptionText = getContents('https://api.gog.com/products/' . $game->id . '?expand=description') or
+			die('Unable to get game description from GOG !');
+
+		$gameDescriptionValue = json_decode($gameDescriptionText);
+
+		$content = 'Genres: ';
+		$content .= implode(', ', $game->genres);
+
+		$content .= '<br />Supported Platforms: ';
+		if($game->worksOn->Windows) {
+			$content .= 'Windows ';
+		}
+		if($game->worksOn->Mac) {
+			$content .= 'Mac ';
+		}
+		if($game->worksOn->Linux) {
+			$content .= 'Linux ';
+		}
+
+		$content .= '<br />' . $gameDescriptionValue->description->full;
+
+		return $content;
+
+	}
+}
--- a/bridges/GQMagazineBridge.php
+++ b/bridges/GQMagazineBridge.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * An extension of the previous SexactuBridge to cover the whole GQMagazine.
+ * This one taks a page (as an example sexe/news or journaliste/maia-mazaurette) which is to be configured,
+ * reads all the articles visible on that page, and make a stream out of it.
+ * @author nicolas-delsaux
+ *
+ */
+class GQMagazineBridge extends BridgeAbstract
+{
+	const MAINTAINER = 'Riduidel';
+
+	const NAME = 'GQMagazine';
+
+	// URI is no more valid, since we can address the whole gq galaxy
+	const URI = 'https://www.gqmagazine.fr';
+
+	const CACHE_TIMEOUT = 7200; // 2h
+	const DESCRIPTION = 'GQMagazine section extractor bridge. This bridge allows you get only a specific section.';
+
+	const DEFAULT_DOMAIN = 'www.gqmagazine.fr';
+
+	const PARAMETERS = array( array(
+		'domain' => array(
+			'name' => 'Domain to use',
+			'required' => true,
+			'defaultValue' => self::DEFAULT_DOMAIN
+		),
+		'page' => array(
+			'name' => 'Initial page to load',
+			'required' => true,
+			'exampleValue' => 'sexe/news'
+		),
+	));
+
+	const REPLACED_ATTRIBUTES = array(
+		'href' => 'href',
+		'src' => 'src',
+		'data-original' => 'src'
+	);
+
+	private function getDomain() {
+		$domain = $this->getInput('domain');
+		if (empty($domain))
+			$domain = self::DEFAULT_DOMAIN;
+		if (strpos($domain, '://') === false)
+			$domain = 'https://' . $domain;
+		return $domain;
+	}
+
+	public function getURI()
+	{
+		return $this->getDomain() . '/' . $this->getInput('page');
+	}
+
+	public function collectData()
+	{
+		$html = getSimpleHTMLDOM($this->getURI()) or returnServerError('Could not request ' . $this->getURI());
+
+		// Since GQ don't want simple class scrapping, let's do it the hard way and ... discover content !
+		$main = $html->find('main', 0);
+		foreach ($main->find('a') as $link) {
+			$uri = $link->href;
+			$title = $link->find('h2', 0);
+			$date = $link->find('time', 0);
+
+			$item = array();
+			$author = $link->find('span[itemprop=name]', 0);
+			$item['author'] = $author->plaintext;
+			$item['title'] = $title->plaintext;
+			if(substr($uri, 0, 1) === 'h') { // absolute uri
+				$item['uri'] = $uri;
+			} else if(substr($uri, 0, 1) === '/') { // domain relative url
+				$item['uri'] = $this->getDomain() . $uri;
+			} else {
+				$item['uri'] = $this->getDomain() . '/' . $uri;
+			}
+
+			$article = $this->loadFullArticle($item['uri']);
+			if($article) {
+				$item['content'] = $this->replaceUriInHtmlElement($article);
+			} else {
+				$item['content'] = "<strong>Article body couldn't be loaded</strong>. It must be a bug!";
+			}
+			$short_date = $date->datetime;
+			$item['timestamp'] = strtotime($short_date);
+			$this->items[] = $item;
+		}
+	}
+
+	/**
+	 * Loads the full article and returns the contents
+	 * @param $uri The article URI
+	 * @return The article content
+	 */
+	private function loadFullArticle($uri){
+		$html = getSimpleHTMLDOMCached($uri);
+		// Once again, that generated css classes madness is an obstacle ... which i can go over easily
+		foreach($html->find('div') as $div) {
+			// List the CSS classes of that div
+			$classes = $div->class;
+			// I can't directly lookup that class since GQ since to generate random names like "ArticleBodySection-fkggUW"
+			if(strpos($classes, 'ArticleBodySection') !== false) {
+				return $div;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Replaces all relative URIs with absolute ones
+	 * @param $element A simplehtmldom element
+	 * @return The $element->innertext with all URIs replaced
+	 */
+	private function replaceUriInHtmlElement($element){
+		$returned = $element->innertext;
+		foreach (self::REPLACED_ATTRIBUTES as $initial => $final) {
+			$returned = str_replace($initial . '="/', $final . '="' . self::URI . '/', $returned);
+		}
+		return $returned;
+	}
+}
--- a/bridges/GelbooruBridge.php
+++ b/bridges/GelbooruBridge.php
@@ -1,21 +1,35 @@
 <?php
 require_once('DanbooruBridge.php');

-class GelbooruBridge extends DanbooruBridge{
+class GelbooruBridge extends DanbooruBridge {

-	const MAINTAINER = "mitsukarenai";
-	const NAME = "Gelbooru";
-	const URI = "http://gelbooru.com/";
-	const DESCRIPTION = "Returns images from given page";
+	const MAINTAINER = 'mitsukarenai';
+	const NAME = 'Gelbooru';
+	const URI = 'http://gelbooru.com/';
+	const DESCRIPTION = 'Returns images from given page';

-    const PATHTODATA='.thumb';
-    const IDATTRIBUTE='id';
+	const PATHTODATA = '.thumb';
+	const IDATTRIBUTE = 'id';
+	const TAGATTRIBUTE = 'title';

-    const PIDBYPAGE=63;
+	const PIDBYPAGE = 63;

-    protected function getFullURI(){
-      return $this->getURI().'index.php?page=post&s=list&'
-        .'&pid='.($this->getInput('p')?($this->getInput('p') -1)*static::PIDBYPAGE:'')
-        .'&tags='.urlencode($this->getInput('t'));
-    }
+	protected function getFullURI(){
+		return $this->getURI()
+		. 'index.php?page=post&s=list&pid='
+		. ($this->getInput('p') ? ($this->getInput('p') - 1) * static::PIDBYPAGE : '')
+		. '&tags=' . urlencode($this->getInput('t'));
+	}
+
+	protected function getTags($element){
+		$tags = parent::getTags($element);
+		$tags = explode(' ', $tags);
+
+		// Remove statistics from the tags list (identified by colon)
+		foreach($tags as $key => $tag) {
+			if(strpos($tag, ':') !== false) unset($tags[$key]);
+		}
+
+		return implode(' ', $tags);
+	}
 }
--- a/bridges/GiphyBridge.php
+++ b/bridges/GiphyBridge.php
@@ -1,71 +1,76 @@
 <?php
 define('GIPHY_LIMIT', 10);

-class GiphyBridge extends BridgeAbstract{
+class GiphyBridge extends BridgeAbstract {

-	const MAINTAINER = "kraoc";
-	const NAME = "Giphy Bridge";
-	const URI = "http://giphy.com/";
+	const MAINTAINER = 'kraoc';
+	const NAME = 'Giphy Bridge';
+	const URI = 'http://giphy.com/';
 	const CACHE_TIMEOUT = 300; //5min
-	const DESCRIPTION = "Bridge for giphy.com";
+	const DESCRIPTION = 'Bridge for giphy.com';

-    const PARAMETERS = array( array(
-        's'=>array(
-            'name'=>'search tag',
-            'required'=>true
-        ),
-        'n'=>array(
-            'name'=>'max number of returned items',
-            'type'=>'number'
-        )
-    ));
+	const PARAMETERS = array( array(
+		's' => array(
+			'name' => 'search tag',
+			'required' => true
+		),
+		'n' => array(
+			'name' => 'max number of returned items',
+			'type' => 'number'
+		)
+	));

 	public function collectData(){
 		$html = '';
-        $base_url = 'http://giphy.com';
-        $html = getSimpleHTMLDOM(self::URI.'/search/'.urlencode($this->getInput('s').'/'))
-            or returnServerError('No results for this query.');
+		$base_url = 'http://giphy.com';
+		$html = getSimpleHTMLDOM(self::URI . '/search/' . urlencode($this->getInput('s') . '/'))
+			or returnServerError('No results for this query.');

-        $max = GIPHY_LIMIT;
-        if ($this->getInput('n')) {
-            $max = $this->getInput('n');
-        }
+		$max = GIPHY_LIMIT;
+		if($this->getInput('n')) {
+			$max = $this->getInput('n');
+		}

-        $limit = 0;
-        $kw = urlencode($this->getInput('s'));
-        foreach($html->find('div.hoverable-gif') as $entry) {
-            if($limit < $max) {
-                $node = $entry->first_child();
-                $href = $node->getAttribute('href');
+		$limit = 0;
+		$kw = urlencode($this->getInput('s'));
+		foreach($html->find('div.hoverable-gif') as $entry) {
+			if($limit < $max) {
+				$node = $entry->first_child();
+				$href = $node->getAttribute('href');

-                $html2 = getSimpleHTMLDOM(self::URI . $href)
-                    or returnServerError('No results for this query.');
-                $figure = $html2->getElementByTagName('figure');
-                $img = $figure->firstChild();
-                $caption = $figure->lastChild();
+				$html2 = getSimpleHTMLDOM(self::URI . $href)
+					or returnServerError('No results for this query.');
+				$figure = $html2->getElementByTagName('figure');
+				$img = $figure->firstChild();
+				$caption = $figure->lastChild();

-                $item = array();
-                $item['id'] = $img->getAttribute('data-gif_id');
-                $item['uri'] = $img->getAttribute('data-bitly_gif_url');
-                $item['username'] = 'Giphy - '.ucfirst($kw);
-                $title = $caption->innertext();
-                    $title = preg_replace('/\s+/', ' ',$title);
-                    $title = str_replace('animated GIF', '', $title);
-                    $title = str_replace($kw, '', $title);
-                    $title = preg_replace('/\s+/', ' ',$title);
-                    $title = trim($title);
-                    if (strlen($title) <= 0) {
-                        $title = $item['id'];
-                    }
-                $item['title'] = trim($title);
-                $item['content'] =
-                    '<a href="'.$item['uri'].'">'
-                        .'<img src="'.$img->getAttribute('src').'" width="'.$img->getAttribute('data-original-width').'" height="'.$img->getAttribute('data-original-height').'" />'
-                    .'</a>';
+				$item = array();
+				$item['id'] = $img->getAttribute('data-gif_id');
+				$item['uri'] = $img->getAttribute('data-bitly_gif_url');
+				$item['username'] = 'Giphy - ' . ucfirst($kw);
+				$title = $caption->innertext();
+					$title = preg_replace('/\s+/', ' ', $title);
+					$title = str_replace('animated GIF', '', $title);
+					$title = str_replace($kw, '', $title);
+					$title = preg_replace('/\s+/', ' ', $title);
+					$title = trim($title);
+					if(strlen($title) <= 0) {
+						$title = $item['id'];
+					}
+				$item['title'] = trim($title);
+				$item['content'] = '<a href="'
+				. $item['uri']
+				. '"><img src="'
+				. $img->getAttribute('src')
+				. '" width="'
+				. $img->getAttribute('data-original-width')
+				. '" height="'
+				. $img->getAttribute('data-original-height')
+				. '" /></a>';

-                $this->items[] = $item;
-                $limit++;
-            }
-        }
+				$this->items[] = $item;
+				$limit++;
+			}
+		}
 	}
 }
--- a/bridges/GitHubGistBridge.php
+++ b/bridges/GitHubGistBridge.php
@@ -0,0 +1,163 @@
+<?php
+
+class GitHubGistBridge extends BridgeAbstract {
+
+	const NAME = 'GitHubGist comment bridge';
+	const URI = 'https://gist.github.com';
+	const DESCRIPTION = 'Generates feeds for Gist comments';
+	const MAINTAINER = 'logmanoriginal';
+	const CACHE_TIMEOUT = 3600;
+
+	const PARAMETERS = array(array(
+		'id' => array(
+			'name' => 'Gist',
+			'type' => 'text',
+			'required' => true,
+			'title' => 'Insert Gist ID or URI',
+			'exampleValue' => '2646763, https://gist.github.com/2646763'
+		)
+	));
+
+	private $filename;
+
+	public function getURI() {
+
+		$id = $this->getInput('id') ?: '';
+
+		$urlpath = parse_url($id, PHP_URL_PATH);
+
+		if($urlpath) {
+
+			$components = explode('/', $urlpath);
+			$id = end($components);
+
+		}
+
+		return static::URI . '/' . $id;
+
+	}
+
+	public function getName() {
+		return $this->filename ? $this->filename . ' - ' . static::NAME : static::NAME;
+	}
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM($this->getURI(),
+		null,
+		null,
+		true,
+		true,
+		DEFAULT_TARGET_CHARSET,
+		false, // Do NOT remove line breaks
+		DEFAULT_BR_TEXT,
+		DEFAULT_SPAN_TEXT)
+			or returnServerError('Could not request ' . $this->getURI());
+
+		$html = defaultLinkTo($html, $this->getURI());
+
+		$fileinfo = $html->find('[class="file-info"]', 0)
+			or returnServerError('Could not find file info!');
+
+		$this->filename = $fileinfo->plaintext;
+
+		$comments = $html->find('div[class="timeline-comment-wrapper"]');
+
+		if(is_null($comments)) { // no comments yet
+			return;
+		}
+
+		foreach($comments as $comment) {
+
+			$uri = $comment->find('a[href*=#gistcomment]', 0)
+				or returnServerError('Could not find comment anchor!');
+
+			$title = $comment->find('div[class="unminimized-comment"] h3[class="timeline-comment-header-text"]', 0)
+				or returnServerError('Could not find comment header text!');
+
+			$datetime = $comment->find('[datetime]', 0)
+				or returnServerError('Could not find comment datetime!');
+
+			$author = $comment->find('a.author', 0)
+				or returnServerError('Could not find author name!');
+
+			$message = $comment->find('[class="comment-body"]', 0)
+				or returnServerError('Could not find comment body!');
+
+			$item = array();
+
+			$item['uri'] = $uri->href;
+			$item['title'] = str_replace('commented', 'commented on', $title->plaintext);
+			$item['timestamp'] = strtotime($datetime->datetime);
+			$item['author'] = '<a href="' . $author->href . '">' . $author->plaintext . '</a>';
+			$item['content'] = $this->fixContent($message);
+			// $item['enclosures'] = array();
+			// $item['categories'] = array();
+
+			$this->items[] = $item;
+
+		}
+
+	}
+
+	/** Removes all unnecessary tags and adds formatting */
+	private function fixContent($content){
+
+		// Restore code (inside <pre />) highlighting
+		foreach($content->find('pre') as $pre) {
+
+			$pre->style = <<<EOD
+padding: 16px;
+overflow: auto;
+font-size: 85%;
+line-height: 1.45;
+background-color: #f6f8fa;
+border-radius: 3px;
+word-wrap: normal;
+box-sizing: border-box;
+margin-bottom: 16px;
+EOD;
+
+			$code = $pre->find('code', 0);
+
+			if($code) {
+
+				$code->style = <<<EOD
+white-space: pre;
+word-break: normal;
+EOD;
+
+			}
+
+		}
+
+		// find <code /> not inside <pre /> (`inline-code`)
+		foreach($content->find('code') as $code) {
+
+			if($code->parent()->tag === 'pre') {
+				continue;
+			}
+
+			$code->style = <<<EOD
+background-color: rgba(27,31,35,0.05);
+padding: 0.2em 0.4em;
+border-radius: 3px;
+EOD;
+
+		}
+
+		// restore text spacing
+		foreach($content->find('p') as $p) {
+			$p->style = 'margin-bottom: 16px;';
+		}
+
+		// Remove unnecessary tags
+		$content = strip_tags(
+			$content->innertext,
+			'<p><a><img><ol><ul><li><table><tr><th><td><string><pre><code><br><hr><h>'
+		);
+
+		return $content;
+
+	}
+}
--- a/bridges/GithubIssueBridge.php
+++ b/bridges/GithubIssueBridge.php
@@ -1,190 +1,219 @@
 <?php
-class GithubIssueBridge extends BridgeAbstract{
+class GithubIssueBridge extends BridgeAbstract {

-  const MAINTAINER = 'Pierre Mazière';
-  const NAME = 'Github Issue';
-  const URI = 'https://github.com/';
-  const CACHE_TIMEOUT = 600; // 10min
-  const DESCRIPTION = 'Returns the issues or comments of an issue of a github project';
+	const MAINTAINER = 'Pierre Mazière';
+	const NAME = 'Github Issue';
+	const URI = 'https://github.com/';
+	const CACHE_TIMEOUT = 600; // 10min
+	const DESCRIPTION = 'Returns the issues or comments of an issue of a github project';

-  const PARAMETERS=array(
-    'global'=>array (
-      'u'=>array(
-        'name'=>'User name',
-        'required'=>true
-      ),
-      'p'=>array(
-        'name'=>'Project name',
-        'required'=>true
-      )
-    ),
+	const PARAMETERS = array(
+		'global' => array(
+			'u' => array(
+				'name' => 'User name',
+				'required' => true
+			),
+			'p' => array(
+				'name' => 'Project name',
+				'required' => true
+			)
+		),
+		'Project Issues' => array(
+			'c' => array(
+				'name' => 'Show Issues Comments',
+				'type' => 'checkbox'
+			)
+		),
+		'Issue comments' => array(
+			'i' => array(
+				'name' => 'Issue number',
+				'type' => 'number',
+				'required' => true
+			)
+		)
+	);

-    'Project Issues'=>array(
-      'c'=>array(
-        'name'=>'Show Issues Comments',
-        'type'=>'checkbox'
-      )
-    ),
-    'Issue comments'=>array(
-      'i'=>array(
-        'name'=>'Issue number',
-        'type'=>'number',
-        'required'=>'true'
-      )
-    )
-  );
+	public function getName(){
+		$name = $this->getInput('u') . '/' . $this->getInput('p');
+		switch($this->queriedContext) {
+		case 'Project Issues':
+			$prefix = static::NAME . 's for ';
+			if($this->getInput('c')) {
+				$prefix = static::NAME . 's comments for ';
+			}
+			$name = $prefix . $name;
+			break;
+		case 'Issue comments':
+			$name = static::NAME . ' ' . $name . ' #' . $this->getInput('i');
+			break;
+		default: return parent::getName();
+		}
+		return $name;
+	}

-  public function getName(){
-    $name=$this->getInput('u').'/'.$this->getInput('p');
-    switch($this->queriedContext){
-    case 'Project Issues':
-      if($this->getInput('c')){
-        $prefix=static::NAME.'s comments for ';
-      }else{
-        $prefix=static::NAME.'s for ';
-      }
-      $name=$prefix.$name;
-      break;
-    case 'Issue comments':
-      $name=static::NAME.' '.$name.' #'.$this->getInput('i');
-      break;
-    }
-    return $name;
-  }
+	public function getURI(){
+		if(null !== $this->getInput('u') && null !== $this->getInput('p')) {
+			$uri = static::URI . $this->getInput('u') . '/'
+				. $this->getInput('p') . '/issues';
+			if($this->queriedContext === 'Issue comments') {
+				$uri .= '/' . $this->getInput('i');
+			} elseif($this->getInput('c')) {
+				$uri .= '?q=is%3Aissue+sort%3Aupdated-desc';
+			}
+			return $uri;
+		}

-  public function getURI(){
-    $uri = static::URI.$this->getInput('u').'/'.$this->getInput('p').'/issues';
-    if($this->queriedContext==='Issue comments'){
-      $uri.='/'.$this->getInput('i');
-    }else if($this->getInput('c')){
-      $uri.='?q=is%3Aissue+sort%3Aupdated-desc';
-    }
-    return $uri;
-  }
+		return parent::getURI();
+	}

-  protected function extractIssueComment($issueNbr,$title,$comment){
-    $class=$comment->getAttribute('class');
-    $classes=explode(' ',$class);
-    $event=false;
-    if(in_array('discussion-item',$classes)){
-      $event=true;
-    }
+	protected function extractIssueEvent($issueNbr, $title, $comment){
+		$comment = $comment->firstChild();
+		$uri = static::URI . $this->getInput('u') . '/' . $this->getInput('p')
+			. '/issues/' . $issueNbr . '#' . $comment->getAttribute('id');

-    $author='unknown';
-    if($comment->find('.author',0)){
-      $author=$comment->find('.author',0)->plaintext;
-    }
+		$author = $comment->find('.author', 0)->plaintext;

-    $uri=static::URI.$this->getInput('u').'/'.$this->getInput('p').'/issues/'
-      .$issueNbr;
+		$title .= ' / ' . trim($comment->plaintext);

-    $comment=$comment->firstChild();
-    if(!$event){
-      $comment=$comment->nextSibling();
-    }
+		$content = $title;
+		if (null !== $comment->nextSibling()) {
+			$content = $comment->nextSibling()->innertext;
+			if ($comment->nextSibling()->nodeName() === 'span') {
+				$content = $comment->nextSibling()->nextSibling()->innertext;
+			}
+		}

-    if($event){
-      $title.=' / '.substr($class,strpos($class,'discussion-item-')+strlen('discussion-item-'));
-      if(!$comment->hasAttribute('id')){
-        $items=array();
-        $timestamp=strtotime($comment->find('relative-time',0)->getAttribute('datetime'));
-        $content=$comment->innertext;
-        while($comment=$comment->nextSibling()){
-          $item=array();
-          $item['author']=$author;
-          $item['title']=html_entity_decode($title,ENT_QUOTES,'UTF-8');
-          $item['timestamp']=$timestamp;
-          $item['content']=$content.'<p>'.$comment->children(1)->innertext.'</p>';
-          $item['uri']=$uri.'#'.$comment->children(1)->getAttribute('id');
-          $items[]=$item;
-        }
-        return $items;
-      }
-      $content=$comment->parent()->innertext;
-    }else{
-      $title.=' / '.trim($comment->firstChild()->plaintext);
-      $content="<pre>".$comment->find('.comment-body',0)->innertext."</pre>";
-    }
+		$item = array();
+		$item['author'] = $author;
+		$item['uri'] = $uri;
+		$item['title'] = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+		$item['timestamp'] = strtotime(
+			$comment->find('relative-time', 0)->getAttribute('datetime')
+		);
+		$item['content'] = $content;
+		return $item;
+	}

-    $item = array();
-    $item['author']=$author;
-    $item['uri']= $uri.'#'.$comment->getAttribute('id');
-    $item['title']=html_entity_decode($title,ENT_QUOTES,'UTF-8');
-    $item['timestamp']=strtotime($comment->find('relative-time',0)->getAttribute('datetime'));
-    $item['content']=$content;
-    return $item;
-  }
+	protected function extractIssueComment($issueNbr, $title, $comment){
+		$uri = static::URI . $this->getInput('u') . '/'
+			. $this->getInput('p') . '/issues/' . $issueNbr;

-  protected function extractIssueComments($issue){
-    $items=array();
-    $title=$issue->find('.gh-header-title',0)->plaintext;
-    $issueNbr=trim(substr($issue->find('.gh-header-number',0)->plaintext,1));
-    $comments=$issue->find('.js-discussion',0);
-    foreach($comments->children() as $comment){
-      $classes=explode(' ',$comment->getAttribute('class'));
-      if(in_array('discussion-item',$classes) ||
-        in_array('timeline-comment-wrapper',$classes)
-      ){
-        $item=$this->extractIssueComment($issueNbr,$title,$comment);
-        if(array_keys($item)!==range(0,count($item)-1)){
-          $item=array($item);
-        }
-        $items=array_merge($items,$item);
-      }
-    }
-    return $items;
-  }
+		$author = $comment->find('.author', 0)->plaintext;

-  public function collectData(){
-    $html = getSimpleHTMLDOM($this->getURI())
-      or returnServerError('No results for Github Issue '.$this->getURI());
+		$title .= ' / ' . trim(
+			$comment->find('.comment .timeline-comment-header-text', 0)->plaintext
+		);

-    switch($this->queriedContext){
-    case 'Issue comments':
-      $this->items=$this->extractIssueComments($html);
-      break;
-    case 'Project Issues':
-      foreach($html->find('.js-active-navigation-container .js-navigation-item') as $issue){
-        $info=$issue->find('.opened-by',0);
-        $issueNbr=substr(trim($info->plaintext),1,strpos(trim($info->plaintext),' '));
+		$content = $comment->find('.comment-body', 0)->innertext;

-        $item=array();
-        $item['content']='';
+		$item = array();
+		$item['author'] = $author;
+		$item['uri'] = $uri
+			. '#' . $comment->firstChild()->nextSibling()->getAttribute('id');
+		$item['title'] = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+		$item['timestamp'] = strtotime(
+			$comment->find('relative-time', 0)->getAttribute('datetime')
+		);
+		$item['content'] = $content;
+		return $item;
+	}

-        if($this->getInput('c')){
-          $uri=static::URI.$this->getInput('u').'/'.$this->getInput('p').'/issues/'.$issueNbr;
-          $issue=getSimpleHTMLDOMCached($uri,static::CACHE_TIMEOUT);
-          if($issue){
-            $this->items=array_merge($this->items,$this->extractIssueComments($issue));
-            continue;
-          }
-          $item['content']='Can not extract comments from '.$uri;
-        }
+	protected function extractIssueComments($issue){
+		$items = array();
+		$title = $issue->find('.gh-header-title', 0)->plaintext;
+		$issueNbr = trim(
+			substr($issue->find('.gh-header-number', 0)->plaintext, 1)
+		);
+		$comments = $issue->find('.js-discussion', 0);
+		foreach($comments->children() as $comment) {
+			if (!$comment->hasChildNodes()) {
+				continue;
+			}
+			$comment = $comment->firstChild();
+			$classes = explode(' ', $comment->getAttribute('class'));
+			if (in_array('timeline-comment-wrapper', $classes)) {
+				$item = $this->extractIssueComment($issueNbr, $title, $comment);
+				$items[] = $item;
+				continue;
+			}
+			while (in_array('discussion-item', $classes)) {
+				$item = $this->extractIssueEvent($issueNbr, $title, $comment);
+				$items[] = $item;
+				$comment = $comment->nextSibling();
+				if (null == $comment) {
+					break;
+				}
+				$classes = explode(' ', $comment->getAttribute('class'));
+			}
+		}
+		return $items;
+	}

-        $item['author']=$info->find('a',0)->plaintext;
-        $item['timestamp']=strtotime($info->find('relative-time',0)->getAttribute('datetime'));
-        $item['title']=html_entity_decode(
-          $issue->find('.js-navigation-open',0)->plaintext,
-          ENT_QUOTES,
-          'UTF-8'
-        );
-        $comments=$issue->find('.col-5',0)->plaintext;
-        $item['content'].="\n".'Comments: '.($comments?$comments:'0');
-        $item['uri']=self::URI.$issue->find('.js-navigation-open',0)->getAttribute('href');
-        $this->items[]=$item;
-      }
-      break;
-    }
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError(
+				'No results for Github Issue ' . $this->getURI()
+			);

-    array_walk($this->items, function(&$item){
-      $item['content']=preg_replace('/\s+/',' ',$item['content']);
-      $item['content']=str_replace('href="/','href="'.static::URI,$item['content']);
-      $item['content']=str_replace(
-        'href="#',
-        'href="'.substr($item['uri'],0,strpos($item['uri'],'#')+1),
-        $item['content']
-      );
-      $item['title']=preg_replace('/\s+/',' ',$item['title']);
-    });
-  }
+		switch($this->queriedContext) {
+		case 'Issue comments':
+			$this->items = $this->extractIssueComments($html);
+			break;
+		case 'Project Issues':
+			foreach($html->find('.js-active-navigation-container .js-navigation-item') as $issue) {
+				$info = $issue->find('.opened-by', 0);
+				$issueNbr = substr(
+					trim($info->plaintext), 1, strpos(trim($info->plaintext), ' ')
+				);
+
+				$item = array();
+				$item['content'] = '';
+
+				if($this->getInput('c')) {
+					$uri = static::URI . $this->getInput('u')
+						. '/' . $this->getInput('p') . '/issues/' . $issueNbr;
+					$issue = getSimpleHTMLDOMCached($uri, static::CACHE_TIMEOUT);
+					if($issue) {
+						$this->items = array_merge(
+							$this->items,
+							$this->extractIssueComments($issue)
+						);
+						continue;
+					}
+					$item['content'] = 'Can not extract comments from ' . $uri;
+				}
+
+				$item['author'] = $info->find('a', 0)->plaintext;
+				$item['timestamp'] = strtotime(
+					$info->find('relative-time', 0)->getAttribute('datetime')
+				);
+				$item['title'] = html_entity_decode(
+					$issue->find('.js-navigation-open', 0)->plaintext,
+					ENT_QUOTES,
+					'UTF-8'
+				);
+				$comments = trim($issue->find('.col-5', 0)->plaintext);
+				$item['content'] .= "\n" . 'Comments: ' . ($comments ? $comments : '0');
+				$item['uri'] = self::URI
+					. $issue->find('.js-navigation-open', 0)->getAttribute('href');
+				$this->items[] = $item;
+			}
+			break;
+		}
+
+		array_walk($this->items, function(&$item){
+			$item['content'] = preg_replace('/\s+/', ' ', $item['content']);
+			$item['content'] = str_replace(
+				'href="/',
+				'href="' . static::URI,
+				$item['content']
+			);
+			$item['content'] = str_replace(
+				'href="#',
+				'href="' . substr($item['uri'], 0, strpos($item['uri'], '#') + 1),
+				$item['content']
+			);
+			$item['title'] = preg_replace('/\s+/', ' ', $item['title']);
+		});
+	}
 }
--- a/bridges/GithubSearchBridge.php
+++ b/bridges/GithubSearchBridge.php
@@ -0,0 +1,66 @@
+<?php
+class GithubSearchBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'corenting';
+	const NAME = 'Github Repositories Search';
+	const URI = 'https://github.com/';
+	const CACHE_TIMEOUT = 600; // 10min
+	const DESCRIPTION = 'Returns a specified repositories search (sorted by recently updated)';
+	const PARAMETERS = array( array(
+		's' => array(
+			'type' => 'text',
+			'name' => 'Search query'
+		)
+	));
+
+	public function collectData(){
+		$params = array('utf8' => '✓',
+										'q' => urlencode($this->getInput('s')),
+										's' => 'updated',
+										'o' => 'desc',
+										'type' => 'Repositories');
+		$url = self::URI . 'search?' . http_build_query($params);
+
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Error while downloading the website content');
+
+		foreach($html->find('div.repo-list-item') as $element) {
+			$item = array();
+
+			$uri = $element->find('h3 a', 0)->href;
+			$uri = substr(self::URI, 0, -1) . $uri;
+			$item['uri'] = $uri;
+
+			$title = $element->find('h3', 0)->plaintext;
+			$item['title'] = $title;
+
+			// Description
+			if (count($element->find('p.d-inline-block')) != 0) {
+				$content = $element->find('p.d-inline-block', 0)->innertext;
+			} else{
+				$content = 'No description';
+			}
+
+			// Tags
+			$content = $content . '<br />';
+			$tags = $element->find('a.topic-tag');
+			$tags_array = array();
+			if (count($tags) != 0) {
+				$content = $content . 'Tags : ';
+				foreach($tags as $tag_element) {
+					$tag_link = 'https://github.com' . $tag_element->href;
+					$tag_name = trim($tag_element->innertext);
+					$content = $content . '<a href="' . $tag_link . '">' . $tag_name . '</a> ';
+					array_push($tags_array, $tag_element->innertext);
+				}
+			}
+
+			$item['categories'] = $tags_array;
+			$item['content'] = $content;
+			$date = $element->find('relative-time', 0)->datetime;
+			$item['timestamp'] = strtotime($date);
+
+			$this->items[] = $item;
+		}
+	}
+}
--- a/bridges/GizmodoBridge.php
+++ b/bridges/GizmodoBridge.php
@@ -1,22 +1,26 @@
 <?php
 class GizmodoBridge extends FeedExpander {

-	const MAINTAINER = "polopollo";
-	const NAME = "Gizmodo";
-	const URI = "http://gizmodo.com/";
+	const MAINTAINER = 'polopollo';
+	const NAME = 'Gizmodo';
+	const URI = 'http://gizmodo.com/';
 	const CACHE_TIMEOUT = 1800; // 30min
-	const DESCRIPTION = "Returns the newest posts from Gizmodo (full text).";
+	const DESCRIPTION = 'Returns the newest posts from Gizmodo (full text).';

 	protected function parseItem($item){
 		$item = parent::parseItem($item);

 		$articleHTMLContent = getSimpleHTMLDOMCached($item['uri']);
-		if(!$articleHTMLContent){
-			$text = 'Could not load '.$item['uri'];
-		}else{
+		if(!$articleHTMLContent) {
+			$text = 'Could not load ' . $item['uri'];
+		} else {
 			$text = $articleHTMLContent->find('div.entry-content', 0)->innertext;
 			foreach($articleHTMLContent->find('pagespeed_iframe') as $element) {
-				$text .= '<p>link to a iframe (could be a video): <a href="'.$element->src.'">'.$element->src.'</a></p><br>';
+				$text .= '<p>link to a iframe (could be a video): <a href="'
+				. $element->src
+				. '">'
+				. $element->src
+				. '</a></p><br>';
 			}

 			$text = strip_tags($text, '<p><b><a><blockquote><img><em>');
--- a/bridges/GlassdoorBridge.php
+++ b/bridges/GlassdoorBridge.php
@@ -0,0 +1,221 @@
+<?php
+class GlassdoorBridge extends BridgeAbstract {
+
+	// Contexts
+	const CONTEXT_BLOG	 = 'Blogs';
+	const CONTEXT_REVIEW = 'Company Reviews';
+	const CONTEXT_GLOBAL = 'global';
+
+	// Global context parameters
+	const PARAM_LIMIT = 'limit';
+
+	// Blog context parameters
+	const PARAM_BLOG_TYPE = 'blog_type';
+	const PARAM_BLOG_FULL = 'full_article';
+
+	const BLOG_TYPE_HOME			 = 'Home';
+	const BLOG_TYPE_COMPANIES_HIRING = 'Companies Hiring';
+	const BLOG_TYPE_CAREER_ADVICE	 = 'Career Advice';
+	const BLOG_TYPE_INTERVIEWS		 = 'Interviews';
+	const BLOG_TYPE_GUIDE			 = 'Guides';
+
+	// Review context parameters
+	const PARAM_REVIEW_COMPANY = 'company';
+
+	const MAINTAINER = 'logmanoriginal';
+	const NAME = 'Glassdoor Bridge';
+	const URI = 'https://www.glassdoor.com/';
+	const DESCRIPTION = 'Returns feeds for blog posts and company reviews';
+	const CACHE_TIMEOUT = 86400; // 24 hours
+
+	const PARAMETERS = array(
+		self::CONTEXT_BLOG => array(
+			self::PARAM_BLOG_TYPE => array(
+				'name' => 'Blog type',
+				'type' => 'list',
+				'title' => 'Select the blog you want to follow',
+				'values' => array(
+					self::BLOG_TYPE_HOME				=> 'blog/',
+					self::BLOG_TYPE_COMPANIES_HIRING	=> 'blog/companies-hiring/',
+					self::BLOG_TYPE_CAREER_ADVICE		=> 'blog/career-advice/',
+					self::BLOG_TYPE_INTERVIEWS			=> 'blog/interviews/',
+					self::BLOG_TYPE_GUIDE				=> 'blog/guide/'
+				)
+			),
+			self::PARAM_BLOG_FULL => array(
+				'name' => 'Full article',
+				'type' => 'checkbox',
+				'title' => 'Enable to return the full article for each post'
+			),
+		),
+		self::CONTEXT_REVIEW => array(
+			self::PARAM_REVIEW_COMPANY => array(
+				'name' => 'Company URL',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Paste the company review page URL here!',
+				'exampleValue' => 'https://www.glassdoor.com/Reviews/GitHub-Reviews-E671945.htm'
+			)
+		),
+		self::CONTEXT_GLOBAL => array(
+			self::PARAM_LIMIT => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => -1,
+				'title' => 'Specifies the maximum number of items to return (default: All)'
+			)
+		)
+	);
+
+	private $host = self::URI; // They redirect without notice :/
+	private $title = '';
+
+	public function getURI() {
+		switch($this->queriedContext) {
+			case self::CONTEXT_BLOG:
+				return self::URI . $this->getInput(self::PARAM_BLOG_TYPE);
+			case self::CONTEXT_REVIEW:
+				return $this->filterCompanyURI($this->getInput(self::PARAM_REVIEW_COMPANY));
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+		return $this->title ? $this->title . ' - ' . self::NAME : parent::getName();
+	}
+
+	public function collectData() {
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Failed loading contents!');
+
+		$this->host = $html->find('link[rel="canonical"]', 0)->href;
+
+		$html = defaultLinkTo($html, $this->host);
+
+		$this->title = $html->find('meta[property="og:title"]', 0)->content;
+		$limit = $this->getInput(self::PARAM_LIMIT);
+
+		switch($this->queriedContext) {
+			case self::CONTEXT_BLOG:
+				$this->collectBlogData($html, $limit);
+				break;
+			case self::CONTEXT_REVIEW:
+				$this->collectReviewData($html, $limit);
+				break;
+		}
+	}
+
+	private function collectBlogData($html, $limit) {
+		$posts = $html->find('section')
+			or returnServerError('Unable to find blog posts!');
+
+		foreach($posts as $post) {
+			$item = array();
+
+			$item['uri'] = $post->find('header a', 0)->href;
+			$item['title'] = $post->find('header', 0)->plaintext;
+			$item['content'] = $post->find('div[class="excerpt-content"]', 0)->plaintext;
+			$item['enclosures'] = array(
+				$this->getFullSizeImageURI($post->find('div[class="post-thumb"]', 0)->{'data-original'})
+			);
+
+			// optionally load full articles
+			if($this->getInput(self::PARAM_BLOG_FULL)) {
+				$full_html = getSimpleHTMLDOMCached($item['uri'])
+					or returnServerError('Unable to load full article!');
+
+				$full_html = defaultLinkTo($full_html, $this->host);
+
+				$item['author'] = $full_html->find('a[rel="author"]', 0);
+				$item['content'] = $full_html->find('article', 0);
+				$item['timestamp'] = strtotime($full_html->find('time.updated', 0)->datetime);
+				$item['categories'] = $full_html->find('span[class="post_tag"]');
+			}
+
+			$this->items[] = $item;
+
+			if($limit > 0 && count($this->items) >= $limit)
+				return;
+		}
+	}
+
+	private function collectReviewData($html, $limit) {
+		$reviews = $html->find('#EmployerReviews li[id^="empReview]')
+			or returnServerError('Unable to find reviews!');
+
+		foreach($reviews as $review) {
+			$item = array();
+
+			$item['uri'] = $review->find('a.reviewLink', 0)->href;
+			$item['title'] = $review->find('[class="summary"]', 0)->plaintext;
+			$item['author'] = $review->find('div.author span', 0)->plaintext;
+			$item['timestamp'] = strtotime($review->find('time', 0)->datetime);
+
+			$mainText = $review->find('p.mainText', 0)->plaintext;
+			$description = $review->find('div.prosConsAdvice', 0)->innertext;
+			$item['content'] = "<p>{$mainText}</p><p>{$description}</p>";
+
+			$this->items[] = $item;
+
+			if($limit > 0 && count($this->items) >= $limit)
+				return;
+		}
+	}
+
+	private function getFullSizeImageURI($uri) {
+		/* Images are scaled for display on the website. The scaling takes place
+		 * on the host, who provides images in different sizes.
+		 *
+		 * For example:
+		 * https://www.glassdoor.com/blog/app/uploads/sites/2/GettyImages-982402074-e1538092065712-390x193.jpg
+		 *
+		 * By removing the size information we receive the full sized image.
+		 *
+		 * For example:
+		 * https://www.glassdoor.com/blog/app/uploads/sites/2/GettyImages-982402074-e1538092065712.jpg
+		 */
+
+		$uri = filter_var($uri, FILTER_SANITIZE_URL);
+		return preg_replace('/(.*)(\-\d+x\d+)(\.jpg)/', '$1$3', $uri);
+	}
+
+	private function filterCompanyURI($uri) {
+		/* Make sure the URI is a valid review page. Unfortunately there is no
+		 * simple way to determine if the URI is valid, because of automagic
+		 * redirection and strange naming conventions.
+		 */
+		if(!filter_var($uri,
+			FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)) {
+			returnClientError('The specified URL is invalid!');
+		}
+
+		$uri = filter_var($uri, FILTER_SANITIZE_URL);
+		$path = parse_url($uri, PHP_URL_PATH);
+		$parts = explode('/', $path);
+
+		$allowed_strings = array(
+			'de-DE' => 'Bewertungen',
+			'en-AU' => 'Reviews',
+			'nl-BE' => 'Reviews',
+			'fr-BE' => 'Avis',
+			'en-CA' => 'Reviews',
+			'fr-CA' => 'Avis',
+			'fr-FR' => 'Avis',
+			'en-IN' => 'Reviews',
+			'en-IE' => 'Reviews',
+			'nl-NL' => 'Reviews',
+			'de-AT' => 'Bewertungen',
+			'de-CH' => 'Bewertungen',
+			'fr-CH' => 'Avis',
+			'en-GB' => 'Reviews',
+			'en'	=> 'Reviews'
+		);
+
+		if(!in_array($parts[1], $allowed_strings)) {
+			returnClientError('Please specify a URL pointing to the companies review page!');
+		}
+
+		return $uri;
+	}
+}
--- a/bridges/GoComicsBridge.php
+++ b/bridges/GoComicsBridge.php
@@ -0,0 +1,61 @@
+<?php
+class GoComicsBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'sky';
+	const NAME = 'GoComics Unofficial RSS';
+	const URI = 'https://www.gocomics.com/';
+	const CACHE_TIMEOUT = 21600; // 6h
+	const DESCRIPTION = 'The Unofficial GoComics RSS';
+	const PARAMETERS = array( array(
+		'comicname' => array(
+			'name' => 'comicname',
+			'type' => 'text',
+			'required' => true
+		)
+	));
+
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request GoComics: ' . $this->getURI());
+
+		//Get info from first page
+		$author = preg_replace('/By /', '', $html->find('.media-subheading', 0)->plaintext);
+
+		$link = self::URI . $html->find('.gc-deck--cta-0', 0)->find('a', 0)->href;
+		for($i = 0; $i < 5; $i++) {
+
+			$item = array();
+
+			$page = getSimpleHTMLDOM($link)
+				or returnServerError('Could not request GoComics: ' . $link);
+			$imagelink = $page->find('.img-fluid', 1)->src;
+			$date = explode('/', $link);
+
+			$item['id'] = $imagelink;
+			$item['uri'] = $link;
+			$item['author'] = $author;
+			$item['title'] = 'GoComics ' . $this->getInput('comicname');
+			$item['timestamp'] = DateTime::createFromFormat('Ymd', $date[5] . $date[6] . $date[7])->getTimestamp();
+			$item['content'] = '<img src="' . $imagelink . '" />';
+
+			$link = self::URI . $page->find('.js-previous-comic', 0)->href;
+			$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') . ' - GoComics';
+		}
+
+		return parent::getName();
+	}
+}
--- a/bridges/GooglePlusPostBridge.php
+++ b/bridges/GooglePlusPostBridge.php
@@ -1,113 +1,208 @@
 <?php
-class GooglePlusPostBridge extends BridgeAbstract
-{
-	protected $_title;
-	protected $_url;
+class GooglePlusPostBridge extends BridgeAbstract{

-	const MAINTAINER = "Grummfy";
-	const NAME = "Google Plus Post Bridge";
-	const URI = "https://plus.google.com/";
+	private $title;
+	private $url;
+
+	const MAINTAINER = 'Grummfy, logmanoriginal';
+	const NAME = 'Google Plus Post Bridge';
+	const URI = 'https://plus.google.com';
 	const CACHE_TIMEOUT = 600; //10min
-	const DESCRIPTION = "Returns user public post (without API).";
+	const DESCRIPTION = 'Returns user public post (without API).';

-    const PARAMETERS = array( array(
-        'username'=>array(
-            'name'=>'username or Id',
-            'required'=>true
-        )
-    ));
+	const PARAMETERS = array( array(
+		'username' => array(
+			'name' => 'username or Id',
+			'required' => true
+		),
+		'include_media' => array(
+			'name' => 'Include media',
+			'type' => 'checkbox',
+			'title' => 'Enable to include media in the feed content'
+		)
+	));

-	public function collectData()
-	{
-		// get content parsed
-//		$html = getSimpleHTMLDOM(__DIR__ . '/../posts2.html'
-		$html = getSimpleHTMLDOM(self::URI . urlencode($this->getInput('username')) . '/posts'
-			// force language
-			, false, stream_context_create(array('http'=> array(
-			'header'    => 'Accept-Language: fr,fr-be,fr-fr;q=0.8,en;q=0.4,en-us;q=0.2;*' . "\r\n"
-			)))
-		) OR returnServerError('No results for this query.');
+	public function getIcon() {
+		return 'https://ssl.gstatic.com/images/branding/product/ico/google_plus_alldp.ico';
+	}

-		// get title, url, ... there is a lot of intresting stuff in meta
-		$this->_title = $html->find('meta[property]', 0)->getAttribute('content');
-		$this->_url = $html->find('meta[itemprop=url]', 0)->getAttribute('content');
+	public function collectData(){

-//		foreach ($html->find('meta') as $e)
-//		{
-//			$item = array();
-//			$item['content'] = var_export($e->attr, true);
-//			$this->items[] = $item;
-//		}
+		$username = $this->getInput('username');
+
+		// Usernames start with a + if it's not an ID
+		if(!is_numeric($username) && substr($username, 0, 1) !== '+') {
+			$username = '+' . $username;
+		}
+
+		$html = getSimpleHTMLDOM(static::URI . '/' . urlencode($username) . '/posts')
+			or returnServerError('No results for this query.');
+
+		$html = defaultLinkTo($html, static::URI);
+
+		$this->title = $html->find('meta[property=og:title]', 0)->getAttribute('content');
+		$this->url   = $html->find('meta[property=og:url]', 0)->getAttribute('content');
+
+		foreach($html->find('div[jsname=WsjYwc]') as $post) {
+
+			$item = array();
+
+			$item['author'] = $post->find('div div div div a', 0)->innertext;
+			$item['uri'] = $post->find('div div div a', 1)->href;
+
+			$timestamp = $post->find('a.qXj2He span', 0);
+
+			if($timestamp) {
+				$item['timestamp'] = strtotime('+' . preg_replace(
+						'/[^0-9A-Za-z]/',
+						'',
+						$timestamp->getAttribute('aria-label')));
+			}
+
+			$message = $post->find('div[jsname=EjRJtf]', 0);
+
+			// Empty messages are not supported right now
+			if(!$message) {
+				continue;
+			}
+
+			$item['content'] = '<div style="float: left; padding: 0 10px 10px 0;"><a href="'
+			. $this->url
+			. '"><img align="top" alt="'
+			. $item['author']
+			. '" src="'
+			. $post->find('div img', 0)->src
+			. '" /></a></div><div>'
+			. trim(strip_tags($message, '<a><p><div><img>'))
+			. '</div>';
+
+			// Make title at least 50 characters long, but don't add '...' if it is shorter!
+			if(strlen($message->plaintext) > 50) {
+				$end = strpos($message->plaintext, ' ', 50) ?: strlen($message->plaintext);
+			} else {
+				$end = strlen($message->plaintext);
+			}
+
+			if(strlen(substr($message->plaintext, 0, $end)) === strlen($message->plaintext)) {
+				$item['title'] = $message->plaintext;
+			} else {
+				$item['title'] = substr($message->plaintext, 0, $end) . '...';
+			}
+
+			$media = $post->find('[jsname="MTOxpb"]', 0);
+
+			if($media) {
+
+				$item['enclosures'] = array();
+
+				foreach($media->find('img') as $img) {
+					$item['enclosures'][] = $this->fixImage($img)->src;
+				}
+
+				if($this->getInput('include_media') === true && count($item['enclosures'] > 0)) {
+					$item['content'] .= '<div style="clear: both;"><a href="'
+					. $item['enclosures'][0]
+					. '"><img src="'
+					. $item['enclosures'][0]
+					. '" /></a></div>';
+				}
+
+			}
+
+			// Add custom parameters (only useful for JSON or Plaintext)
+			$item['fullname'] = $item['author'];
+			$item['avatar'] = $post->find('div img', 0)->src;
+			$item['id'] = $post->find('div div div', 0)->getAttribute('id');
+			$item['content_simple'] = $message->plaintext;
+
+			$this->items[] = $item;

-		// div[jsmodel=XNmfOc]
-		foreach($html->find('div.yt') as $post)
-		{
-			$item = array();
-//			$item['content'] = $post->find('div.Al', 0)->innertext;
-			$item['username'] = $item['fullname'] = $post->find('header.lea h3 a', 0)->innertext;
-			$item['id'] = $post->getAttribute('id');
-//			$item['title'] = $item['fullname'] = $post->find('header.lea', 0)->plaintext;
-			$item['avatar'] = $post->find('div.ys img', 0)->src;
-//			var_dump((($post->find('a.o-U-s', 0)->getAllAttributes())));
-			$item['uri'] = self::URI . $post->find('a.o-U-s', 0)->href;
-			$item['timestamp'] = strtotime($post->find('a.o-U-s', 0)->plaintext);
-			$this->items[] = $item;
-
-			// hashtag to treat : https://plus.google.com/explore/tag
-			$hashtags = array();
-			foreach($post->find('a.d-s') as $hashtag)
-			{
-				$hashtags[ trim($hashtag->plaintext) ] = self::URI . $hashtag->href;
-			}
-
-			$item['content'] = '';
-
-			// avatar display
-			$item['content'] .= '<div style="float:left; margin: 0 0.5em 0.5em 0;"><a href="' . self::URI . urlencode($this->getInput('username'));
-			$item['content'] .= '"><img align="top" alt="avatar" src="' . $item['avatar'].'" />' . $item['username'] . '</a></div>';
-
-			$content = $post->find('div.Al', 0);
-
-			// alter link
-//			$content = $content->innertext;
-//			$content = str_replace('href="./', 'href="' . self::URI, $content);
-//			$content = str_replace('href="photos', 'href="' . self::URI . 'photos', $content);
-			// XXX ugly but I don't have any idea how to do a better stuff, str_replace on link doesn't work as expected and ask too many checks
-			foreach($content->find('a') as $link)
-			{
-				$hasHttp = strpos($link->href, 'http');
-				$hasDoubleSlash = strpos($link->href, '//');
-
-				if ((!$hasHttp && !$hasDoubleSlash)
-					|| (false !== $hasHttp && strpos($link->href, 'http') != 0)
-					|| (false === $hasHttp && false !== $hasDoubleSlash && $hasDoubleSlash != 0))
-				{
-					// skipp bad link, for some hashtag or other stuff
-					if (strpos($link->href, '/') == 0)
-					{
-						$link->href = substr($link->href, 1);
-					}
-					$link->href = self::URI . $link->href;
-				}
-			}
-			$content = $content->innertext;
-
-			$item['content'] .= '<div style="margin-top: -1.5em">' .  $content . '</div>';
-
-			// extract plaintext
-			$item['content_simple'] = $post->find('div.Al', 0)->plaintext;
 		}

-//		$html->save(__DIR__ . '/../posts2.html');
 	}

-	public function getName()
-	{
-		return $this->_title ?: 'Google Plus Post Bridge';
+	public function getName(){
+		return $this->title ?: 'Google Plus Post Bridge';
 	}

-	public function getURI()
+	public function getURI(){
+		return $this->url ?: parent::getURI();
+	}
+
+	private function fixImage($img) {
+
+		// There are certain images like .gif which link to a static picture and
+		// get replaced dynamically via JS in the browser. If we want the "real"
+		// image we need to account for that.
+
+		$urlparts = parse_url($img->src);
+
+		if(array_key_exists('host', $urlparts)) {
+
+			// For some reason some URIs don't contain the scheme, assume https
+			if(!array_key_exists('scheme', $urlparts)) {
+				$urlparts['scheme'] = 'https';
+			}
+
+			$pathelements = explode('/', $urlparts['path']);
+
+			switch($urlparts['host']) {
+
+				case 'lh3.googleusercontent.com':
+
+					if(pathinfo(end($pathelements), PATHINFO_EXTENSION)) {
+
+						// The second to last element of the path specifies the
+						// image format. The URL is still valid if we remove it.
+						unset($pathelements[count($pathelements) - 2]);
+
+					} elseif(strrpos(end($pathelements), '=') !== false) {
+
+						// Some images go throug a proxy. For those images they
+						// add size information after an equal sign.
+						// Example: '=w530-h298-n'. Again this can safely be
+						// removed to get the original image.
+						$pathelements[count($pathelements) - 1] = substr(
+							end($pathelements),
+							0,
+							strrpos(end($pathelements), '=')
+						);
+
+					}
+
+					break;
+
+			}
+
+			$urlparts['path'] = implode('/', $pathelements);
+
+		}
+
+		$img->src = $this->build_url($urlparts);
+		return $img;
+
+	}
+
+	/**
+	 * From: https://gist.github.com/Ellrion/f51ba0d40ae1d62eeae44fd1adf7b704
+	 * slightly adjusted to work with PHP < 7.0
+	 * @param array $parts
+	 * @return string
+	 */
+	private function build_url(array $parts)
 	{
-		return $this->_url ?: self::URI;
+
+		$scheme   = isset($parts['scheme']) ? ($parts['scheme'] . '://') : '';
+		$host     = isset($parts['host']) ? $parts['host'] : '';
+		$port     = isset($parts['port']) ? (':' . $parts['port']) : '';
+		$user     = isset($parts['user']) ? $parts['user'] : '';
+		$pass     = isset($parts['pass']) ? (':' . $parts['pass']) : '';
+		$pass     = ($user || $pass) ? ($pass . '@') : '';
+		$path     = isset($parts['path']) ? $parts['path'] : '';
+		$query    = isset($parts['query']) ? ('?' . $parts['query']) : '';
+		$fragment = isset($parts['fragment']) ? ('#' . $parts['fragment']) : '';
+
+		return implode('', [$scheme, $user, $pass, $host, $port, $path, $query, $fragment]);
+
 	}
 }
--- a/bridges/GoogleSearchBridge.php
+++ b/bridges/GoogleSearchBridge.php
@@ -7,48 +7,58 @@
 *    qdr:y : in past year
 *    sbd:1 : sort by date (will only work if qdr: is specified)
 */
-class GoogleSearchBridge extends BridgeAbstract{
+class GoogleSearchBridge extends BridgeAbstract {

-	const MAINTAINER = "sebsauvage";
-	const NAME = "Google search";
-	const URI = "https://www.google.com/";
+	const MAINTAINER = 'sebsauvage';
+	const NAME = 'Google search';
+	const URI = 'https://www.google.com/';
 	const CACHE_TIMEOUT = 1800; // 30min
-	const DESCRIPTION = "Returns most recent results from Google search.";
+	const DESCRIPTION = 'Returns most recent results from Google search.';

-    const PARAMETERS = array( array(
-        'q'=>array(
-            'name'=>"keyword",
-            'required'=>true
-        )
-    ));
+	const PARAMETERS = array(array(
+		'q' => array(
+			'name' => 'keyword',
+			'required' => true
+		)
+	));

+	public function collectData(){
+		$html = '';

-    public function collectData(){
-        $html = '';
+		$html = getSimpleHTMLDOM(self::URI
+		. 'search?q='
+		. urlencode($this->getInput('q'))
+		. '&num=100&complete=0&tbs=qdr:y,sbd:1')
+			or returnServerError('No results for this query.');

-        $html = getSimpleHTMLDOM(self::URI
-          .'search?q=' . urlencode($this->getInput('q'))
-          .'&num=100&complete=0&tbs=qdr:y,sbd:1')
-          or returnServerError('No results for this query.');
+		$emIsRes = $html->find('div[id=ires]', 0);

-        $emIsRes = $html->find('div[id=ires]',0);
-        if( !is_null($emIsRes) ){
-            foreach($emIsRes->find('li[class=g]') as $element) {
-                $item = array();
+		if(!is_null($emIsRes)) {
+			foreach($emIsRes->find('div[class=g]') as $element) {

-                // Extract direct URL from google href (eg. /url?q=...)
-                $t = $element->find('a[href]',0)->href;
-                $item['uri'] = ''.$t;
-                parse_str(parse_url($t, PHP_URL_QUERY),$parameters);
-                if (isset($parameters['q'])) { $item['uri'] = $parameters['q']; }
-                $item['title'] = $element->find('h3',0)->plaintext;
-                $item['content'] = $element->find('span[class=st]',0)->plaintext;
-                $this->items[] = $item;
-            }
-        }
-    }
+				$item = array();

-    public function getName(){
-        return $this->getInput('q') .' - Google search';
-    }
+				// Extract direct URL from google href (eg. /url?q=...)
+				$t = $element->find('a[href]', 0)->href;
+				$item['uri'] = '' . $t;
+				parse_str(parse_url($t, PHP_URL_QUERY), $parameters);
+				if(isset($parameters['q'])) {
+					$item['uri'] = $parameters['q'];
+				}
+
+				$item['title'] = $element->find('h3', 0)->plaintext;
+				$item['content'] = $element->find('span[class=st]', 0)->plaintext;
+
+				$this->items[] = $item;
+			}
+		}
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('q'))) {
+			return $this->getInput('q') . ' - Google search';
+		}
+
+		return parent::getName();
+	}
 }
--- a/bridges/GrandComicsDatabaseBridge.php
+++ b/bridges/GrandComicsDatabaseBridge.php
@@ -0,0 +1,62 @@
+<?php
+class GrandComicsDatabaseBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'corenting';
+	const NAME = 'Grand Comics Database Bridge';
+	const URI = 'https://www.comics.org/';
+	const CACHE_TIMEOUT = 7200; // 2h
+	const DESCRIPTION = 'Returns the latest comics added to a series timeline';
+	const PARAMETERS = array( array(
+		'series' => array(
+			'name' => 'Series id (from the timeline URL)',
+			'required' => true,
+			'exampleValue' => '63051',
+		),
+	));
+
+	public function collectData(){
+
+		$url = self::URI . 'series/' . $this->getInput('series') . '/details/timeline/';
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Error while downloading the website content');
+
+		$table = $html->find('table', 0);
+		$list = array_reverse($table->find('[class^=row_even]'));
+		$seriesName = $html->find('span[id=series_name]', 0)->innertext;
+
+		// Get row headers
+		$rowHeaders = $table->find('th');
+		foreach($list as $article) {
+
+			// Skip empty rows
+			$emptyRow = $article->find('td.empty_month');
+			if (count($emptyRow) != 0) {
+				continue;
+			}
+
+			$rows = $article->find('td');
+			$key_date = $rows[0]->innertext;
+
+			// Get URL too
+			$uri = 'https://www.comics.org' . $article->find('a')[0]->href;
+
+			// Build content
+			$content = '';
+			for($i = 0; $i < count($rowHeaders); $i++) {
+				$headerItem = $rowHeaders[$i]->innertext;
+				$rowItem = $rows[$i]->innertext;
+				$content = $content . $headerItem . ': ' . $rowItem . '<br/>';
+			}
+
+			// Build final item
+			$content = str_replace('href="/', 'href="' . static::URI, $content);
+			$item = array();
+			$item['title'] = $seriesName . ' - ' . $key_date;
+			$item['timestamp'] = strtotime($key_date);
+			$item['content'] = str_get_html($content);
+			$item['uri'] = $uri;
+
+			$this->items[] = $item;
+		}
+	}
+}
--- a/bridges/HDWallpapersBridge.php
+++ b/bridges/HDWallpapersBridge.php
@@ -1,62 +1,83 @@
 <?php
 class HDWallpapersBridge extends BridgeAbstract {
-	const MAINTAINER = "nel50n";
-	const NAME = "HD Wallpapers Bridge";
-	const URI = "http://www.hdwallpapers.in/";
+	const MAINTAINER = 'nel50n';
+	const NAME = 'HD Wallpapers Bridge';
+	const URI = 'http://www.hdwallpapers.in/';
 	const CACHE_TIMEOUT = 43200; //12h
-	const DESCRIPTION = "Returns the latests wallpapers from HDWallpapers";
+	const DESCRIPTION = 'Returns the latests wallpapers from HDWallpapers';

-    const PARAMETERS = array( array(
-      'c'=>array(
-        'name'=>'category',
-        'defaultValue'=>'latest_wallpapers'
-      ),
-        'm'=>array('name'=>'max number of wallpapers'),
-        'r'=>array(
-            'name'=>'resolution',
-            'defaultValue'=>'1920x1200',
-            'exampleValue'=>'1920x1200, 1680x1050,…'
-        )
-    ));
+	const PARAMETERS = array( array(
+		'c' => array(
+			'name' => 'category',
+			'defaultValue' => 'latest_wallpapers'
+		),
+		'm' => array(
+			'name' => 'max number of wallpapers'
+		),
+		'r' => array(
+			'name' => 'resolution',
+			'defaultValue' => '1920x1200',
+			'exampleValue' => '1920x1200, 1680x1050,…'
+		)
+	));

-    public function collectData(){
-        $category = $this->category;
-        if (strrpos($category, 'wallpapers') !== strlen($category)-strlen('wallpapers')) {
-            $category .= '-desktop-wallpapers';
-        }
+	public function collectData(){
+		$category = $this->category;
+		if(strrpos($category, 'wallpapers') !== strlen($category) - strlen('wallpapers')) {
+			$category .= '-desktop-wallpapers';
+		}

-        $num = 0;
-        $max = $this->getInput('m') ?: 14;
-        $lastpage = 1;
+		$num = 0;
+		$max = $this->getInput('m') ?: 14;
+		$lastpage = 1;

-        for ($page = 1; $page <= $lastpage; $page++) {
-            $link = self::URI.'/'.$category.'/page/'.$page;
-            $html = getSimpleHTMLDOM($link) or returnServerError('No results for this query.');
+		for($page = 1; $page <= $lastpage; $page++) {
+			$link = self::URI . '/' . $category . '/page/' . $page;
+			$html = getSimpleHTMLDOM($link)
+				or returnServerError('No results for this query.');

-            if ($page === 1) {
-                preg_match('/page\/(\d+)$/', $html->find('.pagination a', -2)->href, $matches);
-                $lastpage = min($matches[1], ceil($max/14));
-            }
+			if($page === 1) {
+				preg_match('/page\/(\d+)$/', $html->find('.pagination a', -2)->href, $matches);
+				$lastpage = min($matches[1], ceil($max / 14));
+			}

-            foreach($html->find('.wallpapers .wall a') as $element) {
-                $thumbnail = $element->find('img', 0);
+			foreach($html->find('.wallpapers .wall a') as $element) {
+				$thumbnail = $element->find('img', 0);

-                $item = array();
-                // http://www.hdwallpapers.in/download/yosemite_reflections-1680x1050.jpg
-                $item['uri'] = self::URI.'/download'.str_replace('wallpapers.html', $this->getInput('r').'.jpg', $element->href);
-                $item['timestamp'] = time();
-                $item['title'] = $element->find('p', 0)->text();
-                $item['content'] = $item['title'].'<br><a href="'.$item['uri'].'"><img src="'.self::URI.$thumbnail->src.'" /></a>';
-                $this->items[] = $item;
+				$item = array();
+				// http://www.hdwallpapers.in/download/yosemite_reflections-1680x1050.jpg
+				$item['uri'] = self::URI
+				. '/download'
+				. str_replace('wallpapers.html', $this->getInput('r') . '.jpg', $element->href);

-                $num++;
-                if ($num >= $max)
-                    break 2;
-            }
-        }
-    }
+				$item['timestamp'] = time();
+				$item['title'] = $element->find('p', 0)->text();
+				$item['content'] = $item['title']
+				. '<br><a href="'
+				. $item['uri']
+				. '"><img src="'
+				. self::URI
+				. $thumbnail->src
+				. '" /></a>';

-    public function getName(){
-        return 'HDWallpapers - '.str_replace(['__', '_'], [' & ', ' '], $this->getInput('c')).' ['.$this->getInput('r').']';
-    }
+				$this->items[] = $item;
+
+				$num++;
+				if ($num >= $max)
+					break 2;
+			}
+		}
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('c')) && !is_null($this->getInput('r'))) {
+			return 'HDWallpapers - '
+			. str_replace(['__', '_'], [' & ', ' '], $this->getInput('c'))
+			. ' ['
+			. $this->getInput('r')
+			. ']';
+		}
+
+		return parent::getName();
+	}
 }
--- a/bridges/HentaiHavenBridge.php
+++ b/bridges/HentaiHavenBridge.php
@@ -1,23 +1,37 @@
 <?php
-class HentaiHavenBridge extends BridgeAbstract{
+class HentaiHavenBridge extends BridgeAbstract {

-	const MAINTAINER = "albirew";
-	const NAME = "Hentai Haven";
-	const URI = "http://hentaihaven.org/";
+	const MAINTAINER = 'albirew';
+	const NAME = 'Hentai Haven';
+	const URI = 'http://hentaihaven.org/';
 	const CACHE_TIMEOUT = 21600; // 6h
-	const DESCRIPTION = "Returns releases from Hentai Haven";
+	const DESCRIPTION = 'Returns releases from Hentai Haven';

-    public function collectData(){
-      $html = getSimpleHTMLDOM(self::URI)
-        or returnServerError('Could not request Hentai Haven.');
-        foreach($html->find('div.zoe-grid') as $element) {
-            $item = array();
-            $item['uri'] = $element->find('div.brick-content h3 a', 0)->href;
-            $thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src');
-            $item['title'] = mb_convert_encoding(trim($element->find('div.brick-content h3 a', 0)->innertext), 'UTF-8', 'HTML-ENTITIES');
-            $item['tags'] = $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent span.tags', 0)->plaintext;
-            $item['content'] = 'Tags: ' . $item['tags'].'<br><br><a href="' . $item['uri'] . '"><img width="300" height="169" src="' . $thumbnailUri . '" /></a><br>' . $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent p.description', 0)->innertext;
-            $this->items[] = $item;
-        }
-    }
+	public function collectData(){
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request Hentai Haven.');
+
+		foreach($html->find('div.zoe-grid') as $element) {
+			$item = array();
+			$item['uri'] = $element->find('div.brick-content h3 a', 0)->href;
+			$thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src');
+			$item['title'] = mb_convert_encoding(
+				trim($element->find('div.brick-content h3 a', 0)->innertext),
+				'UTF-8',
+				'HTML-ENTITIES'
+			);
+
+			$item['tags'] = $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent span.tags', 0)->plaintext;
+			$item['content'] = 'Tags: '
+			. $item['tags']
+			. '<br><br><a href="'
+			. $item['uri']
+			. '"><img width="300" height="169" src="'
+			. $thumbnailUri
+			. '" /></a><br>'
+			. $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent p.description', 0)->innertext;
+
+			$this->items[] = $item;
+		}
+	}
 }
--- a/bridges/HotUKDealsBridge.php
+++ b/bridges/HotUKDealsBridge.php
--- a/bridges/IPBBridge.php
+++ b/bridges/IPBBridge.php
@@ -0,0 +1,310 @@
+<?php
+class IPBBridge extends FeedExpander {
+
+	const NAME = 'IPB Bridge';
+	const URI = 'https://www.invisionpower.com';
+	const DESCRIPTION = 'Returns feeds for forums powered by IPB';
+	const MAINTAINER = 'logmanoriginal';
+	const PARAMETERS = array(
+		array(
+			'uri' => array(
+				'name' => 'URI',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Insert forum, subforum or topic URI',
+				'exampleValue' => 'https://invisioncommunity.com/forums/forum/499-feedback-and-ideas/'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'required' => false,
+				'title' => 'Specifies the number of items to return on each request (-1: all)',
+				'defaultValue' => 10
+			)
+		)
+	);
+	const CACHE_TIMEOUT = 3600;
+
+	// Constants for internal use
+	const FORUM_TYPE_LIST_FILTER = '.cForumTopicTable';
+	const FORUM_TYPE_TABLE_FILTER = '#forum_table';
+
+	const TOPIC_TYPE_ARTICLE = 'article';
+	const TOPIC_TYPE_DIV = 'div.post_block';
+
+	public function getURI(){
+		return $this->getInput('uri') ?: parent::getURI();
+	}
+
+	public function collectData(){
+		// The URI cannot be the mainpage (or anything related)
+		switch(parse_url($this->getInput('uri'), PHP_URL_PATH)) {
+			case null:
+			case '/index.php':
+				returnClientError('Provided URI is invalid!');
+				break;
+			default:
+				break;
+		}
+
+		// Sanitize the URI (because else it won't work)
+		$uri = rtrim($this->getInput('uri'), '/'); // No trailing slashes!
+
+		// Forums might provide feeds, though that's optional *facepalm*
+		// Let's check if there is a valid feed available
+		$headers = get_headers($uri . '.xml');
+
+		if($headers[0] === 'HTTP/1.1 200 OK') { // Heureka! It's a valid feed!
+			return $this->collectExpandableDatas($uri);
+		}
+
+		// No valid feed, so do it the hard way
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request ' . $this->getInput('uri') . '!');
+
+		$limit = $this->getInput('limit');
+
+		// Determine if this is a topic or a forum
+		switch(true) {
+			case $this->isTopic($html):
+				$this->collectTopic($html, $limit);
+				break;
+			case $this->isForum($html);
+				$this->collectForum($html);
+				break;
+			default:
+				returnClientError('Unknown type!');
+				break;
+		}
+	}
+
+	private function isForum($html){
+		return !is_null($html->find('div[data-controller*=forums.front.forum.forumPage]', 0))
+		|| !is_null($html->find(static::FORUM_TYPE_TABLE_FILTER, 0));
+	}
+
+	private function isTopic($html){
+		return !is_null($html->find('div[data-controller*=core.front.core.commentFeed]', 0))
+		|| !is_null($html->find(static::TOPIC_TYPE_DIV, 0));
+	}
+
+	private function collectForum($html){
+		// There are multiple forum designs in use (depends on version?)
+		// 1 - Uses an ordered list (based on https://invisioncommunity.com/forums)
+		// 2 - Uses a table (based on https://onehallyu.com)
+
+		switch(true) {
+			case !is_null($html->find(static::FORUM_TYPE_LIST_FILTER, 0)):
+				$this->collectForumList($html);
+				break;
+			case !is_null($html->find(static::FORUM_TYPE_TABLE_FILTER, 0)):
+				$this->collectForumTable($html);
+				break;
+			default:
+				returnClientError('Unknown forum format!');
+				break;
+		}
+	}
+
+	private function collectForumList($html){
+		foreach($html->find(static::FORUM_TYPE_LIST_FILTER, 0)->children() as $row) {
+			// Columns: Title, Statistics, Last modified
+			$item = array();
+
+			$item['uri'] = $row->find('a', 0)->href;
+			$item['title'] = $row->find('a', 0)->title;
+			$item['author'] = $row->find('a', 1)->innertext;
+			$item['timestamp'] = strtotime($row->find('time', 0)->getAttribute('datetime'));
+
+			$this->items[] = $item;
+		}
+	}
+
+	private function collectForumTable($html){
+		foreach($html->find(static::FORUM_TYPE_TABLE_FILTER, 0)->children() as $row) {
+			// Columns: Icon, Content, Preview, Statistics, Last modified
+			$item = array();
+
+			// Skip header row
+			if(!is_null($row->find('th', 0))) continue;
+
+			$item['uri'] = $row->find('a', 0)->href;
+			$item['title'] = $row->find('.title', 0)->plaintext;
+			$item['timestamp'] = strtotime($row->find('[itemprop=dateCreated]', 0)->plaintext);
+
+			$this->items[] = $item;
+		}
+	}
+
+	private function collectTopic($html, $limit){
+		// There are multiple topic designs in use (depends on version?)
+		// 1 - Uses articles (based on https://invisioncommunity.com/forums)
+		// 2 - Uses divs (based on https://onehallyu.com)
+
+		switch(true) {
+			case !is_null($html->find(static::TOPIC_TYPE_ARTICLE, 0)):
+				$this->collectTopicHistory($html, $limit, 'collectTopicArticle');
+				break;
+			case !is_null($html->find(static::TOPIC_TYPE_DIV, 0)):
+				$this->collectTopicHistory($html, $limit, 'collectTopicDiv');
+				break;
+			default:
+				returnClientError('Unknown topic format!');
+				break;
+		}
+	}
+
+	private function collectTopicHistory($html, $limit, $callback){
+		// Make sure the callback is valid!
+		if(!method_exists($this, $callback))
+			returnServerError('Unknown function (\'' . $callback . '\')!');
+
+		$next = null; // Holds the URI of the next page
+
+		while(true) {
+			$next = $this->$callback($html, is_null($next));
+
+			if(is_null($next) || ($limit > 0 && count($this->items) >= $limit)) {
+				break;
+			}
+
+			$html = getSimpleHTMLDOMCached($next);
+		}
+
+		// We might have more items than specified, remove excess
+		$this->items = array_slice($this->items, 0, $limit);
+	}
+
+	private function collectTopicArticle($html, $firstrun = true){
+		$title = $html->find('h1.ipsType_pageTitle', 0)->plaintext;
+
+		// Are we on last page?
+		if($firstrun && !is_null($html->find('.ipsPagination', 0))) {
+			$last = $html->find('.ipsPagination_last a', 0)->{'data-page'};
+			$active = $html->find('.ipsPagination_active a', 0)->{'data-page'};
+
+			if($active !== $last) {
+				// Load last page into memory (cached)
+				$html = getSimpleHTMLDOMCached($html->find('.ipsPagination_last a', 0)->href);
+			}
+		}
+
+		foreach(array_reverse($html->find(static::TOPIC_TYPE_ARTICLE)) as $article) {
+			$item = array();
+
+			$item['uri'] = $article->find('time', 0)->parent()->href;
+			$item['author'] = $article->find('aside a', 0)->plaintext;
+			$item['title'] = $item['author'] . ' - ' . $title;
+			$item['timestamp'] = strtotime($article->find('time', 0)->getAttribute('datetime'));
+
+			$content = $article->find('[data-role=commentContent]', 0);
+			$content = $this->scaleImages($content);
+			$item['content'] = $this->fixContent($content);
+			$item['enclosures'] = $this->findImages($article->find('[data-role=commentContent]', 0)) ?: null;
+
+			$this->items[] = $item;
+		}
+
+		// Return whatever page comes next (previous, as we add in inverse order)
+		// Do we have a previous page? (inactive means no)
+		if(!is_null($html->find('li[class=ipsPagination_prev ipsPagination_inactive]', 0))) {
+			return null; // No, or no more
+		} elseif(!is_null($html->find('li[class=ipsPagination_prev]', 0))) {
+			return $html->find('.ipsPagination_prev a', 0)->href;
+		}
+
+		return null;
+	}
+
+	private function collectTopicDiv($html, $firstrun = true){
+		$title = $html->find('h1.ipsType_pagetitle', 0)->plaintext;
+
+		// Are we on last page?
+		if($firstrun && !is_null($html->find('.pagination', 0))) {
+
+			$active = $html->find('li[class=page active]', 0)->plaintext;
+
+			// There are two ways the 'last' page is displayed:
+			// - With a distict 'last' button (only if there are enough pages)
+			// - With a button for each page (use last button)
+			if(!is_null($html->find('li.last', 0))) {
+				$last = $html->find('li.last a', 0);
+			} else {
+				$last = $html->find('li[class=page] a', -1);
+			}
+
+			if($active !== $last->plaintext) {
+				// Load last page into memory (cached)
+				$html = getSimpleHTMLDOMCached($last->href);
+			}
+		}
+
+		foreach(array_reverse($html->find(static::TOPIC_TYPE_DIV)) as $article) {
+			$item = array();
+
+			$item['uri'] = $article->find('a[rel=bookmark]', 0)->href;
+			$item['author'] = $article->find('.author', 0)->plaintext;
+			$item['title'] = $item['author'] . ' - ' . $title;
+			$item['timestamp'] = strtotime($article->find('.published', 0)->getAttribute('title'));
+
+			$content = $article->find('[itemprop=commentText]', 0);
+			$content = $this->scaleImages($content);
+			$item['content'] = $this->fixContent($content);
+
+			$item['enclosures'] = $this->findImages($article->find('.post_body', 0)) ?: null;
+
+			$this->items[] = $item;
+		}
+
+		// Return whatever page comes next (previous, as we add in inverse order)
+		// Do we have a previous page?
+		if(!is_null($html->find('li.prev', 0))) {
+			return $html->find('li.prev a', 0)->href;
+		}
+
+		return null;
+	}
+
+	/** Returns all images from the provide HTML DOM */
+	private function findImages($html){
+		$images = array();
+
+		foreach($html->find('img') as $img) {
+			$images[] = $img->src;
+		}
+
+		return $images;
+	}
+
+	/** Sets the maximum width and height for all images */
+	private function scaleImages($html, $width = 400, $height = 400){
+		foreach($html->find('img') as $img) {
+			$img->style = "max-width: {$width}px; max-height: {$height}px;";
+		}
+
+		return $html;
+	}
+
+	/** Removes all unnecessary tags and adds formatting */
+	private function fixContent($html){
+
+		// Restore quote highlighting
+		foreach($html->find('blockquote') as $quote) {
+			$quote->style = <<<EOD
+padding: 0px 15px;
+border-width: 1px 1px 1px 2px;
+border-style: solid;
+border-color: #ededed #e8e8e8 #dbdbdb #666666;
+background: #fbfbfb;
+EOD;
+		}
+
+		// Remove unnecessary tags
+		$content = strip_tags(
+			$html->innertext,
+			'<p><a><img><ol><ul><li><table><tr><th><td><strong><blockquote><br><hr><h>'
+		);
+
+		return $content;
+	}
+}
--- a/bridges/IdenticaBridge.php
+++ b/bridges/IdenticaBridge.php
@@ -1,38 +1,52 @@
 <?php
-class IdenticaBridge extends BridgeAbstract{
+class IdenticaBridge extends BridgeAbstract {

-	const MAINTAINER = "mitsukarenai";
-	const NAME = "Identica Bridge";
-	const URI = "https://identi.ca/";
+	const MAINTAINER = 'mitsukarenai';
+	const NAME = 'Identica Bridge';
+	const URI = 'https://identi.ca/';
 	const CACHE_TIMEOUT = 300; // 5min
-	const DESCRIPTION = "Returns user timelines";
+	const DESCRIPTION = 'Returns user timelines';

-    const PARAMETERS = array( array(
-        'u'=>array(
-            'name'=>'username',
-            'required'=>true
-        )
-    ));
+	const PARAMETERS = array( array(
+		'u' => array(
+			'name' => 'username',
+			'required' => true
+		)
+	));

-    public function collectData(){
-        $html = getSimpleHTMLDOM($this->getURI())
-            or returnServerError('Requested username can\'t be found.');
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Requested username can\'t be found.');

-        foreach($html->find('li.major') as $dent) {
-            $item = array();
-            $item['uri'] = html_entity_decode($dent->find('a', 0)->href);	// get dent link
-            $item['timestamp'] = strtotime($dent->find('abbr.easydate', 0)->plaintext);	// extract dent timestamp
-            $item['content'] = trim($dent->find('div.activity-content', 0)->innertext);	// extract dent text
-            $item['title'] = $this->getInput('u') . ' | ' . $item['content'];
-            $this->items[] = $item;
-        }
-    }
+		foreach($html->find('li.major') as $dent) {
+			$item = array();

-    public function getName(){
-        return $this->getInput('u') .' - Identica Bridge';
-    }
+			// get dent link
+			$item['uri'] = html_entity_decode($dent->find('a', 0)->href);

-    public function getURI(){
-        return self::URI.urlencode($this->getInput('u'));
-    }
+			// extract dent timestamp
+			$item['timestamp'] = strtotime($dent->find('abbr.easydate', 0)->plaintext);
+
+			// extract dent text
+			$item['content'] = trim($dent->find('div.activity-content', 0)->innertext);
+			$item['title'] = $this->getInput('u') . ' | ' . $item['content'];
+			$this->items[] = $item;
+		}
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('u'))) {
+			return $this->getInput('u') . ' - Identica Bridge';
+		}
+
+		return parent::getName();
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('u'))) {
+			return self::URI . urlencode($this->getInput('u'));
+		}
+
+		return parent::getURI();
+	}
 }
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -1,71 +1,175 @@
 <?php
-class InstagramBridge extends BridgeAbstract{
+class InstagramBridge extends BridgeAbstract {

-	const MAINTAINER = "pauder";
-	const NAME = "Instagram Bridge";
-	const URI = "http://instagram.com/";
-	const DESCRIPTION = "Returns the newest images";
+	const MAINTAINER = 'pauder';
+	const NAME = 'Instagram Bridge';
+	const URI = 'https://www.instagram.com/';
+	const DESCRIPTION = 'Returns the newest images';

-    const PARAMETERS = array( array(
-        'u'=>array(
-            'name'=>'username',
-            'required'=>true
-        )
-    ));
+	const PARAMETERS = array(
+		'Username' => array(
+			'u' => array(
+				'name' => 'username',
+				'required' => true
+			)
+		),
+		'Hashtag' => array(
+			'h' => array(
+				'name' => 'hashtag',
+				'required' => true
+			)
+		),
+		'Location' => array(
+			'l' => array(
+				'name' => 'location',
+				'required' => true
+			)
+		),
+		'global' => array(
+			'media_type' => array(
+				'name' => 'Media type',
+				'type' => 'list',
+				'required' => false,
+				'values' => array(
+					'All' => 'all',
+					'Story' => 'story',
+					'Video' => 'video',
+					'Picture' => 'picture',
+				),
+				'defaultValue' => 'all'
+			)
+		)

-    public function collectData(){
-        $html = getSimpleHTMLDOM($this->getURI())
-            or returnServerError('Could not request Instagram.');
+	);

-        $innertext = null;
+	public function collectData(){

-        foreach($html->find('script') as $script)
-        {
-        	if ('' === $script->innertext) {
-        		continue;
-        	}
+		if(is_null($this->getInput('u')) && $this->getInput('media_type') == 'story') {
+			returnClientError('Stories are not supported for hashtags nor locations!');
+		}

-        	$pos = strpos(trim($script->innertext), 'window._sharedData');
-        	if (0 !== $pos)
-        	{
-        		continue;
-        	}
+		$data = $this->getInstagramJSON($this->getURI());

-        	$innertext = $script->innertext;
-        	break;
-        }
+		if(!is_null($this->getInput('u'))) {
+			$userMedia = $data->entry_data->ProfilePage[0]->graphql->user->edge_owner_to_timeline_media->edges;
+		} elseif(!is_null($this->getInput('h'))) {
+			$userMedia = $data->entry_data->TagPage[0]->graphql->hashtag->edge_hashtag_to_media->edges;
+		} elseif(!is_null($this->getInput('l'))) {
+			$userMedia = $data->entry_data->LocationsPage[0]->graphql->location->edge_location_to_media->edges;
+		}

-        $json = trim(substr($innertext, $pos+18), ' =;');
-        $data = json_decode($json);
+		foreach($userMedia as $media) {
+			$media = $media->node;

+			if(!is_null($this->getInput('u'))) {
+				switch($this->getInput('media_type')) {
+					case 'all': break;
+					case 'video':
+						if($media->__typename != 'GraphVideo') continue 2;
+						break;
+					case 'picture':
+						if($media->__typename != 'GraphImage') continue 2;
+						break;
+					case 'story':
+						if($media->__typename != 'GraphSidecar') continue 2;
+						break;
+					default: break;
+				}
+			} else {
+				if($this->getInput('media_type') == 'video' && !$media->is_video) continue;
+			}

+			$item = array();
+			$item['uri'] = self::URI . 'p/' . $media->shortcode . '/';

-        $userMedia = $data->entry_data->ProfilePage[0]->user->media->nodes;
+			if (isset($media->owner->username)) {
+				$item['author'] = $media->owner->username;
+			}

-        foreach($userMedia as $media)
-        {
+			if (isset($media->edge_media_to_caption->edges[0]->node->text)) {
+				$textContent = $media->edge_media_to_caption->edges[0]->node->text;
+			} else {
+				$textContent = basename($media->display_url);
+			}

-        	$item = array();
-        	$item['uri'] = self::URI.'p/'.$media->code.'/';
-        	$item['content'] = '<img src="' . htmlentities($media->display_src) . '" />';
-        	if (isset($media->caption))
-        	{
-        		$item['title'] = $media->caption;
-        	} else {
-        		$item['title'] = basename($media->display_src);
-        	}
-        	$item['timestamp'] = $media->date;
-        	$this->items[] = $item;
+			$item['title'] = ($media->is_video ? '▶ ' : '') . trim($textContent);
+			$titleLinePos = strpos(wordwrap($item['title'], 120), "\n");
+			if ($titleLinePos != false) {
+				$item['title'] = substr($item['title'], 0, $titleLinePos) . '...';
+			}

-        }
-    }
+			if(!is_null($this->getInput('u')) && $media->__typename == 'GraphSidecar') {
+				$data = $this->getInstagramStory($item['uri']);
+				$item['content'] = $data[0];
+				$item['enclosures'] = $data[1];
+			} else {
+				$item['content'] = '<a href="' . htmlentities($item['uri']) . '" target="_blank">';
+				$item['content'] .= '<img src="' . htmlentities($media->display_url) . '" alt="' . $item['title'] . '" />';
+				$item['content'] .= '</a><br><br>' . nl2br(htmlentities($textContent));
+				$item['enclosures'] = array($media->display_url);
+			}

-    public function getName(){
-        return $this->getInput('u') .' - Instagram Bridge';
-    }
+			$item['timestamp'] = $media->taken_at_timestamp;

-    public function getURI(){
-        return self::URI.urlencode($this->getInput('u'));
-    }
+			$this->items[] = $item;
+		}
+	}
+
+	protected function getInstagramStory($uri) {
+
+		$data = $this->getInstagramJSON($uri);
+		$mediaInfo = $data->entry_data->PostPage[0]->graphql->shortcode_media;
+
+		//Process the first element, that isn't in the node graph
+		if (count($mediaInfo->edge_media_to_caption->edges) > 0) {
+			$caption = $mediaInfo->edge_media_to_caption->edges[0]->node->text;
+		} else {
+			$caption = '';
+		}
+
+		$enclosures = [$mediaInfo->display_url];
+		$content = '<img src="' . htmlentities($mediaInfo->display_url) . '" alt="' . $caption . '" />';
+
+		foreach($mediaInfo->edge_sidecar_to_children->edges as $media) {
+			$display_url = $media->node->display_url;
+			if(!in_array($display_url, $enclosures)) { // add only if not added yet
+				$content .= '<img src="' . htmlentities($display_url) . '" alt="' . $caption . '" />';
+				$enclosures[] = $display_url;
+			}
+		}
+
+		return [$content, $enclosures];
+
+	}
+
+	protected function getInstagramJSON($uri) {
+
+		$html = getContents($uri)
+			or returnServerError('Could not request Instagram.');
+		$scriptRegex = '/window\._sharedData = (.*);<\/script>/';
+
+		preg_match($scriptRegex, $html, $matches, PREG_OFFSET_CAPTURE, 0);
+
+		return json_decode($matches[1][0]);
+
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('u'))) {
+			return $this->getInput('u') . ' - Instagram Bridge';
+		}
+
+		return parent::getName();
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('u'))) {
+			return self::URI . urlencode($this->getInput('u')) . '/';
+		} elseif(!is_null($this->getInput('h'))) {
+			return self::URI . 'explore/tags/' . urlencode($this->getInput('h'));
+		} elseif(!is_null($this->getInput('l'))) {
+			return self::URI . 'explore/locations/' . urlencode($this->getInput('l'));
+		}
+		return parent::getURI();
+	}
 }
-
--- a/bridges/InstructablesBridge.php
+++ b/bridges/InstructablesBridge.php
@@ -0,0 +1,370 @@
+<?php
+/**
+* This class implements a bridge for http://www.instructables.com, supporting
+* general feeds and feeds by category. Instructables doesn't support HTTPS as
+* of now (23.06.2018), so all connections are insecure!
+*
+* Remarks:
+* - For some reason it is very important to have the category URI end with a
+*	slash, otherwise the site defaults to the main category (i.e. Technology)!
+*	If you need to update the categories list, enable the 'listCategories'
+*	function (see comments below) and run the bridge with format=Html (see page
+*	source)
+*/
+class InstructablesBridge extends BridgeAbstract {
+	const NAME = 'Instructables Bridge';
+	const URI = 'http://www.instructables.com';
+	const DESCRIPTION = 'Returns general feeds and feeds by category';
+	const MAINTAINER = 'logmanoriginal';
+	const PARAMETERS = array(
+		'Category' => array(
+			'category' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'required' => true,
+				'values' => array(
+					'Play' => array(
+						'All' => '/play/',
+						'KNEX' => '/play/knex/',
+						'Offbeat' => '/play/offbeat/',
+						'Lego' => '/play/lego/',
+						'Airsoft' => '/play/airsoft/',
+						'Card Games' => '/play/card-games/',
+						'Guitars' => '/play/guitars/',
+						'Instruments' => '/play/instruments/',
+						'Magic Tricks' => '/play/magic-tricks/',
+						'Minecraft' => '/play/minecraft/',
+						'Music' => '/play/music/',
+						'Nerf' => '/play/nerf/',
+						'Nintendo' => '/play/nintendo/',
+						'Office Supplies' => '/play/office-supplies/',
+						'Paintball' => '/play/paintball/',
+						'Paper Airplanes' => '/play/paper-airplanes/',
+						'Party Tricks' => '/play/party-tricks/',
+						'PlayStation' => '/play/playstation/',
+						'Pranks and Humor' => '/play/pranks-and-humor/',
+						'Puzzles' => '/play/puzzles/',
+						'Siege Engines' => '/play/siege-engines/',
+						'Sports' => '/play/sports/',
+						'Table Top' => '/play/table-top/',
+						'Toys' => '/play/toys/',
+						'Video Games' => '/play/video-games/',
+						'Wii' => '/play/wii/',
+						'Xbox' => '/play/xbox/',
+						'Yo-Yo' => '/play/yo-yo/',
+					),
+					'Craft' => array(
+						'All' => '/craft/',
+						'Art' => '/craft/art/',
+						'Sewing' => '/craft/sewing/',
+						'Paper' => '/craft/paper/',
+						'Jewelry' => '/craft/jewelry/',
+						'Fashion' => '/craft/fashion/',
+						'Books & Journals' => '/craft/books-and-journals/',
+						'Cards' => '/craft/cards/',
+						'Clay' => '/craft/clay/',
+						'Duct Tape' => '/craft/duct-tape/',
+						'Embroidery' => '/craft/embroidery/',
+						'Felt' => '/craft/felt/',
+						'Fiber Arts' => '/craft/fiber-arts/',
+						'Gifts & Wrapping' => '/craft/gifts-and-wrapping/',
+						'Knitting & Crocheting' => '/craft/knitting-and-crocheting/',
+						'Leather' => '/craft/leather/',
+						'Mason Jars' => '/craft/mason-jars/',
+						'No-Sew' => '/craft/no-sew/',
+						'Parties & Weddings' => '/craft/parties-and-weddings/',
+						'Print Making' => '/craft/print-making/',
+						'Soap' => '/craft/soap/',
+						'Wallets' => '/craft/wallets/',
+					),
+					'Technology' => array(
+						'All' => '/technology/',
+						'Electronics' => '/technology/electronics/',
+						'Arduino' => '/technology/arduino/',
+						'Photography' => '/technology/photography/',
+						'Leds' => '/technology/leds/',
+						'Science' => '/technology/science/',
+						'Reuse' => '/technology/reuse/',
+						'Apple' => '/technology/apple/',
+						'Computers' => '/technology/computers/',
+						'3D Printing' => '/technology/3D-Printing/',
+						'Robots' => '/technology/robots/',
+						'Art' => '/technology/art/',
+						'Assistive Tech' => '/technology/assistive-technology/',
+						'Audio' => '/technology/audio/',
+						'Clocks' => '/technology/clocks/',
+						'CNC' => '/technology/cnc/',
+						'Digital Graphics' => '/technology/digital-graphics/',
+						'Gadgets' => '/technology/gadgets/',
+						'Kits' => '/technology/kits/',
+						'Laptops' => '/technology/laptops/',
+						'Lasers' => '/technology/lasers/',
+						'Linux' => '/technology/linux/',
+						'Microcontrollers' => '/technology/microcontrollers/',
+						'Microsoft' => '/technology/microsoft/',
+						'Mobile' => '/technology/mobile/',
+						'Raspberry Pi' => '/technology/raspberry-pi/',
+						'Remote Control' => '/technology/remote-control/',
+						'Sensors' => '/technology/sensors/',
+						'Software' => '/technology/software/',
+						'Soldering' => '/technology/soldering/',
+						'Speakers' => '/technology/speakers/',
+						'Steampunk' => '/technology/steampunk/',
+						'Tools' => '/technology/tools/',
+						'USB' => '/technology/usb/',
+						'Wearables' => '/technology/wearables/',
+						'Websites' => '/technology/websites/',
+						'Wireless' => '/technology/wireless/',
+					),
+					'Workshop' => array(
+						'All' => '/workshop/',
+						'Woodworking' => '/workshop/woodworking/',
+						'Tools' => '/workshop/tools/',
+						'Gardening' => '/workshop/gardening/',
+						'Cars' => '/workshop/cars/',
+						'Metalworking' => '/workshop/metalworking/',
+						'Cardboard' => '/workshop/cardboard/',
+						'Electric Vehicles' => '/workshop/electric-vehicles/',
+						'Energy' => '/workshop/energy/',
+						'Furniture' => '/workshop/furniture/',
+						'Home Improvement' => '/workshop/home-improvement/',
+						'Home Theater' => '/workshop/home-theater/',
+						'Hydroponics' => '/workshop/hydroponics/',
+						'Laser Cutting' => '/workshop/laser-cutting/',
+						'Lighting' => '/workshop/lighting/',
+						'Molds & Casting' => '/workshop/molds-and-casting/',
+						'Motorcycles' => '/workshop/motorcycles/',
+						'Organizing' => '/workshop/organizing/',
+						'Pallets' => '/workshop/pallets/',
+						'Repair' => '/workshop/repair/',
+						'Shelves' => '/workshop/shelves/',
+						'Solar' => '/workshop/solar/',
+						'Workbenches' => '/workshop/workbenches/',
+					),
+					'Home' => array(
+						'All' => '/home/',
+						'Halloween' => '/home/halloween/',
+						'Decorating' => '/home/decorating/',
+						'Organizing' => '/home/organizing/',
+						'Pets' => '/home/pets/',
+						'Life Hacks' => '/home/life-hacks/',
+						'Beauty' => '/home/beauty/',
+						'Christmas' => '/home/christmas/',
+						'Cleaning' => '/home/cleaning/',
+						'Education' => '/home/education/',
+						'Finances' => '/home/finances/',
+						'Gardening' => '/home/gardening/',
+						'Green' => '/home/green/',
+						'Health' => '/home/health/',
+						'Hiding Places' => '/home/hiding-places/',
+						'Holidays' => '/home/holidays/',
+						'Homesteading' => '/home/homesteading/',
+						'Kids' => '/home/kids/',
+						'Kitchen' => '/home/kitchen/',
+						'Life Skills' => '/home/life-skills/',
+						'Parenting' => '/home/parenting/',
+						'Pest Control' => '/home/pest-control/',
+						'Relationships' => '/home/relationships/',
+						'Reuse' => '/home/reuse/',
+						'Travel' => '/home/travel/',
+					),
+					'Outside' => array(
+						'All' => '/outside/',
+						'Bikes' => '/outside/bikes/',
+						'Survival' => '/outside/survival/',
+						'Backyard' => '/outside/backyard/',
+						'Beach' => '/outside/beach/',
+						'Birding' => '/outside/birding/',
+						'Boats' => '/outside/boats/',
+						'Camping' => '/outside/camping/',
+						'Climbing' => '/outside/climbing/',
+						'Fire' => '/outside/fire/',
+						'Fishing' => '/outside/fishing/',
+						'Hunting' => '/outside/hunting/',
+						'Kites' => '/outside/kites/',
+						'Knives' => '/outside/knives/',
+						'Knots' => '/outside/knots/',
+						'Paracord' => '/outside/paracord/',
+						'Rockets' => '/outside/rockets/',
+						'Skateboarding' => '/outside/skateboarding/',
+						'Snow' => '/outside/snow/',
+						'Water' => '/outside/water/',
+					),
+					'Food' => array(
+						'All' => '/food/',
+						'Dessert' => '/food/dessert/',
+						'Snacks & Appetizers' => '/food/snacks-and-appetizers/',
+						'Bacon' => '/food/bacon/',
+						'BBQ & Grilling' => '/food/bbq-and-grilling/',
+						'Beverages' => '/food/beverages/',
+						'Bread' => '/food/bread/',
+						'Breakfast' => '/food/breakfast/',
+						'Cake' => '/food/cake/',
+						'Candy' => '/food/candy/',
+						'Canning & Preserves' => '/food/canning-and-preserves/',
+						'Cocktails & Mocktails' => '/food/cocktails-and-mocktails/',
+						'Coffee' => '/food/coffee/',
+						'Cookies' => '/food/cookies/',
+						'Cupcakes' => '/food/cupcakes/',
+						'Homebrew' => '/food/homebrew/',
+						'Main Course' => '/food/main-course/',
+						'Pasta' => '/food/pasta/',
+						'Pie' => '/food/pie/',
+						'Pizza' => '/food/pizza/',
+						'Salad' => '/food/salad/',
+						'Sandwiches' => '/food/sandwiches/',
+						'Soups & Stews' => '/food/soups-and-stews/',
+						'Vegetarian & Vegan' => '/food/vegetarian-and-vegan/',
+					),
+					'Costumes' => array(
+						'All' => '/costumes/',
+						'Props' => '/costumes/props-and-accessories/',
+						'Animals' => '/costumes/animals/',
+						'Comics' => '/costumes/comics/',
+						'Fantasy' => '/costumes/fantasy/',
+						'For Kids' => '/costumes/for-kids/',
+						'For Pets' => '/costumes/for-pets/',
+						'Funny' => '/costumes/funny/',
+						'Games' => '/costumes/games/',
+						'Historic & Futuristic' => '/costumes/historic-and-futuristic/',
+						'Makeup' => '/costumes/makeup/',
+						'Masks' => '/costumes/masks/',
+						'Scary' => '/costumes/scary/',
+						'TV & Movies' => '/costumes/tv-and-movies/',
+						'Weapons & Armor' => '/costumes/weapons-and-armor/',
+					)
+				),
+				'title' => 'Select your category (required)',
+				'defaultValue' => 'Technology'
+			),
+			'filter' => array(
+				'name' => 'Filter',
+				'type' => 'list',
+				'required' => true,
+				'values' => array(
+					'Featured' => ' ',
+					'Recent' => 'recent/',
+					'Popular' => 'popular/',
+					'Views' => 'views/',
+					'Contest Winners' => 'winners/'
+				),
+				'title' => 'Select a filter',
+				'defaultValue' => 'Featured'
+			)
+		)
+	);
+
+	private $uri;
+
+	public function collectData() {
+		// Enable the following line to get the category list (dev mode)
+		// $this->listCategories();
+
+		$this->uri = static::URI;
+
+		switch($this->queriedContext) {
+			case 'Category': $this->uri .= $this->getInput('category') . $this->getInput('filter');
+		}
+
+		$html = getSimpleHTMLDOM($this->uri)
+				or returnServerError('Error loading category ' . $this->uri);
+
+		foreach($html->find('ul.explore-covers-list li') as $cover) {
+			$item = array();
+
+			$item['uri'] = static::URI . $cover->find('a.cover-image', 0)->href;
+			$item['title'] = $cover->find('.title', 0)->innertext;
+			$item['author'] = $this->getCategoryAuthor($cover);
+			$item['content'] = '<a href='
+			. $item['uri']
+			. '><img src='
+			. $cover->find('a.cover-image img', 0)->src
+			. '></a>';
+
+			$image = str_replace('.RECTANGLE1', '.LARGE', $cover->find('a.cover-image img', 0)->src);
+			$item['enclosures'] = [$image];
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getName() {
+		if(!is_null($this->getInput('category'))
+		&& !is_null($this->getInput('filter'))) {
+			foreach(self::PARAMETERS[$this->queriedContext]['category']['values'] as $key => $value) {
+				$subcategory = array_search($this->getInput('category'), $value);
+
+				if($subcategory !== false)
+					break;
+			}
+
+			$filter = array_search(
+				$this->getInput('filter'),
+				self::PARAMETERS[$this->queriedContext]['filter']['values']
+			);
+
+			return $subcategory . ' (' . $filter . ') - ' . static::NAME;
+		}
+
+		return parent::getName();
+	}
+
+	public function getURI() {
+		if(!is_null($this->getInput('category'))
+		&& !is_null($this->getInput('filter'))) {
+			return $this->uri;
+		}
+
+		return parent::getURI();
+	}
+
+	/**
+	 * Returns a list of categories for development purposes (used to build the
+	 * parameters list)
+	 */
+	private function listCategories(){
+		// Use arbitrary category to receive full list
+		$html = getSimpleHTMLDOM(self::URI . '/technology/');
+
+		foreach($html->find('.channel a') as $channel) {
+			$name = html_entity_decode(trim($channel->innertext));
+
+			// Remove unwanted entities
+			$name = str_replace("'", '', $name);
+			$name = str_replace('&#39;', '', $name);
+
+			$uri = $channel->href;
+
+			$category = explode('/', $uri)[1];
+
+			if(!isset($categories)
+			|| !array_key_exists($category, $categories)
+			|| !in_array($uri, $categories[$category]))
+				$categories[$category][$name] = $uri;
+		}
+
+		// Build PHP array manually
+		foreach($categories as $key => $value) {
+			$name = ucfirst($key);
+			echo "'{$name}' => array(\n";
+			echo "\t'All' => '/{$key}/',\n";
+			foreach($value as $name => $uri) {
+				echo "\t'{$name}' => '{$uri}',\n";
+			}
+			echo "),\n";
+		}
+
+		die;
+	}
+
+	/**
+	 * Returns the author as anchor for a given cover.
+	 */
+	private function getCategoryAuthor($cover) {
+		return '<a href='
+		. static::URI . $cover->find('span.author a', 0)->href
+		. '>'
+		. $cover->find('span.author a', 0)->innertext
+		. '</a>';
+	}
+}
--- a/bridges/IsoHuntBridge.php
+++ b/bridges/IsoHuntBridge.php
@@ -1,468 +0,0 @@
-<?php
-class IsoHuntBridge extends BridgeAbstract{
-  const MAINTAINER = 'logmanoriginal';
-  const NAME = 'isoHunt Bridge';
-  const URI = 'https://isohunt.to/';
-  const CACHE_TIMEOUT = 300; //5min
-  const DESCRIPTION = 'Returns the latest results by category or search result';
-
-  const PARAMETERS = array(
-    /*
-     * Get feeds for one of the "latest" categories
-     * Notice: The categories "News" and "Top Searches" are received from the main page
-     * Elements are sorted by name ascending!
-     */
-    'By "Latest" category' => array(
-      'latest_category'=>array(
-        'name'=>'Latest category',
-        'type'=>'list',
-        'required'=>true,
-        'title'=>'Select your category',
-        'defaultValue'=>'news',
-        'values'=>array(
-          'Hot Torrents'=>'hot_torrents',
-          'News'=>'news',
-          'Releases'=>'releases',
-          'Torrents'=>'torrents'
-        )
-      )
-    ),
-
-    /*
-     * Get feeds for one of the "torrent" categories
-     * Make sure to add new categories also to get_torrent_category_index($)!
-     * Elements are sorted by name ascending!
-     */
-    'By "Torrent" category' => array(
-      'torrent_category'=>array(
-        'name'=>'Torrent category',
-        'type'=>'list',
-        'required'=>true,
-        'title'=>'Select your category',
-        'defaultValue'=>'anime',
-        'values'=>array(
-          'Adult'=>'adult',
-          'Anime'=>'anime',
-          'Books'=>'books',
-          'Games'=>'games',
-          'Movies'=>'movies',
-          'Music'=>'music',
-          'Other'=>'other',
-          'Series & TV'=>'series_tv',
-          'Software'=>'software'
-        )
-      ),
-      'torrent_popularity'=>array(
-        'name'=>'Sort by popularity',
-        'type'=>'checkbox',
-        'title'=>'Activate to receive results by popularity'
-      )
-    ),
-
-    /*
-     * Get feeds for a specific search request
-     */
-    'Search torrent by name' => array(
-      'search_name'=>array(
-        'name'=>'Name',
-        'required'=>true,
-        'title'=>'Insert your search query',
-        'exampleValue'=>'Bridge'
-      ),
-      'search_category'=>array(
-        'name'=>'Category',
-        'type'=>'list',
-        'title'=>'Select your category',
-        'defaultValue'=>'all',
-        'values'=>array(
-          'Adult'=>'adult',
-          'All'=>'all',
-          'Anime'=>'anime',
-          'Books'=>'books',
-          'Games'=>'games',
-          'Movies'=>'movies',
-          'Music'=>'music',
-          'Other'=>'other',
-          'Series & TV'=>'series_tv',
-          'Software'=>'software'
-        )
-      )
-    )
-  );
-
-  public  function getURI(){
-    $uri=self::URI;
-    switch($this->queriedContext){
-    case 'By "Latest" category':
-      switch($this->getInput('latest_category')){
-      case 'hot_torrents':
-        $uri .= 'statistic/hot/torrents';
-        break;
-      case 'news':
-        break;
-      case 'releases':
-        $uri .= 'releases.php';
-        break;
-      case 'torrents':
-        $uri .= 'latest.php';
-        break;
-      }
-      break;
-
-    case 'By "Torrent" category':
-      $uri .= $this->build_category_uri(
-        $this->getInput('torrent_category'),
-        $this->getInput('torrent_popularity')
-      );
-      break;
-
-    case 'Search torrent by name':
-      $category=$this->getInput('search_category');
-      $uri .= $this->build_category_uri($category);
-      if($category!=='movies')
-        $uri .= '&ihq=' . urlencode($this->getInput('search_name'));
-      break;
-    }
-
-    return $uri;
-  }
-
-  public  function getName(){
-    switch($this->queriedContext){
-    case 'By "Latest" category':
-      $categoryName =
-        array_search(
-          $this->getInput('latest_category'),
-          self::PARAMETERS['By "Latest" category']['latest_category']['values']
-        );
-      $name = 'Latest '.$categoryName.' - ' . self::NAME;
-      break;
-
-    case 'By "Torrent" category':
-      $categoryName =
-        array_search(
-          $this->getInput('torrent_category'),
-          self::PARAMETERS['By "Torrent" category']['torrent_category']['values']
-        );
-      $name = 'Category: ' . $categoryName . ' - ' . self::NAME;
-      break;
-
-    case 'Search torrent by name':
-      $categoryName =
-        array_search(
-          $this->getInput('search_category'),
-          self::PARAMETERS['Search torrent by name']['search_category']['values']
-        );
-      $name = 'Search: "' . $this->getInput('search_name') . '" in category: ' . $categoryName . ' - ' . self::NAME;
-      break;
-    }
-
-    return $name;
-  }
-
-
-  public function collectData(){
-    $html = $this->load_html($this->getURI());
-
-    switch($this->queriedContext){
-    case 'By "Latest" category':
-      switch($this->getInput('latest_category')){
-      case 'hot_torrents':
-        $this->get_latest_hot_torrents($html);
-        break;
-      case 'news':
-        $this->get_latest_news($html);
-        break;
-      case 'releases':
-      case 'torrents':
-        $this->get_latest_torrents($html);
-        break;
-      }
-      break;
-
-    case 'By "Torrent" category':
-      if($this->getInput('torrent_category') === 'movies'){
-        // This one is special (content wise)
-        $this->get_movie_torrents($html);
-      }else{
-        $this->get_latest_torrents($html);
-      }
-      break;
-
-    case 'Search torrent by name':
-      if( $this->getInput('search_category') === 'movies'){
-        // This one is special (content wise)
-        $this->get_movie_torrents($html);
-      } else {
-        $this->get_latest_torrents($html);
-      }
-      break;
-    }
-  }
-
-  #region Helper functions for "Movie Torrents"
-
-  private function get_movie_torrents($html){
-    $container = $html->find('div#w0', 0);
-    if(!$container)
-      returnServerError('Unable to find torrent container!');
-
-    $torrents = $container->find('article');
-    if(!$torrents)
-      returnServerError('Unable to find torrents!');
-
-    foreach($torrents as $torrent){
-
-      $anchor = $torrent->find('a', 0);
-      if(!$anchor)
-        returnServerError('Unable to find anchor!');
-
-      $date = $torrent->find('small', 0);
-      if(!$date)
-        returnServerError('Unable to find date!');
-
-      $item = array();
-
-      $item['uri'] = $this->fix_relative_uri($anchor->href);
-      $item['title'] = $anchor->title;
-      // $item['author'] =
-      $item['timestamp'] = strtotime($date->plaintext);
-      $item['content'] = $this->fix_relative_uri($torrent->innertext);
-
-      $this->items[] = $item;
-    }
-  }
-
-  #endregion
-
-  #region Helper functions for "Latest Hot Torrents"
-
-  private function get_latest_hot_torrents($html){
-    $container = $html->find('div#serps', 0);
-    if(!$container)
-      returnServerError('Unable to find torrent container!');
-
-    $torrents = $container->find('tr');
-    if(!$torrents)
-      returnServerError('Unable to find torrents!');
-
-    // Remove first element (header row)
-    $torrents = array_slice($torrents, 1);
-
-    foreach($torrents as $torrent){
-
-      $cell = $torrent->find('td', 0);
-      if(!$cell)
-        returnServerError('Unable to find cell!');
-
-      $element = $cell->find('a', 0);
-      if(!$element)
-        returnServerError('Unable to find element!');
-
-      $item = array();
-
-      $item['uri'] = $element->href;
-      $item['title'] = $element->plaintext;
-      // $item['author'] =
-      // $item['timestamp'] =
-      // $item['content'] =
-
-      $this->items[] = $item;
-    }
-  }
-
-  #endregion
-
-  #region Helper functions for "Latest News"
-
-  private function get_latest_news($html){
-    $container = $html->find('div#postcontainer', 0);
-    if(!$container)
-      returnServerError('Unable to find post container!');
-
-    $posts = $container->find('div.index-post');
-    if(!$posts)
-      returnServerError('Unable to find posts!');
-
-    foreach($posts as $post){
-      $item = array();
-
-      $item['uri'] = $this->latest_news_extract_uri($post);
-      $item['title'] = $this->latest_news_extract_title($post);
-      $item['author'] = $this->latest_news_extract_author($post);
-      $item['timestamp'] = $this->latest_news_extract_timestamp($post);
-      $item['content'] = $this->latest_news_extract_content($post);
-
-      $this->items[] = $item;
-    }
-  }
-
-  private function latest_news_extract_author($post){
-    $author = $post->find('small', 0);
-    if(!$author)
-      returnServerError('Unable to find author!');
-
-    // The author is hidden within a string like: 'Posted by {author} on {date}'
-    preg_match('/Posted\sby\s(.*)\son/i', $author->innertext, $matches);
-
-    return $matches[1];
-  }
-
-  private function latest_news_extract_timestamp($post){
-    $date = $post->find('small', 0);
-    if(!$date)
-      returnServerError('Unable to find date!');
-
-    // The date is hidden within a string like: 'Posted by {author} on {date}'
-    preg_match('/Posted\sby\s.*\son\s(.*)/i', $date->innertext, $matches);
-
-    $timestamp = strtotime($matches[1]);
-
-    // Make sure date is not in the future (dates are given like 'Nov. 20' without year)
-    if($timestamp > time()){
-      $timestamp = strtotime('-1 year', $timestamp);
-    }
-
-    return $timestamp;
-  }
-
-  private function latest_news_extract_title($post){
-    $title = $post->find('a', 0);
-    if(!$title)
-      returnServerError('Unable to find title!');
-
-    return $title->plaintext;
-  }
-
-  private function latest_news_extract_uri($post){
-    $uri = $post->find('a', 0);
-    if(!$uri)
-      returnServerError('Unable to find uri!');
-
-    return $uri->href;
-  }
-
-  private function latest_news_extract_content($post){
-    $content = $post->find('div', 0);
-    if(!$content)
-      returnServerError('Unable to find content!');
-
-    // Remove <h2>...</h2> (title)
-    foreach($content->find('h2') as $element){
-      $element->outertext = '';
-    }
-
-    // Remove <small>...</small> (author)
-    foreach($content->find('small') as $element){
-      $element->outertext = '';
-    }
-
-    return $content->innertext;
-  }
-
-  #endregion
-
-  #region Helper functions for "Latest Torrents", "Latest Releases" and "Torrent Category"
-
-  private function get_latest_torrents($html){
-    $container = $html->find('div#serps', 0);
-    if(!$container)
-      returnServerError('Unable to find torrent container!');
-
-    $torrents = $container->find('tr[data-key]');
-    if(!$torrents)
-      returnServerError('Unable to find torrents!');
-
-    foreach($torrents as $torrent){
-      $item = array();
-
-      $item['uri'] = $this->latest_torrents_extract_uri($torrent);
-      $item['title'] = $this->latest_torrents_extract_title($torrent);
-      $item['author'] = $this->latest_torrents_extract_author($torrent);
-      $item['timestamp'] = $this->latest_torrents_extract_timestamp($torrent);
-      $item['content'] = ''; // There is no valuable content
-
-      $this->items[] = $item;
-    }
-  }
-
-  private function latest_torrents_extract_title($torrent){
-    $cell = $torrent->find('td.title-row', 0);
-    if(!$cell)
-      returnServerError('Unable to find title cell!');
-
-    $title = $cell->find('span', 0);
-    if(!$title)
-      returnServerError('Unable to find title!');
-
-    return $title->plaintext;
-  }
-
-  private function latest_torrents_extract_uri($torrent){
-    $cell = $torrent->find('td.title-row', 0);
-    if(!$cell)
-      returnServerError('Unable to find title cell!');
-
-    $uri = $cell->find('a', 0);
-    if(!$uri)
-      returnServerError('Unable to find uri!');
-
-    return $this->fix_relative_uri($uri->href);
-  }
-
-  private function latest_torrents_extract_author($torrent){
-    $cell = $torrent->find('td.user-row', 0);
-    if(!$cell)
-      return; // No author
-
-    $user = $cell->find('a', 0);
-    if(!$user)
-      returnServerError('Unable to find user!');
-
-    return $user->plaintext;
-  }
-
-  private function latest_torrents_extract_timestamp($torrent){
-    $cell = $torrent->find('td.date-row', 0);
-    if(!$cell)
-      returnServerError('Unable to find date cell!');
-
-    return strtotime('-' . $cell->plaintext, time());
-  }
-
-  #endregion
-
-  #region Generic helper functions
-
-  private function load_html($uri){
-    $html = getSimpleHTMLDOM($uri);
-    if(!$html)
-      returnServerError('Unable to load ' . $uri . '!');
-
-    return $html;
-  }
-
-  private function fix_relative_uri($uri){
-    return preg_replace('/\//i', self::URI, $uri, 1);
-  }
-
-  private function build_category_uri($category, $order_popularity = false){
-    switch($category){
-    case 'anime': $index = 1; break;
-    case 'software' : $index = 2; break;
-    case 'games' : $index = 3; break;
-    case 'adult' : $index = 4; break;
-    case 'movies' : $index = 5; break;
-    case 'music' : $index = 6; break;
-    case 'other' : $index = 7; break;
-    case 'series_tv' : $index = 8; break;
-    case 'books': $index = 9; break;
-    case 'all':
-    default: $index = 0; break;
-    }
-
-    return 'torrents/?iht=' . $index . '&ihs=' . ($order_popularity ? 1 : 0) . '&age=0';
-  }
-
-  #endregion
-}
--- a/bridges/JapanExpoBridge.php
+++ b/bridges/JapanExpoBridge.php
@@ -1,89 +1,106 @@
 <?php
 class JapanExpoBridge extends BridgeAbstract {

-    const MAINTAINER = 'Ginko';
-    const NAME = 'Japan Expo Actualités';
-    const URI = 'http://www.japan-expo-paris.com/fr/actualites';
-    const CACHE_TIMEOUT = 14400; // 4h
-    const DESCRIPTION = 'Returns most recent entries from Japan Expo actualités.';
-    const PARAMETERS = array( array(
-        'mode'=>array(
-            'name'=>'Show full contents',
-            'type'=>'checkbox',
-        )
-    ));
+	const MAINTAINER = 'Ginko';
+	const NAME = 'Japan Expo Actualités';
+	const URI = 'https://www.japan-expo-paris.com/fr/actualites';
+	const CACHE_TIMEOUT = 14400; // 4h
+	const DESCRIPTION = 'Returns most recent entries from Japan Expo actualités.';
+	const PARAMETERS = array( array(
+		'mode' => array(
+			'name' => 'Show full contents',
+			'type' => 'checkbox',
+		)
+	));

-    public function collectData(){
+	public function getIcon() {
+		return 'https://s.japan-expo.com/katana/images/JES073/favicons/paris.png';
+	}

-        function french_pubdate_to_timestamp($date_to_parse) {
-            return strtotime(
-                strtr(
-                    strtolower(str_replace('Publié le ', '', $date_to_parse)),
-                    array(
-                        'janvier'   => 'jan',
-                        'février'   => 'feb',
-                        'mars'      => 'march',
-                        'avril'     => 'apr',
-                        'mai'       => 'may',
-                        'juin'      => 'jun',
-                        'juillet'   => 'jul',
-                        'août'      => 'aug',
-                        'septembre' => 'sep',
-                        'octobre'   => 'oct',
-                        'novembre'  => 'nov',
-                        'décembre'  => 'dec'
-                    )
-                )
-            );
-        }
+	public function collectData(){

-        $convert_article_images = function ($matches) {
-            if (is_array($matches) && count($matches) > 1) {
-                return '<img src="'.$matches[1].'" />';
-            }
-        };
+		function frenchPubDateToTimestamp($date_to_parse) {
+			return strtotime(
+				strtr(
+					strtolower(str_replace('Publié le ', '', $date_to_parse)),
+					array(
+						'janvier' => 'jan',
+						'février' => 'feb',
+						'mars' => 'march',
+						'avril' => 'apr',
+						'mai' => 'may',
+						'juin' => 'jun',
+						'juillet' => 'jul',
+						'août' => 'aug',
+						'septembre' => 'sep',
+						'octobre' => 'oct',
+						'novembre' => 'nov',
+						'décembre' => 'dec'
+					)
+				)
+			);
+		}

-        $html = getSimpleHTMLDOM(self::URI)
-          or returnServerError('Could not request JapanExpo: '.self::URI);
-        $fullcontent = $this->getInput('mode');
-        $count = 0;
+		$convert_article_images = function($matches){
+			if(is_array($matches) && count($matches) > 1) {
+				return '<img src="' . $matches[1] . '" />';
+			}
+		};

-        foreach ($html->find('a._tile2') as $element) {
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request JapanExpo: ' . self::URI);
+		$fullcontent = $this->getInput('mode');
+		$count = 0;

-            $url = $element->href;
-            $thumbnail = 'http://s.japan-expo.com/katana/images/JES049/paris.png';
-            preg_match('/url\(([^)]+)\)/', $element->find('img.rspvimgset', 0)->style, $img_search_result);
-            if (count($img_search_result) >= 2)
-                $thumbnail = trim($img_search_result[1], "'");
+		foreach($html->find('a._tile2') as $element) {

-            if ($fullcontent) {
-                if ($count >= 5) {
-                  break;
-                }
+			$url = $element->href;
+			$thumbnail = 'https://s.japan-expo.com/katana/images/JES049/paris.png';
+			preg_match('/url\(([^)]+)\)/', $element->find('img.rspvimgset', 0)->style, $img_search_result);

-                $article_html = getSimpleHTMLDOMCached('Could not request JapanExpo: '.$url);
-                $header = $article_html->find('header.pageHeadBox', 0);
-                $timestamp = strtotime($header->find('time', 0)->datetime);
-                $title_html = $header->find('div.section', 0)->next_sibling();
-                $title = $title_html->plaintext;
-                $headings = $title_html->next_sibling()->outertext;
-                $article = $article_html->find('div.content', 0)->innertext;
-                $article = preg_replace_callback('/<img [^>]+ style="[^\(]+\(\'([^\']+)\'[^>]+>/i', $convert_article_images, $article);
-                $content = $headings.$article;
-            } else {
-                $date_text = $element->find('span.date', 0)->plaintext;
-                $timestamp = french_pubdate_to_timestamp($date_text);
-                $title = trim($element->find('span._title', 0)->plaintext);
-                $content = '<img src="'.$thumbnail.'"></img><br />'.$date_text.'<br /><a href="'.$url.'">Lire l\'article</a>';
-            }
+			if(count($img_search_result) >= 2)
+				$thumbnail = trim($img_search_result[1], "'");

-            $item = array();
-            $item['uri'] = $url;
-            $item['title'] = $title;
-            $item['timestamp'] = $timestamp;
-            $item['content'] = $content;
-            $this->items[] = $item;
-            $count++;
-        }
-    }
+			if($fullcontent) {
+				if($count >= 5) {
+					break;
+				}
+
+				$article_html = getSimpleHTMLDOMCached($url)
+				or returnServerError('Could not request JapanExpo: ' . $url);
+				$header = $article_html->find('header.pageHeadBox', 0);
+				$timestamp = strtotime($header->find('time', 0)->datetime);
+				$title_html = $header->find('div.section', 0)->next_sibling();
+				$title = $title_html->plaintext;
+				$headings = $title_html->next_sibling()->outertext;
+				$article = $article_html->find('div.content', 0)->innertext;
+				$article = preg_replace_callback(
+					'/<img [^>]+ style="[^\(]+\(\'([^\']+)\'[^>]+>/i',
+					$convert_article_images,
+					$article);
+
+				$content = $headings . $article;
+			} else {
+				$date_text = $element->find('span.date', 0)->plaintext;
+				$timestamp = frenchPubDateToTimestamp($date_text);
+				$title = trim($element->find('span._title', 0)->plaintext);
+				$content = '<img src="'
+				. $thumbnail
+				. '"></img><br />'
+				. $date_text
+				. '<br /><a href="'
+				. $url
+				. '">Lire l\'article</a>';
+			}
+
+			$item = array();
+			$item['uri'] = $url;
+			$item['title'] = $title;
+			$item['timestamp'] = $timestamp;
+			$item['enclosures'] = array($thumbnail);
+			$item['content'] = $content;
+			$this->items[] = $item;
+			$count++;
+		}
+	}
 }
--- a/Show More
+++ b/Show More