From 9b0e49833c2ce5aec65361b9d5ed96e39c625e6c Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Thu, 13 Dec 2012 10:15:52 +0100
Subject: bug 1122:created new file for the CCA overview and added short
 information about CCA into SE admin console

---
 pages/account/43.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pages')

diff --git a/pages/account/43.php b/pages/account/43.php
index 7bf6d04..67076bb 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -176,6 +176,10 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
     <td class="DataTD"><?=_("Trainings")?>:</td>
     <td class="DataTD"><a href="account.php?id=55&amp;userid=<?=intval($row['id'])?>">show</a></td>
   </tr>
+  <tr>
+    <td class="DataTD"><?=_("CCA accepted")?>:</td>
+    <td class="DataTD"><?=intval(get_user_agreement_status($row['id']))?>  <a href="account.php?id=57&amp;userid=<?=intval($row['id'])?>">show</a></td>
+  </tr>
   <tr>
     <td class="DataTD"><?=_("Is Assurer")?>:</td>
     <td class="DataTD"><a href="account.php?id=43&amp;assurer=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admsetassuret')?>"><?=$row['assurer']?></a></td>
-- 
cgit v1.2.1


From e22a338486cd4d7305eb8b2f4b36460873a5855b Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Thu, 13 Dec 2012 10:36:21 +0100
Subject: bug 1122: Added pages/account/57.php

---
 pages/account/57.php | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 pages/account/57.php

(limited to 'pages')

diff --git a/pages/account/57.php b/pages/account/57.php
new file mode 100644
index 0000000..6b15889
--- /dev/null
+++ b/pages/account/57.php
@@ -0,0 +1,108 @@
+<? /*
+    LibreSSL - CAcert web application
+    Copyright (C) 2004-2008  CAcert Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/ ?>
+<?
+  include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
+  
+  if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
+
+  echo _("You do not have access to this page");
+
+  } else {  
+    $user_id = intval($_REQUEST['userid']);
+    $query = "select * from `users` where `id`='$user_id' and `users`.`deleted`=0";
+    $res = mysql_query($query);
+    if(mysql_num_rows($res) <= 0)
+    {
+      echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are a foot!");
+    } else {
+      $row = mysql_fetch_assoc($res);
+?>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("CCA agreement of")." ".sanitizeHTML($row['fname'])." ".sanitizeHTML($row['mname'])." ".sanitizeHTML($row['lname'])?></td>
+  </tr>
+</table>
+
+  
+<br>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td class="DataTD"><b><?=_("???")?></b></td>
+    <td class="DataTD"><b><?=_("Date")?></b></td>
+    <td class="DataTD"><b><?=_("Methode")?></b></td>
+    <td class="DataTD"><b><?=_("Type")?></b></td>
+  </tr>
+<?
+  $data=get_first_user_agreement($user_id,1);
+  if (isset($data['active'])==false){
+      $type="";
+    }else{
+      $type=_("active");
+    }
+?>
+  <tr>
+    <td class="DataTD"><?=_("first active CCA")?></td>
+    <td class="DataTD"><?=$data['date']?></td>
+    <td class="DataTD"><?=$data['method']?></td>
+    <td class="DataTD"><?=$type?></td>
+  </tr>
+<?
+  $data=get_first_user_agreement($user_id,0);
+  if (isset($data['active'])==false){
+      $type="";
+    }else{
+      $type=_("passive");
+    }
+?>
+  <tr>
+    <td class="DataTD"><?=_("first passive CCA")?></td>
+    <td class="DataTD"><?=$data['date']?></td>
+    <td class="DataTD"><?=$data['method']?></td>
+    <td class="DataTD"><?=$type?></td>
+  </tr>
+<?
+  $data=get_last_user_agreement($user_id);
+  if (isset($data['active'])==false){
+      $type="";
+    }elseif($data['active']==1){
+      $type=_("active");
+    }else{
+      $type=_("passive");
+    }
+?>
+  <tr>
+    <td class="DataTD"><?=_("last CCA")?></td>
+    <td class="DataTD"><?=$data['date']?></td>
+    <td class="DataTD"><?=$data['method']?></td>
+    <td class="DataTD"><?=$type?></td>
+  </tr>
+</table>
+<br>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr> 
+<?
+      if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
+?>
+    <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&amp;userid=<?=$user_id ?>">back</a></td></tr>
+<?    } 
+?>  </table>
+<?
+  }
+    }
+?> 
+
-- 
cgit v1.2.1


From 7dca631c59754d7f9e4fff12edc924b8c03d127c Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Sun, 6 Jan 2013 23:28:49 +0100
Subject: bug 1122: Changed isset==false to !isset, Change from " to ', typo
 fix

---
 pages/account/57.php | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'pages')

diff --git a/pages/account/57.php b/pages/account/57.php
index 6b15889..76eee27 100644
--- a/pages/account/57.php
+++ b/pages/account/57.php
@@ -16,11 +16,11 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
 <?
-  include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
+  include_once($_SESSION['_config']['filepath'].'/includes/notary.inc.php');
   
   if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
 
-  echo _("You do not have access to this page");
+  echo _('You do not have access to this page');
 
   } else {  
     $user_id = intval($_REQUEST['userid']);
@@ -34,7 +34,7 @@
 ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="5" class="title"><?=_("CCA agreement of")." ".sanitizeHTML($row['fname'])." ".sanitizeHTML($row['mname'])." ".sanitizeHTML($row['lname'])?></td>
+    <td colspan="5" class="title"><?=_('CCA agreement of').' '.sanitizeHTML($row['fname']).' '.sanitizeHTML($row['mname']).' '.sanitizeHTML($row['lname'])?></td>
   </tr>
 </table>
 
@@ -42,51 +42,51 @@
 <br>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td class="DataTD"><b><?=_("???")?></b></td>
-    <td class="DataTD"><b><?=_("Date")?></b></td>
-    <td class="DataTD"><b><?=_("Methode")?></b></td>
-    <td class="DataTD"><b><?=_("Type")?></b></td>
+    <td class="DataTD"><b><?=_('CCA type')?></b></td>
+    <td class="DataTD"><b><?=_('Date')?></b></td>
+    <td class="DataTD"><b><?=_('Method')?></b></td>
+    <td class="DataTD"><b><?=_('Type')?></b></td>
   </tr>
 <?
   $data=get_first_user_agreement($user_id,1);
-  if (isset($data['active'])==false){
-      $type="";
+  if (!isset($data['active'])){
+      $type='';
     }else{
-      $type=_("active");
+      $type=_('active');
     }
 ?>
   <tr>
-    <td class="DataTD"><?=_("first active CCA")?></td>
+    <td class="DataTD"><?=_('First active CCA')?></td>
     <td class="DataTD"><?=$data['date']?></td>
     <td class="DataTD"><?=$data['method']?></td>
     <td class="DataTD"><?=$type?></td>
   </tr>
 <?
   $data=get_first_user_agreement($user_id,0);
-  if (isset($data['active'])==false){
+  if (!isset($data['active'])){
       $type="";
     }else{
-      $type=_("passive");
+      $type=_('passive');
     }
 ?>
   <tr>
-    <td class="DataTD"><?=_("first passive CCA")?></td>
+    <td class="DataTD"><?=_('First passive CCA')?></td>
     <td class="DataTD"><?=$data['date']?></td>
     <td class="DataTD"><?=$data['method']?></td>
     <td class="DataTD"><?=$type?></td>
   </tr>
 <?
   $data=get_last_user_agreement($user_id);
-  if (isset($data['active'])==false){
+  if (!isset($data['active'])){
       $type="";
     }elseif($data['active']==1){
-      $type=_("active");
+      $type=_('active');
     }else{
-      $type=_("passive");
+      $type=_('passive');
     }
 ?>
   <tr>
-    <td class="DataTD"><?=_("last CCA")?></td>
+    <td class="DataTD"><?=_('Last CCA')?></td>
     <td class="DataTD"><?=$data['date']?></td>
     <td class="DataTD"><?=$data['method']?></td>
     <td class="DataTD"><?=$type?></td>
@@ -103,6 +103,5 @@
 ?>  </table>
 <?
   }
-    }
-?> 
-
+}
+?>
-- 
cgit v1.2.1


From 145102ac00024ea88c7d5db6129aa79ffaaed040 Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Mon, 7 Jan 2013 18:49:01 +0100
Subject: bug 1122: layout change

---
 pages/account/43.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pages')

diff --git a/pages/account/43.php b/pages/account/43.php
index 67076bb..a926a98 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -173,12 +173,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
     <input type="submit" value="Go"></form></nobr></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Trainings")?>:</td>
-    <td class="DataTD"><a href="account.php?id=55&amp;userid=<?=intval($row['id'])?>">show</a></td>
+    <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>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("CCA accepted")?>:</td>
-    <td class="DataTD"><?=intval(get_user_agreement_status($row['id']))?>  <a href="account.php?id=57&amp;userid=<?=intval($row['id'])?>">show</a></td>
+    <td class="DataTD"><?=_("Trainings")?>:</td>
+    <td class="DataTD"><a href="account.php?id=55&amp;userid=<?=intval($row['id'])?>">show</a></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Is Assurer")?>:</td>
-- 
cgit v1.2.1