More fixes for installation phase. Thanks to AndreasJung

diff --git a/.gitattributes b/.gitattributes
index f90ab7b1beefe546d2519b9652afd937f55e0cae..4d5e54c0cabceb3665a1c84ce0da9b7193f4650f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -76,6 +76,7 @@ DOCS/validator.sh -text
 /doubler.php -text
 /img.php -text
 inc/.htaccess -text
+inc/.secret/.htaccess -text
 inc/autopurge.php -text
 inc/autopurge/.htaccess -text
 inc/autopurge/purge- -text

diff --git a/inc/.secret/.htaccess b/inc/.secret/.htaccess
new file mode 100644 (file)
index 0000000..14249c5
--- /dev/null
+++ b/inc/.secret/.htaccess
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file

diff --git a/inc/databases.php b/inc/databases.php
index 798fcef80a530dad82e0a59c389023d77b33d8c1..b4f373f96432c8a1c2a3727eee694b383859c5d7 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "474");
+define('CURR_SVN_REVISION', "475");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/extensions.php b/inc/extensions.php
index 0b75f56d259428dd8b3a5e2562a2f051db948bea..8be7feba1048bd7e43f14930d50f0c56961e8636 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -583,7 +583,7 @@ function GET_EXT_NAME ($id) {
                $ret = $cacheArray['extensions']['ext_name'][$id];
 
                // Count cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
@@ -602,7 +602,7 @@ function GET_EXT_ID($name) {
                $ret = $cacheArray['extensions']['ext_id'][$name];
 
                // Count cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 426eb0018b0de8089a232d654d3be1f642260372..a177eac4149b420ab9c0ef4be27fdee089e8eff8 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -716,6 +716,7 @@ default: // Do stuff when extension is loaded
                //$_CONFIG['verbose_sql']       = "N";
                define('MT_WORD' , DEFAULT_MT_WORD );
                define('MT_WORD2', DEFAULT_MT_WORD2);
+               define('MT_WORD3', DEFAULT_MT_WORD3);
                define('POINTS'  , DEFAULT_POINTS);
        }
        break;

diff --git a/inc/functions.php b/inc/functions.php
index 6ec587a530fb2549fad5e5e330586065e9261e01..9cabe85c619b2dcf34aedfa0f93ccc6575227b7e 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -39,11 +39,20 @@ if (!defined('__SECURITY')) {
 
 // Check if our config file is writeable or not
 function is_INCWritable($inc) {
-       $fp = @fopen(PATH."inc/".$inc.".php", 'a');
+       // Generate FQFN
+       $fqfn = sprintf("%sinc/%s.php", PATH, $inc);
+
+       // Abort by simple test
+       if ((FILE_READABLE($fqfn)) && (!is_writeable($fqfn))) {
+               return false;
+       } // END - if
+
+       // Test if we can append data
+       $fp = @fopen($fqfn, 'a');
        if ($inc == "dummy") {
                // Remove dummy file
                @fclose($fp);
-               return @unlink(PATH."inc/dummy.php");
+               return @unlink($fqfn);
        } else {
                // Close all other files
                return @fclose($fp);

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 552956e9a6683588bf8b98c332e2bce73c2f8e79..f19cf3a718928e19c6b463653dd5bb2c932870b5 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -409,7 +409,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                        }
                                }
                        }
-                       if ((sizeof($FATAL) > 0) || ($FATAL[0] != ''))
+                       if ((sizeof($FATAL) > 0) || ((isset($FATAL[0])) && ($FATAL[0] != '')))
                        {
                                $OUT = "";
                                foreach ($FATAL as $value)

diff --git a/inc/language/de.php b/inc/language/de.php
index 8b90fa8acd9529d5c876c6942d0ddc6898947792..b11ca783cd9aba2d69c12109fed25c34d995352c 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -1073,6 +1073,7 @@ define('ADMIN_SALT_LENGTH_NOTE', "Um für alle Accounts (Mitglieder/Admins d
 define('LOGIN_FAILED_GENERAL', "Genereller Loginfehler! Bitte kontaktieren Sie den Webmaster!");
 define('DEFAULT_MT_WORD', "Mailtausch");
 define('DEFAULT_MT_WORD2', "Mailtausches");
+define('DEFAULT_MT_WORD3', "Mailtauscher");
 define('DEFAULT_POINTS', "Punkte");
 define('EXTENSION_PROBLEM_NOT_INSTALLED', "Erweiterung <u>%s</u> nicht installiert.");
 define('PROBLEM_POINTS_OVERVIEW_UNAVAILABLE', "{!POINTS!}-&Uuml;bersicht derzeit nicht verf&uuml;gbar.");

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 65325e1a698ca1b755a5a82b27e9e2038d9be255..8bb7c27ad46dba54cc4ca395c0c95365cdbe6559 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -53,7 +53,7 @@ function ADMINS_CHECK_ACL($act, $wht) {
                $default = $cacheArray['admins']['def_acl'][get_session('admin_login')];
 
                // Count cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (!is_object($cacheInstance)) {
                // Load from database
                $default = GET_ADMIN_DEFAULT_ACL(get_session('admin_login'));
@@ -95,7 +95,7 @@ function ADMINS_CHECK_ACL($act, $wht) {
                                        }
                                        if ($lines == 1) {
                                                // Count cache hits
-                                               $_CONFIG['cache_hits']++;
+                                               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
                                                break;
                                        }
                                }

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 37c25d174f818987b3e1fd42f07e8142945fe27d..f18f68df6eefa90d93c7450db85cc5ff8b641164 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -745,14 +745,24 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
                foreach ($cacheArray['ref_system']['userid'] as $id => $u_id) {
                        // Do we have a ref for this user?
                        //* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['ref_system']['level'][$id]}<br />\n";
-                       if (($u_id == $uid) && (($cacheArray['ref_system']['level'][$id] == 1 && GET_EXT_VERSION("refback") != "") || ($cacheArray['ref_system']['level'][$id] == 0 && GET_EXT_VERSION("refback") == ""))) {
+                       if (($u_id == $uid) && ($cacheArray['ref_system']['level'][$id] == 1)) {
                                //* DEBUG: */ echo "uid matches!<br />\n";
-                               // Entry found!
-                               $cnt = $cacheArray['ref_system']['counter'][$id];
-                               break;
-                       } // END - if
-               } // END - foreach
+                               foreach ($cacheArray['ref_depths']['level'] as $level) {
+                                       if (($level == $cacheArray['ref_system']['level'][$id]) && ($level == 1)) {
+                                               // Level does exist so abort here
+                                               $cnt = $cacheArray['ref_system']['counter'][$id];
+                                               //* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
+                                               break;
+                                       } elseif ($level > 1) {
+                                               // Not interesting here...
+                                               break;
+                                       }
+                               }
 
+                               // Abort also here!
+                               if ($cnt > 0) break;
+                       }
+               }
                //* DEBUG: */ echo "<PRE>";
                //* DEBUG: */ print_r($cacheArray['ref_system']);
                //* DEBUG: */ echo "</PRE>";
@@ -760,12 +770,12 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 
                if ($cnt > 0) {
                        // Count cache hits
-                       $_CONFIG['cache_hits']++;
+                       if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 
                        // Remove old refs
                        //* DEBUG: */ echo "+".$cnt."/".$old."+<br />";
                        $cnt -= $old;
-               } // END - if
+               }
        } else {
                // Load current refs from database
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(s.counter) AS cnt

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 0c7f5bfeee32742170a6f4246e3451b663b2b9d9..de735f5f5cfef9fe7e7b857726b39ec7ddf71573 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -71,7 +71,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
                // Get password from cache
                $data['password'] = $cacheArray['admins']['password'][$admin_login];
                $ret = "pass";
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 
                // Include more admins data?
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
@@ -79,7 +79,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
                        $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$admin_login];
                        $data['last_failture']   = $cacheArray['admins']['last_failture'][$admin_login];
                } // END - if
-       } elseif (EXT_IS_ACTIVE("cache")) {
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                $ADD = "";
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
                        // Load them here
@@ -232,6 +232,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
        // Initialize some variables
        $done = false;
        $seek++;
+       $next=-1;
        $found = false;
 
        // Is the file there and read-/write-able?
@@ -256,7 +257,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
                                        if (strpos($line, $search) > -1) { $next = 0; $found = true; }
 
                                        if ($next > -1) {
-                                               if ($next == $seek) {
+                                               if ($next === $seek) {
                                                        $next = -1;
                                                        $line = $prefix . $DATA . $suffix."\n";
                                                } else {
@@ -770,7 +771,7 @@ function ADMIN_CHECK_MENU_MODE() {
        if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')])) {
                // Load from cache
                $ADMIN = $cacheArray['admins']['la_mode'][get_session('admin_login')];
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (GET_EXT_VERSION("admins") >= "0.6.7") {
                // Load from database when version of "admins" is enough
                $result = SQL_QUERY_ESC("SELECT la_mode FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 70721b868773fb9db75e3baf9fbdf96b34ddff26..0d8f103b96155869e679f72c04cbc0f709cad046 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -50,7 +50,7 @@ function ADD_MODULE_TITLE($mod) {
                        $name = $cacheArray['modules']['title'][$mod];
 
                        // Update cache hits
-                       $_CONFIG['cache_hits']++;
+                       if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
                } else {
                        // Load from database
                        $result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__);
@@ -115,7 +115,7 @@ function CHECK_MODULE($mod) {
                        $mem    = $cacheArray['modules']['mem_only'][$mod_chk];
 
                        // Update cache hits
-                       $_CONFIG['cache_hits']++;
+                       if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
                        $found = true;
                } else {
                        // No, then we have to update it!
@@ -454,7 +454,7 @@ function IS_ADMIN($admin="")
                $valPass = $cacheArray['admin_hash'];
        } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
                // Count cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 
                // Login data is valid or not?
                $valPass = generatePassString($cacheArray['admins']['password'][$admin]);
@@ -1112,7 +1112,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
                        $per = $cacheArray['ref_depths']['percents'][$key];
 
                        // Count cache hit
-                       $_CONFIG['cache_hits']++;
+                       if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
                }
        } else {
                // Get referal data
@@ -1406,7 +1406,7 @@ function GET_ADMIN_ID($login) {
                $ret = $cacheArray['admins']['aid'][$login];
 
                // Update cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
@@ -1431,7 +1431,7 @@ function GET_ADMIN_HASH($login)
                $ret = $cacheArray['admins']['password'][$login];
 
                // Update cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
@@ -1458,7 +1458,7 @@ function GET_ADMIN_LOGIN ($aid) {
                $ret = $cacheArray['admins']['login'][$aid];
 
                // Update cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT login FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1486,7 +1486,7 @@ function GET_ADMIN_EMAIL ($aid) {
                $ret = $cacheArray['admins']['email'][$aid];
 
                // Update cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result_aid = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1516,7 +1516,7 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
                $ret = $cacheArray['admins']['def_acl'][$aid];
 
                // Update cache hits
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } else {
                // Load from database
                $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1784,11 +1784,11 @@ function MODULE_HAS_MENU($mod, $forceDb = false)
                if (isset($cacheArray['modules']['has_menu'][$mod])) {
                        // Check module cache and count hit
                        $ret = ($cacheArray['modules']['has_menu'][$mod] == "Y");
-                       $_CONFIG['cache_hits']++;
+                       if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
                } elseif (isset($cacheArray['extensions']['ext_menu'][$mod])) {
                        // Check cache and count hit
                        $ret = ($cacheArray['extensions']['ext_menu'][$mod] == "Y");
-                       $_CONFIG['cache_hits']++;
+                       if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
                }
        } elseif ((GET_EXT_VERSION("sql_patches") >= "0.3.6") && ((!EXT_IS_ACTIVE("cache")) || ($forceDb === true))) {
                // Check database for entry

diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index ab5cb1dbe6f081069a16299148f16381061e5286..2ba2d28b774bd4dc01662d21847721661fb3fa47 100644 (file)
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -148,7 +148,7 @@ function THEME_GET_VERSION ($name) {
                $cver = $cacheArray['themes']['theme_ver'][$name];
 
                // Count up
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Load version from database
                $result = SQL_QUERY_ESC("SELECT theme_ver FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1",
@@ -181,7 +181,7 @@ function THEME_GET_ID ($name) {
                $id = $cacheArray['themes']['id'][$name];
 
                // Count up
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1",
@@ -220,7 +220,7 @@ function THEME_IS_ACTIVE ($name) {
                $active = ($cacheArray['themes']['theme_active'][$name] == "Y");
 
                // Count up
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not
                $result = SQL_QUERY_ESC("SELECT theme_active FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
@@ -250,7 +250,7 @@ function GET_CURR_THEME_NAME () {
                $name = $cacheArray['themes']['theme_name'][$name];
 
                // Count up
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not
                $result = SQL_QUERY_ESC("SELECT theme_name FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' AND theme_name='Y' LIMIT 1",

diff --git a/install/tables.sql b/install/tables.sql
index 61f7bfb2fabc4b942c54b37d19db9c60dde708d6..bbe4e75f4d279fe489d975a6325358e54f3377f6 100644 (file)
--- a/install/tables.sql
+++ b/install/tables.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS `mxchange_admin_menu`;
 CREATE TABLE `mxchange_admin_menu` (\r
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,\r
   `action` VARCHAR(255) NOT NULL DEFAULT '',\r
-  `what` VARCHAR(255) NOT NULL DEFAULT '',\r
+  `what` VARCHAR(255) NULL DEFAULT NULL,\r
   `title` VARCHAR(50) NOT NULL DEFAULT '',\r
   `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,\r
   `descr` blob NOT NULL,\r
@@ -49,8 +49,8 @@ INSERT INTO `mxchange_config` VALUES (0,5,2000,200,5,'Y','N','Y',86400,'Y',1000,
 DROP TABLE IF EXISTS `mxchange_guest_menu`;\r
 CREATE TABLE `mxchange_guest_menu` (\r
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,\r
-  `action` VARCHAR(20) NOT NULL DEFAULT '',\r
-  `what` VARCHAR(20) NOT NULL DEFAULT '',\r
+  `action` VARCHAR(255) NOT NULL DEFAULT '',\r
+  `what` VARCHAR(255) NULL DEFAULT NULL,\r
   `title` VARCHAR(50) NOT NULL DEFAULT '',\r
   `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,\r
   `visible` ENUM('Y','N') NOT NULL DEFAULT 'Y',\r
@@ -70,8 +70,8 @@ CREATE TABLE `mxchange_max_receive` (
 DROP TABLE IF EXISTS `mxchange_member_menu`;\r
 CREATE TABLE `mxchange_member_menu` (\r
   `id` BIGINT(22) NOT NULL AUTO_INCREMENT,\r
-  `action` VARCHAR(20) NOT NULL DEFAULT '',\r
-  `what` VARCHAR(20) NOT NULL DEFAULT '',\r
+  `action` VARCHAR(255) NOT NULL DEFAULT '',\r
+  `what` VARCHAR(255) NULL DEFAULT NULL,\r
   `title` VARCHAR(50) NOT NULL DEFAULT '',\r
   `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,\r
   `visible` ENUM('Y','N') NOT NULL DEFAULT 'Y',\r
@@ -245,11 +245,6 @@ CREATE TABLE `mxchange_user_stats` (
 ALTER TABLE `mxchange_user_data` ADD `joined` VARCHAR(10) NOT NULL DEFAULT 0;\r
 ALTER TABLE `mxchange_config` ADD `last_update` VARCHAR(10) NOT NULL DEFAULT 0;\r
 \r
-UPDATE `mxchange_member_menu` SET `locked` = 'N' WHERE 'id'='12' OR 'id'='11' LIMIT 1;\r
-\r
-UPDATE `mxchange_guest_menu` SET `counter`=0;\r
-UPDATE `mxchange_member_menu` SET `counter`=0;\r
-\r
 INSERT INTO `mxchange_mod_reg` VALUES (NULL,'chk_login','N','N','N','','N',0);\r
 ALTER TABLE `mxchange_pool` MODIFY `data_type` ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP';\r
 ALTER TABLE `mxchange_config` ADD `unconfirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT '100';\r
@@ -335,8 +330,6 @@ ALTER TABLE `mxchange_pool` ADD `zip` VARCHAR(6) NOT NULL DEFAULT '';
 \r
 ALTER TABLE `mxchange_task_system` CHANGE `task_type` `task_type` VARCHAR(255)  NOT NULL DEFAULT 'FIRST_USER';\r
 ALTER TABLE `mxchange_user_data` MODIFY `zip` VARCHAR(6) NOT NULL DEFAULT '';\r
-ALTER TABLE `mxchange_admin_menu` MODIFY `action` VARCHAR(255) NOT NULL DEFAULT '';\r
-ALTER TABLE `mxchange_admin_menu` MODIFY `what` VARCHAR(255) NOT NULL DEFAULT '';\r
 ALTER TABLE `mxchange_user_data` MODIFY `last_module` VARCHAR(255) NOT NULL DEFAULT '';\r
 ALTER TABLE `mxchange_config` ADD `allow_direct_pay` ENUM('Y','N') NOT NULL DEFAULT 'N';\r
 ALTER TABLE `mxchange_user_data` MODIFY `last_profile_sent` VARCHAR(10)  NOT NULL DEFAULT 0;\r