Moved resending of user confirmation link to ext-user

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

diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php
index e7faa39850f1d5d08bb08421aec1d69673afda1d..5fb6055eb74898c3c2030b31115faf0b7f1618f5 100644 (file)
--- a/inc/libs/beg_functions.php
+++ b/inc/libs/beg_functions.php
@@ -50,14 +50,10 @@ function addPointsBeg ($userid, $points) {
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=`beg_points`+%s WHERE `userid`=%s LIMIT 1",
                        array($points, $userid), __FUNCTION__, __LINE__);
        } else {
-               // Set mode depending on how many mails the member has to confirm
-               $locked = false;
-               if ((getConfig('ref_payout') > 0) && (getConfig('allow_direct_pay') != 'Y')) $locked = true;
-
                // Add points to account
                // @TODO Try to rewrite the following unset()
                unset($GLOBALS['ref_level']);
-               addPointsThroughReferalSystem('beg', $userid, $points, false, 0, $locked, strtolower(getConfig('beg_mode')));
+               addPointsThroughReferalSystem('beg', $userid, $points, false, 0, strtolower(getConfig('beg_mode')));
        }
 
        // Subtract begged points from member account if the admin has selected one
@@ -70,25 +66,37 @@ function addPointsBeg ($userid, $points) {
 // Checks wether beg_rallye is enabled
 function isBegRallyeEnabled () {
        // Do we have cache?
-       if (!isset($GLOBALS['is_beg_rallye_enabled'])) {
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('beg', '0.2.8')) && (getConfig('beg_rallye') == 'Y'));
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether beg_rallye is enabled
+function isBegNewMemberNotifyEnabled () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
-               $GLOBALS['is_beg_rallye_enabled'] = ((isExtensionInstalledAndNewer('beg', '0.2.8')) && (getConfig('beg_rallye') == 'Y'));
+               $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('beg', '0.2.7')) && (getConfig('beg_new_member_notify') == 'Y'));
        } // END - if
 
        // Return cache
-       return $GLOBALS['is_beg_rallye_enabled'];
+       return $GLOBALS[__FUNCTION__];
 }
 
 // "Getter" for beg_userid
 function getBegUserid () {
        // Do we have cache?
-       if (!isset($GLOBALS['beg_userid'])) {
+       if (!isset($GLOBALS[__FUNCTION__])) {
                // Get it
-               $GLOBALS['beg_userid'] = getConfig('beg_userid');
+               $GLOBALS[__FUNCTION__] = getConfig('beg_userid');
        } // END - if
 
        // Return cache
-       return $GLOBALS['beg_userid'];
+       return $GLOBALS[__FUNCTION__];
 }
 
 // [EOF]