More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

[mailer.git] / inc / modules / member / what-transfer.php

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index eac91e3a0b5b8c9492474b1d4a1f047497c9cdff..2901b4c8d985a8618329d4f5b5bc17c2c35aeaf6 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!IS_MEMBER()) {
@@ -112,26 +112,26 @@ case "new": // Start new transfer
                        $nick = true;
                }
                // Re-check receivers and own personal data
-               $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid IN ('%s', '%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",
+               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid IN ('%s', '%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",
                 array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
                $valid_data = (SQL_NUMROWS($result) == 2);
 
                if ($valid_code && $valid_pass && $valid_amount && $valid_reason && $valid_recipient)
                {
                        // Let's start the transfer and load user data
-                       list($uid1, $sex1, $sname1, $fname1, $email1, $nick1) = SQL_FETCHROW($result);
-                       list($uid2, $sex2, $sname2, $fname2, $email2, $nick2) = SQL_FETCHROW($result);
+                       list($uid1, $gender1, $sname1, $fname1, $email1, $nick1) = SQL_FETCHROW($result);
+                       list($uid2, $gender2, $sname2, $fname2, $email2, $nick2) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        if ($uid1 == $GLOBALS['userid'])
                        {
                                // Data row 1 is sender's data
-                               define('__SENDER_SEX'     , TRANSLATE_SEX($sex1));
+                               define('__SENDER_GENDER'     , TRANSLATE_GENDER($gender1));
                                define('__SENDER_NICK'    , $nick1);
                                define('__SENDER_SNAME'   , $sname1);
                                define('__SENDER_FNAME'   , $fname1);
                                define('__SENDER_EMAIL'   , $email1);
                                // Data row 2 is recpient's data
-                               define('__RECIPIENT_SEX'  , TRANSLATE_SEX($sex2));
+                               define('__RECIPIENT_GENDER'  , TRANSLATE_GENDER($gender2));
                                define('__RECIPIENT_NICK' , $nick2);
                                define('__RECIPIENT_SNAME', $sname2);
                                define('__RECIPIENT_FNAME', $fname2);
@@ -144,13 +144,13 @@ case "new": // Start new transfer
                         else
                        {
                                // Data row 2 is sender's data
-                               define('__SENDER_SEX'     , TRANSLATE_SEX($sex2));
+                               define('__SENDER_GENDER'     , TRANSLATE_GENDER($gender2));
                                define('__SENDER_NICK'    , $nick2);
                                define('__SENDER_SNAME'   , $sname2);
                                define('__SENDER_FNAME'   , $fname2);
                                define('__SENDER_EMAIL'   , $email2);
                                // Data row 1 is recpient's data
-                               define('__RECIPIENT_SEX'  , TRANSLATE_SEX($sex1));
+                               define('__RECIPIENT_GENDER'  , TRANSLATE_GENDER($gender1));
                                define('__RECIPIENT_NICK' , $nick1);
                                define('__RECIPIENT_SNAME', $sname1);
                                define('__RECIPIENT_FNAME', $fname1);
@@ -422,8 +422,8 @@ case "list_all": // List all transactions
        // First of all create the temporary table
        $result = SQL_QUERY("CREATE TEMPORARY TABLE "._MYSQL_PREFIX."_transfers_tmp (
 trans_id VARCHAR(12) NOT NULL DEFAULT '',
-party_uid BIGINT(20) NOT NULL DEFAULT '0',
-points BIGINT(20) NOT NULL DEFAULT '0',
+party_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
+points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 reason VARCHAR(255) NOT NULL DEFAULT '',
 time_trans VARCHAR(10) NOT NULL DEFAULT '0',
 trans_type ENUM('IN', 'OUT') NOT NULL DEFAULT 'IN',
@@ -562,8 +562,7 @@ case "": // Overview page
                define('__TRANSFER_ALL_LINK', $total);
        }
 
-       if (isset($_POST['ok']))
-       {
+       if (isset($_POST['ok'])) {
                // Save settings
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET opt_in='%s' WHERE userid=%s LIMIT 1",
                 array($_POST['opt_in'], $GLOBALS['userid']), __FILE__, __LINE__);
@@ -574,35 +573,34 @@ case "": // Overview page
                // "Settings saved..."
                OUTPUT_HTML("<P><STRONG class=\"member_done\">".SETTINGS_SAVED."</STRONG></P>");
        }
+
        switch ($opt_in)
        {
        case 'Y':
-               define('__TRANSFER_ALLOW_Y', ' checked');
+               define('__TRANSFER_ALLOW_Y', " checked");
                define('__TRANSFER_ALLOW_N', "");
                define('__TRANSFER_NEW_LINK', "<A href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=new\">".TRANSFER_NOW_LINK."</A>");
                break;
 
        case 'N':
                define('__TRANSFER_ALLOW_Y', "");
-               define('__TRANSFER_ALLOW_N', ' checked');
+               define('__TRANSFER_ALLOW_N', " checked");
                define('__TRANSFER_NEW_LINK', TRANSFER_PLEASE_ALLOW_OPT_IN);
                break;
        }
 
        // Check for latest out-transfers
-       $result = SQL_QUERY_ESC("SELECT time_trans FROM "._MYSQL_PREFIX."_user_transfers_out WHERE time_trans > ".(time() - $_CONFIG['transfer_timeout'])." AND userid=%s ORDER BY time_trans DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 0)
-       {
+       $result = SQL_QUERY_ESC("SELECT time_trans FROM "._MYSQL_PREFIX."_user_transfers_out WHERE time_trans > (UNIX_TIMESTAMP() - ".$_CONFIG['transfer_timeout'].") AND userid=%s ORDER BY time_trans DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+       if (SQL_NUMROWS($result) == 0) {
                // Load template
                define('__TRANSFER_SETTINGS_CONTENT', LOAD_TEMPLATE("member_transfer_settings", true));
-       }
-        else
-       {
+       } else {
                // Load newest transaction
                list($newest) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                define('__TRANSFER_SETTINGS_CONTENT', TRANSFER_LATEST_IS_1.MAKE_DATETIME($newest, "3").TRANSFER_LATEST_IS_2);
        }
+
        // Load template
        LOAD_TEMPLATE("member_transfer_overview");
        break;