aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortcit <tcit@tcit.fr>2014-09-28 17:31:02 +0200
committertcit <tcit@tcit.fr>2014-09-28 17:31:02 +0200
commitffcd442989d743e6e0c8e27a24ce9fdeefb277fc (patch)
treef8ff66aba36c3d6dcc570f75e7f08ce783d4709b
parenta0822259e76fb5a52d268ba1671d13e0e512af94 (diff)
parent2e8625c25fa603d0d870bf2f90821e900be27fd0 (diff)
downloadwallabag-ffcd442989d743e6e0c8e27a24ce9fdeefb277fc.tar.gz
wallabag-ffcd442989d743e6e0c8e27a24ce9fdeefb277fc.tar.zst
wallabag-ffcd442989d743e6e0c8e27a24ce9fdeefb277fc.zip
get up to date for merge
-rwxr-xr-xinc/poche/Database.class.php4
-rwxr-xr-xinc/poche/Poche.class.php5
-rwxr-xr-xinstall/index.php4
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mobin11884 -> 12917 bytes
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po99
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mobin16343 -> 16505 bytes
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po13
-rwxr-xr-xthemes/baggy/config.twig10
-rwxr-xr-xthemes/baggy/css/main.css2
-rwxr-xr-xthemes/courgette/config.twig6
-rwxr-xr-xthemes/default/config.twig6
11 files changed, 116 insertions, 33 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index dfd7ae34..b5dd2120 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -117,10 +117,10 @@ class Database {
117 $query = $this->executeQuery($sql, array()); 117 $query = $this->executeQuery($sql, array());
118 } 118 }
119 119
120 public function install($login, $password) 120 public function install($login, $password, $email = '')
121 { 121 {
122 $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)'; 122 $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)';
123 $params = array($login, $password, $login, ' '); 123 $params = array($login, $password, $login, $email);
124 $query = $this->executeQuery($sql, $params); 124 $query = $this->executeQuery($sql, $params);
125 125
126 $sequence = ''; 126 $sequence = '';
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index c80e5d2a..8cebafa3 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -74,12 +74,13 @@ class Poche
74 /** 74 /**
75 * Creates a new user 75 * Creates a new user
76 */ 76 */
77 public function createNewUser($username, $password) 77 public function createNewUser($username, $password, $email = "")
78 { 78 {
79 if (!empty($username) && !empty($password)){ 79 if (!empty($username) && !empty($password)){
80 $newUsername = filter_var($username, FILTER_SANITIZE_STRING); 80 $newUsername = filter_var($username, FILTER_SANITIZE_STRING);
81 $email = filter_var($email, FILTER_SANITIZE_STRING);
81 if (!$this->store->userExists($newUsername)){ 82 if (!$this->store->userExists($newUsername)){
82 if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername))) { 83 if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) {
83 Tools::logm('The new user ' . $newUsername . ' has been installed'); 84 Tools::logm('The new user ' . $newUsername . ' has been installed');
84 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername)); 85 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
85 Tools::redirect(); 86 Tools::redirect();
diff --git a/install/index.php b/install/index.php
index 1ae782a2..9ed62de1 100755
--- a/install/index.php
+++ b/install/index.php
@@ -292,9 +292,11 @@ php composer.phar install</code></pre></li>
292 <p> 292 <p>
293 <label for="password">Password</label> 293 <label for="password">Password</label>
294 <input type="password" required id="password" name="password" value="wallabag" /> 294 <input type="password" required id="password" name="password" value="wallabag" />
295 <label for="show">Show password:</label> <input style="margin-left:-80px;" name="show" id="show" type="checkbox" onchange="document.getElementById('password').type = this.checked ? 'text' : 'password'">
295 </p> 296 </p>
296 <p> 297 <p>
297 <label for="show">Show password:</label> <input name="show" id="show" type="checkbox" onchange="document.getElementById('password').type = this.checked ? 'text' : 'password'"> 298 <label for="email">Email (not required)</label>
299 <input type="email" id="email" name="email" />
298 </p> 300 </p>
299 </fieldset> 301 </fieldset>
300 302
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index bf5f69e7..1f729b60 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files differ
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index 119fb060..8292a196 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -4,16 +4,14 @@ msgstr ""
4"Report-Msgid-Bugs-To: \n" 4"Report-Msgid-Bugs-To: \n"
5"POT-Creation-Date: 2014-02-25 15:17+0300\n" 5"POT-Creation-Date: 2014-02-25 15:17+0300\n"
6"PO-Revision-Date: \n" 6"PO-Revision-Date: \n"
7"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n" 7"Last-Translator: tcit <tcit@tcit.fr>\n"
8"Language-Team: \n" 8"Language-Team: \n"
9"Language: \n" 9"Language: en\n"
10"MIME-Version: 1.0\n" 10"MIME-Version: 1.0\n"
11"Content-Type: text/plain; charset=UTF-8\n" 11"Content-Type: text/plain; charset=UTF-8\n"
12"Content-Transfer-Encoding: 8bit\n" 12"Content-Transfer-Encoding: 8bit\n"
13"X-Generator: Poedit 1.5.4\n" 13"X-Generator: Poedit 1.6.4\n"
14"X-Poedit-Language: English\n"
15"X-Poedit-Basepath: .\n" 14"X-Poedit-Basepath: .\n"
16"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
17 15
18msgid "wallabag, a read it later open source system" 16msgid "wallabag, a read it later open source system"
19msgstr "wallabag, a read it later open source system" 17msgstr "wallabag, a read it later open source system"
@@ -84,8 +82,12 @@ msgstr "A more recent development version is available."
84msgid "Feeds" 82msgid "Feeds"
85msgstr "Feeds" 83msgstr "Feeds"
86 84
87msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." 85msgid ""
88msgstr "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." 86"Your feed token is currently empty and must first be generated to enable "
87"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
88msgstr ""
89"Your feed token is currently empty and must first be generated to enable "
90"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
89 91
90msgid "Unread feed" 92msgid "Unread feed"
91msgstr "Unread feed" 93msgstr "Unread feed"
@@ -102,8 +104,12 @@ msgstr "Your token:"
102msgid "Your user id:" 104msgid "Your user id:"
103msgstr "Your user id:" 105msgstr "Your user id:"
104 106
105msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." 107msgid ""
106msgstr "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." 108"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
109"</a>."
110msgstr ""
111"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
112"</a>."
107 113
108msgid "Change your theme" 114msgid "Change your theme"
109msgstr "Change your theme" 115msgstr "Change your theme"
@@ -135,8 +141,10 @@ msgstr "Repeat your new password:"
135msgid "Import" 141msgid "Import"
136msgstr "Import" 142msgstr "Import"
137 143
138msgid "Please execute the import script locally as it can take a very long time." 144msgid ""
139msgstr "Please execute the import script locally as it can take a very long time." 145"Please execute the import script locally as it can take a very long time."
146msgstr ""
147"Please execute the import script locally as it can take a very long time."
140 148
141msgid "More info in the official documentation:" 149msgid "More info in the official documentation:"
142msgstr "More info in the official documentation:" 150msgstr "More info in the official documentation:"
@@ -184,8 +192,12 @@ msgstr "return to article"
184msgid "plop" 192msgid "plop"
185msgstr "plop" 193msgstr "plop"
186 194
187msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>." 195msgid ""
188msgstr "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>." 196"You can <a href='wallabag_compatibility_test.php'>check your configuration "
197"here</a>."
198msgstr ""
199"You can <a href='wallabag_compatibility_test.php'>check your configuration "
200"here</a>."
189 201
190msgid "favoris" 202msgid "favoris"
191msgstr "favoris" 203msgstr "favoris"
@@ -247,8 +259,14 @@ msgstr "installation"
247msgid "install your wallabag" 259msgid "install your wallabag"
248msgstr "install your wallabag" 260msgstr "install your wallabag"
249 261
250msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>." 262msgid ""
251msgstr "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>." 263"wallabag is still not installed. Please fill the below form to install it. "
264"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
265"on wallabag website</a>."
266msgstr ""
267"wallabag is still not installed. Please fill the below form to install it. "
268"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
269"on wallabag website</a>."
252 270
253msgid "Login" 271msgid "Login"
254msgstr "Login" 272msgstr "Login"
@@ -401,7 +419,8 @@ msgid "a more recent development version is available."
401msgstr "a more recent development version is available." 419msgstr "a more recent development version is available."
402 420
403msgid "Please execute the import script locally, it can take a very long time." 421msgid "Please execute the import script locally, it can take a very long time."
404msgstr "Please execute the import script locally, it can take a very long time." 422msgstr ""
423"Please execute the import script locally, it can take a very long time."
405 424
406msgid "More infos in the official doc:" 425msgid "More infos in the official doc:"
407msgstr "More infos in the official doc:" 426msgstr "More infos in the official doc:"
@@ -448,8 +467,12 @@ msgstr "in demo mode, you can't update your password"
448msgid "your password has been updated" 467msgid "your password has been updated"
449msgstr "your password has been updated" 468msgstr "your password has been updated"
450 469
451msgid "the two fields have to be filled & the password must be the same in the two fields" 470msgid ""
452msgstr "the two fields have to be filled & the password must be the same in the two fields" 471"the two fields have to be filled & the password must be the same in the two "
472"fields"
473msgstr ""
474"the two fields have to be filled & the password must be the same in the two "
475"fields"
453 476
454msgid "still using the \"" 477msgid "still using the \""
455msgstr "still using the \"" 478msgstr "still using the \""
@@ -505,6 +528,46 @@ msgstr "Cache deleted."
505msgid "Oops, it seems you don't have PHP 5." 528msgid "Oops, it seems you don't have PHP 5."
506msgstr "Oops, it seems you don't have PHP 5." 529msgstr "Oops, it seems you don't have PHP 5."
507 530
531msgid "Add user"
532msgstr "Add user"
533
534msgid "Add a new user :"
535msgstr "Add a new user :"
536
537msgid "Login for new user"
538msgstr "Login for new user"
539
540msgid "Password for new user"
541msgstr "Password for new user"
542
543msgid "Email for new user (not required)"
544msgstr "Email for new user (not required)"
545
546msgid "Send"
547msgstr "Send"
548
549msgid "Delete account"
550msgstr "Delete account"
551
552msgid "You can delete your account by entering your password and validating."
553msgstr "You can delete your account by entering your password and validating."
554
555msgid "Be careful, data will be erased forever (that is a very long time)."
556msgstr "Be careful, data will be erased forever (that is a very long time)."
557
558msgid "Type here your password"
559msgstr "Type here your password"
560
561msgid "You are the only user, you cannot delete your own account."
562msgstr "You are the only user, you cannot delete your own account."
563
564msgid ""
565"To completely remove wallabag, delete the wallabag folder on your web server "
566"(and eventual databases)."
567msgstr ""
568"To completely remove wallabag, delete the wallabag folder on your web server "
569"(and eventual databases)."
570
508#~ msgid "poche it!" 571#~ msgid "poche it!"
509#~ msgstr "poche it!" 572#~ msgstr "poche it!"
510 573
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 b625e346..d0f04615 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
Binary files 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 0343bfec..e4e2ce56 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -4,7 +4,7 @@ msgstr ""
4"Report-Msgid-Bugs-To: \n" 4"Report-Msgid-Bugs-To: \n"
5"POT-Creation-Date: 2014-05-10 20:09+0100\n" 5"POT-Creation-Date: 2014-05-10 20:09+0100\n"
6"PO-Revision-Date: \n" 6"PO-Revision-Date: \n"
7"Last-Translator: Gilles Wittezaële <gilles.wittezaele@laposte.net>\n" 7"Last-Translator: tcit <tcit@tcit.fr>\n"
8"Language-Team: \n" 8"Language-Team: \n"
9"Language: fr_FR\n" 9"Language: fr_FR\n"
10"MIME-Version: 1.0\n" 10"MIME-Version: 1.0\n"
@@ -12,7 +12,7 @@ msgstr ""
12"Content-Transfer-Encoding: 8bit\n" 12"Content-Transfer-Encoding: 8bit\n"
13"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" 13"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
14"X-Poedit-SourceCharset: UTF-8\n" 14"X-Poedit-SourceCharset: UTF-8\n"
15"X-Generator: Poedit 1.5.4\n" 15"X-Generator: Poedit 1.6.4\n"
16"Plural-Forms: nplurals=2; plural=(n != 1);\n" 16"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17 17
18msgid "wallabag, a read it later open source system" 18msgid "wallabag, a read it later open source system"
@@ -298,6 +298,9 @@ msgstr "Nom d'utilisateur"
298msgid "Password for new user" 298msgid "Password for new user"
299msgstr "Mot de passe du nouvel utilisateur" 299msgstr "Mot de passe du nouvel utilisateur"
300 300
301msgid "Email for new user (not required)"
302msgstr "E-mail pour le nouvel utilisateur (facultatif)"
303
301msgid "Send" 304msgid "Send"
302msgstr "Envoyer" 305msgstr "Envoyer"
303 306
@@ -320,10 +323,12 @@ msgstr ""
320"Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte." 323"Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte."
321 324
322msgid "" 325msgid ""
323"To completely remove wallabag, delete the wallabag folder on your web server." 326"To completely remove wallabag, delete the wallabag folder on your web server "
327"(and eventual databases)."
324msgstr "" 328msgstr ""
325"Pour désinstaller complètement wallabag, supprimez le répertoire " 329"Pour désinstaller complètement wallabag, supprimez le répertoire "
326"<code>wallabag</code> de votre serveur Web." 330"<code>wallabag</code> de votre serveur Web (ainsi que les bases de données "
331"éventuelles)."
327 332
328msgid "Save a link" 333msgid "Save a link"
329msgstr "Ajouter un lien" 334msgstr "Ajouter un lien"
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 7bd229cb..3523cd08 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -136,11 +136,15 @@
136 <fieldset class="w500p"> 136 <fieldset class="w500p">
137 <div class="row"> 137 <div class="row">
138 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label> 138 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
139 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}"> 139 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
140 </div> 140 </div>
141 <div class="row"> 141 <div class="row">
142 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> 142 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
143 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> 143 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
144 </div>
145 <div class="row">
146 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
147 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
144 </div> 148 </div>
145 <div class="row mts txtcenter"> 149 <div class="row mts txtcenter">
146 <button type="submit">{% trans "Send" %}</button> 150 <button type="submit">{% trans "Send" %}</button>
@@ -161,5 +165,5 @@
161 </div> 165 </div>
162 </form> 166 </form>
163 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 167 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
164 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %} 168 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
165{% endblock %} 169{% endblock %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 9c50786b..b775a291 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -89,7 +89,7 @@ form fieldset {
89 margin: 0; 89 margin: 0;
90} 90}
91 91
92form input[type="text"], select, form input[type="password"], form input[type="url"] { 92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
93 border: 1px solid #999; 93 border: 1px solid #999;
94 padding: 0.5em 1em; 94 padding: 0.5em 1em;
95 min-width: 12em; 95 min-width: 12em;
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index 9ab58461..c4933794 100755
--- a/themes/courgette/config.twig
+++ b/themes/courgette/config.twig
@@ -97,6 +97,10 @@
97 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> 97 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
98 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> 98 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
99 </div> 99 </div>
100 <div class="row">
101 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
102 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
103 </div>
100 <div class="row mts txtcenter"> 104 <div class="row mts txtcenter">
101 <button type="submit">{% trans "Send" %}</button> 105 <button type="submit">{% trans "Send" %}</button>
102 </div> 106 </div>
@@ -116,6 +120,6 @@
116 </div> 120 </div>
117 </form> 121 </form>
118 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 122 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
119 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %} 123 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
120 </div> 124 </div>
121{% endblock %} 125{% endblock %}
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 5656fadd..c639ba9c 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -142,6 +142,10 @@
142 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> 142 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
143 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> 143 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
144 </div> 144 </div>
145 <div class="row">
146 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
147 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
148 </div>
145 <div class="row mts txtcenter"> 149 <div class="row mts txtcenter">
146 <button type="submit">{% trans "Send" %}</button> 150 <button type="submit">{% trans "Send" %}</button>
147 </div> 151 </div>
@@ -161,5 +165,5 @@
161 </div> 165 </div>
162 </form> 166 </form>
163 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 167 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
164 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %} 168 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
165{% endblock %} 169{% endblock %}