Merge pull request poweradmin#247 from NTX/master

Fix for wrong zone appending to subnet PTR records
wociscz · Mar 9, 2016 · d735d41 · d735d41
2 parents 8099c26 + f400889
commit d735d41
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/inc/dns.inc.php b/inc/dns.inc.php
@@ -46,7 +46,7 @@ function validate_input($rid, $zid, $type, &$content, &$name, &$prio, &$ttl) {
 
     $zone = get_zone_name_from_id($zid);    // TODO check for return
 
-    if (!(preg_match("/$zone$/i", $name))) {
+    if (!endsWith(strtolower($zone), strtolower($name))) {
         if (isset($name) && $name != "") {
             $name = $name . "." . $zone;
         } else {

diff --git a/inc/toolkit.inc.php b/inc/toolkit.inc.php
@@ -819,3 +819,18 @@ function logout($msg = "", $type = "") {
     auth($msg, $type);
     exit;
 }
+
+/** Matches end of string
+ * 
+ * Matches end of string (haystack) against another string (needle)
+ *
+ * @param string $needle
+ * @param string $haystack
+ * 
+ * @return true if ends with specified string, otherwise false
+ */
+function endsWith($needle, $haystack) {
+    $length = strlen($haystack);
+    $nLength = strlen($needle);
+    return $nLength <= $length && strncmp(substr($haystack, -$nLength), $needle, $nLength) === 0;
+}