| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_resultswitcher.body.php |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | //and then pop out. Maybe. We're probably going to have to test it a couple different ways, for user experience. |
| 48 | 48 | //However, we're _definitely_ going to need to pop out _before_ we redirect to the thank you or fail pages. |
| 49 | 49 | if ( strpos( $referrer, $wgServer ) === false ) { |
| 50 | | - $wgOut->allowClickjacking(); |
| | 50 | + $wgOut->allowClickjacking(); // so we can embed in an iframe when necessary |
| 51 | 51 | $wgOut->addModules( 'iframe.liberator' ); |
| 52 | 52 | return; |
| 53 | 53 | } |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php |
| — | — | @@ -44,7 +44,7 @@ |
| 45 | 45 | global $wgRequest, $wgOut, $wgExtensionAssetsPath; |
| 46 | 46 | $CSSVersion = $this->adapter->getGlobal( 'CSSVersion' ); |
| 47 | 47 | |
| 48 | | - $wgOut->allowClickjacking(); |
| | 48 | + $wgOut->allowClickjacking(); // so we can embed in an iframe when necessary |
| 49 | 49 | |
| 50 | 50 | $wgOut->addExtensionStyle( |
| 51 | 51 | $wgExtensionAssetsPath . '/DonationInterface/gateway_forms/css/gateway.css?284' . |
| Index: trunk/extensions/DonationInterface/gateway_common/gateway.adapter.php |
| — | — | @@ -1103,9 +1103,10 @@ |
| 1104 | 1104 | // refresh our data |
| 1105 | 1105 | $this->postdata = $this->dataObj->getData(); |
| 1106 | 1106 | |
| 1107 | | - //update contribution tracking |
| | 1107 | + // update contribution tracking |
| 1108 | 1108 | $this->dataObj->updateContributionTracking( true ); |
| 1109 | 1109 | |
| | 1110 | + // Build the redirect URL. $this->postdata['language'] is escaped by sanitizeInput(). |
| 1110 | 1111 | $ret = self::getGlobal( "PaypalURL" ) . "/" . $this->postdata['language'] . "?gateway=paypal&" . http_build_query( $this->getPaypalData() ); |
| 1111 | 1112 | self::log( $ret ); |
| 1112 | 1113 | return $ret; |
| — | — | @@ -1255,7 +1256,7 @@ |
| 1256 | 1257 | } |
| 1257 | 1258 | |
| 1258 | 1259 | public function getFormClass() { |
| 1259 | | - if ( isset( $this->form_class ) && class_exists( $this->form_class ) ) { |
| | 1260 | + if ( isset( $this->form_class ) && MWInit::classExists( $this->form_class ) ) { |
| 1260 | 1261 | return $this->form_class; |
| 1261 | 1262 | } else { |
| 1262 | 1263 | return false; |
| Index: trunk/extensions/DonationInterface/gateway_common/DonationData.php |
| — | — | @@ -708,7 +708,7 @@ |
| 709 | 709 | } |
| 710 | 710 | |
| 711 | 711 | function getAdapterClass(){ |
| 712 | | - if ( class_exists( $this->boss ) ) { |
| | 712 | + if ( MWInit::classExists( $this->boss ) ) { |
| 713 | 713 | return $this->boss; |
| 714 | 714 | } else { |
| 715 | 715 | return false; |
| Index: trunk/extensions/DonationInterface/gateway_common/GatewayForm.php |
| — | — | @@ -334,10 +334,10 @@ |
| 335 | 335 | |
| 336 | 336 | // make sure our form class exists before going on, if not try loading default form class |
| 337 | 337 | $class_name = "Gateway_Form_" . $form_class; |
| 338 | | - if ( !class_exists( $class_name ) ) { |
| | 338 | + if ( !MWInit::classExists( $class_name ) ) { |
| 339 | 339 | $class_name_orig = $class_name; |
| 340 | 340 | $class_name = "Gateway_Form_" . $defaultForm; |
| 341 | | - if ( !class_exists( $class_name ) ) { |
| | 341 | + if ( !MWInit::classExists( $class_name ) ) { |
| 342 | 342 | throw new MWException( 'Could not load form ' . $class_name_orig . ' nor default form ' . $class_name ); |
| 343 | 343 | } |
| 344 | 344 | } |