diff --git a/index.php b/index.php index 26027038a5..ddad78e85c 100644 --- a/index.php +++ b/index.php @@ -145,6 +145,9 @@ if (isset($_GET['route']) || isset($_POST['route'])) { $routes->addRoute(['GET', 'POST'], '/chart', function () { require_once ROOT_PATH . 'libraries/entry_points/table/chart.php'; }); + $routes->addRoute(['GET', 'POST'], '/create', function () { + require_once ROOT_PATH . 'libraries/entry_points/table/create.php'; + }); $routes->addRoute(['GET', 'POST'], '/find_replace', function () { require_once ROOT_PATH . 'libraries/entry_points/table/find_replace.php'; }); diff --git a/js/designer/move.js b/js/designer/move.js index 813a44c5cd..b9d91d9d69 100644 --- a/js/designer/move.js +++ b/js/designer/move.js @@ -1275,7 +1275,7 @@ DesignerMove.newRelation = function () { // -------------------------- create tables ------------------------------------- DesignerMove.startTableNew = function () { CommonParams.set('table', ''); - CommonActions.refreshMain('tbl_create.php'); + CommonActions.refreshMain('index.php?route=/table/create'); }; DesignerMove.startTabUpd = function (table) { diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 17de2587af..5ba2d0de46 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -36,7 +36,6 @@ class Core 'pdf_schema.php', 'server_export.php', 'server_import.php', - 'tbl_create.php', 'tbl_import.php', 'tbl_indexes.php', 'tbl_export.php', diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index 13ff5415ff..8f17f631de 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -10,7 +10,7 @@ declare(strict_types=1); namespace PhpMyAdmin; /** - * Set of functions for tbl_create.php and /table/addfield + * Set of functions for /table/create and /table/addfield * * @package PhpMyAdmin */ diff --git a/libraries/classes/Navigation/Nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php index cbc2ac97c2..8d2e2c5e7a 100644 --- a/libraries/classes/Navigation/Nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -50,10 +50,12 @@ class NodeTableContainer extends NodeDatabaseChildContainer $new->isNew = true; $new->icon = Util::getImage('b_table_add', $newLabel); $new->links = [ - 'text' => 'tbl_create.php?server=' . $GLOBALS['server'] - . '&db=%2$s', - 'icon' => 'tbl_create.php?server=' . $GLOBALS['server'] - . '&db=%2$s', + 'text' => Url::getFromRoute('/table/create', [ + 'server' => $GLOBALS['server'], + ]) . '&db=%2$s', + 'icon' => Url::getFromRoute('/table/create', [ + 'server' => $GLOBALS['server'], + ]) . '&db=%2$s', ]; $new->classes = 'new_table italics'; $this->addChild($new); diff --git a/tbl_create.php b/libraries/entry_points/table/create.php similarity index 95% rename from tbl_create.php rename to libraries/entry_points/table/create.php index 45339ad7ba..6180f94f15 100644 --- a/tbl_create.php +++ b/libraries/entry_points/table/create.php @@ -16,14 +16,12 @@ use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -if (! defined('ROOT_PATH')) { - define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR); +if (! defined('PHPMYADMIN')) { + exit; } global $containerBuilder; -require_once ROOT_PATH . 'libraries/common.inc.php'; - /** @var Response $response */ $response = $containerBuilder->get(Response::class); @@ -84,7 +82,7 @@ $createAddField = new CreateAddField($dbi); // check number of fields to be created $num_fields = $createAddField->getNumberOfFieldsFromRequest(); -$action = 'tbl_create.php'; +$action = Url::getFromRoute('/table/create'); /** * The form used to define the structure of the table has been submitted diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 79b59b92ce..44fb29c9a2 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Display form for changing/adding table fields/columns. - * Included by /table/addfield and tbl_create.php + * Included by /table/addfield and /table/create * * @package PhpMyAdmin */ @@ -69,7 +69,7 @@ $form_params = [ 'db' => $db, ]; -if ($action == 'tbl_create.php') { +if ($action == Url::getFromRoute('/table/create')) { $form_params['reload'] = 1; } else { if ($action == Url::getFromRoute('/table/addfield')) { @@ -102,7 +102,7 @@ if (isset($selected) && is_array($selected)) { } } -$is_backup = ($action != 'tbl_create.php' && $action != Url::getFromRoute('/table/addfield')); +$is_backup = ($action != Url::getFromRoute('/table/create') && $action != Url::getFromRoute('/table/addfield')); $cfgRelation = $relation->getRelationsParam(); diff --git a/templates/columns_definitions/column_definitions_form.twig b/templates/columns_definitions/column_definitions_form.twig index 1fd4b64ca7..d8c53b4d06 100644 --- a/templates/columns_definitions/column_definitions_form.twig +++ b/templates/columns_definitions/column_definitions_form.twig @@ -1,5 +1,5 @@