From 985ce3ec53a71174b30b1872813cb69cab8d7081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 25 Oct 2013 14:25:37 +0200
Subject: bug fix #259: Deleting article doesn't redirect

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 0766cd51..39d43761 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -374,7 +374,7 @@ class Poche
                     $msg = 'error : can\'t delete link #' . $id;
                 }
                 Tools::logm($msg);
-                Tools::redirect();
+                Tools::redirect('?');
                 break;
             case 'toggle_fav' :
                 $this->store->favoriteById($id, $this->user->getId());
-- 
cgit v1.2.3


From 363bc4eb8642d464cc0c099f7ab72a425b56b463 Mon Sep 17 00:00:00 2001
From: banux <banux@helheim.net>
Date: Sun, 27 Oct 2013 07:37:05 +0100
Subject: Add a autoclose parameters. When we use sharing method in plugins
 like the tiny tiny rss one or the firefox plugins we can passe the
 autoclose=true parameters that close the popup.

---
 inc/poche/Poche.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 39d43761..5d807268 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -327,7 +327,7 @@ class Poche
     /**
      * Call action (mark as fav, archive, delete, etc.)
      */
-    public function action($action, Url $url, $id = 0, $import = FALSE)
+    public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE)
     {
         switch ($action)
         {
@@ -358,7 +358,11 @@ class Poche
                 }
 
                 if (!$import) {
-                    Tools::redirect('?view=home');
+                    if ($autoclose == TRUE) {
+                      Tools::redirect('?view=home');
+                    } else {
+                      Tools::redirect('?view=home&autoclose=true');
+                    }
                 }
                 break;
             case 'delete':
-- 
cgit v1.2.3


From f616ab60efc502b919b9b72f81aee2975b2e8465 Mon Sep 17 00:00:00 2001
From: banux <banux@helheim.net>
Date: Sun, 27 Oct 2013 07:47:14 +0100
Subject: use 2 seprate variable for autoclosing windows to avoid to quick
 closing when sharing, the popup can be close before the link is save

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 5d807268..3ecaf084 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -361,7 +361,7 @@ class Poche
                     if ($autoclose == TRUE) {
                       Tools::redirect('?view=home');
                     } else {
-                      Tools::redirect('?view=home&autoclose=true');
+                      Tools::redirect('?view=home&closewin=true');
                     }
                 }
                 break;
-- 
cgit v1.2.3