http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96631
Revision: 96631
Author: kaldari
Date: 2011-09-08 23:40:36 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
fixing some paths
Modified Paths:
--------------
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.php
Modified:
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
===================================================================
---
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
2011-09-08 23:37:31 UTC (rev 96630)
+++
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
2011-09-08 23:40:36 UTC (rev 96631)
@@ -227,10 +227,10 @@
* @param string $file_name
*/
public function set_html_file_path( $file_name ) {
- global $wgPayflowProHtmlFormDir,
$wgPayflowProGatewayAllowedHtmlForms;
-
+ global $wgGlobalCollectGatewayHtmlFormDir,
$wgGlobalCollectGatewayAllowedHtmlForms;
+
// Get the dirname - the "/." helps ensure we get a consistent
path name with no trailing slash
- $html_dir = dirname( $wgPayflowProHtmlFormDir . "/." );
+ $html_dir = dirname( $wgGlobalCollectGatewayHtmlFormDir . "/."
);
if ( !is_dir( $html_dir )) {
throw new MWException( 'Requested form directory does
not exist.' );
@@ -243,7 +243,7 @@
$full_path = $html_dir . '/' . $file_name . '.html';
// ensure that the full file path is actually whitelisted and
exists
- if ( !in_array( $full_path,
$wgPayflowProGatewayAllowedHtmlForms ) || !file_exists( $full_path ) ) {
+ if ( !in_array( $full_path,
$wgGlobalCollectGatewayAllowedHtmlForms ) || !file_exists( $full_path ) ) {
throw new MWException( 'Requested an unavailable or
non-existent form.' );
}
Modified:
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
===================================================================
---
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
2011-09-08 23:37:31 UTC (rev 96630)
+++
branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
2011-09-08 23:40:36 UTC (rev 96631)
@@ -359,7 +359,7 @@
}
public function generateStateDropdown() {
- require_once( dirname( __FILE__ ) .
'/../includes/stateAbbreviations.inc' );
+ require_once( dirname( __FILE__ ) .
'/includes/stateAbbreviations.inc' );
$states = statesMenuXML();
Modified:
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.php
===================================================================
---
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.php
2011-09-08 23:37:31 UTC (rev 96630)
+++
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.php
2011-09-08 23:40:36 UTC (rev 96631)
@@ -99,7 +99,7 @@
* Directory for HTML forms (used by RapidHtml form class)
* @var string
*/
-$wgGlobalCollectGatewayHtmlFormDir = dirname( __FILE__ ) . "/forms/html";
+$wgGlobalCollectGatewayHtmlFormDir = dirname( __FILE__ ) .
"/../gateway_forms/html";
/**
* An array of allowed HTML forms.
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
