From aad99013f3cc80deca2b36aae7142c89ecd1bb84 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 16 Mar 2025 06:20:49 +0100
Subject: [PATCH] Add Adminer namespace

Adminer 5 wrapped itself into a namespace and plugins now need to call Adminer's functions via this namespace.
---
 hideableColumns.php    |  2 +-
 searchAutocomplete.php | 10 +++++-----
 stickyColumns.php      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hideableColumns.php b/hideableColumns.php
index 4caf7c1..35ef335 100644
--- a/hideableColumns.php
+++ b/hideableColumns.php
@@ -48,7 +48,7 @@ public function head()
 		
 		?>
 
-		<script <?php echo nonce()?> type='text/javascript'>
+		<script <?php echo Adminer\nonce()?> type='text/javascript'>
 		
 		//make columns hideable
 		function makeColumnsHideable()
diff --git a/searchAutocomplete.php b/searchAutocomplete.php
index a66a841..24ed256 100644
--- a/searchAutocomplete.php
+++ b/searchAutocomplete.php
@@ -53,7 +53,7 @@ public function headers()
 				$prefix = "";
 				$cond = " $val[op]";
 				if (preg_match('~IN$~', $val["op"])) {
-					$in = process_length($val["val"]);
+					$in = Adminer\process_length($val["val"]);
 					$cond .= " " . ($in != "" ? $in : "(NULL)");
 				} elseif ($val["op"] == "SQL") {
 					$cond = " $val[val]"; // SQL injection
@@ -62,14 +62,14 @@ public function headers()
 				} elseif ($val["op"] == "ILIKE %%") {
 					$cond = " ILIKE " . $adminer->processInput($fields[$val["col"]], "%$val[val]%");
 				} elseif ($val["op"] == "FIND_IN_SET") {
-					$prefix = "$val[op](" . q($val["val"]) . ", ";
+					$prefix = "$val[op](" . Adminer\q($val["val"]) . ", ";
 					$cond = ")";
 				} elseif (!preg_match('~NULL$~', $val["op"])) {
 					$cond .= " " . $adminer->processInput($fields[$val["col"]], $val["val"]);
 				}
 				
 				$Min_SQL=new Min_SQL(null );				
-				$where[] = $prefix .  $Min_SQL->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
+				$where[] = $prefix .  $Min_SQL->convertSearch(Adminer\idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
 			}	
 				
 			//this will likely not use any indexes. 
@@ -81,7 +81,7 @@ public function headers()
 			//to order even text-columns naturally, use this ugly hack, this is tested in MySQL only. Sorry.
 			$orderSQLforNaturalSort="`$column`+0<>0 DESC, `$column`+0, `$column`";		
 			//deliver json
-			echo json_encode(get_vals("SELECT DISTINCT `$column` FROM `$table` $whereSQL ORDER BY $orderSQLforNaturalSort"));
+			echo json_encode(Adminer\get_vals("SELECT DISTINCT `$column` FROM `$table` $whereSQL ORDER BY $orderSQLforNaturalSort"));
 			//stop delivering anything...
 			die();
 		}
@@ -94,7 +94,7 @@ public function head()
 		if(!isset($_GET["select"]))
 			return;
 	?>
-		<script <?php echo nonce()?> type='text/javascript'>
+		<script <?php echo Adminer\nonce()?> type='text/javascript'>
 		//prepare autocomplete searchFields on page load
 		document.addEventListener('DOMContentLoaded', function()
 		{
diff --git a/stickyColumns.php b/stickyColumns.php
index 7d98d5d..a274a81 100644
--- a/stickyColumns.php
+++ b/stickyColumns.php
@@ -86,7 +86,7 @@ public function head()
 		
 		?>
 
-		<script <?php echo nonce()?> type='text/javascript'>
+		<script <?php echo Adminer\nonce()?> type='text/javascript'>
 		//make column headers of table sticky on the left and right.
 		//Due to lack of any ID in thead, this has to be done in JS
 		function makeColumnHeadersSticky()