X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=57ca77e32a66613d94794caec488a6c089ea547a;hb=af7035c4b7477791785d350f4cd72e809583e42a;hp=deded196d36932de955e0bad37d461575101f83e;hpb=e72031bcfdcd8e91f62bec6cc88f36b7a11d9221;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index deded196d3..57ca77e32a 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Alle MySQL-Relevanten Funktionen *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -70,7 +75,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 +84,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);
@@ -114,6 +119,12 @@ function CHECK_MODULE ($mod) {
// Check if cache is latest version
if (GET_EXT_VERSION("cache") >= "0.1.2") {
+ // Is the cache there?
+ if (!isset($GLOBALS['cache_array']['modules'])) {
+ // This should normally not happen...
+ debug_report_bug("Cache 'modules' is gone.");
+ } // END - if
+
// Is the module cached?
if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
// Check cache
@@ -194,10 +205,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";
@@ -306,7 +317,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
list($ret) = SQL_FETCHROW($result);
// Shall we return it?
- if ($return) {
+ if ($return === true) {
// Return title
return $ret;
} elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && (getConfig('youre_here') == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) {
@@ -322,7 +333,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
}
@@ -351,13 +362,13 @@ function ADD_MENU ($MODE, $act, $wht) {
// is the menu action valid?
if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) {
- return getMessage('CODE_MENU_NOT_VALID');
+ return getCode('MENU_NOT_VALID');
} // END - if
// Non-admin shall not see all menus
if (!IS_ADMIN()) {
$AND = " AND `visible`='Y' AND `locked`='N'";
- }
+ } // END - if
// 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`",
@@ -366,60 +377,69 @@ function ADD_MENU ($MODE, $act, $wht) {
if (SQL_NUMROWS($result_main) > 0) {
OUTPUT_HTML("
");
}
}
@@ -523,53 +545,49 @@ function IS_ADMIN ($admin="") {
// Generates a list of "max receiveable emails per day"
function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
$OUT = "";
+ $result = false;
+
switch ($MODE) {
- case "guest":
- // Guests (in the registration form) are not allowed to select 0 mails per day.
- $result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value > 0 ORDER BY value", __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) > 0) {
- $OUT = "";
- while (list($value, $comment) = SQL_FETCHROW($result)) {
- $OUT .= " \n";
if (($MODE != "admin") && ($UPDATE === true)) {
// Update guest or member menu
- $SQL = 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), __FUNCTION__, __LINE__, false);
} elseif (($wht != "overview") && (!empty($wht))) {
// Other actions
- $SQL = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$ADD." ORDER BY action DESC LIMIT 1",
+ $sql = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY action DESC LIMIT 1",
array($MODE, $act, $wht), __FUNCTION__, __LINE__, false);
} 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",
+ $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), __FUNCTION__, __LINE__, false);
}
// Run SQL command
- $result = SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+ $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
if ($UPDATE === true) {
// Check updated/affected rows
$ret = (SQL_AFFECTEDROWS() == 1);
@@ -743,7 +761,7 @@ function SEND_MODE_MAILS($mod, $modes) {
// Load hash
$result_main = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
- array($GLOBALS['userid']), __FUNCTION__, __LINE__);
+ array(getUserId()), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result_main) == 1) {
// Load hash from database
list($hashDB) = SQL_FETCHROW($result_main);
@@ -756,7 +774,7 @@ function SEND_MODE_MAILS($mod, $modes) {
if (($hash == get_session('u_hash')) || (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
// Load user's data
$result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND password='%s' LIMIT 1",
- array($GLOBALS['userid'], $hashDB), __FUNCTION__, __LINE__);
+ array(getUserId(), $hashDB), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load the data
$DATA = SQL_FETCHROW($result);
@@ -800,7 +818,7 @@ function SEND_MODE_MAILS($mod, $modes) {
} // END - if
// Load template
- $msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, $GLOBALS['userid']);
+ $msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, getUserId());
if (getConfig('admin_notify') == "Y") {
// The admin needs to be notified about a profile change
@@ -847,7 +865,7 @@ function SEND_MODE_MAILS($mod, $modes) {
if (empty($content)) {
if ((!empty($sub_adm)) && (!empty($msg_admin))) {
// Send admin mail
- SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, $GLOBALS['userid']);
+ SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, getUserId());
} elseif (getConfig('admin_notify') == "Y") {
// Cannot send mails to admin!
$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
@@ -862,7 +880,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",
@@ -925,7 +943,7 @@ function GET_ACTION ($MODE, &$wht) {
if (isAdminRegistered()) {
// Redirect
// @TODO Why does this lead into an endless loop but we still need it???
- // Commented out LOAD_URL("admin.php");
+ // @TODO Commented out LOAD_URL("admin.php");
} // END - if
}
@@ -999,31 +1017,33 @@ function GET_PAY_POINTS ($pid, $lookFor = "price") {
return $ret;
}
-// Remove a receiver's ID from $ARRAY and add a link for him to confirm
-function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false) {
+// Remove a receiver's ID from $receivers and add a link for him to confirm
+function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id="", $bonus=false) {
+ // Default is not removed
$ret = "failed";
- if ($uid > 0)
- {
+
+ // Is the userid valid?
+ if ($uid > 0) {
// Remove entry from array
- unset($ARRAY[$key]);
+ unset($receivers[$key]);
// Is there already a line for this user available?
- if ($stats_id > 0)
- {
+ if ($stats_id > 0) {
// Only when we got a real stats ID continue searching for the entry
$type = "NORMAL"; $rowName = "stats_id";
if ($bonus) { $type = "BONUS"; $rowName = "bonus_id"; }
+
+ // Try to look the entry up
$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_links` WHERE %s='%s' AND userid=%s AND link_type='%s' LIMIT 1",
- array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) == 0)
- {
- // No, so we add one!
+ array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
+
+ // Was it *not* found?
+ if (SQL_NUMROWS($result) == 0) {
+ // So we add one!
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_links` (%s, userid, link_type) VALUES ('%s','%s','%s')",
- array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
+ array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
$ret = "done";
- }
- else
- {
+ } else {
// Already found
$ret = "already";
}
@@ -1032,15 +1052,27 @@ function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fa
SQL_FREERESULT($result);
}
}
+
// Return status for sending routine
return $ret;
}
// 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 = "id", $whereStatement = "userid", $countRows = false, $add = "") {
$ret = 0;
//* DEBUG: */ echo $search."/".$tableName."/".$lookFor."/".$whereStatement."/".$add."
\n";
- if (($onlyRows) || ($lookFor == "userid")) {
+ if (empty($search)) {
+ // Count or sum whole table?
+ if ($countRows === true) {
+ // Count whole table
+ $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
+ array($lookFor, $tableName), __FUNCTION__, __LINE__);
+ } else {
+ // Sum whole table
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
+ array($lookFor, $tableName), __FUNCTION__, __LINE__);
+ }
+ } elseif (($countRows === true) || ($lookFor == "userid")) {
// Count rows
//* DEBUG: */ echo "COUNT!
\n";
$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
@@ -1220,7 +1252,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
// Prepare content
$content = array(
- 'text' => REASON_DIRECT_PAYMENT,
+ 'text' => getMessage('REASON_DIRECT_PAYMENT'),
'points' => TRANSLATE_COMMA($ref_points)
);
@@ -1228,7 +1260,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
$msg = LOAD_EMAIL_TEMPLATE("add-points", $content, $uid);
// And sent it away
- SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
+ SEND_EMAIL($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));
}
@@ -1283,7 +1315,7 @@ function UPDATE_REF_COUNTER ($uid) {
} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2")) {
// Remove cache here
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):ref={$ref} - CACHE!
\n";
- REBUILD_CACHE("refsystem", "refsystem");
+ rebuildCacheFiles("refsystem", "refsystem");
}
// "Walk" back here
@@ -1295,13 +1327,14 @@ function UPDATE_REF_COUNTER ($uid) {
} // END - if
}
-// OBSOLETE: Sends out mail to all administrators
+// Sends out mail to all administrators. This function is no longer obsolete
+// because we need it when there is no ext-admins installed
function SEND_ADMIN_EMAILS ($subj, $msg) {
// Load all admin email addresses
$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
- while (list($email) = SQL_FETCHROW($result)) {
+ while ($content = SQL_FETCHARRAY($result)) {
// Send the email out
- SEND_EMAIL($email, $subj, $msg);
+ SEND_EMAIL($content['email'], $subj, $msg);
} // END - if
// Free result
@@ -1469,7 +1502,7 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
$ret = "";
if ($table == "/ARRAY/") {
// Selection from array
- if (is_array($id) && is_array($name) && sizeof($id) == sizeof($name)) {
+ if (is_array($id) && is_array($name) && count($id) == count($name)) {
// Both are arrays
foreach ($id as $idx => $value) {
$ret .= "\n";
+ $ret = "\n";
}
}
// Return - hopefully - the requested data
return $ret;
}
-// Activate exchange (DEPERECATED???)
-function activateExchange() {
+// Activate exchange
+function activateExchange () {
+ // Is the extension 'user' there?
+ if (!EXT_IS_ACTIVE("user")) {
+ // Silently abort here
+ return false;
+ } // END - if
+
// Check total amount of users
$totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND max_mails > 0");
@@ -1520,10 +1560,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 +1669,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])."
\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 +1778,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):entries={$entries},affectedRows={$affectedRows}
\n";
// Rebuild cache
- REBUILD_CACHE("config", "config");
+ rebuildCacheFiles("config", "config");
}
// Prepares an SQL statement part for HTML mail and/or holiday depency
@@ -1824,21 +1832,24 @@ function ADD_CATEGORY_OPTIONS ($mode) {
$result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) > 0) {
// ... and begin loading stuff
- while (list($id, $cat) = SQL_FETCHROW($result)) {
+ while ($content = SQL_FETCHARRAY($result)) {
// Transfer some data
- $CATS['id'][] = $id;
- $CATS['name'][] = $cat;
+ $CATS['id'][] = $content['id'];
+ $CATS['name'][] = $content['cat'];
// Check which users are in this category
$result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
- array(bigintval($id)), __FUNCTION__, __LINE__);
+ array(bigintval($content['id'])), __FUNCTION__, __LINE__);
// Start adding all
$uid_cnt = 0;
+ // @TODO Rewrite this to $content = SQL_FETCHARRAY()
while (list($ucat) = SQL_FETCHROW($result_uids)) {
$result_ver = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`
WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
- array(bigintval($ucat)), __FUNCTION__, __LINE__);
+ array(bigintval($ucat)), __FUNCTION__, __LINE__);
+
+ // Add user count
$uid_cnt += SQL_NUMROWS($result_ver);
// Free memory
@@ -1850,7 +1861,7 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
// Add counter
$CATS['uids'][] = $uid_cnt;
- }
+ } // END - while
// Free memory
SQL_FREERESULT($result);
@@ -1859,8 +1870,8 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
$OUT = "";
foreach ($CATS['id'] as $key => $value) {
if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."...";
- $OUT .= " \n";
- }
+ $OUT .= " \n";
+ } // END - foreach
} else {
// No cateogries are defined yet
$OUT = "\n";
@@ -1939,6 +1950,7 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
$CAT_TABS = "%s";
$CAT_WHERE = "";
$receiverList = "";
+ $result = false;
// Secure data
$cat = bigintval($cat);
@@ -1966,19 +1978,19 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
if ((EXT_IS_ACTIVE("html_mail")) && ($mode == "html")) {
// Only include HTML receivers
$result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
- array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
+ array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
} else {
// Include all
$result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
- array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
+ array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
}
// Entries found?
if ((SQL_NUMROWS($result) >= $receiver) && ($receiver > 0)) {
// Load all entries
- while (list($REC) = SQL_FETCHROW($result)) {
+ while ($content = SQL_FETCHARRAY($result)) {
// Add receiver when not empty
- if (!empty($REC)) $receiverList .= $REC.";";
+ if (!empty($content['userid'])) $receiverList .= $content['userid'].";";
} // END - while
// Free memory
@@ -1998,8 +2010,8 @@ function USER_STATS_GET_TIMESTAMP ($type, $data, $uid = 0) {
$stamp = 0;
// User id set?
- if ((isset($GLOBALS['userid'])) && ($uid == 0)) {
- $uid = $GLOBALS['userid'];
+ if ((isUserIdSet()) && ($uid == 0)) {
+ $uid = getUserId();
} // END - if
// Is the extension installed and updated?
@@ -2051,16 +2063,16 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) {
function GET_USER_REF_POINTS ($uid, $level) {
//* DEBUG: */ print "----------------------- ".__FUNCTION__." - ENTRY ------------------------- \n";
// Default is no refs and no nickname
- $ADD = "";
+ $add = "";
$refs = array();
// Do we have nickname extension installed?
if (EXT_IS_ACTIVE("nickname")) {
- $ADD = ", ud.nickname";
+ $add = ", ud.nickname";
} // END - if
// Get refs from database
- $result = SQL_QUERY_ESC("SELECT ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$ADD."
+ $result = SQL_QUERY_ESC("SELECT ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$add."
FROM `{!_MYSQL_PREFIX!}_user_refs` AS ur
LEFT JOIN `{!_MYSQL_PREFIX!}_user_points` AS up
ON ur.refid=up.userid AND ur.level=0
@@ -2117,7 +2129,7 @@ ORDER BY ur.refid ASC",
}
// Recuced the amount of received emails for the receipients for given email
-function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
+function REDUCED_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
// Search for mail in database
$result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
@@ -2125,6 +2137,7 @@ function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
// Are there entries?
if (SQL_NUMROWS($result) > 0) {
// Now load all userids for one big query!
+ // @TODO This can be somehow rewritten
$UIDs = array();
while (list($uid) = SQL_FETCHROW($result)) {
$UIDs[$uid] = $uid;
@@ -2144,11 +2157,21 @@ function INIT_SQLS () {
SET_SQLS(array());
}
+// Checks wether the sqls array is initialized
+function IS_SQLS_INITIALIZED () {
+ return ((isset($GLOBALS['sqls'])) && (is_array($GLOBALS['sqls'])));
+}
+
// Setter for SQLs array
function SET_SQLS ($SQLs) {
$GLOBALS['sqls'] = (array) $SQLs;
}
+// Remover for SQLs array
+function UNSET_SQLS () {
+ unset($GLOBALS['sqls']);
+}
+
// Getter for SQLs array
function GET_SQLS () {
return $GLOBALS['sqls'];
@@ -2156,6 +2179,7 @@ function GET_SQLS () {
// Add an SQL to the list
function ADD_SQL ($sql) {
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("sql=%s, count=%d", $sql, COUNT_SQLS()));
$GLOBALS['sqls'][] = (string) $sql;
}
@@ -2170,9 +2194,10 @@ function COUNT_SQLS () {
$count = false;
// Is the array there?
- if (isset($GLOBALS['sqls'])) {
+ if (IS_SQLS_INITIALIZED()) {
// Then count it
- $count = count($GLOBALS['sql']);
+ $count = count($GLOBALS['sqls']);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("count=%d", $count));
} // END - if
// Return it
@@ -2182,10 +2207,8 @@ function COUNT_SQLS () {
// Checks wether the SQLs array is filled
function IS_SQLS_VALID () {
return (
- (isset($GLOBALS['sqls'])) &&
- (is_array($GLOBALS['sqls'])) &&
- (COUNT_SQL() > 0) &&
- (!empty($GLOBALS['sqls']))
+ (IS_SQLS_INITIALIZED()) &&
+ (COUNT_SQLS() > 0)
);
}