aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-10 01:28:24 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-10 01:28:24 +0100
commit2e4e94a7a420790cd05250e4191bd0e60f81f788 (patch)
tree25725232e434853545acab714b03eefd8defd81f /inc/poche
parent8f209e8a268e198bb449021c30fc783d69ee9818 (diff)
parentcefdc12380c5acee927e3f8e1cb85213f4b1475d (diff)
downloadwallabag-2e4e94a7a420790cd05250e4191bd0e60f81f788.tar.gz
wallabag-2e4e94a7a420790cd05250e4191bd0e60f81f788.tar.zst
wallabag-2e4e94a7a420790cd05250e4191bd0e60f81f788.zip
Merge branch 'dev' into savewithtags
Diffstat (limited to 'inc/poche')
-rwxr-xr-xinc/poche/Poche.class.php4
-rwxr-xr-xinc/poche/Routing.class.php3
-rwxr-xr-xinc/poche/config.inc.default.php1
3 files changed, 5 insertions, 3 deletions
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
195 } 195 }
196 196
197 if ($autoclose == TRUE) { 197 if ($autoclose == TRUE) {
198 Tools::redirect('?view=home'); 198 Tools::redirect('?view=home&closewin=true');
199 } else { 199 } else {
200 Tools::redirect('?view=home&closewin=true'); 200 Tools::redirect('?view=home');
201 } 201 }
202 return $last_id; 202 return $last_id;
203 break; 203 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
33 $this->view = Tools::checkVar('view', 'home'); 33 $this->view = Tools::checkVar('view', 'home');
34 $this->action = Tools::checkVar('action'); 34 $this->action = Tools::checkVar('action');
35 $this->id = Tools::checkVar('id'); 35 $this->id = Tools::checkVar('id');
36 $this->autoclose = Tools::checkVar('autoclose',FALSE);
36 $_SESSION['sort'] = Tools::checkVar('sort', 'id'); 37 $_SESSION['sort'] = Tools::checkVar('sort', 'id');
37 $this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : ''); 38 $this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
38 } 39 }
@@ -64,7 +65,7 @@ class Routing
64 $tplVars = array(); 65 $tplVars = array();
65 66
66 if (\Session::isLogged()) { 67 if (\Session::isLogged()) {
67 $this->wallabag->action($this->action, $this->url, $this->id); 68 $this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
68 $tplFile = Tools::getTplFile($this->view); 69 $tplFile = Tools::getTplFile($this->view);
69 $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id)); 70 $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
70 } elseif(isset($_SERVER['PHP_AUTH_USER'])) { 71 } 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 @@
44@define ('SHARE_MAIL', TRUE); 44@define ('SHARE_MAIL', TRUE);
45@define ('SHARE_SHAARLI', FALSE); 45@define ('SHARE_SHAARLI', FALSE);
46@define ('SHAARLI_URL', 'http://myshaarliurl.com'); 46@define ('SHAARLI_URL', 'http://myshaarliurl.com');
47@define ('SHARE_EVERNOTE', FALSE);
47@define ('SHARE_DIASPORA', FALSE); 48@define ('SHARE_DIASPORA', FALSE);
48@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end 49@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end
49@define ('FLATTR', TRUE); 50@define ('FLATTR', TRUE);