summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-04-01 18:41:21 +0200
committerMichael Tänzer <neo@nhng.de>2014-04-01 18:41:21 +0200
commitd44ae6a04770b7abb0bcf2784b16fdcddc9ad9ac (patch)
treeb67e45eaf065ace2fdffa8876bcce94705f58208 /pages
parent530dc6bd04119aa4a0955463f2ca1f149a81d5d1 (diff)
downloadcacert-devel-d44ae6a04770b7abb0bcf2784b16fdcddc9ad9ac.tar.gz
cacert-devel-d44ae6a04770b7abb0bcf2784b16fdcddc9ad9ac.tar.xz
cacert-devel-d44ae6a04770b7abb0bcf2784b16fdcddc9ad9ac.zip
bug 1138: Common argument ordering for user_agreement getters
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages')
-rw-r--r--pages/account/43.php2
-rw-r--r--pages/account/57.php22
-rw-r--r--pages/account/59.php2
3 files changed, 13 insertions, 13 deletions
diff --git a/pages/account/43.php b/pages/account/43.php
index c0ca26e..b055add 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -238,7 +238,7 @@ if(intval($_REQUEST['userid']) > 0) {
<? // list of flags ?>
<tr>
<td class="DataTD"><?=_("CCA accepted")?>:</td>
- <td class="DataTD"><a href="account.php?id=57&amp;userid=<?=intval($row['id'])?>"><?=intval(get_user_agreement_status($row['id'])) ? _("Yes") : _("No") ?></a></td>
+ <td class="DataTD"><a href="account.php?id=57&amp;userid=<?=intval($row['id'])?>"><?=intval(get_user_agreement_status($row['id'], 'CCA')) ? _("Yes") : _("No") ?></a></td>
</tr>
<tr>
<td class="DataTD"><?=_("Trainings")?>:</td>
diff --git a/pages/account/57.php b/pages/account/57.php
index 0356eeb..56afd53 100644
--- a/pages/account/57.php
+++ b/pages/account/57.php
@@ -48,12 +48,12 @@
<td class="DataTD"><b><?=_('Type')?></b></td>
</tr>
<?
- $data=get_first_user_agreement($user_id,1);
+ $data=get_first_user_agreement($user_id, 'CCA', 1);
if (!isset($data['active'])){
$type='';
- }else{
+ }else{
$type=_('active');
- }
+ }
?>
<tr>
<td class="DataTD"><?=_('First active CCA')?></td>
@@ -62,7 +62,7 @@
<td class="DataTD"><?=$type?></td>
</tr>
<?
- $data=get_first_user_agreement($user_id,0);
+ $data=get_first_user_agreement($user_id, 'CCA', 0);
if (!isset($data['active'])){
$type="";
}else{
@@ -76,14 +76,14 @@
<td class="DataTD"><?=$type?></td>
</tr>
<?
- $data=get_last_user_agreement($user_id);
+ $data=get_last_user_agreement($user_id, 'CCA');
if (!isset($data['active'])){
- $type="";
- }elseif($data['active']==1){
- $type=_('active');
- }else{
- $type=_('passive');
- }
+ $type="";
+ }elseif($data['active']==1){
+ $type=_('active');
+ }else{
+ $type=_('passive');
+ }
?>
<tr>
<td class="DataTD"><?=_('Last CCA')?></td>
diff --git a/pages/account/59.php b/pages/account/59.php
index 8d76789..ae9ec09 100644
--- a/pages/account/59.php
+++ b/pages/account/59.php
@@ -181,7 +181,7 @@ $dres = get_training_result($userid);
<br/>
<?
-$dres = get_user_agreement($userid,'',1);
+$dres = get_user_agreements($userid);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>