X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=d13f4f82868d216a6997355bd506d0d9d4b4f9b3;hb=414570c5081d337bb6c28dcf521bd8bca02f69e7;hp=34eb22df63300a0812a1e48e9b471ae3d347c1b6;hpb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;p=mailer.git diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 34eb22df63..d13f4f8286 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Punktetransfers * * -------------------------------------------------------------------- * - * * + * $Revision:: 856 $ * + * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: stelzi $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -72,7 +77,7 @@ case "new": // Start new transfer // Add new transfer if (getConfig('transfer_code') > 0) { // Check for code - $code = GEN_RANDOM_CODE(getConfig('transfer_code'), REQUEST_POST('code_chk'), $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE')); + $code = generateRandomCodde(getConfig('transfer_code'), REQUEST_POST('code_chk'), $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE')); $valid_code = ($code == REQUEST_POST('code')); } else { // Zero length (= disabled) is always valid! @@ -108,36 +113,37 @@ case "new": // Start new transfer list($uid1, $gender1, $sname1, $fname1, $email1, $nick1) = SQL_FETCHROW($result); list($uid2, $gender2, $sname2, $fname2, $email2, $nick2) = SQL_FETCHROW($result); SQL_FREERESULT($result); + // @TODO Rewrite all these constants to array elements if ($uid1 == $GLOBALS['userid']) { // Data row 1 is sender's data - define('__SENDER_GENDER' , TRANSLATE_GENDER($gender1)); - define('__SENDER_NICK' , $nick1); - define('__SENDER_SNAME' , $sname1); - define('__SENDER_FNAME' , $fname1); - define('__SENDER_EMAIL' , $email1); + 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_GENDER' , TRANSLATE_GENDER($gender2)); - define('__RECIPIENT_NICK' , $nick2); - define('__RECIPIENT_SNAME', $sname2); - define('__RECIPIENT_FNAME', $fname2); - define('__RECIPIENT_EMAIL', $email2); + define('__RECIPIENT_GENDER', TRANSLATE_GENDER($gender2)); + define('__RECIPIENT_NICK' , $nick2); + define('__RECIPIENT_SNAME' , $sname2); + define('__RECIPIENT_FNAME' , $fname2); + define('__RECIPIENT_EMAIL' , $email2); // Prepare variables for testing $TEST_NICK_SENDER = $nick1; $TEST_NICK_REC = $nick2; } else { // Data row 2 is sender's data - define('__SENDER_GENDER' , TRANSLATE_GENDER($gender2)); - define('__SENDER_NICK' , $nick2); - define('__SENDER_SNAME' , $sname2); - define('__SENDER_FNAME' , $fname2); - define('__SENDER_EMAIL' , $email2); + 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_GENDER' , TRANSLATE_GENDER($gender1)); - define('__RECIPIENT_NICK' , $nick1); - define('__RECIPIENT_SNAME', $sname1); - define('__RECIPIENT_FNAME', $fname1); - define('__RECIPIENT_EMAIL', $email1); + define('__RECIPIENT_GENDER', TRANSLATE_GENDER($gender1)); + define('__RECIPIENT_NICK' , $nick1); + define('__RECIPIENT_SNAME' , $sname1); + define('__RECIPIENT_FNAME' , $fname1); + define('__RECIPIENT_EMAIL' , $email1); // Prepare variables for testing $TEST_NICK_SENDER = $nick2; @@ -148,15 +154,15 @@ case "new": // Start new transfer define('__SENDER_UID' , $GLOBALS['userid']); define('__RECIPIENT_UID' , REQUEST_POST('to_uid')); - $SENDER = __SENDER_UID; - $RECIPIENT = __RECIPIENT_UID; + $SENDER = constant('__SENDER_UID'); + $RECIPIENT = constant('__RECIPIENT_UID'); if ($nick) { - if (($TEST_NICK_SENDER != __SENDER_UID) && (!empty($TEST_NICK_SENDER))) { - $SENDER = __SENDER_NICK; + if (($TEST_NICK_SENDER != constant('__SENDER_UID')) && (!empty($TEST_NICK_SENDER))) { + $SENDER = constant('__SENDER_NICK'); } - if (($TEST_NICK_REC != __RECIPIENT_UID) && (!empty($TEST_NICK_REC))) { - $RECIPIENT = __RECIPIENT_NICK; + if (($TEST_NICK_REC != constant('__RECIPIENT_UID')) && (!empty($TEST_NICK_REC))) { + $RECIPIENT = constant('__RECIPIENT_NICK'); } } @@ -165,7 +171,7 @@ case "new": // Start new transfer define('__TRANSFER_EXPIRES', CREATE_FANCY_TIME(getConfig('transfer_age'))); // Generate tranafer id - define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", mt_rand(0, 99999), $GLOBALS['userid'], REQUEST_POST('reason')))); + define('__TRANS_ID', bigintval(generateRandomCodde("10", mt_rand(0, 99999), $GLOBALS['userid'], REQUEST_POST('reason')))); // Add entries to both tables SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_transfers_in` (userid, from_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')", @@ -182,42 +188,42 @@ case "new": // Start new transfer SUB_POINTS("transfer", $GLOBALS['userid'], REQUEST_POST('points')); // First send email to recipient - $msg = LOAD_EMAIL_TEMPLATE("member_transfer_recipient", "", __RECIPIENT_UID); - SEND_EMAIL(__RECIPIENT_EMAIL, TRANSFER_MEMBER_RECIPIENT_SUBJ.": ".$SENDER, $msg); + $msg = LOAD_EMAIL_TEMPLATE("member_transfer_recipient", "", constant('__RECIPIENT_UID')); + SEND_EMAIL(constant('__RECIPIENT_EMAIL'), getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ').": ".$SENDER, $msg); // Second send email to sender - $msg = LOAD_EMAIL_TEMPLATE("member_transfer_sender", "", __SENDER_UID); - SEND_EMAIL(__SENDER_EMAIL, TRANSFER_MEMBER_SENDER_SUBJ.": ".$RECIPIENT, $msg); + $msg = LOAD_EMAIL_TEMPLATE("member_transfer_sender", "", constant('__SENDER_UID')); + SEND_EMAIL(constant('__SENDER_EMAIL'), getMessage('TRANSFER_MEMBER_SENDER_SUBJ').": ".$RECIPIENT, $msg); // At last send admin mail(s) - $ADMIN_SUBJ = sprintf("%s (%s->%s)", TRANSFER_ADMIN_SUBJECT, $SENDER, $RECIPIENT); + $ADMIN_SUBJ = sprintf("%s (%s->%s)", getMessage('TRANSFER_ADMIN_SUBJECT'), $SENDER, $RECIPIENT); SEND_ADMIN_NOTIFICATION($ADMIN_SUBJ, "admin_transfer_points"); // Transfer is completed - LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."
".TRANSFER_CONTINUE_OVERVIEW.""); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('TRANSFER_COMPLETED')."
{--TRANSFER_CONTINUE_OVERVIEW--}"); } elseif (!$valid_code) { // Invalid Touring code! - LOAD_TEMPLATE("admin_settings_saved", false, "
".TRANSFER_INVALID_CODE."
"); + LOAD_TEMPLATE("admin_settings_saved", false, "
{--TRANSFER_INVALID_CODE--}
"); REQUEST_UNSET_POST('ok'); } elseif (!$valid_pass) { // Wrong password entered - LOAD_TEMPLATE("admin_settings_saved", false, "
".TRANSFER_INVALID_PASSWORD."
"); + LOAD_TEMPLATE("admin_settings_saved", false, "
{--TRANSFER_INVALID_PASSWORD--}
"); REQUEST_UNSET_POST('ok'); } elseif (!$valid_amount) { // Too much points entered - LOAD_TEMPLATE("admin_settings_saved", false, "
".TRANSFER_INVALID_POINTS."
"); + LOAD_TEMPLATE("admin_settings_saved", false, "
{--TRANSFER_INVALID_POINTS--}
"); REQUEST_UNSET_POST('ok'); } elseif (!$valid_reason) { // No transfer reason entered - LOAD_TEMPLATE("admin_settings_saved", false, "
".TRANSFER_INVALID_REASON."
"); + LOAD_TEMPLATE("admin_settings_saved", false, "
{--TRANSFER_INVALID_REASON--}
"); REQUEST_UNSET_POST('ok'); } elseif (!$valid_recipient) { // No recipient selected - LOAD_TEMPLATE("admin_settings_saved", false, "
".TRANSFER_INVALID_RECIPIENT."
"); + LOAD_TEMPLATE("admin_settings_saved", false, "
{--TRANSFER_INVALID_RECIPIENT--}
"); REQUEST_UNSET_POST('ok'); } elseif (!$valid_data) { // No recipient selected - LOAD_TEMPLATE("admin_settings_saved", false, "
".TRANSFER_INVALID_DATA."
"); + LOAD_TEMPLATE("admin_settings_saved", false, "
{--TRANSFER_INVALID_DATA--}
"); REQUEST_UNSET_POST('ok'); } } @@ -237,9 +243,10 @@ case "new": // Start new transfer if (SQL_NUMROWS($result) > 0) { // Load list $OUT = " ".$img); } else { @@ -298,44 +305,46 @@ case "list_out": // List only outgoing transactions 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'); - $NOTHING = TRANSFER_NO_INCOMING_TRANSFERS; - define('__TRANSFER_SUM', TRANSFER_TOTAL_INCOMING); - define('__TRANSFER_TITLE', TRANSFER_LIST_INCOMING); + $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'); + // @TODO Rewrite these constants + $NOTHING = getMessage('TRANSFER_NO_INCOMING_TRANSFERS'); + define('__TRANSFER_SUM', getMessage('TRANSFER_TOTAL_INCOMING')); + define('__TRANSFER_TITLE', getMessage('TRANSFER_LIST_INCOMING')); break; case "list_out": - $SQL = "SELECT trans_id, to_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s ORDER BY time_trans DESC LIMIT ".getConfig('transfer_max'); - $NOTHING = TRANSFER_NO_OUTGOING_TRANSFERS; - define('__TRANSFER_SUM', TRANSFER_TOTAL_OUTGOING); - define('__TRANSFER_TITLE', TRANSFER_LIST_OUTGOING); + $sql = "SELECT trans_id, to_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s ORDER BY time_trans DESC LIMIT ".getConfig('transfer_max'); + // @TODO Rewrite these constants + $NOTHING = getMessage('TRANSFER_NO_OUTGOING_TRANSFERS'); + define('__TRANSFER_SUM', getMessage('TRANSFER_TOTAL_OUTGOING')); + define('__TRANSFER_TITLE', getMessage('TRANSFER_LIST_OUTGOING')); break; } // Run the SQL command $total = 0; - $result = SQL_QUERY_ESC($SQL, array($GLOBALS['userid']), __FILE__, __LINE__); + $result = SQL_QUERY_ESC($sql, array($GLOBALS['userid']), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { $OUT = ""; $SW = 2; + // @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)) { - if ($type == "OUT") $points = "$points-"; - $OUT .= " - -
".$tid."
- - -
".MAKE_DATETIME($stamp, "3")."
- - -
".$uid."
- - -
".$reason."
- - -
".$points."
- -\n"; + // Rewrite points + if ($type == "OUT") $points = $points."-"; + + // Prepare content for template + $content = array( + 'sw' => $SW, + 'tid' => $id, + 'stamp' => MAKE_DATETIME($stamp, "3"), + 'uid' => $uid, + 'reason' => $reason, + 'points' => TRANSLATE_COMMA($points) + ); + + // Load row template + $OUT .= LOAD_TEMPLATE("member_transfer_row2", true, $content); + + // Add points and switch color $total += $points; $SW = 3 - $SW; } @@ -352,6 +361,7 @@ case "list_out": // List only outgoing transactions } // ... and add them to a constant for the template + // @TODO Rewrite these constants define('__TRANSFER_ROWS', $OUT); // Remeber total amount @@ -403,29 +413,26 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__); $total = 0; if (SQL_NUMROWS($result) > 0) { + // Search for entries + $result = SQL_QUERY("SELECT party_uid, trans_id, points, reason, time_trans, trans_type FROM `{!_MYSQL_PREFIX!}_transfers_tmp` ORDER BY time_trans DESC", + __FILE__, __LINE__); + // Output rows $OUT = ""; $SW = 2; - $result = SQL_QUERY("SELECT party_uid, trans_id, points, reason, time_trans, trans_type FROM `{!_MYSQL_PREFIX!}_transfers_tmp` ORDER BY time_trans DESC", __FILE__, __LINE__); - while (list($uid, $idx, $points, $reason, $stamp, $type) = SQL_FETCHROW($result)) { - if ($type == "OUT") $points = "-$points"; - $OUT .= " - -
".$idx."
- - -
".MAKE_DATETIME($stamp, "3")."
- - -
".$uid."
- - -
".$reason."
- - -
".$points."
- -\n"; - $total += $points; + while ($content = SQL_FETCHARRAY($result)) { + // Rewrite 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']); + + // Load row template + $OUT .= LOAD_TEMPLATE("member_transfer_row", true, $content); + + // Add points and switch color + $total += $content['points']; $SW = 3 - $SW; } @@ -435,22 +442,23 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__); // Nothing for in and out $OUT = " - ".LOAD_TEMPLATE("admin_settings_saved", true, TRANSFER_NO_INOUT_TRANSFERS)." + ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))." "; } // ... and add them to a constant for the template + // @TODO Rewrite all these constants define('__TRANSFER_ROWS', $OUT); // Remeber total amount define('__TRANSFER_TOTAL_VALUE', $total); // Set title - define('__TRANSFER_TITLE', TRANSFER_LIST_ALL); + define('__TRANSFER_TITLE', getMessage('TRANSFER_LIST_ALL')); // Set "balance" word - define('__TRANSFER_SUM', TRANSFER_TOTAL_BALANCE); + define('__TRANSFER_SUM', getMessage('TRANSFER_TOTAL_BALANCE')); // Load final template LOAD_TEMPLATE("member_transfer_list"); @@ -503,7 +511,7 @@ case "": // Overview page $opt_in = REQUEST_POST('opt_in'); // "Settings saved..." - LOAD_TEMPLATE("admin_settings_saved", false, "
".SETTINGS_SAVED."
"); + LOAD_TEMPLATE("admin_settings_saved", false, "
{--SETTINGS_SAVED--}
"); } switch ($opt_in) @@ -511,13 +519,13 @@ case "": // Overview page case "Y": define('__TRANSFER_ALLOW_Y', " checked=\"checked\""); define('__TRANSFER_ALLOW_N', ""); - define('__TRANSFER_NEW_LINK', "".TRANSFER_NOW_LINK.""); + define('__TRANSFER_NEW_LINK', "{--TRANSFER_NOW_LINK--}"); break; case "N": define('__TRANSFER_ALLOW_Y', ""); define('__TRANSFER_ALLOW_N', " checked=\"checked\""); - define('__TRANSFER_NEW_LINK', TRANSFER_PLEASE_ALLOW_OPT_IN); + define('__TRANSFER_NEW_LINK', getMessage('TRANSFER_PLEASE_ALLOW_OPT_IN')); break; } @@ -534,7 +542,7 @@ LIMIT 1", array(getConfig('transfer_timeout'), $GLOBALS['userid']), __FILE__, __ // 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); + define('__TRANSFER_SETTINGS_CONTENT', sprintf(getMessage('TRANSFER_LATEST_IS'), MAKE_DATETIME($newest, "3"))); } // Load template