From 3e3c03941fc6a46b021345655c18797454e0e0e5 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Wed, 17 Jul 2013 19:11:54 +0000 Subject: [PATCH 01/11] Replaced all short tags --- include/common.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/common.php b/include/common.php index 90f078c..f4ba02f 100644 --- a/include/common.php +++ b/include/common.php @@ -36,11 +36,11 @@ function printHeader($withmenu="default") { ?> - PHPki: <?=$title?> - + PHPki: <?php echo $title?> + - -
>PHPki
-
>
- >PHPki +
>
+ -
> - href=readme.php>ReadMe - href=setup.php>Setup - href=about.php target=_about>About +
> + href=readme.php>ReadMe + href=setup.php>Setup + href=about.php target=_about>About
- "; @@ -86,8 +86,8 @@ function printHeader($withmenu="default") { print 'Policy'; } ?> - href=help.php target=_help>Help - href=about.php target=_about>About + href=help.php target=_help>Help + href=about.php target=_about>About
Policy'; } ?> - href=../help.php target=_help>Help - href=../about.php target=_about>About + href=../help.php target=_help>Help + href=../about.php target=_about>About -

-
PHPki v - Copyright 2003 - William E. Roadcap

+
PHPki v - Copyright 2003 - William E. Roadcap

- From 77a9267f7b0aec187f1ccfe11b26ea67ebc02a92 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Wed, 17 Jul 2013 19:19:36 +0000 Subject: [PATCH 02/11] Replaced all short tags --- setup.php-presetup | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/setup.php-presetup b/setup.php-presetup index dfa845f..3c4fe4a 100644 --- a/setup.php-presetup +++ b/setup.php-presetup @@ -140,12 +140,12 @@ case 'validate': printHeader('setup'); ?> -
+ - +
- "; @@ -630,7 +630,7 @@ EOS;
- someone@somewhere.com &nbs printHeader('setup'); ?> -
method=post> + method=post>

Certificate Authority Initial Setup

@@ -692,12 +692,12 @@ E-mail: someone@somewhere.com &nbs - + - + @@ -707,7 +707,7 @@ E-mail: someone@somewhere.com &nbs e-mail clients as the Issued By: text. This is usually the full name of your certificate authority (i.e. ACME Certificate Authority). - + @@ -717,22 +717,22 @@ E-mail: someone@somewhere.com &nbs regarding your certificate authority and the certificates you issue. - + - + - + - + @@ -741,7 +741,7 @@ E-mail: someone@somewhere.com &nbs This password will be used to protect your root certificate private key.
Can't contain single quote ! Do not lose or forget this password. - + @@ -751,7 +751,7 @@ E-mail: someone@somewhere.com &nbs @@ -803,11 +803,11 @@ E-mail: someone@somewhere.com &nbs @@ -817,7 +817,7 @@ E-mail: someone@somewhere.com &nbs Enter the location of your OpenSSL binary. The default is usually ok. @@ -827,7 +827,7 @@ E-mail: someone@somewhere.com &nbs Enter the location of your PHPki user password file. The default is usually ok. @@ -841,7 +841,7 @@ E-mail: someone@somewhere.com &nbs "acme_caroot.crt". @@ -852,7 +852,7 @@ E-mail: someone@somewhere.com &nbs top of every page. @@ -865,7 +865,7 @@ E-mail: someone@somewhere.com &nbs tags to improve presentation.
Organization *
Department/Unit *
Locality *
State/Province *
Country *
   Again    Again
- +
Storage Directory *
Enter the location where PHPki will store its files. This should be a directory where - the web server has full read/write access (chown ; chmod 700), and is preferably - outside of DOCUMENT_ROOT (). You may have to manually create the directory before completing this form. + the web server has full read/write access (chown ; chmod 700), and is preferably + outside of DOCUMENT_ROOT (). You may have to manually create the directory before completing this form. 		- +
- +
- +
- +
- +
- +
@@ -876,7 +876,7 @@ E-mail: someone@somewhere.com &nbs
- Date: Wed, 17 Jul 2013 19:25:45 +0000 Subject: [PATCH 03/11] Replaced all short tags --- main.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.php b/main.php index 54e0fd1..0353ff5 100644 --- a/main.php +++ b/main.php @@ -20,12 +20,12 @@ case 'display_root': ?>

Root Certificate (PEM Encoded)

-

+

-

method=post> + method=post>
- Find a digital certificate to download and install in your e-mail or browser application. - ?stage=dl_root>Download Our Root Certificate + ?stage=dl_root>Download Our Root Certificate You must install our "Root" certificate before you can use any of the certificates issued here. Read the online help to learn more about this. - ?stage=display_root>Display Our Root Certificate (PEM Encoded) + ?stage=display_root>Display Our Root Certificate (PEM Encoded) This option provides the "Root" certificate PEM encoded text for advanced users to manually install via copy and paste. Read the online help to learn more about this. - ?stage=dl_crl>Download Our Certificate Revocation List + ?stage=dl_crl>Download Our Certificate Revocation List The official list of certificates revoked by this site. Installation and use of this list is optional. Some e-mail programs will reference this list automagically.

- Date: Thu, 18 Jul 2013 14:27:27 +0000 Subject: [PATCH 04/11] Replaced all short tags --- ca/request_cert.php | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ca/request_cert.php b/ca/request_cert.php index 9b03045..32bbf83 100644 --- a/ca/request_cert.php +++ b/ca/request_cert.php @@ -88,12 +88,12 @@ case 'validate': printHeader(); ?> -
+ - +
- "; @@ -122,7 +122,7 @@ case 'confirm': - '; print htvar($email) . '
'; print htvar($organization) . '
'; @@ -139,14 +139,14 @@ case 'confirm':

Are you sure?

-

- +

+  

- -
method=post> + method=post>

There was an error creating your certificate.


Debug Info:

-
+

- +

- -
+ - + - + - + - + - + - + - + - +

Certificate Request Form
Common Name
(i.e. User real name or computer hostname)
E-mail Address
Organization (Company/Agency)
Department/Unit Department/Unit
Locality (City/County)Locality (City/County)
State/ProvinceState/Province
Country
Certificate Password    Again    Again
Certificate Life
Certificate Use:
- Date: Thu, 18 Jul 2013 14:27:46 +0000 Subject: [PATCH 05/11] Fixes #4 which prevented 4096 bit keys. --- ca/request_cert.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/request_cert.php b/ca/request_cert.php index 32bbf83..5e2d1b5 100644 --- a/ca/request_cert.php +++ b/ca/request_cert.php @@ -293,8 +293,8 @@ default: Key Size - '.CA_crl_text().''; } else { @@ -39,14 +39,14 @@ case 'gen_crl':

There was an error updating the Certificate Revocation List.


Debug Info:

-
+
-
method=post> + method=post>

- Certificate Management Control Panel. - ?stage=gen_crl>Update & View the Certificate Revocation List + ?stage=gen_crl>Update & View the Certificate Revocation List Some applications automagically reference the Certificate Revocation List to determine certificate validity. It is not necessary to perform this update function, as the CRL is updated when certificates are revoked. However, doing so is harmless. Read the online help to learn more about this. - ?stage=dl_root>Download the Root Certificate + ?stage=dl_root>Download the Root Certificate The "Root" certificate must be installed before using any of the certificates issued here. Read the online help to learn more about this. - ?stage=dl_crl>Download the Certificate Revocation List + ?stage=dl_crl>Download the Certificate Revocation List This is the official list of revoked certificates. Using this list with your e-mail or browser application is optional. Some applications will automagically reference this list.

- Date: Thu, 18 Jul 2013 14:32:41 +0000 Subject: [PATCH 07/11] Replaced all short tags --- ca/manage_certs.php | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/ca/manage_certs.php b/ca/manage_certs.php index 7ce07f6..892341a 100644 --- a/ca/manage_certs.php +++ b/ca/manage_certs.php @@ -42,7 +42,7 @@ $qstr_sort = "sortfield=$sortfield&ascdec=$ascdec"; switch ($stage) { case 'goaway': printHeader(false); - ?>

YOU ARE A VERY BAD BOY!

YOU ARE A VERY BAD BOY!

Certificate Details

-

(#)
')?>

-

(#)
')?>

+

REVOKED '.$revoke_date.'

'; @@ -65,9 +65,9 @@ case 'dl-confirm': $rec = CAdb_get_entry($serial); ?> -

You are about to download the PRIVATE certificate key for

+

You are about to download the PRIVATE certificate key for

DO NOT DISTRIBUTE THIS FILE TO THE PUBLIC!

-
+ File type:
- Country
- @@ -169,13 +169,13 @@ case 'revoke': .

Debug Info:

-
+

- -

+ - + - + - + - + - + - + - + - +

Certificate Renewal Form
Common Name
E-mail Address
Organization
Department/Unit Department/Unit
LocalityLocality
State/ProvinceState/Province
Country
Certificate Password
Certificate Life - > + >
-

Debug Info:

-
+

- CERTIFICATE MANAGEMENT CONTROL PANEL

-
" method=get name=filter> - Search: -       " method=get name=filter> + Search: +       >Valid -   >Revoked -   >Expired +   >Revoked +   >Expired      
- Date: Thu, 18 Jul 2013 14:50:18 +0000 Subject: [PATCH 08/11] Replaced another short tag --- include/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/common.php b/include/common.php index f4ba02f..2515b12 100644 --- a/include/common.php +++ b/include/common.php @@ -89,7 +89,7 @@ function printHeader($withmenu="default") { href=help.php target=_help>Help href=about.php target=_about>About - Date: Thu, 18 Jul 2013 14:52:46 +0000 Subject: [PATCH 09/11] A quick hack to fix unclosed classes when the HTML is rendered. --- include/common.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/common.php b/include/common.php index 2515b12..093c17c 100644 --- a/include/common.php +++ b/include/common.php @@ -43,14 +43,14 @@ function printHeader($withmenu="default") { From 78dfd43974d31d3308ab3d2e79c81ad92f0a3c15 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Thu, 18 Jul 2013 15:04:57 +0000 Subject: [PATCH 10/11] Updated doctype to HTML5 and fixed a bunch of unquoted elements --- include/common.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/include/common.php b/include/common.php index 093c17c..1352cdc 100644 --- a/include/common.php +++ b/include/common.php @@ -34,7 +34,7 @@ function printHeader($withmenu="default") { header("Pragma: no-cache"); ?> - + PHPki: <?php echo $title?> @@ -65,9 +65,9 @@ function printHeader($withmenu="default") { case 'setup': ?>
> - href=readme.php>ReadMe - href=setup.php>Setup - href=about.php target=_about>About + href="readme.php">ReadMe + href="setup.php">Setup + href="about.php" target="_about">About
"; if (DEMO) { - print "Public"; - print "Manage"; + print "Public"; + print "Manage"; } else { - print "Menu"; + print "Menu"; } if (file_exists('policy.html')) { - print 'Policy'; + print 'Policy'; } ?> - href=help.php target=_help>Help - href=about.php target=_about>About + href="help.php" target="_help">Help + href="about.php" target="_about">About "; if (DEMO) { - print "Public"; - print "Manage"; + print "Public"; + print "Manage"; } else { - print "Menu"; + print "Menu"; } if (file_exists('../policy.html')) { - print 'Policy'; + print 'Policy'; } ?> - href=../help.php target=_help>Help - href=../about.php target=_about>About + href="../help.php" target="_help">Help + href="../about.php" target="_about">About
-
-
-
PHPki v - Copyright 2003 - William E. Roadcap

+
+
+

PHPki v - Copyright 2003 - William E. Roadcap

Date: Thu, 18 Jul 2013 16:00:33 +0000 Subject: [PATCH 11/11] Replaced all short tags --- search.php | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/search.php b/search.php index f779353..b8c9332 100644 --- a/search.php +++ b/search.php @@ -49,15 +49,15 @@ case search: ?>

Nothing Found

-
method=post name=form> - - - - + method=post name=form> + + + +
- - - - - - > - - - - - ?stage=display&serial= target=_certdisp>Display - ; font-weight: bold"> + + + + > + + + + + ?stage=display&serial= target=_certdisp>Display + - ?stage=download&serial=>Download - ?stage=download&serial=>Download + '; } @@ -105,14 +105,14 @@ case search: ?> -
method=post name=form> + method=post name=form> - - - - + + + +
-

Certificate Search

-
method=post name=search> - + method=post name=search> +
- >Valid -      >Revoked -     >Expired + >Valid +      >Revoked +     >Expired


-