New wrapper function introduced, more EL rewrites:

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index 2aabc5c1c28feeb85861511e3445048a5f441194..65516a55b635e08dadffb71a1f4e4e66b88fb6f1 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -97,7 +98,7 @@ if (isGetRequestParameterSet('userid')) {
        } // 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__);
@@ -107,8 +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()) {
                                // Remember remote address, userid and timestamp for next click
@@ -129,18 +129,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(