| Index: trunk/phase3/includes/upload/UploadFromChunks.php |
| — | — | @@ -2,9 +2,9 @@ |
| 3 | 3 | /** |
| 4 | 4 | * @file |
| 5 | 5 | * @ingroup upload |
| 6 | | - * |
| | 6 | + * |
| 7 | 7 | * @author Michael Dale |
| 8 | | - * |
| | 8 | + * |
| 9 | 9 | * first destination checks are made (if ignorewarnings is not checked) errors / warning is returned. |
| 10 | 10 | * |
| 11 | 11 | * we return the uploadUrl |
| — | — | @@ -22,8 +22,10 @@ |
| 23 | 23 | const INIT = 1; |
| 24 | 24 | const CHUNK = 2; |
| 25 | 25 | const DONE = 3; |
| 26 | | - |
| 27 | | - function initializeFromParams( $param, &$request ) { |
| | 26 | + public function initializeFromRequest( &$request ){ |
| | 27 | + //should merge initializeFromParams (but just needs to be working atm) |
| | 28 | + } |
| | 29 | + public function initializeFromParams( $param, &$request ) { |
| 28 | 30 | $this->initFromSessionKey( $param['chunksessionkey'], $request ); |
| 29 | 31 | // set the chunk mode: |
| 30 | 32 | if( !$this->mSessionKey && !$param['done'] ){ |
| — | — | @@ -46,7 +48,6 @@ |
| 47 | 49 | |
| 48 | 50 | return $this->status; |
| 49 | 51 | } |
| 50 | | - |
| 51 | 52 | static function isValidRequest( $request ) { |
| 52 | 53 | $sessionData = $request->getSessionData( 'wsUploadData' ); |
| 53 | 54 | if( !self::isValidSessionKey( |