diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-01-23 16:34:56 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-01-23 16:34:56 +0100 |
commit | 121691e90026dcfaaecef0a1db07d40cd43a9278 (patch) | |
tree | 43e5f079b926c7c79b265c1453c90a12c6f0486b /inc/poche | |
parent | cdde19d6096c85a3ed9b9399482bcc04bb79583c (diff) | |
download | wallabag-121691e90026dcfaaecef0a1db07d40cd43a9278.tar.gz wallabag-121691e90026dcfaaecef0a1db07d40cd43a9278.tar.zst wallabag-121691e90026dcfaaecef0a1db07d40cd43a9278.zip |
working on registration support
Diffstat (limited to 'inc/poche')
-rwxr-xr-x | inc/poche/Poche.class.php | 4 | ||||
-rwxr-xr-x | inc/poche/Routing.class.php | 10 | ||||
-rwxr-xr-x | inc/poche/Tools.class.php | 2 | ||||
-rwxr-xr-x | inc/poche/config.inc.default.php | 4 |
4 files changed, 17 insertions, 3 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 81a18c86..36c8693c 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -76,6 +76,7 @@ class Poche | |||
76 | */ | 76 | */ |
77 | public function createNewUser($username, $password, $email = "") | 77 | public function createNewUser($username, $password, $email = "") |
78 | { | 78 | { |
79 | Tools::logm('Trying to create a new user...'); | ||
79 | if (!empty($username) && !empty($password)){ | 80 | if (!empty($username) && !empty($password)){ |
80 | $newUsername = filter_var($username, FILTER_SANITIZE_STRING); | 81 | $newUsername = filter_var($username, FILTER_SANITIZE_STRING); |
81 | $email = filter_var($email, FILTER_SANITIZE_STRING); | 82 | $email = filter_var($email, FILTER_SANITIZE_STRING); |
@@ -96,6 +97,9 @@ class Poche | |||
96 | Tools::redirect(); | 97 | Tools::redirect(); |
97 | } | 98 | } |
98 | } | 99 | } |
100 | else { | ||
101 | Tools::logm('Password or username were empty'); | ||
102 | } | ||
99 | } | 103 | } |
100 | 104 | ||
101 | /** | 105 | /** |
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index be06a433..8d6abefd 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php | |||
@@ -67,6 +67,12 @@ class Routing | |||
67 | $this->wallabag->action($this->action, $this->url, $this->id); | 67 | $this->wallabag->action($this->action, $this->url, $this->id); |
68 | $tplFile = Tools::getTplFile($this->view); | 68 | $tplFile = Tools::getTplFile($this->view); |
69 | $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id)); | 69 | $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id)); |
70 | } elseif(ALLOW_REGISTER && isset($_GET['registerform'])) { | ||
71 | Tools::logm('register'); | ||
72 | $tplFile = Tools::getTplFile('register'); | ||
73 | } elseif (ALLOW_REGISTER && isset($_GET['register'])){ | ||
74 | $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); | ||
75 | Tools::redirect(); | ||
70 | } elseif(isset($_SERVER['PHP_AUTH_USER'])) { | 76 | } elseif(isset($_SERVER['PHP_AUTH_USER'])) { |
71 | if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) { | 77 | if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) { |
72 | $this->wallabag->login($this->referer); | 78 | $this->wallabag->login($this->referer); |
@@ -104,7 +110,9 @@ class Routing | |||
104 | $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); | 110 | $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); |
105 | $limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0); | 111 | $limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0); |
106 | $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit); | 112 | $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit); |
107 | } | 113 | } //elseif (ALLOW_REGISTER && isset($_GET['register'])) { |
114 | //$this->wallabag->register | ||
115 | //} | ||
108 | 116 | ||
109 | //allowed ONLY to logged in user | 117 | //allowed ONLY to logged in user |
110 | if (\Session::isLogged() === true) | 118 | if (\Session::isLogged() === true) |
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 7ccfc069..d0b31d4f 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
@@ -117,7 +117,7 @@ final class Tools | |||
117 | { | 117 | { |
118 | $views = array( | 118 | $views = array( |
119 | 'install', 'import', 'export', 'config', 'tags', | 119 | 'install', 'import', 'export', 'config', 'tags', |
120 | 'edit-tags', 'view', 'login', 'error', 'about' | 120 | 'edit-tags', 'view', 'login', 'error', 'about', 'register' |
121 | ); | 121 | ); |
122 | 122 | ||
123 | return (in_array($view, $views) ? $view . '.twig' : 'home.twig'); | 123 | return (in_array($view, $views) ? $view . '.twig' : 'home.twig'); |
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index a159e713..3156b56c 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php | |||
@@ -31,7 +31,9 @@ | |||
31 | @define ('SSL_PORT', 443); | 31 | @define ('SSL_PORT', 443); |
32 | 32 | ||
33 | @define ('MODE_DEMO', FALSE); | 33 | @define ('MODE_DEMO', FALSE); |
34 | @define ('DEBUG_POCHE', FALSE); | 34 | @define ('DEBUG_POCHE', TRUE); |
35 | |||
36 | @define ('ALLOW_REGISTER', TRUE); | ||
35 | 37 | ||
36 | //default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL. | 38 | //default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL. |
37 | @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE); | 39 | @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE); |