re bug #25523: add mime.info and mime.types for *.dwg files so that when people add...

[lhc/web/wiklou.git] / includes / upload / UploadFromStash.php

diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 06eb163..804db6b 100644 (file)
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -1,70 +1,89 @@
 <?php
 /**
+ * Implements uploading from previously stored file.
+ *
  * @file
  * @ingroup upload
- * 
- * Implements uploading from previously stored file.
- * 
  * @author Bryan Tong Minh
  */
- 
+
 class UploadFromStash extends UploadBase {
        public static function isValidSessionKey( $key, $sessionData ) {
-               return !empty( $key ) && 
-                       is_array( $sessionData ) && 
-                       isset( $sessionData[$key] ) && 
-                       isset( $sessionData[$key]['version'] ) && 
-                       $sessionData[$key]['version'] == self::SESSION_VERSION;
+               return !empty( $key ) &&
+                       is_array( $sessionData ) &&
+                       isset( $sessionData[$key] ) &&
+                       isset( $sessionData[$key]['version'] ) &&
+                       $sessionData[$key]['version'] == UploadBase::SESSION_VERSION;
        }
 
        public static function isValidRequest( $request ) {
-               $sessionData = $request->getSessionData( 'wsUploadData' );
-               return self::isValidSessionKey( 
-                       $request->getInt( 'wpSessionKey' ),
+               $sessionData = $request->getSessionData( UploadBase::SESSION_KEYNAME );
+               return self::isValidSessionKey(
+                       $request->getText( 'wpSessionKey' ),
                        $sessionData
                );
        }
-       /*
-        * some $na vars for uploadBase method compatibility.
-        */
-       public function initialize( $name, $sessionData, $na, $na2=false ) {
-                       /**
-                        * Confirming a temporarily stashed upload.
-                        * We don't want path names to be forged, so we keep
-                        * them in the session on the server and just give
-                        * an opaque key to the user agent.
-                        */
-                       parent::initialize( $name,
-                               $sessionData['mTempPath'],
-                               $sessionData['mFileSize'],
-                               false
-                       );
 
-                       $this->mFileProps = $sessionData['mFileProps'];
+       public function initialize( $name, $sessionKey, $sessionData ) {
+               /**
+                * Confirming a temporarily stashed upload.
+                * We don't want path names to be forged, so we keep
+                * them in the session on the server and just give
+                * an opaque key to the user agent.
+                */
+
+               $this->initializePathInfo( $name,
+                       $this->getRealPath ( $sessionData['mTempPath'] ),
+                       $sessionData['mFileSize'],
+                       false
+               );
+
+               $this->mSessionKey = $sessionKey;
+               $this->mVirtualTempPath = $sessionData['mTempPath'];
+               $this->mFileProps = $sessionData['mFileProps'];
+               $this->mSourceType = isset( $sessionData['mSourceType'] ) ?
+                       $sessionData['mSourceType'] : null;
        }
 
        public function initializeFromRequest( &$request ) {
-               $sessionKey = $request->getInt( 'wpSessionKey' );
-               $sessionData = $request->getSessionData('wsUploadData');
+               $sessionKey = $request->getText( 'wpSessionKey' );
+               $sessionData = $request->getSessionData( UploadBase::SESSION_KEYNAME );
 
                $desiredDestName = $request->getText( 'wpDestFile' );
                if( !$desiredDestName )
                        $desiredDestName = $request->getText( 'wpUploadFile' );
-               return $this->initialize( $desiredDestName, $sessionData[$sessionKey], false );
+               return $this->initialize( $desiredDestName, $sessionKey, $sessionData[$sessionKey] );
+       }
+
+       public function getSourceType() { 
+               return $this->mSourceType; 
        }
 
        /**
         * File has been previously verified so no need to do so again.
         */
-       protected function verifyFile( $tmpfile ) {
+       protected function verifyFile() {
                return true;
        }
 
+
+       /**
+        * There is no need to stash the image twice
+        */
+       public function stashSession( $key = null ) {
+               if ( !empty( $this->mSessionKey ) )
+                       return $this->mSessionKey;
+               return parent::stashSession();
+       }
+
        /**
-        * We're here from "ignore warnings anyway" so return just OK
+        * Remove a temporarily kept file stashed by saveTempUploadedFile().
+        * @return success
         */
-       public function checkWarnings() {
-               return array();
+       public function unsaveUploadedFile() {
+               $repo = RepoGroup::singleton()->getLocalRepo();
+               $success = $repo->freeTemp( $this->mVirtualTempPath );
+               return $success;
        }
 
 }
\ No newline at end of file