Empty module added, 2 internal TODOs closed
[mailer.git] / inc / modules / member / what-transfer.php
index aad5bf37e2264d0ce4b92c8c92b96924e19162ce..b5b2ad477255d063c15f57abbf4acf313f994b77 100644 (file)
@@ -14,8 +14,6 @@
  * $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 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -62,7 +60,7 @@ if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = '';
 switch ($mode) {
        case 'new': // Start new transfer
                // Get total points and subtract the balance amount from it = maximum transferable points
-               $total = countSumTotalData(getMemberId(), 'user_points', 'points')  - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+               $total = getTotalPoints(getMemberId());
 
                // Remember maximum value for template
                $content['max_transferable'] = round($total - getConfig('transfer_balance') - 0.5);
@@ -125,7 +123,7 @@ switch ($mode) {
                                $TEST_NICK_REC    = $content['recipient']['nickname'];
 
                                // Default is userids for subject line
-                               $SENDER = getMemberId();
+                               $SENDER    = getMemberId();
                                $RECIPIENT = bigintval(postRequestParameter('to_userid'));
 
                                // If nickname is installed we can set the nickname
@@ -133,28 +131,28 @@ switch ($mode) {
                                if (isExtensionActive('nickname')) {
                                        if (($TEST_NICK_SENDER != getMemberId()) && (!empty($TEST_NICK_SENDER))) {
                                                $SENDER = $content['sender']['nickname'];
-                                       }
+                                       } // END - if
 
                                        if (($TEST_NICK_REC != postRequestParameter('to_userid')) && (!empty($TEST_NICK_REC))) {
                                                $RECIPIENT = $content['recipient']['nickname'];
-                                       }
+                                       } // END - if
                                } // END - if
 
                                // Remember transfer reason and fancy date/time in constants
                                $content['reason']  = secureString(postRequestParameter('reason'));
-                               $content['expires'] = createFancyTime(getConfig('transfer_age'));
+                               $content['expires'] = '{%config,createFancyTime=transfer_age%}';
 
                                // Generate tranafer id
                                $content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getMemberId(), postRequestParameter('reason')));
 
                                // Add entries to both tables
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
                                        array(bigintval(postRequestParameter('to_userid')), getMemberId(), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
                                        array(getMemberId(), bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
 
                                // Add points to account *directly* ...
-                               addPointsDirectly('member_transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
+                               addPointsDirectly('transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
 
                                // ... and add it to current user's used points
                                subtractPoints('transfer', getMemberId(), postRequestParameter('points'));
@@ -172,30 +170,30 @@ switch ($mode) {
                                sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
                                // Transfer is completed
-                               loadTemplate('admin_settings_saved', false, '{--TRANSFER_COMPLETED--}' . '<br /><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a>');
+                               loadTemplate('admin_settings_saved', false, '<div>{--TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
                        } elseif ($valid_code === false) {
                                // Invalid Touring code!
-                               loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_CODE--}</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}');
                                unsetPostRequestParameter('ok');
                        } elseif ($valid_pass === false) {
                                // Wrong password entered
-                               loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_PASSWORD--}</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_PASSWORD--}');
                                unsetPostRequestParameter('ok');
                        } elseif ($valid_amount === false) {
                                // Too much points entered
-                               loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_POINTS--}</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_POINTS--}');
                                unsetPostRequestParameter('ok');
                        } elseif ($valid_reason === false) {
                                // No transfer reason entered
-                               loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_REASON--}</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_REASON--}');
                                unsetPostRequestParameter('ok');
                        } elseif ($valid_recipient === false) {
                                // No recipient selected
-                               loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_RECIPIENT--}</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_RECIPIENT--}');
                                unsetPostRequestParameter('ok');
                        } elseif ($valid_data === false) {
                                // No recipient/sender selected
-                               loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_DATA--}</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_DATA--}');
                                unsetPostRequestParameter('ok');
                        }
 
@@ -217,13 +215,13 @@ switch ($mode) {
 
                        if (!SQL_HASZERONUMS($result)) {
                                // Load list
-                               $OUT  = "<select name=\"to_userid\" size=\"1\" class=\"member_select\">
-       <option value=\"0\">{--SELECT_NONE--}</option>\n";
+                               $OUT  = '<select name="to_userid" size="1" class="form_select">
+       <option value="0">{--SELECT_NONE--}</option>';
                                // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
                                while (list($userid, $nick) = SQL_FETCHROW($result)) {
-                                       $OUT .= "       <option value=\"".$userid."\"";
-                                       if ((isPostRequestParameterSet(('to_userid'))) && (postRequestParameter('to_userid') == $userid)) $OUT .= ' selected="selected"';
-                                       $OUT .= ">";
+                                       $OUT .= '       <option value="' . $userid . '"';
+                                       if ((isPostRequestParameterSet('to_userid')) && (postRequestParameter('to_userid') == $userid)) $OUT .= ' selected="selected"';
+                                       $OUT .= '>';
                                        if (($nick != $userid) && (!empty($nick))) {
                                                // Output nickname
                                                $OUT .= $nick;
@@ -231,9 +229,9 @@ switch ($mode) {
                                                // Output userid
                                                $OUT .= $userid;
                                        }
-                                       $OUT .= "</option>\n";
+                                       $OUT .= '</option>';
                                }
-                               $OUT .= "</select>\n";
+                               $OUT .= '</select>';
                                $content['to_disabled'] = '';
 
                                // Free memory
@@ -252,7 +250,7 @@ switch ($mode) {
                                $rand = mt_rand(0, 99999);
                                $code = generateRandomCode(getConfig('transfer_code'), $rand, getMemberId(), $content['max_transferable']);
                                $img = generateImageOrCode($code, false);
-                               $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="member_normal" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
+                               $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
                        } else {
                                $code = '00000';
                                $content['captcha_code'] = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_CODE--}');
@@ -301,44 +299,38 @@ switch ($mode) {
                // Do we have entries?
                if (!SQL_HASZERONUMS($result)) {
                        $OUT = '';
-                       // @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
-                       while (list($tid, $userid, $points, $reason, $stamp) = SQL_FETCHROW($result)) {
-                               // Rewrite points
-                               if ($type == 'OUT') $points = $points . '-';
+                       while ($content = SQL_FETCHARRAY($result)) {
+                               // Rewrite points, out is subtracted
+                               if ($type == 'OUT') {
+                                       $content['points'] = $content['points'] * -1;
+                               } // END - if
 
                                // Prepare content for template
-                               // @TODO Rewrite: tid->trans_id,stamp->time_trans
-                               $row = array(
-                                       'trans_id' => $tid,
-                                       'stamp'    => generateDateTime($stamp, 3),
-                                       'userid'   => $userid,
-                                       'reason'   => $reason,
-                                       'points'   => $points
-                               );
+                               $$content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
                                // Load row template
-                               $OUT .= loadTemplate('member_transfer_row2', true, $row);
+                               $OUT .= loadTemplate('member_transfer_row2', true, $content);
 
                                // Add points and switch color
-                               $totalPoints += $points;
+                               $totalPoints += $content['points'];
                        } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);
                } else {
                        // Nothing for in or out
-                       $OUT = "<tr>
-  <td colspan=\"5\" align=\"center\" class=\"bottom\">
-    ".loadTemplate('admin_settings_saved', true, $nothingMessage)."
+                       $OUT = '<tr>
+  <td colspan="5" align="center" class="bottom">
+    ' . loadTemplate('admin_settings_saved', true, $nothingMessage) . '
   </td>
-</tr>";
+</tr>';
                }
 
                // ... and add them to a constant for the template
                $content['rows'] = $OUT;
 
                // Remeber total amount
-               $content['total'] = translateComma($totalPoints);
+               $content['total'] = $totalPoints;
 
                // Load final template
                loadTemplate('member_transfer_list', false, $content);
@@ -398,7 +390,6 @@ KEY (`party_userid`)
 
                                // Prepare content for template
                                $content['time']   = generateDateTime($content['time_trans'], 3);
-                               $content['points'] = translateComma($content['points']);
 
                                // Load row template
                                $OUT .= loadTemplate('member_transfer_row', true, $content);
@@ -422,7 +413,7 @@ KEY (`party_userid`)
                $content['rows'] =  $OUT;
 
                // Remeber total amount
-               $content['total'] = translateComma($total);
+               $content['total'] = $total;
 
                // Set title
                $content['title'] = '{--TRANSFER_LIST_ALL--}';
@@ -471,7 +462,7 @@ KEY (`party_userid`)
                                array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
 
                        // "Settings saved..."
-                       loadTemplate('admin_settings_saved', false, '<div class="member_done">{--SETTINGS_SAVED--}</div>');
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
                } // END - if
 
                // Init entries