From: Roland Häder <roland@mxchange.org>
Date: Mon, 2 Mar 2009 14:43:33 +0000 (+0000)
Subject: Several rewrites/renames, fixes for installation. Resolves #104
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a

Several rewrites/renames, fixes for installation. Resolves #104
---

diff --git a/inc/autopurge.php b/inc/autopurge.php
index 262bc3d1f3..72b242a0b4 100644
--- a/inc/autopurge.php
+++ b/inc/autopurge.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 $INC_POOL = GET_DIR_AS_ARRAY("inc/autopurge/", "purge-");
 
 // Run the filter
-RUN_FILTER('load_includes', $INC_POOL);
+runFilterChain('load_includes', $INC_POOL);
 
 // Run filters for extra autopurge
-RUN_FILTER('extra_autopurge');
+runFilterChain('extra_autopurge');
 
 //
 ?>
diff --git a/inc/check-reset.php b/inc/check-reset.php
index 45c59f4341..98e515afb7 100644
--- a/inc/check-reset.php
+++ b/inc/check-reset.php
@@ -47,7 +47,7 @@ if ((date("d", getConfig('last_update')) != date("d", time())) && ((!defined('mx
 	$INC_POOL = RESET_ADD_INCLUDES();
 
 	// Run the filter
-	RUN_FILTER('load_includes', $INC_POOL);
+	runFilterChain('load_includes', $INC_POOL);
 } // END - if
 
 //
diff --git a/inc/config-functions.php b/inc/config-functions.php
index 95a6fb2cac..3288e72904 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -109,5 +109,40 @@ function initConfig () {
 	);
 }
 
+// Load configuration and return it as an arry
+function loadConfiguration ($no="0") {
+	global $_CONFIG;
+
+	// Check for cache extension, cache-array and if the requested configuration is in cache
+	if ((is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
+		// Load config from cache
+		//* DEBUG: */ echo gettype($GLOBALS['cache_array']['config'][$no])."<br />\n";
+		foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
+			$_CONFIG[$key] = $value;
+		} // END - foreach
+
+		// Count cache hits if exists
+		if ((isset($_CONFIG['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
+			$_CONFIG['cache_hits']++;
+		} // END - if
+	} elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
+		// Load config from DB
+		$result_config = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1",
+			array(bigintval($no)), __FUNCTION__, __LINE__);
+
+		// Is the config there?
+		if (SQL_NUMROWS($result_config) == 1) {
+			// Get config from database
+			$_CONFIG = SQL_FETCHARRAY($result_config);
+		} // END - if
+
+		// Free result
+		SQL_FREERESULT($result_config);
+
+		// Remember this config in the array
+		$GLOBALS['cache_array']['config'][$no] = $_CONFIG;
+	}
+}
+
 // [EOF]
 ?>
diff --git a/inc/config.php b/inc/config.php
index 963738bfcb..4cfa57bbbf 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -99,10 +99,10 @@ define('PATH', $PATH);
 define('WEBMASTER', "you@some-hoster.tld.invalid");
 
 // CFG: INSTALLED
-define('mxchange_installed', true);
+define('mxchange_installed', false);
 
 // CFG: ADMIN-SETUP
-define('admin_registered', true);
+define('admin_registered', false);
 
 // CFG: FRAMESET
 define('frameset_active', false);
@@ -130,11 +130,11 @@ $MySQL = array(
 	// CFG: MYSQL-HOST
 	'host'     => "localhost",
 	// CFG: MYSQL-DBASE
-	'dbase'    => "mxchange",
+	'dbase'    => "db",
 	// CFG: MYSQL-LOGIN
-	'login'    => "root",
+	'login'    => "user",
 	// CFG: MYSQL-PASSWORD
-	'password' => "ab57dk90",
+	'password' => "pass",
 );
 
 // CFG: MYSQL-PREIFX
@@ -151,7 +151,7 @@ define('LEAD_EXPIRY_TIME' , (30*24*60*60)); // == 30 days
 // CFG: SMTP-HOSTNAME
 define('SMTP_HOSTNAME', "");
 // CFG: SMTP-USER
-define('SMTP_USER', "");
+define('SMTP_USER'    , "");
 // CFG: SMTP-PASSWORD
 define('SMTP_PASSWORD', "");
 
diff --git a/inc/databases.php b/inc/databases.php
index a86f32c141..66d9282aef 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -98,7 +98,7 @@ define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
 //define('CURR_SVN_REVISION', getActualVersion(0));
-define('CURR_SVN_REVISION', "804");
+define('CURR_SVN_REVISION', "805");
 define('CURR_SVN_DATE'    , getActualVersion(1));
 define('CURR_SVN_VERSION' , getActualVersion(2));
 
diff --git a/inc/extensions.php b/inc/extensions.php
index 7d599905f7..68a6ae3326 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -216,14 +216,14 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
 			// "Dry-run-mode" activated?
 			if (!$dry_run) {
 				// Run installation pre-installation filters
-				RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run));
+				runFilterChain('pre_extension_installed', array('dry_run' => $dry_run));
 
 				// Register extension
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_extensions` (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
 					array($ext_name, EXT_GET_ALWAYS_ACTIVE(), EXT_GET_VERSION()), __FILE__, __LINE__);
 
 				// Remove cache file(s) if extension is active
-				RUN_FILTER('post_extension_installed', array('ext_name' => $ext_name, 'task_id' => $task_id, 'inc_pool' => $INC_POOL));
+				runFilterChain('post_extension_installed', array('ext_name' => $ext_name, 'task_id' => $task_id, 'inc_pool' => $INC_POOL));
 
 				// In normal mode return a true on success
 				$ret = true;
@@ -292,7 +292,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":SQLs::count=".COUNT_SQLS()."");
 	if ((IS_SQLS_VALID() && (COUNT_SQLS() > 0))) {
 		// Run SQL commands...
-		RUN_FILTER('run_sqls', array('dry_run' => false));
+		runFilterChain('run_sqls');
 
 		// Removal mode?
 		if ($load_mode == "remove") {
@@ -305,7 +305,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
 	// Remove cache file(s) if extension is active
 	if (((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) && (((SQL_AFFECTEDROWS() == 1)) || ($sqlRan === true) || ($load_mode == "activate") || ($load_mode == "deactivate"))) {
 		// Run filters
-		RUN_FILTER('post_extension_run_sql', $ext_name);
+		runFilterChain('post_extension_run_sql', $ext_name);
 	} // END - if
 
 	// Is this the sql_patches?
@@ -469,13 +469,13 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
 		// In real-mode execute any existing includes
 		if (!$dry_run) {
 			$GLOBALS['cache_array']['inc_pool'][$ext_name] = $INC_POOL;
-			RUN_FILTER('load_includes', $INC_POOL);
+			runFilterChain('load_includes', $INC_POOL);
 			$INC_POOL = $GLOBALS['cache_array']['inc_pool'][$ext_name];
 			unset($GLOBALS['cache_array']['inc_pool'][$ext_name]);
 		} // END - if
 
 		// Run SQLs
-		RUN_FILTER('run_sqls', array('dry_run' => $dry_run));
+		runFilterChain('run_sqls', array('dry_run' => $dry_run));
 
 		if (!$dry_run) {
 			// Create task
@@ -490,7 +490,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
 			unset($GLOBALS['cache_array']['update_ver'][$ext_name]);
 
 			// Run filters on success extension update
-			RUN_FILTER('extension_update', $ext_name);
+			runFilterChain('extension_update', $ext_name);
 		} // END - if
 	} // END - if
 }
diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index b665416b7a..ff6e1fb670 100644
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -738,7 +738,7 @@ default: // Do stuff when extension is loaded
 				LOAD_INC_ONCE("inc/libs/cache_functions.php");
 				require(sprintf("%sinc/extensions/ext-cache.php", constant('PATH')));
 				if ($GLOBALS['cache_instance']->loadCacheFile("extensions", true)) $GLOBALS['cache_instance']->destroyCacheFile();
-				if ($GLOBALS['cache_instance']->loadCacheFile("mod_reg"))          $GLOBALS['cache_instance']->destroyCacheFile();
+				if ($GLOBALS['cache_instance']->loadCacheFile("modreg"))           $GLOBALS['cache_instance']->destroyCacheFile();
 			} // END - if
 		} // END - if
 
@@ -765,7 +765,7 @@ default: // Do stuff when extension is loaded
 		define('MT_WORD3', getConfig('mt_word3'));
 		define('_MAX'    , getConfig('rand_no'));
 	} else {
-	   	// Set some lame ( ;-) ) default settings
+		// Set some lame ( ;-) ) default settings
 		setConfigEntry('def_refid'        , 0);
 		setConfigEntry('enable_title_deco', "N");
 		setConfigEntry('title_mod_show'   , "Y");
diff --git a/inc/filters.php b/inc/filters.php
index dd97fd99a2..f48e19967b 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -185,7 +185,7 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r
 }
 
 // "Runs" the given filters, data is optional and can be any type of data
-function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
+function runFilterChain ($filterName, $data = null, $silentAbort = true) {
 	// Is that filter chain there?
 	if (!isset($GLOBALS['filters']['chains'][$filterName])) {
 		// Then abort here (quick'N'dirty hack)
@@ -310,7 +310,7 @@ function FILTER_FLUSH_FILTERS () {
 	} // END - if
 
 	// Run the run_sqls filter in non-dry mode
-	RUN_FILTER('run_sqls', array('dry_run' => false));
+	runFilterChain('run_sqls');
 }
 
 // Filter for calling the handler for login failures
diff --git a/inc/functions.php b/inc/functions.php
index 8dac96a08f..e9196a01fd 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -476,9 +476,10 @@ Message : ".$MSG."
 }
 
 // Check if legacy or PHPMailer command
+// @TODO Rewrite this to an extension 'smtp'
 // @private
 function CHECK_PHPMAILER_USAGE() {
-	return ((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD')) && (SMTP_HOSTNAME != "") && (SMTP_USER != ""));
+	return ((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD')) && (constant('SMTP_HOSTNAME') != "") && (constant('SMTP_USER') != ""));
 }
 
 /*
@@ -675,8 +676,8 @@ function FRAMETESTER ($URL) {
 function SELECTION_COUNT ($array) {
 	$ret = 0;
 	if (is_array($array)) {
-		foreach ($array as $key => $sel) {
-			if (!empty($sel)) $ret++;
+		foreach ($array as $key => $selected) {
+			if (!empty($selected)) $ret++;
 		}
 	}
 	return $ret;
@@ -1241,8 +1242,9 @@ function TRANSLATE_YESNO ($yn) {
 // Deprecated : $length
 // Optional   : $DATA
 //
-function GEN_RANDOM_CODE ($length, $code, $uid, $DATA="") {
+function generateRandomCodde ($length, $code, $uid, $DATA="") {
 	// Fix missing _MAX constant
+	// @TODO Rewrite this unnice code
 	if (!defined('_MAX')) define('_MAX', 15235);
 
 	// Build server string
@@ -1261,9 +1263,9 @@ function GEN_RANDOM_CODE ($length, $code, $uid, $DATA="") {
 	// Add more additional data
 	if (isSessionVariableSet('u_hash'))			$data .= ":".get_session('u_hash');
 	if (isset($GLOBALS['userid']))				$data .= ":".$GLOBALS['userid'];
-	if (isSessionVariableSet('mxchange_theme'))	$data .= ":".get_session('mxchange_theme');
-	if (isSessionVariableSet('mx_lang'))		$data .= ":".GET_LANGUAGE();
-	if (isset($GLOBALS['refid']))				$data .= ":".$GLOBALS['refid'];
+	if (isSessionVariableSet('mxchange_theme'))		$data .= ":".get_session('mxchange_theme');
+	if (isSessionVariableSet('mx_lang'))			$data .= ":".GET_LANGUAGE();
+	if (isset($GLOBALS['refid']))					$data .= ":".$GLOBALS['refid'];
 
 	// Calculate number for generating the code
 	$a = $code + constant('_ADD') - 1;
@@ -1276,7 +1278,7 @@ function GEN_RANDOM_CODE ($length, $code, $uid, $DATA="") {
 		$rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(constant('_MAX') - $a + sqrt(constant('_ADD'))) / pi();
 	} else {
 		// Generate hash with "hash of site key" from modula of number with the prime number and other data
-		$saltedHash = generateHash(($a % constant('_PRIME')).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, substr(sha1(SITE_KEY), 0, 8));
+		$saltedHash = generateHash(($a % constant('_PRIME')).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, substr(sha1(constant('SITE_KEY')), 0, 8));
 
 		// Create number from hash
 		$rcode = hexdec(substr($saltedHash, 8, 9)) / abs(constant('_MAX') - $a + sqrt(constant('_ADD'))) / pi();
@@ -3177,7 +3179,7 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 }
 
 // Rebuild cache
-function REBUILD_CACHE ($cache, $inc="") {
+function rebuildCacheFiles ($cache, $inc="") {
 	// Shall I remove the cache file?
 	if ((EXT_IS_ACTIVE("cache")) && (is_object($GLOBALS['cache_instance']))) {
 		// Rebuild cache
diff --git a/inc/gen_refback.php b/inc/gen_refback.php
index 449edcaa1d..50f833ddef 100644
--- a/inc/gen_refback.php
+++ b/inc/gen_refback.php
@@ -53,7 +53,7 @@ if (SQL_NUMROWS($result) > 0) {
 	SQL_ALTER_TABLE("ALTER TABLE `{!_MYSQL_PREFIX!}_refsystem` ADD UNIQUE `userid_level` ( `userid` , `level` )", __FILE__, __LINE__);
 
 	// Rebuild cache
-	REBUILD_CACHE("refsystem", "refsystem");
+	rebuildCacheFiles("refsystem", "refsystem");
 } // END - if
 
 // Free result
diff --git a/inc/header.php b/inc/header.php
index a57016954a..0a49ef8dfe 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -77,9 +77,6 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 				// Remember title in constant for the template
 				define('__PAGE_TITLE', $TITLE);
 			} elseif ((!isInstalled()) || (!isAdminRegistered())) {
-				// Load language here
-				LOAD_INC_ONCE("inc/language/install_".GET_LANGUAGE().".php");
-
 				// Installation mode
 				define('__PAGE_TITLE', sprintf(getMessage('INSTALLATION_OF_MXCHANGE'), constant('MAIN_TITLE')));
 			} else {
diff --git a/inc/hooks.php b/inc/hooks.php
index 48d9e1009b..366c386244 100644
--- a/inc/hooks.php
+++ b/inc/hooks.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 // Call-back function for running shutdown functions and close database connection
 function __SHUTDOWN_HOOK () {
 	// Call the filter chain 'shutdown'
-	RUN_FILTER('shutdown', null, false);
+	runFilterChain('shutdown', null, false);
 
 	if (SQL_IS_LINK_UP()) {
 		// Close link
diff --git a/inc/install-inc.php b/inc/install-inc.php
index c852bdd5d7..d0283dfcfd 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -302,7 +302,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 						} // END - if
 
 						// Now run all queries through and try to keep out empty or comment queries
-						RUN_FILTER('run_sqls', array('dry_run' => false));
+						runFilterChain('run_sqls');
 
 						// Ok, all done. So we can write the config data to the php files
 						if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", REQUEST_POST('spath'), 0);
diff --git a/inc/language.php b/inc/language.php
index 61681eec05..0b931cb416 100644
--- a/inc/language.php
+++ b/inc/language.php
@@ -61,7 +61,7 @@ if (!FILE_READABLE($FQFN)) {
 LOAD_INC_ONCE($INC);
 
 // Check for installation mode
-if (isInstalling()) {
+if ((isInstalling()) || (!isInstalled()) || (!isAdminRegistered())) {
 	// Load matching language file
 	LOAD_INC("inc/language/install_".$mx_lang.".php");
 }
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 0a5c58363e..6b6e03595c 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -250,7 +250,7 @@ WHERE id=%s LIMIT 1",
 	}
 
 	// Remove cache file
-	RUN_FILTER('post_admin_edited', REQUEST_POST_ARRAY());
+	runFilterChain('post_admin_edited', REQUEST_POST_ARRAY());
 }
 
 // Make admin accounts editable
@@ -260,14 +260,14 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 
 	// Begin the edit loop
 	$SW = 2; $OUT = "";
-	foreach ($POST['sel'] as $id => $sel) {
+	foreach ($POST['sel'] as $id => $selected) {
 		// Secure ID number
 		$id = bigintval($id);
 
 		// Get the admin's data
 		$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
 			array($id), __FUNCTION__, __LINE__);
-		if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
+		if ((SQL_NUMROWS($result) == 1) && ($selected == 1)) {
 			// Entry found
 			$content = SQL_FETCHARRAY($result);
 			SQL_FREERESULT($result);
@@ -306,13 +306,13 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 	if ($accounts > 1) {
 		// Delete accounts
 		$SW = 2; $OUT = "";
-		foreach ($POST['sel'] as $id => $sel) {
+		foreach ($POST['sel'] as $id => $selected) {
 			// Secure ID number
 			$id = bigintval($id);
 
 			// Get the admin's data
 			$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-			 array($id), __FUNCTION__, __LINE__);
+				array($id), __FUNCTION__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found
 				$content = SQL_FETCHARRAY($result);
@@ -364,7 +364,7 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 	}
 
 	// Remove cache if cache system is activated
-	RUN_FILTER('post_admin_deleted', REQUEST_POST_ARRAY());
+	runFilterChain('post_admin_deleted', REQUEST_POST_ARRAY());
 }
 
 // List all admin accounts
diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 8a766cdaa9..81a695e9cd 100644
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -398,7 +398,7 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
 	if (EXT_IS_ACTIVE("cache")) {
 		if ($GLOBALS['cache_instance']->loadCacheFile("config"))     $GLOBALS['cache_instance']->destroyCacheFile();
 		if ($GLOBALS['cache_instance']->loadCacheFile("extensions")) $GLOBALS['cache_instance']->destroyCacheFile();
-		if ($GLOBALS['cache_instance']->loadCacheFile("mod_reg"))    $GLOBALS['cache_instance']->destroyCacheFile();
+		if ($GLOBALS['cache_instance']->loadCacheFile("modreg"))     $GLOBALS['cache_instance']->destroyCacheFile();
 	} // END - if
 
 	// Return it
@@ -421,7 +421,7 @@ function FILTER_CACHE_DESTROY_ALL () {
 		if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
 		if ($GLOBALS['cache_instance']->loadCacheFile("config"))      $GLOBALS['cache_instance']->destroyCacheFile();
 		if ($GLOBALS['cache_instance']->loadCacheFile("extensions"))  $GLOBALS['cache_instance']->destroyCacheFile();
-		if ($GLOBALS['cache_instance']->loadCacheFile("mod_reg"))     $GLOBALS['cache_instance']->destroyCacheFile();
+		if ($GLOBALS['cache_instance']->loadCacheFile("modreg"))      $GLOBALS['cache_instance']->destroyCacheFile();
 		if ($GLOBALS['cache_instance']->loadCacheFile("refdepths"))   $GLOBALS['cache_instance']->destroyCacheFile();
 		if ($GLOBALS['cache_instance']->loadCacheFile("refsystem"))   $GLOBALS['cache_instance']->destroyCacheFile();
 		if ($GLOBALS['cache_instance']->loadCacheFile("themes"))      $GLOBALS['cache_instance']->destroyCacheFile();
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index a2c33f9a6f..eaef396db5 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -933,7 +933,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
 		}
 
 		// ... and now the validation code
-		$valCode = GEN_RANDOM_CODE($length, sha1(SURFBAR_GET_SALT().":".$urlId), $GLOBALS['userid']);
+		$valCode = generateRandomCodde($length, sha1(SURFBAR_GET_SALT().":".$urlId), $GLOBALS['userid']);
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}", false);
 	} // END - while
 
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 5fbf397828..eceebabec6 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -303,7 +303,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
 				array($hash, $uid), __FUNCTION__, __LINE__);
 
 			// No login bonus by default
-			// @TODO Make this filter working: $ADDON = RUN_FILTER('post_login_update', array('login' => $login, 'online' => $online));
+			// @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', array('login' => $login, 'online' => $online));
 			$BONUS = false;
 
 			// Probe for last online timemark
@@ -327,7 +327,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
 			$hash = generatePassString($hash);
 
 			// Update global array
-			// @TODO Make this filter working: $URL = RUN_FILTER('do_login', array('uid' => $uid, 'hash' => $hash, 'addon' => $ADDON));
+			// @TODO Make this filter working: $URL = runFilterChain('do_login', array('uid' => $uid, 'hash' => $hash, 'addon' => $ADDON));
 			$GLOBALS['userid'] = $uid;
 
 			// Try to set session data (which shall normally always work!)
diff --git a/inc/load_cache.php b/inc/load_cache.php
index 88d53eaf6e..1a60276627 100644
--- a/inc/load_cache.php
+++ b/inc/load_cache.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 $INC_POOL = GET_DIR_AS_ARRAY("inc/loader/", "load_cache-");
 
 // Run the filter
-RUN_FILTER('load_includes', $INC_POOL);
+runFilterChain('load_includes', $INC_POOL);
 
 //
 ?>
diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index e06f522cbd..dff3faf065 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -286,7 +286,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 }
 
 // Run the filter
-RUN_FILTER('load_includes', $INC_POOL);
+runFilterChain('load_includes', $INC_POOL);
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {
diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index eb4de0475d..3237733fe0 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -85,7 +85,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile("admins")) && ($GLOBALS['cache_in
 	$GLOBALS['cache_instance']->storeExtensionVersion("admins");
 
 	// Load every data from DB to cache file
-	$ADD = RUN_FILTER('sql_admin_extra_data');
+	$ADD = runFilterChain('sql_admin_extra_data');
 
 	// Query the database about this
 	$result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 07f8be05d4..0ff8842588 100644
--- a/inc/loader/load_cache-modreg.php
+++ b/inc/loader/load_cache-modreg.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Next cached table is the module registry (mod_reg)...
-if (($GLOBALS['cache_instance']->loadCacheFile("mod_reg")) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("modreg")) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
 	// Load cache
 	$GLOBALS['cache_array']['modules'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 3edf763e9e..c67e0ee25e 100644
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -80,7 +80,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
 			);
 
 			for ($idx = 0; $idx < 4; $idx++) {
-				$content['check'] .= GEN_RANDOM_CODE("8", mt_rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
+				$content['check'] .= generateRandomCodde("8", mt_rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
 			}
 
 			// Insert row into database
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 13924963bd..d3980ba8d7 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -341,7 +341,7 @@ if (!isAdminRegistered()) {
 	{
 	case "done":
 		// Check for access control line of current menu entry
-		$GLOBALS['acl_allow'] = RUN_FILTER('check_admin_acl');
+		$GLOBALS['acl_allow'] = runFilterChain('check_admin_acl');
 
 		// When type of admin menu is not set fallback to old menu system
 		if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', "OLD");
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index a8f107f87f..f96c247a98 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -86,7 +86,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 		} // END - if
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Add extra data via filter now
-		$ADD = RUN_FILTER('sql_admin_extra_data');
+		$ADD = runFilterChain('sql_admin_extra_data');
 
 		// Get password from DB
 		$result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
@@ -147,7 +147,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 		}
 
 		// Rebuild cache
-		REBUILD_CACHE("admins", "admin");
+		rebuildCacheFiles("admins", "admin");
 
 		// Login has failed by default... ;-)
 		$ret = "failed";
@@ -175,7 +175,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 			array($aid), __FUNCTION__, __LINE__);
 
 		// Rebuild cache
-		REBUILD_CACHE("admins", "admin");
+		rebuildCacheFiles("admins", "admin");
 	} // END - if
 
 	// Return the result
@@ -192,7 +192,7 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
 			array($adminLogin), __FUNCTION__, __LINE__);
 
 		// Rebuild cache
-		REBUILD_CACHE("admins", "admin");
+		rebuildCacheFiles("admins", "admin");
 	} // END - if
 
 	// Now set all session variables and return the result
@@ -640,7 +640,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
 	SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
 	// Rebuild cache
-	REBUILD_CACHE("config", "config");
+	rebuildCacheFiles("config", "config");
 
 	// Settings saved
 	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
@@ -1235,7 +1235,7 @@ function ADMIN_RESET_PASSWORD ($login, $password) {
 		array($passHash, $login), __FUNCTION__, __LINE__);
 
 	// Run filters
-	RUN_FILTER('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
+	runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
 
 	// Return output
 	return ADMIN_PASSWORD_RESET_DONE;
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 01f3a7be8d..ed718d441a 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -244,7 +244,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						// Close task but not already closes or deleted or update tasks
 						if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
 							// Solve the task
-							RUN_FILTER('solve_task', $tid);
+							runFilterChain('solve_task', $tid);
 						} // END - if
 					}
 					break;
@@ -256,7 +256,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					// Close task
 					if (($status != "CLOSED") && ($status != "DELETED")) {
 						// Solve the task
-						RUN_FILTER('solve_task', $tid);
+						runFilterChain('solve_task', $tid);
 					} // END - if
 					break;
 
diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php
index 4f7f51e59f..73da6bd7e6 100644
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -53,7 +53,7 @@ if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST
 		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ADD_DONE'));
 
 		// Run filter chain
-		RUN_FILTER('post_admin_added', REQUEST_POST_ARRAY());
+		runFilterChain('post_admin_added', REQUEST_POST_ARRAY());
 	} // END - if
 } // END - if
 
diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 78e1109e10..4f459c95d1 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -46,7 +46,7 @@ if (REQUEST_ISSET_POST(('sel'))) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 	// Edit ACLs
 	$SW = 2; $OUT = "";
-	foreach (REQUEST_POST('sel') as $id => $sel) {
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		// Load data for the ID
 		$result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
 		 array(bigintval($id)), __FILE__, __LINE__);
@@ -78,7 +78,7 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 	LOAD_TEMPLATE("admin_config_admins_edit");
 } elseif ((REQUEST_ISSET_POST(('change'))) && ($SEL > 0)) {
 	// Change entries
-	foreach (REQUEST_POST('sel') as $id => $sel) {
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		// Secure ID
 		$id = bigintval($id);
 
@@ -106,7 +106,7 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 } elseif ((REQUEST_ISSET_POST(('del'))) && ($SEL > 0)) {
 	// Delete ACLs
 	$SW = 2; $OUT = "";
-	foreach (REQUEST_POST('sel') as $id => $sel) {
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		// Load data for the ID
 		$result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
 			array(bigintval($id)), __FILE__, __LINE__);
@@ -143,7 +143,7 @@ if ((REQUEST_ISSET_POST(('edit'))) && ($SEL > 0)) {
 	LOAD_TEMPLATE("admin_config_admins_del");
 } elseif ((REQUEST_ISSET_POST(('remove'))) && ($SEL > 0)) {
 	// Remove entries
-	foreach (REQUEST_POST('sel') as $id => $sel) {
+	foreach (REQUEST_POST('sel') as $id => $selected) {
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
 			array(bigintval($id)),__FILE__, __LINE__);
 	}
diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index e8afadd7f4..9f3b23c195 100644
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -103,7 +103,7 @@ if (REQUEST_ISSET_POST(('edit'))) {
 
 	// Remove cache file if version matches
 	if (GET_EXT_VERSION("cache") >= "0.1.2") {
-		if ($GLOBALS['cache_instance']->loadCacheFile("mod_reg")) $GLOBALS['cache_instance']->destroyCacheFile();
+		if ($GLOBALS['cache_instance']->loadCacheFile("modreg")) $GLOBALS['cache_instance']->destroyCacheFile();
 	}
 
 	// Entries updated
diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 88e5d89919..ae54e81cda 100644
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -145,13 +145,13 @@ WHERE mails_confirmed < %s", $REF, $REF));
 
 		if (COUNT_SQLS() > 0) {
 			// Run all SQL commands
-			RUN_FILTER('run_sqls', array('dry_run' => false));
+			runFilterChain('run_sqls');
 
 			// Entry saved...
 			$message = SETTINGS_SAVED;
 
 			// Destroy config cache file here...
-			REBUILD_CACHE("config", "config");
+			rebuildCacheFiles("config", "config");
 		} else {
 			// Prepare failed-message
 			$message = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index a2e04165ba..41f88a439a 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -195,7 +195,7 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
 		// Is this extension selected?
 		if ($active == 1) {
 			// Run any assigned removal filters
-			RUN_FILTER('extension_remove', GET_EXT_NAME($ext_id));
+			runFilterChain('extension_remove', GET_EXT_NAME($ext_id));
 
 			// Run embeded SQL commands
 			EXTENSION_RUN_SQLS($ext_id, "remove");
@@ -322,7 +322,7 @@ case "register": // Register new extension
 						// Remove cache file (will be auto-created again!)
 						if ($GLOBALS['cache_instance']->loadCacheFile("config")) $GLOBALS['cache_instance']->destroyCacheFile();
 						if ($GLOBALS['cache_instance']->loadCacheFile("extensions", true)) $GLOBALS['cache_instance']->destroyCacheFile();
-						if ($GLOBALS['cache_instance']->loadCacheFile("mod_reg")) $GLOBALS['cache_instance']->destroyCacheFile();
+						if ($GLOBALS['cache_instance']->loadCacheFile("modreg")) $GLOBALS['cache_instance']->destroyCacheFile();
 					} // END - if
 				} elseif (GET_EXT_VERSION($ext_name) != "") {
 					// Notify the admin that we have a problem here...
diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index b24d7c7c2e..2fb61b22b2 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -147,19 +147,19 @@ if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_
 		}
 
 		// Create message
-		$MSG = ADMIN_COUNTRIES_MODIFIED;
+		$MSG = getMessage('ADMIN_COUNTRIES_MODIFIED');
 	} elseif ((REQUEST_ISSET_POST(('remove'))) && (REQUEST_ISSET_POST(('id')))) {
 		// Remove
 		$IDs = implode(",", array_keys(REQUEST_POST('id')));
 		ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_countries` WHERE id IN (".$IDs.") LIMIT ".count(REQUEST_POST('id'))."");
 
 		// Create message
-		$MSG = ADMIN_COUNTRIES_REMOVED;
+		$MSG = getMessage('ADMIN_COUNTRIES_REMOVED');
 	}
 
 	if ((!empty($MSG)) && (COUNT_SQLS() > 0)) {
 		// Run SQL commands
-		RUN_FILTER('run_sqls', array('dry_run' => false));
+		runFilterChain('run_sqls');
 
 		// Display message
 		LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
diff --git a/inc/modules/admin/what-list_newsletter.php b/inc/modules/admin/what-list_newsletter.php
index 6685de8a84..14b01a4852 100644
--- a/inc/modules/admin/what-list_newsletter.php
+++ b/inc/modules/admin/what-list_newsletter.php
@@ -47,7 +47,7 @@ if ((REQUEST_ISSET_POST(('uid'))) && (REQUEST_ISSET_POST(('id')))) {
 		array(bigintval(REQUEST_POST('uid'))), __FILE__, __LINE__);
 
 	// Next the task system...
-	RUN_FILTER('solve_task', bigintval(REQUEST_POST('id')));
+	runFilterChain('solve_task', bigintval(REQUEST_POST('id')));
 
 	// Send mail to user
 	$msg = LOAD_EMAIL_TEMPLATE("member_newsletter_done", true, bigintval(REQUEST_POST('uid')));
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index c6600aec5c..4a1c9db2c7 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -122,7 +122,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
 					if ($ret[0] == $eok) {
 						// Clear task
 						if ($task > 0) {
-							RUN_FILTER('solve_task', $task);
+							runFilterChain('solve_task', $task);
 						}
 
 						// Clear payout request
@@ -161,7 +161,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
 			if (IS_FORM_SENT()) {
 				if ($task > 0) {
 					// Clear task
-					RUN_FILTER('solve_task', $task);
+					runFilterChain('solve_task', $task);
 				}
 
 				// Clear payout request
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 2eca075459..3ed7e88846 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -44,69 +44,56 @@ if (!REQUEST_ISSET_GET(('sub'))) REQUEST_SET_GET('sub', "");
 $MSG = "";
 
 // Quick actions on a rallye
-if (REQUEST_ISSET_GET(('rallye')))
-{
-	// Activate / deactivate
-	$sql = "";
-	if (REQUEST_ISSET_GET(('activate')))
-	{
+if (REQUEST_ISSET_GET(('rallye'))) {
+	// Init SQL queries
+	INIT_SQLS();
+
+	if (REQUEST_ISSET_GET(('activate'))) {
+		// Activate / deactivate
 		switch (REQUEST_GET('activate'))
 		{
 		case "1": // Activate
-			$sql = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET is_active='Y' WHERE id=%s AND is_active='N' LIMIT 1";
+			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET is_active='Y' WHERE id=%s AND is_active='N' LIMIT 1");
 			break;
 
 		case "0": // Deactivate
-			$sql = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET is_active='N' WHERE id=%s AND is_active='Y' LIMIT 1";
+			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET is_active='N' WHERE id=%s AND is_active='Y' LIMIT 1");
 			break;
 		}
-	}
-
-	// Automatic notification
-	if (REQUEST_ISSET_GET(('notify')))
-	{
+	} elseif (REQUEST_ISSET_GET(('notify'))) {
+		// Automatic notification
 		switch (REQUEST_GET('notify'))
 		{
 		case "1": // Activate
-			$sql = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET send_notify='Y' WHERE id=%s AND send_notify='N' LIMIT 1";
+			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET send_notify='Y' WHERE id=%s AND send_notify='N' LIMIT 1");
 			break;
 
 		case "0": // Deactivate
-			$sql = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET send_notify='N' WHERE id=%s AND send_notify='Y' LIMIT 1";
+			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET send_notify='N' WHERE id=%s AND send_notify='Y' LIMIT 1");
 			break;
 		}
-	}
-
-	// Automatic adding of new members
-	if (REQUEST_ISSET_GET(('auto')))
-	{
+	} elseif (REQUEST_ISSET_GET(('auto'))) {
+		// Automatic adding of new members
 		switch (REQUEST_GET('auto'))
 		{
 		case "1": // Activate
-			$sql = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='Y' WHERE id=%s AND auto_add_new_user='N' LIMIT 1";
+			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='Y' WHERE id=%s AND auto_add_new_user='N' LIMIT 1");
 			break;
 
 		case "0": // Deactivate
-			$sql = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='N' WHERE id=%s AND auto_add_new_user='Y' LIMIT 1";
+			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='N' WHERE id=%s AND auto_add_new_user='Y' LIMIT 1");
 			break;
 		}
 	}
 
 	// Run SQL command
-	if (!empty($sql))
-	{
-		$result = SQL_QUERY_ESC($sql, array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
-	}
-}
- elseif (REQUEST_ISSET_POST(('remove')))
-{
+	runFilterChain('run_sqls');
+} elseif (REQUEST_ISSET_POST(('remove'))) {
 	// Delete rallyes
 	$SEL = SELECTION_COUNT(REQUEST_POST('sel'));
-	if ($SEL > 0)
-	{
+	if ($SEL > 0) {
 		// Delete selected rallyes and all it's data
-		foreach (REQUEST_POST('sel') as $id => $sel)
-		{
+		foreach (REQUEST_POST('sel') as $id => $selected) {
 			// Remove selected rallye entirely...
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__);
@@ -117,23 +104,17 @@ if (REQUEST_ISSET_GET(('rallye')))
 		}
 
 		// Output message
-		$MSG = RALLYE_DELETED;
-	}
-	 else
-	{
+		$MSG = getMessage('RALLYE_DELETED');
+	} else {
 		// No rallye selected to delete!
-		$MSG = RALLYE_DELETE_NOTHING_SELECTED;
+		$MSG = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
 	}
-}
- elseif (REQUEST_ISSET_POST(('change')))
-{
+} elseif (REQUEST_ISSET_POST(('change'))) {
 	// Change rallye
 	$SEL = SELECTION_COUNT(REQUEST_POST('title'));
-	if ($SEL > 0)
-	{
+	if ($SEL > 0) {
 		// Change selected rallyes and all it's data
-		foreach (REQUEST_POST('title') as $id => $title)
-		{
+		foreach (REQUEST_POST('title') as $id => $title) {
 			// Secure ID number
 			$id = bigintval($id);
 
@@ -164,7 +145,7 @@ WHERE id='".$id."' LIMIT 1",
 		}
 
 		// Output message
-		$MSG = RALLYE_CHANGED;
+		$MSG = getMessage('RALLYE_CHANGED');
 	}
 }
 
@@ -174,10 +155,10 @@ if (REQUEST_ISSET_POST(('edit'))) {
 	if ($SEL > 0) {
 		// Make all selected and deactivated rallyes editable
 		$SW = 2; $OUT = "";
-		foreach (REQUEST_POST('sel') as $id => $sel) {
+		foreach (REQUEST_POST('sel') as $id => $selected) {
 			// Load rallye basic data
 			$result = SQL_QUERY_ESC("SELECT title, descr, template, start_time, end_time, min_users, min_prices FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
+				array(bigintval($id)), __FILE__, __LINE__);
 			list($title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 
@@ -225,13 +206,11 @@ if (REQUEST_ISSET_POST(('edit'))) {
 } elseif ((REQUEST_GET('sub') == "users") && (REQUEST_GET('rallye') > 0)) {
 	// List users and their refs before start and current
 	$result = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid",
-	 array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0)
-	{
+		array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) > 0) {
 		$SW = 2; $OUT = "";
 		define('__RALLYE_VALUE', REQUEST_GET('rallye'));
-		while (list($uid, $old, $opoints) = SQL_FETCHROW($result))
-		{
+		while (list($uid, $old, $opoints) = SQL_FETCHROW($result)) {
 			// Check for referal count
 			$cnt = RALLYE_GET_REFCOUNT($uid, $old);
 
@@ -269,7 +248,7 @@ if (REQUEST_ISSET_POST(('edit'))) {
 		LOAD_TEMPLATE("admin_list_rallye_usr");
 	} else {
 		// No entries found?
-		LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ADMIN_USERS_404);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('RALLYE_ADMIN_USERS_404'));
 	}
 } else {
 	// Start listing rallyes
@@ -286,11 +265,11 @@ ORDER BY start_time DESC",
 
 			// Count assigned prices
 			$result_prices = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s",
-			 array(bigintval($id)), __FILE__, __LINE__);
+				array(bigintval($id)), __FILE__, __LINE__);
 
 			// Count joined userids
 			$result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s",
-			 array($id), __FILE__, __LINE__);
+				array($id), __FILE__, __LINE__);
 			$joined = SQL_NUMROWS($result_user);
 
 			// Did some users joined this rallye?
@@ -337,12 +316,12 @@ ORDER BY start_time DESC",
 			case "Y":
 				// Rallye is active so do not edit it!
 				$content['select'] = "<div class=\"big\">".$id."</strong>";
-				$content['active_title'] = RALLYE_DEACTIVATE_NOW;
+				$content['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
 				$content['active'] = 0;
 				break;
 
 			case "N":
-				$content['active_title'] = RALLYE_ACTIVATE_NOW;
+				$content['active_title'] = getMessage('RALLYE_ACTIVATE_NOW');
 				$content['active'] = "1";
 				break;
 			}
@@ -351,12 +330,12 @@ ORDER BY start_time DESC",
 			switch ($notify)
 			{
 			case "Y":
-				$content['notify_title'] = RALLYE_STOP_NOTIFY_NOW;
+				$content['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
 				$content['notify'] = 0;
 				break;
 
 			case "N":
-				$content['notify_title'] = RALLYE_START_NOTIFY_NOW;
+				$content['notify_title'] = getMessage('RALLYE_START_NOTIFY_NOW');
 				$content['notify'] = "1";
 				break;
 			}
@@ -365,12 +344,12 @@ ORDER BY start_time DESC",
 			switch ($auto_add)
 			{
 			case "Y":
-				$content['auto_title'] = RALLYE_STOP_AUTO_ADD_NOW;
+				$content['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
 				$content['auto'] = 0;
 				break;
 
 			case "N":
-				$content['auto_title'] = RALLYE_START_AUTO_ADD_NOW;
+				$content['auto_title'] = getMessage('RALLYE_START_AUTO_ADD_NOW');
 				$content['auto'] = "1";
 				break;
 			}
@@ -388,7 +367,7 @@ ORDER BY start_time DESC",
 		LOAD_TEMPLATE("admin_list_rallyes");
 	} else {
 		// No rallyes setup so far
-		LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_NO_RALLYES_SETUP);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('RALLYE_NO_RALLYES_SETUP'));
 	}
 }
 
diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index d3a8c4f4b8..174395cf6a 100644
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -75,7 +75,7 @@ if (IS_FORM_SENT()) {
 	// Save settings
 	if (COUNT_SQLS() > 0) {
 		// Run all queries
-		RUN_FILTER('run_sqls', array('dry_run' => false));
+		runFilterChain('run_sqls');
 		$content = "<span class=\"admin_failed\">".SETTINGS_SAVED."</span>";
 	} else {
 		// Nothing has changed!
diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 676e3156db..c815f43986 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -71,7 +71,7 @@ if ($SEL > 0) {
 			$result = SQL_QUERY($sql, __FILE__, __LINE__);
 
 			// Rebuild cache
-			REBUILD_CACHE("themes", "them");
+			rebuildCacheFiles("themes", "them");
 		} // END - if
 	}
 
diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index ca02e9e2d9..6ab037893f 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -62,7 +62,7 @@ VALUES ('%s','N','%s','%s')",
 				array(REQUEST_POST('theme'), $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
 
 			// Destroy cache
-			REBUILD_CACHE("themes", "them");
+			rebuildCacheFiles("themes", "them");
 
 			// Prepare message
 			$msg = ADMIN_THEME_IMPORTED_1.REQUEST_POST('theme').ADMIN_THEME_IMPORTED_2;
diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 9867936bb8..801be23db9 100644
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -45,7 +45,7 @@ if (IS_FORM_SENT()) {
 	// Does he have selected at least one sponsor?
 	if (SELECTION_COUNT(REQUEST_POST('id')) > 0) {
 		// At least one entry selected
-		foreach (REQUEST_POST('id') as $id => $sel) {
+		foreach (REQUEST_POST('id') as $id => $selected) {
 			// Secure ID number
 			$id = bigintval($id);
 
diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php
index a9be0cc9d6..26e5dfde7a 100644
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.php
@@ -63,7 +63,7 @@ define('ADMINS_ONLINE_CNT' , SQL_NUMROWS($result_admins));
 LOAD_TEMPLATE("online_now");
 
 // Add more links in this block
-RUN_FILTER('online_extra_links');
+runFilterChain('online_extra_links');
 
 //
 ?>
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 0ebcfcb29b..979b7813a7 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -182,7 +182,7 @@ if ((IS_FORM_SENT()) && ((!$FAILED) || (IS_ADMIN()))) {
 	$lockedUsers      = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
 
 	// Generate hash which will be inserted into confirmation mail
-	$hash = generateHash(sha1($confirmedUsers.":".$unconfirmedUsers.":".$lockedUsers.":".REQUEST_POST('month')."-".REQUEST_POST('day')."-".REQUEST_POST('year').":".getenv('SERVER_NAME').":".GET_REMOTE_ADDR().":".GET_USER_AGENT()."/".SITE_KEY."/".DATE_KEY."/".RAND_NUMBER));
+	$hash = generateHash(sha1($confirmedUsers.":".$unconfirmedUsers.":".$lockedUsers.":".REQUEST_POST('month')."-".REQUEST_POST('day')."-".REQUEST_POST('year').":".getenv('SERVER_NAME').":".GET_REMOTE_ADDR().":".GET_USER_AGENT()."/".constant('SITE_KEY')."/".constant('DATE_KEY')."/".constant('RAND_NUMBER')));
 
 	// Add design when extension sql_patches is v0.2.7 or greater
 	$ADD1 = ""; $ADD2 = "";
diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index a8be80d39f..8fbc7d509f 100644
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -50,7 +50,7 @@ OUTPUT_HTML("<div style=\"padding-left: 10px; padding-right: 10px\">");
 $rdf = new fase4_rdf();
 $rdf->use_dynamic_display(false);
 $rdf->set_CacheDir(constant('PATH')."inc/cache/");
-$rdf->set_salt(md5(SITE_KEY));
+$rdf->set_salt(md5(constant('SITE_KEY')));
 $rdf->set_max_item(10);
 $rdf->set_Options(
 	array(
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index aba730d1df..838aa5d78d 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -72,7 +72,7 @@ case "new": // Start new transfer
 		// Add new transfer
 		if (getConfig('transfer_code') > 0) {
 			// Check for code
-			$code = GEN_RANDOM_CODE(getConfig('transfer_code'), REQUEST_POST('code_chk'), $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE'));
+			$code = generateRandomCodde(getConfig('transfer_code'), REQUEST_POST('code_chk'), $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE'));
 			$valid_code = ($code == REQUEST_POST('code'));
 		} else {
 			// Zero length (= disabled) is always valid!
@@ -165,7 +165,7 @@ case "new": // Start new transfer
 			define('__TRANSFER_EXPIRES', CREATE_FANCY_TIME(getConfig('transfer_age')));
 
 			// Generate tranafer id
-			define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", mt_rand(0, 99999), $GLOBALS['userid'], REQUEST_POST('reason'))));
+			define('__TRANS_ID', bigintval(generateRandomCodde("10", mt_rand(0, 99999), $GLOBALS['userid'], REQUEST_POST('reason'))));
 
 			// Add entries to both tables
 			SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_transfers_in` (userid, from_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
@@ -268,7 +268,7 @@ case "new": // Start new transfer
 		// Generate Code
 		if (getConfig('transfer_code') > 0) {
 			$rand = mt_rand(0, 99999);
-			$code = GEN_RANDOM_CODE(getConfig('transfer_code'), $rand, $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE'));
+			$code = generateRandomCodde(getConfig('transfer_code'), $rand, $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE'));
 			$img = GENERATE_IMAGE($code, false);
 			define('__TRANSFER_IMAGE_INPUT', "<input type=\"hidden\" name=\"code_chk\" value=\"".$rand."\" /><input type=\"text\" name=\"code\" class=\"member_normal\" size=\"5\" maxlength=\"7\"{!__TRANSFER_TO_DISABLED!} />&nbsp;".$img);
 		} else {
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 1d5496449d..ee7ec8ebfd 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -104,7 +104,7 @@ if ((!isInstalling()) && (isInstalled())) {
 				unset($MySQL);
 
 				// Load configuration stuff
-				mergeConfig(LOAD_CONFIG());
+				loadConfiguration();
 
 				// Load "databases" aka static arrays
 				LOAD_INC_ONCE("inc/databases.php");
@@ -135,7 +135,7 @@ if ((!isInstalling()) && (isInstalled())) {
 				}
 
 				// Run the init filter chain
-				RUN_FILTER('init');
+				runFilterChain('init');
 
 				// Set default 'what' value
 				//* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");
@@ -158,8 +158,8 @@ if ((!isInstalling()) && (isInstalled())) {
 
 				// Load all active extension including language files when not upgrading.
 				// Check module for testing and count one click
-				$dummy = CHECK_MODULE($GLOBALS['module']);
-				if ($dummy == "done") COUNT_MODULE($GLOBALS['module']);
+				$dummy = checkModulePermissions($GLOBALS['module']);
+				if ($dummy == "done") countModuleHit($GLOBALS['module']);
 				unset($dummy);
 
 				// Shall we activate the exchange?
@@ -169,9 +169,9 @@ if ((!isInstalling()) && (isInstalled())) {
 				if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
 					// Generate random number
 					if (isset($GLOBALS['userid'])) {
-						define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+						define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
 					} else {
-						define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+						define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), 0, ""));
 					}
 				} else {
 					// Generate weak (!!!) code
@@ -221,7 +221,7 @@ if ((!isInstalling()) && (isInstalled())) {
 	} // END - if
 
 	// Run the init filter chain
-	RUN_FILTER('init');
+	runFilterChain('init');
 }
 
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 3a85acbd81..781acb611c 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -70,7 +70,7 @@ function ADD_MODULE_TITLE ($mod) {
 		$name = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod);
 		if (SQL_NUMROWS($result) == 0) {
 			// Add module to database
-			$dummy = CHECK_MODULE($mod);
+			$dummy = checkModulePermissions($mod);
 		} // END - if
 	} // END - if
 
@@ -79,7 +79,7 @@ function ADD_MODULE_TITLE ($mod) {
 }
 
 // Check validity of a given module name (no file extension)
-function CHECK_MODULE ($mod) {
+function checkModulePermissions ($mod) {
 	// Filter module name (names with low chars and underlines are fine!)
 	$mod = preg_replace("/[^a-z_]/", "", $mod);
 
@@ -194,10 +194,10 @@ function CHECK_MODULE ($mod) {
 			} // END - if
 
 			// Destroy cache here
-			REBUILD_CACHE("mod_reg", "modreg");
+			rebuildCacheFiles("modreg", "modreg");
 
 			// And reload data
-			$ret = CHECK_MODULE($mod_chk);
+			$ret = checkModulePermissions($mod_chk);
 		} else {
 			// Module not found we don't add it to the database
 			$ret = "404";
@@ -322,7 +322,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 				$GLOBALS['nav_depth'] = "0";
 
 				// Run the filter chain
-				$ret = RUN_FILTER('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
+				$ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
 				$OUT .= $ret['content'];
 			} // END - if
 		}
@@ -862,7 +862,7 @@ function SEND_MODE_MAILS($mod, $modes) {
 }
 
 // Update module counter
-function COUNT_MODULE($mod) {
+function countModuleHit($mod) {
 	if ($mod != "css") {
 		// Do count all other modules but not accesses on CSS file css.php!
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET clicks=clicks+1 WHERE module='%s' LIMIT 1",
@@ -1283,7 +1283,7 @@ function UPDATE_REF_COUNTER ($uid) {
 	} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2")) {
 		// Remove cache here
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - CACHE!<br />\n";
-		REBUILD_CACHE("refsystem", "refsystem");
+		rebuildCacheFiles("refsystem", "refsystem");
 	}
 
 	// "Walk" back here
@@ -1520,10 +1520,11 @@ function activateExchange() {
 		));
 
 		// Run SQLs
-		RUN_FILTER('run_sqls', array('dry_run' => false));
+		runFilterChain('run_sqls');
 
-		// Rebuild cache
-		REBUILD_CACHE("config", "config");
+		// Rebuild caches
+		rebuildCacheFiles("config", "config");
+		rebuildCacheFiles("modreg", "modreg");
 	} // END - if
 }
 //
@@ -1628,40 +1629,7 @@ function SUB_JACKPOT($points) {
 function IS_DEMO () {
 	return ((EXT_IS_ACTIVE("demo")) && (get_session('admin_login') == "demo"));
 }
-//
-function LOAD_CONFIG ($no="0") {
-	$CFG_DUMMY = array();
-
-	// Check for cache extension, cache-array and if the requested configuration is in cache
-	if ((is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
-		// Load config from cache
-		//* DEBUG: */ echo gettype($GLOBALS['cache_array']['config'][$no])."<br />\n";
-		foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
-			$CFG_DUMMY[$key] = $value;
-		} // END - foreach
-
-		// Count cache hits if exists
-		if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
-			$CFG_DUMMY['cache_hits']++;
-		} // END - if
-	} elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
-		// Load config from DB
-		$result_config = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1",
-			array(bigintval($no)), __FUNCTION__, __LINE__);
-
-		// Get config from database
-		$CFG_DUMMY = SQL_FETCHARRAY($result_config);
 
-		// Free result
-		SQL_FREERESULT($result_config);
-
-		// Remember this config in the array
-		$GLOBALS['cache_array']['config'][$no] = $CFG_DUMMY;
-	}
-
-	// Return config array
-	return $CFG_DUMMY;
-}
 // Gets the matching what name from module
 function GET_WHAT ($modCheck) {
 	// Is the request element set?
@@ -1770,7 +1738,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />\n";
 
 	// Rebuild cache
-	REBUILD_CACHE("config", "config");
+	rebuildCacheFiles("config", "config");
 }
 
 // Prepares an SQL statement part for HTML mail and/or holiday depency
diff --git a/inc/pool-update.php b/inc/pool-update.php
index 2b17629be4..cb2aefe1d6 100644
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -50,7 +50,7 @@ $GLOBALS['pool_cnt'] = 0;
 $INC_POOL = GET_DIR_AS_ARRAY("inc/pool/", "pool-");
 
 // Run the filter
-RUN_FILTER('load_includes', $INC_POOL);
+runFilterChain('load_includes', $INC_POOL);
 
 // Remove counter again
 unset($GLOBALS['pool_cnt']);
diff --git a/install/menu-de.sql b/install/menu-de.sql
index 19a284a0bc..a092c8f080 100644
--- a/install/menu-de.sql
+++ b/install/menu-de.sql
@@ -1,100 +1,100 @@
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gel&ouml;scht und Sie m&uuml;ssen sich erneut anmelden.',999);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu',NULL,'Men&uuml;-System','Alle drei Men&uuml;-System bearbeiten (Admin-, Mitglied- und Gast-Men&uuml;)',1);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','adminedit','Vom Admin editieren','Das Administrationsmen&uuml; mit neuen Men&uuml;s erweitern, bestehende &auml;ndern oder l&ouml;schen. <STRONG>Vorsicht!</STRONG> L&ouml;schen Sie nicht das Login-Men&uuml;!',2);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verf&uuml;gbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen &auml;ndern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','admin_add','Admin-Men&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Admin-Bereich hinzuf&uuml;gen',3);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guest_add','G&auml;ste-Men&uuml; hinzuf&uuml;gen','F&uuml;gen Sie weitere Men&uuml;punkte dem G&auml;ste-Men&uuml; hinzu.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','memedit','Mitgliedsmen&uuml; editieren','Mitgliedsmen&uuml; editieren oder l&ouml;schen',6);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guestedit','G&auml;ste-Men&uuml; editieren','G&auml;ste-Men&uuml; editieren, l&ouml;schen',4);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','mem_add','Mitgliedsmen&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Mitgliedsmen&uuml; hinzuf&uuml;gen',7);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','newsletter','Newsletter versenden','Text- oder HTML-Newsletter verschicken.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','edit_emails','Email-Daten &auml;ndern','Hier k&ouml;nnen Sie u.a. die gebuchte URL der Emails um&auml;ndern, usw.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_secure','Sicherheitseinstellungen','Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.',9);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier k&ouml;nnen Sie die maximal empfangbaren Mails usw. einstellen.',8);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_points','{!POINTS!}','Stellen Sie hier die Willkommensgutschrift, Referal-Gutschrift (einmalige) usw. ein.',10);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_reg','Anmeldeformular','Stellen Sie ein, wie viel Kategorien der Gast bei der Anmeldung mindestens einstellen muss. Diese Einstellung gilt nachher auch im Mitgliedsbereich!',8);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',6);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','F&uuml;gen Sie neue Banner hinzu, die dann die Mitglieder verlinken k&ouml;nnen, um neue Mitglieder zu werben. Oder editieren / l&ouml;schen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{!POINTS!}-Verg&uuml;tungen','F&uuml;gen Sie neue {!POINTS!}-Verg&uuml;tungen hinzu oder &auml;ndern / l&ouml;schen Sie bestende.',11);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gel&ouml;scht und Sie m&uuml;ssen sich erneut anmelden.',999);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu',NULL,'Men&uuml;-System','Alle drei Men&uuml;-System bearbeiten (Admin-, Mitglied- und Gast-Men&uuml;)',1);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','adminedit','Vom Admin editieren','Das Administrationsmen&uuml; mit neuen Men&uuml;s erweitern, bestehende &auml;ndern oder l&ouml;schen. <STRONG>Vorsicht!</STRONG> L&ouml;schen Sie nicht das Login-Men&uuml;!',2);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verf&uuml;gbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen &auml;ndern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','admin_add','Admin-Men&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Admin-Bereich hinzuf&uuml;gen',3);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guest_add','G&auml;ste-Men&uuml; hinzuf&uuml;gen','F&uuml;gen Sie weitere Men&uuml;punkte dem G&auml;ste-Men&uuml; hinzu.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','memedit','Mitgliedsmen&uuml; editieren','Mitgliedsmen&uuml; editieren oder l&ouml;schen',6);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guestedit','G&auml;ste-Men&uuml; editieren','G&auml;ste-Men&uuml; editieren, l&ouml;schen',4);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','mem_add','Mitgliedsmen&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Mitgliedsmen&uuml; hinzuf&uuml;gen',7);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','newsletter','Newsletter versenden','Text- oder HTML-Newsletter verschicken.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','edit_emails','Email-Daten &auml;ndern','Hier k&ouml;nnen Sie u.a. die gebuchte URL der Emails um&auml;ndern, usw.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_secure','Sicherheitseinstellungen','Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.',9);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier k&ouml;nnen Sie die maximal empfangbaren Mails usw. einstellen.',8);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_points','{!POINTS!}','Stellen Sie hier die Willkommensgutschrift, Referal-Gutschrift (einmalige) usw. ein.',10);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_reg','Anmeldeformular','Stellen Sie ein, wie viel Kategorien der Gast bei der Anmeldung mindestens einstellen muss. Diese Einstellung gilt nachher auch im Mitgliedsbereich!',8);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',6);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','F&uuml;gen Sie neue Banner hinzu, die dann die Mitglieder verlinken k&ouml;nnen, um neue Mitglieder zu werben. Oder editieren / l&ouml;schen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{!POINTS!}-Verg&uuml;tungen','F&uuml;gen Sie neue {!POINTS!}-Verg&uuml;tungen hinzu oder &auml;ndern / l&ouml;schen Sie bestende.',11);
 
-INSERT INTO `mxchange_cats` VALUES (1,'Mix / Alles Senden --&gt; keine Erotik!','Y',0);
-INSERT INTO `mxchange_cats` VALUES (2,'Mix / Alles Senden --&gt; ohne PopUps, keine Erotik','Y',1);
-INSERT INTO `mxchange_cats` VALUES (3,'Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
-INSERT INTO `mxchange_cats` VALUES (4,'Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
-INSERT INTO `mxchange_cats` VALUES (5,'Download, PC- Software, HP-Design','Y',4);
-INSERT INTO `mxchange_cats` VALUES (6,'Investment, Banken, B&ouml;rse, Versicherungen, KEIN MLM','Y',5);
-INSERT INTO `mxchange_cats` VALUES (7,'Politik, Wissenschaft','Y',6);
-INSERT INTO `mxchange_cats` VALUES (8,'Handy, SMS, ISDN, DSL,','Y',7);
-INSERT INTO `mxchange_cats` VALUES (9,'Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
-INSERT INTO `mxchange_cats` VALUES (10,'Auto, Motorrad','Y',9);
-INSERT INTO `mxchange_cats` VALUES (11,'Reise,Touristik','Y',10);
-INSERT INTO `mxchange_cats` VALUES (12,'Kunst, Kultur, Bildung','Y',11);
-INSERT INTO `mxchange_cats` VALUES (13,'Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
-INSERT INTO `mxchange_cats` VALUES (14,'Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
-INSERT INTO `mxchange_cats` VALUES (15,'Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
-INSERT INTO `mxchange_cats` VALUES (16,'Medien, Musik, Film, TV, Video & DVD','Y',15);
-INSERT INTO `mxchange_cats` VALUES (17,'Singles, Flirten, Partnerschaft','Y',16);
-INSERT INTO `mxchange_cats` VALUES (18,'Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
-INSERT INTO `mxchange_cats` VALUES (19,'Haus, Garten, Freizeit, Hobbys','Y',18);
-INSERT INTO `mxchange_cats` VALUES (20,'Erotik --&gt; Keine Hardcore !','Y',19);
-INSERT INTO `mxchange_cats` VALUES (21,'Multi Level Marketing (alle Arten)','Y',20);
-INSERT INTO `mxchange_cats` VALUES (22,'Klammlose-Seiten','Y',21);
+INSERT INTO `{!prefix!}_cats` VALUES (1,'Mix / Alles Senden --&gt; keine Erotik!','Y',0);
+INSERT INTO `{!prefix!}_cats` VALUES (2,'Mix / Alles Senden --&gt; ohne PopUps, keine Erotik','Y',1);
+INSERT INTO `{!prefix!}_cats` VALUES (3,'Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
+INSERT INTO `{!prefix!}_cats` VALUES (4,'Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
+INSERT INTO `{!prefix!}_cats` VALUES (5,'Download, PC- Software, HP-Design','Y',4);
+INSERT INTO `{!prefix!}_cats` VALUES (6,'Investment, Banken, B&ouml;rse, Versicherungen, KEIN MLM','Y',5);
+INSERT INTO `{!prefix!}_cats` VALUES (7,'Politik, Wissenschaft','Y',6);
+INSERT INTO `{!prefix!}_cats` VALUES (8,'Handy, SMS, ISDN, DSL,','Y',7);
+INSERT INTO `{!prefix!}_cats` VALUES (9,'Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
+INSERT INTO `{!prefix!}_cats` VALUES (10,'Auto, Motorrad','Y',9);
+INSERT INTO `{!prefix!}_cats` VALUES (11,'Reise,Touristik','Y',10);
+INSERT INTO `{!prefix!}_cats` VALUES (12,'Kunst, Kultur, Bildung','Y',11);
+INSERT INTO `{!prefix!}_cats` VALUES (13,'Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
+INSERT INTO `{!prefix!}_cats` VALUES (14,'Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
+INSERT INTO `{!prefix!}_cats` VALUES (15,'Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
+INSERT INTO `{!prefix!}_cats` VALUES (16,'Medien, Musik, Film, TV, Video & DVD','Y',15);
+INSERT INTO `{!prefix!}_cats` VALUES (17,'Singles, Flirten, Partnerschaft','Y',16);
+INSERT INTO `{!prefix!}_cats` VALUES (18,'Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
+INSERT INTO `{!prefix!}_cats` VALUES (19,'Haus, Garten, Freizeit, Hobbys','Y',18);
+INSERT INTO `{!prefix!}_cats` VALUES (20,'Erotik --&gt; Keine Hardcore !','Y',19);
+INSERT INTO `{!prefix!}_cats` VALUES (21,'Multi Level Marketing (alle Arten)','Y',20);
+INSERT INTO `{!prefix!}_cats` VALUES (22,'Klammlose-Seiten','Y',21);
 
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmen&uuml;',0,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','register','Anmeldung',2,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Best&auml;tigungslink',3,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmen&uuml;',0,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','register','Anmeldung',2,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Best&auml;tigungslink',3,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
 
-INSERT INTO `mxchange_max_receive` VALUES (1,0,'Urlaub');
-INSERT INTO `mxchange_max_receive` VALUES (2,50,'Bonus m&ouml;glich!');
-INSERT INTO `mxchange_max_receive` VALUES (3,90,'Bonus m&ouml;glich!');
-INSERT INTO `mxchange_max_receive` VALUES (4,5,'');
-INSERT INTO `mxchange_max_receive` VALUES (5,10,'');
-INSERT INTO `mxchange_max_receive` VALUES (6,15,'');
-INSERT INTO `mxchange_max_receive` VALUES (7,20,'');
-INSERT INTO `mxchange_max_receive` VALUES (8,25,'');
-INSERT INTO `mxchange_max_receive` VALUES (9,30,'');
-INSERT INTO `mxchange_max_receive` VALUES (10,35,'');
-INSERT INTO `mxchange_max_receive` VALUES (11,40,'');
-INSERT INTO `mxchange_max_receive` VALUES (12,45,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (1,0,'Urlaub');
+INSERT INTO `{!prefix!}_max_receive` VALUES (2,50,'Bonus m&ouml;glich!');
+INSERT INTO `{!prefix!}_max_receive` VALUES (3,90,'Bonus m&ouml;glich!');
+INSERT INTO `{!prefix!}_max_receive` VALUES (4,5,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (5,10,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (6,15,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (7,20,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (8,25,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (9,30,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (10,35,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (11,40,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (12,45,'');
 
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmen&uuml;',0,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mydata','Profildaten &auml;ndern',2,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{!POINTS!}-Guthaben',4,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien ausw&auml;hlen',3,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','order','Mailbuchung',8,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbest&auml;tigte Emails',5,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmen&uuml;',0,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mydata','Profildaten &auml;ndern',2,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{!POINTS!}-Guthaben',4,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien ausw&auml;hlen',3,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','order','Mailbuchung',8,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbest&auml;tigte Emails',5,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);
 
-INSERT INTO `mxchange_payments` VALUES (1,10,2.000,'Klick-Mail 10 Sek.',1.000);
-INSERT INTO `mxchange_payments` VALUES (2,20,10.000,'Klick-Mail 20 Sek.',9.000);
-INSERT INTO `mxchange_payments` VALUES (3,30,30.000,'Klick-Mail 30 Sek.',29.000);
-INSERT INTO `mxchange_payments` VALUES (4,40,40.000,'Klick-Mail 40 Sek.',39.000);
-INSERT INTO `mxchange_payments` VALUES (5,50,50.000,'Klick-Mail 50 Sek.',49.000);
+INSERT INTO `{!prefix!}_payments` VALUES (1,10,2.000,'Klick-Mail 10 Sek.',1.000);
+INSERT INTO `{!prefix!}_payments` VALUES (2,20,10.000,'Klick-Mail 20 Sek.',9.000);
+INSERT INTO `{!prefix!}_payments` VALUES (3,30,30.000,'Klick-Mail 30 Sek.',29.000);
+INSERT INTO `{!prefix!}_payments` VALUES (4,40,40.000,'Klick-Mail 40 Sek.',39.000);
+INSERT INTO `{!prefix!}_payments` VALUES (5,50,50.000,'Klick-Mail 50 Sek.',49.000);
 
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_archiv','E-Mail Archiv','Sehen Sie sich hier bereits gesendete Mails an.','6');
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. <STRONG>Nur bei Normal-Mails:</STRONG> {!POINTS!} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','updates','Updates pr&uuml;fen','Pr&uuml;ft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie m&uuml;ssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8');
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_archiv','E-Mail Archiv','Sehen Sie sich hier bereits gesendete Mails an.','6');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. <STRONG>Nur bei Normal-Mails:</STRONG> {!POINTS!} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','updates','Updates pr&uuml;fen','Pr&uuml;ft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie m&uuml;ssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');
 
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');
diff --git a/install/menu-en.sql b/install/menu-en.sql
index 19a284a0bc..a092c8f080 100644
--- a/install/menu-en.sql
+++ b/install/menu-en.sql
@@ -1,100 +1,100 @@
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gel&ouml;scht und Sie m&uuml;ssen sich erneut anmelden.',999);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu',NULL,'Men&uuml;-System','Alle drei Men&uuml;-System bearbeiten (Admin-, Mitglied- und Gast-Men&uuml;)',1);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','adminedit','Vom Admin editieren','Das Administrationsmen&uuml; mit neuen Men&uuml;s erweitern, bestehende &auml;ndern oder l&ouml;schen. <STRONG>Vorsicht!</STRONG> L&ouml;schen Sie nicht das Login-Men&uuml;!',2);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verf&uuml;gbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen &auml;ndern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','admin_add','Admin-Men&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Admin-Bereich hinzuf&uuml;gen',3);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guest_add','G&auml;ste-Men&uuml; hinzuf&uuml;gen','F&uuml;gen Sie weitere Men&uuml;punkte dem G&auml;ste-Men&uuml; hinzu.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','memedit','Mitgliedsmen&uuml; editieren','Mitgliedsmen&uuml; editieren oder l&ouml;schen',6);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guestedit','G&auml;ste-Men&uuml; editieren','G&auml;ste-Men&uuml; editieren, l&ouml;schen',4);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','mem_add','Mitgliedsmen&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Mitgliedsmen&uuml; hinzuf&uuml;gen',7);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','newsletter','Newsletter versenden','Text- oder HTML-Newsletter verschicken.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','edit_emails','Email-Daten &auml;ndern','Hier k&ouml;nnen Sie u.a. die gebuchte URL der Emails um&auml;ndern, usw.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_secure','Sicherheitseinstellungen','Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.',9);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier k&ouml;nnen Sie die maximal empfangbaren Mails usw. einstellen.',8);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_points','{!POINTS!}','Stellen Sie hier die Willkommensgutschrift, Referal-Gutschrift (einmalige) usw. ein.',10);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_reg','Anmeldeformular','Stellen Sie ein, wie viel Kategorien der Gast bei der Anmeldung mindestens einstellen muss. Diese Einstellung gilt nachher auch im Mitgliedsbereich!',8);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',6);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','F&uuml;gen Sie neue Banner hinzu, die dann die Mitglieder verlinken k&ouml;nnen, um neue Mitglieder zu werben. Oder editieren / l&ouml;schen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{!POINTS!}-Verg&uuml;tungen','F&uuml;gen Sie neue {!POINTS!}-Verg&uuml;tungen hinzu oder &auml;ndern / l&ouml;schen Sie bestende.',11);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('login',NULL,'Willkommen','Eingangsseite zum Admin-Bereich',0);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('logout',NULL,'Ausloggen','Ausloggen aus dem Admin-Bereich. Dadurch wird Ihre Session gel&ouml;scht und Sie m&uuml;ssen sich erneut anmelden.',999);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu',NULL,'Men&uuml;-System','Alle drei Men&uuml;-System bearbeiten (Admin-, Mitglied- und Gast-Men&uuml;)',1);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','adminedit','Vom Admin editieren','Das Administrationsmen&uuml; mit neuen Men&uuml;s erweitern, bestehende &auml;ndern oder l&ouml;schen. <STRONG>Vorsicht!</STRONG> L&ouml;schen Sie nicht das Login-Men&uuml;!',2);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email',NULL,'Email-Management','Gebuchte Mails umleiten, Details zu den Buchungen anzeigen, Emails freigeben, registrierte Email-Adress auf Verf&uuml;gbarkeit testen (Mass-Mailing!), Newsletter versenden, Email-Adressen sperren (Email-Backlist), gebuchte URLs sperren (URL-Blacklist)',4);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen &auml;ndern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','admin_add','Admin-Men&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Admin-Bereich hinzuf&uuml;gen',3);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guest_add','G&auml;ste-Men&uuml; hinzuf&uuml;gen','F&uuml;gen Sie weitere Men&uuml;punkte dem G&auml;ste-Men&uuml; hinzu.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','memedit','Mitgliedsmen&uuml; editieren','Mitgliedsmen&uuml; editieren oder l&ouml;schen',6);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','guestedit','G&auml;ste-Men&uuml; editieren','G&auml;ste-Men&uuml; editieren, l&ouml;schen',4);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','mem_add','Mitgliedsmen&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Mitgliedsmen&uuml; hinzuf&uuml;gen',7);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','newsletter','Newsletter versenden','Text- oder HTML-Newsletter verschicken.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_stats','Email-Statistiken','Schauen Sie sich detailierte Statistiken zu den bereits versanden Mails an.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','edit_emails','Email-Daten &auml;ndern','Hier k&ouml;nnen Sie u.a. die gebuchte URL der Emails um&auml;ndern, usw.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','unlock_emails','Emails freigeben','Geben Sie bei manuellem Versand gebuchte Mails hier frei.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_secure','Sicherheitseinstellungen','Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.',9);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier k&ouml;nnen Sie die maximal empfangbaren Mails usw. einstellen.',8);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_points','{!POINTS!}','Stellen Sie hier die Willkommensgutschrift, Referal-Gutschrift (einmalige) usw. ein.',10);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_reg','Anmeldeformular','Stellen Sie ein, wie viel Kategorien der Gast bei der Anmeldung mindestens einstellen muss. Diese Einstellung gilt nachher auch im Mitgliedsbereich!',8);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',6);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','F&uuml;gen Sie neue Banner hinzu, die dann die Mitglieder verlinken k&ouml;nnen, um neue Mitglieder zu werben. Oder editieren / l&ouml;schen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12);
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{!POINTS!}-Verg&uuml;tungen','F&uuml;gen Sie neue {!POINTS!}-Verg&uuml;tungen hinzu oder &auml;ndern / l&ouml;schen Sie bestende.',11);
 
-INSERT INTO `mxchange_cats` VALUES (1,'Mix / Alles Senden --&gt; keine Erotik!','Y',0);
-INSERT INTO `mxchange_cats` VALUES (2,'Mix / Alles Senden --&gt; ohne PopUps, keine Erotik','Y',1);
-INSERT INTO `mxchange_cats` VALUES (3,'Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
-INSERT INTO `mxchange_cats` VALUES (4,'Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
-INSERT INTO `mxchange_cats` VALUES (5,'Download, PC- Software, HP-Design','Y',4);
-INSERT INTO `mxchange_cats` VALUES (6,'Investment, Banken, B&ouml;rse, Versicherungen, KEIN MLM','Y',5);
-INSERT INTO `mxchange_cats` VALUES (7,'Politik, Wissenschaft','Y',6);
-INSERT INTO `mxchange_cats` VALUES (8,'Handy, SMS, ISDN, DSL,','Y',7);
-INSERT INTO `mxchange_cats` VALUES (9,'Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
-INSERT INTO `mxchange_cats` VALUES (10,'Auto, Motorrad','Y',9);
-INSERT INTO `mxchange_cats` VALUES (11,'Reise,Touristik','Y',10);
-INSERT INTO `mxchange_cats` VALUES (12,'Kunst, Kultur, Bildung','Y',11);
-INSERT INTO `mxchange_cats` VALUES (13,'Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
-INSERT INTO `mxchange_cats` VALUES (14,'Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
-INSERT INTO `mxchange_cats` VALUES (15,'Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
-INSERT INTO `mxchange_cats` VALUES (16,'Medien, Musik, Film, TV, Video & DVD','Y',15);
-INSERT INTO `mxchange_cats` VALUES (17,'Singles, Flirten, Partnerschaft','Y',16);
-INSERT INTO `mxchange_cats` VALUES (18,'Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
-INSERT INTO `mxchange_cats` VALUES (19,'Haus, Garten, Freizeit, Hobbys','Y',18);
-INSERT INTO `mxchange_cats` VALUES (20,'Erotik --&gt; Keine Hardcore !','Y',19);
-INSERT INTO `mxchange_cats` VALUES (21,'Multi Level Marketing (alle Arten)','Y',20);
-INSERT INTO `mxchange_cats` VALUES (22,'Klammlose-Seiten','Y',21);
+INSERT INTO `{!prefix!}_cats` VALUES (1,'Mix / Alles Senden --&gt; keine Erotik!','Y',0);
+INSERT INTO `{!prefix!}_cats` VALUES (2,'Mix / Alles Senden --&gt; ohne PopUps, keine Erotik','Y',1);
+INSERT INTO `{!prefix!}_cats` VALUES (3,'Traffic, Reflinks, Kostenloses, KEIN MLM!','Y',2);
+INSERT INTO `{!prefix!}_cats` VALUES (4,'Geldverdienen, Beruf, Arbeit, KEIN MLM!','Y',3);
+INSERT INTO `{!prefix!}_cats` VALUES (5,'Download, PC- Software, HP-Design','Y',4);
+INSERT INTO `{!prefix!}_cats` VALUES (6,'Investment, Banken, B&ouml;rse, Versicherungen, KEIN MLM','Y',5);
+INSERT INTO `{!prefix!}_cats` VALUES (7,'Politik, Wissenschaft','Y',6);
+INSERT INTO `{!prefix!}_cats` VALUES (8,'Handy, SMS, ISDN, DSL,','Y',7);
+INSERT INTO `{!prefix!}_cats` VALUES (9,'Elektronik, Technik, Server, PC-Hardware, Hosting','Y',8);
+INSERT INTO `{!prefix!}_cats` VALUES (10,'Auto, Motorrad','Y',9);
+INSERT INTO `{!prefix!}_cats` VALUES (11,'Reise,Touristik','Y',10);
+INSERT INTO `{!prefix!}_cats` VALUES (12,'Kunst, Kultur, Bildung','Y',11);
+INSERT INTO `{!prefix!}_cats` VALUES (13,'Gesundheit, Fitness, Sport, KEIN MLM!','Y',12);
+INSERT INTO `{!prefix!}_cats` VALUES (14,'Lifestyle, Mode, Kosmetik, KEIN MLM!','Y',13);
+INSERT INTO `{!prefix!}_cats` VALUES (15,'Auktionen, Shopping, Verkauf, KEIN MLM!','Y',14);
+INSERT INTO `{!prefix!}_cats` VALUES (16,'Medien, Musik, Film, TV, Video & DVD','Y',15);
+INSERT INTO `{!prefix!}_cats` VALUES (17,'Singles, Flirten, Partnerschaft','Y',16);
+INSERT INTO `{!prefix!}_cats` VALUES (18,'Gewinnspiele, Wetten, Lotto, KEIN MLM!','Y',17);
+INSERT INTO `{!prefix!}_cats` VALUES (19,'Haus, Garten, Freizeit, Hobbys','Y',18);
+INSERT INTO `{!prefix!}_cats` VALUES (20,'Erotik --&gt; Keine Hardcore !','Y',19);
+INSERT INTO `{!prefix!}_cats` VALUES (21,'Multi Level Marketing (alle Arten)','Y',20);
+INSERT INTO `{!prefix!}_cats` VALUES (22,'Klammlose-Seiten','Y',21);
 
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmen&uuml;',0,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','register','Anmeldung',2,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Best&auml;tigungslink',3,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen',1,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Hauptmen&uuml;',0,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','register','Anmeldung',2,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','confirm','Best&auml;tigungslink',3,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members',NULL,'Mitglieder',1,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
 
-INSERT INTO `mxchange_max_receive` VALUES (1,0,'Urlaub');
-INSERT INTO `mxchange_max_receive` VALUES (2,50,'Bonus m&ouml;glich!');
-INSERT INTO `mxchange_max_receive` VALUES (3,90,'Bonus m&ouml;glich!');
-INSERT INTO `mxchange_max_receive` VALUES (4,5,'');
-INSERT INTO `mxchange_max_receive` VALUES (5,10,'');
-INSERT INTO `mxchange_max_receive` VALUES (6,15,'');
-INSERT INTO `mxchange_max_receive` VALUES (7,20,'');
-INSERT INTO `mxchange_max_receive` VALUES (8,25,'');
-INSERT INTO `mxchange_max_receive` VALUES (9,30,'');
-INSERT INTO `mxchange_max_receive` VALUES (10,35,'');
-INSERT INTO `mxchange_max_receive` VALUES (11,40,'');
-INSERT INTO `mxchange_max_receive` VALUES (12,45,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (1,0,'Urlaub');
+INSERT INTO `{!prefix!}_max_receive` VALUES (2,50,'Bonus m&ouml;glich!');
+INSERT INTO `{!prefix!}_max_receive` VALUES (3,90,'Bonus m&ouml;glich!');
+INSERT INTO `{!prefix!}_max_receive` VALUES (4,5,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (5,10,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (6,15,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (7,20,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (8,25,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (9,30,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (10,35,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (11,40,'');
+INSERT INTO `{!prefix!}_max_receive` VALUES (12,45,'');
 
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmen&uuml;',0,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mydata','Profildaten &auml;ndern',2,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{!POINTS!}-Guthaben',4,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien ausw&auml;hlen',3,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','order','Mailbuchung',8,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbest&auml;tigte Emails',5,'Y','N');
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);
-INSERT INTO `mxchange_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main',NULL,'Mitgliedsmen&uuml;',0,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout','logout','Ausloggen',999,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mydata','Profildaten &auml;ndern',2,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',1,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{!POINTS!}-Guthaben',4,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien ausw&auml;hlen',3,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','order','Mailbuchung',8,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbest&auml;tigte Emails',5,'Y','N');
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','stats','Statistiken', 'Y','N',9);
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','support','Support ','Y','N',10);
+INSERT INTO `{!prefix!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('logout','guest','Zum Gastmen&uuml;','Y','N',1000);
 
-INSERT INTO `mxchange_payments` VALUES (1,10,2.000,'Klick-Mail 10 Sek.',1.000);
-INSERT INTO `mxchange_payments` VALUES (2,20,10.000,'Klick-Mail 20 Sek.',9.000);
-INSERT INTO `mxchange_payments` VALUES (3,30,30.000,'Klick-Mail 30 Sek.',29.000);
-INSERT INTO `mxchange_payments` VALUES (4,40,40.000,'Klick-Mail 40 Sek.',39.000);
-INSERT INTO `mxchange_payments` VALUES (5,50,50.000,'Klick-Mail 50 Sek.',49.000);
+INSERT INTO `{!prefix!}_payments` VALUES (1,10,2.000,'Klick-Mail 10 Sek.',1.000);
+INSERT INTO `{!prefix!}_payments` VALUES (2,20,10.000,'Klick-Mail 20 Sek.',9.000);
+INSERT INTO `{!prefix!}_payments` VALUES (3,30,30.000,'Klick-Mail 30 Sek.',29.000);
+INSERT INTO `{!prefix!}_payments` VALUES (4,40,40.000,'Klick-Mail 40 Sek.',39.000);
+INSERT INTO `{!prefix!}_payments` VALUES (5,50,50.000,'Klick-Mail 50 Sek.',49.000);
 
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_archiv','E-Mail Archiv','Sehen Sie sich hier bereits gesendete Mails an.','6');
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. <STRONG>Nur bei Normal-Mails:</STRONG> {!POINTS!} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','updates','Updates pr&uuml;fen','Pr&uuml;ft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie m&uuml;ssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8');
-INSERT INTO `mxchange_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','email_archiv','E-Mail Archiv','Sehen Sie sich hier bereits gesendete Mails an.','6');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','del_email','E-Mail l&ouml;schen','L&ouml;schen Sie hierr&uuml;ber E-Mails (sowohl Bonus- als auch Normal-Mails) aus Ihrem Mailtausch-System. <STRONG>Nur bei Normal-Mails:</STRONG> {!POINTS!} aus den unbest&auml;tigten Mails werden dem Werber wieder verg&uuml;tet.','7');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','updates','Updates pr&uuml;fen','Pr&uuml;ft, ob eine neue Version oder ein Patch auf dem Server exisitiert. Sie m&uuml;ssen dann die Patches/Updates selber herunterladen und einspielen. Dabei werden keine Daten von Ihrer Installation an uns gesendet!','8');
+INSERT INTO `{!prefix!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','extensions','Erweiterungen','Erweiterungen installieren, updaten, sperren, l&ouml;schen usw.','8');
 
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken','7','Y','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin',NULL,'Administrative Links','3','N','N');
+INSERT INTO `{!prefix!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('admin','admin','Zum Admin-Bereich','4','N','N');
diff --git a/install/tables.sql b/install/tables.sql
index 6f82a40855..8c78fbc549 100644
--- a/install/tables.sql
+++ b/install/tables.sql
@@ -1,5 +1,5 @@
-DROP TABLE IF EXISTS `mxchange_admin_menu`;
-CREATE TABLE `mxchange_admin_menu` (
+DROP TABLE IF EXISTS `{!prefix!}_admin_menu`;
+CREATE TABLE `{!prefix!}_admin_menu` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `action` VARCHAR(255) NOT NULL DEFAULT '',
   `what` VARCHAR(255) NULL DEFAULT NULL,
@@ -9,16 +9,16 @@ CREATE TABLE `mxchange_admin_menu` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_admins`;
-CREATE TABLE `mxchange_admins` (
+DROP TABLE IF EXISTS `{!prefix!}_admins`;
+CREATE TABLE `{!prefix!}_admins` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `login` VARCHAR(100) NOT NULL DEFAULT '',
   `password` VARCHAR(40) NOT NULL DEFAULT '',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_cats`;
-CREATE TABLE `mxchange_cats` (
+DROP TABLE IF EXISTS `{!prefix!}_cats`;
+CREATE TABLE `{!prefix!}_cats` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `cat` VARCHAR(255) NOT NULL DEFAULT '',
   `visible` ENUM('Y','N') NOT NULL DEFAULT 'Y',
@@ -26,8 +26,8 @@ CREATE TABLE `mxchange_cats` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_config`;
-CREATE TABLE `mxchange_config` (
+DROP TABLE IF EXISTS `{!prefix!}_config`;
+CREATE TABLE `{!prefix!}_config` (
   `config` tinyint(1) NOT NULL DEFAULT 0,
   `pass_len` TINYINT(3) UNSIGNED NOT NULL DEFAULT 5,
   `points_register` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -44,10 +44,10 @@ CREATE TABLE `mxchange_config` (
   PRIMARY KEY  (`config`)
 ) TYPE=MyISAM;
 
-INSERT INTO `mxchange_config` VALUES (0,5,2000,200,5,'Y','N','Y',86400,'Y',1000,'Y','N');
+INSERT INTO `{!prefix!}_config` VALUES (0,5,2000,200,5,'Y','N','Y',86400,'Y',1000,'Y','N');
 
-DROP TABLE IF EXISTS `mxchange_guest_menu`;
-CREATE TABLE `mxchange_guest_menu` (
+DROP TABLE IF EXISTS `{!prefix!}_guest_menu`;
+CREATE TABLE `{!prefix!}_guest_menu` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `action` VARCHAR(255) NOT NULL DEFAULT '',
   `what` VARCHAR(255) NULL DEFAULT NULL,
@@ -59,16 +59,16 @@ CREATE TABLE `mxchange_guest_menu` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_max_receive`;
-CREATE TABLE `mxchange_max_receive` (
+DROP TABLE IF EXISTS `{!prefix!}_max_receive`;
+CREATE TABLE `{!prefix!}_max_receive` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `value` MEDIUMINT(9) NOT NULL DEFAULT 0,
   `comment` VARCHAR(255) NOT NULL DEFAULT '',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_member_menu`;
-CREATE TABLE `mxchange_member_menu` (
+DROP TABLE IF EXISTS `{!prefix!}_member_menu`;
+CREATE TABLE `{!prefix!}_member_menu` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `action` VARCHAR(255) NOT NULL DEFAULT '',
   `what` VARCHAR(255) NULL DEFAULT NULL,
@@ -80,8 +80,8 @@ CREATE TABLE `mxchange_member_menu` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_mod_reg`;
-CREATE TABLE `mxchange_mod_reg` (
+DROP TABLE IF EXISTS `{!prefix!}_mod_reg`;
+CREATE TABLE `{!prefix!}_mod_reg` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `module` VARCHAR(50) NOT NULL DEFAULT '',
   `locked` ENUM('Y','N') NOT NULL DEFAULT 'Y',
@@ -93,16 +93,16 @@ CREATE TABLE `mxchange_mod_reg` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-INSERT INTO `mxchange_mod_reg` VALUES (1,'admin','N','N','Y','','N',0);
-INSERT INTO `mxchange_mod_reg` VALUES (2,'index','N','N','N','','N',0);
-INSERT INTO `mxchange_mod_reg` VALUES (3,'frameset','Y','N','N','','N',0);
-INSERT INTO `mxchange_mod_reg` VALUES (4,'login','N','N','N','','Y',0);
-INSERT INTO `mxchange_mod_reg` VALUES (6,'frametester','N','Y','N','','N',0);
-INSERT INTO `mxchange_mod_reg` VALUES (7,'loader','N','Y','N','','N',0);
-INSERT INTO `mxchange_mod_reg` VALUES (8,'order','N','N','N','','N',0);
+INSERT INTO `{!prefix!}_mod_reg` VALUES (1,'admin','N','N','Y','','N',0);
+INSERT INTO `{!prefix!}_mod_reg` VALUES (2,'index','N','N','N','','N',0);
+INSERT INTO `{!prefix!}_mod_reg` VALUES (3,'frameset','Y','N','N','','N',0);
+INSERT INTO `{!prefix!}_mod_reg` VALUES (4,'login','N','N','N','','Y',0);
+INSERT INTO `{!prefix!}_mod_reg` VALUES (6,'frametester','N','Y','N','','N',0);
+INSERT INTO `{!prefix!}_mod_reg` VALUES (7,'loader','N','Y','N','','N',0);
+INSERT INTO `{!prefix!}_mod_reg` VALUES (8,'order','N','N','N','','N',0);
 
-DROP TABLE IF EXISTS `mxchange_payments`;
-CREATE TABLE `mxchange_payments` (
+DROP TABLE IF EXISTS `{!prefix!}_payments`;
+CREATE TABLE `{!prefix!}_payments` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `time` INT(7) NOT NULL DEFAULT 0,
   `payment` FLOAT(5,3) UNSIGNED NOT NULL DEFAULT '0.000',
@@ -111,8 +111,8 @@ CREATE TABLE `mxchange_payments` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_pool`;
-CREATE TABLE `mxchange_pool` (
+DROP TABLE IF EXISTS `{!prefix!}_pool`;
+CREATE TABLE `{!prefix!}_pool` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `sender` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
   `subject` VARCHAR(200) NOT NULL DEFAULT '',
@@ -127,8 +127,8 @@ CREATE TABLE `mxchange_pool` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_refbanner`;
-CREATE TABLE `mxchange_refbanner` (
+DROP TABLE IF EXISTS `{!prefix!}_refbanner`;
+CREATE TABLE `{!prefix!}_refbanner` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `url` TEXT NOT NULL,
   `alternate` TEXT NOT NULL,
@@ -137,23 +137,23 @@ CREATE TABLE `mxchange_refbanner` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_refdepths`;
-CREATE TABLE `mxchange_refdepths` (
+DROP TABLE IF EXISTS `{!prefix!}_refdepths`;
+CREATE TABLE `{!prefix!}_refdepths` (
   `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
   `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
   `percents` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-INSERT INTO `mxchange_refdepths` VALUES (1,0,100);
-INSERT INTO `mxchange_refdepths` VALUES (2,1,30);
-INSERT INTO `mxchange_refdepths` VALUES (3,2,15);
-INSERT INTO `mxchange_refdepths` VALUES (4,3,10);
-INSERT INTO `mxchange_refdepths` VALUES (5,4,8);
-INSERT INTO `mxchange_refdepths` VALUES (6,5,5);
+INSERT INTO `{!prefix!}_refdepths` VALUES (1,0,100);
+INSERT INTO `{!prefix!}_refdepths` VALUES (2,1,30);
+INSERT INTO `{!prefix!}_refdepths` VALUES (3,2,15);
+INSERT INTO `{!prefix!}_refdepths` VALUES (4,3,10);
+INSERT INTO `{!prefix!}_refdepths` VALUES (5,4,8);
+INSERT INTO `{!prefix!}_refdepths` VALUES (6,5,5);
 
-DROP TABLE IF EXISTS `mxchange_refsystem`;
-CREATE TABLE `mxchange_refsystem` (
+DROP TABLE IF EXISTS `{!prefix!}_refsystem`;
+CREATE TABLE `{!prefix!}_refsystem` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
   `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
@@ -161,16 +161,16 @@ CREATE TABLE `mxchange_refsystem` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_user_cats`;
-CREATE TABLE `mxchange_user_cats` (
+DROP TABLE IF EXISTS `{!prefix!}_user_cats`;
+CREATE TABLE `{!prefix!}_user_cats` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
   `cat_id` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_user_data`;
-CREATE TABLE `mxchange_user_data` (
+DROP TABLE IF EXISTS `{!prefix!}_user_data`;
+CREATE TABLE `{!prefix!}_user_data` (
   `userid` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `surname` VARCHAR(255) NOT NULL DEFAULT '',
   `family` VARCHAR(255) NOT NULL DEFAULT '',
@@ -199,8 +199,8 @@ CREATE TABLE `mxchange_user_data` (
   PRIMARY KEY  (`userid`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_user_points`;
-CREATE TABLE `mxchange_user_points` (
+DROP TABLE IF EXISTS `{!prefix!}_user_points`;
+CREATE TABLE `{!prefix!}_user_points` (
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
   `userid` BIGINT(22) NOT NULL DEFAULT 0,
   `ref_depth` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
@@ -208,17 +208,17 @@ CREATE TABLE `mxchange_user_points` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-ALTER TABLE `mxchange_config` ADD `max_send` TINYINT(3) UNSIGNED NOT NULL DEFAULT '100';
-ALTER TABLE `mxchange_config` ADD `url_blacklist` ENUM('Y','N') NOT NULL DEFAULT 'Y';
-ALTER TABLE `mxchange_config` ADD `auto_purge` TINYINT(3) UNSIGNED NOT NULL DEFAULT '14';
-ALTER TABLE `mxchange_config` ADD `auto_purge_active` ENUM('Y','N') NOT NULL DEFAULT 'Y';
+ALTER TABLE `{!prefix!}_config` ADD `max_send` TINYINT(3) UNSIGNED NOT NULL DEFAULT '100';
+ALTER TABLE `{!prefix!}_config` ADD `url_blacklist` ENUM('Y','N') NOT NULL DEFAULT 'Y';
+ALTER TABLE `{!prefix!}_config` ADD `auto_purge` TINYINT(3) UNSIGNED NOT NULL DEFAULT '14';
+ALTER TABLE `{!prefix!}_config` ADD `auto_purge_active` ENUM('Y','N') NOT NULL DEFAULT 'Y';
 
-ALTER TABLE `mxchange_pool` MODIFY `url` TINYTEXT NOT NULL;
-ALTER TABLE `mxchange_pool` CHANGE `url` `url` TINYBLOB NOT NULL;
-ALTER TABLE `mxchange_pool` MODIFY `data_type` ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP';
+ALTER TABLE `{!prefix!}_pool` MODIFY `url` TINYTEXT NOT NULL;
+ALTER TABLE `{!prefix!}_pool` CHANGE `url` `url` TINYBLOB NOT NULL;
+ALTER TABLE `{!prefix!}_pool` MODIFY `data_type` ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP';
 
-DROP TABLE IF EXISTS `mxchange_user_links`;
-CREATE TABLE `mxchange_user_links` (
+DROP TABLE IF EXISTS `{!prefix!}_user_links`;
+CREATE TABLE `{!prefix!}_user_links` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `stats_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
   `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -226,8 +226,8 @@ CREATE TABLE `mxchange_user_links` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_user_stats`;
-CREATE TABLE `mxchange_user_stats` (
+DROP TABLE IF EXISTS `{!prefix!}_user_stats`;
+CREATE TABLE `{!prefix!}_user_stats` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
   `cat_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -242,33 +242,33 @@ CREATE TABLE `mxchange_user_stats` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-ALTER TABLE `mxchange_user_data` ADD `joined` VARCHAR(10) NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_config` ADD `last_update` VARCHAR(10) NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_user_data` ADD `joined` VARCHAR(10) NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_config` ADD `last_update` VARCHAR(10) NOT NULL DEFAULT 0;
 
-INSERT INTO `mxchange_mod_reg` VALUES (NULL,'chk_login','N','N','N','','N',0);
-ALTER TABLE `mxchange_pool` MODIFY `data_type` ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP';
-ALTER TABLE `mxchange_config` ADD `unconfirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT '100';
-ALTER TABLE `mxchange_config` ADD `profile_lock` BIGINT(20) UNSIGNED NOT NULL DEFAULT '86400';
-ALTER TABLE `mxchange_user_data` ADD `last_update` VARCHAR(10) NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_refbanner` ADD `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_config` ADD `online_timeout` BIGINT(20) UNSIGNED NOT NULL DEFAULT '1800';
+INSERT INTO `{!prefix!}_mod_reg` VALUES (NULL,'chk_login','N','N','N','','N',0);
+ALTER TABLE `{!prefix!}_pool` MODIFY `data_type` ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP';
+ALTER TABLE `{!prefix!}_config` ADD `unconfirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT '100';
+ALTER TABLE `{!prefix!}_config` ADD `profile_lock` BIGINT(20) UNSIGNED NOT NULL DEFAULT '86400';
+ALTER TABLE `{!prefix!}_user_data` ADD `last_update` VARCHAR(10) NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_refbanner` ADD `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_config` ADD `online_timeout` BIGINT(20) UNSIGNED NOT NULL DEFAULT '1800';
 
-ALTER TABLE `mxchange_config` ADD `mad_timestamp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_config` ADD `mad_count` BIGINT(20) UNSIGNED NOT NULL;
-ALTER TABLE `mxchange_config` ADD `profile_update` BIGINT(20) UNSIGNED NOT NULL DEFAULT '15768000';
-ALTER TABLE `mxchange_config` ADD `send_prof_update` ENUM('Y','N') NOT NULL DEFAULT 'Y';
-ALTER TABLE `mxchange_config` ADD `resend_profile_update` BIGINT(20) UNSIGNED NOT NULL DEFAULT '172800';
+ALTER TABLE `{!prefix!}_config` ADD `mad_timestamp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_config` ADD `mad_count` BIGINT(20) UNSIGNED NOT NULL;
+ALTER TABLE `{!prefix!}_config` ADD `profile_update` BIGINT(20) UNSIGNED NOT NULL DEFAULT '15768000';
+ALTER TABLE `{!prefix!}_config` ADD `send_prof_update` ENUM('Y','N') NOT NULL DEFAULT 'Y';
+ALTER TABLE `{!prefix!}_config` ADD `resend_profile_update` BIGINT(20) UNSIGNED NOT NULL DEFAULT '172800';
 
-ALTER TABLE `mxchange_user_data` ADD `last_profile_sent` VARCHAR(10) NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_user_data` ADD `notified` ENUM('Y','N') NOT NULL DEFAULT 'N';
+ALTER TABLE `{!prefix!}_user_data` ADD `last_profile_sent` VARCHAR(10) NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_user_data` ADD `notified` ENUM('Y','N') NOT NULL DEFAULT 'N';
 
-ALTER TABLE `mxchange_config` ADD `patch_level` VARCHAR(100) NOT NULL DEFAULT '78';
-ALTER TABLE `mxchange_config` ADD `patch_ctime` VARCHAR(10) NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_config` ADD `patch_level` VARCHAR(100) NOT NULL DEFAULT '78';
+ALTER TABLE `{!prefix!}_config` ADD `patch_ctime` VARCHAR(10) NOT NULL DEFAULT 0;
 
-ALTER TABLE `mxchange_admins` ADD `email` VARCHAR(255) NOT NULL;
+ALTER TABLE `{!prefix!}_admins` ADD `email` VARCHAR(255) NOT NULL;
 
-DROP TABLE IF EXISTS `mxchange_task_system`;
-CREATE TABLE `mxchange_task_system` (
+DROP TABLE IF EXISTS `{!prefix!}_task_system`;
+CREATE TABLE `{!prefix!}_task_system` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `assigned_admin` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
   `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -281,32 +281,32 @@ CREATE TABLE `mxchange_task_system` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-ALTER TABLE `mxchange_pool` ADD INDEX (`sender`);
-ALTER TABLE `mxchange_pool` ADD INDEX (`payment_id`);
-ALTER TABLE `mxchange_pool` ADD INDEX (`cat_id`);
-ALTER TABLE `mxchange_refsystem` ADD INDEX (`userid`);
-ALTER TABLE `mxchange_task_system` ADD INDEX (`assigned_admin`);
-ALTER TABLE `mxchange_task_system` ADD INDEX (`userid`);
-ALTER TABLE `mxchange_user_cats` ADD INDEX (`userid`);
-ALTER TABLE `mxchange_user_cats` ADD INDEX (`cat_id`);
-ALTER TABLE `mxchange_user_data` ADD INDEX (`refid`);
-ALTER TABLE `mxchange_user_links` ADD INDEX (`userid`);
-ALTER TABLE `mxchange_user_links` ADD INDEX (`stats_id`);
-ALTER TABLE `mxchange_user_points` ADD INDEX (`userid`);
-ALTER TABLE `mxchange_user_stats` ADD INDEX (`userid`);
-ALTER TABLE `mxchange_user_stats` ADD INDEX (`cat_id`);
-ALTER TABLE `mxchange_user_stats` ADD INDEX (`payment_id`);
-ALTER TABLE `mxchange_user_stats` ADD INDEX (`pool_id`);
-
-ALTER TABLE `mxchange_user_stats` ADD `clicks` BIGINT(20) UNSIGNED NOT NULL;
-ALTER TABLE `mxchange_config` ADD `code_length` TINYINT(3) UNSIGNED NOT NULL DEFAULT 5;
-ALTER TABLE `mxchange_config` ADD `guest_stats` ENUM('MEMBERS','MODULES','INACTIVE') NOT NULL DEFAULT 'MEMBERS';
-ALTER TABLE `mxchange_config` ADD `ref_payout` TINYINT(3) UNSIGNED NOT NULL DEFAULT 5;
-ALTER TABLE `mxchange_user_data` ADD `ref_payout` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_user_points` ADD `locked_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0;
-
-DROP TABLE IF EXISTS `mxchange_extensions`;
-CREATE TABLE `mxchange_extensions` (
+ALTER TABLE `{!prefix!}_pool` ADD INDEX (`sender`);
+ALTER TABLE `{!prefix!}_pool` ADD INDEX (`payment_id`);
+ALTER TABLE `{!prefix!}_pool` ADD INDEX (`cat_id`);
+ALTER TABLE `{!prefix!}_refsystem` ADD INDEX (`userid`);
+ALTER TABLE `{!prefix!}_task_system` ADD INDEX (`assigned_admin`);
+ALTER TABLE `{!prefix!}_task_system` ADD INDEX (`userid`);
+ALTER TABLE `{!prefix!}_user_cats` ADD INDEX (`userid`);
+ALTER TABLE `{!prefix!}_user_cats` ADD INDEX (`cat_id`);
+ALTER TABLE `{!prefix!}_user_data` ADD INDEX (`refid`);
+ALTER TABLE `{!prefix!}_user_links` ADD INDEX (`userid`);
+ALTER TABLE `{!prefix!}_user_links` ADD INDEX (`stats_id`);
+ALTER TABLE `{!prefix!}_user_points` ADD INDEX (`userid`);
+ALTER TABLE `{!prefix!}_user_stats` ADD INDEX (`userid`);
+ALTER TABLE `{!prefix!}_user_stats` ADD INDEX (`cat_id`);
+ALTER TABLE `{!prefix!}_user_stats` ADD INDEX (`payment_id`);
+ALTER TABLE `{!prefix!}_user_stats` ADD INDEX (`pool_id`);
+
+ALTER TABLE `{!prefix!}_user_stats` ADD `clicks` BIGINT(20) UNSIGNED NOT NULL;
+ALTER TABLE `{!prefix!}_config` ADD `code_length` TINYINT(3) UNSIGNED NOT NULL DEFAULT 5;
+ALTER TABLE `{!prefix!}_config` ADD `guest_stats` ENUM('MEMBERS','MODULES','INACTIVE') NOT NULL DEFAULT 'MEMBERS';
+ALTER TABLE `{!prefix!}_config` ADD `ref_payout` TINYINT(3) UNSIGNED NOT NULL DEFAULT 5;
+ALTER TABLE `{!prefix!}_user_data` ADD `ref_payout` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_user_points` ADD `locked_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0;
+
+DROP TABLE IF EXISTS `{!prefix!}_extensions`;
+CREATE TABLE `{!prefix!}_extensions` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `ext_name` VARCHAR(255) NOT NULL DEFAULT '',
   `ext_active` ENUM('Y','N') NOT NULL DEFAULT 'N',
@@ -314,24 +314,24 @@ CREATE TABLE `mxchange_extensions` (
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-DROP TABLE IF EXISTS `mxchange_jackpot`;
-CREATE TABLE `mxchange_jackpot` (
+DROP TABLE IF EXISTS `{!prefix!}_jackpot`;
+CREATE TABLE `{!prefix!}_jackpot` (
   `ok` CHAR(2) NOT NULL DEFAULT 'ok',
   `points` FLOAT(20,3) NOT NULL DEFAULT '0.000',
   PRIMARY KEY  (`ok`)
 ) TYPE=MyISAM;
 
-ALTER TABLE `mxchange_config` ADD `activate_xchange` BIGINT(20) UNSIGNED NOT NULL DEFAULT 100;
-ALTER TABLE `mxchange_config` ADD `order_multi_page` ENUM('Y','N') NOT NULL DEFAULT 'Y';
-ALTER TABLE `mxchange_config` ADD `display_refid` ENUM('Y','N') NOT NULL DEFAULT 'Y';
-ALTER TABLE `mxchange_config` ADD `ip_timeout` BIGINT(20) UNSIGNED NOT NULL DEFAULT 86400;
-ALTER TABLE `mxchange_pool` ADD `zip` VARCHAR(6) NOT NULL DEFAULT '';
-
-ALTER TABLE `mxchange_task_system` CHANGE `task_type` `task_type` VARCHAR(255)  NOT NULL DEFAULT 'FIRST_USER';
-ALTER TABLE `mxchange_user_data` MODIFY `zip` VARCHAR(6) NOT NULL DEFAULT '';
-ALTER TABLE `mxchange_user_data` MODIFY `last_module` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `mxchange_config` ADD `allow_direct_pay` ENUM('Y','N') NOT NULL DEFAULT 'N';
-ALTER TABLE `mxchange_user_data` MODIFY `last_profile_sent` VARCHAR(10)  NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_user_data` MODIFY `last_update` VARCHAR(10)  NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_user_data` MODIFY `joined` VARCHAR(10)  NOT NULL DEFAULT 0;
-ALTER TABLE `mxchange_user_data` MODIFY `last_online` VARCHAR(10)  NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_config` ADD `activate_xchange` BIGINT(20) UNSIGNED NOT NULL DEFAULT 100;
+ALTER TABLE `{!prefix!}_config` ADD `order_multi_page` ENUM('Y','N') NOT NULL DEFAULT 'Y';
+ALTER TABLE `{!prefix!}_config` ADD `display_refid` ENUM('Y','N') NOT NULL DEFAULT 'Y';
+ALTER TABLE `{!prefix!}_config` ADD `ip_timeout` BIGINT(20) UNSIGNED NOT NULL DEFAULT 86400;
+ALTER TABLE `{!prefix!}_pool` ADD `zip` VARCHAR(6) NOT NULL DEFAULT '';
+
+ALTER TABLE `{!prefix!}_task_system` CHANGE `task_type` `task_type` VARCHAR(255)  NOT NULL DEFAULT 'FIRST_USER';
+ALTER TABLE `{!prefix!}_user_data` MODIFY `zip` VARCHAR(6) NOT NULL DEFAULT '';
+ALTER TABLE `{!prefix!}_user_data` MODIFY `last_module` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `{!prefix!}_config` ADD `allow_direct_pay` ENUM('Y','N') NOT NULL DEFAULT 'N';
+ALTER TABLE `{!prefix!}_user_data` MODIFY `last_profile_sent` VARCHAR(10)  NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_user_data` MODIFY `last_update` VARCHAR(10)  NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_user_data` MODIFY `joined` VARCHAR(10)  NOT NULL DEFAULT 0;
+ALTER TABLE `{!prefix!}_user_data` MODIFY `last_online` VARCHAR(10)  NOT NULL DEFAULT 0;
diff --git a/mailid_top.php b/mailid_top.php
index fc3c4ab0ea..b68409ad3a 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -162,7 +162,7 @@ if (isInstalled()) {
 							if (($time > 0) && ($payment > 0)) {
 								if (!empty($code)) {
 									// Generate code
-									$img_code = GEN_RANDOM_CODE(getConfig('code_length'), $code, $url_uid, $DATA);
+									$img_code = generateRandomCodde(getConfig('code_length'), $code, $url_uid, $DATA);
 								} // END - if
 
 								switch ($mode) {
diff --git a/modules.php b/modules.php
index 9cdeacb18a..a56acc311b 100644
--- a/modules.php
+++ b/modules.php
@@ -100,7 +100,7 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
 	define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));
 
 	// Did we found the module listed in allowed modules and are we successfully connected?
-	$check = CHECK_MODULE($GLOBALS['module']);
+	$check = checkModulePermissions($GLOBALS['module']);
 	switch ($check)
 	{
 	case "admin_only":