From 121691e90026dcfaaecef0a1db07d40cd43a9278 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 23 Jan 2015 16:34:56 +0100
Subject: [PATCH 1/6] working on registration support

---
 inc/poche/Poche.class.php        |  4 ++++
 inc/poche/Routing.class.php      | 10 +++++++++-
 inc/poche/Tools.class.php        |  2 +-
 inc/poche/config.inc.default.php |  4 +++-
 themes/baggy/login.twig          |  5 +++++
 themes/baggy/register.twig       | 25 +++++++++++++++++++++++++
 themes/default/login.twig        |  5 +++++
 themes/default/register.twig     | 20 ++++++++++++++++++++
 8 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 themes/baggy/register.twig
 create mode 100644 themes/default/register.twig

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 81a18c860..36c8693c1 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 = "")
     {
+        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');
+        }
     }
 
     /**
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index be06a433d..8d6abefde 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -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) 
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 a159e713c..3156b56c8 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -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);
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 58290e9c6..7906cc203 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -31,4 +31,9 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
+    {% if constant('ALLOW_REGISTER') == 1 %}
+    	<div class="register">
+    		<a href="?registerform">{% trans "Register" %}</a>
+    	</div>
+    {% endif %}
 {% endblock %}
diff --git a/themes/baggy/register.twig b/themes/baggy/register.twig
new file mode 100644
index 000000000..5744a4810
--- /dev/null
+++ b/themes/baggy/register.twig
@@ -0,0 +1,25 @@
+{% extends "layout-login.twig" %}
+{% block content %}
+
+<h2>{% trans 'Add user' %}</h2>
+    <form method="post" action="?register">
+        <fieldset class="w500p">
+        <div class="row">
+            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
+            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+        </div>
+        <div class="row mts txtcenter">
+            <button type="submit">{% trans "Register" %}</button>
+        </div>
+        </fieldset>
+    </form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/login.twig b/themes/default/login.twig
index b9f8b497c..d4f440196 100644
--- a/themes/default/login.twig
+++ b/themes/default/login.twig
@@ -31,4 +31,9 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
+    {% if constant('ALLOW_REGISTER') == 1 %}
+    	<div class="registerform">
+    		<a href="?register">{% trans "Register" %}</a>
+    	</div>
+    {% endif %}
 {% endblock %}
diff --git a/themes/default/register.twig b/themes/default/register.twig
new file mode 100644
index 000000000..755ae1328
--- /dev/null
+++ b/themes/default/register.twig
@@ -0,0 +1,20 @@
+<h2>{% trans 'Add user' %}</h2>
+    <form method="post" action="?newuser">
+        <fieldset class="w500p">
+        <div class="row">
+            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
+            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+        </div>
+        <div class="row mts txtcenter">
+            <button type="submit">{% trans "Register" %}</button>
+        </div>
+        </fieldset>
+    </form>
\ No newline at end of file

From 1fbef3bfb57b3f73e6817115f10b5876dd0e57ef Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 24 Jan 2015 12:54:58 +0100
Subject: [PATCH 2/6] resetting debug to false

---
 inc/poche/config.inc.default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 3156b56c8..000faf1c5 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -31,7 +31,7 @@
 @define ('SSL_PORT', 443);
 
 @define ('MODE_DEMO', FALSE);
-@define ('DEBUG_POCHE', TRUE);
+@define ('DEBUG_POCHE', FALSE);
 
 @define ('ALLOW_REGISTER', TRUE);
 

From dc6ec987585a1c51f678c404143e37b0d844d796 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 13 Feb 2015 19:14:56 +0100
Subject: [PATCH 3/6] just a reminder

---
 inc/poche/config.inc.default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index fbf4ae9a5..0fd9bc0e5 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -60,7 +60,7 @@
 @define ('PDF', FALSE);
 
 // registration
-@define ('SEND_CONFIRMATION_EMAIL', TRUE);
+@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
 
 // display or not print link in article view
 @define ('SHOW_PRINTLINK', '1');

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: [PATCH 4/6] couple improvements, translations

---
 inc/poche/Poche.class.php                   |   8 ++++++--
 inc/poche/Routing.class.php                 |   2 +-
 inc/poche/config.inc.default.php            |   3 +--
 locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 17302 -> 17420 bytes
 locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po |   3 +++
 locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 22690 -> 22813 bytes
 locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po |   3 +++
 7 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index cd7578e34..a91a3f8f4 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 e9b677717..177b74d55 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 e569dddd6..7c27856db 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');
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 025231250ebaa376d2b3c3a7a067d9351810e2be..4341e50e33572f944c10a8ea0371781ae9b7edf7 100644
GIT binary patch
delta 4640
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

delta 4574
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

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..37d926f1e 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -673,6 +673,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."
 
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 b3b2f6fed9ebafeba0bb90d7c8216628720f3ec4..1004c1a07d119063bafb8fb4b1f9e15ba045a168 100644
GIT binary patch
delta 4996
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
DE#gec

delta 4929
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
BGJOC5

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..e0ee574ed 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -800,6 +800,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."
 

From 698eda739e705f5605711af927eb5e3720c7c97c Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 14 Feb 2015 12:35:22 +0100
Subject: [PATCH 5/6] mainly css improvements

---
 inc/poche/Poche.class.php                   |   4 +-
 inc/poche/config.inc.default.php            |   2 +-
 locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 17420 -> 17544 bytes
 locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po |  15 +++++--
 locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 22813 -> 22961 bytes
 locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po |  14 ++++++-
 themes/baggy/login.twig                     |  10 ++---
 themes/baggy/register.twig                  |  41 +++++++++++---------
 8 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a91a3f8f4..e37d7c6c5 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -85,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" .
@@ -96,6 +96,7 @@ class Poche
                             $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)
@@ -105,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');
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 7c27856db..6750383e3 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -60,7 +60,7 @@
 @define ('PDF', FALSE);
 
 // registration
-@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
+@define ('SEND_CONFIRMATION_EMAIL', FALSE);
 @define ('ALLOW_REGISTER', TRUE);
 
 // display or not print link in article view
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 4341e50e33572f944c10a8ea0371781ae9b7edf7..f2c8a0f6f42813e30b15d85321de4be44908ebee 100644
GIT binary patch
delta 4786
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

delta 4679
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
Y?sRlni#KztH=@A(TCt97opd(z|GJ&da{vGU

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 37d926f1e..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"
 
@@ -705,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 1004c1a07d119063bafb8fb4b1f9e15ba045a168..1f1995b85b5f02d06a24d765e83555b7fce51f78 100644
GIT binary patch
delta 5531
zcmYk=33N?&0>|-xh={z9RK$`+o(du&_Fa)g5K3wZWo!v48B0rIU!K}pI<|xw##*L=
zS~Ij1wN|V%WTrZ%BeW<(m1@zEIcL7VcmFx3_vDw)|9{`R_x{(L!}|R``wDzKH!AzC
zG93RS5yaQunBG3dJPguVV;YAVQwf`(FLuILF&SfUG&aE%*a%NyEI!2~tXb8VV9dY@
zn2kKb%tF56F$*cUII#``F&``A0p!ON@~avaV+cM+eeU9<uB(Z9P%O5_@yLzMHY|rn
zQ5`si`u<g{f;YT+XeotPIN@L2m;emJhFAyvurKNcgD?uSP(50N8l<(T>vy0Ud<0uz
z5w=8E4P%;NqIEL1puPi}^L%rYf`%|O%&{x#f@#<kciH+)jHg~D+<9OUYDm*iJspPX
zSti!P>8J*+L*2gs)qy+M5z8^(9-eKIDX0g-P;)Z@)#K@?8!xghLk;~Z)c5mk{jl{C
zmgW3S)O~KFM(_vJi2aP^v0S8ceZ@%TUp<K8gyyC`>H#fKbJz{lfT8yMNYsO;U;-{e
z?rAQd*3Lat4}Zam7+TZ0Uu|TTO-tO2y^z5)k83ji(G*-<r4~0vJ-7{a#Z=72)i|16
z5$kqFCXew|!#+ZOOuqFza&PkxHL@<Yil(Fvs)KE<T~KSMkB5SWC<8STS*UH6jT)+{
z$d8%BuhzH)X^Z&=HAN+;A$Qew?h}N1U{%z88ej}I#(p>ud*g0f_o(}IIFW`ua0aSD
zXHon3GS0+bQ8$>(m*2t*s2((}>uk$J)QI#)4fSBuV$DHyYzt}xcA-Z45YkYOIZ45f
z6W364e*^2`6V!gMK}8od#J1QHb$$Y>K?|@kUdIG<(cNV1iA^vM$Ke@N&zsd}RB!>t
z^L(?9g68-p>c-i0TP=MLwTSXiZ??_IkGaCH@>qgeE56*#7sF7CFbef~9BRs%+xj?k
zQJ;kR-n$se^UYEU{<zhCunYCz!>IjRh#H|{WL=rNw(cKi4DT2dg!*0#R=|#^sYpRh
zK`QEdvr$vC8r8r(=+OnAQqTiVpn6h>y5S|%l-x#L_#F8$K@FXrx5q&0eNguqhWdV%
z{d^{}&P*=4@gOqD<{Ik$J{o^LxH`?$K8`{)pgpRE38;}tvFH0>0QCX(d<N=9V^H6p
zYh8>k>ba=*#Rgm7i@N>@>bYm*8Gl`P*?#dW)C2FK8uA1+l+Tb+HzmkAGBGTOXzY!3
zaWZOz)?*($fV^dmKPyvjzG&17rv>tEGH+lIj`vW|qMMDun2UPg7E}wjqk6Izb-@w)
z`9)OEui_rOkD8h_EP2iKm)IPOQTMOX)LFbSSdV&N)Qie9gM#L8E$W8b@Q{x&$52Bz
zmAhyp7NdH;4Ee}>hVAfywH|-cXoDGn-Ek$lu^20({uJu|A*hjxMV{+1i4^ppR1C#*
z)DTTUt%+4w1^1&aJd0{@F>-J75EJp$R?g>{s1clnm2e(b#9Y*UHle2GfVa;4U!kBO
zzKi^rpZKLU5zFS)&^1L}&;`}N4AhOLVpUv%YVcM}!jq^5`L%KCDX5WJf;xW=6EKjs
zS)%rTFA93It>71*nTyChj2~C2-VvEbGY!>%ov0Bzfm$O)sD@rg)~9)dVHnxom=4$)
zHFZ-k4L4yee1;xfSp7Ap$8i`;y*X;mlTq8HJF2H?s0NI+^|`3IU4v@KC#aDuK<%P0
zP}dcr-Vep7@87qdm%PUO*Wg4snyD8>6jsM1R1XKES~}jIUyg&RZ%2LKucOo8SY*eU
zcBluAvCc(ZzXs3a=csMFu#>ZGcXskPi|HyS_)BVvu@9DEg4SUgRxHDsK#i2??DVV(
z>c)}Qj#!g=I_iBe2P1GBY7w4BZQmlShTow^_N9k{R<mESGX){2dN}GvF_?;}*bFzK
zrl<(Z;%(H>-$QlaNA$(YU7Y=14d+r%#4J36!?96U=g+=pIfW6NIEb3Fux`$SYU5Js
z18^wb#SNI8;`H=3YU;|e*~?)hMq+K$VopG<g_)=ZzmEa91~tW7k&*G3qxQr_)P;9Y
zJ#qJN)<6>SW77DgDcFo!0|&4tR(_qo4>%m(z#Yi)FfVZ)w&hDh@EEf0OhhkdI}XBa
zJl}jsLEEJR<E$6OK-3}{h3q6V8yn+c)O+Cp*2kylhmky04U0y9Y>kPSVC(ZSkopqT
z{nw(_Kt5LB`R2I&;5;%U=4-5t-`n%9-p<I>zzUr2hv7IBH3ic#09T?Kv=KFuAEP>U
z%UXi!Ks8plj6#ntsAo^aqb_KP8iC%Z2aU!goR6BjLR61#p&IlE)!-NQ^N7CuJCS+|
z)C+7fvh&Pd)Gm39x<05M<F5-N`Z+D?gf8mcP(#@dwVH>ZhAzW?{tl{vGf@r5Lyf?C
z48eT+`4QBJ7NK5T-=e<v0yP3<(-?pC$i;h6A4H=b*a$T;&9MQtL+$rb7>$dpyHTsY
z2nXU5)QI)yZ`TmUQlE|Wa64)QuArvwv4?`2LcjoL8#O?+tO;r)+F%t-Mm1;<YImgL
zX`GKOG38CCA#;#vHXBeQ@faJTFRhbJu`Uirji~263Tp8x^ucYUCmBjMk+p=aZ@wjm
z$OWR+y@z~8en-@!pU5KeHqr4l2_||sydX133RywEAS(%n$NL`-ttn-b@5u(DDJVU@
zq400=fZQbahz^a4j)P<t8AMtU?QtEfG4H<vRE{SflF_7ulpX`L`r1+JLB^A#_LH`F
z(w6t<-3kuz9I-Vf*vuz?CbNk)uqH}JKG8bYQP07=wB}+I(WE@H=d$n`i6Q?b?-EUl
zj_u?VZ;4l(9-~=ZOm^For|?T#e&4FSq$7hY^OpE$j8zP?<u&*Y;SFY1lbJ+EgoF1z
zYKva}scw#;sLeFTdx{l<(PX5p$KgKGnT#OQ$Yk;#a+~~x=osSQ-H_!e=h(VGMv}K|
zUCVX2EuZH3=9aD8w?45ZAa5S?5jkwniSEBCtJsuWvgdxm9pqzM7xTzml1Z8n9a~5d
z@qEg!e~|^`E3%M0BGt)t5=82g_C&|u9lZbD@JGr^$XHT~Oe81B1oD*V2ypPeZB$%p
z>#sOgH4iBykpi-woFzZxEeMJ7+@+-BBDqZ1$=;)?^&Czob;x(5Ecuy?Bc;cA3W22+
z{DUpOj_b&e<WHm}X+es~RZ>GsGo6Bt$7C;Y6CKCMo1_|PL?)3b<P6cVll-3eslqXp
z6p}E~h5YuoL8TMvNAie{JKo=;cr8=dNUo6Q<Zq-6=|w&#gUK%PSJI3eC%=-?qkm}u
z|3SKvSki$kCtJw}1r<UQ{VK(be>=xLF>}JCtcjT;>lbtmKkgqM=gydv<IWkK>7JCG
zIng~OJ=;BEVrF_y=E(R0-{|vx1?OT<1qX8Fc<0LO`UUgb&35_6xyPkvWxL1b#dZz%
Ri7zPAb)|p7vecy&{ttayU5Wqz

delta 5428
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

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 e0ee574ed..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"
 
@@ -835,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 7906cc203..d941ca936 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -26,14 +26,14 @@
 					<div class="row mts txtcenter">
 						<button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
 					</div>
+					{% if constant('ALLOW_REGISTER') == 1 %}
+    				<div class="register">
+    					<a href="?registerform">{% trans "Register" %}</a>
+    				</div>
+    {% endif %}
                 </fieldset>
                 <input type="hidden" name="returnurl" value="{{ referer }}">
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
-    {% if constant('ALLOW_REGISTER') == 1 %}
-    	<div class="register">
-    		<a href="?registerform">{% trans "Register" %}</a>
-    	</div>
-    {% endif %}
 {% endblock %}
diff --git a/themes/baggy/register.twig b/themes/baggy/register.twig
index 5744a4810..e2c56c735 100644
--- a/themes/baggy/register.twig
+++ b/themes/baggy/register.twig
@@ -1,25 +1,28 @@
 {% extends "layout-login.twig" %}
 {% block content %}
 
+<form method="post" action="?register">
 <h2>{% trans 'Add user' %}</h2>
-    <form method="post" action="?register">
-        <fieldset class="w500p">
-        <div class="row">
-            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
-            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
-        </div>
-        <div class="row">
-            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
-            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
-        </div>
-        <div class="row">
-            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
-            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
-        </div>
-        <div class="row mts txtcenter">
-            <button type="submit">{% trans "Register" %}</button>
-        </div>
-        </fieldset>
-    </form>
+    <fieldset class="w500p">
+    <div class="row">
+        <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+        <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+    </div>
+    <div class="row">
+        <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+        <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+    </div>
+    <div class="row">
+        <label class="col w150p" for="newuseremail">{% trans 'Email (not required)' %}</label>
+        <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+    </div>
+    <div class="row mts txtcenter">
+        <button type="submit">{% trans "Register" %}</button>
+    </div>
+    <div class="register">
+        <a href="?">{% trans "Back" %}</a>
+    </div>
+    </fieldset>
+</form>
 
 {% endblock %}
\ No newline at end of file

From 952faeeb312e7461e4ca69fb236c14ee780d3fc5 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 14 Feb 2015 12:36:00 +0100
Subject: [PATCH 6/6] forgot this file

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index e37d7c6c5..6d4ce1377 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -114,7 +114,7 @@ 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');