From 0a3e593bae2815a19db3f57ad516eed5e0eb3773 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 26 Jan 2014 17:50:12 +0100 Subject: bug 448: changed the wording for the message after the revokation of a certificate --- includes/account.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/account.php b/includes/account.php index 7c3748d..cceed2b 100644 --- a/includes/account.php +++ b/includes/account.php @@ -972,8 +972,10 @@ function buildSubjectFromSession() { continue; } mysql_query("update `domaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."
\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } + printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); + } else { @@ -1128,8 +1130,9 @@ function buildSubjectFromSession() { continue; } mysql_query("update `emailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."
\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } + printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); } else { @@ -1755,8 +1758,9 @@ function buildSubjectFromSession() { continue; } mysql_query("update `orgemailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."
\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } + printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); } else { @@ -2111,8 +2115,9 @@ function buildSubjectFromSession() { continue; } mysql_query("update `orgdomaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."
\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } + printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); } else { -- cgit v1.2.1 From aad62613f78bc092ddccb839f0155dc98417c481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Tue, 25 Feb 2014 23:00:38 +0100 Subject: bug 448: Inline the static string in printf() and add a note to translators instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- includes/account.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/includes/account.php b/includes/account.php index cceed2b..ca64ffd 100644 --- a/includes/account.php +++ b/includes/account.php @@ -974,7 +974,9 @@ function buildSubjectFromSession() { mysql_query("update `domaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } - printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '
'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'
'; } else @@ -1132,7 +1134,9 @@ function buildSubjectFromSession() { mysql_query("update `emailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } - printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '
'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'
'; } else { @@ -1760,7 +1764,9 @@ function buildSubjectFromSession() { mysql_query("update `orgemailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } - printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '
'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'
'; } else { @@ -2117,7 +2123,9 @@ function buildSubjectFromSession() { mysql_query("update `orgdomaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); } - printf('
'._('All listed certificates will be added to the %s soon.').'
','Certificate Revocation List (CRL)'); + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '
'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'
'; } else { -- cgit v1.2.1 From 8ac27d6ed5751435d920f9ae99020752007d441d Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Tue, 11 Mar 2014 22:51:07 +0100 Subject: bug 448: Properly escape data that comes from the database --- includes/account.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/account.php b/includes/account.php index ca64ffd..497bf58 100644 --- a/includes/account.php +++ b/includes/account.php @@ -972,7 +972,7 @@ function buildSubjectFromSession() { continue; } mysql_query("update `domaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term @@ -1132,7 +1132,7 @@ function buildSubjectFromSession() { continue; } mysql_query("update `emailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term @@ -1762,7 +1762,7 @@ function buildSubjectFromSession() { continue; } mysql_query("update `orgemailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term @@ -2121,7 +2121,7 @@ function buildSubjectFromSession() { continue; } mysql_query("update `orgdomaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', $row['CN'], $row['serial']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'
', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term -- cgit v1.2.1