From 534c6d62f9e0505347d326c8a3c725be4c188e09 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 10 Mar 2021 14:18:45 +0100
Subject: [PATCH] Bugfix dashboard widget headers, partly revert and explain
 https://github.com/opnsense/core/commit/f67e242eaabb6db3ed98195586221bd0b054a0f0.
 closes https://github.com/opnsense/core/issues/4795

---
 src/www/foot.inc  | 5 +++--
 src/www/index.php | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/www/foot.inc b/src/www/foot.inc
index 0f6971e3a..9c8834b99 100644
--- a/src/www/foot.inc
+++ b/src/www/foot.inc
@@ -36,8 +36,9 @@
               $widgettitlelink = $widgetItem['name'] . "_title_link";?>
               <tr id="add_widget_<?=$widgetItem['name']; ?>">
 <?php
-              if (isset($widgettitle)):?>
-                  <td style="cursor: pointer;" onclick='return addWidget("<?=$widgetItem['name']; ?>")'><?=$widgettitle; ?></td>
+              // XXX: ${$} is intentional here, the widgets leave global vars [widget_name]_title_link and [widget_name]_title
+              if (isset(${$widgettitle})):?>
+                  <td style="cursor: pointer;" onclick='return addWidget("<?=$widgetItem['name']; ?>")'><?=$$widgettitle; ?></td>
 <?php
               elseif (!empty($widgetItem['display_name'])): ?>
                   <td style="cursor: pointer;" onclick='return addWidget("<?=$widgetItem['name']; ?>")'><?=$widgetItem['display_name']; ?></td>
diff --git a/src/www/index.php b/src/www/index.php
index dd6abb024..5680dd820 100644
--- a/src/www/index.php
+++ b/src/www/index.php
@@ -383,12 +383,13 @@ include("fbegin.inc");?>
                 <ul class="list-inline __nomb">
                   <li><h3>
 <?php
-                    if (isset($widgettitlelink)):?>
-                        <u><span onclick="location.href='/<?= $widgettitlelink ?>'" style="cursor:pointer">
+                    // XXX: ${$} is intentional here, the widgets leave global vars [widget_name]_title_link and [widget_name]_title
+                    if (isset($$widgettitlelink)):?>
+                        <u><span onclick="location.href='/<?= ${$widgettitlelink} ?>'" style="cursor:pointer">
 <?php
                     endif;
-                        echo empty($widgettitle) ?   $widgetItem['display_name'] : $widgettitle;
-                    if (isset($widgettitlelink)):?>
+                        echo empty($$widgettitle) ?   $widgetItem['display_name'] : ${$widgettitle};
+                    if (isset(${$widgettitlelink})):?>
                         </span></u>
 <?php
                     endif;?>