| Index: trunk/extensions/DonationInterface/paypal_gateway/paypal_gateway.php |
| — | — | @@ -23,6 +23,7 @@ |
| 24 | 24 | |
| 25 | 25 | // default variables that should be set in LocalSettings.php |
| 26 | 26 | $wgPaypalEmail = ''; |
| | 27 | +$wgPaypalUrl = 'http://wikimediafoundation.org/wiki/Special:ContributionTracking?'; |
| 27 | 28 | |
| 28 | 29 | /** |
| 29 | 30 | * Hooks required to interface with the donation extension (include <donate> on page) |
| — | — | @@ -75,13 +76,13 @@ |
| 76 | 77 | */ |
| 77 | 78 | function paypalGatewayPage( &$url ) { |
| 78 | 79 | // Business email address set in LocalSettings.php |
| 79 | | - global $wgPaypalEmail; |
| | 80 | + global $wgPaypalEmail, $wgPaypalUrl; |
| 80 | 81 | |
| 81 | 82 | // to go directly to Paypal, will be used for this extension in general |
| 82 | 83 | //$url['paypal'] = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=" . urlencode( $wgPaypalEmail ) . "&lc=US&no_note=1&no_shipping=1&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"; |
| 83 | 84 | |
| 84 | 85 | // specifically for Wikimedia, goes to processor page |
| 85 | | - $url['paypal'] = 'http://wikimediafoundation.org/wiki/Special:ContributionTracking?'; |
| | 86 | + $url['paypal'] = $wgPaypalUrl; |
| 86 | 87 | |
| 87 | 88 | return true; |
| 88 | 89 | } |
| Index: trunk/extensions/DonationInterface/donate_interface/donate_interface.php |
| — | — | @@ -355,7 +355,10 @@ |
| 356 | 356 | 'language' => $wgRequest->getText( 'language', 'en' ), |
| 357 | 357 | 'comment' => $wgRequest->getText( 'comment', '' ), |
| 358 | 358 | 'comment-option' => $wgRequest->getText( 'comment-option', '0' ), |
| 359 | | - 'email' => $wgRequest->getText( 'opt', '0' ), |
| | 359 | + 'email-opt' => $wgRequest->getText( 'email-opt', 0 ), |
| | 360 | + 'fname' => $wgRequest->getText( 'fname', null ), |
| | 361 | + 'lname' => $wgRequest->getText( 'lname', null ), |
| | 362 | + 'email' => $wgRequest->getText( 'email', null ), |
| 360 | 363 | ); |
| 361 | 364 | |
| 362 | 365 | // ask payment processor extensions for their URL/page title |