summaryrefslogtreecommitdiff
path: root/pages/account/43.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-04-29 16:13:59 +0200
committerMichael Tänzer <neo@nhng.de>2014-04-29 16:13:59 +0200
commitbb11f3a0645a6b96767c9c318fa239a12c3351e5 (patch)
tree2dba41fa37855e6f1165c89d91c04c1bc18d6f3d /pages/account/43.php
parent4f555bd41ae6340c21f199512090e1e47d08fa3a (diff)
parent1a119ab85f3bd5b352223ceef6ba8f29151130b2 (diff)
downloadcacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.tar.gz
cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.tar.xz
cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.zip
Merge branch 'bug-1221' into bug-1138
Conflicts: includes/account.php includes/general.php includes/loggedin.php includes/notary.inc.php pages/account/43.php pages/account/55.php pages/wot/10.php www/index.php www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/account/43.php')
-rw-r--r--pages/account/43.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/pages/account/43.php b/pages/account/43.php
index 9a9d75f..dcfa378 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -21,7 +21,6 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
$ticketno='';
$ticketvalidation=FALSE;
-
if (isset($_SESSION['ticketno'])) {
$ticketno = $_SESSION['ticketno'];
$ticketvalidation = valid_ticket_number($ticketno);
@@ -32,6 +31,7 @@ if (isset($_SESSION['ticketmsg'])) {
$ticketmsg = '';
}
+
// search for an account by email search, if more than one is found display list to choose
if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0)
{
@@ -132,14 +132,13 @@ if(intval($_REQUEST['userid']) > 0) {
} else {
$assurance = mysql_escape_string(intval($_REQUEST['assurance']));
$trow = 0;
- $res = mysql_query("select `to` from `notary` where `id`='$assurance'");
+ $res = mysql_query("select `to` from `notary` where `id`='$assurance' and `deleted` = 0");
if ($res) {
$trow = mysql_fetch_assoc($res);
- }
-
- mysql_query("update `notary` set `deleted`=NOW() where `id`='$assurance'");
- if ($trow) {
- fix_assurer_flag($trow['to']);
+ mysql_query("update `notary` set `deleted`=NOW() where `id`='$assurance'");
+ if ($trow) {
+ fix_assurer_flag($trow['to']);
+ }
}
}
} elseif(array_key_exists('assurance',$_REQUEST) && $_REQUEST['assurance'] > 0 && $ticketvalidation == FALSE) {
@@ -966,6 +965,7 @@ if(intval($_REQUEST['userid']) > 0) {
<?
// if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") {
+
function showassuredto($ticketno)
{
?>