Remove the table change entry point file

Directly calls the controller instead of including the file. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jan 7, 2020 · d190c82 · d190c82
1 parent 42468cb
commit d190c82
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php
@@ -388,7 +388,7 @@ public function index(): void
             $message = Message::success(__('No change'));
             // Avoid infinite recursion
             if ($goto_include == 'libraries/entry_points/table/replace.php') {
-                $goto_include = 'libraries/entry_points/table/change.php';
+                $goto_include = '/table/change';
             }
             $active_page = $goto_include;
 
@@ -402,6 +402,11 @@ public function index(): void
                 $controller = $containerBuilder->get(DatabaseSqlController::class);
                 $controller->index();
                 return;
+            } elseif ($goto_include === '/table/change') {
+                /** @var ChangeController $controller */
+                $controller = $containerBuilder->get(ChangeController::class);
+                $controller->index();
+                return;
             }
 
             include ROOT_PATH . Core::securePath((string) $goto_include);
@@ -438,7 +443,7 @@ public function index(): void
             );
         }
         if ($row_skipped) {
-            $goto_include = 'libraries/entry_points/table/change.php';
+            $goto_include = '/table/change';
             $message->addMessagesString($insert_errors, '<br>');
             $message->isError(true);
         }
@@ -590,6 +595,11 @@ public function index(): void
             $controller = $containerBuilder->get(DatabaseSqlController::class);
             $controller->index();
             return;
+        } elseif ($goto_include === '/table/change') {
+            /** @var ChangeController $controller */
+            $controller = $containerBuilder->get(ChangeController::class);
+            $controller->index();
+            return;
         }
 
         /**

diff --git a/libraries/classes/Controllers/Table/RowActionController.php b/libraries/classes/Controllers/Table/RowActionController.php
@@ -21,7 +21,7 @@ class RowActionController extends AbstractController
      */
     public function index(): void
     {
-        global $db, $goto, $pmaThemeImage, $sql_query, $table;
+        global $containerBuilder, $db, $goto, $pmaThemeImage, $sql_query, $table;
         global $submit_mult, $active_page, $err_url, $original_sql_query, $url_query, $original_url_query;
         global $disp_message, $disp_query, $single_table, $where_clause, $action;
 
@@ -100,7 +100,9 @@ public function index(): void
                         }
                     }
                     $active_page = Url::getFromRoute('/table/change');
-                    include ROOT_PATH . 'libraries/entry_points/table/change.php';
+                    /** @var ChangeController $controller */
+                    $controller = $containerBuilder->get(ChangeController::class);
+                    $controller->index();
                     break;
 
                 case 'row_export':

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -8,6 +8,7 @@
 
 namespace PhpMyAdmin;
 
+use PhpMyAdmin\Controllers\Table\ChangeController;
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Plugins\TransformationsPlugin;
 
@@ -2181,6 +2182,8 @@ public function getParamsForUpdateOrInsert()
      */
     public function isInsertRow()
     {
+        global $containerBuilder;
+
         if (isset($_POST['insert_rows'])
             && is_numeric($_POST['insert_rows'])
             && $_POST['insert_rows'] != $GLOBALS['cfg']['InsertRows']
@@ -2192,7 +2195,9 @@ public function isInsertRow()
             $scripts->addFile('vendor/jquery/additional-methods.js');
             $scripts->addFile('table/change.js');
             if (! defined('TESTSUITE')) {
-                include ROOT_PATH . 'libraries/entry_points/table/change.php';
+                /** @var ChangeController $controller */
+                $controller = $containerBuilder->get(ChangeController::class);
+                $controller->index();
                 exit;
             }
         }
@@ -2252,7 +2257,7 @@ public function getGotoInclude($goto_include)
         if (isset($_POST['after_insert'])
             && in_array($_POST['after_insert'], $valid_options)
         ) {
-            $goto_include = 'libraries/entry_points/table/change.php';
+            $goto_include = '/table/change';
         } elseif (! empty($GLOBALS['goto'])) {
             if (! preg_match('@^[a-z_]+\.php$@', $GLOBALS['goto'])) {
                 // this should NOT happen

diff --git a/libraries/entry_points/table/change.php b/libraries/entry_points/table/change.php
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
@@ -2619,7 +2619,7 @@ public function testGetGotoInclude()
 
         $_POST['after_insert'] = 'new_insert';
         $this->assertEquals(
-            'libraries/entry_points/table/change.php',
+            '/table/change',
             $this->insertEdit->getGotoInclude('index')
         );
     }