summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-01-21 10:05:41 +0100
committerBenny Baumann <BenBE@geshi.org>2015-01-21 10:05:41 +0100
commiteb1b77d8c2dc32b1ec6e280822eb9e85f27d77a4 (patch)
tree28b6cb8562e5e5c307caaf985959b17c1049620b
parent85589ff948973586ad4d0dea2e8e458f007fc0ea (diff)
parent315ff4a4c39366af339d2a5c27ce20c6704432e4 (diff)
downloadcacert-devel-eb1b77d8c2dc32b1ec6e280822eb9e85f27d77a4.tar.gz
cacert-devel-eb1b77d8c2dc32b1ec6e280822eb9e85f27d77a4.tar.xz
cacert-devel-eb1b77d8c2dc32b1ec6e280822eb9e85f27d77a4.zip
Merge branch 'bug-1361' into testserver-stable
-rw-r--r--includes/account_stuff.php8
-rw-r--r--www/gpg.php13
2 files changed, 2 insertions, 19 deletions
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index e2f60f6..096315d 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -176,12 +176,8 @@ function hideall() {
</div>
<div class="relatedLinks">
<h3 class="pointer" onclick="explode('mydetails')">+ <?=_("My Details")?></h3>
- <ul class="menu" id="mydetails"><li><a href="account.php?id=13"><?=_("View/Edit")?></a></li><li><a href="account.php?id=14"><?=_("Change Password")?></a></li><li><a href="account.php?id=41"><?=_("Default Language")?></a></li><li><a href="wot.php?id=8"><?=_("My Listing")?></a></li><li><a href="wot.php?id=13"><?=_("My Location")?></a></li><li><a href="account.php?id=36"><?=_("My Alert Settings")?></a></li><li><a href="account.php?id=55"><?=_("My Trainings")?></a></li><li><a href="wot.php?id=10"><?=_("My Points")?></a></li><?
-/* to delete
- if($_SESSION['profile']['id'] == 1 || $_SESSION['profile']['id'] == 5897)
- echo "<li><a href='sqldump.php'>SQL Dump</a></li>";
-*/
- ?></ul>
+ <ul class="menu" id="mydetails"><li><a href="account.php?id=13"><?=_("View/Edit")?></a></li><li><a href="account.php?id=14"><?=_("Change Password")?></a></li><li><a href="account.php?id=41"><?=_("Default Language")?></a></li><li><a href="wot.php?id=8"><?=_("My Listing")?></a></li><li><a href="wot.php?id=13"><?=_("My Location")?></a></li><li><a href="account.php?id=36"><?=_("My Alert Settings")?></a></li><li><a href="account.php?id=55"><?=_("My Trainings")?></a></li><li><a href="wot.php?id=10"><?=_("My Points")?></a></li>
+ </ul>
</div>
<div class="relatedLinks">
<h3 class="pointer" onclick="explode('emailacc')">+ <?=_("Email Accounts")?></h3>
diff --git a/www/gpg.php b/www/gpg.php
index f58153d..2f7aa83 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -48,17 +48,6 @@
$keyid="";
-if(0)
-{
- if($_SESSION["profile"]["id"] != 5897)
- {
- showheader(_("Welcome to CAcert.org"));
- echo "The OpenPGP signing system is currently shutdown due to a maintenance. We hope to get it fixed within the next few hours. We are very sorry for the inconvenience.";
-
- exit(0);
- }
-}
-
function normalizeName($name) {
// Based on http://stackoverflow.com/questions/11176752/converting-named-html-entities-to-numeric-html-entities
static $HTML401NamedToNumeric = array(
@@ -485,8 +474,6 @@ function verifyEmail($email)
return 0;
}
-
-
$ToBeDeleted=array();
$state=0;
if($oldid == "0" && $CSR != "")