diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-01-16 00:14:47 +0100 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-01-16 00:14:47 +0100 |
| commit | 05f008892d127f3e80a3e43384478e29d142ea9a (patch) | |
| tree | 477f6128c0a82ef3f91e77180da08d502ba678c8 | |
| parent | 3441e9895738e27a95518680209c41641eff7df0 (diff) | |
| parent | a53a87fdb6624bcfece257f861f49a883ed24d2c (diff) | |
| download | cacert-devel-05f008892d127f3e80a3e43384478e29d142ea9a.tar.gz cacert-devel-05f008892d127f3e80a3e43384478e29d142ea9a.tar.xz cacert-devel-05f008892d127f3e80a3e43384478e29d142ea9a.zip | |
Merge branch 'bug-888' into release
| -rw-r--r-- | includes/wot.inc.php | 2 | ||||
| -rw-r--r-- | www/wot.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/includes/wot.inc.php b/includes/wot.inc.php index edc442a..6b3bcc8 100644 --- a/includes/wot.inc.php +++ b/includes/wot.inc.php @@ -364,6 +364,8 @@ break; case 'Unknown': // to be revoked in the future? limit to max 50 pts? case 'Trusted Third Parties': // to be revoked in the future? limit to max 35 pts? + case 'TTP-Assisted': // TTP assurances, limit to 35 + case 'TOPUP': // TOPUP to be delevoped in the future, limit to 30 case '': // to be revoked in the future? limit to max 50 pts? case 'Face to Face Meeting': // normal assurances, limit to 35/50 pts in the future? break; diff --git a/www/wot.php b/www/wot.php index c6c0568..a8506cb 100644 --- a/www/wot.php +++ b/www/wot.php @@ -293,7 +293,7 @@ $iecho= "c"; } 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'"; + $query .= ",\n`method`='TTP-Assisted'"; } mysql_query($query); fix_assurer_flag($_SESSION['_config']['notarise']['id']); |