Amount of points displayed in surfbar, more fixes

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index cc01a06f8dfb9af74fc5d7c5b927af4b349d5cbe..703e39be1f498a0abbf9a2f517e7521147d672fd 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -55,10 +55,13 @@ 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"))) {
+       if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (($_GET['frame'] == "stop") || ($_GET['frame'] == "stop2")))) {
                // Reload-lock is full, surfbar stopped so...
                // Load header
                require_once(PATH."inc/header.php");
@@ -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,12 +138,19 @@ 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!)
                                SURFBAR_UPDATE_SALT();
-                       } // END - if
+                       } else {
+                               // Load new URL
+                               LOAD_URL("surfbar.php?frame=stop2");
+                       }
+               } elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
+                       // Starter frame found so let the footer display
+                       unset($_GET['frame']);
                } else {
                        // Load header in frameset mode
                        $isFrameset = true;