Added more configuration wrappers

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index bd6e262d5c9ae9d31cebf9a7123d0ecf46a52169..d585e56cfc6a407d95e68b87f0b30c1cd9f07dd7 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -65,7 +65,7 @@ if (isGetRequestElementSet('userid')) {
 
        // Validate if it is not a number
        if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestElement('userid')))) {
-               // Maybe we have found a nickname?
+               // Maybe a nickname is provided?
                fetchUserData(getRequestElement('userid'), 'nickname');
        } elseif (isNicknameUsed(getRequestElement('userid'))) {
                // Nickname entered but nickname is not active
@@ -90,13 +90,11 @@ if (isGetRequestElementSet('userid')) {
                // Set nickname / userid for template
                $content['userid']        = getRequestElement('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?
-       if ((isValidUserId(getUserData('userid'))) && (getBegUserid() != getUserData('userid'))) {
+       if ((isValidId(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__);
@@ -105,7 +103,7 @@ if (isGetRequestElementSet('userid')) {
                $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(),
+                               determineRealRemoteAddress(),
                                session_id()
                        ), __FILE__, __LINE__);
 
@@ -125,7 +123,7 @@ if (isGetRequestElementSet('userid')) {
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_beg_ips` (`userid`, `remote_ip`, `sid`, `timeout`) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",
                                        array(
                                                getUserData('userid'),
-                                               detectRemoteAddr(),
+                                               determineRealRemoteAddress(),
                                                session_id()
                                        ), __FILE__, __LINE__);
 
@@ -188,7 +186,7 @@ if (isGetRequestElementSet('userid')) {
        } elseif ((getUserData('status') != 'CONFIRMED') && (getUserData('status') != 'failed')) {
                // Maybe locked/unconfirmed account?
                $errorCode = generateErrorCodeFromUserStatus();
-       } elseif ((getUserData('userid') == '0') || (getUserData('status') == 'failed')) {
+       } elseif ((!isValidId(getUserData('userid'))) || (getUserData('status') == 'failed')) {
                // Inalid or locked account, so let's find out
                if (fetchUserData(getRequestElement('userid'), 'nickname')) {
                        // Locked account