Remove the database sql 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 · 42468cb · 42468cb
1 parent bb42779
commit 42468cb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 28 deletions.
diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php
@@ -6,6 +6,7 @@
 
 namespace PhpMyAdmin\Controllers\Table;
 
+use PhpMyAdmin\Controllers\Database\SqlController as DatabaseSqlController;
 use PhpMyAdmin\Controllers\SqlController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
@@ -396,6 +397,11 @@ public function index(): void
                 $controller = $containerBuilder->get(SqlController::class);
                 $controller->index();
                 return;
+            } elseif ($goto_include === '/database/sql') {
+                /** @var DatabaseSqlController $controller */
+                $controller = $containerBuilder->get(DatabaseSqlController::class);
+                $controller->index();
+                return;
             }
 
             include ROOT_PATH . Core::securePath((string) $goto_include);
@@ -579,6 +585,11 @@ public function index(): void
             $controller = $containerBuilder->get(SqlController::class);
             $controller->index();
             return;
+        } elseif ($goto_include === '/database/sql') {
+            /** @var DatabaseSqlController $controller */
+            $controller = $containerBuilder->get(DatabaseSqlController::class);
+            $controller->index();
+            return;
         }
 
         /**

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -2265,13 +2265,13 @@ public function getGotoInclude($goto_include)
             } else {
                 $goto_include = $GLOBALS['goto'];
             }
-            if ($GLOBALS['goto'] == 'libraries/entry_points/database/sql.php' && strlen($GLOBALS['table']) > 0) {
+            if ($GLOBALS['goto'] == 'index.php?route=/database/sql' && strlen($GLOBALS['table']) > 0) {
                 $GLOBALS['table'] = '';
             }
         }
         if (! $goto_include) {
             if (strlen($GLOBALS['table']) === 0) {
-                $goto_include = 'libraries/entry_points/database/sql.php';
+                $goto_include = '/database/sql';
             } else {
                 $goto_include = 'libraries/entry_points/table/sql.php';
             }

diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php
@@ -7,6 +7,7 @@
  */
 declare(strict_types=1);
 
+use PhpMyAdmin\Controllers\Database\SqlController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
@@ -16,7 +17,7 @@
     exit;
 }
 
-global $db, $table, $dbi, $is_db, $is_table, $message, $show_as_php, $sql_query;
+global $containerBuilder, $db, $table, $dbi, $is_db, $is_table, $message, $show_as_php, $sql_query;
 
 if (empty($is_db)) {
     if (strlen($db) > 0) {
@@ -101,7 +102,9 @@
             }
 
             if (! $is_table) {
-                include ROOT_PATH . 'libraries/entry_points/database/sql.php';
+                /** @var SqlController $controller */
+                $controller = $containerBuilder->get(SqlController::class);
+                $controller->index();
                 exit;
             }
         }

diff --git a/libraries/entry_points/database/sql.php b/libraries/entry_points/database/sql.php
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
@@ -2595,7 +2595,7 @@ public function testGetGotoInclude()
         $GLOBALS['table'] = '';
 
         $this->assertEquals(
-            'libraries/entry_points/database/sql.php',
+            '/database/sql',
             $this->insertEdit->getGotoInclude('index')
         );
 
@@ -2605,10 +2605,10 @@ public function testGetGotoInclude()
             $this->insertEdit->getGotoInclude('index')
         );
 
-        $GLOBALS['goto'] = 'libraries/entry_points/database/sql.php';
+        $GLOBALS['goto'] = 'index.php?route=/database/sql';
 
         $this->assertEquals(
-            'libraries/entry_points/database/sql.php',
+            '/database/sql',
             $this->insertEdit->getGotoInclude('index')
         );