Merge pull request #11 from dfateyev/master

phpki: cosmetic changes
This commit is contained in:
Nick Pappas
2015-03-11 14:52:02 -05:00
5 changed files with 11 additions and 11 deletions

View File

@@ -10,7 +10,7 @@ printHeader('about');
?> ?>
<p> <p>
PHPki is an <a href=http://www.opensource.org target=_blank>Open Source</a> PHPki is an <a href=http://www.opensource.org target=_blank>Open Source</a>
Web application for managing a <a href=<?=BASE_URL?>help/glossary.html#PKI target=help/glossary> Web application for managing a <a href=<?php echo BASE_URL?>help/glossary.html#PKI target=help/glossary>
Public Key Infrastructure</a> within a small organizations. PHPki acts as a Public Key Infrastructure</a> within a small organizations. PHPki acts as a
mechanism for the centralized creation and management of digital certificates. mechanism for the centralized creation and management of digital certificates.
PHPki is capable of managing certificates for multiple organizations or user PHPki is capable of managing certificates for multiple organizations or user

View File

@@ -364,10 +364,10 @@ PHPki glossary of terms.
<p> <p>
<h2><a name="GETTING-HELP">GETTING ADDITIONAL HELP</a></h2> <h2><a name="GETTING-HELP">GETTING ADDITIONAL HELP</a></h2>
<blockquote> <blockquote>
<?=$config[getting_help]?> <?php echo $config[getting_help]?>
</blockquote> </blockquote>
<br> <br>
<? <?php
printFooter(); printFooter();
?> ?>

View File

@@ -359,11 +359,11 @@ default:
</tr> </tr>
<tr id="testrow2" name="testrow2" style="visibility:hidden;display:none;"> <tr id="testrow2" name="testrow2" style="visibility:hidden;display:none;">
<td>Alternative DNS Names<br>(only one per Line)</td><td><textarea name=dns_names cols=30 rows=5><?= htvar($dns_names) ?></textarea></td> <td>Alternative DNS Names<br>(only one per Line)</td><td><textarea name=dns_names cols=30 rows=5><?php echo htvar($dns_names) ?></textarea></td>
</tr> </tr>
<tr id="testrow1" name="testrow1" style="visibility:hidden;display:none;"> <tr id="testrow1" name="testrow1" style="visibility:hidden;display:none;">
<td>IP's<br>(only one per Line)</td><td><textarea name=ip_addr cols=30 rows=5><?= htvar($ip_addr) ?></textarea></td> <td>IP's<br>(only one per Line)</td><td><textarea name=ip_addr cols=30 rows=5><?php echo htvar($ip_addr) ?></textarea></td>
</tr> </tr>
<tr> <tr>

View File

@@ -6,11 +6,11 @@ include('./include/common.php');
printHeader(about); printHeader(about);
?> ?>
<center><h1>PHPki HELP FILES</h1> <center><h1>PHPki HELP FILES</h1>
<a href=<?=BASE_URL?>help/PKI_basics.html><h3>PKI and E-mail Encryption - A Brief Explanation</h3></a> <a href=<?php echo BASE_URL?>help/PKI_basics.html><h3>PKI and E-mail Encryption - A Brief Explanation</h3></a>
<a href=<?=BASE_URL?>help/cacert_install_ie.html><h3>Installing Our Root Certificate For Use With Outlook and Outlook Express</h3></a> <a href=<?php echo BASE_URL?>help/cacert_install_ie.html><h3>Installing Our Root Certificate For Use With Outlook and Outlook Express</h3></a>
<p><a href=<?=BASE_URL?>help/usercert_install_ie.html><h3>Installing Your Personal E-mail Certificate For Use With Outlook and Outlook Express</h3></a> <p><a href=<?php echo BASE_URL?>help/usercert_install_ie.html><h3>Installing Your Personal E-mail Certificate For Use With Outlook and Outlook Express</h3></a>
<p><a href=<?=BASE_URL?>help/glossary.html><h3>Glossary</h3></a> <p><a href=<?php echo BASE_URL?>help/glossary.html><h3>Glossary</h3></a>
</center> </center>
<? <?php
printFooter(); printFooter();
?> ?>

View File

@@ -207,7 +207,7 @@ function is_ip( $ip = null ) {
function is_fqdn($FQDN) { function is_fqdn($FQDN) {
// remove leading wildcard characters if exist // remove leading wildcard characters if exist
$FQDN = preg_replace('/^\*\./','', $FQDN, 1); $FQDN = preg_replace('/^\*\./','', $FQDN, 1);
return (!empty($FQDN) && preg_match('/(?=^.{1,254}$)(^(?:(?!\d|-)[a-z0-9\-]{1,63}(?<!-)\.)+(?:[a-z]{2,})$)/i', $FQDN) > 0); return (!empty($FQDN) && preg_match('/^(?=.{1,254}$)((?=[a-z0-9-]{1,63}\.)(xn--+)?[a-z0-9]+(-[a-z0-9]+)*\.)+(xn--+)?[a-z0-9]{2,63}$/i', $FQDN) > 0);
} }
# #