Rewrites/fixes for handling config entries in SQLs

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index febde55fec0c46647dc17886468ed65ae34f75e7..57b930c8d9fc4869b1b720f163def020db07383d 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -108,7 +108,7 @@ if (isGetRequestParameterSet('userid')) {
                        array(getUserData('userid'), detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
                // Entry not found, points set and not logged in?
-               if (((SQL_NUMROWS($result) == '0') || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) {
+               if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) {
 
                        // Admin is testing?
                        if (!isAdmin()) {
@@ -130,18 +130,18 @@ 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(