move form methods to the viewmanager

4 files changed, 16 insertions, 16 deletions

diff --git a/src/traits/AdminTrait.php b/src/traits/AdminTrait.php
index 2fc5b033..9fb02cfb 100644
--- a/src/traits/AdminTrait.php
+++ b/src/traits/AdminTrait.php
@@ -57,7 +57,7 @@ trait AdminTrait
         }
         echo '<input type="hidden" name="action" value="cluster" />' . \PHP_EOL;
 
-        echo $this->misc->form;
+        echo $this->view->form;
 
         echo "<input type=\"submit\" name=\"cluster\" value=\"{$this->lang['strcluster']}\" />\n"; //TODO
         echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL;
@@ -113,7 +113,7 @@ trait AdminTrait
             echo "<p><input type=\"checkbox\" id=\"reindex_force\" name=\"reindex_force\" /><label for=\"reindex_force\">{$this->lang['strforce']}</label></p>" . \PHP_EOL;
         }
 
-        echo $this->misc->form;
+        echo $this->view->form;
 
         echo "<input type=\"submit\" name=\"reindex\" value=\"{$this->lang['strreindex']}\" />\n"; //TODO
         echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL;
@@ -164,7 +164,7 @@ trait AdminTrait
             }
         }
         echo '<input type="hidden" name="action" value="analyze" />' . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
 
         echo "<input type=\"submit\" name=\"analyze\" value=\"{$this->lang['stranalyze']}\" />\n"; //TODO
         echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL;
@@ -213,7 +213,7 @@ trait AdminTrait
             }
         }
         echo '<input type="hidden" name="action" value="vacuum" />' . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
         echo "<p><input type=\"checkbox\" id=\"vacuum_full\" name=\"vacuum_full\" /> <label for=\"vacuum_full\">{$this->lang['strfull']}</label></p>" . \PHP_EOL;
         echo "<p><input type=\"checkbox\" id=\"vacuum_analyze\" name=\"vacuum_analyze\" /> <label for=\"vacuum_analyze\">{$this->lang['stranalyze']}</label></p>" . \PHP_EOL;
         echo "<p><input type=\"checkbox\" id=\"vacuum_freeze\" name=\"vacuum_freeze\" /> <label for=\"vacuum_freeze\">{$this->lang['strfreeze']}</label></p>" . \PHP_EOL;
@@ -287,7 +287,7 @@ trait AdminTrait
         }
 
         echo '<form action="' . self::SUBFOLDER . "/src/views/{$script}\" method=\"post\">" . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
         echo '<input type="hidden" name="action" value="editautovac" />' . \PHP_EOL;
         echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL;
 
@@ -351,7 +351,7 @@ trait AdminTrait
 
         echo "<form style=\"float: left\" action=\"{$script}\" method=\"post\">" . \PHP_EOL;
         echo '<input type="hidden" name="action" value="delautovac" />' . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
         echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL;
         echo '<input type="hidden" name="rel" value="', \htmlspecialchars(\serialize([$_REQUEST['schema'], $_REQUEST['table']])), '" />' . \PHP_EOL;
         echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . \PHP_EOL;
@@ -664,7 +664,7 @@ trait AdminTrait
         echo '<form action="' . self::SUBFOLDER . "/src/views/{$script}\" method=\"post\">" . \PHP_EOL;
 
         echo '<p><input type="hidden" name="action" value="confirm_vacuum" />' . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
         echo $table_hidden_inputs;
         echo "<input type=\"submit\" value=\"{$this->lang['strvacuum']}\" /></p>" . \PHP_EOL;
         echo '</form>' . \PHP_EOL;
@@ -674,7 +674,7 @@ trait AdminTrait
         echo '<td style="text-align: center; vertical-align: bottom">' . \PHP_EOL;
         echo '<form action="' . self::SUBFOLDER . "/src/views/{$script}\" method=\"post\">" . \PHP_EOL;
         echo '<p><input type="hidden" name="action" value="confirm_analyze" />' . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
         echo $table_hidden_inputs;
         echo "<input type=\"submit\" value=\"{$this->lang['stranalyze']}\" /></p>" . \PHP_EOL;
         echo '</form>' . \PHP_EOL;
@@ -687,7 +687,7 @@ trait AdminTrait
         echo '<td style="text-align: center; vertical-align: bottom">' . \PHP_EOL;
         echo '<form action="' . self::SUBFOLDER . "/src/views/{$script}\" method=\"post\">" . \PHP_EOL;
         echo '<p><input type="hidden" name="action" value="confirm_reindex" />' . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
         echo $table_hidden_inputs;
         echo "<input type=\"submit\" value=\"{$this->lang['strreindex']}\" /></p>" . \PHP_EOL;
         echo '</form>' . \PHP_EOL;
@@ -808,7 +808,7 @@ trait AdminTrait
         $disabled = '';
         $reclusterconf = '<td style="text-align: center; vertical-align: bottom">' . \PHP_EOL;
         $reclusterconf .= '<form action="' . self::SUBFOLDER . "/src/views/{$script}\" method=\"post\">" . \PHP_EOL;
-        $reclusterconf .= $this->misc->form;
+        $reclusterconf .= $this->view->form;
         $reclusterconf .= $table_hidden_inputs;
 
         if ('table' === $type && !$data->alreadyClustered($_REQUEST['object'])) {
diff --git a/src/traits/ExportTrait.php b/src/traits/ExportTrait.php
index ad8bbb11..803bb58b 100644
--- a/src/traits/ExportTrait.php
+++ b/src/traits/ExportTrait.php
@@ -202,7 +202,7 @@ trait ExportTrait
     {
         $content = '<p><input type="hidden" name="action" value="export" />' . \PHP_EOL;
 
-        $content .= $this->misc->form;
+        $content .= $this->view->form;
         $content .= \sprintf(
             '<input type="hidden" name="subject" value="%s" />%s',
             $subject,
diff --git a/src/traits/FormTrait.php b/src/traits/FormTrait.php
index dfcd12b1..b6089083 100644
--- a/src/traits/FormTrait.php
+++ b/src/traits/FormTrait.php
@@ -23,7 +23,7 @@ trait FormTrait
      */
     public function getActionTableAndButtons($action, $table, $add, $cancel)
     {
-        $content = $this->misc->form;
+        $content = $this->view->form;
         $content .= \sprintf('<input type="hidden" name="action" value="%s" />%s', $action, \PHP_EOL);
         $content .= \sprintf('<input type="hidden" name="table" value="%s" />%s', $table, \PHP_EOL);
         $content .= \sprintf('<input type="submit" value="%s" />%s', $add, \PHP_EOL);
@@ -41,7 +41,7 @@ trait FormTrait
      */
     public function getFormInputsAndButtons($inputs, $buttons, $cheboxes = [])
     {
-        $content = $this->misc->form;
+        $content = $this->view->form;
 
         foreach ($cheboxes as $checkbox) {
             $content .= \sprintf('<p>%s', \PHP_EOL);
diff --git a/src/traits/ViewsMatviewsTrait.php b/src/traits/ViewsMatviewsTrait.php
index ca93a1d5..df5e36a1 100644
--- a/src/traits/ViewsMatviewsTrait.php
+++ b/src/traits/ViewsMatviewsTrait.php
@@ -137,7 +137,7 @@ trait ViewsMatviewsTrait
             echo '<p><input type="hidden" name="action" value="selectrows" />' . \PHP_EOL;
             echo '<input type="hidden" name="view" value="', \htmlspecialchars($_REQUEST[$this->keystring]), '" />' . \PHP_EOL;
             echo '<input type="hidden" name="subject" value="view" />' . \PHP_EOL;
-            echo $this->misc->form;
+            echo $this->view->form;
             echo "<input type=\"submit\" name=\"select\" accesskey=\"r\" value=\"{$this->lang['strselect']}\" />" . \PHP_EOL;
             echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL;
             echo '</form>' . \PHP_EOL;
@@ -204,7 +204,7 @@ trait ViewsMatviewsTrait
         echo "</td>\n</tr>" . \PHP_EOL;
         echo '</table>' . \PHP_EOL;
         echo '<p><input type="hidden" name="action" value="set_params_create" />' . \PHP_EOL;
-        echo $this->misc->form;
+        echo $this->view->form;
         echo "<input type=\"submit\" value=\"{$this->lang['strnext']}\" />" . \PHP_EOL;
         echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL;
         echo '</form>' . \PHP_EOL;
@@ -460,7 +460,7 @@ trait ViewsMatviewsTrait
             echo '<input type="hidden" name="formTables[]" value="' . \htmlspecialchars(\serialize($curTable)) . '" />' . \PHP_EOL;
         }
 
-        echo $this->misc->form;
+        echo $this->view->form;
         echo "<input type=\"submit\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL;
         echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL;
         echo '</form>' . \PHP_EOL;