diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 8ade91b48..6d4ce1377 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -76,6 +76,7 @@ class Poche
*/
public function createNewUser($username, $password, $email = "", $internalRegistration = false)
{
+ 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);
@@ -84,7 +85,7 @@ class Poche
if ($email != "") { // if email is filled
if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
- // if internal registration
+ // if internal registration from config screen
$body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
"\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
_('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" .
@@ -92,7 +93,10 @@ class Poche
_('This is an automatically generated message, no one will answer if you respond to it.');
// if external (public) registration
- $body = "Hi, " . $newUsername . "\r\n\r\nYou've just created a wallabag account on " . Tools::getPocheUrl() . ".\r\nHave fun with it !";
+ $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" .
+ sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) .
+ "\r\n\r\n" . _("Have fun with it !");
+
$body = $internalRegistration ? $body_internal : $body;
$body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
@@ -102,6 +106,7 @@ class Poche
"From: " . $newUsername . "@" . gethostname() . "\r\n")) {
Tools::logm('The user ' . $newUsername . ' has been emailed');
$this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email));
+ Tools::redirect('?');
} else {
Tools::logm('A problem has been encountered while sending an email');
@@ -109,14 +114,16 @@ class Poche
}
} else {
Tools::logm('The user has been created, but the server did not authorize sending emails');
- $this->messages->add('i', _('The server did not authorize sending a confirmation email'));
+ $this->messages->add('i', _('The server did not authorize sending a confirmation email, but the user was created.'));
}
} else {
Tools::logm('The user has been created, but no email was saved, so no confimation email was sent');
$this->messages->add('i', _('The user was created, but no email was sent because email was not filled in'));
}
Tools::logm('The new user ' . $newUsername . ' has been installed');
- $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'), $newUsername));
+ if (\Session::isLogged()) {
+ $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'), $newUsername));
+ }
Tools::redirect();
}
else {
@@ -130,6 +137,9 @@ class Poche
Tools::redirect();
}
}
+ else {
+ Tools::logm('Password or username were empty');
+ }
}
/**
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 82ff20d67..177b74d55 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -68,6 +68,12 @@ class Routing
$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'])) {
+ Tools::logm('register');
+ $tplFile = Tools::getTplFile('register');
+ } elseif (ALLOW_REGISTER && isset($_GET['register'])){
+ $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']);
+ Tools::redirect();
} elseif(isset($_SERVER['PHP_AUTH_USER'])) {
if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
$this->wallabag->login($this->referer);
@@ -105,7 +111,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)
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 7ccfc069b..d0b31d4f1 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -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');
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index fbf4ae9a5..6750383e3 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -60,7 +60,8 @@
@define ('PDF', FALSE);
// registration
-@define ('SEND_CONFIRMATION_EMAIL', TRUE);
+@define ('SEND_CONFIRMATION_EMAIL', FALSE);
+@define ('ALLOW_REGISTER', TRUE);
// display or not print link in article view
@define ('SHOW_PRINTLINK', '1');
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 025231250..f2c8a0f6f 100644
Binary files a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo and b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 75dad661e..73589e202 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -369,8 +369,8 @@ msgstr "Mark all the entries as read"
msgid "Return home"
msgstr "Return home"
-msgid "Back to top"
-msgstr "Back to top"
+msgid "back"
+msgstr "back"
msgid "Mark as read"
msgstr "Mark as read"
@@ -435,6 +435,9 @@ msgstr "Save a Link"
msgid "back to home"
msgstr "Back to Home"
+msgid "back to login"
+msgstr "back to login"
+
msgid "toggle mark as read"
msgstr "Toggle mark as read"
@@ -673,6 +676,9 @@ msgstr "Hi, %1$s"
msgid "Someone just created a wallabag account for you on %1$s."
msgstr "Someone just created a wallabag account for you on %1$s."
+msgid "You've just created a wallabag account on %1$s"
+msgstr "You've just created a wallabag account on %1$s"
+
msgid "Your login is %1$s."
msgstr "Your login is %1$s."
@@ -702,8 +708,12 @@ msgstr ""
"The new user %1$s has been sent an email at %2$s. You may have to check spam "
"folder."
-msgid "A problem has been encountered while sending the confirmation email"
-msgstr "A problem has been encountered while sending an confirmation email"
+msgid ""
+"A problem has been encountered while sending the confirmation email, but the "
+"user was created."
+msgstr ""
+"A problem has been encountered while sending an confirmation email, but the "
+"user was created."
msgid "The server did not authorize sending a confirmation email"
msgstr "The server did not authorize sending a confirmation email"
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index b3b2f6fed..1f1995b85 100644
Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index 948a83564..526a44a33 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -67,6 +67,9 @@ msgstr "Se connecter"
msgid "back to home"
msgstr "retour à l'accueil"
+msgid "back"
+msgstr "retour"
+
msgid "favorites"
msgstr "favoris"
@@ -357,6 +360,9 @@ msgstr "Tweet"
msgid "Email"
msgstr "E-mail"
+msgid "Email (not required)"
+msgstr "E-mail (non requis)"
+
msgid "shaarli"
msgstr "Shaarli"
@@ -800,6 +806,9 @@ msgid "Someone just created a wallabag account for you on %1$s."
msgstr ""
"Quelqu'un vient juste de créer un compte wallabag pour vous à l'adresse %1$s."
+msgid "You've just created a wallabag account on %1$s"
+msgstr "Vous venez juste de vous créer un compte wallabag sur %1$s"
+
msgid "Your login is %1$s."
msgstr "Votre identifiant is %1$s."
@@ -832,8 +841,12 @@ msgstr ""
msgid "A problem has been encountered while sending the confirmation email"
msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation"
-msgid "The server did not authorize sending a confirmation email"
-msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation"
+msgid ""
+"The server did not authorize sending a confirmation email, but the user was "
+"created."
+msgstr ""
+"Le serveur n'autorise pas l'envoi d'un email de confirmation, mais "
+"l'utilisateur a été créé."
msgid ""
"The user was created, but no email was sent because email was not filled in"
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 58290e9c6..d941ca936 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -26,6 +26,11 @@