From 3e1daa4c9016944b444829151334ab87cd3d3dcb Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 24 Jan 2015 15:09:18 +0100 Subject: [PATCH 1/3] allow to send confirmation emails when creating a new user --- inc/poche/Poche.class.php | 27 +++++++++++++++++++++++---- inc/poche/Routing.class.php | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 81a18c860..adb335c9e 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -74,16 +74,35 @@ class Poche /** * Creates a new user */ - public function createNewUser($username, $password, $email = "") + public function createNewUser($username, $password, $email = "", $internalRegistration = false) { if (!empty($username) && !empty($password)){ $newUsername = filter_var($username, FILTER_SANITIZE_STRING); $email = filter_var($email, FILTER_SANITIZE_STRING); if (!$this->store->userExists($newUsername)){ if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) { - 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)); - Tools::redirect(); + if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) { + // if internal registration + $body_internal = "Hi,\r\n\r\nSomeone just created an account for you on " . Tools::getPocheUrl() . ".\r\nHave fun with it !"; + // if external (public) registration + $body = "Hi, \r\n\r\nYou've just created an account on " . Tools::getPocheUrl() . . ".\r\nHave fun with it !"; + $body = $internalRegistration ? $body_internal : $body; + $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) + if (mail($email, sprintf(_('Your new wallabag account on '), Tools::getPocheUrl()), $body, 'From: {$email}')) { + 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.'), $newUsername, $email)); + + } else { + Tools::logm('A problem has been encountered while sending an email'); + $this->messages->add('e', _('A problem has been encountered while sending an email'); + } + } 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 an email'); + } + 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)); + Tools::redirect(); } else { Tools::logm('error during adding new user'); diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index a8d00b898..b8cab0ec3 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -116,7 +116,7 @@ class Routing // update password $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); } elseif (isset($_GET['newuser'])) { - $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']); + $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail'], true); } elseif (isset($_GET['deluser'])) { $this->wallabag->deleteUser($_POST['password4deletinguser']); } elseif (isset($_GET['epub'])) { From 1be071f9f0fba7c93f114a886ff19199955a3f02 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 24 Jan 2015 15:43:45 +0100 Subject: [PATCH 2/3] fix syntax errors --- inc/poche/Poche.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index adb335c9e..e89e9d305 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -85,20 +85,20 @@ class Poche // if internal registration $body_internal = "Hi,\r\n\r\nSomeone just created an account for you on " . Tools::getPocheUrl() . ".\r\nHave fun with it !"; // if external (public) registration - $body = "Hi, \r\n\r\nYou've just created an account on " . Tools::getPocheUrl() . . ".\r\nHave fun with it !"; + $body = "Hi, \r\n\r\nYou've just created an account on " . Tools::getPocheUrl() . ".\r\nHave fun with it !"; $body = $internalRegistration ? $body_internal : $body; $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) - if (mail($email, sprintf(_('Your new wallabag account on '), Tools::getPocheUrl()), $body, 'From: {$email}')) { + if (mail($email, sprintf(_('Your new wallabag account on '), Tools::getPocheUrl()), $body, 'X-Mailer: PHP/' . phpversion())) { 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.'), $newUsername, $email)); } else { Tools::logm('A problem has been encountered while sending an email'); - $this->messages->add('e', _('A problem has been encountered while sending an email'); + $this->messages->add('e', _('A problem has been encountered while sending an email')); } } 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 an email'); + $this->messages->add('i', _('The server did not authorize sending an email')); } 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)); From 6cb5e1c9f511996d52b45b459bb26047f0dead38 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 13 Feb 2015 19:10:22 +0100 Subject: [PATCH 3/3] improvements to internal registration and translations --- inc/poche/Poche.class.php | 47 ++++++++++++------ inc/poche/config.inc.default.php | 3 ++ locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 15793 -> 17302 bytes locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po | 50 +++++++++++++++++++ locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 21037 -> 22690 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 52 ++++++++++++++++++++ 6 files changed, 136 insertions(+), 16 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index b26826f16..8ade91b48 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -81,25 +81,40 @@ class Poche $email = filter_var($email, FILTER_SANITIZE_STRING); if (!$this->store->userExists($newUsername)){ if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) { - if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) { - // if internal registration - $body_internal = "Hi,\r\n\r\nSomeone just created an account for you on " . Tools::getPocheUrl() . ".\r\nHave fun with it !"; - // if external (public) registration - $body = "Hi, \r\n\r\nYou've just created an account on " . Tools::getPocheUrl() . ".\r\nHave fun with it !"; - $body = $internalRegistration ? $body_internal : $body; - $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) - if (mail($email, sprintf(_('Your new wallabag account on '), Tools::getPocheUrl()), $body, 'X-Mailer: PHP/' . phpversion())) { - 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.'), $newUsername, $email)); + if ($email != "") { // if email is filled + if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) { + + // if internal registration + $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" . + _('Have fun with it !') . "\r\n\r\n" . + _('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 = $internalRegistration ? $body_internal : $body; + + $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) + if (mail($email, sprintf(_('Your new wallabag account on %1$s'), Tools::getPocheUrl()), $body, + 'X-Mailer: PHP/' . phpversion() . "\r\n" . + 'Content-type: text/plain; charset=UTF-8' . "\r\n" . + "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)); + + } else { + Tools::logm('A problem has been encountered while sending an email'); + $this->messages->add('e', _('A problem has been encountered while sending an email')); + } } else { - Tools::logm('A problem has been encountered while sending an email'); - $this->messages->add('e', _('A problem has been encountered while sending an email')); + 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')); } - } 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 an email')); - } + } 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)); Tools::redirect(); diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 91b50c244..fbf4ae9a5 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -59,6 +59,9 @@ @define ('MOBI', FALSE); @define ('PDF', FALSE); +// registration +@define ('SEND_CONFIRMATION_EMAIL', TRUE); + // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); // 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 77dee0708e05000ddd0974f722d78e7aa7d22960..025231250ebaa376d2b3c3a7a067d9351810e2be 100644 GIT binary patch delta 5873 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 WHoYQ6EphuNQOt3X8r@zWrz*{ delta 4440 zcmY+`3slzi9mnx6L4+tMPzc_D0!4z1yNH$u4w+_>NNQ4360mt2qmdJQoQk$Zr9PT= zG4pOZWA-FnkX+ufwah%O<7&t4G}}(<+-aU&&dhD^&-4FzmjC1DdHw!>{?Gq+|35yr zDrEm+-?`YZ^~Q063?MVY&7wlgUh1W*W~cg?h2baIil5@`SQTTIj?Fj>U%?DKh1_CS zu?O~wHH*M_)FYFSf0oHdPcxt0OQDnt<8e4Xi?`tkycy47G@i#>@rpAd&Wt*2AgaP) z7>T2C1&+r=JcabhE}$ClHR^f)!6fRpD4v?jg)Gd*nRpla@oqef>d6&UgRWr;hSJJ- zOhbBNBT*HOLp5v`s^?9p3R_X%Z+GWwF`W8s3k5xBH_|yfgnjWeQkPx8BK$Ajf<@e{ z3QAB7n~eHi4RVVuL{+rXU2jL-zZo^f`%xot5`CJ(&nYBf7_~-WD(ZnbsD_N?BNb~< zJz9pU=qaqgEm)2haVO>`cs>3MH6mZ3Iugo>Mk)b&V`?Jfuf>(eg<#K6Lsf#II0^N| zD%5>*Fb(IU=5!ru(Y=T*cpU4nw4YbO9%P#B9n^@NMA~R)P*Z%VALCEstbc#6WqGI` zjz(2bff|WP?s_eb;CwFX!Mm^uyHIPT593>cB{&wBqt?_1I1jI4CC(XWwidg56f`6g z2YEw39krbrP(9m-8kr-gIs4F^pT*&v|G}LnGJkqb3hKTr)D(?Cb!d{iJ`FX+b*K*d znkZ;BFLoC;p+;movMj6{waCt(hVUF}=+2|=i%a%~G!xa(GSvMOP!&|8rmhC{yje(} zZ4olEKHES+bFv5Tz{AKt`x76Gmfb?@GBFj^qe@f{>roXop{8hw`}-Qyb9P}eeuzWy z5~>05yuH-0EF7TypGQG0tVH#o8Z~4OyX*C+7t36Cy&3hOrKtNipoV@kYMbqK=iR99 zeSo^}jQjiVP|v@NVbpK`q@bbw2Jgh1Xns20g{k-;4#pPLNNvLhunSpt7R^n117;u# z+lo;`T#edhO{m4X0#(mO)CjzcKDB%Y1>Lyc-S8fEaQ;4O=$q5rn!r5HyHOAP8)}h; z)4Cy;jjTtThMJ-$P$Sibl_C75U>N6@xw#du3}O7~wEckYs>kd2(CY6-J@_xEh9xk8 zn(K6oz#LQs#i+R-hw8{fSc>(i-LV(7X3pcy_;1wvMGx0|rFRD7uRL6QTnD( zP|s^nEn9&4;v&@0wWBK9ikkD?sQVA1w&zLgg%^?8vVUP3rqJyuEJr zZ#n9|jhLqWzlnl|?g%oy_A6|`zvCm=$V94w)2I>n0yQH4aOdBkdekS!+a>v^hD}6G z*>u$NYcUodbJtsO6!qIm3VQHStirQ+A7-(V)S$&U7Iz|b*(IEZgYvvp-i~WIKZdG! zYQ8u0k0OI-ji~2rMUBiys44pm`gGw73fe9g+zodWcn`W0bz>pkhGiJ+k-J`tn&XA2 z9xg#G<~Db}8}%E}f$?|(wZ?vr8o{p$7=NbQ{>lZd(m{ou1*jV*I;Wy4n1!0VIj9HD zN4@FVFc!CAU+hFRQNLdiXdORN*qzgWBB#KYe^q|$KFYH3iVF$)wmplIm z)xh7P?)#(r`$bd**H9IQ^S=`fZBNX^7#xcCU>Y{y5PSv`(AP=fehMF>eoT^zy%$a~ z_Tzj4YUt`wyPyr@a6PJ`S5Z^bfogas>b}G7@29bY^RuW1Jvq|b#s`q~>a&k2=z(FQ zykEZrOy|4|lW-ntik?P|)C9*~k2)iKT&z+>RUW50n*N2=#ZS!~`Z6mqz># DP6@!N 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 579d1acad..75dad661e 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" msgid "Download the articles from this category in an epub" msgstr "Download the articles from this category in an EPUB" +# registration +msgid "Hi," +msgstr "Hi," + +msgid "Hi, %1$s" +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 "Your login is %1$s." +msgstr "Your login is %1$s." + +msgid "Have fun with it !" +msgstr "Have fun with it !" + +msgid "" +"This is an automatically generated message, no one will answer if you " +"respond to it." +msgstr "" +"This is an automatically generated message, no one will answer if you " +"respond to it." + +msgid "" +"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" +msgstr "" +"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" + +msgid "" +"The new user %1$s has been sent an email at %2$s. You may have to check spam " +"folder." +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 "The server did not authorize sending a confirmation email" +msgstr "The server did not authorize sending a confirmation email" + +msgid "" +"The user was created, but no email was sent because email was not filled in" +msgstr "" +"The user was created, but no email was sent because email was not filled in" + #~ msgid "poche it!" #~ msgstr "poche it!" 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 83f397a05d37afd64e4e148c7340b97ae3144b2e..b3b2f6fed9ebafeba0bb90d7c8216628720f3ec4 100644 GIT binary patch delta 6935 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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 fef312083..948a83564 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 "" msgid "Produced by wallabag with PHPMobi" msgstr "Produit par wallabag avec PHPMobi" +# registration +msgid "Hi," +msgstr "Salut," + +msgid "Hi, %1$s" +msgstr "Salut, %1$s" + +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 "Your login is %1$s." +msgstr "Votre identifiant is %1$s." + +msgid "Have fun with it !" +msgstr "Amusez-vous bien !" + +msgid "" +"This is an automatically generated message, no one will answer if you " +"respond to it." +msgstr "" +"Ceci est un message généré automatiquement, personne ne vous répondra si " +"vous y répondez." + +msgid "" +"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" +msgstr "" +"Note : Votre mot de passe a été défini par la personne ayant créé votre " +"compte. Vous devriez entrer en contact avec cette personne pour connaître " +"votre mot de passe et le changer dès que possible" + +msgid "" +"The new user %1$s has been sent an email at %2$s. You may have to check spam " +"folder." +msgstr "" +"Un email a été envoyé au nouvel utiliateur %1$s à l'adresse %2$s. Il peut " +"être nécessaire de vérifier le dossier des spams." + +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 user was created, but no email was sent because email was not filled in" +msgstr "" +"L'utilisateur a été créé, mais aucun mail n'a été envoyé car l'email n'était " +"pas renseigné" + msgid "Mail function is disabled. You can't send emails from your server" msgstr "" "La fonction mail est désactivée. Vous ne pouvez pas envoyer d'E-mails depuis "