Used EL code {%template,LoadTemplate=foo%} instead of loadTemplate('foo', TRUE);

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index ba9bc75965ec4280f75ae37173764a524dccbb9e..6bc039e62e773db6c9c7510fc76f133e01cda956 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -61,7 +61,7 @@ if (isGetRequestElementSet('userid')) {
        $points = '0';
 
        // Don't pay is the default...
-       $pay = FALSE;
+       $isPayed = FALSE;
 
        // Validate if it is not a number
        if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestElement('userid')))) {
@@ -90,13 +90,11 @@ if (isGetRequestElementSet('userid')) {
                // Set nickname / userid for template
                $content['userid']        = getRequestElement('userid');
                $content['clicks']        = (getUserData('beg_clicks') + 1);
-               $content['header_banner'] = loadTemplate('beg_header_banner', TRUE);
-               $content['footer_banner'] = loadTemplate('beg_footer_banner', TRUE);
                $content['points']        = $points;
        } // END - if
 
        // User id valid and not webmaster's id?
-       if ((isValidUserId(getUserData('userid'))) && (getBegUserid() != getUserData('userid'))) {
+       if ((isValidId(getUserData('userid'))) && (getBegUserid() != getUserData('userid'))) {
                // Update counter
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_clicks`=`beg_clicks`+1 WHERE `userid`=%s LIMIT 1",
                        array(getUserData('userid')), __FILE__, __LINE__);
@@ -113,7 +111,7 @@ if (isGetRequestElementSet('userid')) {
                //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'SQL_HASZERONUMS()=' . intval(SQL_HASZERONUMS($result)) . ',isAdmin()=' . intval(isAdmin()) . ',points=' . $points . ',isMember()=' . intval(isMember()) . ',getBegPayMode()=' . getBegPayMode());
                if ((SQL_HASZERONUMS($result)) && ($points > 0) && (getBegPayMode() == 'NONE') && ((!isMember()) || (isAdmin()))) {
                        // Default is result from isAdmin(), mostly false
-                       $pay = isAdmin();
+                       $isPayed = isAdmin();
 
                        // Admin is testing?
                        if (!isAdmin()) {
@@ -130,12 +128,12 @@ if (isGetRequestElementSet('userid')) {
                                        ), __FILE__, __LINE__);
 
                                // Was is successfull?
-                               $pay = (!SQL_HASZEROAFFECTED());
+                               $isPayed = (!SQL_HASZEROAFFECTED());
                        } // END - if
 
                        // Pay points?
-                       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'pay=' . intval($pay));
-                       if ($pay === TRUE) {
+                       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'isPayed=' . intval($isPayed));
+                       if ($isPayed === TRUE) {
                                // Add points to user or begging rallye account
                                if (addPointsBeg(getUserData('userid'), $points)) {
                                        // Set 'done' message
@@ -154,7 +152,7 @@ if (isGetRequestElementSet('userid')) {
                } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active!
                        // Load message template depending on pay-mode
                        $content['message'] = loadTemplate('beg_pay_mode_' . strtolower(getBegPayMode()), TRUE, $content);
-                       $pay = TRUE;
+                       $isPayed = TRUE;
                } else {
                        // Clicked received while reload lock is active
                        $content['message'] = loadTemplate('beg_failed', TRUE, $content);
@@ -170,7 +168,7 @@ if (isGetRequestElementSet('userid')) {
                loadTemplate('beg_link', FALSE, $content);
 
                // Tracker code enabled? (We don't track users here!
-               if ((getBegPayMode() != 'NONE') && ($pay === TRUE)) {
+               if ((getBegPayMode() != 'NONE') && ($isPayed === TRUE)) {
                        // Prepare content for template
                        // @TODO Opps, what is missing here???
                        $content = array(
@@ -178,7 +176,7 @@ if (isGetRequestElementSet('userid')) {
 
                        // Include config-depending template
                        loadTemplate('beg_pay_code_' . strtolower(getBegPayMode()), FALSE, $content);
-               } elseif (($pay === FALSE) && (!isset($content['message']))) {
+               } elseif (($isPayed === FALSE) && (!isset($content['message']))) {
                        // Cannot pay! :-(
                        $content['message'] = loadTemplate('beg_failed', TRUE);
                }
@@ -188,7 +186,7 @@ if (isGetRequestElementSet('userid')) {
        } elseif ((getUserData('status') != 'CONFIRMED') && (getUserData('status') != 'failed')) {
                // Maybe locked/unconfirmed account?
                $errorCode = generateErrorCodeFromUserStatus();
-       } elseif ((getUserData('userid') == '0') || (getUserData('status') == 'failed')) {
+       } elseif ((!isValidId(getUserData('userid'))) || (getUserData('status') == 'failed')) {
                // Inalid or locked account, so let's find out
                if (fetchUserData(getRequestElement('userid'), 'nickname')) {
                        // Locked account