fixing coding issues

1 files changed, 40 insertions, 40 deletions

diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php
index 25bd77e2..f55999b9 100644
--- a/src/controllers/MaterializedviewsController.php
+++ b/src/controllers/MaterializedviewsController.php
@@ -9,14 +9,14 @@ use \PHPPgAdmin\Decorators\Decorator;
  */
 class MaterializedviewsController extends BaseController
 {
-    public $script      = 'materializedviews.php';
-    public $_name       = 'MaterializedviewsController';
-    public $table_place = 'matviews-matviews';
+    public $script          = 'materializedviews.php';
+    public $controller_name = 'MaterializedviewsController';
+    public $table_place     = 'matviews-matviews';
 
     public function render()
     {
-        $conf   = $this->conf;
-        $misc   = $this->misc;
+        $conf = $this->conf;
+
         $lang   = $this->lang;
         $action = $this->action;
 
@@ -26,7 +26,7 @@ class MaterializedviewsController extends BaseController
             return $this->doSubTree();
         }
 
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         $this->printHeader('M ' . $lang['strviews']);
         $this->printBody();
@@ -98,9 +98,9 @@ class MaterializedviewsController extends BaseController
     public function doDefault($msg = '')
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         $this->printTrail('schema');
         $this->printTabs('schema', 'matviews');
@@ -113,7 +113,7 @@ class MaterializedviewsController extends BaseController
             'matview' => [
                 'title' => 'M ' . $lang['strview'],
                 'field' => Decorator::field('relname'),
-                'url'   => SUBFOLDER . "/redirect/matview?{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/matview?{$this->misc->href}&",
                 'vars'  => ['matview' => 'relname'],
             ],
             'owner'   => [
@@ -164,7 +164,7 @@ class MaterializedviewsController extends BaseController
             // Insert is possible if the relevant rule for the view has been created.
             //            'insert' => array(
             //                'title'    => $lang['strinsert'],
-            //                'url'    => "materializedviews.php?action=confinsertrow&{$misc->href}&",
+            //                'url'    => "materializedviews.php?action=confinsertrow&{$this->misc->href}&",
             //                'vars'    => array('view' => 'relname'),
             //            ),
 
@@ -236,13 +236,13 @@ class MaterializedviewsController extends BaseController
     public function doTree()
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         $matviews = $data->getMaterializedViews();
 
-        $reqvars = $misc->getRequestVars('matview');
+        $reqvars = $this->misc->getRequestVars('matview');
 
         $attrs = [
             'text'       => Decorator::field('relname'),
@@ -259,13 +259,13 @@ class MaterializedviewsController extends BaseController
     public function doSubTree()
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
-        $tabs    = $misc->getNavTabs('matview');
+        $tabs    = $this->misc->getNavTabs('matview');
         $items   = $this->adjustTabsForTree($tabs);
-        $reqvars = $misc->getRequestVars('matview');
+        $reqvars = $this->misc->getRequestVars('matview');
 
         $attrs = [
             'text'   => Decorator::field('title'),
@@ -290,9 +290,9 @@ class MaterializedviewsController extends BaseController
     public function doSelectRows($confirm, $msg = '')
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         if ($confirm) {
             $this->printTrail('view');
@@ -344,8 +344,8 @@ class MaterializedviewsController extends BaseController
                     echo '<td style="white-space:nowrap;">';
                     echo '<input type="checkbox" name="show[', htmlspecialchars($attrs->fields['attname']), ']"',
                     isset($_REQUEST['show'][$attrs->fields['attname']]) ? ' checked="checked"' : '', ' /></td>';
-                    echo '<td style="white-space:nowrap;">', $misc->printVal($attrs->fields['attname']), '</td>';
-                    echo '<td style="white-space:nowrap;">', $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])), '</td>';
+                    echo '<td style="white-space:nowrap;">', $this->misc->printVal($attrs->fields['attname']), '</td>';
+                    echo '<td style="white-space:nowrap;">', $this->misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])), '</td>';
                     echo '<td style="white-space:nowrap;">';
                     echo "<select name=\"ops[{$attrs->fields['attname']}]\">\n";
                     foreach (array_keys($data->selectOps) as $v) {
@@ -369,7 +369,7 @@ class MaterializedviewsController extends BaseController
             echo "<p><input type=\"hidden\" name=\"action\" value=\"selectrows\" />\n";
             echo '<input type="hidden" name="view" value="', htmlspecialchars($_REQUEST['matview']), "\" />\n";
             echo "<input type=\"hidden\" name=\"subject\" value=\"view\" />\n";
-            echo $misc->form;
+            echo $this->misc->form;
             echo "<input type=\"submit\" name=\"select\" accesskey=\"r\" value=\"{$lang['strselect']}\" />\n";
             echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
             echo "</form>\n";
@@ -419,9 +419,9 @@ class MaterializedviewsController extends BaseController
     public function doDrop($confirm)
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         if (empty($_REQUEST['matview']) && empty($_REQUEST['ma'])) {
             return $this->doDefault($lang['strspecifyviewtodrop']);
@@ -437,17 +437,17 @@ class MaterializedviewsController extends BaseController
             if (isset($_REQUEST['ma'])) {
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
-                    echo '<p>', sprintf($lang['strconfdropview'], $misc->printVal($a['view'])), "</p>\n";
+                    echo '<p>', sprintf($lang['strconfdropview'], $this->misc->printVal($a['view'])), "</p>\n";
                     echo '<input type="hidden" name="view[]" value="', htmlspecialchars($a['view']), "\" />\n";
                 }
             } else {
-                echo '<p>', sprintf($lang['strconfdropview'], $misc->printVal($_REQUEST['matview'])), "</p>\n";
+                echo '<p>', sprintf($lang['strconfdropview'], $this->misc->printVal($_REQUEST['matview'])), "</p>\n";
                 echo '<input type="hidden" name="view" value="', htmlspecialchars($_REQUEST['matview']), "\" />\n";
             }
 
             echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
 
-            echo $misc->form;
+            echo $this->misc->form;
             echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
             echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
             echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
@@ -493,9 +493,9 @@ class MaterializedviewsController extends BaseController
     public function doSetParamsCreate($msg = '')
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         // Check that they've chosen tables for the view definition
         if (!isset($_POST['formTables'])) {
@@ -632,7 +632,7 @@ class MaterializedviewsController extends BaseController
                 echo '<input type="hidden" name="formTables[]" value="' . htmlspecialchars(serialize($curTable)) . "\" />\n";
             }
 
-            echo $misc->form;
+            echo $this->misc->form;
             echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
             echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
             echo "</form>\n";
@@ -645,9 +645,9 @@ class MaterializedviewsController extends BaseController
     public function doWizardCreate($msg = '')
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         $tables = $data->getTables(true);
 
@@ -673,7 +673,7 @@ class MaterializedviewsController extends BaseController
         echo "</td>\n</tr>\n";
         echo "</table>\n";
         echo "<p><input type=\"hidden\" name=\"action\" value=\"set_params_create\" />\n";
-        echo $misc->form;
+        echo $this->misc->form;
         echo "<input type=\"submit\" value=\"{$lang['strnext']}\" />\n";
         echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
         echo "</form>\n";
@@ -685,9 +685,9 @@ class MaterializedviewsController extends BaseController
     public function doCreate($msg = '')
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         if (!isset($_REQUEST['formView'])) {
             $_REQUEST['formView'] = '';
@@ -721,7 +721,7 @@ class MaterializedviewsController extends BaseController
         htmlspecialchars($_REQUEST['formComment']), "</textarea></td>\n\t</tr>\n";
         echo "</table>\n";
         echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create\" />\n";
-        echo $misc->form;
+        echo $this->misc->form;
         echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
         echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
         echo "</form>\n";
@@ -733,9 +733,9 @@ class MaterializedviewsController extends BaseController
     public function doSaveCreate()
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         // Check that they've given a name and a definition
         if ($_POST['formView'] == '') {
@@ -759,9 +759,9 @@ class MaterializedviewsController extends BaseController
     public function doSaveCreateWiz()
     {
         $conf = $this->conf;
-        $misc = $this->misc;
+
         $lang = $this->lang;
-        $data = $misc->getDatabaseAccessor();
+        $data = $this->misc->getDatabaseAccessor();
 
         // Check that they've given a name and fields they want to select