X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=d13f4f82868d216a6997355bd506d0d9d4b4f9b3;hb=414570c5081d337bb6c28dcf521bd8bca02f69e7;hp=3f7c0308c7920e2de4c2d9aee51b01a8375f052d;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c;p=mailer.git
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 3f7c0308c7..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 *
@@ -38,7 +43,7 @@ if (!defined('__SECURITY')) {
} elseif (!IS_MEMBER()) {
LOAD_URL("modules.php?module=index");
} elseif ((!EXT_IS_ACTIVE("transfer")) && (!IS_ADMIN())) {
- addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "transfer");
+ addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "transfer");
return;
}
@@ -54,7 +59,7 @@ list($opt_in) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
$MODE = "";
-if (!empty($_GET['mode'])) $MODE = $_GET['mode'];
+if (REQUEST_ISSET_GET(('mode'))) $MODE = REQUEST_GET('mode');
// Check for "faker"
if (($opt_in == "N") && ($MODE == "new")) $MODE = "";
@@ -68,28 +73,28 @@ case "new": // Start new transfer
// Remember maximum value for template
define('__TRANSFER_MAX_VALUE', round($total - getConfig('transfer_balance') - 0.5));
- if (isset($_POST['ok'])) {
+ if (IS_FORM_SENT()) {
// Add new transfer
if (getConfig('transfer_code') > 0) {
// Check for code
- $code = GEN_RANDOM_CODE(getConfig('transfer_code'), $_POST['code_chk'], $GLOBALS['userid'], __TRANSFER_MAX_VALUE);
- $valid_code = ($code == $_POST['code']);
+ $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!
$valid_code = true;
}
// Test password
- $valid_pass = ($pass == generateHash($_POST['password'], $pass));
+ $valid_pass = ($pass == generateHash(REQUEST_POST('password'), $pass));
// Test transfer amount
- $valid_amount = ((!empty($_POST['points'])) && ($_POST['points'] <= __TRANSFER_MAX_VALUE));
+ $valid_amount = ((REQUEST_ISSET_POST(('points'))) && (REQUEST_POST('points') <= constant('__TRANSFER_MAX_VALUE')));
// Test reason for transfer
- $valid_reason = (!empty($_POST['reason']));
+ $valid_reason = (REQUEST_ISSET_POST(('reason')));
// Test if a recipient is selected
- $valid_recipient = ($_POST['to_uid'] > 0);
+ $valid_recipient = (REQUEST_POST('to_uid') > 0);
// Check for nickname extension and set additional data
$nick = false; $ADD = ", userid";
@@ -100,7 +105,7 @@ case "new": // Start new transfer
// Re-check receivers and own personal data
$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__);
+ array($GLOBALS['userid'], bigintval(REQUEST_POST('to_uid'))), __FILE__, __LINE__);
$valid_data = (SQL_NUMROWS($result) == 2);
if ($valid_code && $valid_pass && $valid_amount && $valid_reason && $valid_recipient) {
@@ -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;
@@ -146,83 +152,83 @@ case "new": // Start new transfer
// Sender's UID is always currently stored in cookie userid...
define('__SENDER_UID' , $GLOBALS['userid']);
- define('__RECIPIENT_UID' , $_POST['to_uid']);
+ 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');
}
}
// Remember transfer reason and fancy date/time in constants
- define('__TRANSFER_REASON', $_POST['reason']);
+ define('__TRANSFER_REASON', REQUEST_POST('reason'));
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'], $_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')",
- array(bigintval($_POST['to_uid']), $GLOBALS['userid'], bigintval($_POST['points']), $_POST['reason'], __TRANS_ID),
+ array(bigintval(REQUEST_POST('to_uid')), $GLOBALS['userid'], bigintval(REQUEST_POST('points')), REQUEST_POST('reason'), __TRANS_ID),
__FILE__, __LINE__);
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_transfers_out` (userid, to_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
- array($GLOBALS['userid'], bigintval($_POST['to_uid']), bigintval($_POST['points']), $_POST['reason'], __TRANS_ID),
+ array($GLOBALS['userid'], bigintval(REQUEST_POST('to_uid')), bigintval(REQUEST_POST('points')), REQUEST_POST('reason'), __TRANS_ID),
__FILE__, __LINE__);
// Add points to account *directly* ...
- ADD_POINTS_REFSYSTEM("member_transfer", bigintval($_POST['to_uid']), bigintval($_POST['points']), false, "0", false, "direct");
+ ADD_POINTS_REFSYSTEM("member_transfer", bigintval(REQUEST_POST('to_uid')), bigintval(REQUEST_POST('points')), false, "0", false, "direct");
// ... and add it to current user's used points
- SUB_POINTS("transfer", $GLOBALS['userid'], $_POST['points']);
+ 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, "