Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1637)
+++ branches/2.8.x/CHANGELOG	(revision 1638)
@@ -12,6 +12,8 @@
 ===============================================================================
 
 
+14 Mar-2012 Build 1638 Werner v.d.Decken(DarkViper)
++ config.php added define to set admin-directory
 13 Mar-2012 Build 1637 Werner v.d.Decken(DarkViper)
 ! made handling of config.php a little bit more easy
 09 Mar-2012 Build 1636 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1637)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1638)
@@ -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.3');
-if(!defined('REVISION')) define('REVISION', '1637');
+if(!defined('REVISION')) define('REVISION', '1638');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 1637)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 1638)
@@ -50,9 +50,14 @@
 		$_SERVER['HTTP_REFERER'] = $sTmpReferer;
 	}
 
-if( !defined('ADMIN_URL')) { define('ADMIN_URL', WB_URL.'/admin'); }
+if( !defined('ADMIN_DIRECTORY')) { define('ADMIN_DIRECTORY', 'admin'); }
+if(!preg_match('/xx[a-z0-9_][a-z0-9_\-\.]+/i', 'xx'.ADMIN_DIRECTORY)) {
+	throw new RuntimeException('Invalid admin-directory: ' . ADMIN_DIRECTORY);
+}
+
+if( !defined('ADMIN_URL')) { define('ADMIN_URL', WB_URL.'/'.ADMIN_DIRECTORY); }
 if( !defined('WB_PATH')) { define('WB_PATH', dirname(dirname(__FILE__))); }
-if( !defined('ADMIN_PATH')) { define('ADMIN_PATH', WB_PATH.'/admin'); }
+if( !defined('ADMIN_PATH')) { define('ADMIN_PATH', WB_PATH.'/'.ADMIN_DIRECTORY); }
 
 if (file_exists(WB_PATH.'/framework/class.database.php')) {
 	// sanitize $_SERVER['HTTP_REFERER']
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php	(revision 1637)
+++ branches/2.8.x/wb/install/save.php	(revision 1638)
@@ -292,6 +292,7 @@
 "define('TABLE_PREFIX', '$table_prefix');\n".
 "\n".
 "define('WB_URL', '$wb_url');\n".
+"define('ADMIN_DIRECTORY', 'admin'); // no leading/trailing slash or backslash!! A simple directory only!!\n".
 "\n".
 "require_once(dirname(__FILE__).'/framework/initialize.php');\n".
 "\n";