TODOs.txt updated

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index 397fdf302c1495e9f27edfac4f639463ee938cca..7dd2d6a78b399abe7048f7d462ee3bd14143c05d 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -91,14 +91,14 @@ if (isGetRequestParameterSet('userid')) {
                $points = mt_rand((getConfig('beg_points') * 100000), (getConfig('beg_points_max') * 100000)) / 100000;
 
                // Set nickname / userid for template
-               $content['userid']      = getRequestParameter('userid');
-               $content['clicks']      = (getUserData('beg_clicks') + 1);
-               $content['banner']      = loadTemplate('beg_banner', true);
-               $content['points']      = translateComma($points);
+               $content['userid'] = getRequestParameter('userid');
+               $content['clicks'] = (getUserData('beg_clicks') + 1);
+               $content['banner'] = loadTemplate('beg_banner', true);
+               $content['points'] = $points;
        } // END - if
 
        // User id valid and not webmaster's id?
-       if ((getUserData('userid') > 0) && (getConfig('beg_userid') != getUserData('userid'))) {
+       if ((isValidUserId(getUserData('userid'))) && (getConfig('beg_userid') != 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__);
@@ -109,7 +109,6 @@ if (isGetRequestParameterSet('userid')) {
 
                // Entry not found, points set and not logged in?
                if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) {
-
                        // Admin is testing?
                        if (!isAdmin()) {
                                // Remember remote address, userid and timestamp for next click
@@ -130,26 +129,19 @@ if (isGetRequestParameterSet('userid')) {
                                // Add points to user or begging rallye account
                                if (addPointsBeg(getUserData('userid'), $points)) {
                                        // Set 'done' message
-                                       $content['message'] = loadTemplate('beg_done', true);
+                                       $content['message'] = loadTemplate('beg_done', true, $content);
                                } else {
                                        // Error!
-                                       $content['message'] = loadTemplate('beg_failed', true);
+                                       $content['message'] = loadTemplate('beg_failed', true, $content);
                                }
                        } else {
                                // Error!
-                               $content['message'] = loadTemplate('beg_failed', true);
+                               $content['message'] = loadTemplate('beg_failed', true, $content);
                        }
                } elseif (isMember()) {
                        // Logged in user found!
-                       $content['message'] = loadTemplate('beg_login', true);
+                       $content['message'] = loadTemplate('beg_login', true, $content);
                } elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active!
-                       // Prepare content for template
-                       $content = array(
-                               'clicks' => $content['clicks'],
-                               'points' => $content['points'],
-                               'userid' => $content['userid']
-                       );
-
                        // Load message template depending on pay-mode
                        $content['message'] = loadTemplate('beg_pay_mode_'.strtolower(getConfig('beg_pay_mode')), true, $content);
                        $pay = true;