From 6774bce34f0ad123179abbec67ae19ec2156c31f Mon Sep 17 00:00:00 2001
From: Squidly271 <unraidsquid@gmail.com>
Date: Fri, 23 May 2025 12:30:06 -0400
Subject: [PATCH 1/2] Feat: Selectable placement of Terminal Button

Defaults to not display in header.  Also allows GUI search to index 'terminal'
---
 emhttp/plugins/dynamix/DisplaySettings.page |  6 +++++
 emhttp/plugins/dynamix/Terminal.page        | 25 +++++++++++++++++++++
 emhttp/plugins/dynamix/TerminalButton.page  |  1 +
 emhttp/plugins/dynamix/default.cfg          |  1 +
 4 files changed, 33 insertions(+)
 create mode 100644 emhttp/plugins/dynamix/Terminal.page

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 4c1160203..dc7792666 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -203,6 +203,12 @@ _(Page view)_:
 
 :display_page_view_help:
 
+_(Show Terminal Button in header)_:
+: <select name="terminalButton">
+  <?=mk_option($display['terminalButton'],"no",_("No"))?>
+  <?=mk_option($display['terminalButton'],"yes",_("Yes"))?>
+  </select>
+
 _(Placement of Users menu)_:
 : <select name="users">
   <?=mk_option($display['users'], "Tasks:3", _('Header menu'))?>
diff --git a/emhttp/plugins/dynamix/Terminal.page b/emhttp/plugins/dynamix/Terminal.page
new file mode 100644
index 000000000..e5d5825f6
--- /dev/null
+++ b/emhttp/plugins/dynamix/Terminal.page
@@ -0,0 +1,25 @@
+Menu="UNRAID-OS"
+Title="Open Terminal"
+Icon="terminal"
+---
+<?PHP
+/* Copyright 2025, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<script>
+$(function(){
+  var d = new Date();
+  openTerminal('ttyd','Web Terminal '+d.getTime(),'');
+  // Give time for terminal to open then go back to the previous page
+  setTimeout(function(){
+    window.location.href = '<?=$_SERVER['HTTP_REFERER']?>';
+  },5000);
+});
+</script>
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix/TerminalButton.page b/emhttp/plugins/dynamix/TerminalButton.page
index 3c35d623f..7e91041ec 100644
--- a/emhttp/plugins/dynamix/TerminalButton.page
+++ b/emhttp/plugins/dynamix/TerminalButton.page
@@ -2,6 +2,7 @@ Menu="Buttons:3"
 Title="Terminal"
 Icon="icon-u-terminal"
 Code="e93f"
+Cond="($display['terminalButton'] == 'yes')"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
diff --git a/emhttp/plugins/dynamix/default.cfg b/emhttp/plugins/dynamix/default.cfg
index d43fbc22b..c0689f732 100644
--- a/emhttp/plugins/dynamix/default.cfg
+++ b/emhttp/plugins/dynamix/default.cfg
@@ -17,6 +17,7 @@ banner=""
 header=""
 background=""
 tabs="1"
+terminalButton="no"
 users="Tasks:3"
 usage="0"
 text="1"

From 2ddeadbe099e347c247c6ee26bc2eb133b531683 Mon Sep 17 00:00:00 2001
From: Squidly271 <unraidsquid@gmail.com>
Date: Fri, 23 May 2025 12:55:29 -0400
Subject: [PATCH 2/2] Update emhttp/plugins/dynamix/Terminal.page

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 emhttp/plugins/dynamix/Terminal.page | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/Terminal.page b/emhttp/plugins/dynamix/Terminal.page
index e5d5825f6..923f5cfdf 100644
--- a/emhttp/plugins/dynamix/Terminal.page
+++ b/emhttp/plugins/dynamix/Terminal.page
@@ -16,10 +16,22 @@ Icon="terminal"
 <script>
 $(function(){
   var d = new Date();
-  openTerminal('ttyd','Web Terminal '+d.getTime(),'');
+  try {
+    openTerminal('ttyd', 'Web Terminal ' + d.getTime(), '');
+  } catch (e) {
+    console.error('Failed to open terminal:', e);
+    window.location.href = '/';
+    return;
+  }
   // Give time for terminal to open then go back to the previous page
+  var referer = '<?= htmlspecialchars($_SERVER['HTTP_REFERER'] ?? '', ENT_QUOTES) ?>';
   setTimeout(function(){
-    window.location.href = '<?=$_SERVER['HTTP_REFERER']?>';
-  },5000);
+    // Only redirect to same origin or fallback to home
+    if (referer && referer.indexOf(window.location.origin) === 0) {
+      window.location.href = referer;
+    } else {
+      window.location.href = '/';
+    }
+  }, 5000);
 });
 </script>
\ No newline at end of file