diff options
| author | ffflabs <amenadiel@gmail.com> | 2020-08-31 10:36:10 +0300 |
|---|---|---|
| committer | ffflabs <amenadiel@gmail.com> | 2020-08-31 10:36:10 +0300 |
| commit | b56d61eea3fd4018c235c5da9e222da0af5031a2 (patch) | |
| tree | 528a0b98360ee917a098efede065de16dd1ff77f | |
| parent | 8fbb9f08cadd108a58156ad193eff8347cd76d6d (diff) | |
move form methods to the viewmanager
29 files changed, 168 insertions, 166 deletions
diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php index cc89bf1a..8a27394e 100644 --- a/src/controllers/AggregatesController.php +++ b/src/controllers/AggregatesController.php @@ -305,7 +305,7 @@ class AggregatesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \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; @@ -378,7 +378,7 @@ class AggregatesController extends BaseController \htmlspecialchars($aggrdata->fields['aggrcomment']), "</textarea></td>\n\t</tr>" . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_alter" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="aggrname" value="', \htmlspecialchars($_REQUEST['aggrname']), '" />' . \PHP_EOL; echo '<input type="hidden" name="aggrtype" value="', \htmlspecialchars($_REQUEST['aggrtype']), '" />' . \PHP_EOL; echo '<input type="hidden" name="aggrowner" value="', \htmlspecialchars($aggrdata->fields['usename']), '" />' . \PHP_EOL; @@ -413,7 +413,7 @@ class AggregatesController extends BaseController echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="aggrname" value="', \htmlspecialchars($_REQUEST['aggrname']), '" />' . \PHP_EOL; echo '<input type="hidden" name="aggrtype" value="', \htmlspecialchars($_REQUEST['aggrtype']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php index 5aae9e69..bb08a67f 100644 --- a/src/controllers/AlldbController.php +++ b/src/controllers/AlldbController.php @@ -303,7 +303,7 @@ class AlldbController extends BaseController } echo '</table>' . \PHP_EOL; echo '<input type="hidden" name="action" value="alter" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="oldname" value="', \htmlspecialchars($_REQUEST['alterdatabase']), '" />' . \PHP_EOL; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; @@ -355,7 +355,8 @@ class AlldbController extends BaseController } echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; - echo $this->misc->form; + + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo "</form>\n"; // END confirm @@ -495,7 +496,7 @@ class AlldbController extends BaseController ('' === $_POST['formSpc']) ? ' selected="selected"' : '', '></option>' . \PHP_EOL; // Display all other tablespaces while (!$tablespaces->EOF) { - $spcname = \htmlspecialchars($tablespaces->fields['spcname']); + $spcname = \htmlspecialchars($tablespaces->fields['spcname']??''); echo "\t\t\t\t<option value=\"{$spcname}\"", ($spcname === $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>" . \PHP_EOL; $tablespaces->moveNext(); @@ -512,7 +513,7 @@ class AlldbController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \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; diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index 8a03ea5a..71b80c00 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -62,7 +62,7 @@ class BaseController public $controller_title = 'base'; public $msg = ''; - +/** @var \PHPPgAdmin\ViewManager */ public $view; public $misc; diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php index e7bb059a..ff052147 100644 --- a/src/controllers/ColpropertiesController.php +++ b/src/controllers/ColpropertiesController.php @@ -336,7 +336,7 @@ class ColpropertiesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="properties" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="2" />' . \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="column" value="', \htmlspecialchars($_REQUEST['column']), '" />' . \PHP_EOL; echo '<input type="hidden" name="olddefault" value="', \htmlspecialchars($_REQUEST['olddefault']), '" />' . \PHP_EOL; diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php index 0f61acf9..02a30949 100644 --- a/src/controllers/DatabaseController.php +++ b/src/controllers/DatabaseController.php @@ -214,7 +214,7 @@ class DatabaseController extends BaseController echo '</select>' . \PHP_EOL; echo "<input type=\"submit\" value=\"{$this->lang['strfind']}\" />" . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="action" value="find" /></p>' . \PHP_EOL; echo '<input type="hidden" name="confirm" value="true" /></p>' . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -564,7 +564,7 @@ class DatabaseController extends BaseController echo '<p><input type="checkbox" id="paginate" name="paginate"', (isset($_REQUEST['paginate']) ? ' checked="checked"' : ''), " /><label for=\"paginate\">{$this->lang['strpaginate']}</label></p>" . \PHP_EOL; echo "<p><input type=\"submit\" name=\"execute\" accesskey=\"r\" value=\"{$this->lang['strexecute']}\" />" . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"reset\" accesskey=\"q\" value=\"{$this->lang['strreset']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php index 93f40eaf..ff314475 100644 --- a/src/controllers/DataexportController.php +++ b/src/controllers/DataexportController.php @@ -144,7 +144,7 @@ class DataexportController extends BaseController if (isset($_REQUEST['search_path'])) { echo '<input type="hidden" name="search_path" value="', \htmlspecialchars($_REQUEST['search_path']), '" />' . \PHP_EOL; } - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" value=\"{$this->lang['strexport']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index d8b6ec6f..19a7dc1b 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -240,7 +240,7 @@ class DisplayController extends BaseController //die(htmlspecialchars($query)); echo '<form method="post" id="sqlform" action="' . $_SERVER['REQUEST_URI'] . '">'; - echo $this->misc->form; + echo $this->view->form; if ($object) { echo '<input type="hidden" name="' . $subject . '" value="', \htmlspecialchars($object), '" />' . \PHP_EOL; @@ -711,7 +711,7 @@ class DisplayController extends BaseController } echo '<input type="hidden" name="action" value="editrow" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo isset($_REQUEST['table']) ? \sprintf('<input type="hidden" name="table" value="%s" />%s', \htmlspecialchars($_REQUEST['table']), \PHP_EOL) : ''; echo isset($_REQUEST['subject']) ? \sprintf('<input type="hidden" name="subject" value="%s" />%s', \htmlspecialchars($_REQUEST['subject']), \PHP_EOL) : ''; @@ -798,7 +798,7 @@ class DisplayController extends BaseController $resultset = $data->browseRow($_REQUEST['table'], $_REQUEST['key']); echo '<form action="' . self::SUBFOLDER . '/src/views/display" method="post">' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; if (1 === $resultset->recordCount()) { echo "<p>{$this->lang['strconfdeleterow']}</p>" . \PHP_EOL; diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index 0dc7e8f2..42f13898 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -308,7 +308,7 @@ class DomainsController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_alter" />' . \PHP_EOL; echo '<input type="hidden" name="domain" value="', \htmlspecialchars($_REQUEST['domain']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -350,7 +350,7 @@ class DomainsController extends BaseController echo '<p><input type="hidden" name="action" value="save_add_check" />' . \PHP_EOL; echo '<input type="hidden" name="domain" value="', \htmlspecialchars($_REQUEST['domain']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"add\" value=\"{$this->lang['stradd']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -397,7 +397,7 @@ class DomainsController extends BaseController echo '<input type="hidden" name="action" value="drop_con" />' . \PHP_EOL; echo '<input type="hidden" name="domain" value="', \htmlspecialchars($_REQUEST['domain']), '" />' . \PHP_EOL; echo '<input type="hidden" name="constraint" value="', \htmlspecialchars($_REQUEST['constraint']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; @@ -564,7 +564,7 @@ class DomainsController extends BaseController echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /><label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="domain" value="', \htmlspecialchars($_REQUEST['domain']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -647,7 +647,7 @@ class DomainsController extends BaseController } echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \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; diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php index 157f98bb..3399d97b 100644 --- a/src/controllers/FulltextController.php +++ b/src/controllers/FulltextController.php @@ -313,7 +313,7 @@ class FulltextController extends BaseController echo '<p><input type="hidden" name="action" value="dropconfig" />' . \PHP_EOL; echo '<input type="hidden" name="database" value="', \htmlspecialchars($_REQUEST['database']), '" />' . \PHP_EOL; echo '<input type="hidden" name="ftscfg" value="', \htmlspecialchars($_REQUEST['ftscfg']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -346,7 +346,7 @@ class FulltextController extends BaseController echo '<input type="hidden" name="ftsdict" value="', \htmlspecialchars($_REQUEST['ftsdict']), '" />' . \PHP_EOL; //echo "<input type=\"hidden\" name=\"ftscfg\" value=\"", htmlspecialchars($_REQUEST['ftscfg']), "\" />".PHP_EOL; echo '<input type="hidden" name="prev_action" value="viewdicts" /></p>' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -454,7 +454,7 @@ class FulltextController extends BaseController echo '<p>' . \PHP_EOL; echo '<input type="hidden" name="action" value="createconfig" />' . \PHP_EOL; echo '<input type="hidden" name="database" value="', \htmlspecialchars($_REQUEST['database']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"create\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo '</p>' . \PHP_EOL; @@ -550,7 +550,7 @@ class FulltextController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="alterconfig" />' . \PHP_EOL; echo '<input type="hidden" name="ftscfg" value="', \htmlspecialchars($_POST['ftscfg']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -880,7 +880,7 @@ class FulltextController extends BaseController echo '<p>' . \PHP_EOL; echo '<input type="hidden" name="action" value="createdict" />' . \PHP_EOL; echo '<input type="hidden" name="database" value="', \htmlspecialchars($_REQUEST['database']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"create\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo '</p>' . \PHP_EOL; @@ -986,7 +986,7 @@ class FulltextController extends BaseController echo '<p><input type="hidden" name="action" value="alterdict" />' . \PHP_EOL; echo '<input type="hidden" name="ftsdict" value="', \htmlspecialchars($_POST['ftsdict']), '" />' . \PHP_EOL; echo '<input type="hidden" name="prev_action" value="viewdicts" /></p>' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -1053,7 +1053,7 @@ class FulltextController extends BaseController echo "<input type=\"hidden\" name=\"ftscfg\" value=\"{$_REQUEST['ftscfg']}\" />" . \PHP_EOL; echo '<input type="hidden" name="action" value="dropmapping" />' . \PHP_EOL; echo '<input type="hidden" name="prev_action" value="viewconfig" /></p>' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -1149,7 +1149,7 @@ class FulltextController extends BaseController echo '<input type="hidden" name="ftscfg" value="', \htmlspecialchars($_POST['ftscfg']), '" />' . \PHP_EOL; echo '<input type="hidden" name="prev_action" value="viewconfig" /></p>' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -1236,7 +1236,7 @@ class FulltextController extends BaseController echo '<p><input type="hidden" name="action" value="addmapping" />' . \PHP_EOL; echo '<input type="hidden" name="ftscfg" value="', \htmlspecialchars($_POST['ftscfg']), '" />' . \PHP_EOL; echo '<input type="hidden" name="prev_action" value="viewconfig" /></p>' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"add\" value=\"{$this->lang['stradd']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index 891ad444..9be53647 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -467,7 +467,7 @@ class FunctionsController extends BaseController echo '<p><input type="hidden" name="action" value="save_edit" />' . \PHP_EOL; echo '<input type="hidden" name="function" value="', \htmlspecialchars($_REQUEST['function']), '" />' . \PHP_EOL; echo '<input type="hidden" name="function_oid" value="', \htmlspecialchars($_REQUEST['function_oid']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -661,7 +661,7 @@ class FunctionsController extends BaseController echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /><label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; @@ -964,7 +964,7 @@ class FunctionsController extends BaseController echo '</tbody></table>' . \PHP_EOL; echo $szJSTRArg; echo '<p><input type="hidden" name="action" value="save_create" />' . \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; diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php index b389aece..dbfe116e 100644 --- a/src/controllers/GroupsController.php +++ b/src/controllers/GroupsController.php @@ -181,7 +181,7 @@ class GroupsController extends BaseController echo '<p>', \sprintf($this->lang['strconfdropmember'], $this->misc->printVal($_REQUEST['user']), $this->misc->printVal($_REQUEST['group'])), '</p>' . \PHP_EOL; echo '<form action="' . self::SUBFOLDER . '/src/views/groups" method="post">' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="action" value="drop_member" />' . \PHP_EOL; echo '<input type="hidden" name="group" value="', \htmlspecialchars($_REQUEST['group']), '" />' . \PHP_EOL; echo '<input type="hidden" name="user" value="', \htmlspecialchars($_REQUEST['user']), '" />' . \PHP_EOL; @@ -259,7 +259,7 @@ class GroupsController extends BaseController } echo '</select>' . \PHP_EOL; echo "<input type=\"submit\" value=\"{$this->lang['straddmember']}\" />" . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="group" value="', \htmlspecialchars($_REQUEST['group']), '" />' . \PHP_EOL; echo '<input type="hidden" name="action" value="add_member" />' . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -293,7 +293,7 @@ class GroupsController extends BaseController echo '<p>', \sprintf($this->lang['strconfdropgroup'], $this->misc->printVal($_REQUEST['group'])), '</p>' . \PHP_EOL; echo '<form action="' . self::SUBFOLDER . '/src/views/groups" method="post">' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="group" value="', \htmlspecialchars($_REQUEST['group']), '" />' . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; @@ -330,7 +330,7 @@ class GroupsController extends BaseController $this->printMsg($msg); echo '<form action="" method="post">' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<table>' . \PHP_EOL; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>" . \PHP_EOL; echo "\t\t<td class=\"data\"><input size=\"32\" maxlength=\"{$data->_maxNameLen}\" name=\"name\" value=\"", \htmlspecialchars($_POST['name']), "\" /></td>\n\t</tr>" . \PHP_EOL; diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php index 6935b27f..f26d08b5 100644 --- a/src/controllers/HistoryController.php +++ b/src/controllers/HistoryController.php @@ -203,7 +203,7 @@ class HistoryController extends BaseController echo '<form action="' . self::SUBFOLDER . '/src/views/history" method="post">' . \PHP_EOL; echo '<input type="hidden" name="action" value="delhistory" />' . \PHP_EOL; echo "<input type=\"hidden\" name=\"queryid\" value=\"{$qid}\" />" . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -225,7 +225,7 @@ class HistoryController extends BaseController echo '<form action="' . self::SUBFOLDER . '/src/views/history" method="post">' . \PHP_EOL; echo '<input type="hidden" name="action" value="clearhistory" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php index 2b4aa54c..b65b6d16 100644 --- a/src/controllers/IndexesController.php +++ b/src/controllers/IndexesController.php @@ -274,7 +274,7 @@ class IndexesController extends BaseController echo '<input type="hidden" name="action" value="cluster_index" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($object), '" />' . \PHP_EOL; echo '<input type="hidden" name="index" value="', \htmlspecialchars($_REQUEST['index']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"cluster\" value=\"{$this->lang['strclusterindex']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -434,7 +434,7 @@ class IndexesController extends BaseController echo '</table>'; echo '<p><input type="hidden" name="action" value="save_create_index" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="subject" value="', \htmlspecialchars($subject), '" />' . \PHP_EOL; echo '<input type="hidden" name="' . $subject . '" value="', \htmlspecialchars($object), '" />' . \PHP_EOL; echo "<input type=\"submit\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; @@ -507,7 +507,7 @@ class IndexesController extends BaseController echo '<input type="hidden" name="action" value="drop_index" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($object), '" />' . \PHP_EOL; echo '<input type="hidden" name="index" value="', \htmlspecialchars($this->getRequestParam('index')), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<p><input type="checkbox" id="cascade" name="cascade" value="1" />'; echo '<label for="cascade">' . $this->lang['strcascade'] . '</label></p>' . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php index c55a18ab..6e2ff20c 100644 --- a/src/controllers/MaterializedviewpropertiesController.php +++ b/src/controllers/MaterializedviewpropertiesController.php @@ -161,7 +161,7 @@ class MaterializedviewpropertiesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_edit" />' . \PHP_EOL; echo '<input type="hidden" name="matview" value="', \htmlspecialchars($_REQUEST[$this->subject]), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -214,7 +214,7 @@ class MaterializedviewpropertiesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="properties" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="2" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="matview" value="', \htmlspecialchars($_REQUEST[$this->subject]), '" />' . \PHP_EOL; echo '<input type="hidden" name="column" value="', \htmlspecialchars($_REQUEST['column']), '" />' . \PHP_EOL; echo '<input type="hidden" name="olddefault" value="', \htmlspecialchars($_REQUEST['olddefault']), '" />' . \PHP_EOL; @@ -329,7 +329,7 @@ class MaterializedviewpropertiesController extends BaseController echo '</table>' . \PHP_EOL; echo '<input type="hidden" name="action" value="alter" />' . \PHP_EOL; echo '<input type="hidden" name="matview" value="', \htmlspecialchars($_REQUEST[$this->subject]), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php index f63c231f..3cbb7ffd 100644 --- a/src/controllers/MaterializedviewsController.php +++ b/src/controllers/MaterializedviewsController.php @@ -297,7 +297,7 @@ class MaterializedviewsController extends BaseController echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; @@ -416,7 +416,7 @@ class MaterializedviewsController extends BaseController \htmlspecialchars($_REQUEST['formComment']), "</textarea></td>\n\t</tr>" . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \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; diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php index ab5a546f..0ce1a773 100644 --- a/src/controllers/OperatorsController.php +++ b/src/controllers/OperatorsController.php @@ -261,7 +261,7 @@ class OperatorsController extends BaseController echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="operator" value="', \htmlspecialchars($_REQUEST['operator']), '" />' . \PHP_EOL; echo '<input type="hidden" name="operator_oid" value="', \htmlspecialchars($_REQUEST['operator_oid']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php index 8ae7814d..b2831d33 100644 --- a/src/controllers/PrivilegesController.php +++ b/src/controllers/PrivilegesController.php @@ -388,7 +388,7 @@ class PrivilegesController extends BaseController \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; } - echo $this->misc->form; + echo $this->view->form; echo \sprintf('<input type="submit" name="%s" value="%s" />%s', $mode, $this->lang['str' . $mode], \PHP_EOL); echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>"; diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php index 583a2e91..64ce51ab 100644 --- a/src/controllers/RolesController.php +++ b/src/controllers/RolesController.php @@ -315,7 +315,7 @@ class RolesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"create\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -481,7 +481,7 @@ class RolesController extends BaseController echo '<input type="hidden" name="memberofold" value="', $_POST['memberofold'] ?? \htmlspecialchars($memberofold), '" />' . \PHP_EOL; echo '<input type="hidden" name="membersold" value="', $_POST['membersold'] ?? \htmlspecialchars($membersold), '" />' . \PHP_EOL; echo '<input type="hidden" name="adminmembersold" value="', $_POST['adminmembersold'] ?? \htmlspecialchars($adminmembersold), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -538,7 +538,7 @@ class RolesController extends BaseController echo '<form action="' . self::SUBFOLDER . '/src/views/roles" method="post">' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="rolename" value="', \htmlspecialchars($_REQUEST['rolename']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -771,7 +771,7 @@ class RolesController extends BaseController echo "\t\t<td><input type=\"password\" name=\"confirm\" size=\"32\" value=\"\" /></td>\n\t</tr>" . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="changepassword" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"ok\" value=\"{$this->lang['strok']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo '</p></form>' . \PHP_EOL; diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php index c1f21758..c43abd83 100644 --- a/src/controllers/RulesController.php +++ b/src/controllers/RulesController.php @@ -202,7 +202,7 @@ class RulesController extends BaseController echo '<input type="hidden" name="subject" value="', \htmlspecialchars($_REQUEST['subject']), '" />' . \PHP_EOL; echo '<input type="hidden" name="', \htmlspecialchars($_REQUEST['subject']), '" value="', \htmlspecialchars($_REQUEST[$_REQUEST['subject']]), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"submit\" name=\"ok\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -254,7 +254,7 @@ class RulesController extends BaseController echo '<input type="hidden" name="', \htmlspecialchars($_REQUEST['reltype']), '" value="', \htmlspecialchars($_REQUEST[$_REQUEST['reltype']]), '" />' . \PHP_EOL; echo '<input type="hidden" name="rule" value="', \htmlspecialchars($_REQUEST['rule']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />" . \PHP_EOL; diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php index dd3a45a6..4268f088 100644 --- a/src/controllers/SchemasController.php +++ b/src/controllers/SchemasController.php @@ -304,7 +304,7 @@ class SchemasController extends BaseController echo '<p>' . \PHP_EOL; echo '<input type="hidden" name="action" value="create" />' . \PHP_EOL; echo '<input type="hidden" name="database" value="', \htmlspecialchars($_REQUEST['database']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"create\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo '</p>' . \PHP_EOL; @@ -392,7 +392,7 @@ class SchemasController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="alter" />' . \PHP_EOL; echo '<input type="hidden" name="schema" value="', \htmlspecialchars($_POST['schema']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -453,7 +453,7 @@ class SchemasController extends BaseController echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="database" value="', \htmlspecialchars($_REQUEST['database']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php index e6b48773..ce59c87c 100644 --- a/src/controllers/SequencesController.php +++ b/src/controllers/SequencesController.php @@ -125,17 +125,17 @@ class SequencesController extends BaseController 'sequence' => [ 'title' => $this->lang['strsequence'], 'field' => Decorator::field('seqname'), - 'url' => "sequences?action=properties&{$this->misc->href}&", - 'vars' => ['sequence' => 'seqname'], + 'url' => "sequences?action=properties&{$this->misc->href}&", + 'vars' => ['sequence' => 'seqname'], ], - 'owner' => [ + 'owner' => [ 'title' => $this->lang['strowner'], 'field' => Decorator::field('seqowner'), ], - 'actions' => [ + 'actions' => [ 'title' => $this->lang['stractions'], ], - 'comment' => [ + 'comment' => [ 'title' => $this->lang['strcomment'], 'field' => Decorator::field('seqcomment'), ], @@ -144,41 +144,41 @@ class SequencesController extends BaseController $actions = [ 'multiactions' => [ 'keycols' => ['sequence' => 'seqname'], - 'url' => 'sequences', + 'url' => 'sequences', ], - 'alter' => [ + 'alter' => [ 'content' => $this->lang['stralter'], - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'confirm_alter', - 'subject' => 'sequence', + 'action' => 'confirm_alter', + 'subject' => 'sequence', 'sequence' => Decorator::field('seqname'), ], ], ], ], - 'drop' => [ - 'content' => $this->lang['strdrop'], - 'attr' => [ + 'drop' => [ + 'content' => $this->lang['strdrop'], + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'confirm_drop', + 'action' => 'confirm_drop', 'sequence' => Decorator::field('seqname'), ], ], ], 'multiaction' => 'confirm_drop', ], - 'privileges' => [ + 'privileges' => [ 'content' => $this->lang['strprivileges'], - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'privileges', + 'url' => 'privileges', 'urlvars' => [ - 'subject' => 'sequence', + 'subject' => 'sequence', 'sequence' => Decorator::field('seqname'), ], ], @@ -189,14 +189,14 @@ class SequencesController extends BaseController echo $this->printTable($sequences, $columns, $actions, 'sequences-sequences', $this->lang['strnosequences']); $this->printNavLinks(['create' => [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'create', - 'server' => $_REQUEST['server'], + 'action' => 'create', + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], - 'schema' => $_REQUEST['schema'], + 'schema' => $_REQUEST['schema'], ], ], ], @@ -212,21 +212,22 @@ class SequencesController extends BaseController $data = $this->misc->getDatabaseAccessor(); $sequences = $data->getSequences(); - - $reqvars = $this->misc->getRequestVars('sequence'); - + $reqvars = $this->misc->getRequestVars('sequence'); + + $actionURL = Decorator::actionurl( + 'sequences', + $reqvars, + [ + 'action' => 'properties', + 'sequence' => Decorator::field('seqname'), + ] + ); + dump($sequences, $actionURL); $attrs = [ - 'text' => Decorator::field('seqname'), - 'icon' => 'Sequence', + 'text' => Decorator::field('seqname'), + 'icon' => 'Sequence', 'toolTip' => Decorator::field('seqcomment'), - 'action' => Decorator::actionurl( - 'sequences', - $reqvars, - [ - 'action' => 'properties', - 'sequence' => Decorator::field('seqname'), - ] - ), + 'action' => $actionURL, ]; return $this->printTree($sequences, $attrs, 'sequences'); @@ -288,30 +289,30 @@ class SequencesController extends BaseController echo '</table>'; $navlinks = [ - 'alter' => [ - 'attr' => [ + 'alter' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'confirm_alter', - 'server' => $_REQUEST['server'], + 'action' => 'confirm_alter', + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], - 'schema' => $_REQUEST['schema'], + 'schema' => $_REQUEST['schema'], 'sequence' => $sequence->fields['seqname'], ], ], ], 'content' => $this->lang['stralter'], ], - 'setval' => [ - 'attr' => [ + 'setval' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'confirm_setval', - 'server' => $_REQUEST['server'], + 'action' => 'confirm_setval', + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], - 'schema' => $_REQUEST['schema'], + 'schema' => $_REQUEST['schema'], 'sequence' => $sequence->fields['seqname'], ], ], @@ -319,14 +320,14 @@ class SequencesController extends BaseController 'content' => $this->lang['strsetval'], ], 'nextval' => [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'nextval', - 'server' => $_REQUEST['server'], + 'action' => 'nextval', + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], - 'schema' => $_REQUEST['schema'], + 'schema' => $_REQUEST['schema'], 'sequence' => $sequence->fields['seqname'], ], ], @@ -334,29 +335,29 @@ class SequencesController extends BaseController 'content' => $this->lang['strnextval'], ], 'restart' => [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'restart', - 'server' => $_REQUEST['server'], + 'action' => 'restart', + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], - 'schema' => $_REQUEST['schema'], + 'schema' => $_REQUEST['schema'], 'sequence' => $sequence->fields['seqname'], ], ], ], 'content' => $this->lang['strrestart'], ], - 'reset' => [ - 'attr' => [ + 'reset' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'action' => 'reset', - 'server' => $_REQUEST['server'], + 'action' => 'reset', + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], - 'schema' => $_REQUEST['schema'], + 'schema' => $_REQUEST['schema'], 'sequence' => $sequence->fields['seqname'], ], ], @@ -364,13 +365,13 @@ class SequencesController extends BaseController 'content' => $this->lang['strreset'], ], 'showall' => [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'sequences', + 'url' => 'sequences', 'urlvars' => [ - 'server' => $_REQUEST['server'], + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], - 'schema' => $_REQUEST['schema'], + 'schema' => $_REQUEST['schema'], ], ], ], @@ -423,13 +424,13 @@ class SequencesController extends BaseController echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; } else { if (\is_array($_POST['sequence'])) { - $msg = ''; + $msg = ''; $status = $data->beginTransaction(); if (0 === $status) { @@ -525,7 +526,7 @@ class SequencesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create_sequence" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"create\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -650,7 +651,7 @@ class SequencesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="setval" />' . \PHP_EOL; echo '<input type="hidden" name="sequence" value="', \htmlspecialchars($_REQUEST['sequence']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"setval\" value=\"{$this->lang['strsetval']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -825,7 +826,7 @@ class SequencesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="alter" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="sequence" value="', \htmlspecialchars($_REQUEST['sequence']), '" />' . \PHP_EOL; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php index 247bd238..e0054d8c 100644 --- a/src/controllers/TablesController.php +++ b/src/controllers/TablesController.php @@ -342,7 +342,7 @@ class TablesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="create" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="2" />' . \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; @@ -457,7 +457,7 @@ class TablesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="create" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="3" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="name" value="', \htmlspecialchars($_REQUEST['name']), '" />' . \PHP_EOL; echo '<input type="hidden" name="fields" value="', \htmlspecialchars($_REQUEST['fields']), '" />' . \PHP_EOL; @@ -630,7 +630,7 @@ class TablesController extends BaseController echo '</table>'; echo '<input type="hidden" name="action" value="confcreatelike" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><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; @@ -756,7 +756,7 @@ class TablesController extends BaseController echo '<p><input type="hidden" name="action" value="selectrows" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; echo '<input type="hidden" name="subject" value="table" />' . \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; @@ -944,7 +944,7 @@ class TablesController extends BaseController echo "<p>{$this->lang['strnofieldsforinsert']}</p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; } - echo $this->misc->form; + echo $this->view->form; echo '</form>' . \PHP_EOL; echo '<script src="' . self::SUBFOLDER . '/assets/js/insert_or_edit_row.js" type="text/javascript"></script>'; } @@ -1021,7 +1021,7 @@ class TablesController extends BaseController } echo "<input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label>"; echo '<input type="hidden" name="action" value="empty" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"empty\" value=\"{$this->lang['strempty']}\" /> <input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo "</form>\n"; // END if confirm } else { @@ -1097,7 +1097,7 @@ class TablesController extends BaseController } echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php index c1721492..532669bf 100644 --- a/src/controllers/TablespacesController.php +++ b/src/controllers/TablespacesController.php @@ -189,7 +189,7 @@ class TablespacesController extends BaseController $this->coalesceArr($_POST, 'comment', ($data->hasSharedComments()) ? $tablespace->fields['spccomment'] : ''); echo '<form action="' . self::SUBFOLDER . '/src/views/tablespaces" method="post">' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<table>' . \PHP_EOL; echo "<tr><th class=\"data left required\">{$this->lang['strname']}</th>" . \PHP_EOL; echo '<td class="data1">'; @@ -265,7 +265,7 @@ class TablespacesController extends BaseController echo '<p>', \sprintf($this->lang['strconfdroptablespace'], $this->misc->printVal($_REQUEST['tablespace'])), '</p>' . \PHP_EOL; echo '<form action="' . self::SUBFOLDER . '/src/views/tablespaces" method="post">' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="tablespace" value="', \htmlspecialchars($_REQUEST['tablespace']), '" />' . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; @@ -309,7 +309,7 @@ class TablespacesController extends BaseController $this->printMsg($msg); echo '<form action="' . self::SUBFOLDER . '/src/views/tablespaces" method="post">' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<table>' . \PHP_EOL; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>" . \PHP_EOL; echo "\t\t<td class=\"data1\"><input size=\"32\" name=\"formSpcname\" maxlength=\"{$data->_maxNameLen}\" value=\"", \htmlspecialchars($_POST['formSpcname']), "\" /></td>\n\t</tr>" . \PHP_EOL; diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php index 9a8ca6ae..919807bb 100644 --- a/src/controllers/TblpropertiesController.php +++ b/src/controllers/TblpropertiesController.php @@ -406,7 +406,7 @@ class TblpropertiesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="alter" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; - echo $misc->form; + echo $view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -480,7 +480,7 @@ class TblpropertiesController extends BaseController echo "<input type=\"file\" name=\"source\" /></td>\n\t</tr>" . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="import" />' . \PHP_EOL; - echo $misc->form; + echo $view->form; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; echo "<input type=\"submit\" value=\"{$this->lang['strimport']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -583,7 +583,7 @@ class TblpropertiesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="add_column" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="2" />' . \PHP_EOL; - echo $misc->form; + echo $view->form; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; if (!$data->hasCreateFieldWithConstraints()) { @@ -653,7 +653,7 @@ class TblpropertiesController extends BaseController echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; echo '<input type="hidden" name="column" value="', \htmlspecialchars($_REQUEST['column']), '" />' . \PHP_EOL; - echo $misc->form; + echo $view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\"> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php index 9a9c3145..abcbfc28 100644 --- a/src/controllers/TriggersController.php +++ b/src/controllers/TriggersController.php @@ -283,7 +283,7 @@ class TriggersController extends BaseController echo '<p><input type="hidden" name="action" value="alter" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; echo '<input type="hidden" name="trigger" value="', \htmlspecialchars($_REQUEST['trigger']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['strok']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -315,7 +315,7 @@ class TriggersController extends BaseController echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; echo '<input type="hidden" name="trigger" value="', \htmlspecialchars($_REQUEST['trigger']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />" . \PHP_EOL; @@ -354,7 +354,7 @@ class TriggersController extends BaseController echo '<input type="hidden" name="action" value="enable" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; echo '<input type="hidden" name="trigger" value="', \htmlspecialchars($_REQUEST['trigger']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -392,7 +392,7 @@ class TriggersController extends BaseController echo '<input type="hidden" name="action" value="disable" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; echo '<input type="hidden" name="trigger" value="', \htmlspecialchars($_REQUEST['trigger']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -476,7 +476,7 @@ class TriggersController extends BaseController echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '<input type="hidden" name="action" value="save_create" />' . \PHP_EOL; echo '<input type="hidden" name="table" value="', \htmlspecialchars($_REQUEST['table']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '</form>' . \PHP_EOL; } diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php index 43ddda75..dcf18ae1 100644 --- a/src/controllers/TypesController.php +++ b/src/controllers/TypesController.php @@ -348,7 +348,7 @@ class TypesController extends BaseController echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="type" value="', \htmlspecialchars($_REQUEST['type']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -402,7 +402,7 @@ class TypesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="create_comp" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="2" />' . \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; @@ -481,7 +481,7 @@ class TypesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="create_comp" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="3" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="name" value="', \htmlspecialchars($_REQUEST['name']), '" />' . \PHP_EOL; echo '<input type="hidden" name="fields" value="', \htmlspecialchars($_REQUEST['fields']), '" />' . \PHP_EOL; echo '<input type="hidden" name="typcomment" value="', \htmlspecialchars($_REQUEST['typcomment']), '" />' . \PHP_EOL; @@ -579,7 +579,7 @@ class TypesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="create_enum" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="2" />' . \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; @@ -625,7 +625,7 @@ class TypesController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="create_enum" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="3" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="name" value="', \htmlspecialchars($_REQUEST['name']), '" />' . \PHP_EOL; echo '<input type="hidden" name="values" value="', \htmlspecialchars($_REQUEST['values']), '" />' . \PHP_EOL; echo '<input type="hidden" name="typcomment" value="', \htmlspecialchars($_REQUEST['typcomment']), '" />' . \PHP_EOL; @@ -777,7 +777,7 @@ class TypesController extends BaseController echo '</select></td></tr>' . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \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; diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php index 5ce1db89..de9852c8 100644 --- a/src/controllers/UsersController.php +++ b/src/controllers/UsersController.php @@ -266,7 +266,7 @@ class UsersController extends BaseController echo "\t\t<td><input type=\"password\" name=\"confirm\" size=\"32\" value=\"\" /></td>\n\t</tr>" . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="changepassword" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"ok\" value=\"{$this->lang['strok']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; echo '</p></form>' . \PHP_EOL; @@ -349,7 +349,7 @@ class UsersController extends BaseController echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_edit" />' . \PHP_EOL; echo '<input type="hidden" name="username" value="', \htmlspecialchars($_REQUEST['username']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -403,7 +403,7 @@ class UsersController extends BaseController echo '<form action="' . self::SUBFOLDER . '/src/views/users" method="post">' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="drop" />' . \PHP_EOL; echo '<input type="hidden" name="username" value="', \htmlspecialchars($_REQUEST['username']), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; @@ -457,7 +457,7 @@ class UsersController extends BaseController echo "\t\t<td class=\"data1\"><input size=\"30\" name=\"formExpires\" value=\"", \htmlspecialchars($_POST['formExpires']), "\" /></td>\n\t</tr>" . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<input type=\"submit\" name=\"create\" value=\"{$this->lang['strcreate']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php index d0ce462a..609919fc 100644 --- a/src/controllers/ViewpropertiesController.php +++ b/src/controllers/ViewpropertiesController.php @@ -172,7 +172,7 @@ class ViewpropertiesController extends BaseController <p> <input type="hidden" name="action" value="save_edit" /> <input type="hidden" name="view" value="{$variables->subject}" /> - {$this->misc->form} + {$this->view->form} <input type="submit" value="{$this->lang['stralter']}" /> <input type="submit" name="cancel" value="{$this->lang['strcancel']}" /> </p> @@ -228,7 +228,7 @@ EOT; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="properties" />' . \PHP_EOL; echo '<input type="hidden" name="stage" value="2" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo '<input type="hidden" name="view" value="', \htmlspecialchars($_REQUEST[$this->subject]), '" />' . \PHP_EOL; echo '<input type="hidden" name="column" value="', \htmlspecialchars($_REQUEST['column']), '" />' . \PHP_EOL; echo '<input type="hidden" name="olddefault" value="', \htmlspecialchars($_REQUEST['olddefault']), '" />' . \PHP_EOL; @@ -343,7 +343,7 @@ EOT; echo '</table>' . \PHP_EOL; echo '<input type="hidden" name="action" value="alter" />' . \PHP_EOL; echo '<input type="hidden" name="view" value="', \htmlspecialchars($_REQUEST[$this->subject]), '" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . \PHP_EOL; echo '</form>' . \PHP_EOL; diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index c658f858..a78a0cbf 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -297,7 +297,7 @@ class ViewsController extends BaseController echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL; - echo $this->misc->form; + echo $this->view->form; echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>" . \PHP_EOL; echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL; echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL; @@ -416,7 +416,7 @@ class ViewsController extends BaseController \htmlspecialchars($_REQUEST['formComment']), "</textarea></td>\n\t</tr>" . \PHP_EOL; echo '</table>' . \PHP_EOL; echo '<p><input type="hidden" name="action" value="save_create" />' . \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; |