From 2418fc2f60176a720cbc39f7423f417491d4f4da Mon Sep 17 00:00:00 2001 From: Mark Schouten Date: Thu, 22 May 2014 10:00:41 +0200 Subject: [PATCH] Prepare $name in such a way that it always works. With or without dot, with or without a domainname --- htdocs/zones.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/zones.php b/htdocs/zones.php index 4a58fe5..8b46116 100644 --- a/htdocs/zones.php +++ b/htdocs/zones.php @@ -202,12 +202,11 @@ if ($action == "list" or $action== "listslaves") { _do_curl("/servers/:serverid:/zones/".$_POST['id'], array(), 'delete'); _jtable_respond(null, 'delete'); } elseif ($action == "createrecord" or $action == "editrecord") { + $name = (!preg_match("/\.".$_POST['domain']."\.?$/", $_POST['name'])) ? $_POST['name'].'.'.$_POST['domain'] : $_POST['name']; + $name = preg_replace("/\.$/", "", $name); + $records = array(); if ($action == "createrecord") { - $name = $_POST['name'].'.'.$_POST['domain']; $records = getrecords_by_name_type($_GET['zoneurl'], $name, $_POST['type']); - } elseif ($action == "editrecord") { - $name = $_POST['name']; - $records = array(); } $records =_create_record($name, $records, $_POST, $_GET['zoneurl']);