Ignore system databases when deleting using UI

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth 2025-01-17 19:24:32 -03:00 committed by Isaac Bennetch
parent 8aa2ca9108
commit cf886df108
3 changed files with 21 additions and 33 deletions

View File

@ -8,6 +8,7 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\Query\Utilities;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;
@ -16,8 +17,10 @@ use PhpMyAdmin\Util;
use function __;
use function _ngettext;
use function array_filter;
use function count;
use function is_array;
use function is_string;
final class DestroyController extends AbstractController
{
@ -47,8 +50,6 @@ final class DestroyController extends AbstractController
{
global $selected, $errorUrl, $cfg, $dblist, $reload;
$selected_dbs = $_POST['selected_dbs'] ?? null;
if (
! $this->response->isAjax()
|| (! $this->dbi->isSuperUser() && ! $cfg['AllowUserDropDatabase'])
@ -61,10 +62,14 @@ final class DestroyController extends AbstractController
return;
}
if (
! is_array($selected_dbs)
|| $selected_dbs === []
) {
$selected_dbs = isset($_POST['selected_dbs']) && is_array($_POST['selected_dbs']) ? $_POST['selected_dbs'] : [];
$selected_dbs = array_filter($selected_dbs, static function ($database): bool {
return is_string($database)
&& ! Utilities::isSystemSchema($database, true)
&& $database !== ($GLOBALS['cfg']['Server']['pmadb'] ?? '');
});
if ($selected_dbs === []) {
$message = Message::error(__('No databases selected.'));
$json = ['message' => $message];
$this->response->setRequestStatus($message->isSuccess());

View File

@ -7280,6 +7280,16 @@ parameters:
count: 1
path: libraries/classes/Controllers/Server/Databases/DestroyController.php
-
message: "#^Cannot access offset 'Server' on mixed\\.$#"
count: 1
path: libraries/classes/Controllers/Server/Databases/DestroyController.php
-
message: "#^Cannot access offset 'pmadb' on mixed\\.$#"
count: 1
path: libraries/classes/Controllers/Server/Databases/DestroyController.php
-
message: "#^Cannot access property \\$databases on mixed\\.$#"
count: 1
@ -7290,21 +7300,6 @@ parameters:
count: 1
path: libraries/classes/Controllers/Server/Databases/DestroyController.php
-
message: "#^Parameter \\#1 \\$db of method PhpMyAdmin\\\\ConfigStorage\\\\RelationCleanup\\:\\:database\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Server/Databases/DestroyController.php
-
message: "#^Parameter \\#1 \\$db of method PhpMyAdmin\\\\Transformations\\:\\:clear\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Server/Databases/DestroyController.php
-
message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Server/Databases/DestroyController.php
-
message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
count: 4

View File

@ -2455,18 +2455,6 @@
<MixedPropertyFetch occurrences="1">
<code>$dblist-&gt;databases</code>
</MixedPropertyFetch>
<PossiblyInvalidArgument occurrences="3">
<code>$database</code>
<code>$database</code>
<code>$database</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="2">
<code>$database</code>
<code>$database</code>
</PossiblyInvalidCast>
<TypeDoesNotContainType occurrences="1">
<code>$selected_dbs === []</code>
</TypeDoesNotContainType>
</file>
<file src="libraries/classes/Controllers/Server/DatabasesController.php">
<MixedArgument occurrences="9">