Admin user details extended, DEBUG_LOG() rewritten, random userid on refid=0 added

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 00f7d155e3ed547a09234f6c41f498a584328103..28dd1789e07ac5323bcd064e7656c4f1ea5aa125 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -335,11 +335,11 @@ function ADD_MENU($MODE, $act, $wht) {
 
        // Non-admin shall not see all menus
        if (!IS_ADMIN()) {
-               $AND = "AND visible='Y' AND locked='N'";
+               $AND = " AND visible='Y' AND locked='N'";
        }
 
        // Load SQL data and add the menu to the output stream...
-       $result_main = SQL_QUERY_ESC("SELECT title, action FROM "._MYSQL_PREFIX."_%s_menu WHERE (what='' OR what IS NULL) ".$AND." ORDER BY sort",
+       $result_main = SQL_QUERY_ESC("SELECT title, action FROM "._MYSQL_PREFIX."_%s_menu WHERE (what='' OR what IS NULL)".$AND." ORDER BY sort",
         array($MODE), __FILE__, __LINE__);
        //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
        if (SQL_NUMROWS($result_main) > 0) {
@@ -1076,16 +1076,16 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal
 }
 
 // Calculate sum (default) or count records of given criteria
-function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false, $add="") {
+function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false, $add="") {
        $ret = 0;
-       if ($onlyRows) {
+       if (($onlyRows) || ($lookFor == "userid")) {
                // Count rows
-               $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `"._MYSQL_PREFIX."_%s` WHERE `%s`='%s'%s",
-                array($lookFor, $tableName, $whereStatement, $search, $add), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `"._MYSQL_PREFIX."_%s` WHERE `%s`='%s'".$add,
+                       array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        } else {
                // Add all rows
-               $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `"._MYSQL_PREFIX."_%s` WHERE `%s`='%s'%s",
-                array($lookFor, $tableName, $whereStatement, $search, $add), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `"._MYSQL_PREFIX."_%s` WHERE `%s`='%s'".$add,
+                       array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        }
 
        // Load row
@@ -1866,7 +1866,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
        }
 
        // Run database update
-       //DEBUG_LOG(__FUNCTION__.":entries={$entries}");
+       //DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");
        SQL_QUERY("UPDATE "._MYSQL_PREFIX."_config SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__);
 
        // Get affected rows
@@ -2199,7 +2199,7 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) {
                        array(bigintval($uid), $type, $data), __FILE__, __LINE__);
        } elseif (is_array($data)) {
                // Invalid data!
-               DEBUG_LOG(__FUNCTION__."(".__LINE__."): uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
+               DEBUG_LOG(__FUNCTION__, __LINE__, " uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
        }
 }