X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=surfbar.php;h=8ad2c2af012473fd73719298e06bc00aa866b8fb;hb=d51d90ea79446c288184b023a7d1d3adabe739c3;hp=cacbe4e64fcd13a1a74ae2622475bf57bbcbd05e;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git

diff --git a/surfbar.php b/surfbar.php
index cacbe4e64f..8ad2c2af01 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -68,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');
@@ -79,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
@@ -163,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();
@@ -174,16 +177,11 @@ 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) {
@@ -207,6 +205,9 @@ 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 /><strong>content</strong>=<pre>' . print_r($content, true) . '</pre>');
 	loadTemplate($templateName, false, $content);