X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=923ef52a4e03941842fe1b31bd65eba52fa596f2;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hp=95b17b72f8226ed192cfd5e276c2d2408e67d4f9;hpb=452578b5bf17d14099ee44956deb4e4dc0832874;p=mailer.git diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 95b17b72f8..923ef52a4e 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -10,10 +10,10 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Punktetransfers * * -------------------------------------------------------------------- * - * $Revision:: 856 $ * - * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ * + * $Revision:: $ * + * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * - * $Author:: stelzi $ * + * $Author:: $ * * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * @@ -38,17 +38,17 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); } elseif (!IS_MEMBER()) { - LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("transfer")) && (!IS_ADMIN())) { - addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "transfer"); + redirectToUrl('modules.php?module=index'); +} elseif ((!EXT_IS_ACTIVE('transfer')) && (!IS_ADMIN())) { + addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'transfer')); return; } // Add description as navigation point -ADD_DESCR("member", __FILE__); +ADD_DESCR('member', __FILE__); // Load data $result = SQL_QUERY_ESC("SELECT opt_in FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", @@ -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 @@ -97,14 +97,14 @@ case "new": // Start new transfer $valid_recipient = (REQUEST_POST('to_uid') > 0); // Check for nickname extension and set additional data - $nick = false; $ADD = ", userid"; - if (EXT_IS_ACTIVE("nickname")) { - $ADD = ", nickname"; + $nick = false; $add = ", userid"; + if (EXT_IS_ACTIVE('nickname')) { + $add = ", nickname"; $nick = true; } // 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", + $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(getUserId(), bigintval(REQUEST_POST('to_uid'))), __FILE__, __LINE__); $valid_data = (SQL_NUMROWS($result) == 2); @@ -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,61 +182,61 @@ 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')); + 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); + $msg = LOAD_EMAIL_TEMPLATE("member_transfer_recipient", '', constant('__RECIPIENT_UID')); + 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); + $msg = LOAD_EMAIL_TEMPLATE("member_transfer_sender", '', constant('__SENDER_UID')); + 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--}"); + 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'); } } if (!IS_FORM_SENT()) { // Load member list - if (EXT_IS_ACTIVE("nickname")) { + 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__); } @@ -247,7 +247,7 @@ case "new": // Start new transfer // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries while (list($uid, $nick) = SQL_FETCHROW($result)) { $OUT .= "