$this->mSessionKey = $this->mUpload->stashSession();
- if( $sessionData === false ) {
+ if( $this->mSessionKey === false ) {
# Couldn't save file; an error has been displayed so let's go.
return;
}
} else {
$copyright = '';
}
- //add the wpEditToken
- $token = htmlspecialchars( $wgUser->editToken() );
$wgOut->addHTML(
Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ),
'enctype' => 'multipart/form-data', 'id' => 'uploadwarning' ) ) . "\n" .
- Xml::hidden('wpEditToken', $token) .
+ Xml::hidden('wpEditToken', $wgUser->editToken()) .
Xml::hidden( 'wpIgnoreWarning', '1' ) . "\n" .
Xml::hidden( 'wpSourceType', 'stash' ) . "\n" .
Xml::hidden( 'wpSessionKey', $this->mSessionKey ) . "\n" .
wfMsgHtml( 'upload_source_url' ) ;
}else{
//@@todo depreciate (not needed once $wgEnableJS2system is turned on)
- $filename_form =
+ $filename_form =
"<input type='radio' id='wpSourceTypeFile' name='wpSourceType' value='file' " .
"onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked='checked' />" .
"<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " .
- "onfocus='" .
+ " onfocus='" .
"toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");" .
"toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")' " .
"onchange='fillDestFilename(\"wpUploadFile\")' size='60' />" .
wfMsgHTML( 'upload_source_file' ) . "<br/>" .
- "<input type='radio' id='wpSourceTypeURL' name='wpSourceType' value='Url' " .
+ "<input type='radio' id='wpSourceTypeURL' name='wpSourceType' value='web' " .
"onchange='toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\")' />" .
"<input tabindex='1' type='text' name='wpUploadFileURL' id='wpUploadFileURL' " .
"onfocus='" .
}
} else {
- $filename_form =
- "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' size='60' />" .
- "<input type='hidden' name='wpSourceType' value='upload' />" ;
+ if($wgEnableJS2system){
+ $filename_form =
+ Xml::input( 'wpUploadFile', 60, false, array( 'id'=>'wpUploadFile', 'type'=>'file', 'tabindex' => '1' ) ) .
+ Xml::hidden( 'wpSourceType', 'file');
+ }else{
+ $filename_form =
+ "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' size='60' ".
+ "onchange='fillDestFilename(\"wpUploadFile\")' />" .
+ "<input type='hidden' name='wpSourceType' value='file' />" ;
+ }
}
if ( $useAjaxDestCheck ) {
$encComment = htmlspecialchars( $this->mComment );
//add the wpEditToken
- $token = htmlspecialchars( $wgUser->editToken() );
$wgOut->addHTML(
Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ),
'enctype' => 'multipart/form-data', 'id' => 'mw-upload-form' ) ) .
- Xml::hidden('wpEditToken', $token) .
+ Xml::hidden('wpEditToken', $wgUser->editToken()) .
Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', null, wfMsg( 'upload' ) ) .
Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-upload-table' ) ) .
return false;
}
$mTempPath = $status->value;
- session_start(); // start up the session (might have been previously closed to prevent php session locking)
+ if(!isset($_SESSION))
+ session_start(); // start up the session (might have been previously closed to prevent php session locking)
$key = $this->getSessionKey();
$_SESSION['wsUploadData'][$key] = array(
'mTempPath' => $mTempPath,
'mFileSize' => $this->mFileSize,
- 'mSrcName' => $this->mSrcName,
'mFileProps' => $this->mFileProps,
'version' => self::SESSION_VERSION,
);
$sessionData[$key]['version'] == self::SESSION_VERSION;
}
- static function isValidRequest( &$request ) {
+ static function isValidRequest( $request ) {
$sessionData = $request->getSessionData( 'wsUploadData' );
return self::isValidSessionKey(
$request->getInt( 'wpSessionKey' ),
$sessionData
);
}
-
- function initialize( $name, $sessionData ) {
+ /*
+ * some $na vars for uploadBase method compatibility.
+ */
+ function initialize( $name, $sessionData, $na, $na2=false ) {
/**
* Confirming a temporarily stashed upload.
* We don't want path names to be forged, so we keep
$desiredDestName = $request->getText( 'wpDestFile' );
if( !$desiredDestName )
$desiredDestName = $request->getText( 'wpUploadFile' );
- return $this->initialize( $desiredDestName, $sessionData[$sessionKey] );
+ return $this->initialize( $desiredDestName, $sessionData[$sessionKey], false );
}
/**