pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' into register

Browse Source
This commit is contained in:
Thomas Citharel
2015-02-13 19:15:31 +01:00
parent 1fbef3bfb5 dc6ec98758
commit 0eae6d14b8
41 changed files with 2062 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
inc/poche/Routing.class.php
View File

@ -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(ALLOW_REGISTER && isset($_GET['registerform'])) {
@ -124,7 +125,7 @@ class Routing
// update password
$this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
} elseif (isset($_GET['newuser'])) {
$this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
$this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail'], true);
} elseif (isset($_GET['deluser'])) {
$this->wallabag->deleteUser($_POST['password4deletinguser']);
} elseif (isset($_GET['epub'])) {