Fix for non-working admin login if no extension is installed (an other fixed broke it)

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 0e2b0ce593ca410d4351efa5b4a18e00d248c83a..4f2c89ca681ed7aa7032b0e7fa4fcceafeb02a6e 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
 
 //
 function ADD_MODULE_TITLE($mod) {
-       global $cacheArray, $_CONFIG;
+       global $cacheArray;
        $name = ""; $result = false;
 
        // Is the script installed?
@@ -50,7 +50,7 @@ function ADD_MODULE_TITLE($mod) {
                        $name = $cacheArray['modules']['title'][$mod];
 
                        // Update cache hits
-                       if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+                       incrementConfigEntry('cache_hits');
                } elseif (!EXT_IS_ACTIVE("cache")) {
                        // Load from database
                        $result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__);
@@ -79,7 +79,7 @@ function ADD_MODULE_TITLE($mod) {
 // Check validity of a given module name (no file extension)
 function CHECK_MODULE ($mod) {
        // We need them now here...
-       global $cacheArray, $_CONFIG, $cacheInstance;
+       global $cacheArray, $cacheInstance;
 
        // Filter module name (names with low chars and underlines are fine!)
        $mod = preg_replace("/[^a-z_]/", "", $mod);
@@ -115,7 +115,7 @@ function CHECK_MODULE ($mod) {
                        $mem    = $cacheArray['modules']['mem_only'][$mod_chk];
 
                        // Update cache hits
-                       if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+                       incrementConfigEntry('cache_hits');
                        $found = true;
                } else {
                        // No, then we have to update it!
@@ -202,8 +202,8 @@ function CHECK_MODULE ($mod) {
 }
 
 // Add menu description pending on given file name (without path!)
-function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
-       global $NAV_DEPTH, $_CONFIG;
+function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
+       global $NAV_DEPTH;
        // Use only filename of the file ;)
        $file = basename($file);
 
@@ -297,7 +297,6 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
 
                        // Can we close the you-are-here navigation?
                        //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";
-                       //* DEBUG: */ die("<pre>".print_r($_CONFIG, true)."</pre>");
                        if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
                                //* DEBUG: */ echo __LINE__."+".$type."+<br />\n";
                                // Add closing div and br-tag
@@ -324,9 +323,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
        }
 }
 //
-function ADD_MENU($MODE, $act, $wht) {
-       global $_CONFIG;
-
+function ADD_MENU ($MODE, $act, $wht) {
        // Init some variables
        $main_cnt = 0;
        $AND = "";
@@ -441,9 +438,10 @@ function ADD_MENU($MODE, $act, $wht) {
        }
 }
 // This patched function will reduce many SELECT queries for the specified or current admin login
-function IS_ADMIN($admin="")
-{
-       global $cacheArray, $_CONFIG;
+function IS_ADMIN ($admin="") {
+       global $cacheArray;
+
+       // Init variables
        $ret = false; $passCookie = ""; $valPass = "";
        //* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
 
@@ -461,7 +459,7 @@ function IS_ADMIN($admin="")
                $valPass = $cacheArray['admin_hash'];
        } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
                // Count cache hits
-               if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               incrementConfigEntry('cache_hits');
 
                // Login data is valid or not?
                $valPass = generatePassString($cacheArray['admins']['password'][$admin]);
@@ -675,20 +673,15 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
        $ADD = "";
        if ((!IS_ADMIN()) && ($MODE != "admin")) $ADD = " AND locked='N'";
        //* DEBUG: */ echo __LINE__.":".$MODE."/".$act."/".$wht."*<br />\n";
-       if (($MODE != "admin") && ($UPDATE))
-       {
+       if (($MODE != "admin") && ($UPDATE)) {
                // Update guest or member menu
-               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s_menu SET counter=counter+1 WHERE action='%s' AND what='%s'".$ADD." LIMIT 1",
+               $SQL = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s_menu SET counter=counter+1 WHERE action='%s' AND what='%s'".$ADD." LIMIT 1",
                        array($MODE, $act, $wht), __FILE__, __LINE__, false);
-       }
-        elseif ($wht != "overview")
-       {
+       } elseif ($wht != "overview") {
                // Other actions
                $SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s'".$ADD." ORDER BY action DESC LIMIT 1",
                        array($MODE, $act), __FILE__, __LINE__, false);
-       }
-        else
-       {
+       } else {
                // Admin login overview
                $SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND (what='' OR what IS NULL)".$ADD." ORDER BY action DESC LIMIT 1",
                        array($MODE, $act), __FILE__, __LINE__, false);
@@ -696,15 +689,11 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
 
        // Run SQL command
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
-       if ($UPDATE)
-       {
+       if ($UPDATE) {
                if (SQL_AFFECTEDROWS() == 1) $ret = true;
                //* DEBUG: */ debug_print_backtrace();
-       }
-        else
-       {
+       } else {
                if (SQL_NUMROWS($result) == 1) {
-                       list($id, $wht2) = SQL_FETCHROW($result);
                        //* DEBUG: */ echo __LINE__."+".$SQL."+<br />\n";
                        //* DEBUG: */ echo __LINE__."*".$id."/".$wht."/".$wht2."*<br />\n";
                        $ret = true;
@@ -744,9 +733,8 @@ function GET_MOD_DESCR($MODE, $wht, $column="what")
        return $ret;
 }
 //
-function SEND_MODE_MAILS($mod, $modes)
-{
-       global $_CONFIG, $DATA;
+function SEND_MODE_MAILS($mod, $modes) {
+       global $DATA;
 
        // Load hash
        $result_main = SQL_QUERY_ESC("SELECT password FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
@@ -876,9 +864,9 @@ function COUNT_MODULE($mod) {
        } // END - if
 }
 // Get action value from mode (admin/guest/member) and what-value
-function GET_ACTION ($MODE, &$wht)
-{
-       global $ret, $_CONFIG;
+function GET_ACTION ($MODE, &$wht) {
+       global $ret;
+
        // @DEPRECATED Init status
        $ret = "";
 
@@ -903,6 +891,7 @@ function GET_ACTION ($MODE, &$wht)
        }
        //* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />\n";
 
+       // Does the module have a menu?
        if (MODULE_HAS_MENU($MODE)) {
                // Rewriting modules to menu
                switch ($MODE) {
@@ -923,7 +912,10 @@ function GET_ACTION ($MODE, &$wht)
 
                // Free memory
                SQL_FREERESULT($result);
-       } // END - if
+       } elseif ((GET_EXT_VERSION("sql_patches") == "") && ($MODE != "admin")) {
+               // No sql_patches installed!
+               LOAD_URL("admin.php");
+       }
 
        // Return action value
        return $ret;
@@ -1071,7 +1063,7 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
 }
 // "Getter fro ref level percents
 function GET_REF_LEVEL_PERCENTS ($level) {
-       global $cacheInstance, $_CONFIG, $cacheArray;
+       global $cacheInstance, $cacheArray;
 
        // Default is zero
        $per = 0;
@@ -1085,7 +1077,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
                        $per = $cacheArray['ref_depths']['percents'][$key];
 
                        // Count cache hit
-                       if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+                       incrementConfigEntry('cache_hits');
                }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Get referal data
@@ -1120,7 +1112,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
  */
 function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
        //* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
-       global $_CONFIG, $DATA, $cacheArray;
+       global $DATA, $cacheArray;
 
        // Convert mode to lower-case
        $add_mode = strtolower($add_mode);
@@ -1315,14 +1307,14 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
 
 // Get ID number from administrator's login name
 function GET_ADMIN_ID ($login) {
-       global $cacheArray, $_CONFIG;
+       global $cacheArray;
        $ret = "-1";
        if (isset($cacheArray['admins']['aid'][$login])) {
                // Check cache
                $ret = $cacheArray['admins']['aid'][$login];
 
                // Update cache hits
-               if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
@@ -1352,14 +1344,14 @@ function GET_CURRENT_ADMIN_ID () {
 // Get password hash from administrator's login name
 function GET_ADMIN_HASH ($aid)
 {
-       global $cacheArray, $_CONFIG;
+       global $cacheArray;
        $ret = "-1";
        if (isset($cacheArray['admins']['password'][$aid])) {
                // Check cache
                $ret = $cacheArray['admins']['password'][$aid];
 
                // Update cache hits
-               if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1379,14 +1371,14 @@ function GET_ADMIN_HASH ($aid)
 }
 //
 function GET_ADMIN_LOGIN ($aid) {
-       global $cacheArray, $_CONFIG;
+       global $cacheArray;
        $ret = "***";
        if (isset($cacheArray['admins']['login'][$aid])) {
                // Get cache
                $ret = $cacheArray['admins']['login'][$aid];
 
                // Update cache hits
-               if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT login FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1406,7 +1398,7 @@ function GET_ADMIN_LOGIN ($aid) {
 }
 // Get email address of admin id
 function GET_ADMIN_EMAIL ($aid) {
-       global $cacheArray, $_CONFIG;
+       global $cacheArray;
 
        $ret = "***";
        if (isset($cacheArray['admins']['email'][$aid])) {
@@ -1414,7 +1406,7 @@ function GET_ADMIN_EMAIL ($aid) {
                $ret = $cacheArray['admins']['email'][$aid];
 
                // Update cache hits
-               if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result_aid = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1436,7 +1428,7 @@ function GET_ADMIN_EMAIL ($aid) {
 }
 // Get default ACL  of admin id
 function GET_ADMIN_DEFAULT_ACL ($aid) {
-       global $cacheArray, $_CONFIG;
+       global $cacheArray;
 
        $ret = "***";
        if (isset($cacheArray['admins']['def_acl'][$aid])) {
@@ -1444,7 +1436,7 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
                $ret = $cacheArray['admins']['def_acl'][$aid];
 
                // Update cache hits
-               if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1508,13 +1500,10 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
 }
 // Activate exchange (DEPERECATED???)
 function activateExchange() {
-       global $_CONFIG;
-       $result = SQL_QUERY("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) >= getConfig('activate_xchange'))
-       {
-               // Free memory
-               SQL_FREERESULT($result);
+       // Check total amount of users
+       $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND max_mails > 0");
 
+       if ($totalUsers >= getConfig('activate_xchange')) {
                // Activate System
                $SQLs = array(
                        "UPDATE "._MYSQL_PREFIX."_mod_reg SET locked='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1",
@@ -1523,12 +1512,11 @@ function activateExchange() {
                );
 
                // Run SQLs
-               foreach ($SQLs as $sql) {
-                       $result = SQL_QUERY($sql, __FILE__, __LINE__);
-               }
+               RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
 
-               // @TODO Destroy cache
-       }
+               // Rebuild cache
+               REBUILD_CACHE("config", "config");
+       } // END - if
 }
 //
 function DELETE_USER_ACCOUNT($uid, $reason)
@@ -1574,10 +1562,9 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
        // Ok, delete the account!
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 }
+
 //
 function META_DESCRIPTION ($mod, $wht) {
-       global $_CONFIG;
-
        // Exclude admin and member's area
        if (($mod != "admin") && ($mod != "login")) {
                // Construct dynamic description
@@ -1670,8 +1657,6 @@ function LOAD_CONFIG ($no="0") {
 }
 // Gets the matching what name from module
 function GET_WHAT($modCheck) {
-       global $_CONFIG;
-
        $wht = "";
        //* DEBUG: */ echo __LINE__."!".$modCheck."!<br />\n";
        switch ($modCheck)
@@ -1931,8 +1916,6 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
 
 // Generate a receiver list for given category and maximum receivers
 function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
-       global $_CONFIG;
-
        // Init variables
        $CAT_TABS     = "%s";
        $CAT_WHERE    = "";
@@ -2047,8 +2030,6 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) {
 
 // "Getter" for array for user refs and points in given level
 function GET_USER_REF_POINTS ($uid, $level) {
-       global $_CONFIG;
-
        //* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
        // Default is no refs and no nickname
        $ADD = "";