Comment removed

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index f849daf87ee1fc3486c4c6338457dc7fabf5cdde..6d4e6c5cc6344665dc3054eb3818d905757d544d 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -36,7 +36,7 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
@@ -94,7 +94,7 @@ if (isInstalled()) {
                        list($uid, $clicks, $ref_payout, $status, $last) = SQL_FETCHROW($result);
 
                        // Account confirmed?
-                       if ($status == "CONFIRMED") {
+                       if ($status == 'CONFIRMED') {
                                // Secure userid
                                $uid = bigintval($uid);
 
@@ -107,7 +107,7 @@ if (isInstalled()) {
                                define('__BEG_UID'   , REQUEST_GET('uid'));
                                define('__BEG_CLICKS', ($clicks + 1));
                                define('__BEG_BANNER', LOAD_TEMPLATE("beg_banner", true));
-                               define('__BEG_POINTS', TRANSLATE_COMMA($points));
+                               define('__BEG_POINTS', translateComma($points));
                        } else {
                                // Other status
                                $uid = 0;
@@ -124,8 +124,8 @@ if (isInstalled()) {
                                array($uid), __FILE__, __LINE__);
 
                        // Check for last entry for userid w/o IP number
-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_beg_ips` WHERE (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_timeout').") OR (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_uid_timeout').") AND userid=%s)) AND (remote_ip='%s' OR sid='%s') LIMIT 1",
-                               array($uid, GET_REMOTE_ADDR(), session_id()), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_beg_ips` WHERE (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_timeout').") OR (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_uid_timeout').") AND `userid`=%s)) AND (remote_ip='%s' OR sid='%s') LIMIT 1",
+                               array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
                        // Entry not found, points set and not logged in?
                        if (((SQL_NUMROWS($result) == 0) || (IS_ADMIN())) && ($points > 0) && (!IS_MEMBER()) && (getConfig('beg_pay_mode') == "NONE")) {
@@ -136,7 +136,7 @@ if (isInstalled()) {
                                        // 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($uid, GET_REMOTE_ADDR(), session_id()), __FILE__, __LINE__);
+                                               array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
                                        // Was is successfull?
                                        if (SQL_AFFECTEDROWS() == 1) {
@@ -152,7 +152,7 @@ if (isInstalled()) {
                                if ($pay === true) {
                                        // Add points to user or begging rallye account
                                        if (BEG_ADD_POINTS($uid, $points)) {
-                                               // Set "done" message
+                                               // Set 'done' message
                                                define('__BEG_MSG', LOAD_TEMPLATE("beg_done", true));
                                        } else {
                                                // Error!
@@ -185,7 +185,7 @@ if (isInstalled()) {
                        SQL_FREERESULT($result);
 
                        // Include header
-                       LOAD_INC_ONCE('inc/header.php');
+                       loadIncludeOnce('inc/header.php');
 
                        // Load final template
                        LOAD_TEMPLATE("beg_link");
@@ -205,11 +205,11 @@ if (isInstalled()) {
                        }
 
                        // Include footer
-                       LOAD_INC_ONCE('inc/footer.php');
-               } elseif (($status != "CONFIRMED") && ($status != "failed")) {
+                       loadIncludeOnce('inc/footer.php');
+               } elseif (($status != 'CONFIRMED') && ($status != "failed")) {
                        // Maybe locked/unconfirmed account?
-                       $msg = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
-               } elseif (($uid == "0") || ($status == "failed")) {
+                       $msg = generateErrorCodeFromUserStatus($status);
+               } elseif (($uid == '0') || ($status == "failed")) {
                        // Inalid or locked account, so let's find out
                        $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
                                array(REQUEST_GET('uid')), __FILE__, __LINE__);
@@ -229,14 +229,14 @@ if (isInstalled()) {
                }
 
                // Reload to index module
-               if ((!empty($msg)) && (!empty($msg))) LOAD_URL('modules.php?module=index&msg='.$msg.'&ext=beg');
+               if ((!empty($msg)) && (!empty($msg))) redirectToUrl('modules.php?module=index&msg='.$msg.'&ext=beg');
        } else {
                // No userid entered
-               LOAD_URL('modules.php?module=index');
+               redirectToUrl('modules.php?module=index');
        }
 } else {
        // You have to install first!
-       LOAD_URL('install.php');
+       redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)