From f2321633b9dcc806b3c036a742bde1e4c9bcbef9 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 13 Feb 2015 19:39:48 +0100
Subject: couple improvements, translations

---
 inc/poche/Poche.class.php        | 8 ++++++--
 inc/poche/Routing.class.php      | 2 +-
 inc/poche/config.inc.default.php | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'inc/poche')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index cd7578e3..a91a3f8f 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -93,7 +93,9 @@ 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)
@@ -117,7 +119,9 @@ class Poche
                     $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 <a href="?logout">logout ?</a>'), $newUsername));
+                if (\Session::isLogged()) {
+                    $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
+                }
                 Tools::redirect();
                 }
                 else {
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index e9b67771..177b74d5 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -72,7 +72,7 @@ class Routing
             Tools::logm('register');
             $tplFile = Tools::getTplFile('register');
         } elseif (ALLOW_REGISTER && isset($_GET['register'])){
-            $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
+            $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'])) {
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index e569dddd..7c27856d 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -33,8 +33,6 @@
 @define ('MODE_DEMO', FALSE);
 @define ('DEBUG_POCHE', FALSE);
 
-@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);
 
@@ -63,6 +61,7 @@
 
 // registration
 @define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
+@define ('ALLOW_REGISTER', TRUE);
 
 // display or not print link in article view
 @define ('SHOW_PRINTLINK', '1');
-- 
cgit v1.2.3