http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73407
Revision: 73407
Author: awjrichards
Date: 2010-09-20 20:28:25 +0000 (Mon, 20 Sep 2010)
Log Message:
-----------
Added public comment fields to TwoColumnLetter form; updated messaging for
donate_interface for email opt-in message; updated code in minfraud API and
payflowpro_gateway.body.php to use non-deprecated php methods for php 5.3
compatibility
Modified Paths:
--------------
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter.css
trunk/extensions/DonationInterface/payflowpro_gateway/includes/payflowUser.inc
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
Modified:
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
===================================================================
---
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
2010-09-20 20:26:39 UTC (rev 73406)
+++
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
2010-09-20 20:28:25 UTC (rev 73407)
@@ -21,9 +21,7 @@
'donate_interface-comment-message' => 'Have a thought to share with the
world? Put up to 200 characters here:',
'donate_interface-comment-label' => 'Comment:',
'donate_interface-anon-message' => 'Please list my name (next to my
comment) on the public donor list.',
- 'donate_interface-email-agreement' => "I agree to receive future
Wikimedia Foundation newsletters or e-mails.
-We will never sell or trade your information.
-Our donor privacy policy can be found <a title='Donate/Donor Privacy'
href='/wiki/Donate/Donor_Privacy'>here</a>",
+ 'donate_interface-email-agreement' => "I agree to receive future
Wikimedia Foundation newsletters or e-mails.",
'donate_interface-comment-title' => 'Public comment',
'donate_interface-big-amount-display' => '$100',
'donate_interface-medium-amount-display' => '$75',
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php
2010-09-20 20:26:39 UTC (rev 73406)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php
2010-09-20 20:28:25 UTC (rev 73407)
@@ -69,7 +69,7 @@
function filter_field($key, $value) {
if ($key == 'emailMD5'){
- if (ereg('\@',$value)){
+ if (preg_match('/@/',$value)){
return md5(strtolower($value));
}
} else if ($key == 'usernameMD5' || $key == 'passwordMD5') {
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php
2010-09-20 20:26:39 UTC (rev 73406)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php
2010-09-20 20:28:25 UTC (rev 73407)
@@ -24,7 +24,9 @@
$form .= parent::generatePaymentContainerTop();
$form .= parent::generatePaymentFields();
$form .= Xml::closeElement( 'table' );
- return $form;
+ $form .= Xml::closeElement( 'div' );
+ $form .= $this->generateCommentFields();
+ return $form;
}
public function generateFormSubmit() {
@@ -39,8 +41,36 @@
$form .= ( strlen( $text_template )) ? $wgOut->parse(
'{{'.$text_template.'}}' ) : '';
$form .= Xml::closeElement( 'div' );
- $form .=Xml::closeElement( 'div' );
- $form .= Xml::closeElement( 'div' );
+ $form .=Xml::closeElement( 'div' );
return $form;
}
+
+ public function generateCommentFields() {
+ $form = Xml::openElement( 'div', array( 'class' =>
'payflow-cc-form-section', 'id' => 'payflowpro_gateway-comment_form' ));
+ $form .= Xml::tags( 'h3', array( 'class' =>
'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-comments' ), wfMsg(
'donate_interface-comment-title' ));
+ $form .= Xml::tags( 'p', array(), wfMsg(
'donate_interface-comment-message' ));
+ $form .= Xml::openElement( 'table', array( 'id' =>
'payflow-table-comment' ) );
+
+ //comment
+ $form .= '<tr>';
+ $form .= '<td>' . Xml::label(
wfMsg('donate_interface-comment-label'), 'comment' ) . '</td>';
+ $form .= '<td>' . Xml::input( 'comment', '30', '', array(
'maxlength' => '200' )) . '</td>';
+ $form .= '</tr>';
+
+ // anonymous
+ $form .= '<tr>';
+ $form .= '<td>' . Xml::check( 'comment-option', TRUE ) .
'</td>';
+ $form .= '<td>' . Xml::label( wfMsg(
'donate_interface-anon-message' ), 'comment-option' );
+ $form .= '</tr>';
+
+ // email agreement
+ $form .= '<tr>';
+ $form .= '<td>' . Xml::check( 'opt', TRUE ) . '</td>';
+ $form .= '<td>' . Xml::label( wfMsg(
'donate_interface-email-agreement' ), 'opt' ) . '</td>';
+ $form .= '</tr>';
+
+ $form .= Xml::closeElement( 'table' );
+ $form .= Xml::closeElement( 'div' );
+ return $form;
+ }
}
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter.css
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter.css
2010-09-20 20:26:39 UTC (rev 73406)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter.css
2010-09-20 20:28:25 UTC (rev 73407)
@@ -1,8 +1,5 @@
.payflow-cc-form-section {
float: none;
-}
-
-#payflowpro_gateway-personal-info {
margin-right: 0em;
margin-bottom: 3em;
}
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/includes/payflowUser.inc
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/includes/payflowUser.inc
2010-09-20 20:26:39 UTC (rev 73406)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/includes/payflowUser.inc
2010-09-20 20:28:25 UTC (rev 73407)
@@ -11,7 +11,8 @@
$wgPayflowProUserID,
$wgPayflowProPassword,
$wgPayflowProURL,
- $wgPayflowProTestingURL;
+ $wgPayflowProTestingURL,
+ $wgPayflowGatewayTest;
$payflow_data = array(
'partner' => $wgPayflowProPartnerID, // PayPal or original
authorized reseller
@@ -23,7 +24,7 @@
'trxtype' => 'S', // transaction type - all donations are a sale
'tender' => 'C', // credit card - all transactions in this case
are credit cards
'verbosity' => 'MEDIUM', // level of detail in Payflow response
- 'user_ip' => $_SERVER['REMOTE_ADDR'], // current user's IP
address
+ 'user_ip' => ( $wgPayflowGatewayTest ) ? '12.12.12.12' :
wfGetIP(), // current user's IP address
'order_id' => (double) microtime() * 1000000 . mt_rand(), //
Generate random order number
);
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2010-09-20 20:26:39 UTC (rev 73406)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2010-09-20 20:28:25 UTC (rev 73407)
@@ -383,7 +383,7 @@
$queryString = implode( '&', $query );
$payflow_query = $queryString;
-
+
// assign header data necessary for the curl_setopt() function
$user_agent = Http::userAgent();
$headers[] = 'Content-Type: text/namevalue';
@@ -459,7 +459,7 @@
*/
$result_arr = explode( "&", $result );
foreach ( $result_arr as $result_pair ) {
- list( $key, $value ) = split( "=", $result_pair );
+ list( $key, $value ) = preg_split( "/=/", $result_pair
);
$responseArray[ $key ] = $value;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
