Even more variables renamed and login procedure prepared for filter

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index f18cd14f9261493186fc6726d6f5dc56ea81811a..5280fc06a1fc1d14ce5c9130619e52c0b31564f9 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -878,27 +878,27 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") {
        }
 
        // Default is all URLs
-       $ADD = "";
+       $add = "";
 
        // Is the status set?
        if (is_array($status)) {
                // Only URLs with these status
-               $ADD = sprintf(" AND status IN('%s')", implode("','", $status));
+               $add = sprintf(" AND status IN('%s')", implode("','", $status));
        } elseif (!empty($status)) {
                // Only URLs with this status
-               $ADD = sprintf(" AND `status`='%s'", $status);
+               $add = sprintf(" AND `status`='%s'", $status);
        } elseif (is_array($exclude)) {
                // Exclude URLs with these status
-               $ADD = sprintf(" AND status NOT IN('%s')", implode("','", $exclude));
+               $add = sprintf(" AND status NOT IN('%s')", implode("','", $exclude));
        } elseif (!empty($exclude)) {
                // Exclude URLs with this status
-               $ADD = sprintf(" AND status != '%s'", $exclude);
+               $add = sprintf(" AND status != '%s'", $exclude);
        }
 
        // Get amount from database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
-WHERE userid=%s".$ADD."
+WHERE userid=%s".$add."
 LIMIT %s",
                array($uid, getConfig('surfbar_max_order')), __FUNCTION__, __LINE__
        );
@@ -992,7 +992,7 @@ function SURFBAR_PAY_POINTS () {
 // Updates the statistics of current URL/userid
 function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
        // Init add
-       $ADD = "";
+       $add = "";
 
        // Get allowed views
        $allowed = SURFBAR_GET_VIEWS_ALLOWED();
@@ -1000,11 +1000,11 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
        // Do we have a limit?
        if ($allowed > 0) {
                // Then count views_max down!
-               $ADD .= ",views_max=views_max-1";
+               $add .= ",views_max=views_max-1";
        } // END - if
 
        // Update URL stats
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$add." WHERE id=%s LIMIT 1",
                array(SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
 
        // Update the stats entry
@@ -1362,7 +1362,7 @@ ORDER BY
        return $USE;
 }
 // "Getter" for maximum random number
-function SURFBAR_GET_MAX_RANDOM ($UIDs, $ADD) {
+function SURFBAR_GET_MAX_RANDOM ($UIDs, $add) {
        // Count max availabe entries
        $result = SQL_QUERY("SELECT sbu.id AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS sbu
@@ -1370,7 +1370,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
 ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$ADD."
+WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$add."
 GROUP BY sbu.id", __FUNCTION__, __LINE__);
 
        // Log last query
@@ -1461,24 +1461,24 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
                $USE = SURFBAR_GET_LOCK_IDS();
 
                // Shall we add some URL ids to ignore?
-               $ADD = "";
+               $add = "";
                if (count($USE) > 0) {
                        // Ignore some!
-                       $ADD = " AND sbu.id NOT IN (";
+                       $add = " AND sbu.id NOT IN (";
                        foreach ($USE as $url_id => $lid) {
                                // Add URL id
-                               $ADD .= $url_id.",";
+                               $add .= $url_id.",";
                        } // END - foreach
 
                        // Add closing bracket
-                       $ADD = substr($ADD, 0, -1) . ")";
+                       $add = substr($add, 0, -1) . ")";
                } // END - if
 
                // Determine depleted user account
                $UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
                // Get maximum randomness factor
-               $maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['uid'], $ADD);
+               $maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['uid'], $add);
 
                // If more than one URL can be called generate the random number!
                if ($maxRand > 1) {
@@ -1494,7 +1494,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
 ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$ADD."
+WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",