Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1565)
+++ branches/2.8.x/CHANGELOG	(revision 1566)
@@ -11,6 +11,9 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+07 Jan-2012 Build 1566 Dietmar Woellbrink (Luisehahne)
+# fix class.login, when name and pass are both empty no longer call increase_attemps
+! some redirect updates in frontend account files
 06 Jan-2012 Build 1565 Dietmar Woellbrink (Luisehahne)
 ! fixed:: detection of serverdefined charsets more different
 06 Jan-2012 Build 1564 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1565)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1566)
@@ -52,5 +52,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', '1565');
+if(!defined('REVISION')) define('REVISION', '1566');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/account/forgot.php
===================================================================
--- branches/2.8.x/wb/account/forgot.php	(revision 1565)
+++ branches/2.8.x/wb/account/forgot.php	(revision 1566)
@@ -1,52 +1,52 @@
-<?php
-/**
- *
- * @category        frontend
- * @package         account
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require_once('../config.php');
-
-// Required page details
-$page_id = 0;
-$page_description = '';
-$page_keywords = '';
-define('PAGE_ID', 0);
-define('ROOT_PARENT', 0);
-define('PARENT', 0);
-define('LEVEL', 0);
-define('PAGE_TITLE', $MENU['FORGOT']);
-define('MENU_TITLE', $MENU['FORGOT']);
-define('VISIBILITY', 'public');
-
-if(!FRONTEND_LOGIN) {
-	if(INTRO_PAGE) {
-		header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
-		exit(0);
-	} else {
-		header('Location: '.WB_URL.'/index.php');
-		exit(0);
-	}
-}
-
-// Set the page content include file
-define('PAGE_CONTENT', WB_PATH.'/account/forgot_form.php');
-
-// Set auto authentication to false
-$auto_auth = false;
-
-// Include the index (wrapper) file
-require(WB_PATH.'/index.php');
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        frontend
+ * @package         account
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require_once('../config.php');
+
+$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0);
+
+// Required page details
+// $page_id = 0;
+$page_description = '';
+$page_keywords = '';
+define('PAGE_ID', $page_id);
+define('ROOT_PARENT', 0);
+define('PARENT', 0);
+define('LEVEL', 0);
+define('PAGE_TITLE', $MENU['FORGOT']);
+define('MENU_TITLE', $MENU['FORGOT']);
+define('VISIBILITY', 'public');
+
+if(!FRONTEND_LOGIN) {
+	if(INTRO_PAGE) {
+		header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
+		exit(0);
+	} else {
+		header('Location: '.WB_URL.'/index.php');
+		exit(0);
+	}
+}
+
+// Set the page content include file
+define('PAGE_CONTENT', WB_PATH.'/account/forgot_form.php');
+
+// Set auto authentication to false
+$auto_auth = false;
+
+// Include the index (wrapper) file
+require(WB_PATH.'/index.php');
Index: branches/2.8.x/wb/account/signup.php
===================================================================
--- branches/2.8.x/wb/account/signup.php	(revision 1565)
+++ branches/2.8.x/wb/account/signup.php	(revision 1566)
@@ -47,8 +47,6 @@
 	$load_language = false;
 }
 
-require_once(WB_PATH.'/framework/class.frontend.php');
-$wb_inst = new wb();
 $page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
 
 // Required page details
Index: branches/2.8.x/wb/account/login.php
===================================================================
--- branches/2.8.x/wb/account/login.php	(revision 1565)
+++ branches/2.8.x/wb/account/login.php	(revision 1566)
@@ -29,8 +29,6 @@
 	}
 }
 
-require_once(WB_PATH.'/framework/class.frontend.php');
-$wb_inst = new wb();
 $page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
 
 // Required page details
Index: branches/2.8.x/wb/account/forgot_form.php
===================================================================
--- branches/2.8.x/wb/account/forgot_form.php	(revision 1565)
+++ branches/2.8.x/wb/account/forgot_form.php	(revision 1566)
@@ -93,9 +93,10 @@
 	$message_color = '000000';
 }
 
-$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] );
-$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']);
-	
+$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>
Index: branches/2.8.x/wb/account/signup2.php
===================================================================
--- branches/2.8.x/wb/account/signup2.php	(revision 1565)
+++ branches/2.8.x/wb/account/signup2.php	(revision 1566)
@@ -22,12 +22,10 @@
 // require_once(WB_PATH.'/framework/class.wb.php');
 $wb = new wb('Start', 'start', false, false);
 
-$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] );
-$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']);
+$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);
 
-// Create new database object
-// $database = new database();
-
 // Get details entered
 $groups_id = FRONTEND_SIGNUP;
 $active = 1;
Index: branches/2.8.x/wb/framework/class.login.php
===================================================================
--- branches/2.8.x/wb/framework/class.login.php	(revision 1565)
+++ branches/2.8.x/wb/framework/class.login.php	(revision 1566)
@@ -93,7 +93,7 @@
 			}
 		} elseif($this->username == '' AND $this->password == '') {
 			$this->message = $MESSAGE['LOGIN']['BOTH_BLANK'];
-			$this->increase_attemps();
+			$this->display_login();
 		} elseif($this->username == '') {
 			$this->message = $MESSAGE['LOGIN']['USERNAME_BLANK'];
 			$this->increase_attemps();