Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1461)
+++ branches/2.8.x/CHANGELOG	(revision 1462)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 ------------------------------------
+30 Jun-2011 Build 1462 Werner v.d.Decken(DarkViper)
++ class-switcher for SecureForm added
 30 Jun-2011 Build 1461 Dietmar Woellbrink (Luisehahne)
 ! correct all misspellings on finnish language file (Tks to invisigoth)
 29 Jun-2011 Build 1460 Dietmar Woellbrink (Luisehahne)

Property changes on: branches/2.8.x/CHANGELOG
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1461)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1462)
@@ -52,6 +52,6 @@
 
 // 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.RC6');
-if(!defined('REVISION')) define('REVISION', '1461');
+if(!defined('REVISION')) define('REVISION', '1462');
 
 ?>
Index: branches/2.8.x/wb/framework/class.admin.php
===================================================================
--- branches/2.8.x/wb/framework/class.admin.php	(revision 1461)
+++ branches/2.8.x/wb/framework/class.admin.php	(revision 1462)
@@ -26,7 +26,7 @@
 
 // Include EditArea wrapper functions
 // require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
-require_once(WB_PATH . '/framework/SecureForm.php');
+//require_once(WB_PATH . '/framework/SecureForm.php');
 
 
 class admin extends wb {
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 1461)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 1462)
@@ -22,6 +22,7 @@
 
 if (file_exists(WB_PATH.'/framework/class.database.php')) {
 
+	date_default_timezone_set('UTC');
 	require_once(WB_PATH.'/framework/class.database.php');
 
 	// Create database class
@@ -49,11 +50,13 @@
 	define('OCTAL_FILE_MODE',(int) octdec($string_file_mode));
 	$string_dir_mode = STRING_DIR_MODE;
 	define('OCTAL_DIR_MODE',(int) octdec($string_dir_mode));
-	
+	$sSecMod = (defined('SECURE_FORM_MODULE')) ? '.'.SECURE_FORM_MODULE : '';
+	$sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php';
+	require_once($sSecMod);
 	if (!defined("WB_INSTALL_PROCESS")) {
 		// get CAPTCHA and ASP settings
 		$table = TABLE_PREFIX.'mod_captcha_control';
-		if($get_settings = $database->query("SELECT * FROM $table LIMIT 1")) {
+		if( ($get_settings = $database->query("SELECT * FROM $table LIMIT 1")) ) {
 			if($get_settings->numRows() == 0) { die("CAPTCHA-Settings not found"); }
 			$setting = $get_settings->fetchRow();
 			if($setting['enabled_captcha'] == '1') define('ENABLED_CAPTCHA', true);
Index: branches/2.8.x/wb/framework/class.wb.php
===================================================================
--- branches/2.8.x/wb/framework/class.wb.php	(revision 1461)
+++ branches/2.8.x/wb/framework/class.wb.php	(revision 1462)
@@ -26,7 +26,7 @@
 // Include new wbmailer class (subclass of PHPmailer)
 require_once(WB_PATH."/framework/class.wbmailer.php");
 
-require_once(WB_PATH."/framework/SecureForm.php");
+//require_once(WB_PATH."/framework/SecureForm.php");
 
 class wb extends SecureForm
 {

Property changes on: branches/2.8.x/wb/framework/class.wb.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Date Revision Id HeadURL
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/framework/class.frontend.php
===================================================================
--- branches/2.8.x/wb/framework/class.frontend.php	(revision 1461)
+++ branches/2.8.x/wb/framework/class.frontend.php	(revision 1462)
@@ -20,7 +20,7 @@
 if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
 
 require_once(WB_PATH.'/framework/class.wb.php');
-require_once(WB_PATH.'/framework/SecureForm.php');
+//require_once(WB_PATH.'/framework/SecureForm.php');
 
 class frontend extends wb {
 	// defaults