| Index: trunk/extensions/DonationInterface/gateway_common/DonationData.php |
| — | — | @@ -27,9 +27,9 @@ |
| 28 | 28 | $this->populateData_Test(); |
| 29 | 29 | } else { |
| 30 | 30 | $this->normalized = array( |
| 31 | | - 'amount' => $wgRequest->getText( 'amount' ), |
| 32 | | - 'amountGiven' => $wgRequest->getText( 'amountGiven' ), |
| 33 | | - 'amountOther' => $wgRequest->getText( 'amountOther' ), |
| | 31 | + 'amount' => $wgRequest->getText( 'amount', null ), |
| | 32 | + 'amountGiven' => $wgRequest->getText( 'amountGiven', null ), |
| | 33 | + 'amountOther' => $wgRequest->getText( 'amountOther', null ), |
| 34 | 34 | 'email' => $wgRequest->getText( 'emailAdd' ), |
| 35 | 35 | 'fname' => $wgRequest->getText( 'fname' ), |
| 36 | 36 | 'mname' => $wgRequest->getText( 'mname' ), |
| — | — | @@ -59,14 +59,14 @@ |
| 60 | 60 | 'cvv' => $wgRequest->getText( 'cvv' ), |
| 61 | 61 | 'currency' => $wgRequest->getVal( 'currency_code' ), |
| 62 | 62 | 'payment_method' => $wgRequest->getText( 'payment_method', 'cc' ), |
| 63 | | - 'payment_submethod' => $wgRequest->getVal( 'payment_submethod' ), // Used by GlobalCollect for payment types |
| | 63 | + 'payment_submethod' => $wgRequest->getText( 'payment_submethod', null ), // Used by GlobalCollect for payment types |
| 64 | 64 | 'issuer_id' => $wgRequest->getText( 'issuer_id' ), |
| 65 | | - 'order_id' => $wgRequest->getVal( 'order_id' ), //as far as I know, this won't actually ever pull anything back. This does get pulled back on processing credit cards. 2011-11-04 |
| 66 | | - 'i_order_id' => $wgRequest->getVal( 'i_order_id' ), //internal id for each contribution attempt |
| | 65 | + 'order_id' => $wgRequest->getText( 'order_id', null ), //as far as I know, this won't actually ever pull anything back. |
| | 66 | + 'i_order_id' => $wgRequest->getText( 'i_order_id', null ), //internal id for each contribution attempt |
| 67 | 67 | 'numAttempt' => $wgRequest->getVal( 'numAttempt', '0' ), |
| 68 | 68 | 'referrer' => ( $wgRequest->getVal( 'referrer' ) ) ? $wgRequest->getVal( 'referrer' ) : $wgRequest->getHeader( 'referer' ), |
| 69 | 69 | 'utm_source' => $wgRequest->getText( 'utm_source' ), |
| 70 | | - 'utm_source_id' => $wgRequest->getVal( 'utm_source_id' ), |
| | 70 | + 'utm_source_id' => $wgRequest->getVal( 'utm_source_id', null ), |
| 71 | 71 | 'utm_medium' => $wgRequest->getText( 'utm_medium' ), |
| 72 | 72 | 'utm_campaign' => $wgRequest->getText( 'utm_campaign' ), |
| 73 | 73 | // try to honor the user-set language (uselang), otherwise the language set in the URL (language) |
| — | — | @@ -76,27 +76,27 @@ |
| 77 | 77 | 'email-opt' => $wgRequest->getText( 'email-opt' ), |
| 78 | 78 | // test_string has been disabled - may no longer be needed. |
| 79 | 79 | //'test_string' => $wgRequest->getText( 'process' ), // for showing payflow string during testing |
| 80 | | - '_cache_' => $wgRequest->getVal( '_cache_' ), |
| 81 | | - 'token' => $wgRequest->getVal( 'token' ), |
| | 80 | + '_cache_' => $wgRequest->getText( '_cache_', null ), |
| | 81 | + 'token' => $wgRequest->getText( 'token', null ), |
| 82 | 82 | 'contribution_tracking_id' => $wgRequest->getText( 'contribution_tracking_id' ), |
| 83 | 83 | 'data_hash' => $wgRequest->getText( 'data_hash' ), |
| 84 | 84 | 'action' => $wgRequest->getText( 'action' ), |
| 85 | 85 | 'gateway' => $wgRequest->getText( 'gateway' ), //likely to be reset shortly by setGateway(); |
| 86 | | - 'owa_session' => $wgRequest->getVal( 'owa_session' ), |
| 87 | | - 'owa_ref' => $wgRequest->getVal( 'owa_ref' ), |
| | 86 | + 'owa_session' => $wgRequest->getText( 'owa_session', null ), |
| | 87 | + 'owa_ref' => $wgRequest->getText( 'owa_ref', null ), |
| 88 | 88 | |
| 89 | | - 'account_name' => $wgRequest->getText( 'account_name' ), |
| 90 | | - 'account_number' => $wgRequest->getText( 'account_number' ), |
| 91 | | - 'authorization_id' => $wgRequest->getText( 'authorization_id' ), |
| 92 | | - 'bank_check_digit' => $wgRequest->getText( 'bank_check_digit' ), |
| 93 | | - 'bank_name' => $wgRequest->getText( 'bank_name' ), |
| 94 | | - 'bank_code' => $wgRequest->getText( 'bank_code' ), |
| 95 | | - 'branch_code' => $wgRequest->getText( 'branch_code' ), |
| 96 | | - 'country_code_bank' => $wgRequest->getText( 'country_code_bank' ), |
| 97 | | - 'date_collect' => $wgRequest->getText( 'date_collect' ), |
| 98 | | - 'direct_debit_text' => $wgRequest->getText( 'direct_debit_text' ), |
| 99 | | - 'iban' => $wgRequest->getText( 'iban' ), |
| 100 | | - 'transaction_type' => $wgRequest->getText( 'transaction_type' ), |
| | 89 | + 'account_name' => $wgRequest->getText( 'account_name', null ), |
| | 90 | + 'account_number' => $wgRequest->getText( 'account_number', null ), |
| | 91 | + 'authorization_id' => $wgRequest->getText( 'authorization_id', null ), |
| | 92 | + 'bank_check_digit' => $wgRequest->getText( 'bank_check_digit', null ), |
| | 93 | + 'bank_name' => $wgRequest->getText( 'bank_name', null ), |
| | 94 | + 'bank_code' => $wgRequest->getText( 'bank_code', null ), |
| | 95 | + 'branch_code' => $wgRequest->getText( 'branch_code', null ), |
| | 96 | + 'country_code_bank' => $wgRequest->getText( 'country_code_bank', null ), |
| | 97 | + 'date_collect' => $wgRequest->getText( 'date_collect', null ), |
| | 98 | + 'direct_debit_text' => $wgRequest->getText( 'direct_debit_text', null ), |
| | 99 | + 'iban' => $wgRequest->getText( 'iban', null ), |
| | 100 | + 'transaction_type' => $wgRequest->getText( 'transaction_type', null ), |
| 101 | 101 | ); |
| 102 | 102 | if ( !$wgRequest->wasPosted() ) { |
| 103 | 103 | $this->setVal( 'posted', false ); |