From 5de1cb4e94ad14c95282e7b3042d4a4179f766dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 23 May 2012 00:01:54 +0200 Subject: Revert "bug 1019: Doh, it's printf not sprintf, and make the string translatable" This reverts commit 01c885f8fc88cd42c750890b9accf67adfbeee40. --- pages/account/40.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/account/40.php b/pages/account/40.php index 499bf4d..d458329 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -19,9 +19,9 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s ?>

-

support@cacert.org" ) ?> -- cgit v1.2.1 From 2e6b80c1c9742fe4c173a24211a89f2bceeef4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 23 May 2012 00:02:11 +0200 Subject: Revert "bug 1019: Disable the logged-in contact form until the underlying problem" This reverts commit 9422c4b9a9907928ff49c8524938630749c928ab. --- pages/account/40.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pages/account/40.php b/pages/account/40.php index d458329..8391903 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -19,15 +19,6 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s ?>

-

support@cacert.org" - ) ?> -

- -

@@ -93,4 +84,3 @@ Australia

document.form2.secrethash2.value = pagehash; --> -*/ -- cgit v1.2.1 From 1da586482b2ad57148706844a5a022eb401146a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 23 May 2012 00:06:48 +0200 Subject: bug 1019: Fix the underlying problem of the logged in contact form not working MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Yep, it probably never worked, so much for copy & paste and not thinking Signed-off-by: Michael Tänzer --- pages/account/40.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/account/40.php b/pages/account/40.php index 8391903..c2b06d6 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -52,7 +52,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s

-
+ -- cgit v1.2.1 From c15aa191e40238802860e8719839c8d14e11ec6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 23 May 2012 00:45:43 +0200 Subject: bug 1019: Do not allow logged in users to spam someone else MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- www/account.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/account.php b/www/account.php index d1dd695..0b32c2c 100644 --- a/www/account.php +++ b/www/account.php @@ -47,7 +47,7 @@ $message = "From: $who\nEmail: $email\nSubject: $subject\n\nMessage:\n".$message; - sendmail("cacert-support@lists.cacert.org, $email", "[website form email]: ".$subject, $message, "website-form@cacert.org", "cacert-support@lists.cacert.org, $email", "", "CAcert Website"); + sendmail("cacert-support@lists.cacert.org", "[website form email]: ".$subject, $message, "website-form@cacert.org", "cacert-support@lists.cacert.org, $email", "", "CAcert Website"); showheader(_("Welcome to CAcert.org")); echo _("Your message has been sent to the general support list."); -- cgit v1.2.1 From 89c0c15f18aedf3bba9e6c5c2d921c4db4ed36c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 23 May 2012 01:09:02 +0200 Subject: bug 1019: Also apply the fix to the logged out form and make the action handling the data explicit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- pages/account/40.php | 4 ++-- pages/index/11.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/account/40.php b/pages/account/40.php index c2b06d6..a96ff0d 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -27,7 +27,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s

- + @@ -52,7 +52,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s

- +
diff --git a/pages/index/11.php b/pages/index/11.php index 8391903..60c8941 100644 --- a/pages/index/11.php +++ b/pages/index/11.php @@ -27,7 +27,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s

- + @@ -52,7 +52,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s

- +
-- cgit v1.2.1