Menu
▾
▴
[TWiki-Dev] [SVN] CrawfordCurrie r15542 - in twiki/branches/TWikiRelease04x02: lib/TWiki/Store lib/TWiki/UI locale templates
|
From: <de...@de...> - 2007-11-09 09:30:59
|
Author: CrawfordCurrie
Date: 2007-11-09 03:31:01 -0600 (Fri, 09 Nov 2007)
New Revision: 15542
Modified:
twiki/branches/TWikiRelease04x02/lib/TWiki/Store/RcsFile.pm
twiki/branches/TWikiRelease04x02/lib/TWiki/UI/Register.pm
twiki/branches/TWikiRelease04x02/locale/TWiki.pot
twiki/branches/TWikiRelease04x02/locale/bg.po
twiki/branches/TWikiRelease04x02/locale/cs.po
twiki/branches/TWikiRelease04x02/locale/da.po
twiki/branches/TWikiRelease04x02/locale/de.po
twiki/branches/TWikiRelease04x02/locale/es.po
twiki/branches/TWikiRelease04x02/locale/fr.po
twiki/branches/TWikiRelease04x02/locale/it.po
twiki/branches/TWikiRelease04x02/locale/jp.po
twiki/branches/TWikiRelease04x02/locale/nl.po
twiki/branches/TWikiRelease04x02/locale/pl.po
twiki/branches/TWikiRelease04x02/locale/pt.po
twiki/branches/TWikiRelease04x02/locale/ru.po
twiki/branches/TWikiRelease04x02/locale/sv.po
twiki/branches/TWikiRelease04x02/locale/zh-cn.po
twiki/branches/TWikiRelease04x02/locale/zh-tw.po
twiki/branches/TWikiRelease04x02/templates/messages.tmpl
Log:
Item4802: the change to encode parameters to the oops script (to block HTML payloads in parameters) broke the reset password functionality, which relies on passing the error message on to oops. All the error messages were formatted as HTML, which was being encoded. So I created a new type of alert (nohtml) and converted all the messages to remove the HTML from them. To avoid forcing a retranslation step, I manually edited the .po files to perform the same translation. The change was trivial (removal of a single <nop>) and should be low risk.
Modified: twiki/branches/TWikiRelease04x02/lib/TWiki/Store/RcsFile.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/lib/TWiki/Store/RcsFile.pm 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/lib/TWiki/Store/RcsFile.pm 2007-11-09 09:31:01 UTC (rev 15542)
@@ -1094,12 +1094,13 @@
sub stringify {
my $this = shift;
-
- return $this->{web}.'.'.
- ($this->{topic} || '{no topic}').
- ($this->{attachment} ? ':'.$this->{attachment} : '').
- $this->{file}.(-e $this->{file} ? '(e)' : '').
- '/'.$this->{rcsFile}.(-e $this->{rcsFile} ? '(e)' : '');
+ my @reply;
+ foreach my $key qw(web topic attachment file rcsFile) {
+ if (defined $this->{$key}) {
+ push(@reply, "$key=$this->{$key}");
+ }
+ }
+ return join(',', @reply);
}
# Chop out recognisable path components to prevent hacking based on error
Modified: twiki/branches/TWikiRelease04x02/lib/TWiki/UI/Register.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/lib/TWiki/UI/Register.pm 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/lib/TWiki/UI/Register.pm 2007-11-09 09:31:01 UTC (rev 15542)
@@ -519,7 +519,7 @@
my $users = $session->{users};
unless( $login ) {
- $$pMess .= $session->inlineAlert( 'alerts', 'bad_user', '' );
+ $$pMess .= $session->inlineAlert( 'alertsnohtml', 'bad_user', '' );
return 0;
}
@@ -527,7 +527,8 @@
my $message = '';
unless( $user && $users->userExists( $user )) {
# Not an error.
- $$pMess .= $session->inlineAlert( 'alerts', 'missing_user', $user);
+ $$pMess .= $session->inlineAlert(
+ 'alertsnohtml', 'missing_user', $user);
return 0;
}
@@ -535,7 +536,8 @@
my $password = TWiki::Users::randomPassword();
unless( $users->setPassword( $user, $password, 1 )) {
- $$pMess .= $session->inlineAlert( 'alerts', 'reset_bad', $user);
+ $$pMess .= $session->inlineAlert(
+ 'alertsnohtml', 'reset_bad', $user);
return 0;
}
@@ -545,7 +547,8 @@
my @em = $users->getEmails($user);
my $sent = 0;
if (!scalar(@em)) {
- $$pMess .= $session->inlineAlert( 'alerts', 'no_email_for', $user);
+ $$pMess .= $session->inlineAlert(
+ 'alertsnohtml', 'no_email_for', $user);
} else {
my $ln = $users->getLoginName($user);
my $wn = $users->getWikiName($user);
@@ -564,7 +567,8 @@
} );
if( $err ) {
- $$pMess .= $session->inlineAlert( 'alerts', 'generic', $err );
+ $$pMess .= $session->inlineAlert(
+ 'alertsnohtml', 'generic', $err );
} else {
$sent = 1;
}
@@ -575,7 +579,7 @@
if ($sent ) {
$$pMess .= $session->inlineAlert(
- 'alerts',
+ 'alertsnohtml',
'new_sys_pass',
$users->getLoginName($user),
$users->getWikiName( $user ));
Modified: twiki/branches/TWikiRelease04x02/locale/TWiki.pot
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/TWiki.pot 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/TWiki.pot 2007-11-09 09:31:01 UTC (rev 15542)
@@ -497,7 +497,7 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
Modified: twiki/branches/TWikiRelease04x02/locale/bg.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/bg.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/bg.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -545,11 +545,11 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
-"Нова *генерирана от системата* парола за вход %1 (<nop>WikiName %2) бе "
+"Нова *генерирана от системата* парола за вход %1 (WikiName %2) бе "
"изпратена на вашия регистриран e-mail-адрес. Ако вашият e-mail-адрес вече е "
"невалиден,моля свържете се с %3"
Modified: twiki/branches/TWikiRelease04x02/locale/cs.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/cs.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/cs.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -540,11 +540,11 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
-"Nové *systémem vygenerované* heslo pro Váš účet %1 (<nop>WikiName %2) byl "
+"Nové *systémem vygenerované* heslo pro Váš účet %1 (WikiName %2) byl "
"odeslán na Vaši registrovanou e-mailovou adresu. Pokud Vaše adresa není dále "
"platná, kontaktujte prosím %3"
Modified: twiki/branches/TWikiRelease04x02/locale/da.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/da.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/da.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -550,11 +550,11 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
-"Et nyt *system-genereret* password til dit brugernavn %1 (<nop>WikiName %2) "
+"Et nyt *system-genereret* password til dit brugernavn %1 (WikiName %2) "
"er blevet sendt til den registrerede e-mail-adresse. Hvis din e-mail-adresse "
"ikke længere er gyldig, kontakt da venligst %3"
Modified: twiki/branches/TWikiRelease04x02/locale/de.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/de.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/de.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -550,12 +550,12 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
"Ein neues vom System erzeugtes Passwort für den Login Namen %1 "
-"(<nop>Wikiname %2) wurde an ihre registrierte E-Mail gesendet. Falls ihre E-"
+"(Wikiname %2) wurde an ihre registrierte E-Mail gesendet. Falls ihre E-"
"Mail Adresse nicht länger gültig ist, setzen Sie sich bitte mit %3 in Kontakt"
#: data/TWiki/WebTemplateTopics.txt:4
Modified: twiki/branches/TWikiRelease04x02/locale/es.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/es.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/es.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -554,12 +554,12 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
"Un nuevo password *generado por el sistema* para su nombre de usuario %1"
-"(<nop>WikiName %2) ha sido enviado a su correo electronico registrado. Si "
+"(WikiName %2) ha sido enviado a su correo electronico registrado. Si "
"sudirección de correo electronico no es valida actualmente, por favor, "
"contacte%3"
Modified: twiki/branches/TWikiRelease04x02/locale/fr.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/fr.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/fr.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -549,7 +549,7 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
Modified: twiki/branches/TWikiRelease04x02/locale/it.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/it.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/it.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -548,12 +548,12 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
"Una nuova password *generata dal sistema* per il tuo login name %1 "
-"(<nop>WikiName %2) è stata inviata al to indirizzo email registrato. Se "
+"(WikiName %2) è stata inviata al to indirizzo email registrato. Se "
"l'indirizzo utilizzato non fosse più valido, contatta %3"
#: data/TWiki/WebTemplateTopics.txt:4
Modified: twiki/branches/TWikiRelease04x02/locale/jp.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/jp.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/jp.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -559,7 +559,7 @@
#: templates/messages.tmpl:447
#, fuzzy
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
Modified: twiki/branches/TWikiRelease04x02/locale/nl.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/nl.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/nl.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -548,7 +548,7 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
Modified: twiki/branches/TWikiRelease04x02/locale/pl.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/pl.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/pl.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -547,11 +547,11 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
-"Nowe, wygenerowane automatycznie hasło dla użytkownika: %1 (<nop>WikiName %"
+"Nowe, wygenerowane automatycznie hasło dla użytkownika: %1 (WikiName %"
"2) zostało przesłane na adres email podany przy rejestracji. Skontaktuj się "
"z %2, jeśli ten adres nie jest poprawny."
Modified: twiki/branches/TWikiRelease04x02/locale/pt.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/pt.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/pt.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -551,11 +551,11 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
-"Uma nova senha *gerada pelo sistema* para o seu login %1 (<nop>NomeWiki %2) "
+"Uma nova senha *gerada pelo sistema* para o seu login %1 (NomeWiki %2) "
"foi enviada para o seu endereço de e-mail registrado no sistema. Se seu "
"endereço de e-mail não for válido, favor contatar %3"
Modified: twiki/branches/TWikiRelease04x02/locale/ru.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/ru.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/ru.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -559,12 +559,12 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
"Новый пароль *автоматически* сгенерированный для Вашего ИмениПользователя %1 "
-"(<nop>ВикиИмя %2) выслан на введенный Вами при регистрации адрес электронной "
+"(ВикиИмя %2) выслан на введенный Вами при регистрации адрес электронной "
"почты. Если этот адрес больше не действителен, то обратитесь, пожалуйста, к %"
"3"
Modified: twiki/branches/TWikiRelease04x02/locale/sv.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/sv.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/sv.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -539,11 +539,11 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
-"Ett nytt *systemgenererat* lösenord till dit användarnamn %1 (<nop>WikiName %"
+"Ett nytt *systemgenererat* lösenord till dit användarnamn %1 (WikiName %"
"2) har skickats till den registrerade e-postadressen. Om den inte längre är "
"giltig så kontakta %3"
Modified: twiki/branches/TWikiRelease04x02/locale/zh-cn.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/zh-cn.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/zh-cn.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -521,7 +521,7 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
Modified: twiki/branches/TWikiRelease04x02/locale/zh-tw.po
===================================================================
--- twiki/branches/TWikiRelease04x02/locale/zh-tw.po 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/locale/zh-tw.po 2007-11-09 09:31:01 UTC (rev 15542)
@@ -520,7 +520,7 @@
#: templates/messages.tmpl:447
msgid ""
-"A new *system-generated* password for your login name %1 (<nop>WikiName %2) "
+"A new *system-generated* password for your login name %1 (WikiName %2) "
"has been sent to your registered e-mail address. If your e-mail address is "
"no longer valid, please contact %3"
msgstr ""
Modified: twiki/branches/TWikiRelease04x02/templates/messages.tmpl
===================================================================
--- twiki/branches/TWikiRelease04x02/templates/messages.tmpl 2007-11-09 09:05:45 UTC (rev 15541)
+++ twiki/branches/TWikiRelease04x02/templates/messages.tmpl 2007-11-09 09:31:01 UTC (rev 15542)
@@ -440,11 +440,11 @@
%TMPL:DEF{"bad_content"}% %MAKETEXT{"Error: Unsupported content type: [_1] (Must be =text/html=, =text/plain= or =text/css=)" args="%PARAM1%"}% %TMPL:END%
%TMPL:DEF{"topic_not_found"}% %MAKETEXT{"Warning: Can't find topic [_1].[_2]" args="<nop>%PARAM1%, <nop>%PARAM2%"}% %TMPL:END%
%TMPL:DEF{"already_included"}% %MAKETEXT{"Warning: Can't INCLUDE [_1] repeatedly, topic is already included. [_2]" args="<nop>%PARAM1%, %PARAM2%"}% %TMPL:END%
-%TMPL:DEF{"generic"}% %PARAM1% %PARAM2% %PARAM3% %PARAM4%<br /> %TMPL:END%
-%TMPL:DEF{"missing_user"}% %MAKETEXT{"The entry for user [_1] was missing in the password system." args="%PARAM1%"}%<br /> %TMPL:END%
-%TMPL:DEF{"bad_user"}% %MAKETEXT{"Can't find user [_1]" args="%PARAM1%"}%<br /> %TMPL:END%
-%TMPL:DEF{"no_email_for"}% %MAKETEXT{"Can't get an e-mail address for [_1] (required for password reset)" args="%PARAM1%"}%<br /> %TMPL:END%
-%TMPL:DEF{"new_sys_pass"}% %MAKETEXT{"A new *system-generated* password for your login name [_1] (<nop>WikiName [_2]) has been sent to your registered e-mail address. If your e-mail address is no longer valid, please contact [_3]" args="%PARAM1%, %USERSWEB%.%PARAM2%, <a href='mailto:%WIKIWEBMASTER%?subject=%ENCODE{"Reset password request for <nop>%PARAM1%/<nop>%PARAM2%"}%'>%WIKIWEBMASTER%</a>"}%<br /> %TMPL:END%
+%TMPL:DEF{"generic"}% %PARAM1% %PARAM2% %PARAM3% %PARAM4% %TMPL:END%
+%TMPL:DEF{"missing_user"}% %MAKETEXT{"The entry for user [_1] was missing in the password system." args="%PARAM1%"}% %TMPL:END%
+%TMPL:DEF{"bad_user"}% %MAKETEXT{"Can't find user [_1]" args="%PARAM1%"}%%TMPL:END%
+%TMPL:DEF{"no_email_for"}% %MAKETEXT{"Can't get an e-mail address for [_1] (required for password reset)" args="%PARAM1%"}% %TMPL:END%
+%TMPL:DEF{"new_sys_pass"}% %MAKETEXT{"A new *system-generated* password for your login name [_1] (WikiName [_2]) has been sent to your registered e-mail address. If your e-mail address is no longer valid, please contact [_3]" args="%PARAM1%, %USERSWEB%.%PARAM2%, %WIKIWEBMASTER%"}% %TMPL:END%
%TMPL:DEF{"geturl_failed"}% %MAKETEXT{"Failed to include URL [_1]" args="%PARAM1%"}%%TMPL:END%
%TMPL:DEF{"urls_not_allowed"}% %MAKETEXT{"Warning: This site does not allow %<nop>INCLUDE% of URLs"}% %TMPL:END%
%TMPL:DEF{"bad_search"}% %MAKETEXT{"Could not perform search. Error was: [_1]" args="%PARAM1%"}%%TMPL:END%
|