Frameset support entirely removed, TODO extended, minor template fix

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index 4966280da18cfbf8b0bd7acdfc0ef804ec99ce67..9cc8187bb4bda5eb9d2ef3c446fb1219b3103402 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -52,12 +52,12 @@ require("inc/config.php");
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Only logged in users may use this surfbar!
-       if (!IS_MEMBER()) {
-               // Redirect
-               LOAD_URL(URL."/modules.php?module=index");
-       } elseif (!EXT_IS_ACTIVE("surfbar")) {
+       if (!EXT_IS_ACTIVE("surfbar")) {
                // Surfbar deactivated
                LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
+       } elseif (!IS_MEMBER()) {
+               // Redirect
+               LOAD_URL(URL."/modules.php?module=index");
        }
 
        // Handle tasks on self-maintenance
@@ -128,7 +128,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        SURFBAR_LOCKDOWN_ID($_GET['id']);
 
                        // Code is valid so pay points here
-                       SURFBAR_PAY_POINTS($_GET['id']);
+                       SURFBAR_PAY_POINTS();
 
                        // Check if reload is full
                        if (SURFBAR_CHECK_RELOAD_FULL()) {
@@ -163,7 +163,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                        'salt'        => SURFBAR_GET_SALT(),
                                        'reward'      => TRANSLATE_COMMA(SURFBAR_GET_REWARD($nextId)),
                                        'url'         => SURFBAR_GET_URL($nextId),
-                                       'curr_reload' => SURFBAR_GET_USER_RELOAD_LOCK(),
+                                       'curr_reload' => SURFBAR_GET_USER_LOCKS(),
                                        'max_urls'    => SURFBAR_GET_TOTAL_URLS(),
                                        'reload'      => SURFBAR_GET_RELOAD_TIME($nextId),
                                        'xxx'         => str_repeat("X", strlen(SURFBAR_GET_RELOAD_TIME($nextId)))