uses coalesceArr

1 files changed, 14 insertions, 32 deletions

diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php
index 3464fdc1..6c8a3b96 100644
--- a/src/controllers/DomainsController.php
+++ b/src/controllers/DomainsController.php
@@ -283,7 +283,7 @@ class DomainsController extends BaseController
             }
 
             // Display domain info
-            echo '<form action="'.\SUBFOLDER."/src/views/domains\" method=\"post\">\n";
+            echo '<form action="' . \SUBFOLDER . "/src/views/domains\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data left required\" style=\"width: 70px\">{$this->lang['strname']}</th>\n";
             echo '<td class="data1">', $this->misc->printVal($domaindata->fields['domname']), "</td></tr>\n";
@@ -325,20 +325,16 @@ class DomainsController extends BaseController
     {
         $data = $this->misc->getDatabaseAccessor();
 
-        if (!isset($_POST['name'])) {
-            $_POST['name'] = '';
-        }
+        $this->coalesceArr($_POST, 'name', '');
 
-        if (!isset($_POST['definition'])) {
-            $_POST['definition'] = '';
-        }
+        $this->coalesceArr($_POST, 'definition', '');
 
         if ($confirm) {
             $this->printTrail('domain');
             $this->printTitle($this->lang['straddcheck'], 'pg.constraint.check');
             $this->printMsg($msg);
 
-            echo '<form action="'.\SUBFOLDER."/src/views/domains\" method=\"post\">\n";
+            echo '<form action="' . \SUBFOLDER . "/src/views/domains\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data\">{$this->lang['strname']}</th>\n";
             echo "<th class=\"data required\">{$this->lang['strdefinition']}</th></tr>\n";
@@ -394,7 +390,7 @@ class DomainsController extends BaseController
                 $this->misc->printVal($_REQUEST['constraint']),
                 $this->misc->printVal($_REQUEST['domain'])
             ), "</p>\n";
-            echo '<form action="'.\SUBFOLDER."/src/views/domains\" method=\"post\">\n";
+            echo '<form action="' . \SUBFOLDER . "/src/views/domains\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"drop_con\" />\n";
             echo '<input type="hidden" name="domain" value="', htmlspecialchars($_REQUEST['domain']), "\" />\n";
             echo '<input type="hidden" name="constraint" value="', htmlspecialchars($_REQUEST['constraint']), "\" />\n";
@@ -558,7 +554,7 @@ class DomainsController extends BaseController
             $this->printTitle($this->lang['strdrop'], 'pg.domain.drop');
 
             echo '<p>', sprintf($this->lang['strconfdropdomain'], $this->misc->printVal($_REQUEST['domain'])), "</p>\n";
-            echo '<form action="'.\SUBFOLDER."/src/views/domains\" method=\"post\">\n";
+            echo '<form action="' . \SUBFOLDER . "/src/views/domains\" method=\"post\">\n";
             echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /><label for=\"cascade\">{$this->lang['strcascade']}</label></p>\n";
             echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="domain" value="', htmlspecialchars($_REQUEST['domain']), "\" />\n";
@@ -585,29 +581,17 @@ class DomainsController extends BaseController
     {
         $data = $this->misc->getDatabaseAccessor();
 
-        if (!isset($_POST['domname'])) {
-            $_POST['domname'] = '';
-        }
+        $this->coalesceArr($_POST, 'domname', '');
 
-        if (!isset($_POST['domtype'])) {
-            $_POST['domtype'] = '';
-        }
+        $this->coalesceArr($_POST, 'domtype', '');
 
-        if (!isset($_POST['domlength'])) {
-            $_POST['domlength'] = '';
-        }
+        $this->coalesceArr($_POST, 'domlength', '');
 
-        if (!isset($_POST['domarray'])) {
-            $_POST['domarray'] = '';
-        }
+        $this->coalesceArr($_POST, 'domarray', '');
 
-        if (!isset($_POST['domdefault'])) {
-            $_POST['domdefault'] = '';
-        }
+        $this->coalesceArr($_POST, 'domdefault', '');
 
-        if (!isset($_POST['domcheck'])) {
-            $_POST['domcheck'] = '';
-        }
+        $this->coalesceArr($_POST, 'domcheck', '');
 
         $types = $data->getTypes(true);
 
@@ -615,7 +599,7 @@ class DomainsController extends BaseController
         $this->printTitle($this->lang['strcreatedomain'], 'pg.domain.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.\SUBFOLDER."/src/views/domains\" method=\"post\">\n";
+        echo '<form action="' . \SUBFOLDER . "/src/views/domains\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr><th class=\"data left required\" style=\"width: 70px\">{$this->lang['strname']}</th>\n";
         echo "<td class=\"data1\"><input name=\"domname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -667,9 +651,7 @@ class DomainsController extends BaseController
     {
         $data = $this->misc->getDatabaseAccessor();
 
-        if (!isset($_POST['domcheck'])) {
-            $_POST['domcheck'] = '';
-        }
+        $this->coalesceArr($_POST, 'domcheck', '');
 
         // Check that they've given a name and a definition
         if ('' == $_POST['domname']) {