Same thing fixed, but without the opps ...

[mailer.git] / inc / modules / member / what-transfer.php

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 98679b4a47c739d6277d868a05e9ceb0826da651..56a3b14ebe3b9d9ae82f99596d35f8b47ca2b18a 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -53,8 +53,8 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) {
 
 // Check for mode in GET
 $mode = '';
-if (isGetRequestElementSet('mode')) {
-       $mode = getRequestElement('mode');
+if (isGetRequestElementSet('do')) {
+       $mode = getRequestElement('do');
 } // END - if
 
 // Check for "faker"
@@ -161,8 +161,8 @@ switch ($mode) {
                                        ), __FILE__, __LINE__);
 
                                // Add points to account *directly* ...
-                               initReferalSystem();
-                               addPointsThroughReferalSystem('transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')));
+                               initReferralSystem();
+                               addPointsThroughReferralSystem('transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')));
 
                                // ... and add it to current user's used points and ignore return status
                                subtractPoints('transfer', getMemberId(), postRequestElement('points'));
@@ -225,7 +225,7 @@ switch ($mode) {
                                        if ((isPostRequestElementSet('to_userid')) && (postRequestElement('to_userid') == $userid)) {
                                                $OUT .= ' selected="selected"';
                                        } // END - if
-                                       $OUT .= '>' . $userid . ' ({%user,nickname,fixEmptyContentToDashes=' . $userid . '%})</option>';
+                                       $OUT .= '>{%template,DisplayUsername=' . $userid . '%}</option>';
                                } // END - while
                                $OUT .= '</select>';
                                $content['to_disabled'] = '';
@@ -281,14 +281,14 @@ switch ($mode) {
                $nothingMessage = '';
                switch ($mode) {
                        case 'list_in':
-                               $sql = 'SELECT `trans_id`,`from_userid` AS party_userid, `points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
+                               $sql = 'SELECT `trans_id`,`from_userid` AS party_userid,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
                                $nothingMessage     = '{--TRANSFER_NO_INCOMING_TRANSFERS--}';
                                $content['balance'] = '{--TRANSFER_TOTAL_INCOMING--}';
                                $content['title']   = '{--TRANSFER_LIST_INCOMING--}';
                                break;
 
                        case 'list_out':
-                               $sql = 'SELECT `trans_id`,`to_userid` AS party_userid, `points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
+                               $sql = 'SELECT `trans_id`,`to_userid` AS party_userid,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
                                $nothingMessage     = '{--TRANSFER_NO_OUTGOING_TRANSFERS--}';
                                $content['balance'] = '{--TRANSFER_TOTAL_OUTGOING--}';
                                $content['title']   = '{--TRANSFER_LIST_OUTGOING--}';
@@ -443,7 +443,7 @@ INDEX (`party_userid`)
                $totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
                $content['in_link'] = $totalIn;
                if ($totalIn > 0) {
-                       $content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_in%}">' . $totalIn . '</a>';
+                       $content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_in%}">' . $totalIn . '</a>';
                } // END - if
 
                // Check outgoing transfers
@@ -451,7 +451,7 @@ INDEX (`party_userid`)
 
                $content['out_link'] = $totalOut;
                if ($totalOut > 0) {
-                       $content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_out%}">' . $totalOut . '</a>';
+                       $content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_out%}">' . $totalOut . '</a>';
                } // END - if
 
                // Add all to total amount
@@ -460,7 +460,7 @@ INDEX (`party_userid`)
                // Total transactions
                $content['all_link'] = $total;
                if ($total > 0) {
-                       $content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
+                       $content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
                } // END - if
 
                if (isFormSent()) {
@@ -483,7 +483,7 @@ INDEX (`party_userid`)
                // Set 'new transfer' link according to above option
                switch (getUserData('opt_in')) {
                        case 'Y':
-                               $content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=new%}" title="{--TRANSFER_NOW_TITLE--}">{--TRANSFER_NOW_LINK--}</a>';
+                               $content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=new%}" title="{--TRANSFER_NOW_TITLE--}">{--TRANSFER_NOW_LINK--}</a>';
                                break;
 
                        case 'N':