r100185 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r100184‎ | r100185 | r100186 >
Date:23:41, 18 October 2011
Author:khorn
Status:ok
Tags:fundraising 
Comment:
Merging the fundraising branch of DonationInterface back into trunk.
Making the hard-coded changes in the DI fundraising branch as well, so I get less noise when I try to diff everything.
Modified paths:
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/Form.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/html/demo.html (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html (modified) (history)
  • /branches/fundraising/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html (modified) (history)

Diff [purge]

Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath, $wgRequest;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -114,7 +114,7 @@
115115 $form .= Html::hidden( 'PaypalRedirect', 0 );
116116 $form .= Xml::tags( 'div',
117117 array(),
118 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) )
 118+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
119119 );
120120 $form .= '</td>';
121121 $form .= '</tr>';
——@@ -204,7 +204,7 @@
205205 $form = '';
206206 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
207207 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
208 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif" ) ) );
 208+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211211 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath, $wgRequest;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -114,7 +114,7 @@
115115 $form .= Html::hidden( 'PaypalRedirect', 0 );
116116 $form .= Xml::tags( 'div',
117117 array(),
118 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) )
 118+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
119119 );
120120 $form .= '</td>';
121121 $form .= '</tr>';
——@@ -204,7 +204,7 @@
205205 $form = '';
206206 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
207207 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
208 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif" ) ) );
 208+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211211 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath, $wgRequest;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -114,7 +114,7 @@
115115 $form .= Html::hidden( 'PaypalRedirect', 0 );
116116 $form .= Xml::tags( 'div',
117117 array(),
118 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) )
 118+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) )
119119 );
120120 $form .= '</td>';
121121 $form .= '</tr>';
——@@ -204,7 +204,7 @@
205205 $form = '';
206206 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
207207 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
208 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate.gif" ) ) );
 208+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211211 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
——@@ -80,7 +80,7 @@
8181
8282 protected function generateBillingFields() {
8383 global $wgScriptPath, $wgRequest;
84 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 84+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8585
8686 $form = '';
8787
——@@ -136,11 +136,11 @@
137137 $form .= '<tr>';
138138 $form .= '<td class="label">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
139139 $form .= '<td>' .
140 - Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). '</label>' .
141 - Xml::radio( 'card_type', 'cc2', $this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' .
142 - Xml::radio( 'card_type', 'cc3', $this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' .
143 - Xml::radio( 'card_type', 'cc4', $this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' .
144 - Xml::radio( 'card_type', 'pp', $this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) . '</label>' .
 140+ Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). '</label>' .
 141+ Xml::radio( 'card_type', 'cc2', $this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). '</label>' .
 142+ Xml::radio( 'card_type', 'cc3', $this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-amex.png" ) ). '</label>' .
 143+ Xml::radio( 'card_type', 'cc4', $this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-discover.png" ) ). '</label>' .
 144+ Xml::radio( 'card_type', 'pp', $this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-paypal.png" ) ) . '</label>' .
145145 '</td>';
146146 $form .= '</tr>';
147147
——@@ -241,7 +241,7 @@
242242 $form = '';
243243 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
244244 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
245 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
 245+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
246246 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
247247 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
248248 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
——@@ -80,7 +80,7 @@
8181
8282 protected function generateBillingFields() {
8383 global $wgScriptPath, $wgRequest;
84 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 84+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8585
8686 $form = '';
8787
——@@ -130,11 +130,11 @@
131131 $form .= '<tr>';
132132 $form .= '<td class="label">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
133133 $form .= '<td>' .
134 - Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). '</label>' .
135 - Xml::radio( 'card_type', 'cc2', $this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' .
136 - Xml::radio( 'card_type', 'cc3', $this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' .
137 - Xml::radio( 'card_type', 'cc4', $this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' .
138 - Xml::radio( 'card_type', 'pp', $this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) . '</label>' .
 134+ Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). '</label>' .
 135+ Xml::radio( 'card_type', 'cc2', $this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). '</label>' .
 136+ Xml::radio( 'card_type', 'cc3', $this->form_data['card_type'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-amex.png" ) ). '</label>' .
 137+ Xml::radio( 'card_type', 'cc4', $this->form_data['card_type'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-discover.png" ) ). '</label>' .
 138+ Xml::radio( 'card_type', 'pp', $this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-paypal.png" ) ) . '</label>' .
139139 '</td>';
140140 $form .= '</tr>';
141141
——@@ -257,7 +257,7 @@
258258 $form = '';
259259 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
260260 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
261 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
 261+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
262262 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
263263 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
264264 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
——@@ -101,17 +101,17 @@
102102 // card logos
103103 if ( $this->form_data[ 'currency' ] == 'USD' ) {
104104 $form .= '<tr id="four_cards" style="display:table-row;">';
105 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 105+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
106106 $form .= '</tr>';
107107 $form .= '<tr id="two_cards" style="display:none;">';
108 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 108+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
109109 $form .= '</tr>';
110110 } else {
111111 $form .= '<tr id="four_cards" style="display:none;">';
112 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 112+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
113113 $form .= '</tr>';
114114 $form .= '<tr id="two_cards" style="display:table-row;">';
115 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 115+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
116116 $form .= '</tr>';
117117 }
118118
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
——@@ -193,7 +193,7 @@
194194
195195 protected function generateBillingFields() {
196196 global $wgScriptPath, $wgRequest;
197 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 197+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
198198
199199 $form = '';
200200
——@@ -249,13 +249,13 @@
250250 $form .= '<td class="label""><div style="padding-top:9px;">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</div></td>';
251251 $form .= '<td>' .
252252 '<p style="border: 1px solid rgb(187, 187, 187); float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0 8px 0 0; padding: 5px 5px 5px 3px; white-space: nowrap;">'.
253 - Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). '</label>' .
254 - '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' .
255 - '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' .
256 - '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' .
 253+ Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). '</label>' .
 254+ '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). '</label>' .
 255+ '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-amex.png" ) ). '</label>' .
 256+ '&#160;<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-discover.png" ) ). '</label>' .
257257 '</p>'.
258258 '<p style="border: 1px solid transparent; float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0; padding: 5px 5px 5px 3px; white-space: nowrap;">'.
259 - Xml::radio( 'card_type', 'pp', $this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) . '</label>' .
 259+ Xml::radio( 'card_type', 'pp', $this->form_data['card_type'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-paypal.png" ) ) . '</label>' .
260260 '</p>'.
261261 '</td>';
262262 $form .= '</tr>';
——@@ -270,7 +270,7 @@
271271
272272 $form .= '<tr>';
273273 $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
274 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
 274+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
275275 $form .= '</tr>';
276276
277277 // card number
——@@ -366,10 +366,10 @@
367367 $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) );
368368 }
369369 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
370 - $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'image' ) );
 370+ $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'image' ) );
371371 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
372372 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
373 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be securely processed.';
 373+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be securely processed.';
374374 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
375375 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
376376
——@@ -381,10 +381,10 @@
382382 }
383383 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
384384 $form .= Html::hidden( 'PaypalRedirect', 0 );
385 - $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/continue-button.png", 'alt' => 'Submit donation', 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'image' ) );
 385+ $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/continue-button.png", 'alt' => 'Submit donation', 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'image' ) );
386386 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
387387 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
388 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be securely processed.';
 388+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be securely processed.';
389389 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
390390 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-submit-paypal
391391 return $form;
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
——@@ -101,17 +101,17 @@
102102 // card logos
103103 if ( $this->form_data[ 'currency' ] == 'USD' ) {
104104 $form .= '<tr id="four_cards" style="display:table-row;">';
105 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 105+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
106106 $form .= '</tr>';
107107 $form .= '<tr id="two_cards" style="display:none;">';
108 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 108+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
109109 $form .= '</tr>';
110110 } else {
111111 $form .= '<tr id="four_cards" style="display:none;">';
112 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 112+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
113113 $form .= '</tr>';
114114 $form .= '<tr id="two_cards" style="display:table-row;">';
115 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 115+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
116116 $form .= '</tr>';
117117 }
118118
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/Form.php
——@@ -111,7 +111,7 @@
112112 $form = '';
113113 $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
114114 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-secure-logos' ) );
115 - $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
 115+ $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
116116 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
117117 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
118118 $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
——@@ -585,7 +585,7 @@
586586
587587 protected function getPaypalButton() {
588588 global $wgScriptPath;
589 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 589+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
590590
591591 $form = '<tr>';
592592 $form .= '<td class="paypal-button" colspan="2">';
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
——@@ -83,7 +83,7 @@
8484
8585 protected function generateBillingFields() {
8686 global $wgScriptPath;
87 - $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
 87+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/gateway_forms/includes";
8888
8989 $form = '';
9090
——@@ -118,7 +118,7 @@
119119 $form .= Html::hidden( 'PaypalRedirect', 0 );
120120 $form .= Xml::tags( 'div',
121121 array(),
122 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif" ) ) . '&#160;&#160;&#160;<a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>'
 122+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos2.gif" ) ) . '&#160;&#160;&#160;<a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>'
123123 );
124124 $form .= '</td>';
125125 $form .= '</tr>';
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
——@@ -23,7 +23,7 @@
2424
2525 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
2626 $form .= Xml::tags( 'div', array( 'id' => 'premium-header' ), wfMsg( 'payflowpro_gateway-tshirt-confirmation' ) );
27 - $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/wikipedia-ten-tshirt-front.png", 'width' => '300', 'height' => '280' ) ) . "<br/>";
 27+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/wikipedia-ten-tshirt-front.png", 'width' => '300', 'height' => '280' ) ) . "<br/>";
2828 $form .= Xml::openElement( 'div', array( 'id' => 'premium-values' ) );
2929 $form .= Xml::openElement( 'div', array( 'id' => 'premium-size' ) );
3030 $sizeDisplay = '<span id="size-display">'.$wgRequest->getText( 'size' ).'</span>';
——@@ -31,7 +31,7 @@
3232 $form .= Xml::closeElement( 'div' ); // close div#premium-size
3333 $form .= wfMsg( 'payflowpro_gateway-on-the-back' ) . "<br/>";
3434 $form .= Xml::openElement( 'div', array( 'id' => 'premium-language' ) );
35 - $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/wordmarks/".$wgRequest->getText( 'premium_language' )."-wordmark.png", 'width' => '200', 'height' => '92' ) );
 35+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/wordmarks/".$wgRequest->getText( 'premium_language' )."-wordmark.png", 'width' => '200', 'height' => '92' ) );
3636 $form .= Xml::closeElement( 'div' ); // close div#premium-language
3737 $form .= Xml::closeElement( 'div' ); // close div#premium-values
3838 $form .= Xml::closeElement( 'div' ); // close div#premium-confirmation
——@@ -107,17 +107,17 @@
108108 // card logos
109109 if ( $this->form_data[ 'currency' ] == 'USD' ) {
110110 $form .= '<tr id="four_cards" style="display:table-row;">';
111 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 111+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
112112 $form .= '</tr>';
113113 $form .= '<tr id="two_cards" style="display:none;">';
114 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 114+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
115115 $form .= '</tr>';
116116 } else {
117117 $form .= '<tr id="four_cards" style="display:none;">';
118 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 118+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
119119 $form .= '</tr>';
120120 $form .= '<tr id="two_cards" style="display:table-row;">';
121 - $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 121+ $form .= '<td class="label"> </td><td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
122122 $form .= '</tr>';
123123 }
124124
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
——@@ -234,7 +234,7 @@
235235 // card logos
236236 $form .= '<tr>';
237237 $form .= '<td />';
238 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 238+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
239239 $form .= '</tr>';
240240
241241 // credit card type
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/html/demo.html
——@@ -58,7 +58,7 @@
5959 </tr>
6060 <tr>
6161 <td />
62 - <td><img src="/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" /></td>
 62+ <td><img src="/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" /></td>
6363 </tr>
6464 <tr>
6565 <td class="label"><label for="card_num">Card number</label></td>
——@@ -156,7 +156,7 @@
157157 <input type="hidden" value="@owa_session" name="owa_session" />
158158 <input type="hidden" value="@owa_ref" name="owa_ref" />
159159 </form>
160 -<div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info"><div id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img src="/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div id="payflowpro_gateway-donate-addl-info-text"><p class=""><a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a></p><p class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privacy policy</a>.</p><p class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
 160+<div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info"><div id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img src="/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div id="payflowpro_gateway-donate-addl-info-text"><p class=""><a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a></p><p class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privacy policy</a>.</p><p class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
161161
162162 Retrieved from "<a href="https://payments.wikimedia.org/index.php/Special:PayflowProGateway">https://payments.wikimedia.org/index.php/Special:PayflowProGateway</a>"</div>
163163
\ No newline at end of file
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
——@@ -131,12 +131,12 @@
132132 </tr>
133133 <tr class="step2hidden">
134134 <td colspan="2"><h3 class="cc_header">Billing information<img
135 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif"
 135+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
136136 style="vertical-align:baseline;margin-left:8px;"/></h3></td>
137137 </tr>
138138 <tr>
139139 <td class="label"></td>
140 - <td><img src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" style="padding-top: 10px;"/>
 140+ <td><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" style="padding-top: 10px;"/>
141141 </td>
142142 </tr>
143143 <tr>
——@@ -188,8 +188,8 @@
189189 <td class="label"></td>
190190 <td>
191191 <div id="mw-donate-submit-button"><input style="margin-top:19px;"
192 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png" alt="Submit donation" type="image"/></div>
193 - <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage"><img src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.</div>
 192+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image"/></div>
 193+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage"><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.</div>
194194 </td>
195195 </tr>
196196 </table>
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
——@@ -161,14 +161,14 @@
162162 <tr>
163163 <td colspan="2">
164164 <h3 class="cc_header">
165 - Billing information <img style="vertical-align:baseline;margin-left:8px;" src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif">
 165+ Billing information <img style="vertical-align:baseline;margin-left:8px;" src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif">
166166 </h3>
167167 </td>
168168 </tr>
169169 <tr>
170170 <td class="label"></td>
171171 <td><img
172 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif"/>
 172+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"/>
173173 </td>
174174 </tr>
175175 <tr>
——@@ -323,9 +323,9 @@
324324 <td class="label"></td>
325325 <td>
326326 <div id="mw-donate-submit-button">&#160;<br/><input
327 - src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png"
 327+ src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png"
328328 alt="Submit donation" type="image"/></div>
329 - <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage"><img src="@script_path/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.</div>
 329+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage"><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.</div>
330330 </td>
331331 </tr>
332332 </table>
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
——@@ -173,10 +173,10 @@
174174 // submit button
175175 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
176176 // $form .= Xml::submitButton( wfMsg( 'payflowpro_gateway-submit-button' ));
177 - $form .= '&#160;<br/>' . Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'type' => 'image' ) );
 177+ $form .= '&#160;<br/>' . Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'type' => 'image' ) );
178178 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
179179 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
180 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your credit / debit card will be securely processed.';
 180+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your credit / debit card will be securely processed.';
181181 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
182182
183183 $form .= '</td>';
——@@ -224,16 +224,16 @@
225225
226226 $form .= '<tr>';
227227 $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
228 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
 228+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
229229 $form .= '</tr>';
230230
231231 // card logos
232232 $form .= '<tr>';
233233 $form .= '<td class="label"> </td>';
234234 if ( $this->form_data[ 'currency' ] == 'USD' ) {
235 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 235+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
236236 } else {
237 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 237+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
238238 }
239239 $form .= '</tr>';
240240
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
——@@ -122,7 +122,7 @@
123123 $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 'valign' => 'top' ) );
124124
125125 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
126 - $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) );
 126+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) );
127127 $form .= wfMsg( 'payflowpro_gateway-shirt-size-2', $wgRequest->getText( 'size' ) );
128128 $form .= Xml::closeElement( 'div' ); // close div#premium-confirmation
129129
——@@ -202,16 +202,16 @@
203203
204204 $form .= '<tr>';
205205 $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
206 - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
 206+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
207207 $form .= '</tr>';
208208
209209 // card logos
210210 $form .= '<tr>';
211211 $form .= '<td class="label"> </td>';
212212 if ( $this->form_data[ 'currency' ] == 'USD' ) {
213 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 213+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
214214 } else {
215 - $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos3.gif" ) ) . '</td>';
 215+ $form .= '<td>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos3.gif" ) ) . '</td>';
216216 }
217217 $form .= '</tr>';
218218
Index: branches/fundraising/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
——@@ -280,7 +280,7 @@
281281 // card logos
282282 $form .= '<tr>';
283283 $form .= '<td />';
284 - $form .= '<td>&#160;<br/>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>';
 284+ $form .= '<td>&#160;<br/>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" ) ) . '</td>';
285285 $form .= '</tr>';
286286
287287 // card number
Index: branches/fundraising/extensions/DonationInterface/globalcollect_gateway/forms/html/demo.html
——@@ -58,7 +58,7 @@
5959 </tr>
6060 <tr>
6161 <td />
62 - <td><img src="/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" /></td>
 62+ <td><img src="/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif" /></td>
6363 </tr>
6464 <tr>
6565 <td class="label"><label for="card_num">Card number</label></td>
——@@ -156,7 +156,7 @@
157157 <input type="hidden" value="@owa_session" name="owa_session" />
158158 <input type="hidden" value="@owa_ref" name="owa_ref" />
159159 </form>
160 -<div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info"><div id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img src="/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div id="payflowpro_gateway-donate-addl-info-text"><p class=""><a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a></p><p class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privacy policy</a>.</p><p class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
 160+<div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info"><div id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img src="/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div id="payflowpro_gateway-donate-addl-info-text"><p class=""><a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a></p><p class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privacy policy</a>.</p><p class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
161161
162162 Retrieved from "<a href="https://payments.wikimedia.org/index.php/Special:PayflowProGateway">https://payments.wikimedia.org/index.php/Special:PayflowProGateway</a>"</div>
163163
\ No newline at end of file

Status & tagging log