From 01adf399bba4a7bab6b81a9e6c93de9be30d3e32 Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <github@tijnkuyper.nl>
Date: Sat, 26 Oct 2019 15:59:05 +0200
Subject: [PATCH] Banner e_help to Admin UI

---
 e107_plugins/banner/admin_banner.php          | 21 +++++++------------
 e107_plugins/banner/e_help.php                |  5 +++++
 .../banner/languages/English_admin.php        |  6 ++----
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php
index 70bb91cae..748ff13ea 100644
--- a/e107_plugins/banner/admin_banner.php
+++ b/e107_plugins/banner/admin_banner.php
@@ -6,20 +6,10 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * Banner Administration
+ * Banner Administration - Handles the display and sequencing of banners on web pages, including counting impressions
  *
 */
 
-/**
- *	e107 Banner management plugin
- *
- *	Handles the display and sequencing of banners on web pages, including counting impressions
- *
- *	@package	e107_plugins
- *	@subpackage	banner
- *
- */
-
 require_once('../../class2.php');
 if (!getperms('D') && !getperms('P'))
 {
@@ -61,8 +51,6 @@ e107::js('footer-inline','
 ');
 
 
-
-
 class banner_admin extends e_admin_dispatcher
 {
 
@@ -385,7 +373,12 @@ class banner_ui extends e_admin_ui
 			
 			//	$ns->tablerender(LAN_PLUGIN_BANNER_NAME.SEP.BNRLAN_36, $mes->render() . $text);
 		}
-	
+
+		public function renderHelp()
+		{
+			$help_text = str_replace("[br]", "<br />", BNRLAN_HELP_02);
+			return array('caption' => LAN_HELP, 'text' => $help_text);
+		}
 			
 }
 				
diff --git a/e107_plugins/banner/e_help.php b/e107_plugins/banner/e_help.php
index aef545643..f3c032cfb 100644
--- a/e107_plugins/banner/e_help.php
+++ b/e107_plugins/banner/e_help.php
@@ -9,6 +9,10 @@
  * Plugin - Banner
  *
 */
+// DEPRECATED FILE - help text now included renderHelp() in banner_config.php 
+return; 
+
+/*
 if (!defined('e107_INIT')) { exit; }
 if (!e107::isInstalled('banner')) 
 {
@@ -19,3 +23,4 @@ e107::includeLan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'admin_banner.php');
 $ns->tablerender(BNRLAN_HELP_01, BNRLAN_HELP_02);
 
 ?>
+*/
\ No newline at end of file
diff --git a/e107_plugins/banner/languages/English_admin.php b/e107_plugins/banner/languages/English_admin.php
index 88d03715e..240d2a56e 100644
--- a/e107_plugins/banner/languages/English_admin.php
+++ b/e107_plugins/banner/languages/English_admin.php
@@ -7,7 +7,6 @@
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  */
- 
 
 define("BNRLAN_00", "No banners created yet."); // 15
 define("BNRLAN_01", "Banner ID not found.");
@@ -71,7 +70,6 @@ define("BNRLAN_48", "All selected campaigns (no box rendering)");
 define("BNRLAN_50", "Local");
 define("BNRLAN_51", "Remote");
 
-define("BNRLAN_HELP_01", "Banner Help");
-define("BNRLAN_HELP_02", "Use this plugin to manage advertising on your website.<br /><br />When creating a new banner you can create a username and password for your client to login and check the progress of the campaign. <br /><br />You can enable the banner menu using the menu manager and perform further configuration from there.");
+//define("BNRLAN_HELP_01", "Banner Help"); LAN_HELP
 
-?>
+define("BNRLAN_HELP_02", "Use this plugin to manage advertising on your website.[br][br]When creating a new banner you can create a username and password for your client to login and check the progress of the campaign. [br][br]You can enable the banner menu using the menu manager and perform further configuration from there.");
\ No newline at end of file