http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100178
Revision: 100178
Author: khorn
Date: 2011-10-18 22:30:24 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Merging the fundraising branch of DonationInterface back into trunk.
Had to fix the class names in the form classes, which also should have changed.
As this is a mid-merge commit, the extension will be broken until the merge is
completed.
Modified Paths:
--------------
trunk/extensions/DonationInterface/gateway_forms/Form.php
trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
trunk/extensions/DonationInterface/gateway_forms/RapidHtml.php
trunk/extensions/DonationInterface/gateway_forms/SingleColumn.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
trunk/extensions/DonationInterface/gateway_forms/TwoColumnPayPal.php
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter2.php
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
Modified: trunk/extensions/DonationInterface/gateway_forms/Form.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/Form.php 2011-10-18
22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/Form.php 2011-10-18
22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-abstract class PayflowProGateway_Form {
+abstract class Gateway_Form {
/**
* Defines if we are in test mode
@@ -277,7 +277,7 @@
* @return string The entire HTML select element for the state dropdown
list
*/
public function generateStateDropdown() {
- require_once( dirname( __FILE__ ) .
'/../includes/stateAbbreviations.inc' );
+ require_once( dirname( __FILE__ ) .
'/includes/stateAbbreviations.inc' );
$states = statesMenuXML();
Modified: trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_OneStepTwoColumn extends PayflowProGateway_Form {
+class Gateway_Form_OneStepTwoColumn extends Gateway_Form {
public $paypal = false; // true for paypal only version
public function __construct( &$form_data, &$form_errors, &$gateway ) {
Modified: trunk/extensions/DonationInterface/gateway_forms/RapidHtml.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/RapidHtml.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/RapidHtml.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_RapidHtml extends PayflowProGateway_Form {
+class Gateway_Form_RapidHtml extends Gateway_Form {
/**
* Full path of HTML form to load
@@ -88,7 +88,7 @@
if ( $country != '' ){
try{
$country_based = $wgRequest->getText( 'ffname',
'default' ) . '-' . $country;
- // set html-escaped filename.
+ // set html-escaped filename.
$this->set_html_file_path( htmlspecialchars(
$country_based ));
} catch ( MWException $mwe ) {
// country-specific file does not exist, set
html-escaped filename.
@@ -98,7 +98,7 @@
// set html-escaped filename.
$this->set_html_file_path( htmlspecialchars(
$wgRequest->getText( 'ffname', 'default' )));
}
-
+
// fix general form error messages so it's not an array of msgs
if ( is_array( $form_errors['general'] ) && count(
$form_errors['general'] ) ) {
$general_errors = "";
@@ -141,7 +141,7 @@
* This is a hack and should be replaced with something more
performant.
*/
$form = $html;
-
+
// handle form action
$form = str_replace( "@action", $this->getNoCacheAction(),
$form );
@@ -157,7 +157,7 @@
}
$form = str_replace( $token, $replace, $form );
}
-
+
// @fixme why do some errors have HTML in them
// replace errors|escape with escaped versions
$escape_error_tokens = array();
@@ -269,7 +269,7 @@
$this->html_file_path = $allowedForms[$file_name];
}
-
+
/**
* Load API js if this form needs to support cacheing
*/
@@ -277,6 +277,6 @@
global $wgRequest;
if ( $wgRequest->getText( '_cache_', false )) {
$this->loadApiJs();
- }
+}
}
}
Modified: trunk/extensions/DonationInterface/gateway_forms/SingleColumn.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/SingleColumn.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/SingleColumn.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_SingleColumn extends
PayflowProGateway_Form_TwoColumnLetter {
+class Gateway_Form_SingleColumn extends Gateway_Form_TwoColumnLetter {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnLetter extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnLetter extends Gateway_Form_OneStepTwoColumn {
public $paypal = false; // true for paypal only version
public function __construct( &$form_data, &$form_errors, &$gateway ) {
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnLetter2 extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnLetter2 extends Gateway_Form_OneStepTwoColumn {
public $paypal = false; // true for paypal only version
public function __construct( &$form_data, &$form_errors, &$gateway ) {
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnLetter3 extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnLetter3 extends Gateway_Form_OneStepTwoColumn {
public $paypal = false; // true for paypal only version
public function __construct( &$form_data, &$form_errors, &$gateway ) {
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnLetter4 extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnLetter4 extends Gateway_Form_OneStepTwoColumn {
public $paypal = false; // true for paypal only version
public function __construct( &$form_data, &$form_errors, &$gateway ) {
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnLetter5 extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnLetter5 extends Gateway_Form_OneStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnLetter6 extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnLetter6 extends Gateway_Form_OneStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnLetter7 extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnLetter7 extends Gateway_Form_OneStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoColumnPayPal.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoColumnPayPal.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoColumnPayPal.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoColumnPayPal extends
PayflowProGateway_Form_OneStepTwoColumn {
+class Gateway_Form_TwoColumnPayPal extends Gateway_Form_OneStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
parent::__construct( $form_data, $form_errors, $gateway );
}
Modified: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoStepTwoColumn extends PayflowProGateway_Form {
+class Gateway_Form_TwoStepTwoColumn extends Gateway_Form {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgOut;
@@ -14,7 +14,7 @@
global $wgOut;
$wgOut->addModules( 'pfp.form.core.placeholders' );
}
-
+
/**
* Required method for constructing the entire form
*
Modified:
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
2011-10-18 22:29:02 UTC (rev 100177)
+++ trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoStepTwoColumnLetter extends
PayflowProGateway_Form_TwoStepTwoColumn {
+class Gateway_Form_TwoStepTwoColumnLetter extends
Gateway_Form_TwoStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified:
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter2.php
===================================================================
---
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter2.php
2011-10-18 22:29:02 UTC (rev 100177)
+++
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter2.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoStepTwoColumnLetter2 extends
PayflowProGateway_Form_TwoStepTwoColumnLetter {
+class Gateway_Form_TwoStepTwoColumnLetter2 extends
Gateway_Form_TwoStepTwoColumnLetter {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified:
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
===================================================================
---
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
2011-10-18 22:29:02 UTC (rev 100177)
+++
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoStepTwoColumnLetter3 extends
PayflowProGateway_Form_TwoStepTwoColumn {
+class Gateway_Form_TwoStepTwoColumnLetter3 extends
Gateway_Form_TwoStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgExtensionAssetsPath;
@@ -28,27 +28,27 @@
if ( $( '#fname' ).val() == '') {
$( '#fname' ).css( 'color', '#999999' );
$( '#fname' ).val( '$first' );
- }
+ }
if ( $( '#lname' ).val() == '') {
$( '#lname' ).css( 'color', '#999999' );
$( '#lname' ).val( '$last' );
- }
+ }
if ( $( '#street' ).val() == '') {
$( '#street' ).css( 'color', '#999999' );
$( '#street' ).val( '$street' );
- }
+ }
if ( $( '#city' ).val() == '' ) {
$( '#city' ).css( 'color', '#999999' );
$( '#city' ).val( '$city' );
- }
+ }
if ( $( '#zip' ).val() =='') {
$( '#zip' ).css( 'color', '#999999' );
$( '#zip' ).val( '$zip' );
- }
+ }
if ( $( '#emailAdd' ).val() == '') {
$( '#emailAdd' ).css( 'color', '#999999' );
$( '#emailAdd' ).val( '$email' );
- }
+ }
});
})(jQuery);
Modified:
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
===================================================================
---
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
2011-10-18 22:29:02 UTC (rev 100177)
+++
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoStepTwoColumnLetterCA extends
PayflowProGateway_Form_TwoStepTwoColumn {
+class Gateway_Form_TwoStepTwoColumnLetterCA extends
Gateway_Form_TwoStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified:
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
===================================================================
---
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
2011-10-18 22:29:02 UTC (rev 100177)
+++
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoStepTwoColumnPremium extends
PayflowProGateway_Form_TwoStepTwoColumn {
+class Gateway_Form_TwoStepTwoColumnPremium extends
Gateway_Form_TwoStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
Modified:
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
===================================================================
---
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
2011-10-18 22:29:02 UTC (rev 100177)
+++
trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
2011-10-18 22:30:24 UTC (rev 100178)
@@ -1,6 +1,6 @@
<?php
-class PayflowProGateway_Form_TwoStepTwoColumnPremiumUS extends
PayflowProGateway_Form_TwoStepTwoColumn {
+class Gateway_Form_TwoStepTwoColumnPremiumUS extends
Gateway_Form_TwoStepTwoColumn {
public function __construct( &$form_data, &$form_errors, &$gateway ) {
global $wgScriptPath;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
