X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=923ef52a4e03941842fe1b31bd65eba52fa596f2;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hp=5838df644295390fd632f938cdbf87f5fe7d8c4a;hpb=116747e4dba29e9e2e4daa82c45d8bbb302e9378;p=mailer.git diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 5838df6442..923ef52a4e 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -41,9 +41,9 @@ if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); } elseif (!IS_MEMBER()) { - LOAD_URL('modules.php?module=index'); + redirectToUrl('modules.php?module=index'); } elseif ((!EXT_IS_ACTIVE('transfer')) && (!IS_ADMIN())) { - addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'transfer'); + addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'transfer')); return; } @@ -58,13 +58,13 @@ list($opt_in) = SQL_FETCHROW($result); // Free memory SQL_FREERESULT($result); -$MODE = ''; -if (REQUEST_ISSET_GET(('mode'))) $MODE = REQUEST_GET('mode'); +$mode = ''; +if (REQUEST_ISSET_GET(('mode'))) $mode = REQUEST_GET('mode'); // Check for "faker" -if (($opt_in == 'N') && ($MODE == "new")) $MODE = ''; +if (($opt_in == 'N') && ($mode == "new")) $mode = ''; -switch ($MODE) +switch ($mode) { case "new": // Start new transfer // Get total points and subtract the balance amount from it = maximum transferable points @@ -116,13 +116,13 @@ case "new": // Start new transfer // @TODO Rewrite all these constants to array elements if ($uid1 == getUserId()) { // Data row 1 is sender's data - define('__SENDER_GENDER' , TRANSLATE_GENDER($gender1)); + define('__SENDER_GENDER' , translateGender($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_GENDER', TRANSLATE_GENDER($gender2)); + define('__RECIPIENT_GENDER', translateGender($gender2)); define('__RECIPIENT_NICK' , $nick2); define('__RECIPIENT_SNAME' , $sname2); define('__RECIPIENT_FNAME' , $fname2); @@ -133,13 +133,13 @@ case "new": // Start new transfer $TEST_NICK_REC = $nick2; } else { // Data row 2 is sender's data - define('__SENDER_GENDER' , TRANSLATE_GENDER($gender2)); + define('__SENDER_GENDER' , translateGender($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_GENDER', TRANSLATE_GENDER($gender1)); + define('__RECIPIENT_GENDER', translateGender($gender1)); define('__RECIPIENT_NICK' , $nick1); define('__RECIPIENT_SNAME' , $sname1); define('__RECIPIENT_FNAME' , $fname1); @@ -168,7 +168,7 @@ case "new": // Start new transfer // Remember transfer reason and fancy date/time in constants define('__TRANSFER_REASON', REQUEST_POST('reason')); - define('__TRANSFER_EXPIRES', CREATE_FANCY_TIME(getConfig('transfer_age'))); + define('__TRANSFER_EXPIRES', createFancyTime(getConfig('transfer_age'))); // Generate tranafer id define('__TRANS_ID', bigintval(generateRandomCodde("10", mt_rand(0, 99999), getUserId(), REQUEST_POST('reason')))); @@ -182,22 +182,22 @@ case "new": // Start new transfer __FILE__, __LINE__); // Add points to account *directly* ... - ADD_POINTS_REFSYSTEM("member_transfer", bigintval(REQUEST_POST('to_uid')), bigintval(REQUEST_POST('points')), false, "0", false, "direct"); + ADD_POINTS_REFSYSTEM_DIRECT('member_transfer', bigintval(REQUEST_POST('to_uid')), bigintval(REQUEST_POST('points'))); // ... and add it to current user's used points SUB_POINTS('transfer', getUserId(), REQUEST_POST('points')); // First send email to recipient $msg = LOAD_EMAIL_TEMPLATE("member_transfer_recipient", '', constant('__RECIPIENT_UID')); - SEND_EMAIL(constant('__RECIPIENT_EMAIL'), getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ').": ".$SENDER, $msg); + sendEmail(constant('__RECIPIENT_EMAIL'), getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ').": ".$SENDER, $msg); // Second send email to sender $msg = LOAD_EMAIL_TEMPLATE("member_transfer_sender", '', constant('__SENDER_UID')); - SEND_EMAIL(constant('__SENDER_EMAIL'), getMessage('TRANSFER_MEMBER_SENDER_SUBJ').": ".$RECIPIENT, $msg); + sendEmail(constant('__SENDER_EMAIL'), getMessage('TRANSFER_MEMBER_SENDER_SUBJ').": ".$RECIPIENT, $msg); // At last send admin mail(s) $ADMIN_SUBJ = sprintf("%s (%s->%s)", getMessage('TRANSFER_ADMIN_SUBJECT'), $SENDER, $RECIPIENT); - SEND_ADMIN_NOTIFICATION($ADMIN_SUBJ, "admin_transfer_points"); + sendAdminNotification($ADMIN_SUBJ, "admin_transfer_points"); // Transfer is completed LOAD_TEMPLATE('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED')."
{--TRANSFER_CONTINUE_OVERVIEW--}"); @@ -232,11 +232,11 @@ case "new": // Start new transfer // Load member list if (EXT_IS_ACTIVE('nickname')) { // Load userid and nickname - $result = SQL_QUERY_ESC("SELECT userid, nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid", + $result = SQL_QUERY_ESC("SELECT userid, nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY `userid` ASC", array(getUserId()), __FILE__, __LINE__); } else { // Load only userid - $result = SQL_QUERY_ESC("SELECT userid, userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid", + $result = SQL_QUERY_ESC("SELECT userid, userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY `userid` ASC", array(getUserId()), __FILE__, __LINE__); } @@ -302,7 +302,7 @@ case "new": // Start new transfer case "list_in": // List only incoming transactions case "list_out": // List only outgoing transactions // As you can see I put list_in and list_out together. I now do a switch() again on it for the right SQL command - switch ($MODE) + switch ($mode) { case "list_in": $sql = "SELECT trans_id, from_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s ORDER BY time_trans DESC LIMIT ".getConfig('transfer_max'); @@ -329,16 +329,16 @@ case "list_out": // List only outgoing transactions // @TODO This should be somehow rewritten to $content = SQL_FETCHARRAY(), see switch() block above for SQL queries while (list($tid, $uid, $points, $reason, $stamp) = SQL_FETCHROW($result)) { // Rewrite points - if ($type == "OUT") $points = $points."-"; + if ($type == "OUT") $points = $points.'-'; // Prepare content for template $content = array( 'sw' => $SW, 'tid' => $id, - 'stamp' => MAKE_DATETIME($stamp, "3"), + 'stamp' => generateDateTime($stamp, "3"), 'uid' => $uid, 'reason' => $reason, - 'points' => TRANSLATE_COMMA($points) + 'points' => translateComma($points) ); // Load row template @@ -421,12 +421,12 @@ array(getUserId(), getConfig('transfer_max')), __FILE__, __LINE__); $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Rewrite points - if ($content['trans_type'] == "OUT") $content['points'] = "-".$content['points'].""; + if ($content['trans_type'] == "OUT") $content['points'] = '-'.$content['points'].""; // Prepare content for template $content['sw'] = $SW; - $content['time'] = MAKE_DATETIME($content['time_trans'], "3"); - $content['points'] = TRANSLATE_COMMA($content['points']); + $content['time'] = generateDateTime($content['time_trans'], "3"); + $content['points'] = translateComma($content['points']); // Load row template $OUT .= LOAD_TEMPLATE("member_transfer_row", true, $content); @@ -532,7 +532,7 @@ case "": // Overview page // Check for latest out-transfers $result = SQL_QUERY_ESC("SELECT time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` -WHERE time_trans > (UNIX_TIMESTAMP() - %s) AND userid=%s +WHERE time_trans > (UNIX_TIMESTAMP() - %s) AND `userid`=%s ORDER BY time_trans DESC LIMIT 1", array(getConfig('transfer_timeout'), getUserId()), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 0) { @@ -542,12 +542,13 @@ LIMIT 1", array(getConfig('transfer_timeout'), getUserId()), __FILE__, __LINE__) // Load newest transaction list($newest) = SQL_FETCHROW($result); SQL_FREERESULT($result); - define('__TRANSFER_SETTINGS_CONTENT', sprintf(getMessage('TRANSFER_LATEST_IS'), MAKE_DATETIME($newest, "3"))); + define('__TRANSFER_SETTINGS_CONTENT', sprintf(getMessage('TRANSFER_LATEST_IS'), generateDateTime($newest, "3"))); } // Load template LOAD_TEMPLATE("member_transfer_overview"); break; } + // ?>