Fix and clean up.

submitted-by: pfJason (Jason Ellingson)

1 files changed, 207 insertions, 220 deletions

diff --git a/usr/local/www/vpn_ipsec_ca_edit_create_cert.php b/usr/local/www/vpn_ipsec_ca_edit_create_cert.php
index d2c03d4..6eb16ce 100755
--- a/usr/local/www/vpn_ipsec_ca_edit_create_cert.php
+++ b/usr/local/www/vpn_ipsec_ca_edit_create_cert.php
@@ -1,11 +1,11 @@
 #!/usr/local/bin/php
-<?php
+<?
 /* $Id$ */
 /*
 	vpn_ipsec_ca_edit_create_cert.php
 	part of pfSense
 
-	Copyright (C) 2004 Scott Ullrich
+	Copyright (C) 2005 Scott Ullrich and Jason Ellingson
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -30,14 +30,14 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require("guiconfig.inc");
+require('guiconfig.inc');
 
-$fd = fopen("/etc/ssl/openssl.cnf", "r");
-$openssl = fread($fd,8096);
+$fd = fopen('/etc/ssl/openssl.cnf', 'r');
+$openssl = fread($fd, 8096);
 fclose($fd);
 
-/* Lets match the fileds in the read in file and
-   populate the variables for the form */
+/*	Lets match the fileds in the read in file and
+	populate the variables for the form */
 preg_match('/\nC\=(.*)\n/', $openssl, $countrycodeA);
 preg_match('/\nST\=(.*)\n/', $openssl, $stateorprovinceA);
 preg_match('/\nL\=(.*)\n/', $openssl, $citynameA);
@@ -45,7 +45,7 @@ preg_match('/\nO\=(.*)\n/', $openssl, $orginizationnameA);
 preg_match('/\nOU\=(.*)\n/', $openssl, $orginizationdepartmentA);
 preg_match('/\nCN\=(.*)\n/', $openssl, $commonnameA);
 
-$pgtitle = "IPSEC: Certificate Authority: Create CertificatesS";
+$pgtitle = 'IPSEC: Certificate Authority: Create CertificatesS';
 
 $countrycode = $countrycodeA[1];
 $stateorprovince = $stateorprovinceA[1];
@@ -54,221 +54,208 @@ $orginizationname = $orginizationnameA[1];
 $orginizationdepartment = $orginizationdepartmentA[1];
 $commonname = $commonnameA[1];
 
-if ($_POST) {
-
-    /* Grab posted variables and create a new openssl.cnf */
-    $countrycode=$_POST['countrycode'];
-    $stateorprovince=$_POST['stateorprovince'];
-    $cityname=$_POST['cityname'];
-    $orginizationname=$_POST['orginizationname'];
-    $orginizationdepartment=$_POST['orginizationdepartment'];
-    $commonname=$_POST['commonname'];
-
-    /* Write out /etc/ssl/openssl.cnf */
-    conf_mount_rw();
-    $fd = fopen("/etc/ssl/openssl.cnf", "w");
-    fwrite($fd, "");
-    fwrite($fd, "[ req ]\n");
-    fwrite($fd, "distinguished_name=req_distinguished_name\n");
-    fwrite($fd, "req_extensions = v3_req\n");
-    fwrite($fd, "prompt=no\n");
-    fwrite($fd, "default_bits            = 1024\n");
-    fwrite($fd, "default_keyfile         = privkey.pem\n");
-    fwrite($fd, "distinguished_name      = req_distinguished_name\n");
-    fwrite($fd, "attributes              = req_attributes\n");
-    fwrite($fd, "x509_extensions = v3_ca # The extentions to add to the self signed cert\n");
-    fwrite($fd, "[ req_distinguished_name ]\n");
-    fwrite($fd, "C=" . $countrycode . "\n");
-    fwrite($fd, "ST=" . $stateorprovince. "\n");
-    fwrite($fd, "L=" . $cityname . "\n");
-    fwrite($fd, "O=" . $orginizationname . "\n");
-    fwrite($fd, "OU=" . $orginizationdepartment . "\n");
-    fwrite($fd, "CN=" . $commonname . "\n");
-    fwrite($fd, "[EMAIL PROTECTED]\n");
-    fwrite($fd, "[EMAIL PROTECTED]\n");
-    fwrite($fd, "[ v3_req ]\n");
-    fwrite($fd, "basicConstraints = critical,CA:FALSE\n");
-    fwrite($fd, "keyUsage = nonRepudiation, digitalSignature, keyEncipherment, dataEncipherment, keyAgreement\n");
-    fwrite($fd, "extendedKeyUsage=emailProtection,clientAuth\n");
-    fwrite($fd, "[ ca ]\n");
-    fwrite($fd, "default_ca      = CA_default\n");
-    fwrite($fd, "[ CA_default ]\n");
-    fwrite($fd, "certificate             = /tmp/cacert.pem\n");
-    fwrite($fd, "private_key             = /tmp/cakey.pem n");
-    fwrite($fd, "dir                     = /tmp/\n");
-    fwrite($fd, "certs                   = /tmp/certs\n");
-    fwrite($fd, "crl_dir                 = /tmp/crl\n");
-    fwrite($fd, "database                = /tmp/index.txt\n");
-    fwrite($fd, "new_certs_dir           = /tmp/newcerts\n");
-    fwrite($fd, "serial                  = /tmp/serial\n");
-    fwrite($fd, "crl                     = /tmp/crl.pem\n");
-    fwrite($fd, "RANDFILE                = /tmp/.rand\n");
-    fwrite($fd, "x509_extensions         = usr_cert\n");
-    fwrite($fd, "name_opt                = ca_default\n");
-    fwrite($fd, "cert_opt                = ca_default\n");
-    fwrite($fd, "default_days            = 365\n");
-    fwrite($fd, "default_crl_days        = 30\n");
-    fwrite($fd, "default_md              = md5\n");
-    fwrite($fd, "preserve                = no\n");
-    fwrite($fd, "policy                  = policy_match\n");
-    fwrite($fd, "[ policy_match ]\n");
-    fwrite($fd, "countryName             = match\n");
-    fwrite($fd, "stateOrProvinceName     = match\n");
-    fwrite($fd, "organizationName        = match\n");
-    fwrite($fd, "organizationalUnitName  = optional\n");
-    fwrite($fd, "commonName              = supplied\n");
-    fwrite($fd, "emailAddress            = optional\n");
-    fwrite($fd, "[ policy_anything ]\n");
-    fwrite($fd, "countryName             = optional\n");
-    fwrite($fd, "stateOrProvinceName     = optional\n");
-    fwrite($fd, "localityName            = optional\n");
-    fwrite($fd, "organizationName        = optional\n");
-    fwrite($fd, "organizationalUnitName  = optional\n");
-    fwrite($fd, "commonName              = supplied\n");
-    fwrite($fd, "emailAddress            = optional\n");
-    fwrite($fd, "[ req_distinguished_name ]\n");
-    fwrite($fd, "countryName                     = US\n");
-    fwrite($fd, "[ req_attributes ]\n");
-    fwrite($fd, "challengePassword               = A challenge password\n");
-    fwrite($fd, "unstructuredName                = An optional company name\n");
-    fwrite($fd, "[ usr_cert ]\n");
-    fwrite($fd, "basicConstraints=CA:FALSE\n");
-    fwrite($fd, "[ v3_ca ]\n");
-    fwrite($fd, "subjectKeyIdentifier=hash\n");
-    fwrite($fd, "authorityKeyIdentifier=keyid:always,issuer:always\n");
-    fwrite($fd, "basicConstraints = CA:true\n");
-    fwrite($fd, "[ crl_ext ]\n");
-    fwrite($fd, "authorityKeyIdentifier=keyid:always,issuer:always\n");
-    fclose($fd);
-    conf_mount_ro();
-
+if($_POST) {
+
+	/* Grab posted variables and create a new openssl.cnf */
+	$countrycode=$_POST['countrycode'];
+	$stateorprovince=$_POST['stateorprovince'];
+	$cityname=$_POST['cityname'];
+	$orginizationname=$_POST['orginizationname'];
+	$orginizationdepartment=$_POST['orginizationdepartment'];
+	$commonname=$_POST['commonname'];
+
+	/* Write out /etc/ssl/openssl.cnf */
+	conf_mount_rw();
+	$fd = fopen('/etc/ssl/openssl.cnf', 'w');
+	fwrite($fd, '');
+	fwrite($fd, "[ req ]\n");
+	fwrite($fd, "distinguished_name      = req_distinguished_name\n");
+	fwrite($fd, "req_extensions          = v3_req\n");
+	fwrite($fd, "prompt                  = no\n");
+	fwrite($fd, "default_bits            = 1024\n");
+	fwrite($fd, "default_keyfile         = privkey.pem\n");
+	fwrite($fd, "distinguished_name      = req_distinguished_name\n");
+	fwrite($fd, "attributes              = req_attributes\n");
+	fwrite($fd, "x509_extensions         = v3_ca # The extentions to add to the self signed cert\n");
+	fwrite($fd, "[ req_distinguished_name ]\n");
+	fwrite($fd, "C                       = " . $countrycode . "\n");
+	fwrite($fd, "ST                      = " . $stateorprovince. "\n");
+	fwrite($fd, "L                       = " . $cityname . "\n");
+	fwrite($fd, "O                       = " . $orginizationname . "\n");
+	fwrite($fd, "OU                      = " . $orginizationdepartment . "\n");
+	fwrite($fd, "CN                      = " . $commonname . "\n");
+	fwrite($fd, "[EMAIL PROTECTED]\n");
+	fwrite($fd, "[EMAIL PROTECTED]\n");
+	fwrite($fd, "[ v3_req ]\n");
+	fwrite($fd, "basicConstraints        = critical,CA:FALSE\n");
+	fwrite($fd, "keyUsage                = nonRepudiation, digitalSignature, keyEncipherment, dataEncipherment, keyAgreement\n");
+	fwrite($fd, "extendedKeyUsage        = emailProtection,clientAuth\n");
+	fwrite($fd, "[ ca ]\n");
+	fwrite($fd, "default_ca              = CA_default\n");
+	fwrite($fd, "[ CA_default ]\n");
+	fwrite($fd, "certificate             = /tmp/cacert.pem\n");
+	fwrite($fd, "private_key             = /tmp/cakey.pem n");
+	fwrite($fd, "dir                     = /tmp/\n");
+	fwrite($fd, "certs                   = /tmp/certs\n");
+	fwrite($fd, "crl_dir                 = /tmp/crl\n");
+	fwrite($fd, "database                = /tmp/index.txt\n");
+	fwrite($fd, "new_certs_dir           = /tmp/newcerts\n");
+	fwrite($fd, "serial                  = /tmp/serial\n");
+	fwrite($fd, "crl                     = /tmp/crl.pem\n");
+	fwrite($fd, "RANDFILE                = /tmp/.rand\n");
+	fwrite($fd, "x509_extensions         = usr_cert\n");
+	fwrite($fd, "name_opt                = ca_default\n");
+	fwrite($fd, "cert_opt                = ca_default\n");
+	fwrite($fd, "default_days            = 365\n");
+	fwrite($fd, "default_crl_days        = 30\n");
+	fwrite($fd, "default_md              = md5\n");
+	fwrite($fd, "preserve                = no\n");
+	fwrite($fd, "policy                  = policy_match\n");
+	fwrite($fd, "[ policy_match ]\n");
+	fwrite($fd, "countryName             = match\n");
+	fwrite($fd, "stateOrProvinceName     = match\n");
+	fwrite($fd, "organizationName        = match\n");
+	fwrite($fd, "organizationalUnitName  = optional\n");
+	fwrite($fd, "commonName              = supplied\n");
+	fwrite($fd, "emailAddress            = optional\n");
+	fwrite($fd, "[ policy_anything ]\n");
+	fwrite($fd, "countryName             = optional\n");
+	fwrite($fd, "stateOrProvinceName     = optional\n");
+	fwrite($fd, "localityName            = optional\n");
+	fwrite($fd, "organizationName        = optional\n");
+	fwrite($fd, "organizationalUnitName  = optional\n");
+	fwrite($fd, "commonName              = supplied\n");
+	fwrite($fd, "emailAddress            = optional\n");
+	fwrite($fd, "[ req_distinguished_name ]\n");
+	fwrite($fd, "countryName             = US\n");
+	fwrite($fd, "[ req_attributes ]\n");
+	fwrite($fd, "challengePassword       = A challenge password\n");
+	fwrite($fd, "unstructuredName        = An optional company name\n");
+	fwrite($fd, "[ usr_cert ]\n");
+	fwrite($fd, "basicConstraints        = CA:FALSE\n");
+	fwrite($fd, "[ v3_ca ]\n");
+	fwrite($fd, "subjectKeyIdentifier    = hash\n");
+	fwrite($fd, "authorityKeyIdentifier  = keyid:always,issuer:always\n");
+	fwrite($fd, "basicConstraints        = CA:true\n");
+	fwrite($fd, "[ crl_ext ]\n");
+	fwrite($fd, "authorityKeyIdentifier  = keyid:always,issuer:always\n");
+	fclose($fd);
+	conf_mount_ro();
 ?>
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
-<title><?=gentitle("");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<form action="vpn_ipsec_ca_edit_create_cert.php" method="post" name="iform" id="iform">
-
-<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
-            <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <?php if ($savemsg) print_info_box($savemsg); ?>
-	    <p>One moment please...
-	<?php
-
-	    mwexec("cd /tmp/ && /usr/bin/openssl req -new -x509 -keyout cakey.pem -out cacert.pem -days 3650 -config /etc/ssl/openssl.cnf -passin pass:test -nodes");
-	    //mwexec("cd /tmp/ && /usr/bin/openssl req -config openssl.cnf -new -nodes > cacert.pem ");
-	    //mwexec("cd /tmp/ && /usr/bin/openssl x509 -in cert.csr -out cert.pem -req -signkey cakey.pem");
-    	    $fd = fopen("/tmp/cacert.pem", "r");
-	    $cacert = fread($fd,8096);
-	    fclose($fd);
-	    $fd = fopen("/tmp/cakey.pem", "r");
-	    $cakey = fread($fd,8096);
-	    fclose($fd);
-	    $cacertA = ereg_replace("\r","",$cacert);
-	    $cakeyA = ereg_replace("\r","",$cakey);
-	    $cacert = ereg_replace("\n","\\n",$cacert);
-	    $cakey = ereg_replace("\n","\\n",$cakey);
-
-	?>
-	<script language="JavaScript">
-	<!--
-	    var cacert='<?=$cacert?>';
-	    var ident='<?=$commonname?>';
-	    opener.document.forms[0].cert.value=cacert;
-	    opener.document.forms[0].ident.value=ident;
-	    this.close();
-	-->
-	</script>
-
-<?php include("fend.inc"); ?>
-</body>
+	<head>
+		<title><?=gentitle('');?></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<link href="gui.css" rel="stylesheet" type="text/css">
+	</head>
+	<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+		<form action="vpn_ipsec_ca_edit_create_cert.php" method="post" name="iform" id="iform">
+<?
+	include('fbegin.inc');
+?>
+			<p class="pgtitle">
+				<?=$pgtitle?>
+			</p>
+<?
+	if($input_errors)
+		print_input_errors($input_errors);
+	if($savemsg)
+		print_info_box($savemsg);
+?>
+			<p>
+				One moment please...
+			</p>
+<?
+	mwexec('cd /tmp/ && /usr/bin/openssl req -new -x509 -keyout cakey.pem -out cacert.pem -days 3650 -config /etc/ssl/openssl.cnf -passin pass:test -nodes');
+	//mwexec('cd /tmp/ && /usr/bin/openssl req -config openssl.cnf -new -nodes > cacert.pem');
+	//mwexec('cd /tmp/ && /usr/bin/openssl x509 -in cert.csr -out cert.pem -req -signkey cakey.pem');
+	$fd = fopen('/tmp/cacert.pem', 'r');
+	$cacert = fread($fd, 8096);
+	fclose($fd);
+	$fd = fopen('/tmp/cakey.pem', 'r');
+	$cakey = fread($fd, 8096);
+	fclose($fd);
+	$cacertA = ereg_replace("\r", '', $cacert);
+	$cakeyA = ereg_replace("\r", '', $cakey);
+	$cacert = ereg_replace("\n", '\n', $cacert);
+	$cakey = ereg_replace("\n", '\n', $cakey);
+?>
+			<script language="JavaScript">
+			<!--
+				var cacert='<?=$cacert?>';
+				var ident='<?=$commonname?>';
+				opener.document.forms[0].cert.value=cacert;
+				opener.document.forms[0].ident.value=ident;
+				this.close();
+			//-->
+			</script>
+<?
+	include('fend.inc');
+?>
+		</form>
+	</body>
 </html>
-
-<?php
-
-} else {
-
+<?
+} else { //if($_POST)
 ?>
-
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <html>
-    <head>
-    <title><?=gentitle("System: Advanced functions");?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link href="gui.css" rel="stylesheet" type="text/css">
-    <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-    <form action="vpn_ipsec_ca_edit_create_cert.php" method="post" name="iform" id="iform">
-    <?php include("fbegin.inc"); ?>
-	  <p class="pgtitle">System: Advanced - Create Certificates</p>
-
-	  <table width="100%" border="0" cellpadding="6" cellspacing="0">
-		    <tr>
-		      <td width="35%" valign="top" class="vncell"><B>Country Code (2 Letters)</td>
-		      <td width="78%" class="vtable">
-			<input name="countrycode" value="<?=$countrycode?>">
-			</span></td>
-		    </tr>
-
-		    <tr>
-		      <td width="35%" valign="top" class="vncell"><B>State or Province name</td>
-		      <td width="78%" class="vtable">
-			<input name="stateorprovince" value="<?=$stateorprovince?>">
-			</span></td>
-		    </tr>
-
-		    <tr>
-		      <td width="35%" valign="top" class="vncell"><B>City name</td>
-		      <td width="78%" class="vtable">
-			<input name="cityname" value="<?=$cityname?>">
-			</span></td>
-		    </tr>
-
-		    <tr>
-		      <td width="35%" valign="top" class="vncell"><B>Organization name</td>
-		      <td width="78%" class="vtable">
-			<input name="orginizationname" value="<?=$orginizationname?>">
-			</span></td>
-		    </tr>
-
-		    <tr>
-		      <td width="35%" valign="top" class="vncell"><B>Organization department</td>
-		      <td width="78%" class="vtable">
-			<input name="orginizationdepartment" value="<?=$orginizationdepartment?>">
-			</span></td>
-		    </tr>
-
-		    <tr>
-		      <td width="35%" valign="top" class="vncell"><B>Common Name (Your name)</td>
-		      <td width="78%" class="vtable">
-			<input name="commonname" value="<?=$commonname?>">
-			</span></td>
-		    </tr>
-
-		    <!--
-		    <tr>
-		      <td width="35%" valign="top" class="vncell"><B>E-Mail address</td>
-		      <td width="78%" class="vtable">
-			<input name="email" value="<?=$email?>">
-			</span></td>
-		    </tr>
-		    -->
-
-		    <tr>
-		      <td width="35%" valign="top">&nbsp;</td>
-		      <td width="78%">
-			<input name="Submit" type="submit" class="formbtn" value="Save">
-		      </td>
-		    </tr>
-
-    <?php include("fend.inc"); ?>
-    </body>
-    </html>
-
-<?php
-}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+	<head>
+		<title><?=gentitle('System: Advanced functions')?></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<link href="gui.css" rel="stylesheet" type="text/css">
+	</head>
+	<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+		<form action="vpn_ipsec_ca_edit_create_cert.php" method="post" name="iform" id="iform">
+<?
+	include('fbegin.inc');
+?>
+			<p class="pgtitle">
+				System: Advanced - Create Certificates
+			</p>
+			<table width="100%" border="0" cellpadding="6" cellspacing="0">
+				<tr>
+					<td nowrap="nowrap" width="30%" class="vncell"><b>Country Code (2 Letters)</b></td>
+					<td nowrap="nowrap" width="70%" class="vtable"><input name="countrycode" value="<?=$countrycode?>"></td>
+				</tr>
+				<tr>
+					<td nowrap="nowrap" class="vncell"><b>State or Province name</b></td>
+					<td nowrap="nowrap" class="vtable"><input name="stateorprovince" value="<?=$stateorprovince?>"></td>
+				</tr>
+				<tr>
+					<td nowrap="nowrap" class="vncell"><b>City name</b></td>
+					<td nowrap="nowrap" class="vtable"><input name="cityname" value="<?=$cityname?>"></td>
+				</tr>
+				<tr>
+					<td nowrap="nowrap" class="vncell"><b>Organization name</b></td>
+					<td nowrap="nowrap" class="vtable"><input name="orginizationname" value="<?=$orginizationname?>"></td>
+				</tr>
+				<tr>
+					<td nowrap="nowrap" class="vncell"><b>Organization department</b></td>
+					<td nowrap="nowrap" class="vtable"><input name="orginizationdepartment" value="<?=$orginizationdepartment?>"></td>
+				</tr>
+				<tr>
+					<td nowrap="nowrap" class="vncell"><b>Common Name (Your name)</b></td>
+					<td nowrap="nowrap" class="vtable"><input name="commonname" value="<?=$commonname?>"></td>
+				</tr>
+<!--
+				<tr>
+					<td nowrap="nowrap" class="vncell"><b>E-Mail address</b></td>
+					<td nowrap="nowrap" class="vtable"><input name="email" value="<?=$email?>"></td>
+				</tr>
+-->
+				<tr>
+					<td nowrap="nowrap">&nbsp;</td>
+					<td nowrap="nowrap"><input name="Submit" type="submit" class="formbtn" value="Save"></td>
+				</tr>
+			</table>
+		</form>
+<?
+	include('fend.inc');
+?>
+	</body>
+</html>
+<?
+} // if($_POST)
 ?>