Large code cleanups:

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index baf0bdef927ec3a9a7a302eaea8cb7a9349df94b..feffef0f6131f358e92926a4efcc1a1fccb3c6cb 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -40,8 +40,8 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
-// Auto-start referal rallyes
-function autostartReferalRallyes ($result) {
+// Auto-start referral rallyes
+function autostartReferralRallyes ($result) {
        // Load all rallyes (usally we have only one rallye active per time!
        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
 
@@ -67,11 +67,11 @@ LIMIT 1",
        $content['id']         = $id;  // id for the rallye details link
 
        // Determine min_users and min_prices
-       $content['min_users']  = determineReferalRallyeMinimumUsers($min_users);
-       $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
+       $content['min_users']  = determineReferralRallyeMinimumUsers($min_users);
+       $content['min_prices'] = determineReferralRallyeMinimumPrices($min_prices);
 
        // Load prices
-       $content['prices'] = addReferalRallyePrices($id);
+       $content['prices'] = addReferralRallyePrices($id);
 
        // Query all users
        $result_user = SQL_QUERY("SELECT
@@ -91,7 +91,7 @@ ORDER BY
                $un = false;
 
                // Get refs by userid
-               $count = getReferalRallyeRefsCount($content['userid']);
+               $count = getReferralRallyeRefsCount($content['userid']);
                if (empty($count)) $count = '0'; // Added prevent some unknown troubles... :-?
 
                // Check if line is already included...
@@ -173,7 +173,7 @@ WHERE
 }
 
 //
-function addReferalRallyePrices ($rallye, $mode = 'email') {
+function addReferralRallyePrices ($rallye, $mode = 'email') {
        // Output mode
        switch($mode) {
                case 'email': $mode = "\n";     break;
@@ -222,7 +222,7 @@ ORDER BY
 }
 
 //
-function addReferalRallyeTopUsers ($mode, $rallye, $default=0) {
+function addReferralRallyeTopUsers ($mode, $rallye, $default=0) {
        // Init variables
        $min_users = 0; $min_prices = 0;
 
@@ -259,7 +259,7 @@ ORDER BY
        // Load all users
        while ($content = SQL_FETCHARRAY($result)) {
                // Get current refs
-               $count = getReferalRallyeRefsCount($content['userid'], $content['refs']);
+               $count = getReferralRallyeRefsCount($content['userid'], $content['refs']);
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT
@@ -346,12 +346,12 @@ LIMIT 1",
 }
 
 // Run this function only when a new member has confirmed his email address!
-function addUserToReferalRallye ($userid, $content = array()) {
+function addUserToReferralRallye ($userid, $content = array()) {
        $add = '';
 
        // Updated extension?
        if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
-               $add .= ', `min_users`,`min_prices`';
+               $add .= ',`min_users`,`min_prices`';
        } // END - if
 
        // Check for an auto-add rallye
@@ -390,11 +390,11 @@ LIMIT 1", __FUNCTION__, __LINE__);
                        $content['refs']  = countSumTotalData($userid, 'user_data', 'userid', 'refid', true);
 
                        // Load prices
-                       $content['prices'] = addReferalRallyePrices($id);
+                       $content['prices'] = addReferralRallyePrices($id);
 
                        // Determine min_users/prices tring
-                       $content['min_users']  = determineReferalRallyeMinimumUsers($min_users);
-                       $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
+                       $content['min_users']  = determineReferralRallyeMinimumUsers($min_users);
+                       $content['min_prices'] = determineReferralRallyeMinimumPrices($min_prices);
 
                        // Send notification to member
                        $message = loadEmailTemplate('member_rallye_notify', $content, $userid);
@@ -435,7 +435,7 @@ LIMIT 1",
 }
 
 //
-function markReferalRallyesAsExpired ($result) {
+function markReferralRallyesAsExpired ($result) {
        // Load rallye data
        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
 
@@ -452,7 +452,7 @@ function markReferalRallyesAsExpired ($result) {
        $content['now_t']  = generateDateTime(time(), 1);
 
        // Load users array (!) with assigned prices
-       $prices = getArrayFromReferalRallyeUsers($id);
+       $prices = getArrayFromReferralRallyeUsers($id);
 
        // Just count...
        $total = '0';
@@ -507,8 +507,8 @@ function markReferalRallyesAsExpired ($result) {
 
                        if ($content['points'] > 0) {
                                // Add points directly to user's account
-                               initReferalSystem();
-                               addPointsThroughReferalSystem('rallye_winner:' . $winnerLevel, $userid, $content['points']);
+                               initReferralSystem();
+                               addPointsThroughReferralSystem('rallye_winner:' . $winnerLevel, $userid, $content['points']);
                        } // END - if
 
                        if ($notify == 'Y') {
@@ -541,7 +541,7 @@ function markReferalRallyesAsExpired ($result) {
                $templ = 'admin_rallye_expired';
        } elseif (is_array($users['userid'])) {
                $templ = 'admin_rallye_expired_no';
-               $count = getReferalRallyeUserDataFromArray($users);
+               $count = getReferralRallyeUserDataFromArray($users);
        }
 
        // Add count
@@ -555,7 +555,7 @@ function markReferalRallyesAsExpired ($result) {
 }
 
 //
-function getReferalRallyeUserDataFromArray ($userIds) {
+function getReferralRallyeUserDataFromArray ($userIds) {
        // Implode user ids
        $userid_string = implode(',', $userIds['userid']);
 
@@ -593,7 +593,7 @@ LIMIT %s",
 }
 
 //
-function getArrayFromReferalRallyePrices ($rallye) {
+function getArrayFromReferralRallyePrices ($rallye) {
        // Init multi array
        $prices = array(
                'level'  => array(),
@@ -627,7 +627,7 @@ ORDER BY
 }
 
 //
-function getArrayFromReferalRallyeUsers ($rallye) {
+function getArrayFromReferralRallyeUsers ($rallye) {
        // Fix zero points to 0.00000
        if (getConfig('ref_payout') == '0') setConfigEntry('ref_payout', '0.00000');
 
@@ -643,7 +643,7 @@ function getArrayFromReferalRallyeUsers ($rallye) {
                array(bigintval($rallye)), __FUNCTION__, __LINE__);
        while ($content = SQL_FETCHARRAY($result_user)) {
                // Load current ref count
-               $count = getReferalRallyeRefsCount($content['userid'], $content['refs']);
+               $count = getReferralRallyeRefsCount($content['userid'], $content['refs']);
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT
@@ -686,7 +686,7 @@ LIMIT 1",
        array_pk_sort($users, array('ref', 'cpoints'), 0, 1, true);
 
        // Load prices array (!)
-       $prices = getArrayFromReferalRallyePrices($rallye);
+       $prices = getArrayFromReferralRallyePrices($rallye);
 
        // Merge users into prices
        foreach ($prices['level'] as $k => $level) {
@@ -703,12 +703,12 @@ LIMIT 1",
 }
 
 // @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
-function addReferalRallyeWinners ($mode, $rallye, $default=0) {
+function addReferralRallyeWinners ($mode, $rallye, $default=0) {
        // First check how many prices are set
        $prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true);
 
        // Load data
-       $content = getArrayFromReferalRallyeUsers($rallye);
+       $content = getArrayFromReferralRallyeUsers($rallye);
 
        // Generate table
        $OUT = '';
@@ -765,7 +765,7 @@ function addReferalRallyeWinners ($mode, $rallye, $default=0) {
 }
 
 //
-function purgeExpiredReferalRallyes () {
+function purgeExpiredReferralRallyes () {
        // Check for expired rallyes
        $EXPIRE = 3; // @TODO The hard-coded value...
        $result_rallye = SQL_QUERY_ESC("SELECT
@@ -812,7 +812,7 @@ WHERE
 }
 
 //
-function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
+function addReferralRallyeTemplateSelection ($name = 'template', $default = '') {
        // Init variables
        $OUT = '';
        $ral = array();
@@ -854,7 +854,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
 }
 
 // @TODO Please document this function
-function getReferalRallyeRefsCount ($currUserid, $oldReferralCount = '0') {
+function getReferralRallyeRefsCount ($currUserid, $oldReferralCount = '0') {
        // Check current refs
        if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
                // Get refs from cache
@@ -927,7 +927,7 @@ WHERE
 }
 
 // Determines the right language string for min_users
-function determineReferalRallyeMinimumUsers ($min_users) {
+function determineReferralRallyeMinimumUsers ($min_users) {
        // Rallye ends without user limitation is the default
        $return = '{--RALLYE_END_NO_USER_LIMITATION--}';
 
@@ -941,7 +941,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 }
 
 // Determines the right language string for min_prices
-function determineReferalRallyeMinimumPrices ($min_prices) {
+function determineReferralRallyeMinimumPrices ($min_prices) {
        // Rallye ends without user limitation is the default
        $return = '{--RALLYE_END_NO_PRICE_LIMITATION--}';