X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=surfbar.php;h=700bd62c77dd4c794e72d0c8d805cbb6c527120d;hb=c92c887891e04b93486205d74fd6c16158de30fc;hp=dea767a00bd568d614b83a7ad814ae810cef9582;hpb=d8d0eaf655fda97f85f94355e6416c224d8508cd;p=mailer.git

diff --git a/surfbar.php b/surfbar.php
index dea767a00b..700bd62c77 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Die Surfbar selbst                               *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -74,7 +69,7 @@ if (!isMember()) {
 			redirectToUrl($url);
 		} else {
 			// Load header
-			loadIncludeOnce('inc/header.php');
+			loadPageHeader();
 
 			// Is there a 'code' provided?
 			if (isGetRequestElementSet('code')) {
@@ -89,7 +84,7 @@ if (!isMember()) {
 			$GLOBALS['__header_sent'] = 2;
 
 			// Load footer
-			loadIncludeOnce('inc/footer.php');
+			loadPageFooter();
 		}
 	} else {
 		// Redirect
@@ -107,7 +102,7 @@ doSurfbarSelfMaintenance();
 if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
 	// Reload-lock is full, surfbar stopped so...
 	// Load header
-	loadIncludeOnce('inc/header.php');
+	loadPageHeader();
 
 	// Load template
 	if (((!isFullPage()) && (getRequestElement('frame') == 'stop2')) || (isFullPage())) {
@@ -165,13 +160,13 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
 		} // END - if
 
 		// Load header to avoid a bug
-		loadIncludeOnce('inc/header.php');
+		loadPageHeader();
 	} else {
 		// Reload to stop frame!
 		redirectToSurfbarStopPage();
 	}
 
-	// All done, so fix notice for footer.php
+	// All done, so fix notice for loadTemplateFooter()
 	$GLOBALS['__footer_sent'] = 1;
 } else {
 	// Prepare content
@@ -184,11 +179,11 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
 		//* DEBUG: */ exit('nextId='.$nextId);
 
 		// Is there a valid id?
-		if ($nextId > 0) {
+		if (isValidId($nextId)) {
 			// Then prepare other content
 			$content = array(
 				'url_id' => $nextId,
-				'xxx'    => str_repeat('X', strlen(getSurfbarReloadTime($nextId))),
+				'xxx'    => str_repeat('X', strlen(getSurfbarWaitingTime($nextId))),
 			);
 
 			// Update salt (double-call lock!) and statistics
@@ -203,7 +198,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
 	}
 
 	// Load header
-	loadIncludeOnce('inc/header.php');
+	loadPageHeader();
 
 	// Determine template name
 	$templateName = determineSurfbarTemplateName();
@@ -215,7 +210,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
 
 // Load footer
 $GLOBALS['__footer_sent'] = 3;
-loadIncludeOnce('inc/footer.php');
+loadPageFooter();
 
 // [EOF]
 ?>