From e25143b036fb223c0b8fa3be79aed21ff808c016 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 6 Apr 2020 02:05:42 -0400 Subject: [PATCH] Remove dedicated help popup. Use instead. --- help.php | 41 --------------------------------------- includes/functions.php | 20 +++++-------------- templates/help_link.tpl | 2 +- templates/help_window.tpl | 23 ---------------------- 4 files changed, 6 insertions(+), 80 deletions(-) delete mode 100644 help.php delete mode 100644 templates/help_window.tpl diff --git a/help.php b/help.php deleted file mode 100644 index 044a003..0000000 --- a/help.php +++ /dev/null @@ -1,41 +0,0 @@ -in['topic'] OR !isset(bugdar::$datastore['help'][ $bugsys->in['topic'] ])) -{ - $topic['title'] = T('Invalid'); - $topic['body'] = T('That help topic does not exist in the system.'); -} -else -{ - $topic = bugdar::$datastore['help'][ $bugsys->in['topic'] ]; - $topic['body'] = nl2br($topic['body']); -} - -eval('$template->flush("' . $template->fetch('help_window') . '");'); - diff --git a/includes/functions.php b/includes/functions.php index 6f28571..b265377 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -551,24 +551,14 @@ function isso_pre_parse_hook($template) function fetch_help_link($topic) { global $bugsys; - + + $helptext = "[[INVALID TOPIC: $topic]]"; if (isset(bugdar::$datastore['help']["$topic"])) { - eval('$temp = "' . $bugsys->template->fetch('help_link') . '";'); - return $temp; - } - else - { - if ($bugsys->debug) - { - return "[[INVALID TOPIC: $topic]]"; - } - // do we want this? - else if (null == 1) - { - return eval('$temp = "' . $bugsys->template->fetch('help_link') . '";'); - } + $helptext = bugdar::$datastore['help']["$topic"]['body']; } + eval('$temp = "' . $bugsys->template->fetch('help_link') . '";'); + return $temp; } // ################################################################### diff --git a/templates/help_link.tpl b/templates/help_link.tpl index 67ad92e..4a8ce9c 100644 --- a/templates/help_link.tpl +++ b/templates/help_link.tpl @@ -1 +1 @@ -? \ No newline at end of file +? diff --git a/templates/help_window.tpl b/templates/help_window.tpl deleted file mode 100644 index 181aa55..0000000 --- a/templates/help_window.tpl +++ /dev/null @@ -1,23 +0,0 @@ -$doctype - - -$headinclude - - {@"Help"} - $topic[title] - - - - -
-
-
{@"Help"} : $topic[title]
- -
- $topic[body] -
-
-
- - - - \ No newline at end of file -- 2.43.5