diff --git a/about.php b/about.php
index 5284a9d..3b02606 100644
--- a/about.php
+++ b/about.php
@@ -10,7 +10,7 @@ printHeader('about');
?>
PHPki is an Open Source
-Web application for managing a help/glossary.html#PKI target=help/glossary>
+Web application for managing a help/glossary.html#PKI target=help/glossary>
Public Key Infrastructure within a small organizations. PHPki acts as a
mechanism for the centralized creation and management of digital certificates.
PHPki is capable of managing certificates for multiple organizations or user
diff --git a/ca/help.php b/ca/help.php
index 425b0b7..e7651d0 100644
--- a/ca/help.php
+++ b/ca/help.php
@@ -364,10 +364,10 @@ PHPki glossary of terms.
-=$config[getting_help]?>
+
-
+
diff --git a/ca/request_cert.php b/ca/request_cert.php
index ed1f725..97bf918 100644
--- a/ca/request_cert.php
+++ b/ca/request_cert.php
@@ -359,11 +359,11 @@ default:
- Alternative DNS Names (only one per Line) | |
+ Alternative DNS Names (only one per Line) | |
- IP's (only one per Line) | |
+ IP's (only one per Line) | |
diff --git a/help.php b/help.php
index f9b1ac3..c5615ed 100644
--- a/help.php
+++ b/help.php
@@ -6,11 +6,11 @@ include('./include/common.php');
printHeader(about);
?>
PHPki HELP FILES
-help/PKI_basics.html>PKI and E-mail Encryption - A Brief Explanation
-help/cacert_install_ie.html>Installing Our Root Certificate For Use With Outlook and Outlook Express
-help/usercert_install_ie.html>Installing Your Personal E-mail Certificate For Use With Outlook and Outlook Express
-
help/glossary.html>Glossary
+help/PKI_basics.html>PKI and E-mail Encryption - A Brief Explanation
+help/cacert_install_ie.html>Installing Our Root Certificate For Use With Outlook and Outlook Express
+
help/usercert_install_ie.html>Installing Your Personal E-mail Certificate For Use With Outlook and Outlook Express
+
help/glossary.html>Glossary
-
+
diff --git a/include/my_functions.php b/include/my_functions.php
index 9511379..09af4f7 100644
--- a/include/my_functions.php
+++ b/include/my_functions.php
@@ -207,7 +207,7 @@ function is_ip( $ip = null ) {
function is_fqdn($FQDN) {
// remove leading wildcard characters if exist
$FQDN = preg_replace('/^\*\./','', $FQDN, 1);
- return (!empty($FQDN) && preg_match('/(?=^.{1,254}$)(^(?:(?!\d|-)[a-z0-9\-]{1,63}(? 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);
}
#