From 1dbd89e603e57442839d0615f683cc069138a28b Mon Sep 17 00:00:00 2001
From: Denis Fateyev <denis@fateyev.com>
Date: Sun, 1 Mar 2015 20:24:19 +0600
Subject: [PATCH 1/2] phpki: php tag fixes

---
 about.php           |  2 +-
 ca/help.php         |  4 ++--
 ca/request_cert.php |  4 ++--
 help.php            | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/about.php b/about.php
index 5284a9d..3b02606 100644
--- a/about.php
+++ b/about.php
@@ -10,7 +10,7 @@ printHeader('about');
 ?>
 <p>
 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
 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.
 <p>
 <h2><a name="GETTING-HELP">GETTING ADDITIONAL HELP</a></h2>
 <blockquote>
-<?=$config[getting_help]?>
+<?php echo $config[getting_help]?>
 </blockquote>
 <br>
 
-<?
+<?php
 printFooter();
 ?>
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:
 	</tr>
 
 	<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 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>
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);
 ?>
 <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=<?=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=<?=BASE_URL?>help/glossary.html><h3>Glossary</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=<?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=<?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=<?php echo BASE_URL?>help/glossary.html><h3>Glossary</h3></a>
 </center>
-<?
+<?php
 printFooter();
 ?>

From 31cefea863545fe0a3182b6bcfdc85d329f2097b Mon Sep 17 00:00:00 2001
From: Denis Fateyev <denis@fateyev.com>
Date: Sun, 1 Mar 2015 20:29:47 +0600
Subject: [PATCH 2/2] phpki: punycode hostname support

---
 include/my_functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}(?<!-)\.)+(?:[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);
 }
 
 #