Extension ext-mediadata now excludes testers

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 3e3bbadb9f9488442f00dee8cde3dc5e41b56b24..11bb77c79036733fc82f1f22c378dd593a5709b1 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -966,7 +966,7 @@ function getReferralRallyeRefsCount ($currUserid, $oldReferralCount = '0') {
        } else {
                // Load current refs from database
                $result_ref = SQL_QUERY_ESC("SELECT
-       SUM(s.counter) AS cnt
+       SUM(s.counter) AS `cnt`
 FROM
        `{?_MYSQL_PREFIX?}_refsystem` AS s
 LEFT JOIN

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index b2fd20ea424f88eabe0e75bc46d7e33a4d983553..65f9614cedba0cc281c995383d99760807299698 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -1012,7 +1012,7 @@ function getSurfbarTotalUrls ($status = 'ACTIVE', $excludeUserId = NULL) {
 
        // Get amount from database
        $result = SQL_QUERY_ESC("SELECT
-       COUNT(`url_id`) AS cnt
+       COUNT(`url_id`) AS `cnt`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
@@ -1603,7 +1603,7 @@ 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

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index cf3ecff32208ca4733d1972a51d0584a21f0f799..3262dfe6c74faadfd284a76765cb1f2b3f3e3426 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -78,16 +78,16 @@ if ($TEST > time()) {
 }
 
 // User who can receive mails
-$content['user_max_mails'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', TRUE, " AND `max_mails` > 0");
+$content['user_max_mails'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', TRUE, runFilterChain('user_exclusion_sql', " AND `max_mails` > 0"));
 
 // Users who can receive mails today
-$content['user_max_rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', TRUE, " AND `receive_mails` > 0");
+$content['user_max_rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', TRUE, runFilterChain('user_exclusion_sql', " AND `receive_mails` > 0"));
 
 // Max mails per day
-$content['max'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', FALSE, " AND `max_mails` > 0");
+$content['max'] = countSumTotalData('CONFIRMED', 'user_data', 'max_mails', 'status', FALSE, runFilterChain('user_exclusion_sql', " AND `max_mails` > 0"));
 
 // Max mails for this day
-$content['rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', FALSE, " AND `receive_mails` > 0");
+$content['rec'] = countSumTotalData('CONFIRMED', 'user_data', 'receive_mails', 'status', FALSE, runFilterChain('user_exclusion_sql', " AND `receive_mails` > 0"));
 
 // Initial lots of variables
 $bmails = '0';
@@ -140,9 +140,11 @@ $content['jackpot'] = $jackpot;
 
 // Total referral link clicks, total logins
 $result = SQL_QUERY('SELECT
-       SUM(d.ref_clicks), SUM(d.total_logins)
+       SUM(d.`ref_clicks`) AS `total_ref_clicks`,
+       SUM(d.`total_logins`) AS `total_logins`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d', __FILE__, __LINE__);
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
+' . runFilterChain('user_exclusion_sql', ''), __FILE__, __LINE__);
 list($ref, $logins) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
@@ -161,7 +163,7 @@ $content['total_logins']    = $logins;
 $total = countSumTotalData('Y', 'refbanner', 'id', 'visible', TRUE);
 
 // Total views and clicks
-$result = SQL_QUERY("SELECT SUM(`counter`) AS cnt, SUM(`clicks`) AS clx FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y'", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT SUM(`counter`) AS `cnt`, SUM(`clicks`) AS `clicks` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y'", __FILE__, __LINE__);
 list($views, $clicks) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
@@ -225,15 +227,16 @@ if (isExtensionActive('doubler')) {
 if (isExtensionActive('holiday')) {
        // Total holiday requests
        $result = SQL_QUERY("SELECT
-       COUNT(h.userid) AS count_holidays
+       COUNT(h.`userid`) AS `count_holidays`
 FROM
-       `{?_MYSQL_PREFIX?}_user_holidays` AS h
+       `{?_MYSQL_PREFIX?}_user_holidays` AS `h`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       h.userid=d.userid
+       h.`userid`=d.`userid`
 WHERE
-       d.`holiday_active`='Y'",
+       d.`holiday_active`='Y'
+" . runFilterChain('user_exclusion_sql', ' '),
        __FILE__, __LINE__);
        list($holiday) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
@@ -248,13 +251,15 @@ WHERE
 if (isExtensionActive('transfer')) {
        // Statistics for points transfers
        $result = SQL_QUERY("SELECT
-       COUNT(t.id) AS cnt, SUM(t.points) AS `points`
+       COUNT(t.`id`) AS `cnt`,
+       SUM(t.`points`) AS `points`
 FROM
-       `{?_MYSQL_PREFIX?}_user_transfers_in` AS t
+       `{?_MYSQL_PREFIX?}_user_transfers_in` AS `t`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       t.userid=d.userid",
+       t.`userid`=d.`userid`
+" . runFilterChain('user_exclusion_sql', ''),
                __FILE__, __LINE__);
        list($count_in, $points_in) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
@@ -262,13 +267,14 @@ ON
        if (empty($points_in)) $points_in = '0';
 
        $result = SQL_QUERY("SELECT
-       COUNT(t.id), SUM(t.points)
+       COUNT(t.`id`) AS `cnt`, SUM(t.`points`) AS `points`
 FROM
-       `{?_MYSQL_PREFIX?}_user_transfers_out` AS t
+       `{?_MYSQL_PREFIX?}_user_transfers_out` AS `t`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       t.userid=d.userid",
+       t.userid=d.userid
+" . runFilterChain('user_exclusion_sql', ''),
        __FILE__, __LINE__);
        list($count_out, $points_out) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index dbc24d16796050d6e84cd70f73d72a078014ead9..e0244d0af44eff72fd5a853b9fe60d872058e29d 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -172,7 +172,7 @@ function merge_array ($array1, $array2, $keepIndex = FALSE) {
 
        // Maintain index of array2?
        if ($keepIndex === TRUE) {
-               // Keep index of array2, array_merge() rewrites $key=2 to $key=0 ! :(
+               // Keep index of array2, array_merge() rewrites e.g. $key=1 to $key=0, $key=2 to $key=1 ! :(
                foreach ($array2 as $key => $value) {
                        // Add it
                        $array1[$key] = $value;