From c4111cc94816a9f0bd66bd1eb909e84661da2300 Mon Sep 17 00:00:00 2001
From: Matthew Barbour <matthew@darkholme.net>
Date: Wed, 26 Jun 2019 22:41:42 -0500
Subject: [PATCH] Added shortcut-key support to bulk action extension

---
 ext/bulk_actions/main.php  | 32 +++++++++++++++++++++++---------
 ext/bulk_actions/theme.php |  8 ++++----
 ext/pools/main.php         |  4 ++--
 ext/rating/main.php        |  8 ++++----
 ext/regen_thumb/main.php   |  2 +-
 ext/transcode/main.php     | 11 ++++++++++-
 ext/trash/main.php         |  2 +-
 7 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/ext/bulk_actions/main.php b/ext/bulk_actions/main.php
index b945f727..f9294ac1 100644
--- a/ext/bulk_actions/main.php
+++ b/ext/bulk_actions/main.php
@@ -16,22 +16,29 @@ class BulkActionBlockBuildingEvent extends Event
 
     public $search_terms = [];
 
-    public function add_action(String $action, string $button_text, String $confirmation_message = "", String $block = "", int $position = 40)
+    public function add_action(String $action, string $button_text, string $access_key = null, String $confirmation_message = "", String $block = "", int $position = 40)
     {
         if ($block == null) {
             $block = "";
         }
 
-        array_push(
-            $this->actions,
-            [
+        if(!empty($access_key)) {
+            assert(strlen($access_key)==1);
+            foreach ($this->actions as $existing) {
+                if($existing["access_key"]==$access_key) {
+                    throw new SCoreException("Access key $access_key is already in use");
+                }
+            }
+        }
+
+        $this->actions[] =[
                 "block" => $block,
+                "access_key" => $access_key,
                 "confirmation_message" => $confirmation_message,
                 "action" => $action,
                 "button_text" => $button_text,
                 "position" => $position
-            ]
-        );
+            ];
     }
 }
 
@@ -79,15 +86,22 @@ class BulkActions extends Extension
         global $user;
 
         if ($user->can("delete_image")) {
-            $event->add_action("bulk_delete", "Delete", "Delete selected images?", "", 10);
+            $event->add_action("bulk_delete", "(D)elete", "d", "Delete selected images?", "", 10);
         }
 
         if ($user->can("bulk_edit_image_tag")) {
-            $event->add_action("bulk_tag", "Tag", "", $this->theme->render_tag_input(), 10);
+
+            $event->add_action(
+                "bulk_tag",
+                "Tag",
+                "t",
+                "",
+                $this->theme->render_tag_input(),
+                10);
         }
 
         if ($user->can("bulk_edit_image_source")) {
-            $event->add_action("bulk_source", "Set Source", "", $this->theme->render_source_input(), 10);
+            $event->add_action("bulk_source", "Set (S)ource", "s","", $this->theme->render_source_input(), 10);
         }
     }
 
diff --git a/ext/bulk_actions/theme.php b/ext/bulk_actions/theme.php
index 538c74df..30eac633 100644
--- a/ext/bulk_actions/theme.php
+++ b/ext/bulk_actions/theme.php
@@ -2,14 +2,14 @@
 
 class BulkActionsTheme extends Themelet
 {
-    public function display_selector(Page $page, $actions, $query)
+    public function display_selector(Page $page, array $actions, string $query)
     {
         global $user;
 
         $body = "<input type='hidden' name='bulk_selected_ids' id='bulk_selected_ids' />
-				<input id='bulk_selector_activate' type='button' onclick='activate_bulk_selector();' value='Activate Selector'/>
+				<input id='bulk_selector_activate' type='button' onclick='activate_bulk_selector();' value='Activate (M)anual Select' accesskey='m'/>
 				<div id='bulk_selector_controls' style='display: none;'>
-					<input id='bulk_selector_deactivate' type='button' onclick='deactivate_bulk_selector();' value='Deactivate Selector'/>
+					<input id='bulk_selector_deactivate' type='button' onclick='deactivate_bulk_selector();' value='Deactivate (M)anual Select' accesskey='m'/>
 					Click on images to mark them.
 					<br />
 					<table><tr><td>
@@ -36,7 +36,7 @@ class BulkActionsTheme extends Themelet
                 "<input type='hidden' name='bulk_selected_ids' />" .
                 "<input type='hidden' name='bulk_action' value='" . $action["action"] . "' />" .
                 $action["block"] .
-                "<input type='submit' name='submit_button' value='" . $action["button_text"] . "'/>" .
+                "<input type='submit' name='submit_button' accesskey='{$action["access_key"]}' value='" . $action["button_text"] . "'/>" .
                 "</form></div>";
         }
 
diff --git a/ext/pools/main.php b/ext/pools/main.php
index 8cb464c1..49d99f0e 100644
--- a/ext/pools/main.php
+++ b/ext/pools/main.php
@@ -415,8 +415,8 @@ class Pools extends Extension
         $pools = $database->get_all("SELECT * FROM pools ORDER BY title ");
 
 
-        $event->add_action("bulk_pool_add_existing", "Add To Pool", "", $this->theme->get_bulk_pool_selector($pools));
-        $event->add_action("bulk_pool_add_new", "Create Pool", "", $this->theme->get_bulk_pool_input());
+        $event->add_action("bulk_pool_add_existing", "Add To (P)ool", "p","", $this->theme->get_bulk_pool_selector($pools));
+        $event->add_action("bulk_pool_add_new", "Create Pool", "","", $this->theme->get_bulk_pool_input());
     }
 
     public function onBulkAction(BulkActionEvent $event)
diff --git a/ext/rating/main.php b/ext/rating/main.php
index 092223f3..30988977 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -169,8 +169,8 @@ class Ratings extends Extension
     {
         global $user;
 
-        if ($user->is_admin()) {
-            $event->add_action("bulk_rate", "Set Rating", "", $this->theme->get_selection_rater_html("u", "bulk_rating"));
+        if ($user->can("bulk_edit_image_rating")) {
+            $event->add_action("bulk_rate","Set (R)ating", "r","",$this->theme->get_selection_rater_html("u","bulk_rating"));
         }
     }
 
@@ -183,7 +183,7 @@ class Ratings extends Extension
                 if (!isset($_POST['bulk_rating'])) {
                     return;
                 }
-                if ($user->is_admin()) {
+                if ($user->can("bulk_edit_image_rating")) {
                     $rating = $_POST['bulk_rating'];
                     $total = 0;
                     foreach ($event->items as $id) {
@@ -206,7 +206,7 @@ class Ratings extends Extension
         global $user, $page;
         
         if ($event->page_matches("admin/bulk_rate")) {
-            if (!$user->is_admin()) {
+            if (!$user->can("bulk_edit_image_rating")) {
                 throw new PermissionDeniedException();
             } else {
                 $n = 0;
diff --git a/ext/regen_thumb/main.php b/ext/regen_thumb/main.php
index b402281f..70e00d1b 100644
--- a/ext/regen_thumb/main.php
+++ b/ext/regen_thumb/main.php
@@ -69,7 +69,7 @@ class RegenThumb extends Extension
         global $user;
 
         if ($user->can("delete_image")) {
-            $event->add_action("bulk_regen", "Regen Thumbnails", "", $this->theme->bulk_html());
+            $event->add_action("bulk_regen", "Regen Thumbnails", "","", $this->theme->bulk_html());
         }
     }
 
diff --git a/ext/transcode/main.php b/ext/transcode/main.php
index 8a04f884..bb1e3ada 100644
--- a/ext/transcode/main.php
+++ b/ext/transcode/main.php
@@ -12,6 +12,15 @@
  *  If and image is uanble to be transcoded for any reason, the upload will continue unaffected.
  */
 
+class TranscodeConfig
+{
+    const ENGINE = "transcode_engine";
+    const ENABLED = "transcode_enabled";
+    const UPLOAD = "transcode_upload";
+    const UPLOAD_PREFIX = "transcode_upload_";
+    const QUALITY = "transcode_quality";
+}
+
  /*
  * This is used by the image transcoding code when there is an error while transcoding
  */
@@ -221,7 +230,7 @@ class TranscodeImage extends Extension
         $engine = $config->get_string("transcode_engine");
 
         if ($user->is_admin()) {
-            $event->add_action("bulk_transcode", "Transcode", "", $this->theme->get_transcode_picker_html($this->get_supported_output_formats($engine)));
+            $event->add_action(self::ACTION_BULK_TRANSCODE, "Transcode", null,"", $this->theme->get_transcode_picker_html($this->get_supported_output_formats($engine)));
         }
     }
 
diff --git a/ext/trash/main.php b/ext/trash/main.php
index 1c9484d3..dd9aa72b 100644
--- a/ext/trash/main.php
+++ b/ext/trash/main.php
@@ -124,7 +124,7 @@ class Trash extends Extension
         global $user;
 
         if ($user->can("view_trash")&&in_array("in:trash", $event->search_terms)) {
-            $event->add_action("bulk_trash_restore","Restore From Trash");
+            $event->add_action("bulk_trash_restore","(U)ndelete", "u");
         }
     }