forked from wallabag/wallabag
working on registration support
This commit is contained in:
@ -76,6 +76,7 @@ class Poche
|
||||
*/
|
||||
public function createNewUser($username, $password, $email = "")
|
||||
{
|
||||
Tools::logm('Trying to create a new user...');
|
||||
if (!empty($username) && !empty($password)){
|
||||
$newUsername = filter_var($username, FILTER_SANITIZE_STRING);
|
||||
$email = filter_var($email, FILTER_SANITIZE_STRING);
|
||||
@ -96,6 +97,9 @@ class Poche
|
||||
Tools::redirect();
|
||||
}
|
||||
}
|
||||
else {
|
||||
Tools::logm('Password or username were empty');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -67,6 +67,12 @@ class Routing
|
||||
$this->wallabag->action($this->action, $this->url, $this->id);
|
||||
$tplFile = Tools::getTplFile($this->view);
|
||||
$tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
|
||||
} elseif(ALLOW_REGISTER && isset($_GET['registerform'])) {
|
||||
Tools::logm('register');
|
||||
$tplFile = Tools::getTplFile('register');
|
||||
} elseif (ALLOW_REGISTER && isset($_GET['register'])){
|
||||
$this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
|
||||
Tools::redirect();
|
||||
} elseif(isset($_SERVER['PHP_AUTH_USER'])) {
|
||||
if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
|
||||
$this->wallabag->login($this->referer);
|
||||
@ -104,7 +110,9 @@ class Routing
|
||||
$tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
|
||||
$limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0);
|
||||
$this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit);
|
||||
}
|
||||
} //elseif (ALLOW_REGISTER && isset($_GET['register'])) {
|
||||
//$this->wallabag->register
|
||||
//}
|
||||
|
||||
//allowed ONLY to logged in user
|
||||
if (\Session::isLogged() === true)
|
||||
|
||||
@ -117,7 +117,7 @@ final class Tools
|
||||
{
|
||||
$views = array(
|
||||
'install', 'import', 'export', 'config', 'tags',
|
||||
'edit-tags', 'view', 'login', 'error', 'about'
|
||||
'edit-tags', 'view', 'login', 'error', 'about', 'register'
|
||||
);
|
||||
|
||||
return (in_array($view, $views) ? $view . '.twig' : 'home.twig');
|
||||
|
||||
@ -31,7 +31,9 @@
|
||||
@define ('SSL_PORT', 443);
|
||||
|
||||
@define ('MODE_DEMO', FALSE);
|
||||
@define ('DEBUG_POCHE', FALSE);
|
||||
@define ('DEBUG_POCHE', TRUE);
|
||||
|
||||
@define ('ALLOW_REGISTER', TRUE);
|
||||
|
||||
//default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL.
|
||||
@define ('ERROR_REPORTING', E_ALL & ~E_NOTICE);
|
||||
|
||||
Reference in New Issue
Block a user