oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

mainly css improvements

Browse source
This commit is contained in:
Thomas Citharel 2015-02-14 12:35:22 +01:00
parent f2321633b9
commit 698eda739e
8 changed files with 54 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inc/poche/Poche.class.php
View file

@ -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');

2
inc/poche/config.inc.default.php
View file

@ -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