Menu block 'logout' is now weighted 999 as default

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index ccec32bb02fc723e781783281d2aee9a2f1f57b9..eb9ab63004b2dda97c1ca90a7851760718a39aff 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -80,7 +79,7 @@ if (!isMember()) {
                        // Is there a 'code' provided?
                        if (isGetRequestParameterSet('code')) {
                                // Then generate an error message
-                               loadTemplate('admin_settings_saved', false, getMessageFromErrorCode(getRequestParameter('code')));
+                               displayMessage(getMessageFromErrorCode(getRequestParameter('code')));
                        } // END - if
 
                        // Display login form
@@ -94,7 +93,7 @@ if (!isMember()) {
                }
        } else {
                // Redirect
-               redirectToUrl('index.php');
+               redirectToUrl('modules.php?module=index');
        }
 } // END - if
 
@@ -121,19 +120,10 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
                // This makes the footer appear again
                unsetGetRequestParameter('frame');
        } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stats')) {
-               // Get total points amount
-               $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-
                // Prepare content
                $content = array(
-                       'points'   => translateComma($points),
-                       'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
-                       'reload'   => (getConfig('surfbar_stats_reload') * 1000),
-                       'c_total'  => translateComma(getConfig('surfbar_total_counter')),
-                       'c_today'  => translateComma(getConfig('surfbar_daily_counter')),
-                       'c_yester' => translateComma(getConfig('surfbar_yester_counter')),
-                       'c_week'   => translateComma(getConfig('surfbar_weekly_counter')),
-                       'c_month'  => translateComma(getConfig('surfbar_monthly_counter')),
+                       'points' => getTotalPoints(getMemberId()),
+                       'reload' => (getConfig('surfbar_stats_reload') * 1000)
                );
 
                // Load template for "stats" page
@@ -141,8 +131,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
        } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'textlinks')) {
                // Prepare content
                $content = array(
-                       'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
-                       'reload'   => (getConfig('surfbar_stats_reload') * 1000)
+                       'reload' => (getConfig('surfbar_stats_reload') * 1000)
                );
 
                // Load template for "stats" page
@@ -200,15 +189,8 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
                if ($nextId > 0) {
                        // Then prepare other content
                        $content = array(
-                               'id'          => $nextId,
-                               'check'       => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
-                               'salt'        => SURFBAR_GET_SALT(),
-                               'reward'      => translateComma(SURFBAR_GET_REWARD($nextId)),
-                               'url'         => SURFBAR_GET_URL($nextId),
-                               '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)))
+                               'url_id' => $nextId,
+                               'xxx'    => str_repeat('X', strlen(SURFBAR_GET_RELOAD_TIME($nextId))),
                        );
 
                        // Update salt (double-call lock!) and statistics
@@ -226,7 +208,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
        loadIncludeOnce('inc/header.php');
 
        // Load that template
-       //* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
+       //* DEBUG: */ die('templateName=' . $templateName . '<br /><strong>content</strong>=<pre>' . print_r($content, true) . '</pre>');
        loadTemplate($templateName, false, $content);
 }