X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=surfbar.php;h=8ad2c2af012473fd73719298e06bc00aa866b8fb;hb=2db306a4e4049ab759a10bb1e3c18d925d1583f9;hp=fb6a5dd02c7fdf057c51c92b7569a88e662047ba;hpb=b6a10f5ccfe2ff6e9e5c43f42e33966ae25ffbaa;p=mailer.git

diff --git a/surfbar.php b/surfbar.php
index fb6a5dd02c..8ad2c2af01 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -14,11 +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, 2010 by Mailer Developer Team                    *
+ * 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 *
@@ -70,10 +68,10 @@ if (!isMember()) {
 		// Is the form sent?
 		if ((isFormSent()) && (isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password'))) {
 			// Do the login procedure
-			$URL = doUserLogin(postRequestParameter('id'), postRequestParameter('password'), basename(__FILE__), basename(__FILE__) . '?code=');
+			$url = doUserLogin(postRequestParameter('id'), postRequestParameter('password'), basename(__FILE__), basename(__FILE__) . '?code=');
 
 			// And redirect to the URL
-			redirectToUrl($URL);
+			redirectToUrl($url);
 		} else {
 			// Load header
 			loadIncludeOnce('inc/header.php');
@@ -81,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
@@ -122,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
@@ -142,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
@@ -175,6 +163,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 			// Then load waiting page
 			SURFBAR_RELOAD_TO_STOP_PAGE();
 		} // END - if
+
+		// Load header to avoid a bug
+		loadIncludeOnce('inc/header.php');
 	} else {
 		// Reload to stop frame!
 		SURFBAR_RELOAD_TO_STOP_PAGE();
@@ -186,30 +177,18 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 	// Prepare content
 	$content = '';
 
-	// Determine template name
-	$templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
-
-	// Load header in frameset mode is the default
-	$isFrameset = true;
-
 	// Frame "top" set?
 	if ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'top')) {
 		// Determine next id
 		$nextId = SURFBAR_DETERMINE_NEXT_ID();
+		//* DEBUG: */ die('nextId='.$nextId);
 
 		// Is there a valid id?
 		if ($nextId > 0) {
 			// Then prepare other content
 			$content = array(
-				'url_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,8 +205,11 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 	// Load header
 	loadIncludeOnce('inc/header.php');
 
+	// Determine template name
+	$templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
+
 	// 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);
 }