Extension ext-forced enhanced, some code cleanup:

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index 7dd2d6a78b399abe7048f7d462ee3bd14143c05d..5a290e3baaa0ebcc1c1e1e721fe2cacb3ec11354 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -85,10 +83,12 @@ if (isGetRequestParameterSet('userid')) {
 
        // Check if account was found
        if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED')) {
-               // Multiply configured values with 100000 and divide with 100000 so we can also handle small values
-               // If we need more number behind the decimal dot then we just need to increase all these three
-               // numbers matching to the numbers behind the decimal dot. Simple! ;-)
-               $points = mt_rand((getConfig('beg_points') * 100000), (getConfig('beg_points_max') * 100000)) / 100000;
+               /*
+                * Multiply configured values with 100000 and divide with 100000 so we can also handle small values
+                * If we need more number behind the decimal dot then we just need to increase all these three
+                * numbers matching to the numbers behind the decimal dot. Simple! ;-)
+                */
+               $points = mt_rand((getBegPoints() * 100000), (getBegPointsMax() * 100000)) / 100000;
 
                // Set nickname / userid for template
                $content['userid'] = getRequestParameter('userid');
@@ -98,7 +98,7 @@ if (isGetRequestParameterSet('userid')) {
        } // END - if
 
        // User id valid and not webmaster's id?
-       if ((isValidUserId(getUserData('userid'))) && (getConfig('beg_userid') != getUserData('userid'))) {
+       if ((isValidUserId(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__);
@@ -108,17 +108,23 @@ if (isGetRequestParameterSet('userid')) {
                        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()) && (getConfig('beg_pay_mode') == 'NONE')) {
+               if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getBegPayMode() == 'NONE')) {
                        // Admin is testing?
                        if (!isAdmin()) {
-                               // Remember remote address, userid and timestamp for next click
-                               // but only when there is no admin begging.
-                               // Admins shall be able to test it!
+                               /*
+                                * Remember remote address, userid and timestamp for next click
+                                * 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())",
-                                       array(getUserData('userid'), detectRemoteAddr(), session_id()), __FILE__, __LINE__);
+                                       array(
+                                               getUserData('userid'),
+                                               detectRemoteAddr(),
+                                               session_id()
+                                       ), __FILE__, __LINE__);
 
                                // Was is successfull?
-                               $pay (SQL_AFFECTEDROWS() == 1);
+                               $pay (!SQL_HASZEROAFFECTED());
                        } else {
                                // Is admin!
                                $pay = true;
@@ -141,9 +147,9 @@ if (isGetRequestParameterSet('userid')) {
                } elseif (isMember()) {
                        // Logged in user found!
                        $content['message'] = loadTemplate('beg_login', true, $content);
-               } elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active!
+               } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active!
                        // Load message template depending on pay-mode
-                       $content['message'] = loadTemplate('beg_pay_mode_'.strtolower(getConfig('beg_pay_mode')), true, $content);
+                       $content['message'] = loadTemplate('beg_pay_mode_'.strtolower(getBegPayMode()), true, $content);
                        $pay = true;
                } else {
                        // Clicked received while reload lock is active
@@ -160,14 +166,14 @@ if (isGetRequestParameterSet('userid')) {
                loadTemplate('beg_link', false, $content);
 
                // Tracker code enabled? (We don't track users here!
-               if ((getConfig('beg_pay_mode') != 'NONE') && ($pay === true)) {
+               if ((getBegPayMode() != 'NONE') && ($pay === true)) {
                        // Prepare content for template
                        // @TODO Opps, what is missing here???
                        $content = array(
                        );
 
                        // Include config-depending template
-                       loadTemplate('beg_pay_code_'.strtolower(getConfig('beg_pay_mode')), false, $content);
+                       loadTemplate('beg_pay_code_'.strtolower(getBegPayMode()), false, $content);
                } elseif (($pay === false) && (!isset($content['message']))) {
                        // Cannot pay! :-(
                        $content['message'] = loadTemplate('beg_failed', true);
@@ -187,7 +193,7 @@ if (isGetRequestParameterSet('userid')) {
                        // Invalid nickname! (404)
                        $errorCode = getCode('USER_404');
                }
-       } elseif (getUserData('userid') == getConfig('beg_userid')) {
+       } elseif (getUserData('userid') == getBegUserid()) {
                // Webmaster's id cannot beg for points!
                $errorCode = getCode('BEG_SAME_AS_OWN');
        }