diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html
index 971cf65..a8825c5 100644
--- a/client/partials/image/edit.html
+++ b/client/partials/image/edit.html
@@ -38,7 +38,6 @@
                     <input type="hidden" name="task" value="image" />
                     <input type="hidden" name="token" value="{{ getToken()}}" />
                     <input type="hidden" name="action" value="uploadImage" />
-                    <input type="hidden" name="diskFormat" value="QCOW2" />
 
                     <input type="hidden" name="id" value="{{ image.id}}" />
                     <input type="hidden" name="file_name" value="cirros-0.3.4-x86_64-disk.img" />
diff --git a/server/core/Image.php b/server/core/Image.php
index 9a28f4a..00f061f 100755
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -1,14 +1,14 @@
 <?php
-
 /**
- * File containing the Image Class.
- *
- * @version 1.0 Initialisation of this file
- * @since 1.0 Core application's file
- * 
- * @author Evan Pisani 'yogg at epsina . com'
- * 
- */
+* File containing the Image Class.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Evan Pisani 'yogg at epsina . com'
+* 
+*/
+
 use OpenCloud\Common\Error\BadResponseError;
 use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
@@ -17,638 +17,670 @@ use OpenCloud\Common\Error\UserInputError;
 require_once("CoreInterface.php");
 
 /**
- * Image Class of the back-end application
- *
- * Management of images
- *
- */
-class image implements Core {
+* Image Class of the back-end application
+*
+* Management of images
+*
+*/
+class image implements Core{ 
 
-    /** @var App $app protected, contains the main app object */
-    protected $app;
+	/** @var App $app protected, contains the main app object */
+	protected $app;
+	
+	/** @var OpenStack\Image $libClass protected, contains the library Image object */
+	protected $libClass;
+	
+	/**
+	* Image constructor
+	*
+	* @param App $app the main app object
+	*
+	* @return image Object
+	*/
+	public function __construct($app){
+		if(!isset($app)){
+			$this->app->setOutput("Error", "Incorrect parameter app");
+		}
+		$this->app = $app;
+		$this->libClass = $app->getLibClass("Image");
+	}
 
-    /** @var OpenStack\Image $libClass protected, contains the library Image object */
-    protected $libClass;
 
-    /**
-     * Image constructor
-     *
-     * @param App $app the main app object
-     *
-     * @return image Object
-     */
-    public function __construct($app) {
-        if (!isset($app)) {
-            $this->app->setOutput("Error", "Incorrect parameter app");
-        }
-        $this->app = $app;
-        $this->libClass = $app->getLibClass("Image");
-    }
+	/**
+	* Execute an action
+	*
+	* @param String $action name of another function of this class
+	*
+	* @return void
+	*/
+	public function action($action){
+		$this->{$action.""}();	
+	}
 
-    /**
-     * Execute an action
-     *
-     * @param String $action name of another function of this class
-     *
-     * @return void
-     */
-    public function action($action) {
-        $this->{$action . ""}();
-    }
+	/**
+	* Create a new image
+	*
+	* @param array $opt Options for the image creation (name is required, others are optionals)
+	*
+	* @return void
+	*/
+	private function createImage(){
+		$opt = $this->app->getPostParam("opt");
 
-    /**
-     * Create a new image
-     *
-     * @param array $opt Options for the image creation (name is required, others are optionals)
-     *
-     * @return void
-     */
-    private function createImage() {
-        $opt = $this->app->getPostParam("opt");
+		if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect parameter opt");
+		}
 
-        if (!isset($opt)) {
-            $this->app->setOutput("Error", "Incorrect parameter opt");
-        }
+		try{	
+			$options = Array();
 
-        try {
-            $options = Array();
+			// Check the image name
+			if(isset($opt['name'])){ 
+				$imagesList = $this->listImage();
+				if(isset($imagesList)){
+					foreach($imagesList as $image){
+						if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error
+							$this->app->setOutput("Error", "Image name already exists");
+						}
+					}
+				}
+				$options['name'] = $opt['name'];
+			}
+			else{
+				$this->app->setOutput("Error", "Missing parameter 'name' for the new image");
+			}
 
-            // Check the image name
-            if (isset($opt['name'])) {
-                $imagesList = $this->listImage();
-                if (isset($imagesList)) {
-                    foreach ($imagesList as $image) {
-                        if (strcmp($image->name, $opt['name']) == 0) { // if the image name already exists -> error
-                            $this->app->setOutput("Error", "Image name already exists");
-                        }
-                    }
-                }
-                $options['name'] = $opt['name'];
-            } else {
-                $this->app->setOutput("Error", "Missing parameter 'name' for the new image");
-            }
+			//  Check optionals arguments
+			if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
+				if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error
+					$this->app->setOutput("Error", "Image id already exists");
+				}
+				$options['id'] = $opt['id'];
+			}
+			if(isset($opt['visibility'])){ // public, private
+				$options['visibility'] = $opt['visibility'];
+			}
+			if(isset($opt['tags'])){ // list
+				$options['tags'] = $opt['tags'];
+			}
+			if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker
+				$options['containerFormat'] = $opt['containerFormat'];
+			}else{
+				$options['containerFormat'] = "bare";
+			}
+			if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
+				$options['diskFormat'] = $opt['diskFormat'];
+			}else{
+				$options['diskFormat'] = "iso";
+			}
+			if(isset($opt['minDisk'])){ //int
+				$options['minDisk'] = $opt['minDisk'];
+			}
+			if(isset($opt['minRam'])){ // int
+				$options['minRam'] = $opt['minRam'];
+			}
+			if(isset($opt['protected'])){ // boolean
+				$options['protected'] = $opt['protected'];
+			}
+			if(isset($opt['properties'])){ // type dict 
+				$options['properties'] = $opt['properties'];
+			}	
 
-            //  Check optionals arguments
-            if (isset($opt['id'])) { // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
-                if ($this->libClass->getImage($opt['id']) != null) { // if the id already exists -> error
-                    $this->app->setOutput("Error", "Image id already exists");
-                }
-                $options['id'] = $opt['id'];
-            }
-            if (isset($opt['visibility'])) { // public, private
-                $options['visibility'] = $opt['visibility'];
-            }
-            if (isset($opt['tags'])) { // list
-                $options['tags'] = $opt['tags'];
-            }
-            if (isset($opt['containerFormat'])) { // string : ami, ari, aki, bare, ovf, ova, docker
-                $options['containerFormat'] = $opt['containerFormat'];
-            }
-            if (isset($opt['diskFormat'])) { // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
-                $options['diskFormat'] = $opt['diskFormat'];
-            }
-            if (isset($opt['minDisk'])) { //int
-                $options['minDisk'] = $opt['minDisk'];
-            }
-            if (isset($opt['minRam'])) { // int
-                $options['minRam'] = $opt['minRam'];
-            }
-            if (isset($opt['protected'])) { // boolean
-                $options['protected'] = $opt['protected'];
-            }
-            if (isset($opt['properties'])) { // type dict 
-                $options['properties'] = $opt['properties'];
-            }
+			$image = $this->libClass->createImage($options);
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+		}catch(UserInputError $e){
+			$this->app->getErrorInstance()->UserInputHandler($e);
+		}catch(BaseError $e){
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
+		}catch(NotImplementedError $e){
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
+		$this->app->setOutput("Images", $image);
 
-            $image = $this->libClass->createImage($options);
-        } catch (BadResponseError $e) {
-            $this->app->getErrorInstance()->BadResponseHandler($e);
-        } catch (UserInputError $e) {
-            $this->app->getErrorInstance()->UserInputHandler($e);
-        } catch (BaseError $e) {
-            $this->app->getErrorInstance()->BaseErrorHandler($e);
-        } catch (NotImplementedError $e) {
-            $this->app->getErrorInstance()->NotImplementedHandler($e);
-        } catch (Exception $e) {
-            $this->app->getErrorInstance()->OtherException($e);
-        }
-        $this->app->setOutput("Images", $image);
-    }
+	}
 
-    /**
-     * List the images of the server
-     *
-     * @return void
-     */
-    private function listImage() {
-        try {
-            $result = array();
-            $l = $this->libClass->listImages();
-            foreach ($l as $tmp) {
-                $result[] = $tmp;
-            }
-        } catch (BadResponseError $e) {
-            $this->app->getErrorInstance()->BadResponseHandler($e);
-        } catch (UserInputError $e) {
-            $this->app->getErrorInstance()->UserInputHandler($e);
-        } catch (BaseError $e) {
-            $this->app->getErrorInstance()->BaseErrorHandler($e);
-        } catch (NotImplementedError $e) {
-            $this->app->getErrorInstance()->NotImplementedHandler($e);
-        } catch (Exception $e) {
-            $this->app->getErrorInstance()->OtherException($e);
-        }
+	/**
+	* List the images of the server
+	*
+	* @return void
+	*/
+	private function listImage(){
+		try{
+			$result = array();
+			$l = $this->libClass->listImages();
+			foreach($l as $tmp){
+				$result[] = $tmp;
+			}
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+		}catch(UserInputError $e){
+			$this->app->getErrorInstance()->UserInputHandler($e);
+		}catch(BaseError $e){
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
+		}catch(NotImplementedError $e){
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 
-        $this->app->setOutput("Images", $result);
-    }
+		$this->app->setOutput("Images", $result);
 
-    /**
-     * Details about an image
-     *
-     * @param String $id Identifier of the image
-     * 	
-     * @return void
-     */
-    private function detailsImage() {
-        $id = $this->app->getPostParam("id");
+	}
 
-        if (!isset($id)) {
-            $this->app->setOutput("Error", "Incorrect id parameter");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                } else {
-                    $this->app->setOutput("Images", $image);
-                }
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+	/**
+	* Details about an image
+	*
+	* @param String $id Identifier of the image
+	*	
+	* @return void
+	*/
+	private function detailsImage(){
+		$id = $this->app->getPostParam("id");
 
-    /**
-     * Update informations about an image
-     *
-     * @param String $id id of the image
-     * @param array  $opt Options for the image creation
-     * 	
-     * @return void
-     */
-    private function updateImage() {
-        $id = $this->app->getPostParam("id");
-        $opt = $this->app->getPostParam("opt");
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter"); 
+		}
+		else{
+			try{
+				$service = $this->libClass;
+				$image = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
+				else{
+					$this->app->setOutput("Images", $image);
+				}
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
+	}
 
-        if (!isset($id)) {
-            $this->app->setOutput("Error", "Incorrect id parameter");
-        } else if (!isset($opt)) {
-            $this->app->setOutput("Error", "Incorrect opt parameter");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
+	/**
+	* Update informations about an image
+	*
+	* @param String $id id of the image
+	* @param array  $opt Options for the image creation
+	*	
+	* @return void
+	*/
 
-                $options = Array();
+	private function updateImage(){
+		$id = $this->app->getPostParam("id");
+		$opt = $this->app->getPostParam("opt");
 
-                // Voir vérification des types
-                if (isset($opt['name'])) { //string
-                    $options['name'] = $opt['name'];
-                }
-                if (isset($opt['minDisk'])) { //int
-                    $options['minDisk'] = $opt['minDisk'];
-                }
-                if (isset($opt['minRam'])) { // int
-                    $options['minRam'] = $opt['minRam'];
-                }
-                if (isset($opt['protected'])) { // boolean
-                    $options['protected'] = $opt['protected'] == "true" ? true : false;
-                }
-                if (isset($opt['visibility'])) { // public, private
-                    $options['visibility'] = $opt['visibility'];
-                }
-                if (isset($opt['tags'])) { // list
-                    $options['tags'] = $opt['tags'];
-                }
-                $image->update($options);
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-            $this->app->setOutput("Images", $image);
-        }
-    }
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter"); 
+		}
+		else if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect opt parameter");
+		}
+		else{
+			try{
+				$service = $this->libClass;
+				$image = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
 
-    /**
-     * Delete an image
-     *
-     * @param String $id Identifier of the image
-     * 	
-     * @return void
-     */
-    private function deleteImage() {
-        $id = $this->app->getPostParam("id");
-        if (!isset($id)) {
-            $this->app->setOutput("Error", "Image doesn't exist");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $this->libClass->getImage($id);
-                if ($image == null) { // if the image doesn't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $image->delete();
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+				$options = Array();
 
-    /**
-     * Reactive an image
-     *
-     * @param String $id Identifier of the image
-     * 	
-     * @return void
-     */
-    private function reactivateImage() {
-        $id = $this->app->getPostParam("id");
+				// Voir vérification des types
+				if(isset($opt['name'])){ //string
+					$options['name'] = $opt['name'];
+				}
+				if(isset($opt['minDisk'])){ //int
+					$options['minDisk'] = $opt['minDisk'];
+				}
+				if(isset($opt['minRam'])){ // int
+					$options['minRam'] = $opt['minRam'];
+				}
+				if(isset($opt['protected'])){ // boolean
+					$options['protected'] = $opt['protected'];
+				}
+				if(isset($opt['visibility'])){ // public, private
+					$options['visibility'] = $opt['visibility'];
+				}
+				if(isset($opt['tags'])){ // list
+					$options['tags'] = $opt['tags'];
+				}
+				$image->update($options);
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+			$this->app->setOutput("Images", $image);
+		}
+	}
 
-        if (!isset($id)) {
-            $this->app->setOutput("Error", "Incorrect parameter");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
+	/**
+	* Delete an image
+	*
+	* @param String $id Identifier of the image
+	*	
+	* @return void
+	*/
+	private function deleteImage(){
+		$id = $this->app->getPostParam("id");
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Image doesn't exist");
+		}
+		else{
+			try{
+				$service = $this->libClass;
+				$image = $this->libClass->getImage($id);
+				if($image == null){ // if the image doesn't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
+				$image->delete();
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}	
+		}
+	}
 
-                $image->reactivate();
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+	/**
+	* Reactive an image
+	*
+	* @param String $id Identifier of the image
+	*	
+	* @return void
+	*/
+	private function reactivateImage(){
+		$id = $this->app->getPostParam("id");
 
-    /**
-     * Desactivaate an image
-     *
-     * @param String $id Identifier of the image
-     *
-     * @return void	
-     */
-    private function desactivateImage() {
-        $id = $this->app->getPostParam("id");
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		else
+		{
+			try{
+				$service = $this->libClass;
+				$image = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
 
-        if (!isset($id)) {
-            $this->app->setOutput("Error", "Incorrect parameter");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $image->deactivate();
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+				$image->reactivate();
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
+	}
 
-    /**
-     * Upload an image
-     *
-     * @param String $id Identifier of the image
-     * @param String $file_name Path of the image
-     * 	
-     * @return void
-     */
-    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);
+	/**
+	* Desactivaate an image
+	*
+	* @param String $id Identifier of the image
+	*
+	* @return void	
+	*/
+	private function desactivateImage(){
+		$id = $this->app->getPostParam("id");
 
-        if (!isset($id)) {
-            $this->app->setOutput("Error", "Incorrect id parameter");
-        } else if (!isset($file_name)) {
-            $this->app->setOutput("Error", "Incorrect file name parameter");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $stream = \GuzzleHttp\Psr7\stream_for($file);
-                $image->uploadData($stream);
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		else
+		{
+			try{
+				$service = $this->libClass;
+				$image = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
+				$image->deactivate();
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
+	}
 
-    /**
-     * Download an image
-     *
-     * @param String $id Identifier of the image
-     *
-     * @return void
-     */
-    private function downloadImage() {
-        $id = $this->app->getPostParam("id");
+	/**
+	* Upload an image
+	*
+	* @param String $id Identifier of the image
+	* @param String $file_name Path of the image
+	*	
+	* @return void
+	*/
+	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");
+		}
+		else if(!isset($file_name)){
+			$this->app->setOutput("Error", "Incorrect file name parameter");
+		}
+		else{
+			try{
+				$service = $this->libClass;
+				$image  = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
+				$stream = \GuzzleHttp\Psr7\stream_for($file);
+				$image->uploadData($stream);
+			}catch(BadResponseError $e){
+				echo $e;
+				//$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
+	}
 
-        if (!isset($id)) {
-            $this->app->setOutput("Error", "Incorrect id parameter");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $stream = $image->downloadData();
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-            $this->app->setOutput("Images", $stream);
-        }
-    }
+	/**
+	* Download an image
+	*
+	* @param String $id Identifier of the image
+	*
+	* @return void
+	*/
+	private function downloadImage(){
+		$id = $this->app->getPostParam("id");
 
-    /**
-     * Add a member to image
-     *
-     * @param String $image_id Identifier of the image
-     * @param String $member_id Identifier of the member
-     * 	
-     * @return void
-     */
-    private function addMemberImage() {
-        $image_id = $this->app->getPostParam("image_id");
-        $member_id = $this->app->getPostParam("member_id");
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter");
+		}
+		else{
+			try{
+				$service = $this->libClass;
+				$image  = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
+				$stream = $image->downloadData();
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+			$this->app->setOutput("Images", $stream);
+		}
+	}
 
-        if (!isset($image_id)) {
-            $this->app->setOutput("Error", "Incorrect image id parameter");
-        } else if (!isset($member_id)) {
-            $this->app->setOutput("Error", "Incorrect member id parameter");
-        } else {
-            try {
-                $service = $this->libClass;
+	/**
+	* Add a member to image
+	*
+	* @param String $image_id Identifier of the image
+	* @param String $member_id Identifier of the member
+	*	
+	* @return void
+	*/
+	private function addMemberImage(){
+		$image_id = $this->app->getPostParam("image_id");
+		$member_id = $this->app->getPostParam("member_id");
 
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $member_id = $image->addMember($member_id);
-                $this->app->setOutput("Images", $member_id);
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect image id parameter");
+		}
+		else if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect member id parameter");
+		}
+		else{
+			try{
+				$service = $this->libClass;	
 
-    /**
-     * List members of an image
-     *
-     * @param String $image_id identifier of the image
-     *
-     * @return void
-     */
-    private function listMemberImage() {
-        $image_id = $this->app->getPostParam("image_id");
-        $member_id = $this->app->getPostParam("member_id");
+				$image  = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
+				$member_id = $image->addMember($member_id);
+				$this->app->setOutput("Images", $member_id);
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
+	}
 
-        if (!isset($image_id)) {
-            $this->app->setOutput("Error", "Incorrect image id parameter");
-        } else if (!isset($member_id)) {
-            $this->app->setOutput("Error", "Incorrect member id parameter");
-        } else {
-            try {
-                $service = $this->libClass;
-                $image = $service->getImage($image_id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $members = $image->listMembers();
-                if ($members == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "No member");
-                }
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-            $this->app->setOutput("Images", $members);
-        }
-    }
+	
+	/**
+	* List members of an image
+	*
+	* @param String $image_id identifier of the image
+	*
+	* @return void
+	*/
+	private function listMemberImage(){
+		$image_id = $this->app->getPostParam("image_id");
+		$member_id = $this->app->getPostParam("member_id");
 
-    /**
-     * Show details of a member of an image
-     *
-     * @param String $image_id Identifier of the image
-     * @param String $member_id Identifier of the member
-     *
-     * @return void
-     */
-    private function detailMemberImage() {
-        $image_id = $this->app->getPostParam("image_id");
-        $member_id = $this->app->getPostParam("member_id");
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect image id parameter");
+		}
+		else if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect member id parameter"); 
+		}
+		else{
+			try{
+				$service = $this->libClass;
+				$image = $service->getImage($image_id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist"); 
+				}
+				$members = $image->listMembers();
+				if($members == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "No member");
+				}
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+			$this->app->setOutput("Images", $members);
+		}
+	}
 
-        if (!isset($image_id)) {
-            $this->app->setOutput("Error", "Incorrect image id parameter");
-        } else if (!isset($member_id)) {
-            $this->app->setOutput("Error", "Incorrect member id parameter");
-        } else {
-            try {
-                $service = $this->libClass;
+	/**
+	* Show details of a member of an image
+	*
+	* @param String $image_id Identifier of the image
+	* @param String $member_id Identifier of the member
+	*
+	* @return void
+	*/
+	private function detailMemberImage(){
+		$image_id = $this->app->getPostParam("image_id");
+		$member_id = $this->app->getPostParam("member_id");
 
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect image id parameter"); 
+		}
+		else if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect member id parameter");
+		}
+		else{
+			try{
+				$service = $this->libClass;	
 
-                $member = $image->getMember($member_id);
-                if ($member == null) { // if the member don't exists -> error
-                    $this->app->setOutput("Error", "Member doesn't exist");
-                }
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-            $this->app->setOutput("Images", $member);
-        }
-    }
+				$image  = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
 
-    /**
-     * Remove a member of an image
-     *
-     * @param String $image_id Identifier of the image
-     * @param String $member_id Identifier of the member
-     * 	
-     * @return void
-     */
-    private function removeMemberImage() {
-        $image_id = $this->app->getPostParam("image_id");
-        $member_id = $this->app->getPostParam("member_id");
+				$member = $image->getMember($member_id);
+				if($member == null){ // if the member don't exists -> error
+					$this->app->setOutput("Error", "Member doesn't exist");
+				}
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+			$this->app->setOutput("Images", $member);
+		}
+	}
+	
+	/**
+	* Remove a member of an image
+	*
+	* @param String $image_id Identifier of the image
+	* @param String $member_id Identifier of the member
+	*	
+	* @return void
+	*/
+	private function removeMemberImage(){
+		$image_id = $this->app->getPostParam("image_id");
+		$member_id = $this->app->getPostParam("member_id");
 
-        if (!isset($image_id)) {
-            $this->app->setOutput("Error", "Incorrect image id parameter");
-        } else if (!isset($member_id)) {
-            $this->app->setOutput("Error", "Incorrect member id parameter");
-        } else {
-            try {
-                $service = $this->libClass;
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect image id parameter"); 
+		}
+		else if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect member id parameter");
+		}
+		else{
+			try{
+				$service = $this->libClass;	
 
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $member = $image->getMember($member_id);
-                if ($member == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Member doesn't exist");
-                }
-                $member->delete();
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+				$image  = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}	
+				$member = $image->getMember($member_id);
+				if($member == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Member doesn't exist");
+				}
+				$member->delete();
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
+	}
 
-    /**
-     * Update a member of an image
-     *
-     * @param String $image_id Identifier of the image
-     * @param String $member_id Identifier of the member
-     * @param String $status New status for the member
-     *
-     * @return void
-     * */
-    private function updateMemberImage() {
-        $image_id = $this->app->getPostParam("image_id");
-        $member_id = $this->app->getPostParam("member_id");
-        $status = $this->app->getPostParam("status");
+	/**
+	* Update a member of an image
+	*
+	* @param String $image_id Identifier of the image
+	* @param String $member_id Identifier of the member
+	* @param String $status New status for the member
+	*
+	* @return void
+	**/
+	private function updateMemberImage(){
+		$image_id = $this->app->getPostParam("image_id");
+		$member_id = $this->app->getPostParam("member_id");
+		$status = $this->app->getPostParam("status");
 
-        if (!isset($image_id)) {
-            $this->app->setOutput("Error", "Incorrect image id parameter");
-        } else if (!isset($member_id)) {
-            $this->app->setOutput("Error", "Incorrect member id parameter");
-        } else {
-            try {
-                $service = $this->libClass;
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect image id parameter");
+		}
+		else if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect member id parameter");
+		}
+		else{
+			try{
+				$service = $this->libClass;		
 
-                $image = $service->getImage($id);
-                if ($image == null) { // if the image don't exists -> error
-                    $this->app->setOutput("Error", "Image doesn't exist");
-                }
-                $member = $image->getMember($member_id);
-                if ($member == null) { // if the member don't exists -> error
-                    $this->app->setOutput("Error", "Member doesn't exist");
-                }
-                $member->updateStatus($status);
-            } catch (BadResponseError $e) {
-                $this->app->getErrorInstance()->BadResponseHandler($e);
-            } catch (UserInputError $e) {
-                $this->app->getErrorInstance()->UserInputHandler($e);
-            } catch (BaseError $e) {
-                $this->app->getErrorInstance()->BaseErrorHandler($e);
-            } catch (NotImplementedError $e) {
-                $this->app->getErrorInstance()->NotImplementedHandler($e);
-            } catch (Exception $e) {
-                $this->app->getErrorInstance()->OtherException($e);
-            }
-        }
-    }
+				$image  = $service->getImage($id);
+				if($image == null){ // if the image don't exists -> error
+					$this->app->setOutput("Error", "Image doesn't exist");
+				}
+				$member = $image->getMember($member_id);
+				if($member == null){ // if the member don't exists -> error
+					$this->app->setOutput("Error", "Member doesn't exist");
+				}
+				$member->updateStatus($status);
+			}catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
+	}
 
 }
-
 ?>