summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-08-24 17:04:44 +0200
committerMichael Tänzer <neo@nhng.de>2013-08-24 17:04:44 +0200
commitc34d0d386d2efb408cdc2dbd512a67ca259abea3 (patch)
treec55d8f57521066371b11cb4c7b21a7f03c281d9e /www
parentf543973bfaa3ed1c393e4b1df022511b5c11e795 (diff)
parentff8e88c54bcbfad0084834f82b798b8a3f35817d (diff)
downloadcacert-devel-c34d0d386d2efb408cdc2dbd512a67ca259abea3.tar.gz
cacert-devel-c34d0d386d2efb408cdc2dbd512a67ca259abea3.tar.xz
cacert-devel-c34d0d386d2efb408cdc2dbd512a67ca259abea3.zip
Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
Diffstat (limited to 'www')
-rw-r--r--www/wot.php15
1 files changed, 4 insertions, 11 deletions
diff --git a/www/wot.php b/www/wot.php
index daba46a..9b6bd27 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -126,7 +126,7 @@ function send_reminder()
if($oldid == 12)
$id = $oldid;
-
+
if($oldid == 4)
{
if ($_POST['ttp']!='') {
@@ -278,7 +278,7 @@ $iecho= "c";
}
//met assuree in person, not appliciable fot TTP / TTP Topup assurances
- if((!array_key_exists('certify',$_POST) || $_POST['certify'] != 1 ) && $_SESSION['profile']['ttpadmin'] != 1)
+ if((!array_key_exists('certify',$_POST) || $_POST['certify'] != 1 ) && $_REQUEST['method'] != "Trusted 3rd Parties")
{
show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert"));
exit;
@@ -373,15 +373,8 @@ $iecho= "c";
if (check_date_format(trim($_REQUEST['date']),2010)) {
write_user_agreement($_SESSION['profile']['id'], "CCA", "Assurance", "Assurer", 1, $_SESSION['_config']['notarise']['id']);
}
- if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0)
- {
- $query .= ",\n`method`='Temporary Increase'";
- $query .= ",\n`expire`=DATE_ADD(NOW(), INTERVAL '".intval($_POST['expire'])."' DAY)";
- $query .= ",\n`sponsor`='".intval($_POST['sponsor'])."'";
- } else if($_SESSION['profile']['board'] == 1) {
- $query .= ",\n`method`='".mysql_escape_string(stripslashes($_POST['method']))."'";
- } else if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) {
- $query .= ",\n`method`='Trusted Third Parties'";
+ if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) {
+ $query .= ",\n`method`='TTP-Assisted'";
}
mysql_query($query);
fix_assurer_flag($_SESSION['_config']['notarise']['id']);