Menu entries moved to ext-user:

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index 9aaef503068c988d604f01297c4b3e4846758b0d..14d19efe31ff64b344359158f4dc44816c0eb4ca 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -64,15 +64,12 @@ if (isGetRequestParameterSet('userid')) {
        $pay = false;
 
        // Validate if it is not a number
-       if (isNicknameUsed(getRequestParameter('userid'))) {
-               // Is the nickname extension there?
-               if (isExtensionActive('nickname')) {
-                       // Maybe we have found a nickname?
-                       fetchUserData(getRequestParameter('userid'), 'nickname');
-               } else {
-                       // Nickname entered but nickname is not active
-                       $errorCode = getCode('EXTENSION_PROBLEM');
-               }
+       if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestParameter('userid')))) {
+               // Maybe we have found a nickname?
+               fetchUserData(getRequestParameter('userid'), 'nickname');
+       } elseif (isNicknameUsed(getRequestParameter('userid'))) {
+               // Nickname entered but nickname is not active
+               $errorCode = getCode('EXTENSION_PROBLEM');
        } else {
                // Direct userid
                fetchUserData(getRequestParameter('userid'));
@@ -103,8 +100,8 @@ if (isGetRequestParameterSet('userid')) {
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_clicks`=`beg_clicks`+1 WHERE `userid`=%s LIMIT 1",
                        array(getUserData('userid')), __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() - {?beg_timeout?}) OR (`timeout` > (UNIX_TIMESTAMP() - {?beg_userid_timeout?}) AND `userid`=%s)) AND (`remote_ip`='%s' OR `sid`='%s') LIMIT 1",
+               // 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__);
 
                // Entry not found, points set and not logged in?
@@ -116,7 +113,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(),
@@ -149,7 +146,7 @@ if (isGetRequestParameterSet('userid')) {
                        $content['message'] = loadTemplate('beg_login', true, $content);
                } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active!
                        // Load message template depending on pay-mode
-                       $content['message'] = loadTemplate('beg_pay_mode_'.strtolower(getBegPayMode()), true, $content);
+                       $content['message'] = loadTemplate('beg_pay_mode_' . strtolower(getBegPayMode()), true, $content);
                        $pay = true;
                } else {
                        // Clicked received while reload lock is active
@@ -173,7 +170,7 @@ if (isGetRequestParameterSet('userid')) {
                        );
 
                        // Include config-depending template
-                       loadTemplate('beg_pay_code_'.strtolower(getBegPayMode()), false, $content);
+                       loadTemplate('beg_pay_code_' . strtolower(getBegPayMode()), false, $content);
                } elseif (($pay === false) && (!isset($content['message']))) {
                        // Cannot pay! :-(
                        $content['message'] = loadTemplate('beg_failed', true);