Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1598)
+++ branches/2.8.x/CHANGELOG	(revision 1599)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+06 Feb-2012 Build 1599 Dietmar Woellbrink (Luisehahne)
+! update all used files with redirect_url to $_SESSION['HTTP_REFERER']
 06 Feb-2012 Build 1598 Dietmar Woellbrink (Luisehahne)
 # fixed undefined fragment index in initialize.php 
 ! add $_SESSION['HTTP_REFERER'] storing active pagelink if page_id != 0
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1598)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1599)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2');
-if(!defined('REVISION')) define('REVISION', '1598');
+if(!defined('REVISION')) define('REVISION', '1599');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/account/login_form.php
===================================================================
--- branches/2.8.x/wb/account/login_form.php	(revision 1598)
+++ branches/2.8.x/wb/account/login_form.php	(revision 1599)
@@ -35,11 +35,7 @@
 	}
 }
 
-$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
-$_SESSION['PAGE_LINK'] = get_page_link( $page_id );
-if(!file_exists($_SESSION['PAGE_LINK'])) {$_SESSION['PAGE_LINK'] = WB_URL.'/'; }
-$_SESSION['HTTP_REFERER'] = $_SESSION['PAGE_LINK'];
-$thisApp->redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $_SESSION['PAGE_LINK'])
+$thisApp->redirect_url = (isset($thisApp->redirect_url) && ($thisApp->redirect_url!='')  ? $thisApp->redirect_url : $_SESSION['HTTP_REFERER'] );
 ?>
 <div style="margin: 1em auto;">
 	<button type="button" value="cancel" onClick="javascript: window.location = '<?php print $_SESSION['HTTP_REFERER'] ?>';"><?php print $TEXT['CANCEL'] ?></button>
Index: branches/2.8.x/wb/account/signup.php
===================================================================
--- branches/2.8.x/wb/account/signup.php	(revision 1598)
+++ branches/2.8.x/wb/account/signup.php	(revision 1599)
@@ -47,7 +47,7 @@
 	$load_language = false;
 }
 
-$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
+$page_id = (isset($_SESSION['PAGE_ID']) && ($_SESSION['PAGE_ID']!='') ? $_SESSION['PAGE_ID'] : 0);
 
 // Required page details
 // $page_id = 0;
Index: branches/2.8.x/wb/account/logout.php
===================================================================
--- branches/2.8.x/wb/account/logout.php	(revision 1598)
+++ branches/2.8.x/wb/account/logout.php	(revision 1599)
@@ -22,7 +22,7 @@
 	setcookie('REMEMBER_KEY', '', time()-3600, '/');
 }
 
-$redirect = ((isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != '') ?  $_SERVER['HTTP_REFERER'] : WB_URL.'/index.php');
+$redirect = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '') ?  $_SESSION['HTTP_REFERER'] : WB_URL.'/index.php');
 
 $_SESSION['USER_ID'] = null;
 $_SESSION['GROUP_ID'] = null;
Index: branches/2.8.x/wb/account/forgot_form.php
===================================================================
--- branches/2.8.x/wb/account/forgot_form.php	(revision 1598)
+++ branches/2.8.x/wb/account/forgot_form.php	(revision 1599)
@@ -18,9 +18,16 @@
 // Must include code to stop this file being access directly
 if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
 // Check if the user has already submitted the form, otherwise show it
+$message = $MESSAGE['FORGOT_PASS_NO_DATA'];
+$errMsg ='';
 if(isset($_POST['email']) && $_POST['email'] != "" )
 {
 	$email = strip_tags($_POST['email']);
+	if($admin->validate_email($email) == false)
+    {
+		$errMsg = $MESSAGE['USERS_INVALID_EMAIL'];
+		$email = '';
+	} else {
 // Check if the email exists in the database
 	$sql  = 'SELECT `user_id`,`username`,`display_name`,`email`,`last_reset`,`password` '.
 	        'FROM `'.TABLE_PREFIX.'users` '.
@@ -32,7 +39,7 @@
 		// Check if the password has been reset in the last 2 hours
 			if( (time() - (int)$results_array['last_reset']) < (2 * 3600) ) {
 			// Tell the user that their password cannot be reset more than once per hour
-				$message = $MESSAGE['FORGOT_PASS']['ALREADY_RESET'];
+				$errMsg = $MESSAGE['FORGOT_PASS_ALREADY_RESET'];
 			} else {
 				require_once(WB_PATH.'/framework/PasswordHash.php');
 				$pwh = new PasswordHash(0, true);
@@ -61,10 +68,10 @@
 						       'SET `password`=\''.$old_pass.'\' '.
 						       'WHERE `user_id`='.(int)$results_array['user_id'];
 						$database->query($sql);
-						$message = $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'];
+						$errMsg = $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'];
 					}
 				}else { // Error updating database
-					$message = $MESSAGE['RECORD_MODIFIED_FAILED'];
+					$errMsg = $MESSAGE['RECORD_MODIFIED_FAILED'];
 					if(DEBUG) {
 						$message .= '<br />'.$database->get_error();
 						$message .= '<br />'.$sql;
@@ -72,31 +79,27 @@
 				}
 			}
 		}else { // no record found - Email doesn't exist, so tell the user
-			$message = $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'];
+			$errMsg = $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'];
 		}
 	} else { // Query failed
-		$message = 'SystemError:: Database query failed!';
+		$errMsg = 'SystemError:: Database query failed!';
 		if(DEBUG) {
-			$message .= '<br />'.$database->get_error();
-			$message .= '<br />'.$sql;
+			$errMsg .= '<br />'.$database->get_error();
+			$errMsg .= '<br />'.$sql;
 		}
 	}
+	}
 } else {
 	$email = '';
 }
 
-if(isset($message) && $message != '') {
-	$message = $MESSAGE['FORGOT_PASS']['NO_DATA'];
-	$message_color = 'FF0000';
+if( ($errMsg=='') && ($message != '')) {
+	// $message = $MESSAGE['FORGOT_PASS_NO_DATA'];
+	$message_color = '000000';
 } else {
-	$message = $MESSAGE['FORGOT_PASS_NO_DATA'];
-	$message_color = '000000';
+	$message = $errMsg;
+	$message_color = 'ff0000';
 }
-
-$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0);
-$_SESSION['PAGE_LINK'] = get_page_link( $page_id );
-$_SESSION['HTTP_REFERER'] = (($_SESSION['PAGE_LINK']!='') ? page_link($_SESSION['PAGE_LINK']) : WB_URL);
-
 ?>
 <div style="margin: 1em auto;">
 	<button type="button" value="cancel" onClick="javascript: window.location = '<?php print $_SESSION['HTTP_REFERER'] ?>';"><?php print $TEXT['CANCEL'] ?></button>
@@ -107,7 +110,7 @@
 		<table cellpadding="5" cellspacing="0" border="0" align="center" width="500">
 		<tr>
 			<td height="40" align="center" style="color: #<?php echo $message_color; ?>;" colspan="2">
-			<?php echo $message; ?>
+			<strong><?php echo $message; ?></strong>
 			</td>
 		</tr>
 <?php if(!isset($display_form) OR $display_form != false) { ?>
Index: branches/2.8.x/wb/account/preferences_form.php
===================================================================
--- branches/2.8.x/wb/account/preferences_form.php	(revision 1598)
+++ branches/2.8.x/wb/account/preferences_form.php	(revision 1599)
@@ -25,9 +25,6 @@
 		exit(0);
 	}
 
-$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] );
-$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']);
-
 // load module default language file (EN)
 	require_once(WB_PATH .'/account/languages/EN.php');
 // check for user defined language file, load it and override EN-Settings with
Index: branches/2.8.x/wb/account/details.php
===================================================================
--- branches/2.8.x/wb/account/details.php	(revision 1598)
+++ branches/2.8.x/wb/account/details.php	(revision 1599)
@@ -41,6 +41,7 @@
 		$_SESSION['DISPLAY_NAME'] = $display_name;
 		$_SESSION['LANGUAGE'] = $language;
 		$_SESSION['TIMEZONE'] = $timezone;
+		$_SESSION['HTTP_REFERER'] = (($_SESSION['LANGUAGE']== LANGUAGE) ? $_SESSION['HTTP_REFERER'] : WB_URL);
 // Update date format
 		if($date_format != '') {
 			$_SESSION['DATE_FORMAT'] = $date_format;
Index: branches/2.8.x/wb/account/signup2.php
===================================================================
--- branches/2.8.x/wb/account/signup2.php	(revision 1598)
+++ branches/2.8.x/wb/account/signup2.php	(revision 1599)
@@ -22,10 +22,6 @@
 // require_once(WB_PATH.'/framework/class.wb.php');
 $wb = new wb('Start', 'start', false, false);
 
-$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0);
-$_SESSION['PAGE_LINK'] = get_page_link( $page_id );
-$_SESSION['HTTP_REFERER'] = (($_SESSION['PAGE_LINK']!='') ? page_link($_SESSION['PAGE_LINK']) : WB_URL);
-
 // Get details entered
 $groups_id = FRONTEND_SIGNUP;
 $active = 1;
@@ -123,7 +119,7 @@
 	$mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO']);
 
 	// Try sending the email
-	if($wb->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { 
+	if($wb->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) {
 		$display_form = false;
 		$wb->print_success($MESSAGE['FORGOT_PASS']['PASSWORD_RESET'], WB_URL.'/account/login.php' );
 	} else {
Index: branches/2.8.x/wb/account/signup_form.php
===================================================================
--- branches/2.8.x/wb/account/signup_form.php	(revision 1598)
+++ branches/2.8.x/wb/account/signup_form.php	(revision 1599)
@@ -21,9 +21,6 @@
 
 require_once(WB_PATH.'/include/captcha/captcha.php');
 
-$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] );
-$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']);
-
 ?>
 <div style="margin: 1em auto;">
 	<button type="button" value="cancel" onClick="javascript: window.location = '<?php print $_SESSION['HTTP_REFERER'] ?>';"><?php print $TEXT['CANCEL'] ?></button>
@@ -50,7 +47,7 @@
 	<?php }
 	?>
     </div>
-<table cellpadding="5" cellspacing="0" border="0" width="90%">
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="90%">
 <tr>
 	<td width="180"><?php echo $TEXT['USERNAME']; ?>:</td>
 	<td class="value_input">
Index: branches/2.8.x/wb/account/template.html
===================================================================
--- branches/2.8.x/wb/account/template.html	(revision 1598)
+++ branches/2.8.x/wb/account/template.html	(revision 1599)
@@ -16,7 +16,7 @@
 <hr />
 <form name="details" action="" method="post">
 	<h3>{HEADING_MY_SETTINGS}</h3>
-	<table cellpadding="5" cellspacing="0" border="0" width="100%">
+	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
 		<tr>
 			<td width="160">{TEXT_DISPLAY_NAME}:</td>
 			<td>
@@ -78,7 +78,7 @@
 <hr />
 <form name="email" action="" method="post">
 	<h3>{HEADING_MY_EMAIL}</h3>
-	<table cellpadding="5" cellspacing="0" border="0" width="100%">
+	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
 		<tr>
 			<td>{TEXT_EMAIL}:</td>
 			<td>
@@ -103,7 +103,7 @@
 <hr />
 <form name="password" action="" method="post">
 	<h3>{HEADING_MY_PASSWORD}</h3>
-	<table cellpadding="5" cellspacing="0" border="0" width="100%">
+	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
 		<tr>
 			<td width="160">{TEXT_CURRENT_PASSWORD}:</td>
 			<td>
Index: branches/2.8.x/wb/templates/allcss/index.php
===================================================================
--- branches/2.8.x/wb/templates/allcss/index.php	(revision 1598)
+++ branches/2.8.x/wb/templates/allcss/index.php	(revision 1599)
@@ -83,8 +83,8 @@
 		show_menu2(0,SM2_ROOT,SM2_CURR+1,SM2_TRIM,'<li><span class="menu-default">[ac][menu_title]</a></span>','</li>','<ul>','</ul>');
 		// CODE FOR WEBSITE BAKER FRONTEND LOGIN
 		if (FRONTEND_LOGIN == 'enabled' && VISIBILITY != 'private' && $wb->get_session('USER_ID') == '') {
-			$redirect_url = ((isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != '') ? $_SERVER['HTTP_REFERER'] : WB_URL );
-			$redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url );?>
+			$redirect_url = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '') ? $_SESSION['HTTP_REFERER'] : WB_URL );
+			$redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url );
 			<!-- login form -->
 			<br />
 			<form name="login" id="login" action="<?php echo LOGIN_URL; ?>" method="post">
Index: branches/2.8.x/wb/templates/round/index.php
===================================================================
--- branches/2.8.x/wb/templates/round/index.php	(revision 1598)
+++ branches/2.8.x/wb/templates/round/index.php	(revision 1599)
@@ -55,11 +55,11 @@
 
 <body>
 
-<table cellpadding="0" cellspacing="0" border="0" align="center" class="main" width="750">
+<table summary="" cellpadding="0" cellspacing="0" border="0" align="center" class="main" width="750">
 <tr>
 	<td colspan="2" class="header" height="80">
 		<a href="<?php echo WB_URL; ?>">
-			<img src="<?php echo TEMPLATE_DIR; ?>/images/banner.jpg" border="0" width="750" height="80" alt="<?php 
+			<img src="<?php echo TEMPLATE_DIR; ?>/images/banner.jpg" border="0" width="750" height="80" alt="<?php
 			page_title('', '[WEBSITE_TITLE]'); ?>" />
 		</a>
 	</td>
@@ -70,7 +70,7 @@
 	if(SHOW_MENU) {
 	?>	
 	<td style="padding: 10px; background-color: #FFF;" valign="top">
-		<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" class="menu">
+		<table summary="" cellpadding="0" cellspacing="0" border="0" width="150" align="center" class="menu">
 		<tr>
 			<td class="border">
 				<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
@@ -94,7 +94,7 @@
 		<form name="search" action="<?php echo WB_URL; ?>/search/index.php" method="get">
 			<input type="hidden" name="referrer" value="<?php
 				echo defined('REFERRER_ID') ? REFERRER_ID : PAGE_ID; ?>" />
-			<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
+			<table summary="" cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
 				<tr>
 					<td class="border">
 						<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
@@ -121,12 +121,12 @@
 		
 <?php
 		if(FRONTEND_LOGIN AND !$wb->is_authenticated() AND VISIBILITY != 'private' ) {
-			$redirect_url = ((isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != '') ? $_SERVER['HTTP_REFERER'] : WB_URL );
+			$redirect_url = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '') ? $_SESSION['HTTP_REFERER'] : WB_URL );
 			$redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url );
 ?>
 		<form name="login" action="<?php echo LOGIN_URL; ?>" method="post">
 			<input type="hidden" name="redirect" value="<?php echo $redirect_url;?>" /></p>
-			<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
+			<table summary="" cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
 			<tr>
 				<td class="border">
 					<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
@@ -184,7 +184,7 @@
 		?>
 		<form name="logout" action="<?php echo LOGOUT_URL; ?>" method="post">
 			
-			<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
+			<table summary="" cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
 			<tr>
 				<td class="border">
 					<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
Index: branches/2.8.x/wb/modules/droplets/example/LoginBox.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/example/LoginBox.php	(revision 1598)
+++ branches/2.8.x/wb/modules/droplets/example/LoginBox.php	(revision 1599)
@@ -68,9 +68,8 @@
 	}
 
 // Get redirect
-	$redirect_url = '';
-   	$redirect_url = isset($redirect)&&($redirect!='') ? '<input type="hidden" name="url" value="'.$redirect.'" />'."\n" : $redirect_url;
-	$redirect_url = (isset($_SERVER['HTTP_REFERER']) && ($redirect_url=='') ?  '<input type="hidden" name="url" value="'.$_SERVER['HTTP_REFERER'].'" />'."\n"  : $redirect_url );
+	$redirect_url = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '') ? $_SESSION['HTTP_REFERER'] : WB_URL );
+   	$redirect_url = (isset($redirect) && ($redirect!='') ? $redirect : $redirect_url);
 
 	if ( ( FRONTEND_LOGIN == 'enabled') &&
 		    ( VISIBILITY != 'private') &&
@@ -77,7 +76,7 @@
 		        ( $wb->get_session('USER_ID') == '')  )
 	{
 		$return_value .= '<form action="'.LOGIN_URL.'" method="post">'."\n";
-		$return_value .= $redirect_url."\n";
+		$return_value .= '<input type="hidden" name="url" value="'.$redirect_url.'" />'."\n";
     	$return_value .= '<fieldset>'."\n";
 		$return_value .= '<h1>'.$TEXT['LOGIN'].'</h1>'."\n";
 		$return_value .= '<label for="username">'.$TEXT['USERNAME'].':</label>'."\n";