6 files changed, 16 insertions, 8 deletions

diff --git a/inc/3rdparty/site_config/standard/gist.github.com.txt b/inc/3rdparty/site_config/standard/gist.github.com.txt
index 90207862..f11b7b42 100755
--- a/inc/3rdparty/site_config/standard/gist.github.com.txt
+++ b/inc/3rdparty/site_config/standard/gist.github.com.txt
@@ -1,6 +1,4 @@
-body: //div[@class="highlight"]/pre
 
-prune: no
-tidy: no
-
-test_url: https://gist.github.com/1258908
\ No newline at end of file
+title: //div[contains(@class,'gist-description')]
+body: //div[contains(@class,'blob-wrapper')]
+test_url: https://gist.github.com/staltz/868e7e9bc2a7b8c1f754
diff --git a/inc/3rdparty/site_config/standard/jungle-world.com.txt b/inc/3rdparty/site_config/standard/jungle-world.com.txt
new file mode 100644
index 00000000..61e0087f
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/jungle-world.com.txt
@@ -0,0 +1,3 @@
+title: //h1
+body: //div[contains(@class,'story')]
+test_url: http://jungle-world.com/artikel/2015/02/51207.html
diff --git a/inc/3rdparty/site_config/standard/toolinux.com.txt b/inc/3rdparty/site_config/standard/toolinux.com.txt
new file mode 100755
index 00000000..3f1a8405
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/toolinux.com.txt
@@ -0,0 +1,5 @@
+title: //h2[contains(@class,'news')]
+body: //div[contains(@class,'articleContent')]
+date: substring-after(//div[@class = 'SupaDate']/text(), 'le')
+
+test_url: http://www.toolinux.com/Wi-Fi-Linksys-WRT-la-legende-de
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index f9928145..a601f0a8 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -195,9 +195,9 @@ class Poche
                 }
 
                 if ($autoclose == TRUE) {
-                  Tools::redirect('?view=home');
+                    Tools::redirect('?view=home&closewin=true');
                 } else {
-                  Tools::redirect('?view=home&closewin=true');
+                    Tools::redirect('?view=home');
                 }
                 return $last_id;
                 break;
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index a8d00b89..709831d5 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -33,6 +33,7 @@ class Routing
         $this->view         = Tools::checkVar('view', 'home');
         $this->action       = Tools::checkVar('action');
         $this->id           = Tools::checkVar('id');
+        $this->autoclose    = Tools::checkVar('autoclose',FALSE);
         $_SESSION['sort']   = Tools::checkVar('sort', 'id');
         $this->url          = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
     }
@@ -64,7 +65,7 @@ class Routing
         $tplVars = array();
 
         if (\Session::isLogged()) {
-            $this->wallabag->action($this->action, $this->url, $this->id);
+            $this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
             $tplFile = Tools::getTplFile($this->view);
             $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
         } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index aaaf12a6..91b50c24 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -44,6 +44,7 @@
 @define ('SHARE_MAIL', TRUE);
 @define ('SHARE_SHAARLI', FALSE);
 @define ('SHAARLI_URL', 'http://myshaarliurl.com');
+@define ('SHARE_EVERNOTE', FALSE);
 @define ('SHARE_DIASPORA', FALSE);
 @define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end
 @define ('FLATTR', TRUE);