Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1464)
+++ branches/2.8.x/CHANGELOG	(revision 1465)
@@ -11,7 +11,10 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 ------------------------------------
-01 Jun-2011 Build 1464 Werner v.d.Decken(DarkViper)
+01 Jul-2011 Build 1465 Dietmar Woellbrink (Luisehahne)
+# bugfix in initialize including SecureForm
+! update admintools FTAN handling 
+01 Jul-2011 Build 1464 Werner v.d.Decken(DarkViper)
 # fixed little bug in moveCssToHead()
 01 Jul-2011 Build 1463 Dietmar Woellbrink (Luisehahne)
 # fixed Ticket 1050 Bug in include/phpmailer/class.phpmailer.php with Lotus Notes
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1464)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1465)
@@ -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', '1464');
+if(!defined('REVISION')) define('REVISION', '1465');
 
 ?>
Index: branches/2.8.x/wb/admin/admintools/modules.inc
===================================================================
--- branches/2.8.x/wb/admin/admintools/modules.inc	(revision 1464)
+++ branches/2.8.x/wb/admin/admintools/modules.inc	(nonexistent)
@@ -1,8 +0,0 @@
-# each line a single entry only!
-# list of all admintools which use FTAN
-code
-droplets
-output_filter
-jsadmin
-captcha_control
-pagecloner
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/admintools/modules.inc
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Date Revision Id HeadURL
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/admin/admintools/tool.php
===================================================================
--- branches/2.8.x/wb/admin/admintools/tool.php	(revision 1464)
+++ branches/2.8.x/wb/admin/admintools/tool.php	(revision 1465)
@@ -29,22 +29,14 @@
 	$tool = $array[0];
 }
 
-$ModulesList = array();
+$ModulesUsingFTAN = '';
 $admin_header =  true;
 if(isset($_POST['save_settings'])) {
-	$ModulesUsingFTAN = ADMIN_PATH.'/admintools/modules.inc';
-	if(file_exists($ModulesUsingFTAN)){
-		if(($ModulesList = file($ModulesUsingFTAN, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) !== false)
-		{
-			// remove remark-lines
-			$ModulesList = preg_grep('/^\s*?[^#;]/', $ModulesList);
-		}
-	}
+	$ModulesUsingFTAN = WB_PATH.'/modules/'.$tool.'/FTAN_SUPPORTED';
 }
 
-$admin_header = (!in_array($tool, $ModulesList));
+$admin_header = (file_exists($ModulesUsingFTAN) && is_file($ModulesUsingFTAN)) == false;
 $admin = new admin('admintools', 'admintools', $admin_header );
-unset($ModulesList);
 
 // Check if tool is installed
 $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".preg_replace("/\W/", "", $tool)."'");
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 1464)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 1465)
@@ -50,7 +50,7 @@
 	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 = (defined('SECURE_FORM_MODULE') && SECURE_FORM_MODULE != '') ? '.'.SECURE_FORM_MODULE : '';
 	$sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php';
 	require_once($sSecMod);
 	if (!defined("WB_INSTALL_PROCESS")) {
Index: branches/2.8.x/wb/modules/captcha_control/FTAN_SUPPORTED
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/FTAN_SUPPORTED	(nonexistent)
+++ branches/2.8.x/wb/modules/captcha_control/FTAN_SUPPORTED	(revision 1465)
@@ -0,0 +1 @@
+This module supports the FTAN-System
\ No newline at end of file
Index: branches/2.8.x/wb/modules/jsadmin/FTAN_SUPPORTED
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/FTAN_SUPPORTED	(nonexistent)
+++ branches/2.8.x/wb/modules/jsadmin/FTAN_SUPPORTED	(revision 1465)
@@ -0,0 +1 @@
+This module supports the FTAN-System
\ No newline at end of file
Index: branches/2.8.x/wb/modules/output_filter/FTAN_SUPPORTED
===================================================================
--- branches/2.8.x/wb/modules/output_filter/FTAN_SUPPORTED	(nonexistent)
+++ branches/2.8.x/wb/modules/output_filter/FTAN_SUPPORTED	(revision 1465)
@@ -0,0 +1 @@
+This module supports the FTAN-System
\ No newline at end of file