| Index: branches/fundraising/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php |
| — | — | @@ -359,7 +359,7 @@ |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | public function generateStateDropdown() { |
| 363 | | - require_once( dirname( __FILE__ ) . '/../includes/stateAbbreviations.inc' ); |
| | 363 | + require_once( dirname( __FILE__ ) . '/includes/stateAbbreviations.inc' ); |
| 364 | 364 | |
| 365 | 365 | $states = statesMenuXML(); |
| 366 | 366 | |
| Index: branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php |
| — | — | @@ -227,10 +227,10 @@ |
| 228 | 228 | * @param string $file_name |
| 229 | 229 | */ |
| 230 | 230 | public function set_html_file_path( $file_name ) { |
| 231 | | - global $wgPayflowProHtmlFormDir, $wgPayflowProGatewayAllowedHtmlForms; |
| 232 | | - |
| | 231 | + global $wgGlobalCollectGatewayHtmlFormDir, $wgGlobalCollectGatewayAllowedHtmlForms; |
| | 232 | + |
| 233 | 233 | // Get the dirname - the "/." helps ensure we get a consistent path name with no trailing slash |
| 234 | | - $html_dir = dirname( $wgPayflowProHtmlFormDir . "/." ); |
| | 234 | + $html_dir = dirname( $wgGlobalCollectGatewayHtmlFormDir . "/." ); |
| 235 | 235 | |
| 236 | 236 | if ( !is_dir( $html_dir )) { |
| 237 | 237 | throw new MWException( 'Requested form directory does not exist.' ); |
| — | — | @@ -243,7 +243,7 @@ |
| 244 | 244 | $full_path = $html_dir . '/' . $file_name . '.html'; |
| 245 | 245 | |
| 246 | 246 | // ensure that the full file path is actually whitelisted and exists |
| 247 | | - if ( !in_array( $full_path, $wgPayflowProGatewayAllowedHtmlForms ) || !file_exists( $full_path ) ) { |
| | 247 | + if ( !in_array( $full_path, $wgGlobalCollectGatewayAllowedHtmlForms ) || !file_exists( $full_path ) ) { |
| 248 | 248 | throw new MWException( 'Requested an unavailable or non-existent form.' ); |
| 249 | 249 | } |
| 250 | 250 | |
| Index: branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.php |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | * Directory for HTML forms (used by RapidHtml form class) |
| 101 | 101 | * @var string |
| 102 | 102 | */ |
| 103 | | -$wgGlobalCollectGatewayHtmlFormDir = dirname( __FILE__ ) . "/forms/html"; |
| | 103 | +$wgGlobalCollectGatewayHtmlFormDir = dirname( __FILE__ ) . "/../gateway_forms/html"; |
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | 106 | * An array of allowed HTML forms. |