A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index 14d19efe31ff64b344359158f4dc44816c0eb4ca..f73f1a89941ce292a3a35c3d2fdcba390205794c 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -44,7 +44,7 @@ $GLOBALS['startTime'] = microtime(true);
 // Set module
 $GLOBALS['module'] = 'beg';
 $GLOBALS['output_mode'] = -1;
-$errorCode = null;
+$errorCode = NULL;
 
 // Load the required file(s)
 require('inc/config-global.php');
@@ -88,10 +88,11 @@ if (isGetRequestParameterSet('userid')) {
                $points = mt_rand((getBegPoints() * 100000), (getBegPointsMax() * 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'] = $points;
+               $content['userid']        = getRequestParameter('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?
@@ -102,10 +103,18 @@ if (isGetRequestParameterSet('userid')) {
 
                // Check for last entry for userid w/o IP number                            12              33                               2    23              44            3                                          21     1                              1
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_beg_ips` WHERE ((UNIX_TIMESTAMP() - `timeout`) >= {?beg_timeout?} OR ((UNIX_TIMESTAMP() - `timeout`) >= {?beg_userid_timeout?} AND `userid`=%s)) AND (`remote_ip`='%s' OR `sid`='%s') LIMIT 1",
-                       array(getUserData('userid'), detectRemoteAddr(), session_id()), __FILE__, __LINE__);
+                       array(
+                               getUserData('userid'),
+                               detectRemoteAddr(),
+                               session_id()
+                       ), __FILE__, __LINE__);
 
                // Entry not found, points set and not logged in?
-               if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getBegPayMode() == 'NONE')) {
+               //* 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();
+
                        // Admin is testing?
                        if (!isAdmin()) {
                                /*
@@ -113,7 +122,7 @@ if (isGetRequestParameterSet('userid')) {
                                 * but only when there is no admin begging.
                                 * Admins shall be able to test it!
                                 */
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_beg_ips` (`userid`, `remote_ip`, `sid`, `timeout`) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_beg_ips` (`userid`,`remote_ip`,`sid`,`timeout`) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",
                                        array(
                                                getUserData('userid'),
                                                detectRemoteAddr(),
@@ -121,13 +130,11 @@ if (isGetRequestParameterSet('userid')) {
                                        ), __FILE__, __LINE__);
 
                                // Was is successfull?
-                               $pay (!SQL_HASZEROAFFECTED());
-                       } else {
-                               // Is admin!
-                               $pay = true;
-                       }
+                               $pay = (!SQL_HASZEROAFFECTED());
+                       } // END - if
 
                        // Pay points?
+                       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'pay=' . intval($pay));
                        if ($pay === true) {
                                // Add points to user or begging rallye account
                                if (addPointsBeg(getUserData('userid'), $points)) {
@@ -196,7 +203,7 @@ if (isGetRequestParameterSet('userid')) {
        }
 
        // Reload to index module if an error happens
-       if (!empty($errorCode)) {
+       if (!is_null($errorCode)) {
                redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=beg');
        } // END - if
 } else {