| Index: trunk/extensions/Collection/Collection.body.php |
| — | — | @@ -517,16 +517,17 @@ |
| 518 | 518 | $redirect = SkinTemplate::makeSpecialUrlSubpage( 'Collection', 'generating_pdf/' ); |
| 519 | 519 | $wgOut->redirect( wfAppendQuery( $redirect, |
| 520 | 520 | 'return_to=' . urlencode( $referrer->getPrefixedText() ) |
| 521 | | - . '&iframe_src=' . urlencode( $response->iframe_src ) ) ); |
| | 521 | + . '&query=' . urlencode( $response->query ) ) ); |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | 524 | function generatingPDF() { |
| 525 | 525 | global $wgOut; |
| | 526 | + global $wgPDFServer; |
| 526 | 527 | global $wgRequest; |
| 527 | | - |
| | 528 | + |
| 528 | 529 | $this->setHeaders(); |
| 529 | | - |
| 530 | | - $iframe_src = $wgRequest->getVal( 'iframe_src' ); |
| | 530 | + |
| | 531 | + $query = $wgRequest->getVal( 'query' ); |
| 531 | 532 | $return_to = $wgRequest->getVal( 'return_to' ); |
| 532 | 533 | |
| 533 | 534 | $wgOut->setPageTitle( wfMsg( 'coll-generating_pdf_title' ) ); |
| — | — | @@ -534,7 +535,7 @@ |
| 535 | 536 | array( |
| 536 | 537 | 'width' => '100%', |
| 537 | 538 | 'height' => '200', |
| 538 | | - 'src' => $iframe_src, |
| | 539 | + 'src' => wfAppendQuery( $wgPDFServer, $query ), |
| 539 | 540 | 'name' => 'PDF Generation', |
| 540 | 541 | 'frameborder' => 0, ), |
| 541 | 542 | '' ) |
| Index: trunk/extensions/Collection/pdf-server/pdf-server.py |
| — | — | @@ -148,13 +148,10 @@ |
| 149 | 149 | |
| 150 | 150 | self.headers['Content-Type'] = 'application/json' |
| 151 | 151 | self.content = simplejson.dumps({ |
| 152 | | - 'iframe_src': '%s?%s' % ( |
| 153 | | - script_url, |
| 154 | | - urllib.urlencode({ |
| 155 | | - 'command': 'pdf_status', |
| 156 | | - 'collection_id': self.collection_id |
| 157 | | - }), |
| 158 | | - ), |
| | 152 | + 'query': urllib.urlencode({ |
| | 153 | + 'command': 'pdf_status', |
| | 154 | + 'collection_id': self.collection_id |
| | 155 | + }), |
| 159 | 156 | }) |
| 160 | 157 | |
| 161 | 158 | def do_pdf_status(self): |