Visitar URL original
Extract guard condition from Triggers\Triggers::export() · phpmyadmin/phpmyadmin@9c01b7c · GitHub
Skip to content

Commit 9c01b7c

Browse files
committed
Extract guard condition from Triggers\Triggers::export()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 1f734f9 commit 9c01b7c

3 files changed

Lines changed: 4 additions & 9 deletions

File tree

‎libraries/classes/Controllers/Triggers/IndexController.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ public function __invoke(ServerRequest $request): void
7474
$GLOBALS['errors'] = [];
7575

7676
$this->triggers->handleEditor();
77-
$this->triggers->export();
77+
if ($request->hasQueryParam('export_item') && $request->hasQueryParam('item_name')) {
78+
$this->triggers->export();
79+
}
7880

7981
$triggers = Triggers::getDetails($this->dbi, $GLOBALS['db'], $GLOBALS['table']);
8082
$hasTriggerPrivilege = Util::currentUserHasPrivilege('TRIGGER', $GLOBALS['db'], $GLOBALS['table']);
81-
$isAjax = $this->response->isAjax() && empty($_REQUEST['ajax_page_request']);
83+
$isAjax = $this->response->isAjax() && empty($request->getParam('ajax_page_request'));
8284

8385
$this->render('triggers/list', [
8486
'db' => $GLOBALS['db'],

‎libraries/classes/Triggers/Triggers.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,6 @@ private function sendEditor(string $mode, array|null $item, string $title, strin
433433

434434
public function export(): void
435435
{
436-
if (empty($_GET['export_item']) || empty($_GET['item_name'])) {
437-
return;
438-
}
439-
440436
$itemName = $_GET['item_name'];
441437
$triggers = self::getDetails($this->dbi, $GLOBALS['db'], $GLOBALS['table'], '');
442438
$exportData = false;

‎psalm-baseline.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4275,9 +4275,6 @@
42754275
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
42764276
<code><![CDATA[$GLOBALS['errors']]]></code>
42774277
</MixedAssignment>
4278-
<UnusedParam>
4279-
<code>$request</code>
4280-
</UnusedParam>
42814278
</file>
42824279
<file src="libraries/classes/Controllers/UserPasswordController.php">
42834280
<InvalidArrayOffset>

0 commit comments

Comments
 (0)