Fixes and other improvements

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

diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index fe4ef4adcf6ba0bd86a2b1beaced2e9b53feb587..a7db2cba3eb7e5c45481860d273966436972ca01 100644 (file)
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -50,7 +50,7 @@ function addRefbackPoints ($userid, $ref, $points, $ref_points) {
        $return = $ref_points;
 
        // Get all ref levels
-       $result_refs = SQL_QUERY('SELECT `level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level` > 0 ORDER BY `level` ASC',
+       $result_refs = SQL_QUERY('SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level` > 0 ORDER BY `level` ASC',
                __FUNCTION__, __LINE__);
 
        // "Walk" through all level
@@ -136,7 +136,7 @@ LIMIT 1',
  */
 function getRefbackPercents ($userid, $refid) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . $refid . ' - ENTERED!');
-       if ((!isValidUserId($userid)) || (!isValidUserId($refid))) {
+       if ((!isValidId($userid)) || (!isValidId($refid))) {
                // userid and/or refid is invalid
                reportBug(__FUNCTION__, __LINE__, 'userid=' . convertNullToZero($userid) . ', refid=' . convertNullToZero($refid) . ' - Both must be > 0');
        } elseif ($userid == $refid) {
@@ -216,26 +216,26 @@ function getArrayFromRefbackUserRefs ($userid, $level) {
 
        // Get refs from database
        $result = SQL_QUERY_ESC("SELECT
-       r.`id`,
-       r.`refid`,
-       r.`refback_percents`,
-       r.`refback_points`,
-       d.`status`,
-       d.`joined`,
-       d.`mails_confirmed`,
-       d.`emails_received`,
-       d.`refid` AS `level_refid`
+       `r`.`id`,
+       `r`.`refid`,
+       `r`.`refback_percents`,
+       `r`.`refback_points`,
+       `d`.`status`,
+       `d`.`joined`,
+       `d`.`mails_confirmed`,
+       `d`.`emails_received`,
+       `d`.`refid` AS `level_refid`
 FROM
-       `{?_MYSQL_PREFIX?}_user_refs` AS r
+       `{?_MYSQL_PREFIX?}_user_refs` AS `r`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       r.`refid`=d.`userid`
+       `r`.`refid`=`d`.`userid`
 WHERE
-       r.`userid`=%s AND
-       r.`level`=%s
+       `r`.`userid`=%s AND
+       `r`.`level`=%s
 ORDER BY
-       r.`refid` ASC",
+       `r`.`refid` ASC",
                array(bigintval($userid), bigintval($level)), __FUNCTION__, __LINE__);
 
        // Are there some entries?
@@ -274,7 +274,7 @@ function getArrayFromUserRefbackData ($id) {
        $id = bigintval($id);
 
        // Get entry from database
-       $result = SQL_QUERY_ESC("SELECT `id`,`userid`,`refid`,`refback_percents`,`level`,`refback_points` FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `id`=%s AND `userid`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`, `userid`, `refid`, `refback_percents`, `level`, `refback_points` FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `id`=%s AND `userid`=%s LIMIT 1",
                array($id, getMemberId()), __FUNCTION__, __LINE__);
 
        // Is there an entry?
@@ -354,19 +354,59 @@ function updateMemberRefbackPercents ($id, $percents, $note) {
        sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $content, $content['refid']);
 
        // All fine!
-       $status['ok'] = true;
+       $status['ok'] = TRUE;
 
        // Return status array
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',percents=' . $percents . ' - EXIT!');
        return $status;
 }
 
+// ----------------------------------------------------------------------------
+//                 Wrapper functions for configuration entries
+// ----------------------------------------------------------------------------
+
+// Getter for refback_enabled
+function getRefbackEnabled () {
+       // Is there cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('refback_enabled');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // Checks whether refback is enabled
 function isRefbackEnabled () {
-       // Do we have cache?
+       // Is there cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = (getRefbackEnabled() == 'Y');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for refback_max_perc
+function getRefbackMaxPerc () {
+       // Is there cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('refback_max_perc');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for refback_min_perc
+function getRefbackMinPerc () {
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
-               $GLOBALS[__FUNCTION__] = (getConfig('refback_enabled') == 'Y');
+               $GLOBALS[__FUNCTION__] = getConfig('refback_min_perc');
        } // END - if
 
        // Return cache