aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xinc/poche/Poche.class.php42
-rwxr-xr-xinc/poche/Routing.class.php2
-rwxr-xr-xinc/poche/config.inc.default.php3
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mobin15793 -> 17302 bytes
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po50
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mobin21037 -> 22690 bytes
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po52
7 files changed, 144 insertions, 5 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index d096de91..8ade91b4 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -74,16 +74,50 @@ class Poche
74 /** 74 /**
75 * Creates a new user 75 * Creates a new user
76 */ 76 */
77 public function createNewUser($username, $password, $email = "") 77 public function createNewUser($username, $password, $email = "", $internalRegistration = false)
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 $email = filter_var($email, FILTER_SANITIZE_STRING);
82 if (!$this->store->userExists($newUsername)){ 82 if (!$this->store->userExists($newUsername)){
83 if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) { 83 if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) {
84 Tools::logm('The new user ' . $newUsername . ' has been installed'); 84 if ($email != "") { // if email is filled
85 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername)); 85 if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
86 Tools::redirect(); 86
87 // if internal registration
88 $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
89 "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
90 _('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" .
91 _('Have fun with it !') . "\r\n\r\n" .
92 _('This is an automatically generated message, no one will answer if you respond to it.');
93
94 // if external (public) registration
95 $body = "Hi, " . $newUsername . "\r\n\r\nYou've just created a wallabag account on " . Tools::getPocheUrl() . ".\r\nHave fun with it !";
96 $body = $internalRegistration ? $body_internal : $body;
97
98 $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
99 if (mail($email, sprintf(_('Your new wallabag account on %1$s'), Tools::getPocheUrl()), $body,
100 'X-Mailer: PHP/' . phpversion() . "\r\n" .
101 'Content-type: text/plain; charset=UTF-8' . "\r\n" .
102 "From: " . $newUsername . "@" . gethostname() . "\r\n")) {
103 Tools::logm('The user ' . $newUsername . ' has been emailed');
104 $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));
105
106 } else {
107 Tools::logm('A problem has been encountered while sending an email');
108 $this->messages->add('e', _('A problem has been encountered while sending an email'));
109 }
110 } else {
111 Tools::logm('The user has been created, but the server did not authorize sending emails');
112 $this->messages->add('i', _('The server did not authorize sending a confirmation email'));
113 }
114 } else {
115 Tools::logm('The user has been created, but no email was saved, so no confimation email was sent');
116 $this->messages->add('i', _('The user was created, but no email was sent because email was not filled in'));
117 }
118 Tools::logm('The new user ' . $newUsername . ' has been installed');
119 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
120 Tools::redirect();
87 } 121 }
88 else { 122 else {
89 Tools::logm('error during adding new user'); 123 Tools::logm('error during adding new user');
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 709831d5..82ff20d6 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -117,7 +117,7 @@ class Routing
117 // update password 117 // update password
118 $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); 118 $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
119 } elseif (isset($_GET['newuser'])) { 119 } elseif (isset($_GET['newuser'])) {
120 $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']); 120 $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail'], true);
121 } elseif (isset($_GET['deluser'])) { 121 } elseif (isset($_GET['deluser'])) {
122 $this->wallabag->deleteUser($_POST['password4deletinguser']); 122 $this->wallabag->deleteUser($_POST['password4deletinguser']);
123 } elseif (isset($_GET['epub'])) { 123 } elseif (isset($_GET['epub'])) {
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 91b50c24..fbf4ae9a 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -59,6 +59,9 @@
59@define ('MOBI', FALSE); 59@define ('MOBI', FALSE);
60@define ('PDF', FALSE); 60@define ('PDF', FALSE);
61 61
62// registration
63@define ('SEND_CONFIRMATION_EMAIL', TRUE);
64
62// display or not print link in article view 65// display or not print link in article view
63@define ('SHOW_PRINTLINK', '1'); 66@define ('SHOW_PRINTLINK', '1');
64// display or not percent of read in article view. Affects only default theme. 67// display or not percent of read in article view. Affects only default theme.
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 77dee070..02523125 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
Binary files 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 579d1aca..75dad661 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -663,6 +663,56 @@ msgstr "Download the articles from this search in an EPUB"
663msgid "Download the articles from this category in an epub" 663msgid "Download the articles from this category in an epub"
664msgstr "Download the articles from this category in an EPUB" 664msgstr "Download the articles from this category in an EPUB"
665 665
666# registration
667msgid "Hi,"
668msgstr "Hi,"
669
670msgid "Hi, %1$s"
671msgstr "Hi, %1$s"
672
673msgid "Someone just created a wallabag account for you on %1$s."
674msgstr "Someone just created a wallabag account for you on %1$s."
675
676msgid "Your login is %1$s."
677msgstr "Your login is %1$s."
678
679msgid "Have fun with it !"
680msgstr "Have fun with it !"
681
682msgid ""
683"This is an automatically generated message, no one will answer if you "
684"respond to it."
685msgstr ""
686"This is an automatically generated message, no one will answer if you "
687"respond to it."
688
689msgid ""
690"Note : The password has been chosen by the person who created your account. "
691"Get in touch with that person to know your password and change it as soon as "
692"possible"
693msgstr ""
694"Note : The password has been chosen by the person who created your account. "
695"Get in touch with that person to know your password and change it as soon as "
696"possible"
697
698msgid ""
699"The new user %1$s has been sent an email at %2$s. You may have to check spam "
700"folder."
701msgstr ""
702"The new user %1$s has been sent an email at %2$s. You may have to check spam "
703"folder."
704
705msgid "A problem has been encountered while sending the confirmation email"
706msgstr "A problem has been encountered while sending an confirmation email"
707
708msgid "The server did not authorize sending a confirmation email"
709msgstr "The server did not authorize sending a confirmation email"
710
711msgid ""
712"The user was created, but no email was sent because email was not filled in"
713msgstr ""
714"The user was created, but no email was sent because email was not filled in"
715
666#~ msgid "poche it!" 716#~ msgid "poche it!"
667#~ msgstr "poche it!" 717#~ msgstr "poche it!"
668 718
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 83f397a0..b3b2f6fe 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 fef31208..948a8356 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -789,6 +789,58 @@ msgstr ""
789msgid "Produced by wallabag with PHPMobi" 789msgid "Produced by wallabag with PHPMobi"
790msgstr "Produit par wallabag avec PHPMobi" 790msgstr "Produit par wallabag avec PHPMobi"
791 791
792# registration
793msgid "Hi,"
794msgstr "Salut,"
795
796msgid "Hi, %1$s"
797msgstr "Salut, %1$s"
798
799msgid "Someone just created a wallabag account for you on %1$s."
800msgstr ""
801"Quelqu'un vient juste de créer un compte wallabag pour vous à l'adresse %1$s."
802
803msgid "Your login is %1$s."
804msgstr "Votre identifiant is %1$s."
805
806msgid "Have fun with it !"
807msgstr "Amusez-vous bien !"
808
809msgid ""
810"This is an automatically generated message, no one will answer if you "
811"respond to it."
812msgstr ""
813"Ceci est un message généré automatiquement, personne ne vous répondra si "
814"vous y répondez."
815
816msgid ""
817"Note : The password has been chosen by the person who created your account. "
818"Get in touch with that person to know your password and change it as soon as "
819"possible"
820msgstr ""
821"Note : Votre mot de passe a été défini par la personne ayant créé votre "
822"compte. Vous devriez entrer en contact avec cette personne pour connaître "
823"votre mot de passe et le changer dès que possible"
824
825msgid ""
826"The new user %1$s has been sent an email at %2$s. You may have to check spam "
827"folder."
828msgstr ""
829"Un email a été envoyé au nouvel utiliateur %1$s à l'adresse %2$s. Il peut "
830"être nécessaire de vérifier le dossier des spams."
831
832msgid "A problem has been encountered while sending the confirmation email"
833msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation"
834
835msgid "The server did not authorize sending a confirmation email"
836msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation"
837
838msgid ""
839"The user was created, but no email was sent because email was not filled in"
840msgstr ""
841"L'utilisateur a été créé, mais aucun mail n'a été envoyé car l'email n'était "
842"pas renseigné"
843
792msgid "Mail function is disabled. You can't send emails from your server" 844msgid "Mail function is disabled. You can't send emails from your server"
793msgstr "" 845msgstr ""
794"La fonction mail est désactivée. Vous ne pouvez pas envoyer d'E-mails depuis " 846"La fonction mail est désactivée. Vous ne pouvez pas envoyer d'E-mails depuis "