Merge pull request #1267 from wallabag/dev1.9.1

1.9.1

143 files changed, 1194 insertions, 232 deletions

diff --git a/inc/3rdparty/Session.class.php b/inc/3rdparty/Session.class.php
index b56e4c54..6ff73a76 100644
--- a/inc/3rdparty/Session.class.php
+++ b/inc/3rdparty/Session.class.php
@@ -51,9 +51,9 @@ class Session
     public static function init($longlastingsession = false)
     {
         //check if session name is correct
-        if ( (session_id() && !empty(self::$sessionName) && session_name()!=self::$sessionName) || $longlastingsession ) {
+        /*if ( (session_id() && !empty(self::$sessionName) && session_name()!=self::$sessionName) || $longlastingsession ) {
             session_destroy();
-        }
+        }*/
 
         // Force cookie path (but do not change lifetime)
         $cookie = session_get_cookie_params();
diff --git a/inc/3rdparty/site_config/standard/20min.ch.txt b/inc/3rdparty/site_config/standard/20min.ch.txt
new file mode 100755
index 00000000..cd8e3fc0
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/20min.ch.txt
@@ -0,0 +1,24 @@
+# Author: cirnod@gmail.com
+
+tidy: no
+prune: no
+
+title: //h1
+date: /html/body/div[3]/div[1]/div[6]/div/div[1]/div[2]/div[1]/div/p
+body: //div[@class='published clearfix'] | //div[@class='story_titles']/h3 | //div[@class='story_text']
+
+# General Cleanup
+strip_id_or_class: info_panel 
+strip_id_or_class: info_poll 
+strip_id_or_class: teaser 
+strip_id_or_class: panelbox
+strip_id_or_class: polls
+strip_id_or_class: warning 
+strip_id_or_class: vplaceholder
+
+# visual removal only -> complete removal doesn't work
+replace_string(Print</a>): </a>
+
+# Try yourself
+test_url: http://www.20min.ch/wissen/news/story/31588952
+test_url: http://www.20min.ch/digital/dossier/apple/story/So-einfach-laesst-sich-das-iPhone-6-Plus-verbiegen-24651169
diff --git a/inc/3rdparty/site_config/standard/24.ae.txt b/inc/3rdparty/site_config/standard/24.ae.txt
new file mode 100755
index 00000000..6e515076
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/24.ae.txt
@@ -0,0 +1,8 @@
+title: //div[@id='DivTitle']
+body: //div[@id='divImages' or @id='Divkhabarcontent']
+author: //div[@id='DivAuthor']
+
+prune: no
+
+test_url: http://24.ae/article.aspx?ArticleId=123304
+test_url: http://24.ae/rss.aspx?pageId=30
diff --git a/inc/3rdparty/site_config/standard/9gag.com.txt b/inc/3rdparty/site_config/standard/9gag.com.txt
new file mode 100755
index 00000000..4ebb62ad
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/9gag.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2F9gag.com%2Fgag%2FaDwQnO7
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' badge-post-container ')]
+test_url: http://9gag.com/gag/aDwQnO7
diff --git a/inc/3rdparty/site_config/standard/ad.nl.txt b/inc/3rdparty/site_config/standard/ad.nl.txt
new file mode 100755
index 00000000..422faa57
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/ad.nl.txt
@@ -0,0 +1,7 @@
+#bypass cookie check
+single_page_link: //a[contains(@href, '/acceptCookieCheck.do?url=')]
+
+test_url: http://www.ad.nl/ad/nl/10444/Offside/article/detail/4043834/2015/05/31/Dani-Alves-voetbalt-met-drol-op-zijn-hoofd.dhtml
+test_contains: De nieuwe coupe van Alves
+
+test_url: http://www.ad.nl/digitaal/rss.xml
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/albayan.ae.txt b/inc/3rdparty/site_config/standard/albayan.ae.txt
index f6c093d2..d52700b3 100755
--- a/inc/3rdparty/site_config/standard/albayan.ae.txt
+++ b/inc/3rdparty/site_config/standard/albayan.ae.txt
@@ -1,5 +1,7 @@
 body: //div[@id='main-column']//div[@class='content']
 
+strip_id_or_class: social-buttons
+
 prune: no
 
 test_url: http://www.albayan.ae/across-the-uae/education/2013-08-29-1.1949645
diff --git a/inc/3rdparty/site_config/standard/androidpolice.com.txt b/inc/3rdparty/site_config/standard/androidpolice.com.txt
index 8f9b1a21..660f29d9 100755
--- a/inc/3rdparty/site_config/standard/androidpolice.com.txt
+++ b/inc/3rdparty/site_config/standard/androidpolice.com.txt
@@ -1,5 +1,6 @@
 body: //div[@class='post_content']
 date: //div[@class='date_day'] | div[@class='date_month']
+strip_id_or_class: author-box
+author: //h2[@class='author-box-heading']/a
 
 test_url: http://www.androidpolice.com/2014/03/30/music-boss-for-pebble-can-now-control-playback-and-volume-on-chromecast-content-from-your-smartwatch/
-
diff --git a/inc/3rdparty/site_config/standard/artofmanliness.com.txt b/inc/3rdparty/site_config/standard/artofmanliness.com.txt
new file mode 100755
index 00000000..b29ea0db
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/artofmanliness.com.txt
@@ -0,0 +1,6 @@
+parser: html5php
+date: //article/p[contains(@class, 'single-date')]
+author: //article/p[contains(@class, 'byline')]
+
+test_url: http://www.artofmanliness.com/2013/01/31/relationship-red-flags/
+test_contains: It seems that once we get close to a person
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/au.businessinsider.com.txt b/inc/3rdparty/site_config/standard/au.businessinsider.com.txt
new file mode 100755
index 00000000..46bcddf2
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/au.businessinsider.com.txt
@@ -0,0 +1,12 @@
+title://div[@class="sl-layout-post"]/h1
+body: //div[@id='content_post']
+strip: //div[contains(@class, "post-sidebar")]
+strip: //div[@id='related-links']
+strip: //img[@class='size_xlarge']
+author://div[@class="byline"]/a
+date://div[@class="byline"]/span[@class="date"]
+prune: no
+tidy: no
+
+
+test_url: http://www.businessinsider.com/microsoft-just-put-one-of-its-hardcore-technical-geniuses-on-xbox-2012-1
diff --git a/inc/3rdparty/site_config/standard/au.news.yahoo.com.txt b/inc/3rdparty/site_config/standard/au.news.yahoo.com.txt
new file mode 100755
index 00000000..8e84cbbb
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/au.news.yahoo.com.txt
@@ -0,0 +1,4 @@
+strip: //a[contains(text(), "RELATED:")]
+author: //div[@class="info"]//span[@class="association printer-source"]
+author: //div[@class="info"]//span[@class="stamp printer-date"]
+
diff --git a/inc/3rdparty/site_config/standard/bastamag.net.txt b/inc/3rdparty/site_config/standard/bastamag.net.txt
new file mode 100644
index 00000000..142c959c
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/bastamag.net.txt
@@ -0,0 +1,10 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.bastamag.net%2FEncadrement-des-loyers-pourquoi-Anne-Hidalgo-ferait-bien-de-visiter-Vienne-l
+
+body: //div[@id='content']//article
+
+strip_id_or_class: appel-soutien
+strip_id_or_class: liste dossiers-content
+
+test_url: http://www.bastamag.net/Encadrement-des-loyers-pourquoi-Anne-Hidalgo-ferait-bien-de-visiter-Vienne-l
diff --git a/inc/3rdparty/site_config/standard/bbc.co.uk.txt b/inc/3rdparty/site_config/standard/bbc.co.uk.txt
index bad77654..7bef73ad 100755
--- a/inc/3rdparty/site_config/standard/bbc.co.uk.txt
+++ b/inc/3rdparty/site_config/standard/bbc.co.uk.txt
@@ -30,6 +30,12 @@ strip: //div[contains(@class, 'comment-introduction')]
 strip: //div[contains(@class, 'share-tools')]
 strip: //div[@id='also-related-links']
 
+find_string: http://ichef.bbci.co.uk/news/200/
+replace_string: http://ichef.bbci.co.uk/news/624/
+
+find_string: http://ichef.bbci.co.uk/news/304/
+replace_string: http://ichef.bbci.co.uk/news/624/
+
 strip_id_or_class: share-help
 strip_id_or_class: comments_module
 
diff --git a/inc/3rdparty/site_config/standard/bbc.com.txt b/inc/3rdparty/site_config/standard/bbc.com.txt
index c04a683e..200dba63 100755
--- a/inc/3rdparty/site_config/standard/bbc.com.txt
+++ b/inc/3rdparty/site_config/standard/bbc.com.txt
@@ -33,6 +33,12 @@ strip: //div[@id='also-related-links']
 strip_id_or_class: share-help
 strip_id_or_class: comments_module
 
+find_string: http://ichef.bbci.co.uk/news/200/
+replace_string: http://ichef.bbci.co.uk/news/624/
+
+find_string: http://ichef.bbci.co.uk/news/304/
+replace_string: http://ichef.bbci.co.uk/news/624/
+
 replace_string(<noscript>): <div>
 replace_string(</noscript>): </div>
 
diff --git a/inc/3rdparty/site_config/standard/bearmetal.eu.txt b/inc/3rdparty/site_config/standard/bearmetal.eu.txt
new file mode 100644
index 00000000..44d34655
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/bearmetal.eu.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=https%3A%2F%2Fbearmetal.eu%2Ftheden%2Fits-not-about-you%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' entry-content ')]
+test_url: https://bearmetal.eu/theden/its-not-about-you/
diff --git a/inc/3rdparty/site_config/standard/blog.niqnutn.com.txt b/inc/3rdparty/site_config/standard/blog.niqnutn.com.txt
new file mode 100644
index 00000000..aa2f1865
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/blog.niqnutn.com.txt
@@ -0,0 +1,9 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fblog.niqnutn.com%2Farticle35%2Fsteganographie-l-art-de-dissimuler-un-message
+
+body: //article[contains(concat(' ',normalize-space(@class),' '),' article-content ')]//section
+
+strip_id_or_class: sommaire
+
+test_url: http://blog.niqnutn.com/article35/steganographie-l-art-de-dissimuler-un-message
diff --git a/inc/3rdparty/site_config/standard/blogs.msdn.com.txt b/inc/3rdparty/site_config/standard/blogs.msdn.com.txt
index b2ff8332..11b8d42d 100755
--- a/inc/3rdparty/site_config/standard/blogs.msdn.com.txt
+++ b/inc/3rdparty/site_config/standard/blogs.msdn.com.txt
@@ -1,6 +1,6 @@
 title: //h3[@class="post-name"]
 author: //span[@class="user-name"]
-date: //div[@class="post-date"]
+date: //div[@class="post-date"]/span[@class="value"]
 body: //div[@class="post-content user-defined-markup"]
 footnotes: no
-test_url: http://blogs.msdn.com/b/b8/archive/2011/10/04/designing-the-start-screen.aspx
\ No newline at end of file
+test_url: http://blogs.msdn.com/b/b8/archive/2011/10/04/designing-the-start-screen.aspx
diff --git a/inc/3rdparty/site_config/standard/brandeins.de.txt b/inc/3rdparty/site_config/standard/brandeins.de.txt
index 36aa2efa..be326346 100755
--- a/inc/3rdparty/site_config/standard/brandeins.de.txt
+++ b/inc/3rdparty/site_config/standard/brandeins.de.txt
@@ -1,7 +1,9 @@
-# set body
-body: //div[@id='theContent']
 
-# set title
-title: //div[@id='theContent']/h3
-strip: //div[@id='theContent']/h3
-test_url: http://www.brandeins.de/archiv/magazin/gegessen-wird-immer/artikel/hunger.html
\ No newline at end of file
+body: //div[@class="articleTeaser"] | //section[@class="contentSection"]
+
+strip: //section[@class="greenBox italic"]
+
+author: //div[@class="articleAuthor"]
+# no publish date on page (the articles are from a monthly periodical)
+
+test_url: http://www.brandeins.de/archiv/2015/fuehrung/ministry-group-mach-doch-mal-ne-ansage/
diff --git a/inc/3rdparty/site_config/standard/brokernews.com.au.txt b/inc/3rdparty/site_config/standard/brokernews.com.au.txt
new file mode 100755
index 00000000..814da38a
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/brokernews.com.au.txt
@@ -0,0 +1,2 @@
+author: //span[@itemprop="author"]
+date: //span[@itemprop="datePublished"]
diff --git a/inc/3rdparty/site_config/standard/business.time.com.txt b/inc/3rdparty/site_config/standard/business.time.com.txt
new file mode 100755
index 00000000..5502beae
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/business.time.com.txt
@@ -0,0 +1,17 @@
+# 2011-10-25 - carlo@... - Initial setup.
+
+single_page_link: //li[@class='print']/a/@href
+
+title: //h1
+author: //meta[@name="byline"]/@content
+date: //meta[@name="date"]/@content
+
+strip: //span[@class="see"]
+strip: //div[@class="byline"]
+strip: //div[@id="date2"]
+strip: //h1
+strip: //div[@class='post-rail-ad']
+strip: //div[@class='post-rail-content']
+strip: //aside[@class='post-rail']
+
+test_url: http://www.time.com/time/specials/packages/article/0,28804,2094921_2094923_2094924,00.html
diff --git a/inc/3rdparty/site_config/standard/captaineconomics.fr.txt b/inc/3rdparty/site_config/standard/captaineconomics.fr.txt
new file mode 100644
index 00000000..036e0281
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/captaineconomics.fr.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.captaineconomics.fr%2F-les-immigres-recemment-arrives-en-france-qui-sont-ils-insee
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' post_content ')]
+test_url: http://www.captaineconomics.fr/-les-immigres-recemment-arrives-en-france-qui-sont-ils-insee
diff --git a/inc/3rdparty/site_config/standard/choice.com.au.txt b/inc/3rdparty/site_config/standard/choice.com.au.txt
new file mode 100755
index 00000000..02714755
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/choice.com.au.txt
@@ -0,0 +1,4 @@
+
+body: //div[@id='content']//div[@id='mainBlogContentWrapper']//*[self::p or self::img or self::ul] | //div[@class='mainArticleIntro')]
+
+date: //span[@class='date']
diff --git a/inc/3rdparty/site_config/standard/cloudacademy.com.txt b/inc/3rdparty/site_config/standard/cloudacademy.com.txt
new file mode 100644
index 00000000..f5b67840
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/cloudacademy.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fcloudacademy.com%2Fblog%2Fberkshelf-manage-chef-cookbooks%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' entry-content ')]
+test_url: http://cloudacademy.com/blog/berkshelf-manage-chef-cookbooks/
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/cnet.com.au.txt b/inc/3rdparty/site_config/standard/cnet.com.au.txt
new file mode 100755
index 00000000..d5719d40
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/cnet.com.au.txt
@@ -0,0 +1,17 @@
+title: //meta[@property="og:title"]/@content
+body: //div[contains(@class, 'postBody')]
+date: //div[@id='nameAndTime']/time
+author: //div[@id='nameAndTime']/span[@class='author']
+
+strip_id_or_class: image-credit
+strip_id_or_class: noAutolink
+strip_id_or_class: related
+strip_id_or_class: cite
+
+prune: no
+tidy: no
+
+# early end
+replace_string(Download today's podcast</a>): Download today's podcast</a></div></body></html>
+
+test_url: http://www.cnet.com/8301-13952_1-57367607-81/the-404-981-where-the-world-is-a-vampire-podcast/
diff --git a/inc/3rdparty/site_config/standard/codebase64.org.txt b/inc/3rdparty/site_config/standard/codebase64.org.txt
new file mode 100644
index 00000000..d992d2f1
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/codebase64.org.txt
@@ -0,0 +1,9 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fcodebase64.org%2Fdoku.php%3Fid%3Dbase%3Ademo_coding_introduction
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' page ')]
+
+strip_id_or_class: dw__toc
+
+test_url: http://codebase64.org/doku.php?id=base:demo_coding_introduction
diff --git a/inc/3rdparty/site_config/standard/computerbase.de.txt b/inc/3rdparty/site_config/standard/computerbase.de.txt
index 5973c50b..214fcceb 100755
--- a/inc/3rdparty/site_config/standard/computerbase.de.txt
+++ b/inc/3rdparty/site_config/standard/computerbase.de.txt
@@ -2,7 +2,7 @@ title://h1
 
 author://div[@id="news-meta"]/a
 
-body://*[@id="main"]/div[1]
+body: //div[contains(@class, 'text-content')]
 
 strip://*[@id="main"]/div[2]
 strip://*[@id="main"]/div[3]
@@ -15,4 +15,4 @@ strip://img
 
 #figures are not displayed in instapaper...
 strip://figure | //figcaption
-test_url: http://www.computerbase.de/news/2012-06/verbraucherzentrale-mahnt-blizzard-fuer-diablo-3-ab/
\ No newline at end of file
+test_url: http://www.computerbase.de/news/2012-06/verbraucherzentrale-mahnt-blizzard-fuer-diablo-3-ab/
diff --git a/inc/3rdparty/site_config/standard/contrepoints.org.txt b/inc/3rdparty/site_config/standard/contrepoints.org.txt
new file mode 100755
index 00000000..8a6a1250
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/contrepoints.org.txt
@@ -0,0 +1,21 @@
+# Contrepoints.org
+# As of 2015-04, it's a wordpress-powered website.
+
+title: //h1[contains(concat(' ',normalize-space(@class),' '),' page-title ')]//span[contains(concat(' ',normalize-space(@class),' '),' inner-text ')]
+date: //time[contains(concat(' ',normalize-space(@class),' '),' art-date ')]
+author: //h1[contains(concat(' ',normalize-space(@class),' '),' author-name ')]
+body: //article[contains(concat(' ',normalize-space(@class),' '),' plain-art ')]
+
+# no toolbar, meta, etc, but misses excerpt
+# body: //div[contains(concat(' ',normalize-space(@class),' '),' entry ')]
+
+# Thus, we need to strip useless elements from the "plain-art"
+strip: //div[contains(concat(' ',normalize-space(@class),' '),' plain-post-topbar ')]
+strip: //div[contains(concat(' ',normalize-space(@class),' '),' single-type-block ')]
+strip: //header[contains(concat(' ',normalize-space(@class),' '),' entry-header ')]
+
+# And no pruning is needed because we stripped unwanted elements.
+prune: no
+
+test_url: http://www.contrepoints.org/2015/04/25/205709-leconomie-selon-ray-dalio
+test_url: http://www.contrepoints.org/2015/04/25/205734-huile-et-gaz-de-schiste-revolution-durable
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/cooper.com.txt b/inc/3rdparty/site_config/standard/cooper.com.txt
index a4244097..fc156f7b 100755
--- a/inc/3rdparty/site_config/standard/cooper.com.txt
+++ b/inc/3rdparty/site_config/standard/cooper.com.txt
@@ -1,4 +1,4 @@
-body: //*[contains(@class,'body')]
+body: //div[contains(@class,'post-body')]
 date: //abbr[@class='published']
 
-test_url: http://www.cooper.com/journal/2012/08/2-weeks-left-to-win-your-way-to-the-woodstock-of-ux-coopers-ux-boot-camp.html/
\ No newline at end of file
+test_url: http://www.cooper.com/journal/2015/6/creating-personas
diff --git a/inc/3rdparty/site_config/standard/cwnp.com.txt b/inc/3rdparty/site_config/standard/cwnp.com.txt
new file mode 100755
index 00000000..169fdf84
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/cwnp.com.txt
@@ -0,0 +1,14 @@
+title: //div[@class='entry-pad']//h2
+body: //div[contains(concat(' ',normalize-space(@class),' '),' entry-pad ')]
+strip: //h1
+strip: //p
+strip: //h2
+strip: //div[@class='clear']
+
+prune: no
+tidy: no
+
+autodetect_on_failure: no
+
+test_url: https://www.cwnp.com/wotd.php
+test_url: https://www.cwnp.com/qotd.php
diff --git a/inc/3rdparty/site_config/standard/cyrille-borne.com.txt b/inc/3rdparty/site_config/standard/cyrille-borne.com.txt
new file mode 100644
index 00000000..7b41aa0b
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/cyrille-borne.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.cyrille-borne.com%2Farticle511%2Fun-an-de-zte-open-c-plus-tard
+
+body: //article//section
+test_url: http://www.cyrille-borne.com/article511/un-an-de-zte-open-c-plus-tard
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/dailymail.co.uk.txt b/inc/3rdparty/site_config/standard/dailymail.co.uk.txt
index cd29a4d4..8535b19f 100755
--- a/inc/3rdparty/site_config/standard/dailymail.co.uk.txt
+++ b/inc/3rdparty/site_config/standard/dailymail.co.uk.txt
@@ -7,6 +7,15 @@ strip_id_or_class: googleAds
 strip_id_or_class: digg-button
 strip_id_or_class: article-icon-links-container
 strip_id_or_class: clickToEnlarge
+strip_id_or_class: articleIconLinksContainer
+strip_id_or_class: related-carousel
+strip_id_or_class: reader-comments
+strip_id_or_class: most-watched
+strip_id_or_class: most-read
+
+find_string:blkBorder img-share
+replace_string: nothing
+
 tidy: no
 
 test_url: http://www.dailymail.co.uk/news/article-1375423/Royal-wedding-Texan-billionaire-Joe-Albritton-invited-Prince-Charles.html
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/dailytelegraph.com.au.txt b/inc/3rdparty/site_config/standard/dailytelegraph.com.au.txt
new file mode 100755
index 00000000..571e8111
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/dailytelegraph.com.au.txt
@@ -0,0 +1,5 @@
+title: //h1[@class="heading"]
+author: //cite[@class='author']
+date: //li[contains(@class, 'date-and-time')]
+
+
diff --git a/inc/3rdparty/site_config/standard/deadspin.com.txt b/inc/3rdparty/site_config/standard/deadspin.com.txt
new file mode 100755
index 00000000..e6ca16ae
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/deadspin.com.txt
@@ -0,0 +1 @@
+http_header(user-agent): PHP/5.3
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/derbund.ch.txt b/inc/3rdparty/site_config/standard/derbund.ch.txt
new file mode 100755
index 00000000..1363eff6
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/derbund.ch.txt
@@ -0,0 +1,13 @@
+# Author: cirnod@gmail.com
+
+tidy: no
+prune: no
+
+body: //div[@id="article"]/h3 | //*[@id="mainContent"]
+
+# General Cleanup
+#strip_id_or_class: info_panel 
+
+
+# Try yourself
+test_url: http://www.derbund.ch/bern/nachrichten/Fossilienforscher-stehen-auf-Heavy-Metal/story/20919522
diff --git a/inc/3rdparty/site_config/standard/des-livres-pour-changer-de-vie.fr.txt b/inc/3rdparty/site_config/standard/des-livres-pour-changer-de-vie.fr.txt
new file mode 100644
index 00000000..56b0ea27
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/des-livres-pour-changer-de-vie.fr.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.des-livres-pour-changer-de-vie.fr%2Fbit-literacy-2%2F
+
+body: //div[@id='getsocialmain']
+test_url: http://www.des-livres-pour-changer-de-vie.fr/bit-literacy-2/
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/designbuildsource.com.au.txt b/inc/3rdparty/site_config/standard/designbuildsource.com.au.txt
new file mode 100755
index 00000000..93d3507e
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/designbuildsource.com.au.txt
@@ -0,0 +1,2 @@
+date: substring-after(//p[@class='post_date'], 'on')
+
diff --git a/inc/3rdparty/site_config/standard/dilbert.com.txt b/inc/3rdparty/site_config/standard/dilbert.com.txt
index 85cc78e5..b8788553 100755
--- a/inc/3rdparty/site_config/standard/dilbert.com.txt
+++ b/inc/3rdparty/site_config/standard/dilbert.com.txt
@@ -1,11 +1,9 @@
-#title: substring(substring-after(//title, ':'), 1, string-length(substring-after(//title, ':')) - 10)
-title: //div[contains(@class, 'SB_Title')]//a
-body: //div[contains(@class, 'STR_Image')]
-body: //*[contains(@class, 'SB_Content')]
+title: //a[@class="post-title"]/text()
+title: //meta[@name="twitter:title"]/@content
+body: //img[@class="img-responsive img-comic"]
 author: string('Scott Adams')
-date: //*[contains(@class, 'SB_Detail')]/text()[1]
-
+date: //meta[@property="article:publish_date"]/@content
 
 test_url: http://dilbert.com/blog/entry/death_by_hypnosis_or_not/
 test_url: http://dilbert.com/strips/comic/2013-10-22
-test_url: http://feed.dilbert.com/dilbert/daily_strip
\ No newline at end of file
+test_url: http://feed.dilbert.com/dilbert/daily_strip
diff --git a/inc/3rdparty/site_config/standard/dn.se.txt b/inc/3rdparty/site_config/standard/dn.se.txt
index 5283a0cd..a2ad609b 100755
--- a/inc/3rdparty/site_config/standard/dn.se.txt
+++ b/inc/3rdparty/site_config/standard/dn.se.txt
@@ -15,6 +15,9 @@ strip_id_or_class: hook
 strip_id_or_class: right
 strip_id_or_class: footer
 
+strip_id_or_class: ad-head
+strip_id_or_class: atc-share-title
+
 # Other news
 strip: //div[@id="mirrors"]
 
@@ -25,4 +28,5 @@ author: //div[@id="byline"]/div/p/strong
 date: substring(substring-after(//p[@class="published"], 'Publicerad '), 0, 11)
 
 test_url: http://www.dn.se/nyheter/varlden/landade-flygplan-mitt-i-villaomrade
-test_url: http://www.dn.se/m/rss/senaste-nytt
\ No newline at end of file
+test_contains: Ett tekniskt haveri tvingade
+test_url: http://www.dn.se/rss/senaste-nytt
diff --git a/inc/3rdparty/site_config/standard/economie.gouv.fr.txt b/inc/3rdparty/site_config/standard/economie.gouv.fr.txt
new file mode 100755
index 00000000..b0db03c1
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/economie.gouv.fr.txt
@@ -0,0 +1,4 @@
+body: //div[contains(@class, 'txtVisu')]
+prune: no
+
+test_url: http://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/Assurance
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/entwickler.de.txt b/inc/3rdparty/site_config/standard/entwickler.de.txt
new file mode 100755
index 00000000..316f3991
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/entwickler.de.txt
@@ -0,0 +1,7 @@
+title: //h1[@class="post-title"]
+body: //section[@class="article-content"]
+author: //div[@class="post-bottom-meta"]/span[@class="post-author"]
+date: //div[@class="post-date"]/time/@datetime
+
+test_url: https://entwickler.de/online/mobile-welt-offline-welt-was-der-offline-first-ansatz-fuer-app-entwickler-heisst-140602.html
+test_url: https://entwickler.de/online/development/plex-docker-joomla-165345.html
diff --git a/inc/3rdparty/site_config/standard/espacepolitique.revues.org.txt b/inc/3rdparty/site_config/standard/espacepolitique.revues.org.txt
new file mode 100644
index 00000000..c4acb26e
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/espacepolitique.revues.org.txt
@@ -0,0 +1,10 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fespacepolitique.revues.org%2F284
+
+body: //div[@id='text']
+
+strip_id_or_class: paranumber
+strip_id_or_class: go-top
+
+test_url: http://espacepolitique.revues.org/284
diff --git a/inc/3rdparty/site_config/standard/explosm.net.txt b/inc/3rdparty/site_config/standard/explosm.net.txt
new file mode 100755
index 00000000..f2d0a20f
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/explosm.net.txt
@@ -0,0 +1,4 @@
+body: //img[@id='main-comic']
+author: substring(//small[@class="author-credit-name"], 4)
+
+test_url: http://explosm.net/comics/3954/
diff --git a/inc/3rdparty/site_config/standard/facebook.com.txt b/inc/3rdparty/site_config/standard/facebook.com.txt
index 26d4f905..2641a0b2 100755
--- a/inc/3rdparty/site_config/standard/facebook.com.txt
+++ b/inc/3rdparty/site_config/standard/facebook.com.txt
@@ -1,12 +1,14 @@
 body: //div[@id='imagestage']
 body: //div[contains(@class, 'userContentWrapper')]
-
+body: //div[@id='m_story_permalink_view' or contains(@data-sigil, 'm-story-view')]
 strip_id_or_class: commentable
+strip: //div[contains(@data-sigil, 'm-mentions-expand')]
 
 prune: no
 tidy: no
 
-# single_page_link: replace(substring-after(//noscript//meta[@http-equiv="refresh"]/@content, 'URL='), "&amp;", "&")
+single_page_link: concat("https://m.", substring-after(//link[@rel="alternate" and @media="handheld"]/@href, "//www."))
+if_page_contains: //link[@rel="alternate" and @media="handheld"]
 
 test_url: https://www.facebook.com/permalink.php?story_fbid=10154584776550183&id=294468630182
 test_contains: holding an extraordinary session in Brussels this month
diff --git a/inc/3rdparty/site_config/standard/fastcompany.com.txt b/inc/3rdparty/site_config/standard/fastcompany.com.txt
index a6417237..bf8375ee 100755
--- a/inc/3rdparty/site_config/standard/fastcompany.com.txt
+++ b/inc/3rdparty/site_config/standard/fastcompany.com.txt
@@ -1,16 +1,20 @@
-title: //h1
-author: //h5[@class='byline']//a
-date: //h5[@class='date']
-body: //figure[@class='node-poster'] | //div[contains(@class, "node-content")]
-strip_id_or_class: article-top-wrapper
-strip_id_or_class: footer-message
-strip_id_or_class: print-logo
-strip: //cite
-strip://*[@class='timestamp']
-strip://div[@id='page_right']
-strip://section[@id='header_region']
-strip://h1[@class='node-title']
-strip://div[@class='node-submitted']
-strip_id_or_class: skipnav
+author: //div[@class='byline']//a
+date: //meta[@property='article:published_time']/@content
+body: //figure[@class='jumbotron'] | //div[@itemprop='body']
+
+prune: no
+
+#strip_id_or_class: article-top-wrapper
+#strip_id_or_class: footer-message
+#strip_id_or_class: print-logo
+#strip: //cite
+#strip://*[@class='timestamp']
+#strip://div[@id='page_right']
+#strip://section[@id='header_region']
+#strip://h1[@class='node-title']
+#strip://div[@class='node-submitted']
+#strip_id_or_class: skipnav
+
 test_url: http://www.fastcompany.com/3000226/link-between-quietness-and-productivity
-test_url: http://www.fastcompany.com/3003586/6-simple-rituals-reach-your-potential-every-day
\ No newline at end of file
+test_contains: Some of you may have tried to reach me this morning
+test_url: http://www.fastcompany.com/3003586/6-simple-rituals-reach-your-potential-every-day
diff --git a/inc/3rdparty/site_config/standard/fok.nl.txt b/inc/3rdparty/site_config/standard/fok.nl.txt
new file mode 100755
index 00000000..012f07df
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/fok.nl.txt
@@ -0,0 +1,4 @@
+# skip cookie warning
+single_page_link: concat(//form/@action, '?allowcookies=yes')
+
+test_url: http://fok.nl/687116
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/forsvaret.no.txt b/inc/3rdparty/site_config/standard/forsvaret.no.txt
index c1bd2bac..ec9e5807 100755
--- a/inc/3rdparty/site_config/standard/forsvaret.no.txt
+++ b/inc/3rdparty/site_config/standard/forsvaret.no.txt
@@ -6,4 +6,5 @@ strip: //div[contains(@class,"aside")]
 # remove some SharePoint webpart label junk
 strip: //div[@id="ctl00_PlaceHolderMain_ArticleLeadField_label"]
 strip: //div[@id="ctl00_PlaceHolderMain_PublishingPageContentField_label"]
-test_url: http://forsvaret.no/aktuelt/publisert/nyheter/Sider/F5-fly-til-Skedsmo.aspx
\ No newline at end of file
+test_url: https://forsvaret.no/aktuelt/historisk-medaljeutdeling
+test_contains: Samarbeidet med Marinen har vært en sann glede
diff --git a/inc/3rdparty/site_config/standard/france24.com.txt b/inc/3rdparty/site_config/standard/france24.com.txt
new file mode 100755
index 00000000..6356e048
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/france24.com.txt
@@ -0,0 +1,14 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.france24.com%2Fen%2F20150427-togo-gnassingbe-poised-extend-power-election%2F
+
+body: //article[contains(concat(' ',normalize-space(@class),' '),' article-long ')]//div[contains(concat(' ',normalize-space(@class),' '),' bd ')]
+title: //h1[@class="title"] 
+author://p[@class="author"]
+date://p[@class="modification"]
+
+find_string: <p class="modification">Latest update : 
+replace_string: <p class="modification">
+
+
+test_url: http://www.france24.com/en/20150427-togo-gnassingbe-poised-extend-power-election/
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/frankdenneman.nl.txt b/inc/3rdparty/site_config/standard/frankdenneman.nl.txt
new file mode 100644
index 00000000..c6011002
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/frankdenneman.nl.txt
@@ -0,0 +1,2 @@
+body: //*[(@class = "content")]
+test_url: http://frankdenneman.nl/
diff --git a/inc/3rdparty/site_config/standard/frontburner.dmagazine.com.txt b/inc/3rdparty/site_config/standard/frontburner.dmagazine.com.txt
new file mode 100644
index 00000000..73f44324
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/frontburner.dmagazine.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Ffrontburner.dmagazine.com%2F2015%2F04%2F23%2Fthe-barrett-brown-review-of-arts-and-letters-and-jail-a-sign-of-things-to-come%2F
+
+body: //div[@id='article-body']
+test_url: http://frontburner.dmagazine.com/2015/04/23/the-barrett-brown-review-of-arts-and-letters-and-jail-a-sign-of-things-to-come/
diff --git a/inc/3rdparty/site_config/standard/galwayindependent.com.txt b/inc/3rdparty/site_config/standard/galwayindependent.com.txt
new file mode 100755
index 00000000..d45b7acf
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/galwayindependent.com.txt
@@ -0,0 +1,3 @@
+title: //div[@class='leftCol']/h1
+
+prune: no
diff --git a/inc/3rdparty/site_config/standard/gameblog.fr.txt b/inc/3rdparty/site_config/standard/gameblog.fr.txt
index 73f8342f..227d39ac 100755
--- a/inc/3rdparty/site_config/standard/gameblog.fr.txt
+++ b/inc/3rdparty/site_config/standard/gameblog.fr.txt
@@ -1,5 +1,7 @@
 title: //meta[@property="og:title"]/@content
 body: //div[@id='GBTVPlayer'] | //div[contains(@class, 'col490')]
+author: //span[contains(concat(' ',normalize-space(@class),' '),' author ')]
+date: //header[@id='gbArticleHeader']//div//time/@datetime
 
 prune: no
 
@@ -7,4 +9,4 @@ strip_id_or_class: noprint
 strip: //div[@id='gbNewsTextContent']/following-sibling::*
 
 test_url: http://www.gameblog.fr/news/26330-les-sims-3-showtime-s-annonce-en-video
-test_url: http://www.gameblog.fr/news/26306-mise-a-jour-du-dashboard-de-la-xbox-360-disponible
\ No newline at end of file
+test_url: http://www.gameblog.fr/news/26306-mise-a-jour-du-dashboard-de-la-xbox-360-disponible
diff --git a/inc/3rdparty/site_config/standard/ganglia.info.txt b/inc/3rdparty/site_config/standard/ganglia.info.txt
new file mode 100644
index 00000000..2ae27b48
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/ganglia.info.txt
@@ -0,0 +1,2 @@
+body: //*[(@id = "mid")]
+test_url: http://ganglia.info/
diff --git a/inc/3rdparty/site_config/standard/gawker.com.txt b/inc/3rdparty/site_config/standard/gawker.com.txt
index 9bc5613a..27e4b4bb 100755
--- a/inc/3rdparty/site_config/standard/gawker.com.txt
+++ b/inc/3rdparty/site_config/standard/gawker.com.txt
@@ -3,4 +3,6 @@ body: //div[@class="post-body"]
 # Remove 'content is restricted'
 strip: //div[@id='agegate_IDHERE']
 
+http_header(user-agent): PHP/5.3
+
 test_url: http://gawker.com/#!5782070/russian-bomb-squad-successfully-defuses-sex-toy
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/getpocket.com.txt b/inc/3rdparty/site_config/standard/getpocket.com.txt
new file mode 100755
index 00000000..e6ca16ae
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/getpocket.com.txt
@@ -0,0 +1 @@
+http_header(user-agent): PHP/5.3
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/gist.github.com.txt b/inc/3rdparty/site_config/standard/gist.github.com.txt
index f11b7b42..90207862 100755
--- a/inc/3rdparty/site_config/standard/gist.github.com.txt
+++ b/inc/3rdparty/site_config/standard/gist.github.com.txt
@@ -1,4 +1,6 @@
+body: //div[@class="highlight"]/pre
 
-title: //div[contains(@class,'gist-description')]
-body: //div[contains(@class,'blob-wrapper')]
-test_url: https://gist.github.com/staltz/868e7e9bc2a7b8c1f754
+prune: no
+tidy: no
+
+test_url: https://gist.github.com/1258908
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/gizmodo.com.au.txt b/inc/3rdparty/site_config/standard/gizmodo.com.au.txt
new file mode 100755
index 00000000..9dbfc152
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/gizmodo.com.au.txt
@@ -0,0 +1,8 @@
+body: //div[@id='content_post' or @class="post-body" or contains(@class, 'illustration top')]
+author: (//cite//span[@class="plus-icon"])[1]
+date: //span[@class="date"]
+date: //time
+
+prune: no
+
+test_url: http://gizmodo.com/5880147/kuhn-rikon-improves-their-spice-grinder-with-grade-school-science
diff --git a/inc/3rdparty/site_config/standard/gizmodo.com.txt b/inc/3rdparty/site_config/standard/gizmodo.com.txt
index e73ec9d2..535041cd 100755
--- a/inc/3rdparty/site_config/standard/gizmodo.com.txt
+++ b/inc/3rdparty/site_config/standard/gizmodo.com.txt
@@ -6,6 +6,8 @@ date: //span[@class="date"]
 
 prune: no
 
+http_header(user-agent): PHP/5.3
+
 test_url: http://gizmodo.com/5880147/kuhn-rikon-improves-their-spice-grinder-with-grade-school-science
 test_url: http://gizmodo.com/what-van-goghs-paintings-would-look-like-if-they-came-874035680
 test_url: http://gizmodo.com/vip.xml
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/globalgrind.com.txt b/inc/3rdparty/site_config/standard/globalgrind.com.txt
new file mode 100755
index 00000000..e2f4e233
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/globalgrind.com.txt
@@ -0,0 +1,6 @@
+body: //div[contains(@class, 'content-body')]
+
+prune: no
+
+test_url: http://globalgrind.com/2015/04/26/listen-jeremih-featuring-chance-the-rapper-the-social-experiment-planes-remix-new-music/
+test_contains: The Chicago rapper has made a name for himself
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/gocomics.com.txt b/inc/3rdparty/site_config/standard/gocomics.com.txt
new file mode 100755
index 00000000..212c02d5
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/gocomics.com.txt
@@ -0,0 +1,5 @@
+body: //a[@class="photo"]/img[@class="strip"]
+author: //meta[@name="author"]/@content
+date: //meta[@property="gocomics:publish_date"]/@content
+
+test_url: http://www.gocomics.com/garfield/2015/06/13
diff --git a/inc/3rdparty/site_config/standard/gokulkrishh.github.io.txt b/inc/3rdparty/site_config/standard/gokulkrishh.github.io.txt
new file mode 100644
index 00000000..b395fa9e
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/gokulkrishh.github.io.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=https%3A%2F%2Fgokulkrishh.github.io%2FJavascript-Guidelines%2F
+
+body: //section[contains(concat(' ',normalize-space(@class),' '),' main-content ')]
+test_url: https://gokulkrishh.github.io/Javascript-Guidelines/
diff --git a/inc/3rdparty/site_config/standard/hackersrepublic.org.txt b/inc/3rdparty/site_config/standard/hackersrepublic.org.txt
new file mode 100644
index 00000000..da01c213
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/hackersrepublic.org.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.hackersrepublic.org%2Fculture-du-hacking%2Fune-histoire-de-privileges
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' field-name-body ')]//div[contains(concat(' ',normalize-space(@class),' '),' field-items ')]//div[contains(concat(' ',normalize-space(@class),' '),' field-item ') and (contains(concat(' ',normalize-space(@class),' '),' even '))]
+test_url: http://www.hackersrepublic.org/culture-du-hacking/une-histoire-de-privileges
diff --git a/inc/3rdparty/site_config/standard/help.fivefilters.org.txt b/inc/3rdparty/site_config/standard/help.fivefilters.org.txt
new file mode 100755
index 00000000..70a7d156
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/help.fivefilters.org.txt
@@ -0,0 +1,2 @@
+title: //div[@class="title"]/h3
+date: substring-after(//div[@class="meta"], ": ")
diff --git a/inc/3rdparty/site_config/standard/heraldsun.com.au.txt b/inc/3rdparty/site_config/standard/heraldsun.com.au.txt
new file mode 100755
index 00000000..b0ce56c5
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/heraldsun.com.au.txt
@@ -0,0 +1,12 @@
+#body: //div[@class='story-body']
+body: //div[contains(@class, 'story-body')]
+title: //div[@class='story-headline']//h1
+author: //cite[contains(@class, 'author')]
+date: //span[@class='datestamp']
+
+strip_id_or_class: story-info
+strip: //div[contains(@class, 'story-promo')]
+strip: //div[contains(@class, 'story-related')]
+
+prune: no
+tidy: no
diff --git a/inc/3rdparty/site_config/standard/hiiraan.com.txt b/inc/3rdparty/site_config/standard/hiiraan.com.txt
new file mode 100755
index 00000000..cf1f7942
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/hiiraan.com.txt
@@ -0,0 +1,10 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.hiiraan.com%2Fnews%2F2014%2FDec%2Fwararka_maanta20-89428.htm
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' single ')]//div[contains(concat(' ',normalize-space(@class),' '),' description ')]
+
+prune: no
+
+test_url: http://www.hiiraan.com/news/2014/Dec/wararka_maanta20-89428.htm
+test_url: http://rss.hiiraan.com/wararka_maanta_rss.xml
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/iceblog.free.fr.txt b/inc/3rdparty/site_config/standard/iceblog.free.fr.txt
new file mode 100644
index 00000000..9d1ce214
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/iceblog.free.fr.txt
@@ -0,0 +1,7 @@
+
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Ficeblog.free.fr%2Findex.php%3Farticle102%2Fweb-histoire-geek-4
+
+body: //article//section
+test_url: http://iceblog.free.fr/index.php?article102/web-histoire-geek-4
diff --git a/inc/3rdparty/site_config/standard/independent.co.uk.txt b/inc/3rdparty/site_config/standard/independent.co.uk.txt
index af742209..6711a0a2 100755
--- a/inc/3rdparty/site_config/standard/independent.co.uk.txt
+++ b/inc/3rdparty/site_config/standard/independent.co.uk.txt
@@ -1,9 +1,16 @@
 title: //meta[@property='og:title']/@content
-body: //div[contains(@class, 'articleContent')]
+body: //img[contains(@class, 'FirstImage')] | //div[contains(@class, 'articleContent')]
 date: //meta[@property='article:published_time']/@content
 author: //div[@id='main']//div[@class='byline']//span[@class='authorName']
 
 strip_id_or_class: RelatedArtTag
 
+strip: //h5[contains(., 'READ MORE:')]
+strip: //h5[contains(., 'Read more:')]
+
 tidy: no
-test_url: http://www.independent.co.uk/news/world/middle-east/syria-could-face-human-rights-probe-2274326.html
\ No newline at end of file
+test_url: http://www.independent.co.uk/news/world/middle-east/syria-could-face-human-rights-probe-2274326.html
+test_url: http://www.independent.co.uk/voices/comment/robert-fisk-on-the-cia-torture-report-once-again-language-is-distorted-in-order-to-hide-us-state-wrongdoing-9924501.html
+test_contains: Thank God for Noam Chomsky.
+
+test_url: http://www.independent.co.uk/news/uk/rss
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/io9.com.txt b/inc/3rdparty/site_config/standard/io9.com.txt
new file mode 100755
index 00000000..e6ca16ae
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/io9.com.txt
@@ -0,0 +1 @@
+http_header(user-agent): PHP/5.3
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/ippmedia.com.txt b/inc/3rdparty/site_config/standard/ippmedia.com.txt
new file mode 100755
index 00000000..99f25dc0
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/ippmedia.com.txt
@@ -0,0 +1,4 @@
+title: //div[@class="content_title"]//h2
+author: substring-after(//div[@class="byline"], "By ")
+date: //div[@class="publish_date"]
+strip: //div[@class="read_image_box"]
diff --git a/inc/3rdparty/site_config/standard/iso.500px.com.txt b/inc/3rdparty/site_config/standard/iso.500px.com.txt
new file mode 100644
index 00000000..ffa29a1d
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/iso.500px.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=https%3A%2F%2Fiso.500px.com%2Fhow-i-post-processed-the-most-successful-image-of-my-career%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' post-content ')]
+test_url: https://iso.500px.com/how-i-post-processed-the-most-successful-image-of-my-career/
diff --git a/inc/3rdparty/site_config/standard/it-connect.fr.txt b/inc/3rdparty/site_config/standard/it-connect.fr.txt
new file mode 100644
index 00000000..80c95e68
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/it-connect.fr.txt
@@ -0,0 +1,9 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.it-connect.fr%2Fdebuter-avec-docker-et-les-containers-sous-debian-8%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' post_inner_wrapper ')]
+
+strip_id_or_class: toc_container
+
+test_url: http://www.it-connect.fr/debuter-avec-docker-et-les-containers-sous-debian-8/
diff --git a/inc/3rdparty/site_config/standard/itnews.com.au.txt b/inc/3rdparty/site_config/standard/itnews.com.au.txt
new file mode 100755
index 00000000..47cbb0f3
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/itnews.com.au.txt
@@ -0,0 +1,5 @@
+title: //h1[@class='article-header']
+body: //div[@class='body-content']
+author: //span[@class='author-byline']/a[contains(@id, 'Author')]
+
+strip: //span[contains(@id, 'Article_SourceLabel')]
diff --git a/inc/3rdparty/site_config/standard/jalopnik.com.txt b/inc/3rdparty/site_config/standard/jalopnik.com.txt
index fc2eef8e..7823dbd7 100755
--- a/inc/3rdparty/site_config/standard/jalopnik.com.txt
+++ b/inc/3rdparty/site_config/standard/jalopnik.com.txt
@@ -1,2 +1,5 @@
 author: //span[@class='plus-icon']
+
+http_header(user-agent): PHP/5.3
+
 test_url: http://jalopnik.com/5892124/1955-porsche-550-spyder-sells-for-record-3685-million/
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/jezebel.com.txt b/inc/3rdparty/site_config/standard/jezebel.com.txt
new file mode 100755
index 00000000..e6ca16ae
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/jezebel.com.txt
@@ -0,0 +1 @@
+http_header(user-agent): PHP/5.3
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/jsforcats.com.txt b/inc/3rdparty/site_config/standard/jsforcats.com.txt
new file mode 100644
index 00000000..f2699ef1
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/jsforcats.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fjsforcats.com%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' post-content ')]
+test_url: http://jsforcats.com/
diff --git a/inc/3rdparty/site_config/standard/kotaku.com.txt b/inc/3rdparty/site_config/standard/kotaku.com.txt
index be439d75..61ccbc46 100755
--- a/inc/3rdparty/site_config/standard/kotaku.com.txt
+++ b/inc/3rdparty/site_config/standard/kotaku.com.txt
@@ -1,2 +1,5 @@
 author: //span[@class="plus-icon"]
+
+http_header(user-agent): PHP/5.3
+
 test_url: http://kotaku.com/5920211/save-the-furries-on-your-wii-in-this-weeks-nintendo-download
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/lapin-blanc.blogs.docteo.net.txt b/inc/3rdparty/site_config/standard/lapin-blanc.blogs.docteo.net.txt
new file mode 100644
index 00000000..38835a90
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/lapin-blanc.blogs.docteo.net.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Flapin-blanc.blogs.docteo.net%2F2015%2F01%2F20%2Flencadrement-doctoral-deviendrait-il-un-sujet-dactualite%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' entry-content ')]
+test_url: http://lapin-blanc.blogs.docteo.net/2015/01/20/lencadrement-doctoral-deviendrait-il-un-sujet-dactualite/
diff --git a/inc/3rdparty/site_config/standard/lececil.org.txt b/inc/3rdparty/site_config/standard/lececil.org.txt
new file mode 100644
index 00000000..8a38bbf3
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/lececil.org.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.lececil.org%2Fnode%2F7688
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' field-body ')]
+test_url: http://www.lececil.org/node/7688
diff --git a/inc/3rdparty/site_config/standard/lefigaro.fr.txt b/inc/3rdparty/site_config/standard/lefigaro.fr.txt
index e720e377..7e1d12d7 100755
--- a/inc/3rdparty/site_config/standard/lefigaro.fr.txt
+++ b/inc/3rdparty/site_config/standard/lefigaro.fr.txt
@@ -2,7 +2,8 @@ title: //meta[@name='title']/@content
 author: //span[@class='sign']//a[@class='journaliste']
 author: //meta[@name='author']/@content
 body: //*[@id='article']/div[@class='photo'] | //*[@id='article']/h2 | //*[@id='article']/div[@class='texte']
-date: //time[@pubdate]/@datetime
+date: //li[contains(concat(' ',normalize-space(@class),' '),' fig-date-pub ')]//time
 prune: no
 test_url: http://www.lefigaro.fr/environnement/2011/11/10/01029-20111110ARTFIG00801-la-chine-confrontee-a-un-immense-defi-ecologique.php
-test_url: http://www.lefigaro.fr/conjoncture/2012/11/20/20002-20121120ARTFIG00609-l-usager-devrait-payer-plus-pour-financer-les-transports.php
\ No newline at end of file
+test_url: http://www.lefigaro.fr/conjoncture/2012/11/20/20002-20121120ARTFIG00609-l-usager-devrait-payer-plus-pour-financer-les-transports.php
+test_url: http://www.lefigaro.fr/social/2015/03/10/09010-20150310ARTFIG00312-encore-une-annee-noire-pour-l-emploi-salarie.php
diff --git a/inc/3rdparty/site_config/standard/lifehacker.com.txt b/inc/3rdparty/site_config/standard/lifehacker.com.txt
index ec97f06c..330c4e78 100755
--- a/inc/3rdparty/site_config/standard/lifehacker.com.txt
+++ b/inc/3rdparty/site_config/standard/lifehacker.com.txt
@@ -42,6 +42,12 @@ strip: //p[@class="arrow"]
 
 # Remove "track" image from article body
 strip: //img[@alt="track"]
+
+# Remove hidden URLs
+strip: //a[@x-inset="hidden"]
+
+http_header(user-agent): PHP/5.3
+
 test_url: http://lifehacker.com/5925801/how-can-i-turn-vague-goals-into-actionable-to+dos
 test_url: http://lifehacker.com/5941600/hack-an-old-computer-mouse-into-a-wireless-bluetooth-mouse
-test_url: http://lifehacker.com/what-happens-to-the-brain-when-you-meditate-and-how-it-1202533314
\ No newline at end of file
+test_url: http://lifehacker.com/what-happens-to-the-brain-when-you-meditate-and-how-it-1202533314
diff --git a/inc/3rdparty/site_config/standard/linuxjournal.com.txt b/inc/3rdparty/site_config/standard/linuxjournal.com.txt
new file mode 100755
index 00000000..c5e64463
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/linuxjournal.com.txt
@@ -0,0 +1,6 @@
+body: //div[@class='content-area']
+next_page_link: //a[@title='Go to next page']
+author: //a[@title='View user profile.']
+strip_id_or_class: comments
+
+test_url: http://www.linuxjournal.com/content/be-mechanicwith-android-and-linux
diff --git a/inc/3rdparty/site_config/standard/m.bbc.co.uk.txt b/inc/3rdparty/site_config/standard/m.bbc.co.uk.txt
index d1ff0b43..7037c64b 100755
--- a/inc/3rdparty/site_config/standard/m.bbc.co.uk.txt
+++ b/inc/3rdparty/site_config/standard/m.bbc.co.uk.txt
@@ -3,6 +3,12 @@ body: //div[@class="story-body"]
 date: //p[@class='date']/strong
 author: substring-after(//div[@class="story-inner"]/div[@class="byline"]//span[@class='name'], 'By')
 
+find_string: http://ichef.bbci.co.uk/news/200/
+replace_string: http://ichef.bbci.co.uk/news/624/
+
+find_string: http://ichef.bbci.co.uk/news/304/
+replace_string: http://ichef.bbci.co.uk/news/624/
+
 strip: //div[@class="story-inner"]/div[@class="byline"]
 
 test_url: http://m.bbc.co.uk/news/science-environment-19144464
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/m.facebook.com.txt b/inc/3rdparty/site_config/standard/m.facebook.com.txt
new file mode 100755
index 00000000..1b9c1b34
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/m.facebook.com.txt
@@ -0,0 +1,12 @@
+body: //div[@id='m_story_permalink_view' or contains(@data-sigil, 'm-story-view')]
+
+title: //div[@id='m_story_permalink_view' or contains(@data-sigil, 'm-story-view')]//h3
+
+strip_id_or_class: commentable
+strip: //*[contains(@data-sigil, 'm-mentions-expand') or contains(@data-sigil, 'story-popup-context') or contains(@data-sigil, 'share') or contains(@data-sigil, 'translate')]
+
+prune: no
+tidy: no
+
+test_url: https://www.facebook.com/permalink.php?story_fbid=10154584776550183&id=294468630182
+test_contains: holding an extraordinary session in Brussels this month
diff --git a/inc/3rdparty/site_config/standard/m.theregister.co.uk.txt b/inc/3rdparty/site_config/standard/m.theregister.co.uk.txt
new file mode 100755
index 00000000..64cb1c32
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/m.theregister.co.uk.txt
@@ -0,0 +1,4 @@
+strip: //div[@class='wptl btm']
+body: //div[@id='article']//h2 | //div[@id='body']
+
+test_url: http://m.theregister.co.uk/2015/07/06/geeks_guide_spaceguard_center/
diff --git a/inc/3rdparty/site_config/standard/marketingmag.com.au.txt b/inc/3rdparty/site_config/standard/marketingmag.com.au.txt
new file mode 100755
index 00000000..910741f3
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/marketingmag.com.au.txt
@@ -0,0 +1 @@
+strip: //h3[@class="related-posts"]
diff --git a/inc/3rdparty/site_config/standard/medium.com.txt b/inc/3rdparty/site_config/standard/medium.com.txt
index 9e9c6895..5ab3ac5e 100755
--- a/inc/3rdparty/site_config/standard/medium.com.txt
+++ b/inc/3rdparty/site_config/standard/medium.com.txt
@@ -1,4 +1,4 @@
-body: //div[contains(@class, 'postContent-inner')]
+body: //div[contains(@class, 'postArticle-content')]
 strip_id_or_class: supplementalPostContent
 
 prune: no
diff --git a/inc/3rdparty/site_config/standard/menshealth.com.sg.txt b/inc/3rdparty/site_config/standard/menshealth.com.sg.txt
index 6a669253..af450b5e 100755
--- a/inc/3rdparty/site_config/standard/menshealth.com.sg.txt
+++ b/inc/3rdparty/site_config/standard/menshealth.com.sg.txt
@@ -3,10 +3,5 @@ body: //div[@style="float:left;width:740px;"]
 
 tidy: no
 
-test_url: http://www.menshealth.com.sg/fitness/mh-picks-under-armour-clutchfit-nitro-mid-cleats
-test_contains: These cleats are made for one thing
-
-test_url: http://www.menshealth.com.sg/fitness/top-10-fat-burning-bodyweight-moves-you-can-do-10-minutes
-test_contains: let this workout fool you
-
-test_url: http://www.menshealth.com.sg/fitness/feed
\ No newline at end of file
+# broken feed?
+test_url: http://www.menshealth.com.sg/fitness/feed
diff --git a/inc/3rdparty/site_config/standard/metrocop.net.txt b/inc/3rdparty/site_config/standard/metrocop.net.txt
new file mode 100644
index 00000000..9535f125
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/metrocop.net.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fmetrocop.net%2Fmythic-comics%2Fissue-1%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' entry ')]
+test_url: http://metrocop.net/mythic-comics/issue-1/
diff --git a/inc/3rdparty/site_config/standard/mitchellrepublic.com.txt b/inc/3rdparty/site_config/standard/mitchellrepublic.com.txt
new file mode 100755
index 00000000..fae858a3
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/mitchellrepublic.com.txt
@@ -0,0 +1,3 @@
+body: //div[@class='section']
+strip_id_or_class: mediumtxt
+strip: //strong[contains
diff --git a/inc/3rdparty/site_config/standard/mobile.nytimes.com.txt b/inc/3rdparty/site_config/standard/mobile.nytimes.com.txt
index c60252ef..ef1ce98d 100755
--- a/inc/3rdparty/site_config/standard/mobile.nytimes.com.txt
+++ b/inc/3rdparty/site_config/standard/mobile.nytimes.com.txt
@@ -1,4 +1,7 @@
 title: //h1[contains(@class, 'headline')]
 body: //article[contains(@class, 'full-art')]
+date: //meta[@name="pdate"]/@content
+author: //meta[@name="byl"]/@content
+
 strip_id_or_class: image-credit
 test_url: http://mobile.nytimes.com/2014/06/19/opinion/gail-collins-romney-and-the-2016-contenders-huddle.html
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/moneymanagement.com.au.txt b/inc/3rdparty/site_config/standard/moneymanagement.com.au.txt
new file mode 100755
index 00000000..9892f662
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/moneymanagement.com.au.txt
@@ -0,0 +1,2 @@
+date: //span[@class="publishdate"]//time
+author: //span[@class="byline"]
diff --git a/inc/3rdparty/site_config/standard/n0where.net.txt b/inc/3rdparty/site_config/standard/n0where.net.txt
new file mode 100644
index 00000000..e91159ea
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/n0where.net.txt
@@ -0,0 +1,5 @@
+title://div[@class='main-title single-title entry-title']
+body://div[@id="content-anchor-inner"]
+date://meta[@content]
+
+strip: //noscript
diff --git a/inc/3rdparty/site_config/standard/nbnnews.com.au.txt b/inc/3rdparty/site_config/standard/nbnnews.com.au.txt
new file mode 100755
index 00000000..a2409878
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/nbnnews.com.au.txt
@@ -0,0 +1,3 @@
+body: //div[contains(concat(' ',normalize-space(@class),' '),' entry ') or contains(@class, 'single-post-thumb')]
+test_url: http://www.nbnnews.com.au/2015/03/24/lismore-man-will-attempt-to-run-around-australia/
+test_url: http://www.nbnnews.com.au/category/nthn-rivers-sport/feed/
diff --git a/inc/3rdparty/site_config/standard/news.com.au.txt b/inc/3rdparty/site_config/standard/news.com.au.txt
new file mode 100755
index 00000000..57b89a54
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/news.com.au.txt
@@ -0,0 +1,3 @@
+body: //div[@class='story-body']
+prune: no
+tidy: no
diff --git a/inc/3rdparty/site_config/standard/news.menshealth.com.txt b/inc/3rdparty/site_config/standard/news.menshealth.com.txt
new file mode 100755
index 00000000..a07fdacc
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/news.menshealth.com.txt
@@ -0,0 +1 @@
+strip: //span[@style="color: #cf1206;"]
diff --git a/inc/3rdparty/site_config/standard/news.ninemsn.com.au.txt b/inc/3rdparty/site_config/standard/news.ninemsn.com.au.txt
new file mode 100755
index 00000000..ddd64065
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/news.ninemsn.com.au.txt
@@ -0,0 +1,3 @@
+strip: //a[@class="contact"]
+strip: //div[@class="article-media video-item"]
+date: //div[@class='display-date']
diff --git a/inc/3rdparty/site_config/standard/parool.nl.txt b/inc/3rdparty/site_config/standard/parool.nl.txt
new file mode 100755
index 00000000..2ceef940
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/parool.nl.txt
@@ -0,0 +1,7 @@
+#bypass cookie check
+single_page_link: //a[contains(@href, '/acceptCookieCheck.do?url=')]
+
+test_url: http://www.parool.nl/parool/nl/4/AMSTERDAM/article/detail/4042734/2015/05/29/MRSA-bacterie-niet-verder-verspreid-in-Bijlmerbajes.dhtml
+test_contains: De twee gevangenen die
+
+test_url: http://www.parool.nl/amsterdam/rss.xml
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/perthnow.com.au.txt b/inc/3rdparty/site_config/standard/perthnow.com.au.txt
new file mode 100755
index 00000000..b0ce56c5
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/perthnow.com.au.txt
@@ -0,0 +1,12 @@
+#body: //div[@class='story-body']
+body: //div[contains(@class, 'story-body')]
+title: //div[@class='story-headline']//h1
+author: //cite[contains(@class, 'author')]
+date: //span[@class='datestamp']
+
+strip_id_or_class: story-info
+strip: //div[contains(@class, 'story-promo')]
+strip: //div[contains(@class, 'story-related')]
+
+prune: no
+tidy: no
diff --git a/inc/3rdparty/site_config/standard/planetsave.com.txt b/inc/3rdparty/site_config/standard/planetsave.com.txt
new file mode 100755
index 00000000..d6f34e22
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/planetsave.com.txt
@@ -0,0 +1 @@
+strip_id_or_class: author-bio-box
diff --git a/inc/3rdparty/site_config/standard/presseportal.de.txt b/inc/3rdparty/site_config/standard/presseportal.de.txt
new file mode 100755
index 00000000..703806d8
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/presseportal.de.txt
@@ -0,0 +1,11 @@
+body: //div[contains(concat(' ',normalize-space(@class),' '),' story-text ')]
+
+strip_id_or_class: news-bodycopy
+
+parser: html5php
+tidy: no
+
+test_url: http://www.presseportal.de/pm/103258/2930232/felix-neureuther-vor-der-ski-wm-ich-denke-von-rennen-zu-rennen
+test_url: http://www.presseportal.de/pm/66749/2933779/koelner-stadt-anzeiger-bahnmitarbeiter-werden-in-nrw-immer-haeufiger-angegriffen-zahl-der/rss
+test_contains: kleineren Bahnhöfen installieren und erhofft
+test_url: http://www.presseportal.de/rss/presseportal.rss2
diff --git a/inc/3rdparty/site_config/standard/pérotin.com.txt b/inc/3rdparty/site_config/standard/pérotin.com.txt
new file mode 100644
index 00000000..7784fa4c
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/pérotin.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=xn--protin-bva.com%2Fpost%2F2009%2F06%2F09%2FSAV-Free-un-sketch-kafkaien
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' post ')]
+test_url: http://xn--protin-bva.com/post/2009/06/09/SAV-Free-un-sketch-kafkaien
diff --git a/inc/3rdparty/site_config/standard/quechoisir.org.txt b/inc/3rdparty/site_config/standard/quechoisir.org.txt
new file mode 100644
index 00000000..a8bacdb7
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/quechoisir.org.txt
@@ -0,0 +1,10 @@
+title: //h1[@id='titre']
+body://h2[@id="surtitre"]|//div[@id="ctn_introarticle"]|//div[@class="ctn_globalcontent"]
+
+strip_id_or_class: qc-container-main
+strip_id_or_class: article_footer
+
+tidy: no
+prune: no
+
+test_url: http://www.quechoisir.org/alimentation/securite-hygiene/actualite-acrylamide-un-contaminant-trop-present-dans-nos-assiettes
diff --git a/inc/3rdparty/site_config/standard/quora.com.txt b/inc/3rdparty/site_config/standard/quora.com.txt
index 732d12d7..f2b75a99 100755
--- a/inc/3rdparty/site_config/standard/quora.com.txt
+++ b/inc/3rdparty/site_config/standard/quora.com.txt
@@ -1,8 +1,10 @@
 tidy: no
 prune: no
-body: //div[contains(@class, 'main_col')]
-title: //h1
+body: //div[contains(concat(' ',normalize-space(@class),' '),' Answer ')] | //div[contains(concat(' ',normalize-space(@class),' '),' header ')] | //div[contains(concat(' ',normalize-space(@class),' '),' AnswerWikiArea ')] | //hr
+#body: //div[contains(@class, 'main_col')]
 
+strip_id_or_class: AnswerFooter
+strip_id_or_class: ActionBar
 strip_id_or_class: hidden
 strip_id_or_class: item_action_bar
 strip_id_or_class: answer_voters
@@ -13,5 +15,15 @@ strip_id_or_class: view_tag
 strip_id_or_class: include_details
 strip_id_or_class: sig_edit
 strip_id_or_class: profile_photo_img
+strip_id_or_class: question_text_icons
 
-test_url: http://www.quora.com/What-everyday-habit-do-you-wish-you-had-developed-earlier-in-life
\ No newline at end of file
+# insert hr between answers
+find_string: <div class="Answer" 
+replace_string: <hr /><div class="Answer" 
+
+test_url: http://www.quora.com/What-everyday-habit-do-you-wish-you-had-developed-earlier-in-life
+test_contains: Please provide a specific practical/measurable action-based everyday
+test_contains: Exercise every day
+
+test_url: http://www.quora.com/What-is-the-greatest-illusion-in-life
+test_contains: What is the greatest illusion in life?
diff --git a/inc/3rdparty/site_config/standard/rockpapershotgun.com.txt b/inc/3rdparty/site_config/standard/rockpapershotgun.com.txt
index f8c9541f..83342cb7 100755
--- a/inc/3rdparty/site_config/standard/rockpapershotgun.com.txt
+++ b/inc/3rdparty/site_config/standard/rockpapershotgun.com.txt
@@ -1,8 +1,10 @@
 title: //h2
 
 strip: //div[ contains(@class, 'respond') ]  |  //h2  |  //h1
+strip_id_or_class: social
+strip_id_or_class: dd_post_share
 
 date: substring-after(//p[@class='info'], ' on ')
 
 author: //p[@class='info']//a
-test_url: http://www.rockpapershotgun.com/2010/07/29/rps-half-verdict-starcraft-2/
\ No newline at end of file
+test_url: http://www.rockpapershotgun.com/2010/07/29/rps-half-verdict-starcraft-2/
diff --git a/inc/3rdparty/site_config/standard/saadaalnews.net.txt b/inc/3rdparty/site_config/standard/saadaalnews.net.txt
new file mode 100755
index 00000000..b9ce04e5
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/saadaalnews.net.txt
@@ -0,0 +1,11 @@
+body: //div[contains(@class, 'section-content-left')]
+
+strip_id_or_class: related
+strip_id_or_class: nocontent
+strip_id_or_class: comment
+strip_id_or_class: widget
+strip_id_or_class: respond
+strip: //h3[.='Comments']
+strip: //p[.='comments']
+
+test_url: http://saadaalnews.net/?p=42624
diff --git a/inc/3rdparty/site_config/standard/smh.com.au.txt b/inc/3rdparty/site_config/standard/smh.com.au.txt
new file mode 100755
index 00000000..f647f812
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/smh.com.au.txt
@@ -0,0 +1,14 @@
+body: //div[@id='content']
+title: //h1[@class='cN-headingPage']
+author: //h3[@class='authorName']
+date: //dd[@class='updated dtstamp']
+
+strip: //ul[@class='social sponsored cfix']
+strip: //div[contains(@class, 'hiddenVisually')]
+strip: //dd[@class='updated dtstamp']
+strip: //h3[@class='authorName']
+strip: //ul[@class='social  cfix']
+strip: //div[contains(@id, 'adspot')]
+
+strip: //div[contains(@class, 'overlayPlayCountdown')]
+strip: //div[@class='fdVideoWof']//span[@class='gone']
diff --git a/inc/3rdparty/site_config/standard/smh.drive.com.au.txt b/inc/3rdparty/site_config/standard/smh.drive.com.au.txt
new file mode 100755
index 00000000..463fd88b
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/smh.drive.com.au.txt
@@ -0,0 +1,13 @@
+body: //div[@id='content']
+title: //h1[@class='cN-headingPage']
+author: //h3[@class='authorName']
+date: //dd[@class='updated dtstamp']
+
+strip: //ul[@class='social sponsored cfix']
+strip: //div[contains(@class, 'hiddenVisually')]
+strip: //dd[@class='updated dtstamp']
+strip: //h3[@class='authorName']
+strip: //ul[@class='social  cfix']
+strip: //div[contains(@id, 'adspot')]
+
+test_url: http://smh.drive.com.au/roads-and-traffic/driver-distraction-responsible-for-more-car-crashes-than-alcohol-20130503-2iyg0.html
diff --git a/inc/3rdparty/site_config/standard/smithsonianmag.com.txt b/inc/3rdparty/site_config/standard/smithsonianmag.com.txt
index 3e8fee95..fc479c2a 100755
--- a/inc/3rdparty/site_config/standard/smithsonianmag.com.txt
+++ b/inc/3rdparty/site_config/standard/smithsonianmag.com.txt
@@ -7,6 +7,9 @@ body://div[@id = 'article-body']
 # full content
 single_page_link://td/li[@class = 'article-singlepage']/a
 
+# continue link
+single_page_link: //a[@id='continue-btn']
+
 # caption clean up
 wrap_in(i)://span[@class='articleImageCaptionwide']
 move_into (//span[@class='articleImageCaptionwide'])://div[@id = 'articleImage']/p
@@ -17,4 +20,4 @@ strip://p[@id = 'articlePaginationWrapper']
 strip://ul[contains(@class, 'cat-breadcrumb')]
 strip://div [@class= 'viewMorePhotos']
 
-test_url: http://www.smithsonianmag.com/history-archaeology/The-Goddess-Goes-Home.html
\ No newline at end of file
+test_url: http://www.smithsonianmag.com/history-archaeology/The-Goddess-Goes-Home.html
diff --git a/inc/3rdparty/site_config/standard/snip.ly.txt b/inc/3rdparty/site_config/standard/snip.ly.txt
new file mode 100755
index 00000000..4e80fcae
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/snip.ly.txt
@@ -0,0 +1,3 @@
+single_page_link: //meta[@property="og:url"]/@content
+
+test_url: http://snip.ly/qa1R
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/soundcity.tv.txt b/inc/3rdparty/site_config/standard/soundcity.tv.txt
new file mode 100755
index 00000000..c26b9f95
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/soundcity.tv.txt
@@ -0,0 +1,3 @@
+strip_id_or_class: sharing
+
+test_url: http://soundcity.tv/feed/
diff --git a/inc/3rdparty/site_config/standard/spiegel.de.txt b/inc/3rdparty/site_config/standard/spiegel.de.txt
index 413e0155..7b7b1752 100755
--- a/inc/3rdparty/site_config/standard/spiegel.de.txt
+++ b/inc/3rdparty/site_config/standard/spiegel.de.txt
@@ -8,6 +8,9 @@
 # - Fixed single_page_link
 # - Included intro text in single page view
 # - Added body in default view
+# stesie@
+# - removed copyright box
+# - removed "print more" box
 
 # set body
 tidy: no
@@ -15,6 +18,7 @@ tidy: no
 body: //div[@id="spArticleContent"]
 # body in default view
 body: //div[@id="spArticleSection"]
+body: //div[contains(@class, 'article-section')] | //div[@id='js-article-top-wide-asset'] | //p[contains(@class, 'article-intro')] | //div[contains(@class, 'js-module-box-image')]
 # body in "Fotostrecke"
 body: //div[@id="spBigaContent"]
 
@@ -25,6 +29,8 @@ strip: //div[@id="spArticleContent"]/h3
 # set date in "Fotostrecke"
 date: //div[@id="spBigaDatum"]
 
+# title in default view
+title: //h2[contains(@class, 'article-title')]
 #set title in single page view
 title: //div[@id='spArticleContent']/h2
 # strip title
@@ -49,7 +55,7 @@ strip: //*/div[@class='spCredit']/following-sibling::p
 strip: //div[@class='spMInline']
 
 # remove photogalleries and extras
-strip: //div[@class='spPhotoGallery']
+strip: //div[contains(@class, 'spPhotoGallery')]
 strip: //div[@class='spPhotoGallery']/following-sibling::br
 strip: //div[@class='spAssetAlignleft']
 strip: //div[contains(@class,'spAsset')]
@@ -67,9 +73,24 @@ strip: //div[@id='spBigaLatestEntries']
 strip: //div[contains(@class, 'spBigaNavi')]
 strip: //div[@class='spDottedLine']
 
+strip: //div[@class='asset-box article-print-more']
+strip: //div[@class='article-copyright']
+strip: //span[@class='image-buttons']
+
 # Use link to print article for single page view
 single_page_link: //a[contains(@href, '-druck')]
+if_page_contains: //div[contains(@class, 'multi-pager-control')]
+
+# Clean up title in print view
+find_string: <title>Druckversion - 
+replace_string: <title>
 
 # use next link in "Fotostrecke"
 next_page_link: //a[@class='spBigaControlForw']
-test_url: http://www.spiegel.de/politik/deutschland/0,1518,787602,00.html
\ No newline at end of file
+test_url: http://www.spiegel.de/politik/deutschland/0,1518,787602,00.html
+
+# regular article
+test_url: http://www.spiegel.de/wirtschaft/soziales/griechenland-was-den-griechischen-buergern-nun-droht-a-1042682.html
+
+# multipage article
+test_url: http://www.spiegel.de/spiegel/a-710880.html
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/spiil.org.txt b/inc/3rdparty/site_config/standard/spiil.org.txt
new file mode 100644
index 00000000..dd12fb88
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/spiil.org.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=https%3A%2F%2Fwww.spiil.org%2Fguide-bonnes-pratiques-editeurs-de-presse-ligne
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' node-content ')]
+test_url: https://www.spiil.org/guide-bonnes-pratiques-editeurs-de-presse-ligne
diff --git a/inc/3rdparty/site_config/standard/srf.ch.txt b/inc/3rdparty/site_config/standard/srf.ch.txt
new file mode 100755
index 00000000..d07a9050
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/srf.ch.txt
@@ -0,0 +1,24 @@
+# Author: cirnod@gmail.com
+
+tidy: no
+prune: no
+
+body: //div[@id="article-content"]/p | //div[@class="main-article-content clearfix"]
+
+# General Cleanup
+strip_id_or_class: offscreen
+strip_id_or_class: video-description
+strip_id_or_class: v2 big-video
+strip_id_or_class: module smb freetext
+strip_id_or_class: asset span3
+strip_id_or_class: module smb related-links
+
+# fix image-galleries
+strip_id_or_class: module lightbox-gallery image hide
+replace_string(width="624"): width="100%"
+replace_string(height="468"): height="%"
+
+# Try yourself
+test_url: http://www.srf.ch/news/wirtschaft/weltbank-korrigiert-konjunktur-erwartungen-nach-unten
+test_url: http://www.srf.ch/news/wirtschaft/ural-statt-alpen-russische-touristen-bleiben-zuhause
+test_url: http://www.srf.ch/news/international/zwei-schweizer-bei-blutigem-attentat-in-mali-verletzt
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/sueddeutsche.de.txt b/inc/3rdparty/site_config/standard/sueddeutsche.de.txt
index 74b8d451..26e05605 100755
--- a/inc/3rdparty/site_config/standard/sueddeutsche.de.txt
+++ b/inc/3rdparty/site_config/standard/sueddeutsche.de.txt
@@ -1,6 +1,6 @@
 # 2012-12-04: complete rewrite after Süddeutsche.de relaunch - carlo@...
 
-single_page_link: //a[ contains( @href, "/2.220/" ) ]
+single_page_link: //li[@id="article-sidebar-action-print"]/@data-clickurl
 
 body: //article[@id="sitecontent"]/section[@class="body"]
 author: //address[@class="author"]
diff --git a/inc/3rdparty/site_config/standard/sunshinecoastdaily.com.au.txt b/inc/3rdparty/site_config/standard/sunshinecoastdaily.com.au.txt
new file mode 100755
index 00000000..bf5e9189
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/sunshinecoastdaily.com.au.txt
@@ -0,0 +1,10 @@
+body: //section//article//p
+
+strip: //aside
+strip: //div[@class='margin-top-15']
+strip: //p[@class='tags']
+
+author: //span[@class='byline']//ul[@class='piped']//li[1]
+date: //span[@class='byline']//ul[@class='piped']//li[2]
+
+parser: html5lib
diff --git a/inc/3rdparty/site_config/standard/sz.de.txt b/inc/3rdparty/site_config/standard/sz.de.txt
index f67637d2..f194271f 100755
--- a/inc/3rdparty/site_config/standard/sz.de.txt
+++ b/inc/3rdparty/site_config/standard/sz.de.txt
@@ -1,6 +1,6 @@
 # 2012-12-04: complete rewrite after Süddeutsche.de relaunch - carlo@...
 
-single_page_link: //a[ contains( @href, "/2.220/" ) ]
+single_page_link: //li[@id="article-sidebar-action-print"]/@data-clickurl
 
 body: //article[@id="sitecontent"]/section[@class="body"]
 author: //address[@class="author"]
diff --git a/inc/3rdparty/site_config/standard/tagesanzeiger.ch.txt b/inc/3rdparty/site_config/standard/tagesanzeiger.ch.txt
new file mode 100755
index 00000000..45c5cd02
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/tagesanzeiger.ch.txt
@@ -0,0 +1,14 @@
+# Author: cirnod@gmail.com
+
+tidy: no
+prune: no
+
+body: //div[@id="article"]/h3 | //*[@id="mainContent"]
+
+# General Cleanup
+#strip_id_or_class: info_panel 
+
+
+# Try yourself
+test_url: http://www.tagesanzeiger.ch/zuerich/stadt/Nach-spektakulaerer-Abseilaktion-verhaftet/story/18039895
+test_url: http://www.tagesanzeiger.ch/ausland/naher-osten-und-afrika/IS-zerstoert-auch-das-antike-Hatra/story/19865699
diff --git a/inc/3rdparty/site_config/standard/tagesschau.de.txt b/inc/3rdparty/site_config/standard/tagesschau.de.txt
index be76cd05..ba3b1d3b 100755
--- a/inc/3rdparty/site_config/standard/tagesschau.de.txt
+++ b/inc/3rdparty/site_config/standard/tagesschau.de.txt
@@ -1,23 +1,14 @@
-title://h1[1]
+body: //div[contains(@class, 'sectionArticle')]//div[contains(concat(' ',normalize-space(@class),' '),' box ')]
 
-author: substring-after(//em, 'Von ')
-author:string('tagesschau.de')
+strip_id_or_class: infokasten
+strip_id_or_class: teaserImTeaser
+strip_id_or_class: Comments
+strip_id_or_class: mediaInfo
+strip: //div[contains(@class, 'mediaCon')]//iframe
 
-date:substring-after(//div[@class='standDatum'], 'Stand: ')
+prune: no
 
-body://div[contains(@class, 'article')] | //div[contains(@class, 'centerCol')]
+test_url: http://www.tagesschau.de/ausland/snowden-dateien-entschluesselung-101.html
+test_contains: Snowden hatte zunächst für
 
-strip://h1[1]
-strip: //div[contains(@class, 'directLinks')]
-strip: //div[contains(@class, 'zitatBox')]
-strip: //div[contains(@class, 'teaserBox metaBlock')]
-strip: //*[contains(@class, 'inv')]
-strip: //span[@class='imgSubline']
-strip: //*[contains(@class, 'topline')][1]
-strip: //div[@id='rightCol'][1]
-strip: //div[@id="footer"][1]
-strip: //div[@class="fPlayer"] 
-strip: //div[@id='seitenanfang']
-strip: //div[@class='standDatum']
-strip: //em
-test_url: http://www.tagesschau.de/ausland/wahlkampffrankreich102.html
\ No newline at end of file
+test_url: http://www.tagesschau.de/xml/rss2
diff --git a/inc/3rdparty/site_config/standard/taz.de.txt b/inc/3rdparty/site_config/standard/taz.de.txt
index cf853662..a3368568 100755
--- a/inc/3rdparty/site_config/standard/taz.de.txt
+++ b/inc/3rdparty/site_config/standard/taz.de.txt
@@ -1,8 +1,9 @@
 date: //div[@class='secthead']
-body: //div[@class='sectbody']
+body: (//div[@class='sectbody'])[1]
 title: concat(//div[@class='sectbody']/h4,': ',//div[@class='sectbody']/h1)
 author: //span[@class='author']
 strip: //p[@class='caption']
+strip_id_or_class: ad_bin
 strip_id_or_class: rack
 
 test_url: http://www.taz.de/Protestbewegung-Occupy/!80188/
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/theatlantic.com.txt b/inc/3rdparty/site_config/standard/theatlantic.com.txt
index 3fc5611b..36864197 100755
--- a/inc/3rdparty/site_config/standard/theatlantic.com.txt
+++ b/inc/3rdparty/site_config/standard/theatlantic.com.txt
@@ -1,5 +1,6 @@
 title: //div[contains(@class, 'articleHead')]//h1
 
+body: //div[@itemprop='articleBody']
 body: //div[@class='articleText']
 body: //div[@class='articleContent']
 body: //div[@id='article']
@@ -13,10 +14,14 @@ strip: //p[contains(., 'This article available online at:')]
 strip: //p[contains(., 'This article available online at:')]/following::*
 strip: //div[@class='earthbox']
 
-single_page_link: //article//a[contains(@class, 'print')]
+single_page_link: //div[contains(@class, 'article-tools')]//a[contains(@class, 'print')]
 
 native_ad_clue: //meta[@property="og:url" and contains(@content, '/sponsored/')]
 
+#multi-page article
+test_url: http://www.theatlantic.com/magazine/archive/2014/12/the-real-roots-of-midlife-crisis/382235/
+test_contains: The curve tends to evince itself
+
 test_url: http://www.theatlantic.com/technology/archive/2011/04/want-to-see-how-crazy-a-bot-run-market-can-be/237773/
 test_url: http://www.theatlantic.com/magazine/archive/2007/11/the-autumn-of-the-multitaskers/6342/
-test_url: http://www.theatlantic.com/entertainment/archive/2012/04/30-rock-live-a-funny-reminder-of-why-sitcoms-arent-shot-live-anymore/256447/
\ No newline at end of file
+test_url: http://www.theatlantic.com/entertainment/archive/2012/04/30-rock-live-a-funny-reminder-of-why-sitcoms-arent-shot-live-anymore/256447/
diff --git a/inc/3rdparty/site_config/standard/theaustralian.com.au.txt b/inc/3rdparty/site_config/standard/theaustralian.com.au.txt
new file mode 100755
index 00000000..1245efca
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/theaustralian.com.au.txt
@@ -0,0 +1,6 @@
+body: //div[contains(@class, 'story-body')]
+author: //cite[contains(@class, 'author')]
+date: //span[@class='datestamp']
+
+strip: //div[@class='story-info']
+
diff --git a/inc/3rdparty/site_config/standard/thebostonchannel.com.txt b/inc/3rdparty/site_config/standard/thebostonchannel.com.txt
index b74442de..808876da 100755
--- a/inc/3rdparty/site_config/standard/thebostonchannel.com.txt
+++ b/inc/3rdparty/site_config/standard/thebostonchannel.com.txt
@@ -1,7 +1,7 @@
 title: //meta[@name='og:title']/@content
 date: //meta[@name='created']/@content
-body: //div[@class="StoryBody" or @class="storyTeaser"]
+body: //div[contains(@class, "article-body")]
 
 replace_string(<p></p>): <br /><br />
 
-test_url: http://www.thebostonchannel.com/slideshow/news/28210648/detail.html
\ No newline at end of file
+test_url: http://www.wcvb.com/news/2-teens-arrested-in-fatal-dorchester-shooting-of-16yearold-boy/33564886
diff --git a/inc/3rdparty/site_config/standard/theguardian.com.txt b/inc/3rdparty/site_config/standard/theguardian.com.txt
index 88e2ecf4..c8b70e6f 100755
--- a/inc/3rdparty/site_config/standard/theguardian.com.txt
+++ b/inc/3rdparty/site_config/standard/theguardian.com.txt
@@ -1,5 +1,5 @@
 title: //div[@id='main-article-info']//h1
-body: //div[@id='article-wrapper']
+body: //figure[contains(@itemprop, "associatedMedia")] | //div[contains(@itemprop, "articleBody")]
 date: //li[@class='publication']//time[@pubdate] | //li[@class='publication']//data[@pubdate]
 strip: //div[contains(@class, 'email-subscription')]
 strip: //div[contains(@class, 'kindleWidget')]
@@ -11,6 +11,8 @@ native_ad_clue: //meta[@property="video:tag" and contains(@content, "Partner zon
 prune: no
 tidy: no
 
+strip_id_or_class: -expand-
+
 test_url: http://www.theguardian.com/world/2013/oct/04/nsa-gchq-attack-tor-network-encryption
 test_contains: The National Security Agency has made repeated attempts to develop
 test_contains: The agency did not directly address those questions, instead providing a statement.
diff --git a/inc/3rdparty/site_config/standard/theregister.co.uk.txt b/inc/3rdparty/site_config/standard/theregister.co.uk.txt
index 5d30230d..70d3d437 100755
--- a/inc/3rdparty/site_config/standard/theregister.co.uk.txt
+++ b/inc/3rdparty/site_config/standard/theregister.co.uk.txt
@@ -1,8 +1,9 @@
-# Updated 25-Jan-2014
-single_page_link: //a[contains(@href, '/Print/')]
+single_page_link: //link[contains(@href, 'm.theregister')]
+if_page_contains: //div[@id='nextpage']
+strip: //div[@class='wptl btm']
+body: //div[contains(@class,'article_head')]//h2 | //div[@id='body']
 
-title: //div[@id="article"]/h2
-author: //p[@class="byline"]/a
-date: //p[@class="dateline"]/a[last()]
-
-test_url: http://www.theregister.co.uk/2014/01/24/thirty_years_of_the_apple_macintosh_part_2/
+#multipage
+test_url: http://www.theregister.co.uk/2015/07/06/geeks_guide_spaceguard_center/
+#singlepage
+test_url: http://www.theregister.co.uk/2015/07/06/us_japan_massive_robots_in_the_ring/
diff --git a/inc/3rdparty/site_config/standard/theverge.com.txt b/inc/3rdparty/site_config/standard/theverge.com.txt
index 78f8654a..cee50c9b 100755
--- a/inc/3rdparty/site_config/standard/theverge.com.txt
+++ b/inc/3rdparty/site_config/standard/theverge.com.txt
@@ -33,6 +33,8 @@ strip_id_or_class: m-ad
 strip_id_or_class: social-sharing
 strip_id_or_class: m-video-entry__excerpt
 strip_id_or_class: hidden
+strip_id_or_class: m-article__follow-bar
+strip_id_or_class: m-article__share-buttons
 
 replace_string(<noscript>): <div>
 replace_string(</noscript>): </div>
diff --git a/inc/3rdparty/site_config/standard/titanic-magazin.de.txt b/inc/3rdparty/site_config/standard/titanic-magazin.de.txt
new file mode 100755
index 00000000..70108e36
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/titanic-magazin.de.txt
@@ -0,0 +1,8 @@
+body: //div[contains(@class, 'tt_news-bodytext')]
+
+# cut html short
+find_string: <!--TYPO3SEARCH_end-->
+replace_string: </div></body></html>
+
+test_url: http://www.titanic-magazin.de/ich.war.bei.der.waffen.rss
+test_url: http://www.titanic-magazin.de/news/wenig-bekannte-fakten-ueber-2014-6986/
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/tofugu.com.txt b/inc/3rdparty/site_config/standard/tofugu.com.txt
new file mode 100644
index 00000000..5ac9d6a0
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/tofugu.com.txt
@@ -0,0 +1,3 @@
+body://div[@class='entry-content']
+
+test_url: http://www.tofugu.com/2015/07/20/interview-with-toriena-japanese-chiptune/
diff --git a/inc/3rdparty/site_config/standard/truongtx.me.txt b/inc/3rdparty/site_config/standard/truongtx.me.txt
new file mode 100755
index 00000000..6b10adce
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/truongtx.me.txt
@@ -0,0 +1,9 @@
+prune: false
+tidy: false
+
+body: //div[@class='col-md-9']
+author: //meta[@name='author']
+date: //i[@class='fa fa-calendar']/../span
+title: //div[@class='page-header']/h1
+
+test_url: https://truongtx.me/2014/04/20/emacs-javascript-completion-and-refactoring/
diff --git a/inc/3rdparty/site_config/standard/utdailybeacon.com.txt b/inc/3rdparty/site_config/standard/utdailybeacon.com.txt
index d37911bc..c4593d55 100755
--- a/inc/3rdparty/site_config/standard/utdailybeacon.com.txt
+++ b/inc/3rdparty/site_config/standard/utdailybeacon.com.txt
@@ -1,5 +1,2 @@
-title: //h1
-author: //*[@class='byline']
-date: substring-after(//*[@class='pubdatetime'], 'Published: ')
-body: //*[@class='body-block']
-test_url: http://utdailybeacon.com/news/2012/oct/8/energy-forum-continues/
\ No newline at end of file
+body: //div[@id='blox-story-text']
+test_url: http://www.utdailybeacon.com/news/article_ccf6d024-0f15-11e5-ae29-9f63598deb81.html
diff --git a/inc/3rdparty/site_config/standard/volkskrant.nl.txt b/inc/3rdparty/site_config/standard/volkskrant.nl.txt
new file mode 100755
index 00000000..c2770349
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/volkskrant.nl.txt
@@ -0,0 +1,15 @@
+#bypass cookie check
+single_page_link: //a[contains(@href, '/cookiewall/accept.do?')]
+
+title: //h1[@itemprop="headline"]
+body: //figure[contains(@class, 'article__top-image')] | //div[@itemprop="articleBody"]
+
+strip: //div[contains(@class, 'media-container') and contains(@class, 'pull-right')]
+
+tidy: no
+prune: no
+
+test_url: http://www.volkskrant.nl/sport/dossier-wereldvoetbalbond-fifa-wankelt~a4042695/
+test_contains: De belangrijkste spil in het
+
+test_url: http://www.volkskrant.nl/nieuws/rss.xml
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/warnerbros.fr.txt b/inc/3rdparty/site_config/standard/warnerbros.fr.txt
index 21f56352..6215b727 100755
--- a/inc/3rdparty/site_config/standard/warnerbros.fr.txt
+++ b/inc/3rdparty/site_config/standard/warnerbros.fr.txt
@@ -1,3 +1,2 @@
-title: //h3
-body: //div[@class="content_wysiwyg"]
-test_url: http://www.warnerbros.fr/game-of-thrones-un-junket-vu-de-l-interieur-268.html
\ No newline at end of file
+body: //div[@class="article-body"]
+test_url: https://www.warnerbros.fr/articles/magic-mike-xxl-adam-rodriguez-portrait
diff --git a/inc/3rdparty/site_config/standard/washingtonpost.com.txt b/inc/3rdparty/site_config/standard/washingtonpost.com.txt
index 0aa9f1d8..c29af00f 100755
--- a/inc/3rdparty/site_config/standard/washingtonpost.com.txt
+++ b/inc/3rdparty/site_config/standard/washingtonpost.com.txt
@@ -5,9 +5,14 @@ body: //div[contains(@class, "article_body")]
 body: //div[@id='print_facet']//div[@id='body']
 
 author://meta[@name='DC.creator']/@content
+author://span[@class="pb-byline"]
+author://h3[@property='dc.creator']//a[@rel='author']
 title://meta[@name='title']/@content
 date://div[contains(@class,'byline')]//span[contains(@class,'published')]/@title
 date://meta[@name="DC.date.issued"]/@content
+date://span[contains(@class,"pb-timestamp")]
+date://meta[@name="eomportal-lastUpdate"]/@content
+
 strip://div[@class="relative primary-slot padding-top img-border gallery-container photo-wrapper"]
 strip://div[@id="wp-column six end"]
 strip://div[contains(@class,'hidden')]
@@ -23,6 +28,7 @@ strip_id_or_class: module
 
 # Change gJQAwdJG4U_story.html to gJQAwdJG4U_print.html
 single_page_link: concat(substring-before(//link[@rel="canonical"]/@href, "_story.html"), "_print.html")
+if_page_contains: //link[@rel="canonical" and contains(@href, '_story.html')]
 
 # [OLD] Change gJQAwdJG4U_story.html to gJQAwdJG4U_story_print.html
 #single_page_link: concat(substring-before(//link[@rel="canonical"]/@href, "_story.html"), "_story_print.html")
diff --git a/inc/3rdparty/site_config/standard/watoday.com.au.txt b/inc/3rdparty/site_config/standard/watoday.com.au.txt
new file mode 100755
index 00000000..4302ac5e
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/watoday.com.au.txt
@@ -0,0 +1,7 @@
+author: //h3[@class="authorName"]
+date: //dd[@class='updated dtstamp']//time
+
+strip: //div[contains(@class, "adspot")]
+strip: //noscript
+strip: //p//small
+
diff --git a/inc/3rdparty/site_config/standard/weeklytimesnow.com.au.txt b/inc/3rdparty/site_config/standard/weeklytimesnow.com.au.txt
new file mode 100755
index 00000000..a79871f3
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/weeklytimesnow.com.au.txt
@@ -0,0 +1,4 @@
+body: //div[@class='main-col' or @class='article-image-wide']
+title: //h1[@class='article-title']
+author: substring-before(//span[@class='author'], "|")
+date: //span[@class='date']
diff --git a/inc/3rdparty/site_config/standard/westernadvocate.com.au.txt b/inc/3rdparty/site_config/standard/westernadvocate.com.au.txt
new file mode 100755
index 00000000..eb00f776
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/westernadvocate.com.au.txt
@@ -0,0 +1,11 @@
+title: //header[contains(@class, "news-article-title")]//h1
+date: //div[@class="news-article-byline"]//time
+author: //h2[@class="news-article-author"]//cite
+
+# Turns out that westernadvocate is doing funky things with the slide show images. :<
+# body: //ul[@class="slides"]//img | //div[contains(@class, "news-article-body")]
+body: //div[contains(@class, "news-article-body")]
+
+strip: //div[contains(@class, "flexslider")]
+
+test_url: http://www.westernadvocate.com.au/story/1532050/roos-accept-ziebell-ban-commentators-do-not/
diff --git a/inc/3rdparty/site_config/standard/wsj.com.txt b/inc/3rdparty/site_config/standard/wsj.com.txt
new file mode 100755
index 00000000..467c39c2
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/wsj.com.txt
@@ -0,0 +1,29 @@
+title: //meta[@property="og:title"]/@content
+body: //div[@id='wsj-article-wrap']
+# is this still used?
+body: //div[@id='article_story_body']
+
+author: //h3[@class='byline']/a
+# for slide show content
+body: //ul[@id='imageSlide']//li[@class='firstSlide']//img | (//div[@class='txt_body']//p)[1]
+date: //li[@class='dateStamp']/small
+
+strip_id_or_class: insetFullBracket
+strip_id_or_class: insettipBox
+#strip_id_or_class: legacyInset
+strip_id_or_class: recipeACShopAndBuyText
+
+strip: //div[contains(@class, 'insetContent')]//cite
+strip: //*[contains(@style, 'visibility: hidden;')]
+strip: //div[contains(@class, 'insetContent') and not(contains(@class, 'image'))]
+strip: //div[contains(@class, 'carousel')]
+
+prune: no
+tidy: no
+
+test_url: http://www.wsj.com/articles/airasia-flight-8501-tail-recovered-1420878809
+test_contains: Saturday evening that the black boxes
+test_url: http://www.wsj.com/news/articles/SB10001424052702304626304579509100018004342
+test_url: http://www.wsj.com/article/SB10001424052970203363504577185322849515102.html
+# slide show
+test_url: http://www.wsj.com/article/SB10001424052970204791104577110550376458164.html
diff --git a/inc/3rdparty/site_config/standard/yosko.net.txt b/inc/3rdparty/site_config/standard/yosko.net.txt
new file mode 100644
index 00000000..99e711e3
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/yosko.net.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.yosko.net%2Farticle33%2Fsnippet-06-javascript-capturer-des-raccourcis-clavier-utilises-par-votre-navigateur
+
+body: //article//section
+test_url: http://www.yosko.net/article33/snippet-06-javascript-capturer-des-raccourcis-clavier-utilises-par-votre-navigateur
diff --git a/inc/3rdparty/site_config/standard/yourerie.com.txt b/inc/3rdparty/site_config/standard/yourerie.com.txt
index b46b09e8..46ee5ba1 100755
--- a/inc/3rdparty/site_config/standard/yourerie.com.txt
+++ b/inc/3rdparty/site_config/standard/yourerie.com.txt
@@ -1,2 +1,2 @@
-body: //div[@class="nxFullTextData"]
-test_url: http://yourerie.com/fulltext?nxd_id=306552
+body: //div[@itemprop="articleBody"]
+test_url: http://www.yourerie.com/news/news-article/d/story/cd-release-party-at-pi-downs/22898/G_gFL3mSQkWH_DW2wLuMOA
diff --git a/inc/3rdparty/site_config/standard/zeit.de.txt b/inc/3rdparty/site_config/standard/zeit.de.txt
index 9815d478..4e008946 100755
--- a/inc/3rdparty/site_config/standard/zeit.de.txt
+++ b/inc/3rdparty/site_config/standard/zeit.de.txt
@@ -1,3 +1,4 @@
+# 2015.07.08 [Marvin Dickhaus] fixed single_page_link
 # 2013.10.30 [rezor92] fixed single_page_link
 # 2012-12-23 [carlo@...] fixed half-assed headlines in articles, removed inline author profiles, adjusted picture captions
 # 2012-03-17 [dkless@...] Cut metadata parts in the beginning and the ends of the content block; copyright entries for pictures removed; Author fixed, not sure if old entries still valid (I left them); Weird problems with some pages addressed (see last section for removing hidden section)
@@ -5,8 +6,7 @@
 # 2011-08-23 [carlo@...] changed single page link to use print version: page works better, less ambiguity. Related cleanups and simplifications.
 # 2011-08-20 [carlo@...] added author, fixed date
 
-
-single_page_link: //a[@title='Auf einer Seite']
+single_page_link: //a[contains(@href, 'komplettansicht')]
 tidy: no
 
 title: //title
@@ -24,6 +24,8 @@ strip: //p[@class="copyright"]
 strip: //div[@class="copyright"]
 #Removes pagination links at the end
 strip: //div[@class="pagination"]
+#Removes link to main page at the bottom of some articles (Zur Startseite)
+strip: //a[@href='http://www.zeit.de']
 
 # Fix picture captions
 wrap_in(small): //p[@class="caption"]/text()
@@ -43,3 +45,4 @@ strip_id_or_class:"pagination"
 
 footnotes: no
 test_url: http://www.zeit.de/kultur/film/2012-12/Kurzfilmtag
+test_url: http://www.zeit.de/kultur/2015-07/kapitalismuskritik-selbstberuhigung-armin-nassehi
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 65675afe..7ec1602d 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -156,11 +156,14 @@ class Database {
     {
         $sql = "SELECT * FROM users_config WHERE user_id = ?";
         $query = $this->executeQuery($sql, array($id));
-        $result = $query->fetchAll();
-        $user_config = array();
+        $result = ($query) ? $query->fetchAll() : false;
+        $user_config = false;
+        if ($query) {
+            $user_config = array();
 
-        foreach ($result as $key => $value) {
-            $user_config[$value['name']] = $value['value'];
+            foreach ($result as $key => $value) {
+                $user_config[$value['name']] = $value['value'];
+            }
         }
 
         return $user_config;
@@ -171,11 +174,7 @@ class Database {
         $sql = "SELECT * FROM users WHERE username=?";
         $query = $this->executeQuery($sql, array($username));
         $login = $query->fetchAll();
-        if (isset($login[0])) {
-            return true;
-        } else {
-            return false;
-        }
+        return (isset($login[0]) && $query) ? true : false;
     }
 
     public function login($username, $password, $isauthenticated = FALSE)
@@ -187,10 +186,10 @@ class Database {
             $sql = "SELECT * FROM users WHERE username=? AND password=?";
             $query = $this->executeQuery($sql, array($username, $password));
         }
-        $login = $query->fetchAll();
+        $login = ($query) ? $query->fetchAll() : false;
 
         $user = array();
-        if (isset($login[0])) {
+        if ($login[0]) {
             $user['id'] = $login[0]['id'];
             $user['username'] = $login[0]['username'];
             $user['password'] = $login[0]['password'];
@@ -243,7 +242,7 @@ class Database {
     {
         $sql = 'SELECT count(*) FROM users'.( $username ? ' WHERE username=?' : '');
         $query = $this->executeQuery($sql, ( $username ? array($username) : array()));
-        list($count) = $query->fetch();
+        list($count) = ($query) ? $query->fetch() : false;
         return $count;
     }
     
@@ -252,7 +251,7 @@ class Database {
         $sql = "SELECT * FROM users WHERE id=?";
         $query = $this->executeQuery($sql, array($userID));
         $password = $query->fetchAll();
-        return isset($password[0]['password']) ? $password[0]['password'] : null;
+        return ($query) ? $password[0]['password'] : false;
     }
     
     public function deleteUserConfig($userID)
@@ -260,18 +259,22 @@ class Database {
         $sql_action = 'DELETE from users_config WHERE user_id=?';
         $params_action = array($userID);
         $query = $this->executeQuery($sql_action, $params_action);
-        return $query;
+        return ($query) ? $query : false;
     }
     
     public function deleteTagsEntriesAndEntries($userID)
     {
         $entries = $this->retrieveAll($userID);
-        foreach($entries as $entryid) {
-            $tags = $this->retrieveTagsByEntry($entryid);
-            foreach($tags as $tag) {
-                $this->removeTagForEntry($entryid,$tags);
+        if ($entries) {
+            foreach($entries as $entry) {
+                $tags = $this->retrieveTagsByEntry($entry['id']);
+                foreach($tags as $tag) {
+                    $this->removeTagForEntry($entry['id'], $tags);
+                }
+                $this->deleteById($entryid,$userID);
             }
-            $this->deleteById($entryid,$userID);
+        } else {
+            return false;
         }
     }
     
@@ -302,7 +305,7 @@ class Database {
         $query      = $this->executeQuery($sql, array($user_id));
         $entries    = $query->fetchAll();
 
-        return $entries;
+        return ($query) ? $entries : false;
     }
 
     public function retrieveUnfetchedEntriesCount($user_id)
@@ -320,29 +323,44 @@ class Database {
         $query      = $this->executeQuery($sql, array($user_id));
         $entries    = $query->fetchAll();
 
+        return ($query) ? $entries : false;
+    }
+
+    public function retrieveAllWithTags($user_id)
+    {
+        $entries = $this->retrieveAll($user_id);
+        if ($entries) {
+            $count = count($entries);
+            for ($i = 0; $i < $count; $i++) {
+              $tag_entries = $this->retrieveTagsByEntry($entries[$i]['id']);
+              $tags = [];
+              foreach ($tag_entries as $tag) {
+                $tags[] = $tag[1];
+              }
+              $entries[$i]['tags'] = implode(',', $tags);
+            }         
+        }
         return $entries;
     }
 
     public function retrieveOneById($id, $user_id)
     {
-        $entry  = NULL;
         $sql    = "SELECT * FROM entries WHERE id=? AND user_id=?";
         $params = array(intval($id), $user_id);
         $query  = $this->executeQuery($sql, $params);
         $entry  = $query->fetchAll();
 
-        return isset($entry[0]) ? $entry[0] : null;
+        return ($query) ? $entry[0] : false;
     }
 
     public function retrieveOneByURL($url, $user_id)
     {
-        $entry  = NULL;
         $sql    = "SELECT * FROM entries WHERE url=? AND user_id=?";
         $params = array($url, $user_id);
         $query  = $this->executeQuery($sql, $params);
         $entry  = $query->fetchAll();
 
-        return isset($entry[0]) ? $entry[0] : null;
+        return ($query) ? $entry[0] : false;
     }
 
     public function reassignTags($old_entry_id, $new_entry_id)
@@ -380,7 +398,8 @@ class Database {
                 $query = $this->executeQuery($sql, $params);
                 $entries = $query->fetchAll();
 
-                return $entries;
+                return ($query) ? $entries : false;
+
     }
 
     public function getEntriesByViewCount($view, $user_id, $tag_id = 0)
@@ -407,17 +426,57 @@ class Database {
         }
 
         $query = $this->executeQuery($sql, $params);
-        list($count) = $query->fetch();
+        list($count) = ($query) ? $query->fetch() : array(false);
 
         return $count;
     }
-    public function getRandomId($user_id) {
+    public function getRandomId($user_id, $view) {
         $random = (STORAGE == 'mysql') ? 'RAND()' : 'RANDOM()';
-        $sql = "SELECT id FROM entries WHERE user_id=? ORDER BY ". $random . " LIMIT 1";
-        $params = array($user_id);
+        switch ($view) {
+            case 'archive': 
+                $sql = "SELECT id FROM entries WHERE user_id=? AND is_read=? ORDER BY ". $random . " LIMIT 1";
+                $params = array($user_id,1);
+                break;
+            case 'fav':
+                $sql = "SELECT id FROM entries WHERE user_id=? AND is_fav=? ORDER BY ". $random . " LIMIT 1";
+                $params = array($user_id,1);
+                break;
+            default:
+                $sql = "SELECT id FROM entries WHERE user_id=? AND is_read=? ORDER BY ". $random . " LIMIT 1";
+                $params = array($user_id,0);
+                break;
+        }
         $query = $this->executeQuery($sql, $params);
         $id = $query->fetchAll();
 
+        return ($query) ? $id : false;
+    }
+
+    public function getPreviousArticle($id, $user_id) 
+    {
+        $sqlcondition = "is_read=0";
+        if (STORAGE == 'postgres') {
+            $sqlcondition = "is_read=false";
+        }
+        $sql = "SELECT id FROM entries WHERE id = (SELECT max(id) FROM entries WHERE id < ? AND " . $sqlcondition . ") AND user_id=? AND " . $sqlcondition;
+        $params = array($id, $user_id);
+        $query = $this->executeQuery($sql, $params);
+        $id_entry = ($query) ? $query->fetchAll() : false;
+        $id = ($query) ? $id_entry[0][0] : false;
+        return $id;
+    }
+
+    public function getNextArticle($id, $user_id) 
+    {
+        $sqlcondition = "is_read=0";
+        if (STORAGE == 'postgres') {
+            $sqlcondition = "is_read=false";
+        }
+        $sql = "SELECT id FROM entries WHERE id = (SELECT min(id) FROM entries WHERE id > ? AND " . $sqlcondition . ") AND user_id=? AND " . $sqlcondition;
+        $params = array($id, $user_id);
+        $query = $this->executeQuery($sql, $params);
+        $id_entry = ($query) ? $query->fetchAll() : false;
+        $id = ($query) ? $id_entry[0][0] : false;
         return $id;
     }
 
@@ -493,7 +552,7 @@ class Database {
         $sql_action .= $this->getEntriesOrder().' ' . $limit;
         $params_action = array($user_id, $search, $search, $search);
         $query = $this->executeQuery($sql_action, $params_action);
-        return $query->fetchAll();
+        return ($query) ? $query->fetchAll() : false;
         }
 
     public function retrieveAllTags($user_id, $term = NULL)
@@ -506,23 +565,23 @@ class Database {
           GROUP BY tags.id, tags.value
           ORDER BY tags.value";
         $query = $this->executeQuery($sql, (($term)? array($user_id, strtolower('%'.$term.'%')) : array($user_id) ));
-        $tags = $query->fetchAll();
+        $tags = ($query) ? $query->fetchAll() : false;
 
         return $tags;
     }
 
     public function retrieveTag($id, $user_id)
     {
-        $tag  = NULL;
         $sql    = "SELECT DISTINCT tags.* FROM tags
           LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
           LEFT JOIN entries ON tags_entries.entry_id=entries.id
           WHERE tags.id=? AND entries.user_id=?";
         $params = array(intval($id), $user_id);
         $query  = $this->executeQuery($sql, $params);
-        $tag  = $query->fetchAll();
+        $tags  = ($query) ? $query->fetchAll() : false;
+        $tag = ($query) ? $tags[0] : false;
 
-        return isset($tag[0]) ? $tag[0] : NULL;
+        return $tag[0];
     }
 
     public function retrieveEntriesByTag($tag_id, $user_id)
@@ -532,7 +591,7 @@ class Database {
             LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
             WHERE tags_entries.tag_id = ? AND entries.user_id=? ORDER by entries.id DESC";
         $query = $this->executeQuery($sql, array($tag_id, $user_id));
-        $entries = $query->fetchAll();
+        $entries = ($query) ? $query->fetchAll() : false;
 
         return $entries;
     }
@@ -544,7 +603,7 @@ class Database {
             LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
             WHERE tags_entries.entry_id = ?";
         $query = $this->executeQuery($sql, array($entry_id));
-        $tags = $query->fetchAll();
+        $tags = ($query) ? $query->fetchAll() : false;
 
         return $tags;
     }
@@ -554,38 +613,40 @@ class Database {
         $sql_action     = "DELETE FROM tags_entries WHERE tag_id=? AND entry_id=?";
         $params_action  = array($tag_id, $entry_id);
         $query          = $this->executeQuery($sql_action, $params_action);
-        return $query;
+        return ($query) ? $query : false;
     }
     
     public function cleanUnusedTag($tag_id)
     {
         $sql_action = "SELECT tags.* FROM tags JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags.id=?";
         $query = $this->executeQuery($sql_action,array($tag_id));
-        $tagstokeep = $query->fetchAll();
+        $tagstokeep = ($query) ? $query->fetchAll() : false;
         $sql_action = "SELECT tags.* FROM tags LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags.id=?";
         $query = $this->executeQuery($sql_action,array($tag_id));
-        $alltags = $query->fetchAll();
-        
-        foreach ($alltags as $tag) {
-            if ($tag && !in_array($tag,$tagstokeep)) {
-                $sql_action = "DELETE FROM tags WHERE id=?";
-                $params_action = array($tag[0]);
-                $this->executeQuery($sql_action, $params_action);
-                return true;
+        $alltags = ($query) ? $query->fetchAll() : false;
+
+        if ($tagstokeep && $alltags) {
+            foreach ($alltags as $tag) {
+                if ($tag && !in_array($tag,$tagstokeep)) {
+                    $sql_action = "DELETE FROM tags WHERE id=?";
+                    $params_action = array($tag[0]);
+                    $this->executeQuery($sql_action, $params_action);
+                    return true;
+                }
             }
+        } else {
+            return false;
         }
-        
     }
 
     public function retrieveTagByValue($value)
     {
-        $tag  = NULL;
         $sql    = "SELECT * FROM tags WHERE value=?";
         $params = array($value);
         $query  = $this->executeQuery($sql, $params);
-        $tag  = $query->fetchAll();
+        $tag  = ($query) ? $query->fetchAll() : false;
 
-        return isset($tag[0]) ? $tag[0] : null;
+        return ($query) ? $tag[0] : false;
     }
 
     public function createTag($value)
@@ -593,7 +654,7 @@ class Database {
         $sql_action = 'INSERT INTO tags ( value ) VALUES (?)';
         $params_action = array($value);
         $query = $this->executeQuery($sql_action, $params_action);
-        return $query;
+        return ($query) ? $query : false;
     }
 
     public function setTagToEntry($tag_id, $entry_id)
@@ -601,7 +662,7 @@ class Database {
         $sql_action = 'INSERT INTO tags_entries ( tag_id, entry_id ) VALUES (?, ?)';
         $params_action = array($tag_id, $entry_id);
         $query = $this->executeQuery($sql_action, $params_action);
-        return $query;
+        return ($query) ? $query : false;
     }
 
     private function getEntriesOrder()
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index fd2600f3..9014f455 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -200,27 +200,34 @@ class Poche
 
                 //search for possible duplicate
                 $duplicate = NULL;
-                $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
+                $clean_url = $url->getUrl();
 
-                $last_id = $this->store->add($url->getUrl(), $title, $body, $this->user->getId());
+                // Clean URL to remove parameters from feedburner and all this stuff. Taken from Shaarli.
+                $i=strpos($clean_url,'&utm_source='); if ($i!==false) $clean_url=substr($clean_url,0,$i);
+                $i=strpos($clean_url,'?utm_source='); if ($i!==false) $clean_url=substr($clean_url,0,$i);
+                $i=strpos($clean_url,'#xtor=RSS-'); if ($i!==false) $clean_url=substr($clean_url,0,$i);
+
+                $duplicate = $this->store->retrieveOneByURL($clean_url, $this->user->getId());
+
+                $last_id = $this->store->add($clean_url, $title, $body, $this->user->getId());
                 if ( $last_id ) {
-                    Tools::logm('add link ' . $url->getUrl());
+                    Tools::logm('add link ' . $clean_url);
                     if (DOWNLOAD_PICTURES) {
-                        $content = Picture::filterPicture($body, $url->getUrl(), $last_id);
+                        $content = Picture::filterPicture($body, $clean_url, $last_id);
                         Tools::logm('updating content article');
                         $this->store->updateContent($last_id, $content, $this->user->getId());
                     }
 
                     if ($duplicate != NULL) {
                         // duplicate exists, so, older entry needs to be deleted (as new entry should go to the top of list), BUT favorite mark and tags should be preserved
-                        Tools::logm('link ' . $url->getUrl() . ' is a duplicate');
+                        Tools::logm('link ' . $clean_url . ' is a duplicate');
                         // 1) - preserve tags and favorite, then drop old entry
                         $this->store->reassignTags($duplicate['id'], $last_id);
                         if ($duplicate['is_fav']) {
                           $this->store->favoriteById($last_id, $this->user->getId());
                         }
                         if ($this->store->deleteById($duplicate['id'], $this->user->getId())) {
-                          Tools::logm('previous link ' . $url->getUrl() .' entry deleted');
+                          Tools::logm('previous link ' . $clean_url .' entry deleted');
                         }
                     }
 
@@ -235,7 +242,7 @@ class Poche
                 }
                 else {
                     $this->messages->add('e', _('error during insertion : the link wasn\'t added'));
-                    Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl());
+                    Tools::logm('error during insertion : the link wasn\'t added ' . $clean_url);
                 }
 
                 if ($autoclose == TRUE) {
@@ -259,6 +266,15 @@ class Poche
                 }
                 foreach($entry_ids as $id) {
                     $msg = 'delete link #' . $id;
+
+                    // deleting tags and tags_entries
+                    $tags = $this->store->retrieveTagsByEntry($id);
+                    foreach ($tags as $tag) {
+                        $this->store->removeTagForEntry($id, $tag['id']);
+                        $this->store->cleanUnusedTag($tag['id']);
+                    }
+
+                    // deleting pictures
                     if ($this->store->deleteById($id, $this->user->getId())) {
                         if (DOWNLOAD_PICTURES) {
                             Picture::removeDirectory(ABS_PATH . $id);
@@ -303,11 +319,16 @@ class Poche
                 if ( Tools::isAjaxRequest() ) {
                   echo 1;
                   exit;
-                }
-                else {
+                } else {
                   Tools::redirect();
                 }
                 break;
+            case 'archive_and_next' :
+                $nextid = $this->store->getPreviousArticle($id, $this->user->getId());
+                $this->store->archiveById($id, $this->user->getId());
+                Tools::logm('archive link #' . $id);
+                Tools::redirect('?view=view&id=' . $nextid);
+                break;
             case 'archive_all' :
                 $this->store->archiveAll($this->user->getId());
                 Tools::logm('archive all links');
@@ -394,8 +415,9 @@ class Poche
             /* For some unknown reason I can't get displayView() to work here (it redirects to home view afterwards). So here's a dirty fix which redirects directly to URL */
             case 'random':
                 Tools::logm('get a random article');
-                if ($this->store->getRandomId($this->user->getId())) {
-                    $id_array = $this->store->getRandomId($this->user->getId());
+                $view = $_GET['view'];
+                if ($this->store->getRandomId($this->user->getId(),$view)) {
+                    $id_array = $this->store->getRandomId($this->user->getId(),$view);
                     $id = $id_array[0];
                     Tools::redirect('?view=view&id=' . $id[0]);
                     Tools::logm('got the article with id ' . $id[0]);
@@ -426,8 +448,9 @@ class Poche
                 $themes = $this->tpl->getInstalledThemes();
                 $languages = $this->language->getInstalledLanguages();
                 $token = $this->user->getConfigValue('token');
-                $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false;
+                $http_auth = isset($_SERVER['REMOTE_USER']);
                 $only_user = ($this->store->listUsers() > 1) ? false : true;
+                $https = substr(Tools::getPocheUrl(), 0, 5) == 'https';
                 $tpl_vars = array(
                     'themes' => $themes,
                     'languages' => $languages,
@@ -440,7 +463,8 @@ class Poche
                     'token' => $token,
                     'user_id' => $this->user->getId(),
                     'http_auth' => $http_auth,
-                    'only_user' => $only_user
+                    'only_user' => $only_user,
+                    'https' => $https
                 );
                 Tools::logm('config view');
                 break;
@@ -453,9 +477,31 @@ class Poche
                     Tools::redirect();
                 }
                 $tags = $this->store->retrieveTagsByEntry($id);
+                $all_tags = $this->store->retrieveAllTags($this->user->getId());
+                $maximus = 0;
+                foreach ($all_tags as $eachtag) { // search for the most times a tag is present
+                    if ($eachtag["entriescount"] > $maximus) $maximus = $eachtag["entriescount"];
+                }
+                foreach ($all_tags as $key => $eachtag) { // get the percentage of presence of each tag
+                    $percent = floor(($eachtag["entriescount"] / $maximus) * 100);
+
+                    if ($percent < 20): // assign a css class, depending on the number of entries count
+                        $cssclass = 'smallesttag';
+                    elseif ($percent >= 20 and $percent < 40):
+                        $cssclass = 'smalltag';
+                    elseif ($percent >= 40 and $percent < 60):
+                        $cssclass = 'mediumtag';
+                    elseif ($percent >= 60 and $percent < 80):
+                        $cssclass = 'largetag';
+                    else:
+                        $cssclass = 'largesttag';
+                    endif;
+                    $all_tags[$key]['cssclass'] = $cssclass;
+                }
                 $tpl_vars = array(
                     'entry_id' => $id,
                     'tags' => $tags,
+                    'alltags' => $all_tags,
                     'entry' => $entry,
                 );
                 break;
@@ -509,6 +555,20 @@ class Poche
                         $flattr->checkItem($entry['url'], $entry['id']);
                     }
                     
+                    # previous and next
+                    $previous = FALSE;
+                    $previous_id = $this->store->getPreviousArticle($id, $this->user->getId());
+                    $next = FALSE;
+                    $next_id = $this->store->getNextArticle($id, $this->user->getId());
+
+                    if ($this->store->retrieveOneById($previous_id, $this->user->getId())) {
+                        $previous = TRUE;
+                    }
+                    if ($this->store->retrieveOneById($next_id, $this->user->getId())) {
+                        $next = TRUE;
+                    }
+                    $navigate = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id);
+
                     # tags
                     $tags = $this->store->retrieveTagsByEntry($entry['id']);
 
@@ -516,7 +576,8 @@ class Poche
                         'entry' => $entry,
                         'content' => $content,
                         'flattr' => $flattr,
-                        'tags' => $tags
+                        'tags' => $tags,
+                        'navigate' => $navigate
                     );
                 }
                 else {
@@ -529,6 +590,7 @@ class Poche
                     'page_links' => '',
                     'nb_results' => '',
                     'listmode' => (isset($_COOKIE['listmode']) ? true : false),
+                    'view' => $view,
                 );
 
                 //if id is given - we retrieve entries by tag: id is tag id
@@ -539,7 +601,7 @@ class Poche
 
                 $count = $this->store->getEntriesByViewCount($view, $this->user->getId(), $id);
 
-                if ($count > 0) {
+                if ($count && $count > 0) {
                     $this->pagination->set_total($count);
                     $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')),
                         $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . (($id)?'&id='.$id:'') . '&' ));
@@ -593,9 +655,6 @@ class Poche
      */
     private function credentials()
     {
-        if (isset($_SERVER['PHP_AUTH_USER'])) {
-            return array($_SERVER['PHP_AUTH_USER'], 'php_auth', true);
-        }
         if (!empty($_POST['login']) && !empty($_POST['password'])) {
             return array($_POST['login'], $_POST['password'], false);
         }
@@ -635,6 +694,7 @@ class Poche
                 setlocale(LC_ALL, $language);
                 bindtextdomain($language, LOCALE);
                 textdomain($language);
+                bind_textdomain_codeset($language, 'UTF-8');
 
                 $this->messages->add('s', _('welcome to your wallabag'));
                 Tools::logm('login successful');
@@ -681,23 +741,45 @@ class Poche
           $html->load_file($_FILES['file']['tmp_name']);
           $data = array();
           $read = 0;
-          foreach (array('ol','ul') as $list) {
-            foreach ($html->find($list) as $ul) {
-              foreach ($ul->find('li') as $li) {
-                $tmpEntry = array();
-                  $a = $li->find('a');
-                  $tmpEntry['url'] = $a[0]->href;
-                  $tmpEntry['tags'] = $a[0]->tags;
-                  $tmpEntry['is_read'] = $read;
-                  if ($tmpEntry['url']) {
-                    $data[] = $tmpEntry;
+
+          if (Tools::get_doctype($html)->innertext == "<!DOCTYPE NETSCAPE-Bookmark-file-1>") {
+            // Firefox-bookmarks HTML
+            foreach (array('DL','ul') as $list) {
+                foreach ($html->find($list) as $ul) {
+                  foreach ($ul->find('DT') as $li) {
+                    $tmpEntry = array();
+                      $a = $li->find('A');
+                      $tmpEntry['url'] = $a[0]->href;
+                      $tmpEntry['tags'] = $a[0]->tags;
+                      $tmpEntry['is_read'] = $read;
+                      if ($tmpEntry['url']) {
+                        $data[] = $tmpEntry;
+                      }
                   }
-              }
-              # the second <ol/ul> is for read links
-              $read = ((sizeof($data) && $read)?0:1);
+                  # the second <ol/ul> is for read links
+                  $read = ((sizeof($data) && $read)?0:1);
+                }
             }
-          }
-        }
+          } else {
+            // regular HTML
+            foreach (array('ol','ul') as $list) {
+                foreach ($html->find($list) as $ul) {
+                  foreach ($ul->find('li') as $li) {
+                    $tmpEntry = array();
+                      $a = $li->find('a');
+                      $tmpEntry['url'] = $a[0]->href;
+                      $tmpEntry['tags'] = $a[0]->tags;
+                      $tmpEntry['is_read'] = $read;
+                      if ($tmpEntry['url']) {
+                        $data[] = $tmpEntry;
+                      }
+                  }
+                  # the second <ol/ul> is for read links
+                  $read = ((sizeof($data) && $read)?0:1);
+                }
+              }
+                }
+        }
 
             // for readability structure
 
@@ -715,7 +797,7 @@ class Poche
             $urlsInserted = array(); //urls of articles inserted
             foreach($data as $record) {
                 $url = trim(isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : ''));
-                if ($url and !in_array($url, $urlsInserted)) {
+                if (filter_var($url, FILTER_VALIDATE_URL) and !in_array($url, $urlsInserted)) {
                     $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ') . '</a> <a href="./?import">' . _('click to finish import') . '</a><a>');
                     $body = (isset($record['content']) ? $record['content'] : '');
                     $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive']) ? intval($record['archive']) : 0));
@@ -820,14 +902,18 @@ class Poche
      */
     public function export()
     {
-      $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
-      header('Content-Disposition: attachment; filename='.$filename);
-
-      $entries = $this->store->retrieveAll($this->user->getId());
-      echo $this->tpl->render('export.twig', array(
-          'export' => Tools::renderJson($entries),
-      ));
-      Tools::logm('export view');
+        $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
+        header('Content-Disposition: attachment; filename='.$filename);
+
+        $entries = $this->store->retrieveAllWithTags($this->user->getId());
+        if ($entries) {
+            echo $this->tpl->render('export.twig', array(
+            'export' => Tools::renderJson($entries),
+            ));
+            Tools::logm('export view');
+        } else {
+            Tools::logm('error accessing database while exporting');
+        }
     }
 
     /**
@@ -903,7 +989,7 @@ class Poche
         if (0 == $limit) {
             $limit = count($entries);
         }
-        if (count($entries) > 0) {
+        if ($entries && count($entries) > 0) {
             for ($i = 0; $i < min(count($entries), $limit); $i++) {
                 $entry = $entries[$i];
                 $newItem = $feed->createNewItem();
@@ -915,7 +1001,10 @@ class Poche
                 $feed->addItem($newItem);
             }
         }
-
+        else 
+            {
+                Tools::logm("database error while generating feeds");
+            }
         $feed->genarateFeed();
         exit;
     }
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 177b74d5..fb37a838 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -15,6 +15,7 @@ class Routing
     protected $view;
     protected $action;
     protected $id;
+    protected $autoclose;
     protected $url;
     protected $file;
     protected $defaultVars = array();
@@ -74,15 +75,6 @@ class Routing
         } elseif (ALLOW_REGISTER && isset($_GET['register'])){
             $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']);
             Tools::redirect();
-        } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
-            if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
-                $this->wallabag->login($this->referer);
-            } else {
-                $this->wallabag->messages->add('e', _('login failed: user doesn\'t exist'));
-                Tools::logm('user doesn\'t exist');
-                $tplFile = Tools::getTplFile('login');
-                $tplVars['http_auth'] = 1;
-            }
         } elseif(isset($_SERVER['REMOTE_USER'])) {
             if($this->wallabag->store->userExists($_SERVER['REMOTE_USER'])) {
                 $this->wallabag->login($this->referer);
@@ -111,9 +103,7 @@ class Routing
             $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
             $limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0);
             $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit);
-        } //elseif (ALLOW_REGISTER && isset($_GET['register'])) {
-            //$this->wallabag->register
-        //}
+        }
         
         //allowed ONLY to logged in user
         if (\Session::isLogged() === true) 
@@ -142,7 +132,7 @@ class Routing
                 $pdf->producePDF();
             } elseif (isset($_GET['import'])) {
                 $import = $this->wallabag->import();
-                $tplVars = array_merge($this->vars, $import);
+                $this->vars = array_merge($this->vars, $import);
             } elseif (isset($_GET['empty-cache'])) {
                 Tools::emptyCache();
             } elseif (isset($_GET['export'])) {
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index d0b31d4f..9c748391 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -40,6 +40,8 @@ final class Tools
      */
     public static function getPocheUrl()
     {
+        $baseUrl = "";
+
         $https = (!empty($_SERVER['HTTPS'])
                     && (strtolower($_SERVER['HTTPS']) == 'on'))
             || (isset($_SERVER["SERVER_PORT"])
@@ -72,8 +74,15 @@ final class Tools
             $serverport = '';
         }
 
-        return 'http' . ($https ? 's' : '') . '://'
-            . $host . $serverport . $scriptname;
+                // check if BASE_URL is configured
+                if(BASE_URL) {
+                        $baseUrl = BASE_URL;
+                } else {
+                        $baseUrl = 'http' . ($https ? 's' : '') . '://' . $host . $serverport;
+                }
+
+    return $baseUrl . $scriptname;
+    
     }
 
     /**
@@ -392,8 +401,11 @@ final class Tools
         );
 
         foreach ($files as $fileInfo) {
-            $todo = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
-            $todo($fileInfo->getRealPath());
+            $filename = $fileInfo->getFilename();
+            if (!$filename[0] == '.') {
+                $todo = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
+                $todo($fileInfo->getRealPath());
+            }
         }
 
         Tools::logm('empty cache');
@@ -417,4 +429,23 @@ final class Tools
         return str_replace('+', '', $token);
     }
 
+    /** 
+    *
+    * Returns the doctype for an HTML document (used for Mozilla Bookmarks)
+    * @param simple_html_dom $doc
+    * @return doctype $el
+    *
+    */
+
+    public static function get_doctype($doc)
+    {
+        $els = $doc->find('unknown');
+
+        foreach ($els as $e => $el) 
+            if ($el->parent()->tag == 'root') 
+                return $el;
+
+        return NULL;
+    }
+
 }
diff --git a/inc/poche/WallabagEBooks.class.php b/inc/poche/WallabagEBooks.class.php
index 55831571..ec1e4b27 100644
--- a/inc/poche/WallabagEBooks.class.php
+++ b/inc/poche/WallabagEBooks.class.php
@@ -96,7 +96,6 @@ class WallabagEpub extends WallabagEBooks
         $bookEnd = "</body>\n</html>\n";
 
         $log = new Logger("wallabag", TRUE);
-        $fileDir = CACHE;
 
         $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
         $log->logLine("new EPub()");
@@ -121,8 +120,12 @@ class WallabagEpub extends WallabagEBooks
         $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
         $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
 
-        $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
-
+        /* 
+        * Line not used but planned to be used
+        *        
+        *$cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
+        */
+        
         $log->logLine("Add Cover");
 
         $fullTitle = "<h1> " . $this->bookTitle . "</h1>\n";
@@ -180,8 +183,6 @@ class WallabagMobi extends WallabagEBooks
         $mobi = new MOBI();
         $content = new MOBIFile();
 
-        $messages = new Messages(); // for later
-        
         Tools::logm('Filling metadata for Mobi...');
 
         $content->set("title", $this->bookTitle);
@@ -243,10 +244,9 @@ class WallabagPDF extends WallabagEbooks
 
         $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
 
-        $i = 1;
         Tools::logm('Adding actual content...');
         foreach ($this->entries as $item) {
-                $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']);
+                $tags = $this->wallabag->store->retrieveTagsByEntry($item['id']);
                 foreach ($tags as $tag) {
                 $pdf->SetKeywords($tag['value']);
             }
@@ -260,7 +260,7 @@ class WallabagPDF extends WallabagEbooks
         $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
         
         
-        $pdf->Output($this->bookFileName . '.pdf', 'FD');
+        $pdf->Output('cache/' . $this->bookFileName . '.pdf', 'FD');
         }
         catch (Exception $e) {
             Tools::logm('TCPDF has encountered an error : '.$e->getMessage());
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 09d3aa9a..5d889ffd 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -31,6 +31,9 @@
 // Change this if not using the standart port for SSL - i.e you server is behind sslh
 @define ('SSL_PORT', 443);
 
+// Define this only if you use wallabag behind a proxy and if you encounter problems
+@define ('BASE_URL', ''); 
+
 @define ('MODE_DEMO', FALSE);
 @define ('DEBUG_POCHE', FALSE);