From 3ecae0b73b5a750e7853838b3bded110011536e5 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 11 Nov 2012 20:14:15 +0100 Subject: bug 782: Added a comment field to all certificate pages --- pages/account/10.php | 2 ++ pages/account/12.php | 9 ++++++--- pages/account/16.php | 6 ++++++ pages/account/18.php | 9 ++++++--- pages/account/20.php | 4 +++- pages/account/22.php | 9 ++++++--- pages/account/3.php | 6 ++++++ pages/account/5.php | 11 +++++++---- 8 files changed, 42 insertions(+), 14 deletions(-) (limited to 'pages/account') diff --git a/pages/account/10.php b/pages/account/10.php index 704a05c..f5527ab 100644 --- a/pages/account/10.php +++ b/pages/account/10.php @@ -34,6 +34,8 @@

+


+


"> diff --git a/pages/account/12.php b/pages/account/12.php index 44926ca..35ae6c2 100644 --- a/pages/account/12.php +++ b/pages/account/12.php @@ -25,7 +25,8 @@ - + + @@ -34,7 +35,8 @@ UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`, `domaincerts`.`expire` as `expires`, `revoked` as `revoke`, - UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id` + UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`, + `domaincerts`.`description` from `domaincerts`,`domains` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `domaincerts`.`domid`=`domains`.`id` "; if($viewall != 1) @@ -75,7 +77,8 @@ - + + diff --git a/pages/account/16.php b/pages/account/16.php index 514ecfd..338878d 100644 --- a/pages/account/16.php +++ b/pages/account/16.php @@ -56,6 +56,12 @@ + + +
+ + + "> "> diff --git a/pages/account/18.php b/pages/account/18.php index 13dcc30..45e3be9 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -25,7 +25,8 @@ - + + @@ -35,7 +36,8 @@ UNIX_TIMESTAMP(`oemail`.`expire`) as `expired`, `oemail`.`expire` as `expires`, `oemail`.`revoked` as `revoke`, UNIX_TIMESTAMP(`oemail`.`revoked`) as `revoked`, - `oemail`.`CN`, `oemail`.`serial`, `oemail`.`id` + `oemail`.`CN`, `oemail`.`serial`, `oemail`.`id`, + `oemail`.`description` from `orgemailcerts` as `oemail`, `org` where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `org`.`orgid`=`oemail`.`orgid` "; @@ -80,7 +82,8 @@ - + + diff --git a/pages/account/20.php b/pages/account/20.php index 510b708..5e91e77 100644 --- a/pages/account/20.php +++ b/pages/account/20.php @@ -29,9 +29,11 @@


+


+

-
+
">
diff --git a/pages/account/22.php b/pages/account/22.php index 9df8200..ac7a645 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -25,7 +25,8 @@ - + + @@ -36,7 +37,8 @@ `orgdomaincerts`.`expire` as `expires`, `revoked` as `revoke`, UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `orgdomaincerts`.`serial`, - `orgdomaincerts`.`id` as `id` + `orgdomaincerts`.`id` as `id`, + `orgdomaincerts`.`description` from `orgdomaincerts`,`org` where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orgdomaincerts`.`orgid`=`org`.`orgid` "; if($viewall != 1) @@ -77,7 +79,8 @@ - + + diff --git a/pages/account/3.php b/pages/account/3.php index 5590488..b2e3184 100644 --- a/pages/account/3.php +++ b/pages/account/3.php @@ -52,6 +52,12 @@ if($_SESSION['profile']['points'] >= 50) $lname = $_SESSION['profile']['lname']; $suffix = $_SESSION['profile']['suffix']; ?> + + +
+ + +
diff --git a/pages/account/5.php b/pages/account/5.php index 5c131ba..539f237 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -25,7 +25,8 @@ - + + @@ -40,8 +41,9 @@ `emailcerts`.`id`, `emailcerts`.`CN`, `emailcerts`.`serial`, - emailcerts.disablelogin as `disablelogin` - from `emailcerts` + emailcerts.disablelogin as `disablelogin`, + `emailcerts`.`description` + from `emailcerts` where `emailcerts`.`memid`='".$_SESSION['profile']['id']."' "; if($viewall != 1) @@ -86,7 +88,8 @@ - + + -- cgit v1.2.1 From e6dee64e0f3b03060c6c0443b9bba090061db54e Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 14 Nov 2012 22:50:12 +0100 Subject: Bug 782: fixed layout, change of comment not yet realised in overview 5.php --- pages/account/3.php | 36 ++++++++++++++++++------------------ pages/account/5.php | 26 +++++++++++++++++--------- 2 files changed, 35 insertions(+), 27 deletions(-) (limited to 'pages/account') diff --git a/pages/account/3.php b/pages/account/3.php index b2e3184..2726952 100644 --- a/pages/account/3.php +++ b/pages/account/3.php @@ -52,35 +52,28 @@ if($_SESSION['profile']['points'] >= 50) $lname = $_SESSION['profile']['lname']; $suffix = $_SESSION['profile']['suffix']; ?> - - -
- - - - -
-
- \n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 125))?> +
+
+ \n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 125))?> -
- ''
- ''
- ''
- ''
+
+ ''
+ ''
+ ''
+ ''
= 100 && $_SESSION['profile']['codesign'] > 0) { ?> - + - + @@ -91,7 +84,12 @@ if($_SESSION['profile']['points'] >= 50)
- + + +
+ + + @@ -107,6 +105,8 @@ if($_SESSION['profile']['points'] >= 50) + + diff --git a/pages/account/5.php b/pages/account/5.php index 539f237..52266ec 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -19,18 +19,17 @@
- + - - + - + - + - - + + + - + - + + + + -- cgit v1.2.1 From da87734b7884d1dee5a7a25efeabe1055de9e7b2 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 21 Nov 2012 00:28:42 +0100 Subject: bug 782: changed insert sql (deleted intval) on account.php, adjustment text area --- pages/account/5.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/account') diff --git a/pages/account/5.php b/pages/account/5.php index 52266ec..b2c9609 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -94,7 +94,7 @@ /> - + @@ -116,7 +116,7 @@ - + -- cgit v1.2.1 From 7fb567534aa04c1b5883a133ca039c9d54557d74 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 21 Nov 2012 00:36:27 +0100 Subject: bug 782: Changed row id --- pages/account/5.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages/account') diff --git a/pages/account/5.php b/pages/account/5.php index b2c9609..b10dd75 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -94,7 +94,7 @@ /> - + -- cgit v1.2.1 From ef4fa3cf7a767df0813577cf920e9a51939d452a Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 21 Nov 2012 00:49:14 +0100 Subject: bug 782: typo fix --- pages/account/5.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages/account') diff --git a/pages/account/5.php b/pages/account/5.php index b10dd75..206a149 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -94,7 +94,7 @@ /> - + -- cgit v1.2.1 From f4838bd359669c262faa0d7c145e3ee64718cca6 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 21 Nov 2012 09:22:53 +0100 Subject: bug 782: Update routine for description in includes/account.php, new view in pages/account/6.php, small changes in pages/account/5.php --- pages/account/5.php | 17 +++++----- pages/account/6.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 10 deletions(-) (limited to 'pages/account') diff --git a/pages/account/5.php b/pages/account/5.php index 206a149..f8e9190 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -29,7 +29,7 @@ - + - + " value="1" /> - - + - - @@ -116,7 +113,7 @@ - + diff --git a/pages/account/6.php b/pages/account/6.php index 38af8e8..e76ef06 100644 --- a/pages/account/6.php +++ b/pages/account/6.php @@ -19,6 +19,23 @@ $certid = 0; if(array_key_exists('cert',$_REQUEST)) $certid=intval($_REQUEST['cert']); $query = "select * from `emailcerts` where `id`='$certid' and `memid`='".intval($_SESSION['profile']['id'])."'"; + $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`, + UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, + UNIX_TIMESTAMP(`emailcerts`.`expire`) as `expired`, + `emailcerts`.`expire` as `expires`, + `emailcerts`.`revoked` as `revoke`, + UNIX_TIMESTAMP(`emailcerts`.`revoked`) as `revoked`, + `emailcerts`.`id`, + `emailcerts`.`CN`, + `emailcerts`.`serial`, + emailcerts.disablelogin as `disablelogin`, + `emailcerts`.`crt_name`, + `emailcerts`.`keytype`, + `emailcerts`.`description` + from `emailcerts` + where `emailcerts`.`id`='$certid' and `emailcerts`.`memid`='".intval($_SESSION['profile']['id'])."'"; + + $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -134,3 +151,75 @@ } ?> + +
- -
/> + "> +
+
+ +
">     "> "> ">     ">"> ">
"> ">
- "> -
+
- + +
">     ">"> ">
+ + + + 0) + { + while($row = mysql_fetch_assoc($res)) + { + if($row['timeleft'] > 0) + $verified = _("Valid"); + if($row['timeleft'] < 0) + $verified = _("Expired"); + if($row['expired'] == 0) + $verified = _("Pending"); + if($row['revoked'] > 0) + $verified = _("Revoked"); + if($row['revoked'] == 0) + $row['revoke'] = _("Not Revoked"); +?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
+ /> +
">
+ + +
-- cgit v1.2.1 From c2b222a40ec6d43e8bc35dd6dc38b44bde11f7c9 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 25 Nov 2012 20:32:59 +0100 Subject: bug 782: added missing backticks around field names --- pages/account/6.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/account') diff --git a/pages/account/6.php b/pages/account/6.php index e76ef06..1436308 100644 --- a/pages/account/6.php +++ b/pages/account/6.php @@ -18,7 +18,7 @@ Date: Sun, 6 Jan 2013 22:53:26 +0100 Subject: bug 782: Changed index in html table --- pages/account/6.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/account') diff --git a/pages/account/6.php b/pages/account/6.php index 1436308..e3bc139 100644 --- a/pages/account/6.php +++ b/pages/account/6.php @@ -176,9 +176,9 @@ - + - +   -- cgit v1.2.1 From 494eb5923b8a682e2de786c284344b504211da8d Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 1 May 2013 22:20:26 +0200 Subject: bug 782: adjusted comment handling for client certs --- pages/account/5.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pages/account') diff --git a/pages/account/5.php b/pages/account/5.php index f8e9190..7ef8933 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -19,7 +19,7 @@
- + @@ -29,20 +29,20 @@ - + " value="1" /> - + + @@ -108,12 +109,12 @@ - + - + -- cgit v1.2.1 From a8fa9c12a6001ff97cfefced3a68b0f788a02b65 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 1 May 2013 22:40:00 +0200 Subject: bug 782: fixed typo --- pages/account/3.php | 8 ++++---- pages/account/5.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pages/account') diff --git a/pages/account/3.php b/pages/account/3.php index 2726952..b92f4fa 100644 --- a/pages/account/3.php +++ b/pages/account/3.php @@ -44,7 +44,7 @@ -= 50) { $fname = $_SESSION['profile']['fname']; @@ -67,7 +67,7 @@ if($_SESSION['profile']['points'] >= 50) ''
- += 100 && $_SESSION['profile']['codesign'] > 0) { ?> diff --git a/pages/account/5.php b/pages/account/5.php index 7ef8933..ab7a8c9 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -92,10 +92,10 @@ - - + + -- cgit v1.2.1 From b4af4ce47b780a6fb46300dcf8c04eaaa56dc213 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Mon, 13 May 2013 22:22:35 +0200 Subject: bug 782: changed variable names in account.php, adjusted table in account/5.php --- pages/account/5.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/account') diff --git a/pages/account/5.php b/pages/account/5.php index ab7a8c9..133e0fe 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -99,13 +99,13 @@ - - -- cgit v1.2.1 From 71d6d063bc6633d67133ccb53f67d5d27f9f5b99 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Tue, 14 May 2013 22:59:46 +0200 Subject: bug 782: Added comment update for all certificate view pages --- pages/account/12.php | 23 +++++++++++++++-------- pages/account/18.php | 13 ++++++++++--- pages/account/22.php | 20 +++++++++++++------- pages/account/5.php | 2 +- 4 files changed, 39 insertions(+), 19 deletions(-) (limited to 'pages/account') diff --git a/pages/account/12.php b/pages/account/12.php index 35ae6c2..44c5739 100644 --- a/pages/account/12.php +++ b/pages/account/12.php @@ -19,16 +19,16 @@
- -
">     ">"> ">
@@ -86,8 +86,8 @@ if($_SESSION['profile']['points'] >= 50)
-
- +
+
/> - +
+
+
- + - - + + - + 0) $verified = _("Revoked"); - if($row['revoked'] == 0) - $row['revoke'] = _("Not Revoked"); + if($row['revoked'] == 0) + $row['revoke'] = _("Not Revoked"); ?> @@ -77,15 +77,22 @@ - - + + + + + + +
- -
+ +
">     ">">
diff --git a/pages/account/18.php b/pages/account/18.php index 45e3be9..e736977 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -19,7 +19,7 @@ - + @@ -52,7 +52,7 @@ { ?> - + - + + + + + +
- -
+ +
">     ">">
diff --git a/pages/account/22.php b/pages/account/22.php index ac7a645..5d53582 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -19,17 +19,16 @@ - + - - + - + - + - - + + + + + + +
- -
+ +
">     ">">
diff --git a/pages/account/5.php b/pages/account/5.php index 133e0fe..515d33f 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -57,7 +57,7 @@ { ?> - + Date: Wed, 15 May 2013 00:20:08 +0200 Subject: bug 782: added format for XHTML, typo fixing --- pages/account/10.php | 12 ++++++------ pages/account/12.php | 14 +++++++------- pages/account/16.php | 18 +++++++++--------- pages/account/18.php | 2 +- pages/account/20.php | 16 ++++++++-------- pages/account/22.php | 10 +++++----- pages/account/3.php | 32 ++++++++++++++++---------------- pages/account/5.php | 10 +++++----- pages/account/8.php | 4 ++-- 9 files changed, 59 insertions(+), 59 deletions(-) (limited to 'pages/account') diff --git a/pages/account/10.php b/pages/account/10.php index f5527ab..848077a 100644 --- a/pages/account/10.php +++ b/pages/account/10.php @@ -30,14 +30,14 @@ = 50) { ?> -
-
+
+

-


-

+


+


-"> - +"/> +
diff --git a/pages/account/12.php b/pages/account/12.php index 44c5739..ffd4ae8 100644 --- a/pages/account/12.php +++ b/pages/account/12.php @@ -69,9 +69,9 @@ ?> - + - +   @@ -86,17 +86,17 @@ - + - ">     + "/>     "> - "> + "/> - - + +

diff --git a/pages/account/16.php b/pages/account/16.php index 338878d..6f055d7 100644 --- a/pages/account/16.php +++ b/pages/account/16.php @@ -29,25 +29,25 @@ foreach($_SESSION['_config']['emails'] as $val) { ?> : - + : - + : - + : - + -
-
+
+
\n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 60))?> @@ -58,13 +58,13 @@ -
- +
+ "> - "> + " /> diff --git a/pages/account/18.php b/pages/account/18.php index e736977..2267689 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -91,7 +91,7 @@ - + diff --git a/pages/account/20.php b/pages/account/20.php index 5e91e77..0187013 100644 --- a/pages/account/20.php +++ b/pages/account/20.php @@ -27,13 +27,13 @@

-
-
-


-

+
+
+


+

-
-"> - -
+
+" /> + + \ No newline at end of file diff --git a/pages/account/22.php b/pages/account/22.php index 5d53582..f5ba920 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -87,17 +87,17 @@ - + - ">     - "> - "> + " />     + " /> + " /> - +

diff --git a/pages/account/3.php b/pages/account/3.php index b92f4fa..c2165c2 100644 --- a/pages/account/3.php +++ b/pages/account/3.php @@ -53,25 +53,25 @@ if($_SESSION['profile']['points'] >= 50) $suffix = $_SESSION['profile']['suffix']; ?> -
-
- \n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 125))?> +
+
+ \n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 125))?> -
- ''
- ''
- ''
- ''
+
+ ''
+ ''
+ ''
+ ''
= 100 && $_SESSION['profile']['codesign'] > 0) { ?> - + @@ -80,14 +80,14 @@ if($_SESSION['profile']['points'] >= 50) -
+

-
- +
+ @@ -99,8 +99,8 @@ if($_SESSION['profile']['points'] >= 50) -
-
+
+
\n", wordwrap(_("By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it."), 125))?> @@ -114,10 +114,10 @@ if($_SESSION['profile']['points'] >= 50) - "> + " /> - +