aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-14 12:35:22 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-14 12:35:22 +0100
commit698eda739e705f5605711af927eb5e3720c7c97c (patch)
tree0c28505888ed9d65b304692b7b81946c4ed3b059 /inc
parentf2321633b9dcc806b3c036a742bde1e4c9bcbef9 (diff)
downloadwallabag-698eda739e705f5605711af927eb5e3720c7c97c.tar.gz
wallabag-698eda739e705f5605711af927eb5e3720c7c97c.tar.zst
wallabag-698eda739e705f5605711af927eb5e3720c7c97c.zip
mainly css improvements
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/Poche.class.php4
-rwxr-xr-xinc/poche/config.inc.default.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a91a3f8f..e37d7c6c 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -85,7 +85,7 @@ class Poche
85 if ($email != "") { // if email is filled 85 if ($email != "") { // if email is filled
86 if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) { 86 if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
87 87
88 // if internal registration 88 // if internal registration from config screen
89 $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) . 89 $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
90 "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" . 90 "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
91 _('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 _('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
96 $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" . 96 $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" .
97 sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) . 97 sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) .
98 "\r\n\r\n" . _("Have fun with it !"); 98 "\r\n\r\n" . _("Have fun with it !");
99
99 $body = $internalRegistration ? $body_internal : $body; 100 $body = $internalRegistration ? $body_internal : $body;
100 101
101 $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) 102 $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
@@ -105,6 +106,7 @@ class Poche
105 "From: " . $newUsername . "@" . gethostname() . "\r\n")) { 106 "From: " . $newUsername . "@" . gethostname() . "\r\n")) {
106 Tools::logm('The user ' . $newUsername . ' has been emailed'); 107 Tools::logm('The user ' . $newUsername . ' has been emailed');
107 $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)); 108 $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));
109 Tools::redirect('?');
108 110
109 } else { 111 } else {
110 Tools::logm('A problem has been encountered while sending an email'); 112 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 7c27856d..6750383e 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -60,7 +60,7 @@
60@define ('PDF', FALSE); 60@define ('PDF', FALSE);
61 61
62// registration 62// registration
63@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL 63@define ('SEND_CONFIRMATION_EMAIL', FALSE);
64@define ('ALLOW_REGISTER', TRUE); 64@define ('ALLOW_REGISTER', TRUE);
65 65
66// display or not print link in article view 66// display or not print link in article view