Filters for configurable userid exclusion added:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index a242cd01c9238c28fa06393ffd5a767d3ce6cf41..6824a16c43adc7cafcee3417b50850f3c85e9ac0 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1471,15 +1471,15 @@ function deleteUserAccount ($userid, $reason) {
 
        // Search for the points and user data
        $result = SQL_QUERY_ESC("SELECT
-       (SUM(p.`points`) - d.`used_points`) AS `points`
+       (SUM(`p`.`points`) - `d`.`used_points`) AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_points` AS `p`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       p.`userid`=d.`userid`
+       `p`.`userid`=`d`.`userid`
 WHERE
-       p.`userid`=%s
+       `p`.`userid`=%s
 LIMIT 1",
                array(bigintval($userid)), __FUNCTION__, __LINE__);
 
@@ -1762,23 +1762,33 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
        // Category given?
        if (isValidId($categoryId)) {
                // Select category
-               $extraColumns  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`";
-               $addWhere = sprintf(" AND c.`cat_id`=%s", $categoryId);
+               $extraColumns  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS `c` ON `d`.`userid`=`c`.`userid`";
+               $addWhere = sprintf(" AND `c`.`cat_id`=%s", $categoryId);
        } // END - if
 
        // Exclude users in holiday?
        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                // Add something for the holiday extension
-               $addWhere .= " AND d.`holiday_active`='N'";
+               $addWhere .= " AND `d`.`holiday_active`='N'";
        } // END - if
 
        // Include only HTML recipients?
        if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
-               $addWhere .= " AND d.`html`='Y'";
+               $addWhere .= " AND `d`.`html`='Y'";
        } // END - if
 
        // Run query
-       $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$extraColumns." WHERE d.`status`='CONFIRMED' ".$addWhere." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT
+       `d`.`userid`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
+       " . $extraColumns . "
+WHERE
+       `d`.`status`='CONFIRMED'
+       " . $addWhere . "
+ORDER BY
+       `d`.`{?order_select?}` {?order_mode?}
+LIMIT %s",
                array(
                        $receiver
                ), __FUNCTION__, __LINE__);