summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2013-09-14 08:37:48 +0200
committerINOPIAE <inopiae@cacert.org>2013-09-14 08:37:48 +0200
commitcf1fbe4a9394d4073ee5ada23aeaa23d1c1cc8d1 (patch)
tree74443c35d8483bf16204f92e83a44d9af008e492
parent4bbb41f4aab39885d9e06ba5eedb8ae7d5b77f00 (diff)
downloadcacert-devel-cf1fbe4a9394d4073ee5ada23aeaa23d1c1cc8d1.tar.gz
cacert-devel-cf1fbe4a9394d4073ee5ada23aeaa23d1c1cc8d1.tar.xz
cacert-devel-cf1fbe4a9394d4073ee5ada23aeaa23d1c1cc8d1.zip
bug 988: reworked the method for the assurances type
-rw-r--r--includes/notary.inc.php2
-rw-r--r--pages/wot/6.php10
-rw-r--r--www/wot.php5
3 files changed, 10 insertions, 7 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index c2fd979..0760b14 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -85,7 +85,7 @@
{
$where="";
if ($support==2) {
- $where=" and (`method`='Trusted 3rd Parties' or `method`='TopUP')";
+ $where=" and (`method`='TTP-Assisted' or `method`='TTP TOPUP')";
}
$res = query_init ("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` ".$where." order by `id` asc ");
return $res;
diff --git a/pages/wot/6.php b/pages/wot/6.php
index 4458ad0..96186af 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -25,12 +25,12 @@ if(!array_key_exists('notarise',$_SESSION['_config']))
$row = $_SESSION['_config']['notarise'];
- if($_SESSION['profile']['ttpadmin'] == 1)
-// $methods = array("Face to Face Meeting", "Trusted 3rd Parties", "TopUP");
-// else
- $methods = array("Face to Face Meeting", "Trusted 3rd Parties");
+ if($_SESSION['profile']['ttpadmin'] == 2)
+ $methods = array('Face to Face Meeting', 'TTP-Assisted', 'TTP-TOPUP');
+ elseif($_SESSION['profile']['ttpadmin'] == 1)
+ $methods = array('Face to Face Meeting', 'TTP-Assisted');
else
- $methods = array("Face to Face Meeting");
+ $methods = array('Face to Face Meeting');
$fname = $row['fname'];
$mname = $row['mname'];
diff --git a/www/wot.php b/www/wot.php
index 8f23e9b..0422005 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -373,9 +373,12 @@ $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']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) {
+ if($_SESSION['profile']['ttpadmin'] >= 1 && $_POST['method'] == 'TTP-Assisted') {
$query .= ",\n`method`='TTP-Assisted'";
}
+ if($_SESSION['profile']['ttpadmin'] == 2 && $_POST['method'] == 'TTP-TOPUP') {
+ $query .= ",\n`method`='TTP-TOPUP'";
+ }
mysql_query($query);
fix_assurer_flag($_SESSION['_config']['notarise']['id']);
include_once("../includes/notary.inc.php");