Make kill_process / process_list extendable

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27e89942e64945c69f550005fe259b9f88041f1b..2d00eacf0892fa619433de39a63a06337ea29110 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Adminer dev
 - Allow specifying operator in search anywhere
+- Plugins: Methods processList() and killProcess()
 
 ## Adminer 5.3.0 (released 2025-05-04)
 - Align numeric functions right

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 6b5dfe68a4482e5edc0a973b9fc31f27b3c62fa7..9de33046f6098d404f225ec6af2b1819085d9d52 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -1067,11 +1067,11 @@ if (!defined('Adminer\DRIVER')) {
        }
 
        /** Kill a process
-       * @param numeric-string $val
+       * @param numeric-string $id
        * @return Result|bool
        */
-       function kill_process(string $val) {
-               return queries("KILL " . number($val));
+       function kill_process(string $id) {
+               return queries("KILL " . number($id));
        }
 
        /** Return query to get connection ID */

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 3d5a86e63c54fda03a29609166637aaafeaf73fc..f68c15e00ebc60767b25136b1a3e4d6325fa8739 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1115,4 +1115,19 @@ class Adminer {
                }
                echo "</ul>\n";
        }
+
+       /** Get process list
+       * @return list<string[]> [$row]
+       */
+       function processList(): array {
+               return process_list();
+       }
+
+       /** Kill a process
+       * @param numeric-string $id
+       * @return Result|bool
+       */
+       function killProcess(string $id) {
+               return kill_process($id);
+       }
 }

diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index dbef17b6363f2c24ec4aa4ffd17c49ed12ec77a0..1a38637903a3fc83b5ce20e5f2095f04ff72ad45 100644 (file)
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -5,7 +5,7 @@ if (support("kill")) {
        if ($_POST && !$error) {
                $killed = 0;
                foreach ((array) $_POST["kill"] as $val) {
-                       if (kill_process($val)) {
+                       if (adminer()->killProcess($val)) {
                                $killed++;
                        }
                }
@@ -23,7 +23,7 @@ page_header(lang('Process list'), $error);
 echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 // HTML valid because there is always at least one process
 $i = -1;
-foreach (process_list() as $i => $row) {
+foreach (adminer()->processList() as $i => $row) {
        if (!$i) {
                echo "<thead><tr lang='en'>" . (support("kill") ? "<th>" : "");
                foreach ($row as $key => $val) {