Filters for configurable userid exclusion added:

[mailer.git] / inc / libs / surfbar_functions.php

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 801ab5a7ec071129a7ef3bac3e12fd124e987832..bc559acfac87d3b147aa5b5739ead40ea4a624b8 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -959,13 +959,13 @@ FROM
 INNER JOIN
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 ON
-       u.`url_id`=l.`locks_url_id`
+       `u`.`url_id`=l.`locks_url_id`
 WHERE
        l.`locks_userid`=%s AND
        (UNIX_TIMESTAMP() - {%%pipe,getSurfbarSurfLock%%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND
        (
-               ((UNIX_TIMESTAMP(l.`locks_last_surfed`) - u.`url_fixed_reload`) < 0 AND u.`url_fixed_reload` > 0) OR
-               u.`url_fixed_reload` = 0
+               ((UNIX_TIMESTAMP(l.`locks_last_surfed`) - `u`.`url_fixed_reload`) < 0 AND `u`.`url_fixed_reload` > 0) OR
+               `u`.`url_fixed_reload` = 0
        )
 LIMIT 1",
                array(getMemberId()), __FUNCTION__, __LINE__
@@ -1302,41 +1302,41 @@ function determineSurfbarDepletedUserids ($limit=0) {
 
                // Get all userid except logged in one
                $result = SQL_QUERY_ESC("SELECT
-       u.`url_userid`,
-       UNIX_TIMESTAMP(d.`surfbar_low_notified`) AS `notified`
+       `u`.`url_userid`,
+       UNIX_TIMESTAMP(`d`.`surfbar_low_notified`) AS `notified`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 INNER JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       u.`url_userid`=d.`userid`
+       `u`.`url_userid`=`d`.`userid`
 WHERE
-       u.`url_userid` NOT IN (%s) AND
-       u.`url_userid` IS NOT NULL AND
-       u.`url_status`='ACTIVE'
+       `u`.`url_userid` NOT IN (%s) AND
+       `u`.`url_userid` IS NOT NULL AND
+       `u`.`url_status`='ACTIVE'
 GROUP BY
-       u.`url_userid`
+       `u`.`url_userid`
 ORDER BY
-       u.`url_userid` ASC",
+       `u`.`url_userid` ASC",
                        array(getMemberId()), __FUNCTION__, __LINE__);
        } else {
                // Get all userid
                $result = SQL_QUERY("SELECT
-       u.`url_userid`,
-       UNIX_TIMESTAMP(d.`surfbar_low_notified`) AS `notified`
+       `u`.`url_userid`,
+       UNIX_TIMESTAMP(`d`.`surfbar_low_notified`) AS `notified`
 FROM
-       `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       u.`url_userid`=d.`userid`
+       `u`.`url_userid`=`d`.`userid`
 WHERE
-       u.`url_userid` > 0 AND
-       u.`url_status`='ACTIVE'
+       `u`.`url_userid` > 0 AND
+       `u`.`url_status`='ACTIVE'
 GROUP BY
-       u.`url_userid`
+       `u`.`url_userid`
 ORDER BY
-       u.`url_userid` ASC", __FUNCTION__, __LINE__);
+       `u`.`url_userid` ASC", __FUNCTION__, __LINE__);
        }
 
        // Load all userid
@@ -1606,24 +1606,24 @@ ORDER BY
 function getSurfbarMaximumRandom ($userids, $add) {
        // Count max availabe entries
        $result = SQL_QUERY("SELECT
-       sbu.`url_id` AS `cnt`
+       `sbu`.`url_id` AS `cnt`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-       sbu.`url_id`=sbs.`salts_url_id`
+       `sbu`.`url_id`=`sbs`.`salts_url_id`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       sbu.`url_id`=l.`locks_url_id`
+       `sbu`.`url_id`=l.`locks_url_id`
 WHERE
-       sbu.`url_userid` NOT IN (" . implode(',', $userids) . ") AND
-       (sbu.`url_views_allowed`=0 OR (sbu.`url_views_allowed` > 0 AND sbu.`url_views_max` > 0)) AND
-       sbu.`url_status`='ACTIVE'
+       `sbu`.`url_userid` NOT IN (" . implode(',', $userids) . ") AND
+       (`sbu`.`url_views_allowed`=0 OR (`sbu`.`url_views_allowed` > 0 AND `sbu`.`url_views_max` > 0)) AND
+       `sbu`.`url_status`='ACTIVE'
        " . $add . "
 GROUP BY
-       sbu.`url_id` ASC", __FUNCTION__, __LINE__);
+       `sbu`.`url_id` ASC", __FUNCTION__, __LINE__);
 
        // Log last query
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
@@ -1645,24 +1645,24 @@ function getSurfbarUserUrls () {
 
        // Begin the query
        $result = SQL_QUERY_ESC("SELECT
-       u.`url_id`,
-       u.`url_userid`,
-       u.`url_package_id`,
-       u.`url`,
-       u.`url_status`,
-       u.`url_views_total`,
-       u.`url_views_max`,
-       u.`url_views_allowed`,
-       UNIX_TIMESTAMP(u.`url_registered`) AS `url_registered`,
-       UNIX_TIMESTAMP(u.`url_last_locked`) AS `url_last_locked`,
-       u.`url_lock_reason`
+       `u`.`url_id`,
+       `u`.`url_userid`,
+       `u`.`url_package_id`,
+       `u`.`url`,
+       `u`.`url_status`,
+       `u`.`url_views_total`,
+       `u`.`url_views_max`,
+       `u`.`url_views_allowed`,
+       UNIX_TIMESTAMP(`u`.`url_registered`) AS `url_registered`,
+       UNIX_TIMESTAMP(`u`.`url_last_locked`) AS `url_last_locked`,
+       `u`.`url_lock_reason`
 FROM
-       `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 WHERE
-       u.`url_userid`=%s AND
-       u.`url_status` != 'DELETED'
+       `u`.`url_userid`=%s AND
+       `u`.`url_status` != 'DELETED'
 ORDER BY
-       u.`url_id` ASC",
+       `u`.`url_id` ASC",
                array(getMemberId()), __FUNCTION__, __LINE__);
 
        // Are there entries?
@@ -1738,7 +1738,7 @@ function determineSurfbarNextId ($urlId = NULL) {
                $add = '';
                if (count($USE) > 0) {
                        // Ignore some!
-                       $add = " AND sbu.`url_id` NOT IN (";
+                       $add = " AND `sbu`.`url_id` NOT IN (";
                        foreach ($USE as $url_id => $lid) {
                                // Add URL id
                                $add .= $url_id.',';
@@ -1763,67 +1763,67 @@ function determineSurfbarNextId ($urlId = NULL) {
                // And query the database
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.getSurfbarSurfLock());
                $result = SQL_QUERY_ESC("SELECT
-       sbu.`url_id`,
-       sbu.`url_userid`,
-       sbu.`url_package_id`,
-       sbu.`url`,
-       sbs.`salts_last_salt`,
-       sbu.`url_views_total`,
-       sbu.`url_views_max`,
-       sbu.`url_views_allowed`,
+       `sbu`.`url_id`,
+       `sbu`.`url_userid`,
+       `sbu`.`url_package_id`,
+       `sbu`.`url`,
+       `sbs`.`salts_last_salt`,
+       `sbu`.`url_views_total`,
+       `sbu`.`url_views_max`,
+       `sbu`.`url_views_allowed`,
        UNIX_TIMESTAMP(l.`locks_last_surfed`) AS `last_surfed`,
-       sbu.`url_fixed_reload`
+       `sbu`.`url_fixed_reload`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-       sbu.`url_id`=sbs.`salts_url_id`
+       `sbu`.`url_id`=`sbs`.`salts_url_id`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       sbu.`url_id`=l.`locks_url_id`
+       `sbu`.`url_id`=l.`locks_url_id`
 WHERE
-       (sbu.`url_userid` NOT IN (" . implode(',', $userids['url_userid']) . ") OR sbu.`url_userid` IS NULL) AND
-       sbu.`url_status`='ACTIVE' AND
-       (sbu.`url_views_allowed`=0 OR (sbu.`url_views_allowed` > 0 AND sbu.`url_views_max` > 0))
+       (`sbu`.`url_userid` NOT IN (" . implode(',', $userids['url_userid']) . ") OR `sbu`.`url_userid` IS NULL) AND
+       `sbu`.`url_status`='ACTIVE' AND
+       (`sbu`.`url_views_allowed`=0 OR (`sbu`.`url_views_allowed` > 0 AND `sbu`.`url_views_max` > 0))
        " . $add . "
 GROUP BY
-       sbu.`url_id`
+       `sbu`.`url_id`
 ORDER BY
        l.`locks_last_surfed` ASC,
-       sbu.`url_id` ASC
+       `sbu`.`url_id` ASC
 LIMIT %s,1",
                        array($randNum), __FUNCTION__, __LINE__
                );
        } else {
                // Get data from specified id number
                $result = SQL_QUERY_ESC("SELECT
-       sbu.`url_id`,
-       sbu.`url_userid`,
-       sbu.`url_package_id`,
-       sbu.`url`,
-       sbs.`salts_last_salt`,
-       sbu.`url_views_total`,
-       sbu.`url_views_max`,
-       sbu.`url_views_allowed`,
+       `sbu`.`url_id`,
+       `sbu`.`url_userid`,
+       `sbu`.`url_package_id`,
+       `sbu`.`url`,
+       `sbs`.`salts_last_salt`,
+       `sbu`.`url_views_total`,
+       `sbu`.`url_views_max`,
+       `sbu`.`url_views_allowed`,
        UNIX_TIMESTAMP(l.`locks_last_surfed`) AS `last_surfed`,
-       sbu.`url_fixed_reload`
+       `sbu`.`url_fixed_reload`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-       sbu.`url_id`=sbs.`salts_url_id`
+       `sbu`.`url_id`=`sbs`.`salts_url_id`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       sbu.`url_id`=l.`locks_url_id`
+       `sbu`.`url_id`=l.`locks_url_id`
 WHERE
-       (sbu.`url_userid` != %s OR sbu.`url_userid` IS NULL) AND
-       sbu.`url_status`='ACTIVE' AND
-       sbu.`url_id`=%s AND
-       (sbu.`url_views_allowed` = 0 OR (sbu.`url_views_allowed` > 0 AND sbu.`url_views_max` > 0))
+       (`sbu`.`url_userid` != %s OR `sbu`.`url_userid` IS NULL) AND
+       `sbu`.`url_status`='ACTIVE' AND
+       `sbu`.`url_id`=%s AND
+       (`sbu`.`url_views_allowed` = 0 OR (`sbu`.`url_views_allowed` > 0 AND `sbu`.`url_views_max` > 0))
 LIMIT 1",
                        array(getMemberId(), bigintval($urlId)), __FUNCTION__, __LINE__
                );