diff options
Diffstat (limited to 'inc')
-rwxr-xr-x | inc/poche/Database.class.php | 4 | ||||
-rwxr-xr-x | inc/poche/Poche.class.php | 5 | ||||
-rw-r--r-- | inc/poche/Routing.class.php | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 2c80b64b..8b52a9df 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
@@ -113,10 +113,10 @@ class Database { | |||
113 | $query = $this->executeQuery($sql, array()); | 113 | $query = $this->executeQuery($sql, array()); |
114 | } | 114 | } |
115 | 115 | ||
116 | public function install($login, $password) | 116 | public function install($login, $password, $email = '') |
117 | { | 117 | { |
118 | $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)'; | 118 | $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)'; |
119 | $params = array($login, $password, $login, ' '); | 119 | $params = array($login, $password, $login, $email); |
120 | $query = $this->executeQuery($sql, $params); | 120 | $query = $this->executeQuery($sql, $params); |
121 | 121 | ||
122 | $sequence = ''; | 122 | $sequence = ''; |
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index a49413f2..c8a09f30 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -74,12 +74,13 @@ class Poche | |||
74 | /** | 74 | /** |
75 | * Creates a new user | 75 | * Creates a new user |
76 | */ | 76 | */ |
77 | public function createNewUser($username, $password) | 77 | public function createNewUser($username, $password, $email = "") |
78 | { | 78 | { |
79 | if (!empty($username) && !empty($password)){ | 79 | if (!empty($username) && !empty($password)){ |
80 | $newUsername = filter_var($username, FILTER_SANITIZE_STRING); | 80 | $newUsername = filter_var($username, FILTER_SANITIZE_STRING); |
81 | $email = filter_var($email, FILTER_SANITIZE_STRING); | ||
81 | if (!$this->store->userExists($newUsername)){ | 82 | if (!$this->store->userExists($newUsername)){ |
82 | if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername))) { | 83 | if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) { |
83 | Tools::logm('The new user ' . $newUsername . ' has been installed'); | 84 | Tools::logm('The new user ' . $newUsername . ' has been installed'); |
84 | $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername)); | 85 | $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername)); |
85 | Tools::redirect(); | 86 | Tools::redirect(); |
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 2db57d12..6643397a 100644 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php | |||
@@ -107,7 +107,7 @@ class Routing | |||
107 | // update password | 107 | // update password |
108 | $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); | 108 | $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); |
109 | } elseif (isset($_GET['newuser'])) { | 109 | } elseif (isset($_GET['newuser'])) { |
110 | $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); | 110 | $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']); |
111 | } elseif (isset($_GET['deluser'])) { | 111 | } elseif (isset($_GET['deluser'])) { |
112 | $this->wallabag->deleteUser($_POST['password4deletinguser']); | 112 | $this->wallabag->deleteUser($_POST['password4deletinguser']); |
113 | } elseif (isset($_GET['epub'])) { | 113 | } elseif (isset($_GET['epub'])) { |