]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/member/what-transfer.php
A lot double-quotes rewritten to single-quotes, global fix for getMessage() calls
[mailer.git] / inc / modules / member / what-transfer.php
index 738ca29ba8fa0486ee7df1e45c708015f2d8d310..cb4ace1868daa811518ee723f83403282ee7c63a 100644 (file)
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Punktetransfers                                  *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                  *
 
 // 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");
+       LOAD_URL('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",
-       array($GLOBALS['userid']), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
 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
-       $total = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points")  - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
+       $total = GET_TOTAL_DATA(getUserId(), "user_points", "points")  - GET_TOTAL_DATA(getUserId(), "user_data", "used_points");
 
        // Remember maximum value for template
        define('__TRANSFER_MAX_VALUE', round($total - getConfig('transfer_balance') - 0.5));
@@ -72,7 +77,7 @@ case "new": // Start new transfer
                // Add new transfer
                if (getConfig('transfer_code') > 0) {
                        // Check for code
-                       $code = generateRandomCodde(getConfig('transfer_code'), REQUEST_POST('code_chk'), $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE'));
+                       $code = generateRandomCodde(getConfig('transfer_code'), REQUEST_POST('code_chk'), getUserId(), constant('__TRANSFER_MAX_VALUE'));
                        $valid_code = ($code == REQUEST_POST('code'));
                } else {
                        // Zero length (= disabled) is always valid!
@@ -92,15 +97,15 @@ 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",
-                       array($GLOBALS['userid'], bigintval(REQUEST_POST('to_uid'))), __FILE__, __LINE__);
+               $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);
 
                if ($valid_code && $valid_pass && $valid_amount && $valid_reason && $valid_recipient) {
@@ -109,7 +114,7 @@ case "new": // Start new transfer
                        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']) {
+                       if ($uid1 == getUserId()) {
                                // Data row 1 is sender's data
                                define('__SENDER_GENDER'   , TRANSLATE_GENDER($gender1));
                                define('__SENDER_NICK'     , $nick1);
@@ -146,7 +151,7 @@ case "new": // Start new transfer
                        }
 
                        // Sender's UID is always currently stored in cookie userid...
-                       define('__SENDER_UID'     , $GLOBALS['userid']);
+                       define('__SENDER_UID'     , getUserId());
                        define('__RECIPIENT_UID'  , REQUEST_POST('to_uid'));
 
                        $SENDER = constant('__SENDER_UID');
@@ -166,28 +171,28 @@ case "new": // Start new transfer
                        define('__TRANSFER_EXPIRES', CREATE_FANCY_TIME(getConfig('transfer_age')));
 
                        // Generate tranafer id
-                       define('__TRANS_ID', bigintval(generateRandomCodde("10", mt_rand(0, 99999), $GLOBALS['userid'], REQUEST_POST('reason'))));
+                       define('__TRANS_ID', bigintval(generateRandomCodde("10", mt_rand(0, 99999), getUserId(), 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(REQUEST_POST('to_uid')), $GLOBALS['userid'], bigintval(REQUEST_POST('points')), REQUEST_POST('reason'), __TRANS_ID),
+                               array(bigintval(REQUEST_POST('to_uid')), getUserId(), 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(REQUEST_POST('to_uid')), bigintval(REQUEST_POST('points')), REQUEST_POST('reason'), __TRANS_ID),
+                               array(getUserId(), 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(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'], 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'));
+                       $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", "", constant('__SENDER_UID'));
+                       $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)
@@ -195,53 +200,54 @@ case "new": // Start new transfer
                        SEND_ADMIN_NOTIFICATION($ADMIN_SUBJ, "admin_transfer_points");
 
                        // Transfer is completed
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('TRANSFER_COMPLETED')."<br /><a href=\"{!URL!}/modules.php?module=login&amp;what=transfer\">{--TRANSFER_CONTINUE_OVERVIEW--}</a>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED')."<br /><a href=\"{!URL!}/modules.php?module=login&amp;what=transfer\">{--TRANSFER_CONTINUE_OVERVIEW--}</a>");
                } elseif (!$valid_code) {
                        // Invalid Touring code!
-                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">{--TRANSFER_INVALID_CODE--}</div>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_note\">{--TRANSFER_INVALID_CODE--}</div>");
                        REQUEST_UNSET_POST('ok');
                } elseif (!$valid_pass) {
                        // Wrong password entered
-                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">{--TRANSFER_INVALID_PASSWORD--}</div>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_note\">{--TRANSFER_INVALID_PASSWORD--}</div>");
                        REQUEST_UNSET_POST('ok');
                } elseif (!$valid_amount) {
                        // Too much points entered
-                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">{--TRANSFER_INVALID_POINTS--}</div>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_note\">{--TRANSFER_INVALID_POINTS--}</div>");
                        REQUEST_UNSET_POST('ok');
                } elseif (!$valid_reason) {
                        // No transfer reason entered
-                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">{--TRANSFER_INVALID_REASON--}</div>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_note\">{--TRANSFER_INVALID_REASON--}</div>");
                        REQUEST_UNSET_POST('ok');
                } elseif (!$valid_recipient) {
                        // No recipient selected
-                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">{--TRANSFER_INVALID_RECIPIENT--}</div>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_note\">{--TRANSFER_INVALID_RECIPIENT--}</div>");
                        REQUEST_UNSET_POST('ok');
                } elseif (!$valid_data) {
                        // No recipient selected
-                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">{--TRANSFER_INVALID_DATA--}</div>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_note\">{--TRANSFER_INVALID_DATA--}</div>");
                        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",
-                        array($GLOBALS['userid']), __FILE__, __LINE__);
+                        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",
-                        array($GLOBALS['userid']), __FILE__, __LINE__);
+                        array(getUserId()), __FILE__, __LINE__);
                }
 
                if (SQL_NUMROWS($result) > 0) {
                        // Load list
                        $OUT  = "<select name=\"to_uid\" size=\"1\" class=\"member_select\">
-  <option value=\"0\">".SELECT_NONE."</option>\n";
+       <option value=\"0\">{--SELECT_NONE--}</option>\n";
+                       // @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 .= "<option value=\"".$uid."\"";
-                               if ((REQUEST_ISSET_POST(('to_uid'))) && (REQUEST_POST('to_uid') == $uid)) $OUT .= " selected=\"selected\"";
+                               $OUT .= "       <option value=\"".$uid."\"";
+                               if ((REQUEST_ISSET_POST(('to_uid'))) && (REQUEST_POST('to_uid') == $uid)) $OUT .= ' selected="selected"';
                                $OUT .= ">";
                                if (($nick != $uid) && (!empty($nick))) {
                                        // Output nickname
@@ -253,7 +259,7 @@ case "new": // Start new transfer
                                $OUT .= "</option>\n";
                        }
                        $OUT .= "</select>\n";
-                       define('__TRANSFER_TO_DISABLED', "");
+                       define('__TRANSFER_TO_DISABLED', '');
 
                        // Free memory
                        SQL_FREERESULT($result);
@@ -269,7 +275,7 @@ case "new": // Start new transfer
                // Generate Code
                if (getConfig('transfer_code') > 0) {
                        $rand = mt_rand(0, 99999);
-                       $code = generateRandomCodde(getConfig('transfer_code'), $rand, $GLOBALS['userid'], constant('__TRANSFER_MAX_VALUE'));
+                       $code = generateRandomCodde(getConfig('transfer_code'), $rand, getUserId(), constant('__TRANSFER_MAX_VALUE'));
                        $img = GENERATE_IMAGE($code, false);
                        define('__TRANSFER_IMAGE_INPUT', "<input type=\"hidden\" name=\"code_chk\" value=\"".$rand."\" /><input type=\"text\" name=\"code\" class=\"member_normal\" size=\"5\" maxlength=\"7\"{!__TRANSFER_TO_DISABLED!} />&nbsp;".$img);
                } else {
@@ -284,8 +290,8 @@ case "new": // Start new transfer
                        define('__TRANSFER_REASON_VALUE', strip_tags(REQUEST_POST('reason')));
                } else {
                        // Set empty values
-                       define('__TRANSFER_POINTS_VALUE', "");
-                       define('__TRANSFER_REASON_VALUE', "");
+                       define('__TRANSFER_POINTS_VALUE', '');
+                       define('__TRANSFER_REASON_VALUE', '');
                }
 
                // Output form
@@ -296,10 +302,11 @@ 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');
+               // @TODO Rewrite these constants
                $NOTHING = getMessage('TRANSFER_NO_INCOMING_TRANSFERS');
                define('__TRANSFER_SUM', getMessage('TRANSFER_TOTAL_INCOMING'));
                define('__TRANSFER_TITLE', getMessage('TRANSFER_LIST_INCOMING'));
@@ -307,6 +314,7 @@ case "list_out": // List only outgoing transactions
 
        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');
+               // @TODO Rewrite these constants
                $NOTHING = getMessage('TRANSFER_NO_OUTGOING_TRANSFERS');
                define('__TRANSFER_SUM', getMessage('TRANSFER_TOTAL_OUTGOING'));
                define('__TRANSFER_TITLE', getMessage('TRANSFER_LIST_OUTGOING'));
@@ -315,28 +323,28 @@ case "list_out": // List only outgoing transactions
 
        // Run the SQL command
        $total = 0;
-       $result = SQL_QUERY_ESC($sql, array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC($sql, array(getUserId()), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
-               $OUT = ""; $SW = 2;
+               $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 .= "<tr>
-  <td class=\"transfer_row1 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row1\">".$tid."</div>
-  </td>
-  <td class=\"transfer_row2 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row2\">".MAKE_DATETIME($stamp, "3")."</div>
-  </td>
-  <td class=\"transfer_row3 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row3\">".$uid."</div>
-  </td>
-  <td class=\"transfer_row4 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row4\">".$reason."</div>
-  </td>
-  <td class=\"transfer_row5 switch_sw".$SW." bottom2\">
-    <div class=\"transfer_row5\">".$points."</div>
-  </td>
-</tr>\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;
                }
@@ -347,12 +355,13 @@ case "list_out": // List only outgoing transactions
                // Nothing for in or out
                $OUT = "<tr>
   <td colspan=\"5\" align=\"center\" class=\"bottom2\" height=\"70\">
-    ".LOAD_TEMPLATE("admin_settings_saved", true, $NOTHING)."
+    ".LOAD_TEMPLATE('admin_settings_saved', true, $NOTHING)."
   </td>
 </tr>";
        }
 
        // ... and add them to a constant for the template
+       // @TODO Rewrite these constants
        define('__TRANSFER_ROWS', $OUT);
 
        // Remeber total amount
@@ -380,7 +389,7 @@ KEY(party_uid)
 
        // Let's begin with the incoming list
        $result = SQL_QUERY_ESC("SELECT trans_id, from_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s ORDER BY `id` LIMIT %s",
-array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
+array(getUserId(), getConfig('transfer_max')), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result)) {
                $DATA[] = "IN";
                $DATA = implode("','", $DATA);
@@ -392,7 +401,7 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
 
        // As the last table transfer data from outgoing table to temporary
        $result = SQL_QUERY_ESC("SELECT trans_id, to_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s ORDER BY `id` LIMIT %s",
-array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
+array(getUserId(), getConfig('transfer_max')), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result)) {
                $DATA[] = "OUT";
                $DATA = implode("','", $DATA);
@@ -404,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 .= "<tr>
-  <td class=\"transfer_row1 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row1\">".$idx."</div>
-  </td>
-  <td class=\"transfer_row2 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row2\">".MAKE_DATETIME($stamp, "3")."</div>
-  </td>
-  <td class=\"transfer_row3 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row3\">".$uid."</div>
-  </td>
-  <td class=\"transfer_row4 switch_sw".$SW." bottom2 right2\">
-    <div class=\"transfer_row4\">".$reason."</div>
-  </td>
-  <td class=\"transfer_row5 switch_sw".$SW." bottom2\">
-    <div class=\"transfer_row5\">".$points."</div>
-  </td>
-</tr>\n";
-                       $total += $points;
+               $OUT = ''; $SW = 2;
+               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;
                }
 
@@ -436,12 +442,13 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
                // Nothing for in and out
                $OUT = "<tr>
   <td colspan=\"5\" align=\"center\" class=\"bottom2\" height=\"70\">
-    ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))."
+    ".LOAD_TEMPLATE('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))."
   </td>
 </tr>";
        }
 
        // ... and add them to a constant for the template
+       // @TODO Rewrite all these constants
        define('__TRANSFER_ROWS', $OUT);
 
        // Remeber total amount
@@ -465,7 +472,7 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
 
 case "": // Overview page
        // Check incoming transfers
-       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s", array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s", array(getUserId()), __FILE__, __LINE__);
        list($dmy) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
@@ -477,7 +484,7 @@ case "": // Overview page
        }
 
        // Check outgoing transfers
-       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s", array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s", array(getUserId()), __FILE__, __LINE__);
        list($dmy) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
@@ -498,26 +505,26 @@ case "": // Overview page
        if (IS_FORM_SENT()) {
                // Save settings
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET opt_in='%s' WHERE userid=%s LIMIT 1",
-                       array(REQUEST_POST('opt_in'), $GLOBALS['userid']), __FILE__, __LINE__);
+                       array(REQUEST_POST('opt_in'), getUserId()), __FILE__, __LINE__);
 
                // Rember for next switch() command
                $opt_in = REQUEST_POST('opt_in');
 
                // "Settings saved..."
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_done\">{--SETTINGS_SAVED--}</div>");
+               LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_done\">{--SETTINGS_SAVED--}</div>");
        }
 
        switch ($opt_in)
        {
-       case "Y":
-               define('__TRANSFER_ALLOW_Y', " checked=\"checked\"");
-               define('__TRANSFER_ALLOW_N', "");
+       case 'Y':
+               define('__TRANSFER_ALLOW_Y', ' chkecked="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=\"checked\"");
+       case 'N':
+               define('__TRANSFER_ALLOW_Y', '');
+               define('__TRANSFER_ALLOW_N', ' chkecked="checked"');
                define('__TRANSFER_NEW_LINK', getMessage('TRANSFER_PLEASE_ALLOW_OPT_IN'));
                break;
        }
@@ -527,7 +534,7 @@ case "": // Overview page
 FROM `{!_MYSQL_PREFIX!}_user_transfers_out`
 WHERE time_trans > (UNIX_TIMESTAMP() - %s) AND userid=%s
 ORDER BY time_trans DESC
-LIMIT 1", array(getConfig('transfer_timeout'), $GLOBALS['userid']), __FILE__, __LINE__);
+LIMIT 1", array(getConfig('transfer_timeout'), getUserId()), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Load template
                define('__TRANSFER_SETTINGS_CONTENT', LOAD_TEMPLATE("member_transfer_settings", true));