summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Gummi <martin.gummi@cacert.org>2014-09-09 23:00:39 +0200
committerMartin Gummi <martin.gummi@cacert.org>2014-09-09 23:26:53 +0200
commit01db793460898fd32c0933e04e18c3d4f09cdd61 (patch)
tree79840cb74d59470e72f6534d8ee687ae4a158a9b
parentd0a489800638cbe7e81ca39ac7ac2feebf1df4ec (diff)
downloadcacert-devel-01db793460898fd32c0933e04e18c3d4f09cdd61.tar.gz
cacert-devel-01db793460898fd32c0933e04e18c3d4f09cdd61.tar.xz
cacert-devel-01db793460898fd32c0933e04e18c3d4f09cdd61.zip
bug-1302: move link to support mailing list under contact form
-rw-r--r--pages/account/40.php3
-rw-r--r--pages/index/11.php3
2 files changed, 2 insertions, 4 deletions
diff --git a/pages/account/40.php b/pages/account/40.php
index 10d4d70..76e77ec 100644
--- a/pages/account/40.php
+++ b/pages/account/40.php
@@ -25,7 +25,6 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
<p><?=sprintf(_("If you are having trouble with your username or password, please visit our %swiki page%s for more information"), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount' target='_new'>", "</a>");?></p>
<p><?=_("Before contacting us, be sure to read the information on our official and unofficial HowTo and FAQ pages.")?> - <a href="//wiki.cacert.org/HELP/"><?=_("Go here for more details.")?></a></p>
<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 use the form below to contact the support team directly. The mail is NOT send to the mailing list.")?></p>
<form method="post" action="account.php" name="form1">
<input type="hidden" name="oldid" value="<?=$id?>">
@@ -62,7 +61,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
</tr>
</table>
</form>
-
+<p><a href="https://lists.cacert.org/wws/info/cacert-support"><?=_("Click here to go to the Support List")?></a></p>
<p><b>IRC</b></p>
<p><a href="irc://irc.CAcert.org/CAcert">irc://irc.CAcert.org/CAcert</a></p>
<p><b>Secure IRC</b></p>
diff --git a/pages/index/11.php b/pages/index/11.php
index b972f49..751f1a4 100644
--- a/pages/index/11.php
+++ b/pages/index/11.php
@@ -26,7 +26,6 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
<p><?=_("Before contacting us, be sure to read the information on our official and unofficial HowTo and FAQ pages.")?> - <a href="//wiki.cacert.org/HELP/"><?=_("Go here for more details.")?></a></p>
<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 use the form below to contact the support team directly. The mail is NOT send to the mailing list.")?></p>
<form method="post" action="index.php" name="form1">
<input type="hidden" name="oldid" value="<?=$id?>">
<!-- <input type="hidden" name="support" value="yes"> -->
@@ -60,7 +59,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
</tr>
</table>
</form>
-
+<p><?=_("You can use the form below to contact the support team directly. The mail is NOT send to the mailing list.")?></p>
<p><b>IRC</b></p>
<p><a href="irc://irc.CAcert.org/CAcert">irc://irc.CAcert.org/CAcert</a></p>
<p><b>Secure IRC</b></p>