Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208643
Change subject: WIP Make DonationInterface config less of a snowflake
......................................................................
WIP Make DonationInterface config less of a snowflake
Bug: T94477
Change-Id: I7592d5b865e2e84759aa8ea87573d950f3ab9856
---
M DonationInterface.php
1 file changed, 49 insertions(+), 89 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/43/208643/1
diff --git a/DonationInterface.php b/DonationInterface.php
index bae4eca..fd05e86 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -128,109 +128,65 @@
$wgAutoloadClasses['StateAbbreviations'] = $donationinterface_dir .
'gateway_forms/includes/StateAbbreviations.php';
//GlobalCollect gateway classes
-if ( $optionalParts['GlobalCollect'] === true ){
- $wgDonationInterfaceClassMap['globalcollect'] = 'GlobalCollectAdapter';
- $wgAutoloadClasses['GlobalCollectGateway'] = $donationinterface_dir .
'globalcollect_gateway/globalcollect_gateway.body.php';
- $wgAutoloadClasses['GlobalCollectGatewayResult'] =
$donationinterface_dir .
'globalcollect_gateway/globalcollect_resultswitcher.body.php';
+$wgDonationInterfaceClassMap['globalcollect'] = 'GlobalCollectAdapter';
+$wgAutoloadClasses['GlobalCollectGateway'] = $donationinterface_dir .
'globalcollect_gateway/globalcollect_gateway.body.php';
+$wgAutoloadClasses['GlobalCollectGatewayResult'] = $donationinterface_dir .
'globalcollect_gateway/globalcollect_resultswitcher.body.php';
- $wgAutoloadClasses['GlobalCollectAdapter'] = $donationinterface_dir .
'globalcollect_gateway/globalcollect.adapter.php';
- $wgAutoloadClasses['GlobalCollectOrphanAdapter'] = __DIR__ .
'/globalcollect_gateway/scripts/orphan_adapter.php';
-}
+$wgAutoloadClasses['GlobalCollectAdapter'] = $donationinterface_dir .
'globalcollect_gateway/globalcollect.adapter.php';
+$wgAutoloadClasses['GlobalCollectOrphanAdapter'] = __DIR__ .
'/globalcollect_gateway/scripts/orphan_adapter.php';
-if ( $optionalParts['Amazon'] === true ){
- $wgDonationInterfaceClassMap['amazon'] = 'AmazonAdapter';
- $wgAutoloadClasses['AmazonGateway'] = $donationinterface_dir .
'amazon_gateway/amazon_gateway.body.php';
- $wgAutoloadClasses['AmazonAdapter'] = $donationinterface_dir .
'amazon_gateway/amazon.adapter.php';
-}
+// Amazon
+$wgDonationInterfaceClassMap['amazon'] = 'AmazonAdapter';
+$wgAutoloadClasses['AmazonGateway'] = $donationinterface_dir .
'amazon_gateway/amazon_gateway.body.php';
+$wgAutoloadClasses['AmazonAdapter'] = $donationinterface_dir .
'amazon_gateway/amazon.adapter.php';
-if ( $optionalParts['Adyen'] === true ){
- $wgDonationInterfaceClassMap['adyen'] = 'AdyenAdapter';
- $wgAutoloadClasses['AdyenGateway'] = $donationinterface_dir .
'adyen_gateway/adyen_gateway.body.php';
- $wgAutoloadClasses['AdyenGatewayResult'] = $donationinterface_dir .
'adyen_gateway/adyen_resultswitcher.body.php';
- $wgAutoloadClasses['AdyenAdapter'] = $donationinterface_dir .
'adyen_gateway/adyen.adapter.php';
-}
+//Adyen
+$wgDonationInterfaceClassMap['adyen'] = 'AdyenAdapter';
+$wgAutoloadClasses['AdyenGateway'] = $donationinterface_dir .
'adyen_gateway/adyen_gateway.body.php';
+$wgAutoloadClasses['AdyenGatewayResult'] = $donationinterface_dir .
'adyen_gateway/adyen_resultswitcher.body.php';
+$wgAutoloadClasses['AdyenAdapter'] = $donationinterface_dir .
'adyen_gateway/adyen.adapter.php';
-if ( $optionalParts['Astropay'] === true ){
- $wgDonationInterfaceClassMap['astropay'] = 'AstropayAdapter';
- $wgAutoloadClasses['AstropayGateway'] = $donationinterface_dir .
'astropay_gateway/astropay_gateway.body.php';
- $wgAutoloadClasses['AstropayGatewayResult'] = $donationinterface_dir .
'astropay_gateway/astropay_resultswitcher.body.php';
- $wgAutoloadClasses['AstropayAdapter'] = $donationinterface_dir .
'astropay_gateway/astropay.adapter.php';
-}
+// Astropay
+$wgDonationInterfaceClassMap['astropay'] = 'AstropayAdapter';
+$wgAutoloadClasses['AstropayGateway'] = $donationinterface_dir .
'astropay_gateway/astropay_gateway.body.php';
+$wgAutoloadClasses['AstropayGatewayResult'] = $donationinterface_dir .
'astropay_gateway/astropay_resultswitcher.body.php';
+$wgAutoloadClasses['AstropayAdapter'] = $donationinterface_dir .
'astropay_gateway/astropay.adapter.php';
-if ( $optionalParts['Paypal'] === true ){
- $wgDonationInterfaceClassMap['paypal'] = 'PaypalAdapter';
- $wgAutoloadClasses['PaypalGateway'] = $donationinterface_dir .
'paypal_gateway/paypal_gateway.body.php';
- $wgAutoloadClasses['PaypalGatewayResult'] = $donationinterface_dir .
'paypal_gateway/paypal_resultswitcher.body.php';
- $wgAutoloadClasses['PaypalAdapter'] = $donationinterface_dir .
'paypal_gateway/paypal.adapter.php';
-}
+// Paypal
+$wgDonationInterfaceClassMap['paypal'] = 'PaypalAdapter';
+$wgAutoloadClasses['PaypalGateway'] = $donationinterface_dir .
'paypal_gateway/paypal_gateway.body.php';
+$wgAutoloadClasses['PaypalGatewayResult'] = $donationinterface_dir .
'paypal_gateway/paypal_resultswitcher.body.php';
+$wgAutoloadClasses['PaypalAdapter'] = $donationinterface_dir .
'paypal_gateway/paypal.adapter.php';
-if ( $optionalParts['WorldPay'] === true ){
- $wgDonationInterfaceClassMap['worldpay'] = 'WorldPayAdapter';
- $wgAutoloadClasses['WorldPayGateway'] = $donationinterface_dir .
'worldpay_gateway/worldpay_gateway.body.php';
- $wgAutoloadClasses['WorldPayAdapter'] = $donationinterface_dir .
'worldpay_gateway/worldpay.adapter.php';
+// WorldPay
+$wgDonationInterfaceClassMap['worldpay'] = 'WorldPayAdapter';
+$wgAutoloadClasses['WorldPayGateway'] = $donationinterface_dir .
'worldpay_gateway/worldpay_gateway.body.php';
+$wgAutoloadClasses['WorldPayAdapter'] = $donationinterface_dir .
'worldpay_gateway/worldpay.adapter.php';
- $wgAPIModules['di_wp_validate'] = 'WorldPayValidateApi';
- $wgAutoloadClasses['WorldPayValidateApi'] = $donationinterface_dir .
'worldpay_gateway/worldpay.api.php';
-}
+$wgAPIModules['di_wp_validate'] = 'WorldPayValidateApi';
+$wgAutoloadClasses['WorldPayValidateApi'] = $donationinterface_dir .
'worldpay_gateway/worldpay.api.php';
-
-//Stomp classes
-if ($optionalParts['Stomp'] === true){
- $wgAutoloadClasses['activemq_stomp'] = $donationinterface_dir .
'activemq_stomp/activemq_stomp.php'; # Tell MediaWiki to load the extension
body.
-}
+// Stomp
+$wgAutoloadClasses['activemq_stomp'] = $donationinterface_dir .
'activemq_stomp/activemq_stomp.php'; # Tell MediaWiki to load the extension
body.
//Extras classes - required for ANY optional class that is considered an
"extra".
-if ($optionalParts['Extras'] === true){
- $wgAutoloadClasses['Gateway_Extras'] = $donationinterface_dir .
"extras/extras.body.php";
-}
+$wgAutoloadClasses['Gateway_Extras'] = $donationinterface_dir .
"extras/extras.body.php";
//Custom Filters classes
-if ( $optionalParts['CustomFilters'] === true ) {
- $wgAutoloadClasses['Gateway_Extras_CustomFilters'] =
$donationinterface_dir . "extras/custom_filters/custom_filters.body.php";
-}
+$wgAutoloadClasses['Gateway_Extras_CustomFilters'] = $donationinterface_dir .
"extras/custom_filters/custom_filters.body.php";
//Conversion Log classes
-if ($optionalParts['ConversionLog'] === true){
- $wgAutoloadClasses['Gateway_Extras_ConversionLog'] =
$donationinterface_dir . "extras/conversion_log/conversion_log.body.php";
-}
+$wgAutoloadClasses['Gateway_Extras_ConversionLog'] = $donationinterface_dir .
"extras/conversion_log/conversion_log.body.php";
-//Minfraud classes
-if ( $optionalParts['Minfraud'] === true ){
- $wgAutoloadClasses['Gateway_Extras_CustomFilters_MinFraud'] =
$donationinterface_dir .
"extras/custom_filters/filters/minfraud/minfraud.body.php";
-}
+$wgAutoloadClasses['Gateway_Extras_CustomFilters_MinFraud'] =
$donationinterface_dir .
"extras/custom_filters/filters/minfraud/minfraud.body.php";
+$wgAutoloadClasses['Gateway_Extras_CustomFilters_Referrer'] =
$donationinterface_dir .
"extras/custom_filters/filters/referrer/referrer.body.php";
+$wgAutoloadClasses['Gateway_Extras_CustomFilters_Source'] =
$donationinterface_dir . "extras/custom_filters/filters/source/source.body.php";
+$wgAutoloadClasses['Gateway_Extras_CustomFilters_Functions'] =
$donationinterface_dir .
"extras/custom_filters/filters/functions/functions.body.php";
+$wgAutoloadClasses['Gateway_Extras_CustomFilters_IP_Velocity'] =
$donationinterface_dir .
"extras/custom_filters/filters/ip_velocity/ip_velocity.body.php";
-//Referrer Filter classes
-if ( $optionalParts['ReferrerFilter'] === true ){
- $wgAutoloadClasses['Gateway_Extras_CustomFilters_Referrer'] =
$donationinterface_dir .
"extras/custom_filters/filters/referrer/referrer.body.php";
-}
-
-//Source Filter classes
-if ( $optionalParts['SourceFilter'] === true ){
- $wgAutoloadClasses['Gateway_Extras_CustomFilters_Source'] =
$donationinterface_dir . "extras/custom_filters/filters/source/source.body.php";
-}
-
-//Functions Filter classes
-if ( $optionalParts['FunctionsFilter'] === true ) {
- $wgAutoloadClasses['Gateway_Extras_CustomFilters_Functions'] =
$donationinterface_dir .
"extras/custom_filters/filters/functions/functions.body.php";
-}
-
-//Functions Filter classes
-if ( $optionalParts['IPVelocityFilter'] === true ){
- $wgAutoloadClasses['Gateway_Extras_CustomFilters_IP_Velocity'] =
$donationinterface_dir .
"extras/custom_filters/filters/ip_velocity/ip_velocity.body.php";
-}
-
-//Functions Filter classes
-if ( $optionalParts['SessionVelocityFilter'] === true ){
- $wgAutoloadClasses['Gateway_Extras_SessionVelocityFilter'] =
$donationinterface_dir . "extras/session_velocity/session_velocity.body.php";
-}
-
-if ( $optionalParts['FormChooser'] === true ){
- $wgAutoloadClasses['GatewayFormChooser'] = $donationinterface_dir .
'special/GatewayFormChooser.php';
-
-}
-if ( $optionalParts['SystemStatus'] === true ){
- $wgAutoloadClasses['SystemStatus'] = $donationinterface_dir .
'special/SystemStatus.php';
-}
+$wgAutoloadClasses['Gateway_Extras_SessionVelocityFilter'] =
$donationinterface_dir . "extras/session_velocity/session_velocity.body.php";
+$wgAutoloadClasses['GatewayFormChooser'] = $donationinterface_dir .
'special/GatewayFormChooser.php';
+$wgAutoloadClasses['SystemStatus'] = $donationinterface_dir .
'special/SystemStatus.php';
/**
* GLOBALS
@@ -351,9 +307,13 @@
'INR' => array(), //all countries
);
+function getEnabledGateways() {
+ $gateways = array();
+
+ if ( $optionalParts['GlobalCollect'] === true ){
+ $wgDonationInterfaceEnabledGateways[] = 'globalcollect';
+
//GlobalCollect gateway globals
-if ( $optionalParts['GlobalCollect'] === true ){
- $wgDonationInterfaceEnabledGateways[] = 'globalcollect';
$wgGlobalCollectGatewayURL = 'https://ps.gcsip.nl/wdl/wdl';
$wgGlobalCollectGatewayTestingURL = 'https://'; // GlobalCollect
testing URL
--
To view, visit https://gerrit.wikimedia.org/r/208643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7592d5b865e2e84759aa8ea87573d950f3ab9856
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
