loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debut Upload

Browse source
This commit is contained in:
Eole 2016-05-08 20:52:31 +02:00
parent 39865ef592
commit 4bac080418
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/partials/image/edit.html Normal file → Executable file
View file

@ -34,7 +34,7 @@
</fieldset> </fieldset>
</form> </form>
<form action="../server/index.php" method="post" ng-if='image.status == "queued"'> <form action="../server/index.php" enctype="multipart/form-data" method="post" ng-if='image.status == "queued"'>
<input type="hidden" name="task" value="image" /> <input type="hidden" name="task" value="image" />
<input type="hidden" name="token" value="{{ getToken()}}" /> <input type="hidden" name="token" value="{{ getToken()}}" />
<input type="hidden" name="action" value="uploadImage" /> <input type="hidden" name="action" value="uploadImage" />

25
server/core/Image.php
View file

@ -388,9 +388,28 @@ class image implements Core{
*/ */
private function uploadImage(){ private function uploadImage(){
$id = $this->app->getPostParam("id"); $id = $this->app->getPostParam("id");
$file_name = $this->app->getPostParam("file_name");
$file = $this->app->getPostParam("file"); $file = $this->app->getPostParam("file");
error_log(print_r($file, true), 0); $file_name = $_FILES['file']['name'];
$file_error = $_FILES['file']['error'];
$file_tmp = $_FILES['file']['tmp_name'];
switch($file_error){
case UPLOAD_ERR_INI_SIZE:
$this->app->setOutput("Error", "File Size exceeds Maximum");
return;
case UPLOAD_ERR_FORM_SIZE:
case UPLOAD_ERR_PARTIAL:
$this->app->setOutput("Error", "Incorrect id parameter");
return;
case UPLOAD_ERR_NO_FILE:
$this->app->setOutput("Error", "File Upload incomplete");
return;
}
if( !is_uploaded_file($file_tmp) )
{
$this->app->setOutput("Error", "File Upload Error");
return;
}
if(!isset($id)){ if(!isset($id)){
$this->app->setOutput("Error", "Incorrect id parameter"); $this->app->setOutput("Error", "Incorrect id parameter");
@ -405,7 +424,7 @@ class image implements Core{
if($image == null){ // if the image don't exists -> error if($image == null){ // if the image don't exists -> error
$this->app->setOutput("Error", "Image doesn't exist"); $this->app->setOutput("Error", "Image doesn't exist");
} }
$stream = \GuzzleHttp\Psr7\stream_for($file); $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_tmp, 'r'));
$image->uploadData($stream); $image->uploadData($stream);
}catch(BadResponseError $e){ }catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e); $this->app->getErrorInstance()->BadResponseHandler($e);