Amount of points displayed in surfbar, more fixes

diff --git a/surfbar.php b/surfbar.php
index 3c23ad4de53a396acd58522e5ef52e219a163fa1..703e39be1f498a0abbf9a2f517e7521147d672fd 100644 (file)
--- 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 4ff666d142dc9b0be512ab1e0590fd8b4d1c128f..c9713919a02251c6d68b70c47574c30955b471a9 100644 (file)
--- 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 d6f48f9f25e1f5836d793185d38c26ab45c3d19e..b61239b9e54cabbefb320aef2ca8d8817515664c 100644 (file)
--- 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 1f1f41db9097f83e27f6ac7aebf8afbc10850386..c8ced309f5fd6e47984d2fb3676ef21a0e91915a 100644 (file)
--- 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 a1329e5cce6ef147f1b2316d40194044249dc640..5baf67cfe6d40bcf59de0d0144ed864d1b2d9b35 100644 (file)
--- 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 03743cee104aca10728004b4556f5afe37382dfd..9759d973642288f5ec04b25e61e9899773e6d4b5 100644 (file)
--- a/theme/desert/css/surfbar.css
+++ b/theme/desert/css/surfbar.css
@@ -17,3 +17,6 @@
 }
 .surfbar_max {
 }
+.surfbar_points {
+       font-weight             : bold;
+}