diff options
Diffstat (limited to 'inc/poche/Routing.class.php')
-rwxr-xr-x | inc/poche/Routing.class.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 8d6abefd..e9b67771 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(ALLOW_REGISTER && isset($_GET['registerform'])) { | 71 | } elseif(ALLOW_REGISTER && isset($_GET['registerform'])) { |
@@ -124,7 +125,7 @@ class Routing | |||
124 | // update password | 125 | // update password |
125 | $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); | 126 | $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); |
126 | } elseif (isset($_GET['newuser'])) { | 127 | } elseif (isset($_GET['newuser'])) { |
127 | $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); | 128 | $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail'], true); |
128 | } elseif (isset($_GET['deluser'])) { | 129 | } elseif (isset($_GET['deluser'])) { |
129 | $this->wallabag->deleteUser($_POST['password4deletinguser']); | 130 | $this->wallabag->deleteUser($_POST['password4deletinguser']); |
130 | } elseif (isset($_GET['epub'])) { | 131 | } elseif (isset($_GET['epub'])) { |