| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -129,7 +129,7 @@ |
| 130 | 130 | * |
| 131 | 131 | * @param $session_id String: the session id to grab download details from |
| 132 | 132 | * @param $upload_session_key String: the key of the given upload session |
| 133 | | - * (a given client could have started a few http uploads at once) |
| | 133 | + * (a given client could have started a few http uploads at once) |
| 134 | 134 | */ |
| 135 | 135 | public static function doSessionIdDownload( $session_id, $upload_session_key ){ |
| 136 | 136 | global $wgUser, $wgEnableWriteAPI, $wgAsyncHTTPTimeout; |
| — | — | @@ -154,9 +154,9 @@ |
| 155 | 155 | session_write_close(); |
| 156 | 156 | |
| 157 | 157 | $req = new HttpRequest( $sd['url'], array( |
| 158 | | - 'target_file_path' => $sd['target_file_path'], |
| | 158 | + 'target_file_path' => $sd['target_file_path'], |
| 159 | 159 | 'upload_session_key'=> $upload_session_key, |
| 160 | | - 'timeout' => $wgAsyncHTTPTimeout |
| | 160 | + 'timeout' => $wgAsyncHTTPTimeout |
| 161 | 161 | ) ); |
| 162 | 162 | // run the actual request .. (this can take some time) |
| 163 | 163 | wfDebug( __METHOD__ . "do Request: " . $sd['url'] . ' tf: ' . $sd['target_file_path'] ); |
| — | — | @@ -264,9 +264,9 @@ |
| 265 | 265 | * Get the contents of a file by HTTP |
| 266 | 266 | * @param $url string Full URL to act on |
| 267 | 267 | * @param $Opt associative array Optional array of options: |
| 268 | | - * 'method' => 'GET', 'POST' etc. |
| 269 | | - * 'target_file_path' => if curl should output to a target file |
| 270 | | - * 'adapter' => 'curl', 'soket' |
| | 268 | + * 'method' => 'GET', 'POST' etc. |
| | 269 | + * 'target_file_path' => if curl should output to a target file |
| | 270 | + * 'adapter' => 'curl', 'soket' |
| 271 | 271 | */ |
| 272 | 272 | public function doRequest() { |
| 273 | 273 | # Use curl if available |
| — | — | @@ -278,9 +278,9 @@ |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | private function doCurlReq(){ |
| 282 | | - global $wgHTTPProxy, $wgTitle; |
| | 282 | + global $wgHTTPProxy, $wgTitle; |
| 283 | 283 | |
| 284 | | - $status = Status::newGood(); |
| | 284 | + $status = Status::newGood(); |
| 285 | 285 | $c = curl_init( $this->url ); |
| 286 | 286 | |
| 287 | 287 | // proxy setup: |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | var $mDestWarningAck; |
| 29 | 29 | var $mLocalFile; |
| 30 | 30 | |
| 31 | | - var $mUpload; // Instance of UploadBase or derivative |
| | 31 | + var $mUpload; // Instance of UploadBase or derivative |
| 32 | 32 | |
| 33 | 33 | # Placeholders for text injection by hooks (must be HTML) |
| 34 | 34 | # extensions should take care to _append_ to the present value |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | $this->mReUpload = $request->getCheck( 'wpReUpload' ); |
| 79 | 79 | |
| 80 | 80 | $this->mAction = $request->getVal( 'action' ); |
| 81 | | - $this->mUpload = UploadBase::createFromRequest( $request ); |
| | 81 | + $this->mUpload = UploadBase::createFromRequest( $request ); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | |
| — | — | @@ -156,14 +156,14 @@ |
| 157 | 157 | * |
| 158 | 158 | * FIXME this should really use the standard Status class (instead of associative array) |
| 159 | 159 | * FIXME would be nice if we refactored this into the upload api. |
| 160 | | - * (the special upload page is not the only response point that needs clean localized error msgs) |
| | 160 | + * (the special upload page is not the only response point that needs clean localized error msgs) |
| 161 | 161 | * |
| 162 | 162 | * @access private |
| 163 | 163 | */ |
| 164 | 164 | function processUpload(){ |
| 165 | 165 | global $wgOut, $wgFileExtensions, $wgLang; |
| 166 | | - $details = $this->internalProcessUpload(); |
| 167 | | - switch( $details['status'] ) { |
| | 166 | + $details = $this->internalProcessUpload(); |
| | 167 | + switch( $details['status'] ) { |
| 168 | 168 | case UploadBase::SUCCESS: |
| 169 | 169 | $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() ); |
| 170 | 170 | break; |
| — | — | @@ -239,7 +239,7 @@ |
| 240 | 240 | |
| 241 | 241 | default: |
| 242 | 242 | throw new MWException( __METHOD__ . ": Unknown value `{$details['status']}`" ); |
| 243 | | - } |
| | 243 | + } |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | /** |
| — | — | @@ -835,7 +835,7 @@ |
| 836 | 836 | Xml::element( 'legend', null, wfMsg( 'upload' ) ) . |
| 837 | 837 | Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-upload-table' ) ) . |
| 838 | 838 | "<tr> |
| 839 | | - {$this->uploadFormTextTop} |
| | 839 | + {$this->uploadFormTextTop} |
| 840 | 840 | <td class='mw-label'> |
| 841 | 841 | <label for='wpUploadFile'>{$sourcefilename}</label> |
| 842 | 842 | </td> |