aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-13 19:39:48 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-13 19:39:48 +0100
commitf2321633b9dcc806b3c036a742bde1e4c9bcbef9 (patch)
treefaa2120d3a458d124ac41bec8ff62f6b06035d1d /inc
parent0eae6d14b8858005919cc3069799f77008a81d29 (diff)
downloadwallabag-f2321633b9dcc806b3c036a742bde1e4c9bcbef9.tar.gz
wallabag-f2321633b9dcc806b3c036a742bde1e4c9bcbef9.tar.zst
wallabag-f2321633b9dcc806b3c036a742bde1e4c9bcbef9.zip
couple improvements, translations
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/Poche.class.php8
-rwxr-xr-xinc/poche/Routing.class.php2
-rwxr-xr-xinc/poche/config.inc.default.php3
3 files changed, 8 insertions, 5 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index cd7578e3..a91a3f8f 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -93,7 +93,9 @@ class Poche
93 _('This is an automatically generated message, no one will answer if you respond to it.'); 93 _('This is an automatically generated message, no one will answer if you respond to it.');
94 94
95 // if external (public) registration 95 // if external (public) registration
96 $body = "Hi, " . $newUsername . "\r\n\r\nYou've just created a wallabag account on " . Tools::getPocheUrl() . ".\r\nHave fun with it !"; 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()) .
98 "\r\n\r\n" . _("Have fun with it !");
97 $body = $internalRegistration ? $body_internal : $body; 99 $body = $internalRegistration ? $body_internal : $body;
98 100
99 $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) 101 $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
@@ -117,7 +119,9 @@ class Poche
117 $this->messages->add('i', _('The user was created, but no email was sent because email was not filled in')); 119 $this->messages->add('i', _('The user was created, but no email was sent because email was not filled in'));
118 } 120 }
119 Tools::logm('The new user ' . $newUsername . ' has been installed'); 121 Tools::logm('The new user ' . $newUsername . ' has been installed');
120 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername)); 122 if (\Session::isLogged()) {
123 $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
124 }
121 Tools::redirect(); 125 Tools::redirect();
122 } 126 }
123 else { 127 else {
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index e9b67771..177b74d5 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -72,7 +72,7 @@ class Routing
72 Tools::logm('register'); 72 Tools::logm('register');
73 $tplFile = Tools::getTplFile('register'); 73 $tplFile = Tools::getTplFile('register');
74 } elseif (ALLOW_REGISTER && isset($_GET['register'])){ 74 } elseif (ALLOW_REGISTER && isset($_GET['register'])){
75 $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); 75 $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']);
76 Tools::redirect(); 76 Tools::redirect();
77 } elseif(isset($_SERVER['PHP_AUTH_USER'])) { 77 } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
78 if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) { 78 if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index e569dddd..7c27856d 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -33,8 +33,6 @@
33@define ('MODE_DEMO', FALSE); 33@define ('MODE_DEMO', FALSE);
34@define ('DEBUG_POCHE', FALSE); 34@define ('DEBUG_POCHE', FALSE);
35 35
36@define ('ALLOW_REGISTER', TRUE);
37
38//default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL. 36//default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL.
39@define ('ERROR_REPORTING', E_ALL & ~E_NOTICE); 37@define ('ERROR_REPORTING', E_ALL & ~E_NOTICE);
40 38
@@ -63,6 +61,7 @@
63 61
64// registration 62// registration
65@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL 63@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
64@define ('ALLOW_REGISTER', TRUE);
66 65
67// display or not print link in article view 66// display or not print link in article view
68@define ('SHOW_PRINTLINK', '1'); 67@define ('SHOW_PRINTLINK', '1');