Extension ext-coupon continued, a lot improvements applied:

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index c241a6d373d633aa2e2986e8f1a87e1cdc5afcfd..e46a44d872ca2fdc0d0e2ddd35e3a28d8a32e2e6 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -103,8 +103,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 +116,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(),
@@ -145,7 +145,7 @@ if (isGetRequestParameterSet('userid')) {
                                $content['message'] = loadTemplate('beg_failed', true, $content);
                        }
                } elseif (isMember()) {
-                       // Logged in user found!
+                       // Logged in user found
                        $content['message'] = loadTemplate('beg_login', true, $content);
                } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active!
                        // Load message template depending on pay-mode
@@ -198,8 +198,10 @@ if (isGetRequestParameterSet('userid')) {
                $errorCode = getCode('BEG_SAME_AS_OWN');
        }
 
-       // Reload to index module
-       if ((!empty($errorCode)) && (!empty($errorCode))) redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=beg');
+       // Reload to index module if an error happens
+       if (!empty($errorCode)) {
+               redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=beg');
+       } // END - if
 } else {
        // No userid entered
        redirectToUrl('modules.php?module=index');