[geeklog-cvs] geeklog: New / updated texts regarding token expiry / re-authent...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Dec 29 08:00:38 EST 2009
changeset 7554:74294018258d
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/74294018258d
user: Dirk Haun <dirk at haun-online.de>
date: Tue Dec 29 11:17:46 2009 +0100
description:
New / updated texts regarding token expiry / re-authentication
diffstat:
language/english.php | 9 +++++++--
language/english_utf-8.php | 11 ++++++++---
language/german.php | 9 +++++++--
language/german_formal.php | 9 +++++++--
language/german_formal_utf-8.php | 9 +++++++--
language/german_utf-8.php | 9 +++++++--
public_html/users.php | 2 +-
system/lib-security.php | 13 +++++++------
8 files changed, 51 insertions(+), 20 deletions(-)
diffs (232 lines):
diff -r 1e007c956d39 -r 74294018258d language/english.php
--- a/language/english.php Tue Dec 29 10:07:01 2009 +0100
+++ b/language/english.php Tue Dec 29 11:17:46 2009 +0100
@@ -383,7 +383,9 @@
159 => 'This email was generated automatically. Please do not reply to this email.',
160 => '(max. %d x %d pixels, %d bytes; %s)',
161 => 'will be scaled down',
- 162 => 'will not be scaled'
+ 162 => 'will not be scaled',
+ 163 => 'Re-Authentication Failed',
+ 164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.'
);
###############################################################################
@@ -1601,7 +1603,10 @@
'meta_description' => 'Meta Description',
'meta_keywords' => 'Meta Keywords',
'na' => 'N/A',
- 'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.'
+ 'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.',
+ 'token_expired' => 'The security token for this operation has expired. Please authenticate again to continue.',
+ 'reauth_msg' => 'The security token for this operation has expired. If you want to continue with this operation, then please authenticate again below. This will ensure that the changes you just made will not be lost.',
+ 'authenticate' => 'Authenticate'
);
# Localisation of the texts for the various drop-down menus that are actually
diff -r 1e007c956d39 -r 74294018258d language/english_utf-8.php
--- a/language/english_utf-8.php Tue Dec 29 10:07:01 2009 +0100
+++ b/language/english_utf-8.php Tue Dec 29 11:17:46 2009 +0100
@@ -383,7 +383,9 @@
159 => 'This email was generated automatically. Please do not reply to this email.',
160 => '(max. %d x %d pixels, %d bytes; %s)',
161 => 'will be scaled down',
- 162 => 'will not be scaled'
+ 162 => 'will not be scaled',
+ 163 => 'Re-Authentication Failed',
+ 164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.'
);
###############################################################################
@@ -428,7 +430,7 @@
9 => 'User URL',
10 => 'Send mail to',
11 => 'Your Name:',
- 12 => 'Your Email Address:',
+ 12 => 'Your Email Address',
13 => 'Subject:',
14 => 'Message:',
15 => 'HTML will not be translated.',
@@ -1601,7 +1603,10 @@
'meta_description' => 'Meta Description',
'meta_keywords' => 'Meta Keywords',
'na' => 'N/A',
- 'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.'
+ 'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.',
+ 'token_expired' => 'The security token for this operation has expired. Please authenticate again to continue.',
+ 'reauth_msg' => 'The security token for this operation has expired. If you want to continue with this operation, then please authenticate again below. This will ensure that the changes you just made will not be lost.',
+ 'authenticate' => 'Authenticate'
);
# Localisation of the texts for the various drop-down menus that are actually
diff -r 1e007c956d39 -r 74294018258d language/german.php
--- a/language/german.php Tue Dec 29 10:07:01 2009 +0100
+++ b/language/german.php Tue Dec 29 11:17:46 2009 +0100
@@ -386,7 +386,9 @@
159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.',
160 => '(max. %d x %d Pixel, %d Bytes; %s)',
161 => 'wird ggfs. skaliert',
- 162 => 'wird nicht skaliert'
+ 162 => 'wird nicht skaliert',
+ 163 => 'Re-Authentication Failed',
+ 164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.'
);
###############################################################################
@@ -1602,7 +1604,10 @@
'meta_description' => 'Metatag Description',
'meta_keywords' => 'Metatag Keywords',
'na' => 'n/v',
- 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.'
+ 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.',
+ 'token_expired' => 'The security token for this operation has expired. Please authenticate again to continue.',
+ 'reauth_msg' => 'The security token for this operation has expired. If you want to continue with this operation, then please authenticate again below. This will ensure that the changes you just made will not be lost.',
+ 'authenticate' => 'Authenticate'
);
# Localisation of the texts for the various drop-down menus that are actually
diff -r 1e007c956d39 -r 74294018258d language/german_formal.php
--- a/language/german_formal.php Tue Dec 29 10:07:01 2009 +0100
+++ b/language/german_formal.php Tue Dec 29 11:17:46 2009 +0100
@@ -387,7 +387,9 @@
159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.',
160 => '(max. %d x %d Pixel, %d Bytes; %s)',
161 => 'wird ggfs. skaliert',
- 162 => 'wird nicht skaliert'
+ 162 => 'wird nicht skaliert',
+ 163 => 'Re-Authentication Failed',
+ 164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.'
);
###############################################################################
@@ -1603,7 +1605,10 @@
'meta_description' => 'Metatag Description',
'meta_keywords' => 'Metatag Keywords',
'na' => 'n/v',
- 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.'
+ 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.',
+ 'token_expired' => 'The security token for this operation has expired. Please authenticate again to continue.',
+ 'reauth_msg' => 'The security token for this operation has expired. If you want to continue with this operation, then please authenticate again below. This will ensure that the changes you just made will not be lost.',
+ 'authenticate' => 'Authenticate'
);
# Localisation of the texts for the various drop-down menus that are actually
diff -r 1e007c956d39 -r 74294018258d language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php Tue Dec 29 10:07:01 2009 +0100
+++ b/language/german_formal_utf-8.php Tue Dec 29 11:17:46 2009 +0100
@@ -387,7 +387,9 @@
159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.',
160 => '(max. %d x %d Pixel, %d Bytes; %s)',
161 => 'wird ggfs. skaliert',
- 162 => 'wird nicht skaliert'
+ 162 => 'wird nicht skaliert',
+ 163 => 'Re-Authentication Failed',
+ 164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.'
);
###############################################################################
@@ -1603,7 +1605,10 @@
'meta_description' => 'Metatag Description',
'meta_keywords' => 'Metatag Keywords',
'na' => 'n/v',
- 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.'
+ 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.',
+ 'token_expired' => 'The security token for this operation has expired. Please authenticate again to continue.',
+ 'reauth_msg' => 'The security token for this operation has expired. If you want to continue with this operation, then please authenticate again below. This will ensure that the changes you just made will not be lost.',
+ 'authenticate' => 'Authenticate'
);
# Localisation of the texts for the various drop-down menus that are actually
diff -r 1e007c956d39 -r 74294018258d language/german_utf-8.php
--- a/language/german_utf-8.php Tue Dec 29 10:07:01 2009 +0100
+++ b/language/german_utf-8.php Tue Dec 29 11:17:46 2009 +0100
@@ -386,7 +386,9 @@
159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.',
160 => '(max. %d x %d Pixel, %d Bytes; %s)',
161 => 'wird ggfs. skaliert',
- 162 => 'wird nicht skaliert'
+ 162 => 'wird nicht skaliert',
+ 163 => 'Re-Authentication Failed',
+ 164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.'
);
###############################################################################
@@ -1602,7 +1604,10 @@
'meta_description' => 'Metatag Description',
'meta_keywords' => 'Metatag Keywords',
'na' => 'n/v',
- 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.'
+ 'token_expiry' => 'Achtung, zeitgesteuerte Sicherheitsfunktion (Security-Token). Nach %s lässt sich diese Seite nicht mehr speichern. Änderungen gehen verloren.',
+ 'token_expired' => 'The security token for this operation has expired. Please authenticate again to continue.',
+ 'reauth_msg' => 'The security token for this operation has expired. If you want to continue with this operation, then please authenticate again below. This will ensure that the changes you just made will not be lost.',
+ 'authenticate' => 'Authenticate'
);
# Localisation of the texts for the various drop-down menus that are actually
diff -r 1e007c956d39 -r 74294018258d public_html/users.php
--- a/public_html/users.php Tue Dec 29 10:07:01 2009 +0100
+++ b/public_html/users.php Tue Dec 29 11:17:46 2009 +0100
@@ -1356,7 +1356,7 @@
if (! empty($files)) {
SECINT_cleanupFiles($files);
}
- displayLoginErrorAndAbort(82, $LANG04[113], $LANG04[112]);
+ displayLoginErrorAndAbort(82, $LANG04[163], $LANG04[164]);
} else {
$returnurl = '';
if (isset($_POST['token_returnurl'])) {
diff -r 1e007c956d39 -r 74294018258d system/lib-security.php
--- a/system/lib-security.php Tue Dec 29 10:07:01 2009 +0100
+++ b/system/lib-security.php Tue Dec 29 11:17:46 2009 +0100
@@ -1131,7 +1131,7 @@
*/
function SEC_checkToken()
{
- global $_CONF, $LANG20;
+ global $_CONF, $LANG20, $LANG_ADMIN;
if (SECINT_checkToken()) {
return true;
@@ -1159,7 +1159,7 @@
}
$display = COM_siteHeader('menu', $LANG20[1])
- . COM_showMessageText('The security token for this operation has expired. Please authenticate again to continue.')
+ . COM_showMessageText($LANG_ADMIN['token_expired'])
. SECINT_authform($returnurl, $method, $postdata, $getdata, $files)
. COM_siteFooter();
@@ -1183,9 +1183,9 @@
$token = ''; // Default to no token.
$return = false; // Default to fail.
- if(array_key_exists(CSRF_TOKEN, $_GET)) {
+ if (array_key_exists(CSRF_TOKEN, $_GET)) {
$token = COM_applyFilter($_GET[CSRF_TOKEN]);
- } else if(array_key_exists(CSRF_TOKEN, $_POST)) {
+ } elseif (array_key_exists(CSRF_TOKEN, $_POST)) {
$token = COM_applyFilter($_POST[CSRF_TOKEN]);
}
@@ -1243,7 +1243,7 @@
*/
function SECINT_authform($returnurl, $method, $postdata = '', $getdata = '', $files = '')
{
- global $_CONF, $LANG01, $LANG04, $LANG20;
+ global $_CONF, $LANG01, $LANG04, $LANG20, $LANG_ADMIN;
$retval = '';
@@ -1254,10 +1254,11 @@
$authform->set_var('site_admin_url', $_CONF['site_admin_url']);
$authform->set_var('layout_url', $_CONF['layout_url']);
+ $authform->set_var('lang_message', $LANG_ADMIN['reauth_msg']);
$authform->set_var('lang_newreglink', '');
$authform->set_var('lang_forgetpassword', '');
- $authform->set_var('lang_login', $LANG04[80]);
+ $authform->set_var('lang_login', $LANG_ADMIN['authenticate']);
$authform->set_var('lang_username', $LANG04[2]);
$authform->set_var('lang_password', $LANG01[57]);
More information about the geeklog-cvs
mailing list