A lot has been rewritten, ext-teams added, ext-forced continued:

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 9a8edbbb8d2bb5726215a8c4302bcdc7bf9f594b..d28a0ab1baed4eb9bae7079d43c1804c3fbb3d78 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -654,11 +654,11 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 
        // Is the id set?
        if (empty($userid)) {
-               $userid = NULL;
+               $userid = 'NULL';
        } // END - if
 
        // Just run the insert query for now
-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (`url_userid`, `url`, `url_status`, `url_views_max`, `url_views_allowed`, `url_fixed_reload`) VALUES (%s,'%s','%s',%s,%s,%s)",
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (`url_userid`,`url`,`url_status`,`url_views_max`,`url_views_allowed`,`url_fixed_reload`) VALUES (%s,'%s','%s',%s,%s,%s)",
                array(
                        $userid,
                        $urlData['url'],
@@ -998,16 +998,16 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = NULL, $status = '', $exclude = '
        // Is the status set?
        if (is_array($status)) {
                // Only URLs with these status
-               $add = sprintf(" AND `url_status` IN('%s')", implode("','", $status));
+               $add = sprintf(" WHERE `url_status` IN('%s')", implode("','", $status));
        } elseif (!empty($status)) {
                // Only URLs with this status
-               $add = sprintf(" AND `url_status`='%s'", $status);
+               $add = sprintf(" WHERE `url_status`='%s'", $status);
        } elseif (is_array($exclude)) {
                // Exclude URLs with these status
-               $add = sprintf(" AND `url_status` NOT IN('%s')", implode("','", $exclude));
+               $add = sprintf(" WHERE `url_status` NOT IN('%s')", implode("','", $exclude));
        } elseif (!empty($exclude)) {
                // Exclude URLs with this status
-               $add = sprintf(" AND `url_status` != '%s'", $exclude);
+               $add = sprintf(" WHERE `url_status` != '%s'", $exclude);
        }
 
        // Get amount from database
@@ -1065,7 +1065,7 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
        // Do we have no record?
        if ($countLock == 0) {
                // Just add it to the database
-               SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`, `locks_url_id`) VALUES (%s, %s)',
+               SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`,`locks_url_id`) VALUES (%s, %s)',
                        array(
                                getMemberId(),
                                bigintval($urlId)
@@ -1087,6 +1087,7 @@ function SURFBAR_PAY_POINTS () {
        // Remove it from the URL owner
        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - ENTERED!');
        if (isValidUserId(SURFBAR_GET_USERID())) {
+               // Subtract points and ignore return status
                subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
        } // END - if
 
@@ -1094,7 +1095,7 @@ function SURFBAR_PAY_POINTS () {
        // Init referal system here
        initReferalSystem();
 
-       // Book it to the user
+       // Book it to the user and ignore return status
        addPointsThroughReferalSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD());
        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - EXIT!');
 }
@@ -1127,7 +1128,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
        // Was that update okay?
        if (SQL_HASZEROAFFECTED()) {
                // No, then insert entry
-               SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`, `stats_url_id`, `stats_count`) VALUES (%s,%s,1)',
+               SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`,`stats_url_id`,`stats_count`) VALUES (%s,%s,1)',
                        array(
                                getMemberId(),
                                SURFBAR_GET_ID()
@@ -1172,7 +1173,7 @@ function SURFBAR_UPDATE_SALT_STATS () {
        // Was that okay?
        if (SQL_HASZEROAFFECTED()) {
                // Insert missing entry!
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_salts` (`salts_url_id`, `salts_userid`, `salts_last_salt`) VALUES (%s, %s, '%s')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_salts` (`salts_url_id`,`salts_userid`,`salts_last_salt`) VALUES (%s, %s, '%s')",
                        array(
                                SURFBAR_GET_ID(),
                                getMemberId(),
@@ -1340,7 +1341,7 @@ function SURFBAR_DETERMINE_WAIT_TIME () {
 }
 
 // Changes the status of an URL from given to other
-function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) {
+function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data = array()) {
        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - ENTERED!');
        // Make new status always lower-case
        $newStatus = strtolower($newStatus);
@@ -1882,7 +1883,7 @@ function SURFBAR_GET_DATA ($element) {
        /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - ENTERED!');
 
        // Default is null
-       $data = null;
+       $data = NULL;
 
        // Is the entry there?
        if (isset($GLOBALS['surfbar_cache'][$element])) {