uses coalesceArr

1 files changed, 11 insertions, 25 deletions

diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php
index d8fb0fe7..9a0fc0a9 100644
--- a/src/controllers/MaterializedviewpropertiesController.php
+++ b/src/controllers/MaterializedviewpropertiesController.php
@@ -117,7 +117,7 @@ class MaterializedviewpropertiesController extends BaseController
     public function doRefresh()
     {
         $data = $this->misc->getDatabaseAccessor();
-        $sql  = 'REFRESH MATERIALIZED VIEW '.$_REQUEST[$this->subject];
+        $sql  = 'REFRESH MATERIALIZED VIEW ' . $_REQUEST[$this->subject];
         $this->prtrace($sql);
         $status = $data->execute($sql);
 
@@ -149,7 +149,7 @@ class MaterializedviewpropertiesController extends BaseController
                 $_POST['formComment']    = $viewdata->fields['relcomment'];
             }
 
-            echo '<form action="'.\SUBFOLDER."/src/views/materializedviewproperties\" method=\"post\">\n";
+            echo '<form action="' . \SUBFOLDER . "/src/views/materializedviewproperties\" method=\"post\">\n";
             echo "<table style=\"width: 100%\">\n";
             echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strdefinition']}</th>\n";
             echo "\t\t<td class=\"data1\"><textarea style=\"width: 100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\">",
@@ -178,9 +178,7 @@ class MaterializedviewpropertiesController extends BaseController
     {
         $data = $this->misc->getDatabaseAccessor();
 
-        if (!isset($_REQUEST['stage'])) {
-            $_REQUEST['stage'] = 1;
-        }
+        $this->coalesceArr($_REQUEST, 'stage', 1);
 
         switch ($_REQUEST['stage']) {
             case 1:
@@ -189,7 +187,7 @@ class MaterializedviewpropertiesController extends BaseController
                 $this->printTitle($this->lang['stralter'], 'pg.column.alter');
                 $this->printMsg($msg);
 
-                echo '<form action="'.\SUBFOLDER."/src/views/materializedviewproperties\" method=\"post\">\n";
+                echo '<form action="' . \SUBFOLDER . "/src/views/materializedviewproperties\" method=\"post\">\n";
 
                 // Output matview header
                 echo "<table>\n";
@@ -278,23 +276,15 @@ class MaterializedviewpropertiesController extends BaseController
             $matview = $data->getView($_REQUEST[$this->subject]);
 
             if ($matview->recordCount() > 0) {
-                if (!isset($_POST['name'])) {
-                    $_POST['name'] = $matview->fields['relname'];
-                }
+                $this->coalesceArr($_POST, 'name', $matview->fields['relname']);
 
-                if (!isset($_POST['owner'])) {
-                    $_POST['owner'] = $matview->fields['relowner'];
-                }
+                $this->coalesceArr($_POST, 'owner', $matview->fields['relowner']);
 
-                if (!isset($_POST['newschema'])) {
-                    $_POST['newschema'] = $matview->fields['nspname'];
-                }
+                $this->coalesceArr($_POST, 'newschema', $matview->fields['nspname']);
 
-                if (!isset($_POST['comment'])) {
-                    $_POST['comment'] = $matview->fields['relcomment'];
-                }
+                $this->coalesceArr($_POST, 'comment', $matview->fields['relcomment']);
 
-                echo '<form action="'.\SUBFOLDER."/src/views/materializedviewproperties\" method=\"post\">\n";
+                echo '<form action="' . \SUBFOLDER . "/src/views/materializedviewproperties\" method=\"post\">\n";
                 echo "<table>\n";
                 echo "<tr><th class=\"data left required\">{$this->lang['strname']}</th>\n";
                 echo '<td class="data1">';
@@ -345,13 +335,9 @@ class MaterializedviewpropertiesController extends BaseController
             }
         } else {
             // For databases that don't allow owner change
-            if (!isset($_POST['owner'])) {
-                $_POST['owner'] = '';
-            }
+            $this->coalesceArr($_POST, 'owner', '');
 
-            if (!isset($_POST['newschema'])) {
-                $_POST['newschema'] = null;
-            }
+            $this->coalesceArr($_POST, 'newschema', null);
 
             $status = $data->alterView($_POST[$this->subject], $_POST['name'], $_POST['owner'], $_POST['newschema'], $_POST['comment']);
             if (0 == $status) {