From a7bf9306d3844acd160034bb5c64e1ca7ef77ddc Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 3 Apr 2016 11:15:52 +0200 Subject: Test --- server/core/Image.php | 9 +++++---- server/vendor/php-opencloud/openstack | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'server') diff --git a/server/core/Image.php b/server/core/Image.php index c595135..59f7aed 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -389,8 +389,9 @@ class image implements Core{ private function uploadImage(){ $id = $this->app->getPostParam("id"); $file_name = $this->app->getPostParam("file_name"); - - + $file = $this->app->getPostParam("file"); + error_log(print_r($file, true), 0); + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } @@ -405,7 +406,7 @@ class image implements Core{ if($image == null){ // if the image don't exists -> error $this->app->setOutput("Error", "Image doesn't exist"); } - $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); + $stream = \GuzzleHttp\Psr7\stream_for($file); $image->uploadData($stream); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -684,4 +685,4 @@ class image implements Core{ } } -?> \ No newline at end of file +?> diff --git a/server/vendor/php-opencloud/openstack b/server/vendor/php-opencloud/openstack index 6162642..e140ef5 160000 --- a/server/vendor/php-opencloud/openstack +++ b/server/vendor/php-opencloud/openstack @@ -1 +1 @@ -Subproject commit 61626420361a1dab3ed6f9455e1057bda18cc335 +Subproject commit e140ef5ee8f47c5ffa126a581d9e03700a5cdc2f -- cgit v1.2.3