From 5de1cb4e94ad14c95282e7b3042d4a4179f766dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
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
 ?>
 <H3><?=_("Contact Us")?></H3>
 
-<p><? printf(_("To contact us please log out and then use the contact form ".
+<p><? sprintf("To contact us please log out and then use the contact form ".
 		"there or send us an email to %s. We are working to fix this ".
-		"situation so you may contact us while staying logged in again."),
+		"situation so you may contact us while staying logged in again.",
 		
 		"<a href='mailto:support@cacert.org'>support@cacert.org</a>"
 	) ?>
-- 
cgit v1.2.1


From 2e6b80c1c9742fe4c173a24211a89f2bceeef4c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
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
 ?>
 <H3><?=_("Contact Us")?></H3>
 
-<p><? sprintf("To contact us please log out and then use the contact form ".
-		"there or send us an email to %s. We are working to fix this ".
-		"situation so you may contact us while staying logged in again.",
-		
-		"<a href='mailto:support@cacert.org'>support@cacert.org</a>"
-	) ?>
-</p>
-
-<?/*
 <p><b><?=_("General Questions")?></b></p>
 <p><b><?=_("PLEASE NOTE: Due to the large amounts of support questions, incorrectly directed emails may be over looked, this is a volunteer effort and directing general questions to the right place will help everyone, including yourself as you will get a reply quicker.")?></b></p>
 <p><b><?=_("If you are contacting us about advertising, please use the form at the bottom of the website, the first contact form is not the correct place.")?></b></p>
@@ -93,4 +84,3 @@ Australia</p>
 	document.form2.secrethash2.value = pagehash;
 -->
 </script>
-*/
-- 
cgit v1.2.1


From 1da586482b2ad57148706844a5a022eb401146a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
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 <neo@nhng.de>
---
 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
 
 <p><b><?=_("Sensitive Information")?></b></p>
 <p><?=_("If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help.")?></p>
-<form method="post" action="https://www.cacert.org/index.php" name="form2">
+<form method="post" name="form2">
   <input type="hidden" name="secrethash2" value="">
   <input type="hidden" name="oldid" value="<?=$id?>">
   <table border="0">
-- 
cgit v1.2.1


From c15aa191e40238802860e8719839c8d14e11ec6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
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 <neo@nhng.de>
---
 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?= <neo@nhng.de>
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 <neo@nhng.de>
---
 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
 <p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
 <p><a href="https://lists.cacert.org/wws/info/cacert-support"><?=_("Click here to go to the Support List")?></a></p>
 <p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
-<form method="post" name="form1">
+<form method="post" action="account.php" name="form1">
   <input type="hidden" name="oldid" value="<?=$id?>">
   <input type="hidden" name="support" value="yes">
   <input type="hidden" name="secrethash2" value="">
@@ -52,7 +52,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
 
 <p><b><?=_("Sensitive Information")?></b></p>
 <p><?=_("If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help.")?></p>
-<form method="post" name="form2">
+<form method="post" action="account.php" name="form2">
   <input type="hidden" name="secrethash2" value="">
   <input type="hidden" name="oldid" value="<?=$id?>">
   <table border="0">
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
 <p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
 <p><a href="https://lists.cacert.org/wws/info/cacert-support"><?=_("Click here to go to the Support List")?></a></p>
 <p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
-<form method="post" name="form1">
+<form method="post" action="index.php" name="form1">
   <input type="hidden" name="oldid" value="<?=$id?>">
   <input type="hidden" name="support" value="yes">
   <input type="hidden" name="secrethash2" value="">
@@ -52,7 +52,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
 
 <p><b><?=_("Sensitive Information")?></b></p>
 <p><?=_("If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help.")?></p>
-<form method="post" action="https://www.cacert.org/index.php" name="form2">
+<form method="post" action="index.php" name="form2">
   <input type="hidden" name="secrethash2" value="">
   <input type="hidden" name="oldid" value="<?=$id?>">
   <table border="0">
-- 
cgit v1.2.1