From 0f2ef2f94a72bd9d869c7e79674dc39f0bf0a71b Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 15 Dec 2012 14:38:44 +0100 Subject: bug 893:extracted delete functionalities to temp_functions.php, modified www/disputes.php, includes/account.php with the new function calls, changed the the delete account routine for pages/account/50.php Late the functions from temp_functions.php should be moved to notary_inc.php??? --- pages/account/50.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/account/50.php b/pages/account/50.php index 1604156..48c8896 100644 --- a/pages/account/50.php +++ b/pages/account/50.php @@ -19,12 +19,16 @@
- + + + + + -- cgit v1.2.1 From ea3030cdf3dd8f11a8bb5f588ebb3573765c7084 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 9 Jan 2013 11:36:16 +0100 Subject: bug 1137: Implemented the CCA tick and the recording of the CCA. There seems to be an inconsistance of the data between the file from GitHub/release the basis of this bug and the stable system. --- pages/wot/6.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'pages') diff --git a/pages/wot/6.php b/pages/wot/6.php index 28c1875..7403f5b 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -45,15 +45,17 @@ AssureHead(_("Assurance Confirmation"),sprintf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance."), $fname)); AssureTextLine(_("Name"),$name); AssureTextLine(_("Date of Birth"),$dob." ("._("YYYY-MM-DD").")"); + AssureMethodLine(_("Method"),$methods,''); AssureBoxLine("certify",sprintf(_("I certify that %s %s %s has appeared in person"), $fname, $mname, $lname),array_key_exists('certify',$_POST) && $_POST['certify'] == 1); + AssureBoxLine("CCAAgreed",sprintf(_("I verify that %s %s %s accepted the CAcert Community Agreement."), $fname, $mname, $lname),array_key_exists('CCAAgreed',$_POST) && $_POST['CCAAgreed'] == 1); AssureInboxLine("location",_("Location"),array_key_exists('location',$_SESSION['_config'])?$_SESSION['_config']['location']:"",""); - AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"
"._("Please adjust the date if you assured the person on a different day")); - AssureMethodLine(_("Method"),$methods,_("Only tick the next box if the Assurance was face to face.")); + AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"
"._("The date when the assurance took place. Please adjust the date if you assured the person on a different day")); + AssureTextLine(_("Only tick the next box if the Assurance was face to face.")); AssureBoxLine("assertion",_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible."),array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1); - AssureBoxLine("rules",_("I have read and understood the Assurance Policy and the Assurance Handbook and am making this Assurance subject to and in compliance with the policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); - AssureTextLine(_("Policy"),""._("Assurance Policy")." - "._("Assurance Handbook").""); + AssureBoxLine("rules",_("I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); + AssureTextLine(_("Policy"),""._("CAcert Community Agreement")." -"._("Assurance Policy")." - "._("Assurance Handbook").""); AssureInboxLine("points",_("Points"),"","
(Max. ".maxpoints().")"); - AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the CAcert Community Agreement"),$fname)); - AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to the CAcert Community Agreement")); +// AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the CAcert Community Agreement"),$fname)); +// AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to the CAcert Community Agreement")); AssureFoot($id,_("I confirm this Assurance")); ?> -- cgit v1.2.1 From cc88dab218df45cad0a963d33e69934f5f212715 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 12 Jan 2013 23:13:02 +0100 Subject: bug 1137: added include notary.inc.php in wot.php. --- pages/wot/6.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/wot/6.php b/pages/wot/6.php index 7403f5b..8fd4207 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -50,7 +50,7 @@ AssureBoxLine("CCAAgreed",sprintf(_("I verify that %s %s %s accepted the CAcert Community Agreement."), $fname, $mname, $lname),array_key_exists('CCAAgreed',$_POST) && $_POST['CCAAgreed'] == 1); AssureInboxLine("location",_("Location"),array_key_exists('location',$_SESSION['_config'])?$_SESSION['_config']['location']:"",""); AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"
"._("The date when the assurance took place. Please adjust the date if you assured the person on a different day")); - AssureTextLine(_("Only tick the next box if the Assurance was face to face.")); + AssureTextLine(_("","Only tick the next box if the Assurance was face to face.")); AssureBoxLine("assertion",_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible."),array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1); AssureBoxLine("rules",_("I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); AssureTextLine(_("Policy"),""._("CAcert Community Agreement")." -"._("Assurance Policy")." - "._("Assurance Handbook").""); -- cgit v1.2.1 From 6c7abe807dda81e8284876ba91f9e3d267285eff Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 18 Jan 2013 00:59:21 +0100 Subject: bug 1137: added date check and fixed some typos --- pages/wot/6.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pages') diff --git a/pages/wot/6.php b/pages/wot/6.php index 8fd4207..a1f7489 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -46,11 +46,11 @@ AssureTextLine(_("Name"),$name); AssureTextLine(_("Date of Birth"),$dob." ("._("YYYY-MM-DD").")"); AssureMethodLine(_("Method"),$methods,''); - AssureBoxLine("certify",sprintf(_("I certify that %s %s %s has appeared in person"), $fname, $mname, $lname),array_key_exists('certify',$_POST) && $_POST['certify'] == 1); - AssureBoxLine("CCAAgreed",sprintf(_("I verify that %s %s %s accepted the CAcert Community Agreement."), $fname, $mname, $lname),array_key_exists('CCAAgreed',$_POST) && $_POST['CCAAgreed'] == 1); + AssureBoxLine("certify",sprintf(_("I certify that %s %s %s has appeared in person."), $fname, $mname, $lname),array_key_exists('certify',$_POST) && $_POST['certify'] == 1); + AssureBoxLine("CCAAgreed",sprintf(_("I verify that %s %s %s has accepted the CAcert Community Agreement."), $fname, $mname, $lname),array_key_exists('CCAAgreed',$_POST) && $_POST['CCAAgreed'] == 1); AssureInboxLine("location",_("Location"),array_key_exists('location',$_SESSION['_config'])?$_SESSION['_config']['location']:"",""); - AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"
"._("The date when the assurance took place. Please adjust the date if you assured the person on a different day")); - AssureTextLine(_("","Only tick the next box if the Assurance was face to face.")); + AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"
"._("The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).")); + AssureTextLine("",_("Only tick the next box if the Assurance was face to face.")); AssureBoxLine("assertion",_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible."),array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1); AssureBoxLine("rules",_("I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); AssureTextLine(_("Policy"),""._("CAcert Community Agreement")." -"._("Assurance Policy")." - "._("Assurance Handbook").""); -- cgit v1.2.1 From a9f468f535e39962b7acfa74cd7b81e5e46c35db Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 18 Jan 2013 22:41:38 +0100 Subject: bug 1136: Added the revoke all private cert routine for SE --- pages/account/43.php | 77 +++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 34 deletions(-) (limited to 'pages') diff --git a/pages/account/43.php b/pages/account/43.php index 7bf6d04..96196b3 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -53,14 +53,14 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); } else { // $email contains non-digits ==> search for mail addresses // Be defensive here (outer join) if primary mail is not listed in email table - $query = "select `users`.`id` as `id`, `email`.`email` as `email` + $query = "select `users`.`id` as `id`, `email`.`email` as `email` from `users` left outer join `email` on (`users`.`id`=`email`.`memid`) - where (`email`.`email` like '$emailsearch' + where (`email`.`email` like '$emailsearch' or `users`.`email` like '$emailsearch') and `users`.`deleted`=0 group by `users`.`id` limit 100"; } - // bug-975 ted+uli changes --- end + // bug-975 ted+uli changes --- end $res = mysql_query($query); if(mysql_num_rows($res) > 1) { ?>
:
:
@@ -338,7 +338,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); - don't list user account @@ -359,7 +359,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); 4. email.email = primary-email (???) or'd not covered by admin console find user routine, but may block users login 5. users.verified = 0|1 - further "special settings" + further "special settings" 6. users.locked (setting displayed in display form) 7. users.assurer_blocked (setting displayed in display form) @@ -370,7 +370,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); 1. users.verified = 1 2. users.deleted = 0 3. users.locked = 0 - 4. users.email = primary-email + 4. users.email = primary-email --- Assurer, assure someone find user query select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."' @@ -384,11 +384,11 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); 1. email.hash = '' Yes No No 2. email.deleted = 0 Yes No No 3. users.deleted = 0 Yes Yes Yes - 4. users.verified = 1 No Yes No + 4. users.verified = 1 No Yes No 5. users.locked = 0 No Yes No 6. users.email = prim-email No Yes Yes 7. email.email = prim-email Yes No No - + full usable account needs all 7 requirements fulfilled so if one setting isn't set/cleared there is an inconsistency either way if eg email.email is not avail, admin console cannot open user info @@ -432,7 +432,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); } - + if ($drow) { $eemail = $drow['eemail']; $edeleted = $drow['edeleted']; @@ -451,11 +451,11 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); } if ($edeleted!=0) { $inconsistency += 8; - $inccause .= (empty($inccause)?"":"
")._("Email record set deleted"); + $inccause .= (empty($inccause)?"":"
")._("Email record set deleted"); } if ($ehash!='') { $inconsistency += 16; - $inccause .= (empty($inccause)?"":"
")._("Email record hash not unset"); + $inccause .= (empty($inccause)?"":"
")._("Email record hash not unset"); } } else { $inconsistency = 32; @@ -474,14 +474,14 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); "operations and needs to be fixed manually through arbitration/critical ". "team.")?> - +

- @@ -510,12 +510,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $total = $drow['total']; - + $maxexpire = "0000-00-00 00:00:00"; if ($drow['maxexpire']) { $maxexpire = $drow['maxexpire']; } - + if($total > 0) { $query = "select COUNT(*) as `valid` from `domains` inner join `domaincerts` @@ -526,7 +526,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $valid = $drow['valid']; - + $query = "select COUNT(*) as `expired` from `domains` inner join `domaincerts` on `domains`.`id` = `domaincerts`.`domid` @@ -535,7 +535,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $expired = $drow['expired']; - + $query = "select COUNT(*) as `revoked` from `domains` inner join `domaincerts` on `domains`.`id` = `domaincerts`.`domid` @@ -568,12 +568,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $total = $drow['total']; - + $maxexpire = "0000-00-00 00:00:00"; if ($drow['maxexpire']) { $maxexpire = $drow['maxexpire']; } - + if($total > 0) { $query = "select COUNT(*) as `valid` from `emailcerts` @@ -583,7 +583,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $valid = $drow['valid']; - + $query = "select COUNT(*) as `expired` from `emailcerts` where `memid` = '".intval($row['id'])."' @@ -591,7 +591,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $expired = $drow['expired']; - + $query = "select COUNT(*) as `revoked` from `emailcerts` where `memid` = '".intval($row['id'])."' @@ -623,12 +623,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $total = $drow['total']; - + $maxexpire = "0000-00-00 00:00:00"; if ($drow['maxexpire']) { $maxexpire = $drow['maxexpire']; } - + if($total > 0) { $query = "select COUNT(*) as `valid` from `gpg` @@ -637,7 +637,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $valid = $drow['valid']; - + $query = "select COUNT(*) as `expired` from `emailcerts` where `memid` = '".intval($row['id'])."' @@ -645,7 +645,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $expired = $drow['expired']; - + ?> @@ -672,12 +672,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $total = $drow['total']; - + $maxexpire = "0000-00-00 00:00:00"; if ($drow['maxexpire']) { $maxexpire = $drow['maxexpire']; } - + if($total > 0) { $query = "select COUNT(*) as `valid` from `orgdomaincerts` as `orgcerts` inner join `org` @@ -688,7 +688,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $valid = $drow['valid']; - + $query = "select COUNT(*) as `expired` from `orgdomaincerts` as `orgcerts` inner join `org` on `orgcerts`.`orgid` = `org`.`orgid` @@ -697,7 +697,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $expired = $drow['expired']; - + $query = "select COUNT(*) as `revoked` from `orgdomaincerts` as `orgcerts` inner join `org` on `orgcerts`.`orgid` = `org`.`orgid` @@ -732,12 +732,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $total = $drow['total']; - + $maxexpire = "0000-00-00 00:00:00"; if ($drow['maxexpire']) { $maxexpire = $drow['maxexpire']; } - + if($total > 0) { $query = "select COUNT(*) as `valid` from `orgemailcerts` as `orgcerts` inner join `org` @@ -748,7 +748,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $valid = $drow['valid']; - + $query = "select COUNT(*) as `expired` from `orgemailcerts` as `orgcerts` inner join `org` on `orgcerts`.`orgid` = `org`.`orgid` @@ -757,7 +757,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $dres = mysql_query($query); $drow = mysql_fetch_assoc($dres); $expired = $drow['expired']; - + $query = "select COUNT(*) as `revoked` from `orgemailcerts` as `orgcerts` inner join `org` on `orgcerts`.`orgid` = `org`.`orgid` @@ -780,9 +780,18 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); + + + ')) return false;"> + + +
+ +
+ ()
@@ -884,7 +893,7 @@ function showassuredby()

- Date: Mon, 28 Jan 2013 08:47:07 +0100 Subject: bug 1136: Added refernce for includes/account.php and fixed layout --- pages/account/43.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/account/43.php b/pages/account/43.php index 96196b3..695e035 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -784,7 +784,8 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
')) return false;"> - + +
-- cgit v1.2.1 From 90bdd8cbe3eb660d3887337919173ce730b344fb Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 27 Feb 2013 00:32:07 +0100 Subject: bug 1136: fixed references $id and $userid --- pages/account/43.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pages') diff --git a/pages/account/43.php b/pages/account/43.php index 695e035..608f66b 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -98,8 +98,8 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); if(intval($_REQUEST['userid']) > 0) { - $id = intval($_REQUEST['userid']); - $query = "select * from `users` where `id`='$id' and `users`.`deleted`=0"; + $userid = intval($_REQUEST['userid']); + $query = "select * from `users` where `users`.`id`='$userid' and `users`.`deleted`=0"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -133,7 +133,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); : - + @@ -784,7 +784,8 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
')) return false;"> - + +
-- cgit v1.2.1 From e05ca1fd4ba7a1bc19f452ba668502ac086170c6 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Tue, 30 Apr 2013 23:08:46 +0200 Subject: bug 893: Added check for correct arbitrtation no + sequence no --- pages/account/50.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/account/50.php b/pages/account/50.php index 48c8896..a4c2413 100644 --- a/pages/account/50.php +++ b/pages/account/50.php @@ -26,7 +26,7 @@ - : + : -- cgit v1.2.1 From c3f0e56d1ee679f193758538d63a6d182aa0f9e0 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 1 May 2013 02:00:31 +0200 Subject: bug 1136: changed from variable to fixed value for hidden oldid --- pages/account/43.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/account/43.php b/pages/account/43.php index 608f66b..b4f77d7 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -784,7 +784,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
')) return false;"> - +
-- cgit v1.2.1 From bc07a929dbc01138feebc39f17036e3635ad8b68 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 9 Jun 2013 20:12:37 +0200 Subject: bug 1137: corrected some checks in wot.inc.php and wot.php --- pages/wot/6.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'pages') diff --git a/pages/wot/6.php b/pages/wot/6.php index a1f7489..fda3fc3 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -55,7 +55,5 @@ AssureBoxLine("rules",_("I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); AssureTextLine(_("Policy"),""._("CAcert Community Agreement")." -"._("Assurance Policy")." - "._("Assurance Handbook").""); AssureInboxLine("points",_("Points"),"","
(Max. ".maxpoints().")"); -// AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the CAcert Community Agreement"),$fname)); -// AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to the CAcert Community Agreement")); AssureFoot($id,_("I confirm this Assurance")); ?> -- cgit v1.2.1 From 5e2267dc9f2c2bee3b9f65d6610a1059400a57c4 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 14 Jul 2013 21:36:24 +0200 Subject: bug 1123: changed layout of pages/account/3.php --- pages/account/3.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'pages') diff --git a/pages/account/3.php b/pages/account/3.php index 5590488..87484f9 100644 --- a/pages/account/3.php +++ b/pages/account/3.php @@ -44,7 +44,7 @@ -= 50) { $fname = $_SESSION['profile']['fname']; @@ -68,28 +68,35 @@ if($_SESSION['profile']['points'] >= 50) ''
- + = 100 && $_SESSION['profile']['codesign'] > 0) { ?> + + + - - - +
+ - -
+ + + +

- - + + + + + -- cgit v1.2.1 From 32c9710e36d3b73f7257a8e590412bb109e6d407 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 14 Jul 2013 22:26:44 +0200 Subject: bug 1123: implement CCA acception for client certs --- pages/account/3.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pages') diff --git a/pages/account/3.php b/pages/account/3.php index 87484f9..2402ae4 100644 --- a/pages/account/3.php +++ b/pages/account/3.php @@ -114,6 +114,15 @@ if($_SESSION['profile']['points'] >= 50) + + + + + + CCA")?>
+ + + "> -- cgit v1.2.1 From 654323f9f22b7d3c11dc5dd9959364d10f188a7d Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 14 Jul 2013 22:03:19 +0200 Subject: bug 1123: added layout changes --- pages/account/10.php | 8 +++++--- pages/account/3.php | 2 +- pages/gpg/0.php | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'pages') diff --git a/pages/account/10.php b/pages/account/10.php index a394695..7ada977 100644 --- a/pages/account/10.php +++ b/pages/account/10.php @@ -36,7 +36,9 @@

-
-"> - +
+

CCA")?>
+

+" /> + diff --git a/pages/account/3.php b/pages/account/3.php index 2402ae4..4c839f7 100644 --- a/pages/account/3.php +++ b/pages/account/3.php @@ -116,7 +116,7 @@ if($_SESSION['profile']['points'] >= 50) - + CCA")?>
diff --git a/pages/gpg/0.php b/pages/gpg/0.php index ce3b72a..60b1784 100644 --- a/pages/gpg/0.php +++ b/pages/gpg/0.php @@ -19,7 +19,9 @@ ?>

-
-"> - +
+

CCA")?>
+

+" /> +
-- cgit v1.2.1 From 75693292de2d907bf2a4b0f12abd7cd68781f95a Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 14 Jul 2013 22:23:52 +0200 Subject: bug 1123: fixed merge conflicts on testserver --- pages/gpg/0.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pages') diff --git a/pages/gpg/0.php b/pages/gpg/0.php index 60b1784..c513793 100644 --- a/pages/gpg/0.php +++ b/pages/gpg/0.php @@ -19,6 +19,8 @@ ?>

+


+


CCA")?>

-- cgit v1.2.1 From d2007817b54591de8e0f89939839eb1bcf730720 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 21 Jul 2013 22:08:27 +0200 Subject: bug 1177: Update include references from wot.inc.php to link to notary.inc.php --- pages/wot/15.php | 2 +- pages/wot/4.php | 2 +- pages/wot/6.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pages') diff --git a/pages/wot/15.php b/pages/wot/15.php index 8579588..cca2702 100644 --- a/pages/wot/15.php +++ b/pages/wot/15.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - include_once($_SESSION['_config']['filepath']."/includes/wot.inc.php"); + require_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); $userid = intval($_SESSION['profile']['id']); diff --git a/pages/wot/4.php b/pages/wot/4.php index befdfe4..628e6a5 100644 --- a/pages/wot/4.php +++ b/pages/wot/4.php @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -require_once(dirname(__FILE__).'/../../includes/wot.inc.php'); +require_once(dirname(__FILE__).'/../../includes/notary.inc.php'); ?>

diff --git a/pages/wot/6.php b/pages/wot/6.php index 28c1875..037eb7e 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -40,7 +40,7 @@ $name = $fname." ".$mname." ".$lname." ".$suffix; $_SESSION['_config']['wothash'] = md5($name."-".$dob); - include_once($_SESSION['_config']['filepath']."/includes/wot.inc.php"); + require_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); AssureHead(_("Assurance Confirmation"),sprintf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance."), $fname)); AssureTextLine(_("Name"),$name); -- cgit v1.2.1 From 8683c1418a4ae2d46f0458e31a74fde5b1089864 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Tue, 23 Jul 2013 23:16:02 +0200 Subject: bug 1177: Fix colspan values for old display of assurance points --- pages/account/43.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pages') diff --git a/pages/account/43.php b/pages/account/43.php index 234e01a..841189d 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -837,7 +837,7 @@ function showassuredto() - : + :   @@ -883,7 +883,7 @@ function showassuredby() - : + :   -- cgit v1.2.1 From c6fd753005d2651382fc8aa21933376225035a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Sun, 25 Aug 2013 00:27:52 +0200 Subject: Revert "bug 1123: fixed merge conflicts on testserver" This reverts commit 75693292de2d907bf2a4b0f12abd7cd68781f95a. --- pages/gpg/0.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'pages') diff --git a/pages/gpg/0.php b/pages/gpg/0.php index c513793..60b1784 100644 --- a/pages/gpg/0.php +++ b/pages/gpg/0.php @@ -19,8 +19,6 @@ ?>

-


-


CCA")?>

-- cgit v1.2.1