Add support for "order" field privilege

In Elasticsearch, text fields are not sortable.

diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php
index 8cb56cfc846ea775cecfb236ef53ba5941233aa2..d61365d60819f59628f278dd43cef7446cd5f56e 100644 (file)
--- a/adminer/drivers/mongo.inc.php
+++ b/adminer/drivers/mongo.inc.php
@@ -182,6 +182,7 @@ if (isset($_GET["mongo"])) {
                                                                        "select" => 1,
                                                                        "update" => 1,
                                                                        "where" => 1,
+                                                                       "order" => 1,
                                                                ),
                                                        );
                                                }

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index da68829ac5a84de06598a32c8982aab870132fb1..a5136c2bda8ea01c1c57e3ba9557c7e43d8994d8 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -380,7 +380,7 @@ WHERE c.object_id = " . q($table_id)) as $row
                                "null" => $row["is_nullable"],
                                "auto_increment" => $row["is_identity"],
                                "collation" => $row["collation_name"],
-                               "privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1),
+                               "privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
                                "primary" => $row["is_primary_key"],
                                "comment" => $comments[$row["name"]],
                        );

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 71f5bb0cb9289eaea45b7db6324c6b31cf49d00b..b4168e27f3a0ad63f471ca651ed6b672a01113d5 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -613,7 +613,7 @@ if (!defined('Adminer\DRIVER')) {
                                "auto_increment" => ($extra == "auto_increment"),
                                "on_update" => (preg_match('~\bon update (\w+)~i', $extra, $match) ? $match[1] : ""), //! available since MySQL 5.1.23
                                "collation" => $row["COLLATION_NAME"],
-                               "privileges" => array_flip(explode(",", "$row[PRIVILEGES],where")),
+                               "privileges" => array_flip(explode(",", "$row[PRIVILEGES],where,order")),
                                "comment" => $row["COLUMN_COMMENT"],
                                "primary" => ($row["COLUMN_KEY"] == "PRI"),
                                "generated" => ($generated[1] == "PERSISTENT" ? "STORED" : $generated[1]),

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index 46de876fb9a7656cc2379b7633551621f45b58c4..5282a972a287ccc81d386195a3f41e2d60b137f9 100644 (file)
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -334,7 +334,7 @@ ORDER BY 1") as $row
                                "null" => ($row["NULLABLE"] == "Y"),
                                //! "auto_increment" => false,
                                //! "collation" => $row["CHARACTER_SET_NAME"],
-                               "privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1),
+                               "privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
                                //! "comment" => $row["Comment"],
                                //! "primary" => ($row["Key"] == "PRI"),
                        );

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 969c294a4f3b2c71908bccf7665ffe5aeea9c0cd..5c3394a334dba85e8808c634ada8439e27060b5a 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -266,7 +266,7 @@ if (isset($_GET["sqlite"])) {
                                "full_type" => $type,
                                "default" => (preg_match("~^'(.*)'$~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
                                "null" => !$row["notnull"],
-                               "privileges" => array("select" => 1, "insert" => 1, "update" => 1, "where" => 1),
+                               "privileges" => array("select" => 1, "insert" => 1, "update" => 1, "where" => 1, "order" => 1),
                                "primary" => $row["pk"],
                        );
                        if ($row["pk"]) {

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 155b521f76f9f3cb48c266052c642e1c513188fb..c1f0a67c1811b9e6587460f61691f0a1ece2999d 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -1069,7 +1069,7 @@ function fields_from_edit() {
                $name = bracket_escape($key, 1); // 1 - back
                $return[$name] = array(
                        "field" => $name,
-                       "privileges" => array("insert" => 1, "update" => 1, "where" => 1),
+                       "privileges" => array("insert" => 1, "update" => 1, "where" => 1, "order" => 1),
                        "null" => 1,
                        "auto_increment" => ($key == $driver->primary),
                );

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index db8a0ed938941318f637c68379e2f77955d0826a..e467fd2a9267176017e367203e3ac20b740ff140 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -12,6 +12,7 @@ parse_str($_COOKIE["adminer_import"], $adminer_import);
 $rights = array(); // privilege => 0
 $columns = array(); // selectable columns
 $search_columns = array(); // searchable columns
+$order_columns = array(); // searchable columns
 $text_length = null;
 foreach ($fields as $key => $field) {
        $name = $adminer->fieldName($field);
@@ -24,6 +25,9 @@ foreach ($fields as $key => $field) {
        if (isset($field["privileges"]["where"]) && $name != "") {
                $search_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
        }
+       if (isset($field["privileges"]["order"]) && $name != "") {
+               $order_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
+       }
        $rights += $field["privileges"];
 }
 
@@ -257,7 +261,7 @@ if (!$columns && support("table")) {
        echo "</div>\n";
        $adminer->selectColumnsPrint($select, $columns);
        $adminer->selectSearchPrint($where, $search_columns, $indexes);
-       $adminer->selectOrderPrint($order, $columns, $indexes);
+       $adminer->selectOrderPrint($order, $order_columns, $indexes);
        $adminer->selectLimitPrint($limit);
        $adminer->selectLengthPrint($text_length);
        $adminer->selectActionPrint($indexes);
@@ -342,11 +346,19 @@ if (!$columns && support("table")) {
                                                $column = idf_escape($key);
                                                $href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
                                                $desc = "&desc%5B0%5D=1";
+                                               $sortable = isset($field["privileges"]["order"]);
                                                echo "<th id='th[" . h(bracket_escape($key)) . "]'>" . script("mixin(qsl('th'), {onmouseover: partial(columnMouse), onmouseout: partial(columnMouse, ' hidden')});", "");
-                                               echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
-                                               echo apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
+                                               if ($sortable) {
+                                                       echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
+                                               }
+                                               echo apply_sql_function($val["fun"], $name); //! columns looking like functions
+                                               if ($sortable) {
+                                                       echo "</a>";
+                                               }
                                                echo "<span class='column hidden'>";
-                                               echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+                                               if ($sortable) {
+                                                       echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+                                               }
                                                if (!$val["fun"] && isset($field["privileges"]["where"])) {
                                                        echo '<a href="#fieldset-search" title="' . lang('Search') . '" class="text jsonly"> =</a>';
                                                        echo script("qsl('a').onclick = partial(selectSearch, '" . js_escape($key) . "');");

diff --git a/changes.txt b/changes.txt
index 43c95f8d39bc7c2a483e0a8669e3ccc862ec7dae..343f37a2372f081150ae174e36d0b1281abb10d3 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,7 +1,7 @@
 Adminer dev:
 PostgreSQL: Fix setting NULL and original value on enum (bug #884)
 CockroachDB: Add support via PostgreSQL driver
-Elasticsearch: Add support for "where" field privilege
+Elasticsearch: Add support for "where" and "order" field privilege
 
 Adminer 5.0.1 (released 2025-03-07):
 Fix bulk operations with tables (regression from 5.0.0)

diff --git a/plugins/drivers/clickhouse.php b/plugins/drivers/clickhouse.php
index 804818c7fbac1d449774b5c6bcd0df6f4af70c24..d933e83206675d1ae60d97bbe085ae63b9933526 100644 (file)
--- a/plugins/drivers/clickhouse.php
+++ b/plugins/drivers/clickhouse.php
@@ -340,7 +340,7 @@ if (isset($_GET["clickhouse"])) {
                                "default" => trim($row['default_expression']),
                                "null" => $nullable,
                                "auto_increment" => '0',
-                               "privileges" => array("insert" => 1, "select" => 1, "update" => 0, "where" => 1),
+                               "privileges" => array("insert" => 1, "select" => 1, "update" => 0, "where" => 1, "order" => 1),
                        );
                }
 

diff --git a/plugins/drivers/firebird.php b/plugins/drivers/firebird.php
index 0ae27236c729fad561489c247c7c59eb7a7c9b42..5049dd5fdfce78bf6567bccab5daf44c81efb459 100644 (file)
--- a/plugins/drivers/firebird.php
+++ b/plugins/drivers/firebird.php
@@ -254,7 +254,7 @@ ORDER BY r.RDB$FIELD_POSITION';
                                "null" => (trim($row["FIELD_NOT_NULL_CONSTRAINT"]) == "YES"),
                                "auto_increment" => '0',
                                "collation" => trim($row["FIELD_COLLATION"]),
-                               "privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1),
+                               "privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
                                "comment" => trim($row["FIELD_DESCRIPTION"]),
                        );
                }

diff --git a/todo.txt b/todo.txt
index 56937c314ab2f0bc492ca1f1cc30f4318f5f55e8..38dcfbd71cec9a4ac85d6ffda257122da1ac83d0 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -15,7 +15,6 @@ Skinnable plus.gif and other images - http://typo3.org/extensions/repository/vie
 
 https://github.com/vrana/adminer/compare/master...adminneo-org:adminneo:main
 Add drag-n-drop moving of rows in table editing
-Elasticsearch: Add support for "order" field privilege
 Elasticsearch: New condition operators as the combination of query type and match type
 
 Editor: