From 28c89a327172118d6ea4040fd3df05810cd9430b Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Sat, 3 May 2008 19:40:15 +0000
Subject: [PATCH] Bugtracker #4407 - problems with banner login

---
 banner.php                                | 21 ++++++++++++---------
 e107_themes/templates/banner_template.php |  3 ++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/banner.php b/banner.php
index bf82831de..052138ba6 100644
--- a/banner.php
+++ b/banner.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/banner.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-04-29 19:48:45 $
+|     $Revision: 1.3 $
+|     $Date: 2008-05-03 19:39:59 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -68,7 +68,8 @@ if (isset($_POST['clientsubmit'])) {
 			$BANNER_TABLE_STARTDATE = BANNERLAN_37." ".$start_date;
 			$BANNER_TABLE_ENDDATE = BANNERLAN_34." ".$end_date;
 			
-			if ($row['banner_ip']) {
+			if ($row['banner_ip']) 
+			{
 				$tmp = explode("^", $row['banner_ip']);
 				$BANNER_TABLE_IP_LAN = (count($tmp)-1);
 				for($a = 0; $a <= (count($tmp)-2); $a++) {
@@ -76,22 +77,24 @@ if (isset($_POST['clientsubmit'])) {
 				}
 			}
 			 
-			if (!$BANNER_TABLE) {
+			if (!$BANNER_TABLE) 
+			{
 				if (file_exists(THEME."banner_template.php")) {
-					require_once(THEME."banner_template.php");
+					require(THEME."banner_template.php");
 				} else {
-					require_once(e_BASE.$THEMES_DIRECTORY."templates/banner_template.php");
+					require(e_BASE.$THEMES_DIRECTORY."templates/banner_template.php");
 				}
 			}
 			$textstring .= preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_TABLE);
 		}
 	}
 	 
-	if (!$BANNER_TABLE) {
+	if (!$BANNER_TABLE) 
+	{
 		if (file_exists(THEME."banner_template.php")) {
-			require_once(THEME."banner_template.php");
+			require(THEME."banner_template.php");
 		} else {
-			require_once(e_BASE.$THEMES_DIRECTORY."templates/banner_template.php");
+			require(e_BASE.$THEMES_DIRECTORY."templates/banner_template.php");
 		}
 	}
 	$textstart = preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_TABLE_START);
diff --git a/e107_themes/templates/banner_template.php b/e107_themes/templates/banner_template.php
index 137e1da94..98520c5a2 100644
--- a/e107_themes/templates/banner_template.php
+++ b/e107_themes/templates/banner_template.php
@@ -1,10 +1,11 @@
 <?php
-// $Id: banner_template.php,v 1.2 2007-12-06 21:35:55 e107steved Exp $
+// $Id: banner_template.php,v 1.3 2008-05-03 19:39:59 e107steved Exp $
 
 if (!defined('e107_INIT')) { exit; }
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:98%"); }
 
 // ##### LOGIN TABLE -------------------------------------------------------------------------------
+global $BANNER_LOGIN_TABLE;
 if(!isset($BANNER_LOGIN_TABLE))
 {
 		$BANNER_LOGIN_TABLE = "