From 61cd73076e1e1a2d3e6fe63bab0c8a6957fbb26e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 8 Sep 2008 11:27:15 +0000
Subject: [PATCH] Amount of points displayed in surfbar, more fixes

---
 surfbar.php                                      | 11 +++++++++--
 templates/de/html/member/member_surfbar_link.tpl |  2 +-
 templates/de/html/surfbar/surfbar_frame_top.tpl  |  9 ++++++---
 theme/business/css/surfbar.css                   |  3 +++
 theme/default/css/surfbar.css                    |  3 +++
 theme/desert/css/surfbar.css                     |  3 +++
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/surfbar.php b/surfbar.php
index 3c23ad4de5..703e39be1f 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -55,7 +55,10 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	if (!IS_LOGGED_IN()) {
 		// Redirect
 		LOAD_URL(URL."/modules.php?module=index");
-	} // END - if
+	} elseif (!EXT_IS_ACTIVE("surfbar")) {
+		// Surfbar deactivated
+		LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM);
+	}
 
 	// Is there a check value?
 	if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (($_GET['frame'] == "stop") || ($_GET['frame'] == "stop2")))) {
@@ -123,6 +126,9 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 
 			// Is there a valid id?
 			if ($nextId > 0) {
+				// Get total points amount
+				$points = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
+
 				// Then prepare other content
 				$content = array(
 					'id'          => $nextId,
@@ -132,7 +138,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 					'url'         => SURFBAR_GET_URL($nextId),
 					'curr_reload' => SURFBAR_GET_USER_RELOAD_LOCK(),
 					'max_urls'    => SURFBAR_GET_TOTAL_URLS(),
-					'reload'      => SURFBAR_GET_RELOAD_TIME($nextId)
+					'reload'      => SURFBAR_GET_RELOAD_TIME($nextId),
+					'points'      => TRANSLATE_COMMA($points)
 				);
 
 				// Update salt (double-call lock!)
diff --git a/templates/de/html/member/member_surfbar_link.tpl b/templates/de/html/member/member_surfbar_link.tpl
index 4ff666d142..c9713919a0 100644
--- a/templates/de/html/member/member_surfbar_link.tpl
+++ b/templates/de/html/member/member_surfbar_link.tpl
@@ -1,3 +1,3 @@
 <div class="member_title2 dashed" style="width:600px;margin-top:10px">
-	&gt;&gt;&nbsp;<strong><a href="{!URL!}/surfbar.php" target="_blank">Jetzt die Surfbar starten!</a></strong>&nbsp;&lt;&lt;
+	&gt;&gt;&nbsp;<strong><a href="{!URL!}/surfbar.php">Jetzt die Surfbar starten!</a></strong>&nbsp;&lt;&lt;
 </div>
diff --git a/templates/de/html/surfbar/surfbar_frame_top.tpl b/templates/de/html/surfbar/surfbar_frame_top.tpl
index d6f48f9f25..b61239b9e5 100644
--- a/templates/de/html/surfbar/surfbar_frame_top.tpl
+++ b/templates/de/html/surfbar/surfbar_frame_top.tpl
@@ -8,9 +8,12 @@
 		 class="surfbar_max">$content[max_urls]</span> im Reload&laquo;<br />
 
 		&raquo;<a href="$content[url]" target="_blank">Aktuelle Seite in neuem
-		Fenster &ouml;ffnen</a>&laquo;<br />&nbsp;[<a target="_parent"
-		 href="{!URL!}/modules.php?module=login&amp;what=logout">Ausloggen</a>|<a
-		 href="javascript:window.close()">Schliessen</a>]
+		Fenster &ouml;ffnen</a>&laquo;<br />
+		[<a target="_parent" href="{!URL!}/modules.php?module=login">Loginbereich</a>|<a
+		 target="_parent" href="{!URL!}/modules.php?module=login&amp;what=logout">Ausloggen</a>|<a
+		 href="javascript:window.close()">Schliessen</a>]&nbsp;&raquo;Guthaben:&nbsp;<span
+		 class="surfbar_points">$content[points]&nbsp;{!POINTS!}</span>&laquo;
+		<br />
 
 		&raquo;{!MAIN_TITLE!} ist f&uuml;r den Inhalt nicht verantwortlich!&laquo;
 	</td>
diff --git a/theme/business/css/surfbar.css b/theme/business/css/surfbar.css
index 1f1f41db90..c8ced309f5 100644
--- a/theme/business/css/surfbar.css
+++ b/theme/business/css/surfbar.css
@@ -16,3 +16,6 @@
 }
 .surfbar_max {
 }
+.surfbar_points {
+	font-weight		: bold;
+}
\ No newline at end of file
diff --git a/theme/default/css/surfbar.css b/theme/default/css/surfbar.css
index a1329e5cce..5baf67cfe6 100644
--- a/theme/default/css/surfbar.css
+++ b/theme/default/css/surfbar.css
@@ -16,3 +16,6 @@
 }
 .surfbar_max {
 }
+.surfbar_points {
+	font-weight		: bold;
+}
diff --git a/theme/desert/css/surfbar.css b/theme/desert/css/surfbar.css
index 03743cee10..9759d97364 100644
--- a/theme/desert/css/surfbar.css
+++ b/theme/desert/css/surfbar.css
@@ -17,3 +17,6 @@
 }
 .surfbar_max {
 }
+.surfbar_points {
+	font-weight		: bold;
+}
-- 
2.39.5