36 files changed, 435 insertions, 165 deletions

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/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.cloudflare.com.txt b/inc/3rdparty/site_config/standard/blog.cloudflare.com.txt
index db80a35f..9b7cf25c 100755
--- a/inc/3rdparty/site_config/standard/blog.cloudflare.com.txt
+++ b/inc/3rdparty/site_config/standard/blog.cloudflare.com.txt
@@ -3,7 +3,11 @@ title: substring-before(//title, '-')
 
 author: //a[ contains(@href, '/people') ]
 
-body: //div[ @class='post' ]
+body: //article[contains(concat(' ',normalize-space(@class),' '),' post ')]
+
+strip_id_or_class: section learn-more
+strip_id_or_class: section comments
+strip_id_or_class: disqus_thread
 
 # Date is impossible to retrieve since they use those stupid "fuzzy" dates, inserted through javascript, at posterous.
-test_url: http://blog.cloudflare.com/understanding-analytics-when-is-a-page-view-n
\ No newline at end of file
+test_url: http://blog.cloudflare.com/understanding-analytics-when-is-a-page-view-n
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/reddit.com.txt b/inc/3rdparty/site_config/standard/reddit.com.txt
index ba342c7c..c3f2d3e5 100755
--- a/inc/3rdparty/site_config/standard/reddit.com.txt
+++ b/inc/3rdparty/site_config/standard/reddit.com.txt
@@ -7,7 +7,9 @@ author: //p[@class="tagline"]/a
 # this doesn't work for some reason...?
 date: //p[@class="tagline"]//@datetime
 
-body: (//div[contains(@class, 'noncollapsed')]//div[contains(@class, 'usertext-body')])[1]
+#body: (//div[contains(@class, 'noncollapsed')]//div[contains(@class, 'usertext-body')])[1]
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' usertext-body ') and (contains(concat(' ',normalize-space(@class),' '),' may-blank-within ')) and (contains(concat(' ',normalize-space(@class),' '),' md-container '))]//div[contains(concat(' ',normalize-space(@class),' '),' md ')]
 
 strip_id_or_class: tagline
 strip_id_or_class: unvotable-message
@@ -18,4 +20,4 @@ single_page_link: //p[@class="title"]/a[contains(@href, 'http://')]
 
 test_url: http://www.reddit.com/r/truegaming/comments/wfe7r/i_wrote_about_the_problems_i_honestly_feel_that/
 test_url: http://www.reddit.com/r/worldnews/comments/1as37r/twelve_north_korean_soldiers_attempting_to_defect/
-test_url: http://www.reddit.com/r/WritingPrompts/comments/2786lw/wp_in_a_world_where_puns_are_illegal_one_man/chybk8e
\ No newline at end of file
+test_url: http://www.reddit.com/r/WritingPrompts/comments/2786lw/wp_in_a_world_where_puns_are_illegal_one_man/chybk8e
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/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/poche/Database.class.php b/inc/poche/Database.class.php
index 7be7a394..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,44 +323,44 @@ class Database {
         $query      = $this->executeQuery($sql, array($user_id));
         $entries    = $query->fetchAll();
 
-        return $entries;
+        return ($query) ? $entries : false;
     }
 
     public function retrieveAllWithTags($user_id)
     {
         $entries = $this->retrieveAll($user_id);
-        $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);
+        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)
@@ -395,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)
@@ -422,7 +426,7 @@ class Database {
         }
 
         $query = $this->executeQuery($sql, $params);
-        list($count) = $query->fetch();
+        list($count) = ($query) ? $query->fetch() : array(false);
 
         return $count;
     }
@@ -445,26 +449,34 @@ class Database {
         $query = $this->executeQuery($sql, $params);
         $id = $query->fetchAll();
 
-        return $id;
+        return ($query) ? $id : false;
     }
 
     public function getPreviousArticle($id, $user_id) 
     {
-        $sql = "SELECT id FROM entries WHERE id = (SELECT max(id) FROM entries WHERE id < ? AND is_read=0) AND user_id=? AND is_read=0";
+        $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->fetchAll();
-        $id = $id_entry[0][0];
+        $id_entry = ($query) ? $query->fetchAll() : false;
+        $id = ($query) ? $id_entry[0][0] : false;
         return $id;
     }
 
     public function getNextArticle($id, $user_id) 
     {
-        $sql = "SELECT id FROM entries WHERE id = (SELECT min(id) FROM entries WHERE id > ? AND is_read=0) AND user_id=? AND is_read=0";
+        $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->fetchAll();
-        $id = $id_entry[0][0];
+        $id_entry = ($query) ? $query->fetchAll() : false;
+        $id = ($query) ? $id_entry[0][0] : false;
         return $id;
     }
 
@@ -540,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)
@@ -553,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)
@@ -579,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;
     }
@@ -591,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;
     }
@@ -601,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)
@@ -640,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)
@@ -648,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 baa08788..ea196ce2 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -266,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);
@@ -278,7 +287,7 @@ class Poche
                     }
                     Tools::logm($msg);
                 }
-                Tools::redirect();
+                Tools::redirect('?');
                 break;
             case 'toggle_fav' :
                 $this->store->favoriteById($id, $this->user->getId());
@@ -441,6 +450,7 @@ class Poche
                 $token = $this->user->getConfigValue('token');
                 $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false;
                 $only_user = ($this->store->listUsers() > 1) ? false : true;
+                $https = substr(Tools::getPocheUrl(), 0, 5) == 'https';
                 $tpl_vars = array(
                     'themes' => $themes,
                     'languages' => $languages,
@@ -453,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;
@@ -590,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:'') . '&' ));
@@ -894,14 +905,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->retrieveAllWithTags($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');
+        }
     }
 
     /**
@@ -977,7 +992,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();
@@ -989,7 +1004,10 @@ class Poche
                 $feed->addItem($newItem);
             }
         }
-
+        else 
+            {
+                Tools::logm("database error while generating feeds");
+            }
         $feed->genarateFeed();
         exit;
     }
diff --git a/install/index.php b/install/index.php
index bb351095..f5bce50d 100755
--- a/install/index.php
+++ b/install/index.php
@@ -94,10 +94,14 @@ else if (isset($_POST['install'])) {
                 $errors[] = 'Impossible to create the SQLite database file. Please check your file permissions.';
             }
             else {
-                $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite';
-                $handle = new PDO($db_path);
-                $handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-                $sql_structure = "";
+                try {
+                    $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite';
+                    $handle = new PDO($db_path);
+                    $handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                    $sql_structure = "";
+                } catch (PDOException $e) {
+                    $errors[] = "SQLite has encountered an issue : " . $e->getMessage();
+                }
             }
         } else {
             // MySQL and Postgre
@@ -254,7 +258,6 @@ else if (isset($_POST['install'])) {
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="themes/baggy/img/apple-touch-icon-144x144-precomposed.png">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="themes/baggy/img/apple-touch-icon-72x72-precomposed.png">
         <link rel="apple-touch-icon-precomposed" href="themes/baggy/img/apple-touch-icon-precomposed.png">
-        <link href='//fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="themes/baggy/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="themes/baggy/css/font.css" media="all">
         <link rel="stylesheet" href="themes/baggy/css/main.css" media="all">
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 2fcb356a..99e1ad59 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 2fe4b352..6fca6d79 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "wallabag, a read it later open source system"
 msgstr "wallabag, a read it later open source system"
@@ -112,6 +112,9 @@ msgstr "Standard Firefox Add-On"
 msgid "Mozilla Services (Social API) Extension"
 msgstr "Mozilla Services (Social API) Extension"
 
+msgid "Mozilla Services (Social API) Extension needs an https connection"
+msgstr "Mozilla Services (Social API) Extension needs an https connection"
+
 msgid "Chrome Extension"
 msgstr "Chrome Extension"
 
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index f46ef600..626b0258 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index e8ba1547..a5e7bcd1 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.5.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "wallabag, a read it later open source system"
@@ -46,7 +46,8 @@ msgid "Login to wallabag"
 msgstr "Se connecter à wallabag"
 
 msgid "you are in demo mode, some features may be disabled."
-msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées."
+msgstr ""
+"vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées."
 
 msgid "Username"
 msgstr "Nom d'utilisateur"
@@ -82,7 +83,9 @@ msgid "Tag"
 msgstr "Tag"
 
 msgid "No tags found. You must view an article to set tags for it."
-msgstr "Pas de tags trouvés. Vous devez vous rendre sur un article pour choisir de lui associer des tags."
+msgstr ""
+"Pas de tags trouvés. Vous devez vous rendre sur un article pour choisir de "
+"lui associer des tags."
 
 msgid "No articles found."
 msgstr "Aucun article trouvé."
@@ -127,11 +130,12 @@ msgid "About wallabag"
 msgstr "À propos de wallabag"
 
 msgid ""
-"wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like "
-"ads or menus are deleted."
+"wallabag is a read-it-later application: you can save a web page by keeping "
+"only content. Elements like ads or menus are deleted."
 msgstr ""
-"wallabag est une application de lecture différée : vous pouvez sauver une page web et garder uniquement "
-"son contenu. Les élements comme les publicités ou les menus sont supprimés."
+"wallabag est une application de lecture différée : vous pouvez sauver une "
+"page web et garder uniquement son contenu. Les élements comme les publicités "
+"ou les menus sont supprimés."
 
 msgid "Project website"
 msgstr "Site web du projet"
@@ -167,11 +171,11 @@ msgid "Documentation"
 msgstr "Documentation"
 
 msgid ""
-"<a href=\"docs/\">Offline documentation</a> and <a href=\"https://doc.wallabag.org/\">online "
-"documentation</a> (up to date)"
+"<a href=\"docs/\">Offline documentation</a> and <a href=\"https://doc."
+"wallabag.org/\">online documentation</a> (up to date)"
 msgstr ""
-"<a href=\"docs/\">Documentation hors-ligne</a> et <a href=\"https://doc.wallabag.org/\">documentation "
-"en ligne</a> (à jour)"
+"<a href=\"docs/\">Documentation hors-ligne</a> et <a href=\"https://doc."
+"wallabag.org/\">documentation en ligne</a> (à jour)"
 
 msgid "Helping wallabag"
 msgstr "Aider wallabag"
@@ -206,6 +210,10 @@ msgstr "Add-On Firefox classique"
 msgid "Mozilla Services (Social API) Extension"
 msgstr "Extension Mozilla Services (Social API)"
 
+msgid "Mozilla Services (Social API) Extension needs an https connection"
+msgstr ""
+"L'extension Mozilla Services (Social API) nécessite une connection https"
+
 msgid "Chrome Extension"
 msgstr "Extension Chrome"
 
@@ -261,17 +269,19 @@ msgid "A more recent development version is available."
 msgstr "Une version de développement plus récente est disponible."
 
 msgid "You can clear cache to check the latest release."
-msgstr "Vous pouvez vider le cache pour vérifier que vous avez la dernière version."
+msgstr ""
+"Vous pouvez vider le cache pour vérifier que vous avez la dernière version."
 
 msgid "Feeds"
 msgstr "Flux"
 
 msgid ""
-"Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?"
-"feed&amp;action=generate'>here to generate it</a>."
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
 msgstr ""
-"Votre jeton de flux est actuellement vide et doit d'abord être généré pour activer les flux. Cliquez <a "
-"href='?feed&amp;action=generate'>ici</a> pour le générer."
+"Votre jeton de flux est actuellement vide et doit d'abord être généré pour "
+"activer les flux. Cliquez <a href='?feed&amp;action=generate'>ici</a> pour "
+"le générer."
 
 msgid "Unread feed"
 msgstr "Flux des non lus"
@@ -288,8 +298,12 @@ msgstr "Votre jeton :"
 msgid "Your user id:"
 msgstr "Votre ID utilisateur :"
 
-msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
-msgstr "Vous pouvez regénérer votre jeton : <a href='?feed&amp;action=generate'>génération !</a>."
+msgid ""
+"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
+"</a>."
+msgstr ""
+"Vous pouvez regénérer votre jeton : <a href='?feed&amp;"
+"action=generate'>génération !</a>."
 
 msgid "Change your theme"
 msgstr "Changer votre thème"
@@ -319,33 +333,38 @@ msgid "Import"
 msgstr "Importer"
 
 msgid ""
-"You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html "
-"format."
+"You can import your Pocket, Readability, Instapaper, Wallabag or any data in "
+"appropriate json or html format."
 msgstr ""
-"Vous pouvez importer depuis Pocket, Readability, Instapaper, wallabag, ou n'importe quel fichier au "
-"format JSON ou HTML approprié."
+"Vous pouvez importer depuis Pocket, Readability, Instapaper, wallabag, ou "
+"n'importe quel fichier au format JSON ou HTML approprié."
 
 msgid ""
-"Please select export file on your computer and press \"Import\" button below. Wallabag will parse your "
-"file, insert all URLs and start fetching of articles if required."
+"Please select export file on your computer and press \"Import\" button "
+"below. Wallabag will parse your file, insert all URLs and start fetching of "
+"articles if required."
 msgstr ""
-"Sélectionnez le fichier à importer sur votre disque dur, et pressez le bouton « Importer » ci-dessous. "
-"wallabag analysera votre fichier, ajoutera toutes les URL trouvées et commencera à télécharger les "
-"contenus si nécessaire."
+"Sélectionnez le fichier à importer sur votre disque dur, et pressez le "
+"bouton « Importer » ci-dessous. wallabag analysera votre fichier, ajoutera "
+"toutes les URL trouvées et commencera à télécharger les contenus si "
+"nécessaire."
 
 msgid ""
-"Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles "
-"are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)."
+"Fetching process is controlled by two constants in your config file: "
+"IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay "
+"between fetch of next batch of articles)."
 msgstr ""
-"Le processus d'import peut être paramétré par deux constantes dans votre fichier de configuration : "
-"IMPORT_LIMIT (combien d'articles sont téléchargés à la fois) et IMPORT_DELAY (le délai entre le "
-"téléchargement du prochain lot d'articles)."
+"Le processus d'import peut être paramétré par deux constantes dans votre "
+"fichier de configuration : IMPORT_LIMIT (combien d'articles sont téléchargés "
+"à la fois) et IMPORT_DELAY (le délai entre le téléchargement du prochain lot "
+"d'articles)."
 
 msgid "File:"
 msgstr "Fichier : "
 
 msgid "You can click here to fetch content for articles with no content."
-msgstr "Vous pouvez cliquer ici pour télécharger le contenu des articles vides."
+msgstr ""
+"Vous pouvez cliquer ici pour télécharger le contenu des articles vides."
 
 msgid "Export your wallabag data"
 msgstr "Exporter vos données de wallabag"
@@ -372,7 +391,8 @@ msgid "Delete Cache"
 msgstr "Vider le cache"
 
 msgid "Deleting the cache may help with display or other problems."
-msgstr "Vider le cache peut résoudre des problèmes d'affichage ou d'autres problèmes."
+msgstr ""
+"Vider le cache peut résoudre des problèmes d'affichage ou d'autres problèmes."
 
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
@@ -399,7 +419,9 @@ msgid "Delete account"
 msgstr "Supprimer le compte"
 
 msgid "You can delete your account by entering your password and validating."
-msgstr "Vous pouvez supprimer votre compte en entrant votre mot de passe et en validant."
+msgstr ""
+"Vous pouvez supprimer votre compte en entrant votre mot de passe et en "
+"validant."
 
 msgid "Be careful, data will be erased forever (that is a very long time)."
 msgstr "Attention, les données seront perdues pour toujours."
@@ -408,13 +430,16 @@ msgid "Type here your password"
 msgstr "Entrez votre mot de passe ici"
 
 msgid "You are the only user, you cannot delete your own account."
-msgstr "Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte."
+msgstr ""
+"Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte."
 
 msgid ""
-"To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)."
+"To completely remove wallabag, delete the wallabag folder on your web server "
+"(and eventual databases)."
 msgstr ""
-"Pour désinstaller complètement wallabag, supprimez le répertoire <code>wallabag</code> de votre serveur "
-"Web (ainsi que les bases de données éventuelles)."
+"Pour désinstaller complètement wallabag, supprimez le répertoire "
+"<code>wallabag</code> de votre serveur Web (ainsi que les bases de données "
+"éventuelles)."
 
 msgid "Save a link"
 msgstr "Ajouter un lien"
@@ -522,7 +547,9 @@ msgid "a more recent development version is available."
 msgstr "une version de développement plus récente est disponible."
 
 msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Merci d'exécuter le script d'importation en local car cela peut prendre du temps."
+msgstr ""
+"Merci d'exécuter le script d'importation en local car cela peut prendre du "
+"temps."
 
 msgid "More infos in the official doc:"
 msgstr "Plus d'infos dans la documentation officielle :"
@@ -589,11 +616,13 @@ msgid "install your wallabag"
 msgstr "installez votre wallabag"
 
 msgid ""
-"wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a "
-"href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+"wallabag is still not installed. Please fill the below form to install it. "
+"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
+"on wallabag website</a>."
 msgstr ""
-"wallabag n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez "
-"pas à <a href='http://doc.wallabag.org'>lire la documentation sur le site de wallabag</a>."
+"wallabag n'est pas encore installé. Merci de remplir le formulaire suivant "
+"pour l'installer. N'hésitez pas à <a href='http://doc.wallabag.org'>lire la "
+"documentation sur le site de wallabag</a>."
 
 msgid "Repeat your password"
 msgstr "Répétez votre mot de passe"
@@ -601,8 +630,12 @@ msgstr "Répétez votre mot de passe"
 msgid "Install"
 msgstr "Installer"
 
-msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
-msgstr "Vous pouvez vérifier votre configuration <a href='wallabag_compatibility_test.php'>ici</a>."
+msgid ""
+"You can <a href='wallabag_compatibility_test.php'>check your configuration "
+"here</a>."
+msgstr ""
+"Vous pouvez vérifier votre configuration <a "
+"href='wallabag_compatibility_test.php'>ici</a>."
 
 msgid "Tags"
 msgstr "Tags"
@@ -641,9 +674,12 @@ msgid "Enter your search here"
 msgstr "Entrez votre recherche ici"
 
 #, php-format
-msgid "The new user %s has been installed. Do you want to <a href=\"?logout\">logout ?</a>"
+msgid ""
+"The new user %s has been installed. Do you want to <a href=\"?logout"
+"\">logout ?</a>"
 msgstr ""
-"Le nouvel utilisateur « %s » a été ajouté. Voulez-vous vous  <a href=\"?logout\">déconnecter ?</a>"
+"Le nouvel utilisateur « %s » a été ajouté. Voulez-vous vous  <a href=\"?"
+"logout\">déconnecter ?</a>"
 
 #, php-format
 msgid "Error : An user with the name %s already exists !"
@@ -657,7 +693,9 @@ msgid "Error : The password is wrong !"
 msgstr "Erreur : le mot de passe est incorrect !"
 
 msgid "Error : You are the only user, you cannot delete your account !"
-msgstr "Erreur : Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte !"
+msgstr ""
+"Erreur : Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre "
+"compte !"
 
 msgid "Untitled"
 msgstr "Sans titre"
@@ -689,8 +727,12 @@ msgstr "en mode démo, vous ne pouvez pas mettre à jour votre mot de passe"
 msgid "your password has been updated"
 msgstr "votre mot de passe a été mis à jour"
 
-msgid "the two fields have to be filled & the password must be the same in the two fields"
-msgstr "les deux champs doivent être remplis & le mot de passe doit être le même dans les deux"
+msgid ""
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
+msgstr ""
+"les deux champs doivent être remplis & le mot de passe doit être le même "
+"dans les deux"
 
 msgid "still using the \""
 msgstr "vous utilisez toujours \""
@@ -826,11 +868,11 @@ msgid "Generate PDF file"
 msgstr "Générer fichier PDF"
 
 msgid ""
-"This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your "
-"server configuration."
+"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
+"articles, depending on your server configuration."
 msgstr ""
-"Ceci peut <b>prendre un moment</b> et même <b>échouer</b> si vous avez trop d'articles, selon la "
-"configuration matérielle de votre serveur."
+"Ceci peut <b>prendre un moment</b> et même <b>échouer</b> si vous avez trop "
+"d'articles, selon la configuration matérielle de votre serveur."
 
 msgid "Download the articles from this tag in an epub"
 msgstr "Télécharger les articles de ce tag dans un epub"
@@ -911,11 +953,12 @@ msgid "Produced by wallabag with PHPePub"
 msgstr "Produit par wallabag avec PHPePub"
 
 msgid ""
-"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</a> if you have trouble with "
-"the display of this E-Book on your device."
+"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
+"a> if you have trouble with the display of this E-Book on your device."
 msgstr ""
-"Merci d'ouvrir <a href='https://github.com/wallabag/wallabag/issues'>un ticket</a> si vous avez des "
-"problèmes d'affichage de cet E-Book sur votre appareil."
+"Merci d'ouvrir <a href='https://github.com/wallabag/wallabag/issues'>un "
+"ticket</a> si vous avez des problèmes d'affichage de cet E-Book sur votre "
+"appareil."
 
 msgid "Produced by wallabag with PHPMobi"
 msgstr "Produit par wallabag avec PHPMobi"
@@ -928,7 +971,8 @@ msgid "Hi, %1$s"
 msgstr "Salut, %1$s"
 
 msgid "Someone just created a wallabag account for you on %1$s."
-msgstr "Quelqu'un vient juste de créer un compte wallabag pour vous à l'adresse %1$s."
+msgstr ""
+"Quelqu'un vient juste de créer un compte wallabag pour vous à l'adresse %1$s."
 
 msgid "You've just created a wallabag account on %1$s"
 msgstr "Vous venez juste de vous créer un compte wallabag sur %1$s"
@@ -939,32 +983,49 @@ msgstr "Votre identifiant is %1$s."
 msgid "Have fun with it !"
 msgstr "Amusez-vous bien !"
 
-msgid "This is an automatically generated message, no one will answer if you respond to it."
-msgstr "Ceci est un message généré automatiquement, personne ne vous répondra si vous y répondez."
+msgid ""
+"This is an automatically generated message, no one will answer if you "
+"respond to it."
+msgstr ""
+"Ceci est un message généré automatiquement, personne ne vous répondra si "
+"vous y répondez."
 
 msgid ""
-"Note : The password has been chosen by the person who created your account. Get in touch with that "
-"person to know your password and change it as soon as possible"
+"Note : The password has been chosen by the person who created your account. "
+"Get in touch with that person to know your password and change it as soon as "
+"possible"
 msgstr ""
-"Note : Votre mot de passe a été défini par la personne ayant créé votre compte. Vous devriez entrer en "
-"contact avec cette personne pour connaître votre mot de passe et le changer dès que possible"
+"Note : Votre mot de passe a été défini par la personne ayant créé votre "
+"compte. Vous devriez entrer en contact avec cette personne pour connaître "
+"votre mot de passe et le changer dès que possible"
 
-msgid "The new user %1$s has been sent an email at %2$s. You may have to check spam folder."
+msgid ""
+"The new user %1$s has been sent an email at %2$s. You may have to check spam "
+"folder."
 msgstr ""
-"Un email a été envoyé au nouvel utilisateur %1$s à l'adresse %2$s. Il peut être nécessaire de vérifier "
-"le dossier des spams."
+"Un email a été envoyé au nouvel utilisateur %1$s à l'adresse %2$s. Il peut "
+"être nécessaire de vérifier le dossier des spams."
 
 msgid "A problem has been encountered while sending the confirmation email"
 msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation"
 
-msgid "The server did not authorize sending a confirmation email, but the user was created."
-msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation, mais l'utilisateur a été créé."
+msgid ""
+"The server did not authorize sending a confirmation email, but the user was "
+"created."
+msgstr ""
+"Le serveur n'autorise pas l'envoi d'un email de confirmation, mais "
+"l'utilisateur a été créé."
 
-msgid "The user was created, but no email was sent because email was not filled in"
-msgstr "L'utilisateur a été créé, mais aucun mail n'a été envoyé car l'email n'était pas renseigné"
+msgid ""
+"The user was created, but no email was sent because email was not filled in"
+msgstr ""
+"L'utilisateur a été créé, mais aucun mail n'a été envoyé car l'email n'était "
+"pas renseigné"
 
 msgid "Mail function is disabled. You can't send emails from your server"
-msgstr "La fonction mail est désactivée. Vous ne pouvez pas envoyer d'E-mails depuis votre serveur"
+msgstr ""
+"La fonction mail est désactivée. Vous ne pouvez pas envoyer d'E-mails depuis "
+"votre serveur"
 
 msgid "You didn't set your kindle's email adress !"
 msgstr "Vous n'avez pas renseigné l'adresse E-mail de votre Kindle !"
diff --git a/themes/_global/js/keyboard.js b/themes/_global/js/keyboard.js
index 4469248d..04000f47 100644
--- a/themes/_global/js/keyboard.js
+++ b/themes/_global/js/keyboard.js
@@ -63,6 +63,9 @@ function actionArticle(id) {
       case 77:
         markReadArticle(id); // m key letter
       break;
+      case 78:
+        markReadAndNextArticle(id); // n letter
+      break;
     }
 
   }, false);
@@ -86,6 +89,12 @@ function markReadArticle(id) {
   }
 }
 
+function markReadAndNextArticle(id) {
+   if (id) {
+          window.location = window.location.origin + window.location.pathname + '?action=archive_and_next&id=' + id;
+  }
+}
+
 function homeNavigation() {
   selectedArticle = $('.entrie:first');
   window.addEventListener("keydown", function (event) {
@@ -144,5 +153,7 @@ function goSelectPrev(selectedArticle,number) {
 }
 
 function enterArticle(selectedArticle) {
-  window.location = selectedArticle.find('a:first').attr('href');
+  if (!$("#bagit").hasClass("current")) {
+    window.location = selectedArticle.find('a:first').attr('href');
+  }
 }
\ No newline at end of file
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 2e40178e..6f55cd75 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -17,7 +17,7 @@
             <h3>{% trans "Browser Addons" %}</h3>
             <ul>
                 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
-                <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
+                {% if https %}<li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>{% else %}<li>{% trans "Mozilla Services (Social API) Extension needs an https connection" %}</li>{% endif %}
                 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
             </ul>
             <h3>{% trans "Mobile Apps" %}</h3>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index e39826c3..24e3e570 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -17,7 +17,7 @@
             <h3>Browser Plugins</h3>
             <ul>
                 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
-                <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
+                {% if https %}<li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>{% else %}<li>{% trans "Mozilla Services (Social API) Extension needs an https connection" %}</li>{% endif %}
                 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
             </ul>
             <h3>Mobile Apps</h3>