2 files changed, 43 insertions, 14 deletions

diff --git a/server/core/Image.php b/server/core/Image.php
index bf67e75..c9d9845 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -8,27 +8,27 @@ class Image {
 	protected $oidentity;
 	//protected $plugins;
 
-	/*
+	/**
 	* Constructor 
 	*
 	* @param $openstack
 	*		
 	* @param $options
 	*
-	*/
+	**/
 	public function __construct($ostack, $options){ //, $apiP
 		$this->oidentity = $ostack->imagesV2($options);
 		//$this->plugins = $apiP;
 	}
 
 
-	/*
+	/**
 	* Details about an image
 	*
 	* @param array $opt
 	*	options for the image creation
 	*
-	*/
+	**/
 	public function create_image(array $opt){
 		// VOIR COMMENT RENDRE LES CHAMPS OPTIONNELS (SAUF NAME)
 		$image = $this->oidentity->createImage([
@@ -54,13 +54,13 @@ class Image {
 		return $images;
 	}
 
-	/*
+	/**
 	* Details about an image
 	*
 	* @param string $id
 	*	identifier of the image
 	*
-	*/
+	**/
 	public function image_details($id){
 		$service = $this->oidentity;
 		$image = $service->getImage($id);
@@ -84,27 +84,50 @@ class Image {
 		return $image;
 	}
 
-	// RETOUR A VOIR
-	public function delete_image($name){
+	/**
+	* Delete an image
+	*
+	* @param string $id
+	*	identifier of the image
+	**/
+	public function delete_image($id){
 		$service = $this->oidentity;
-		$service->getImage($name)->delete();
+		$service->getImage($id)->delete();
 	}
 
-	// RETOUR A VOIR
+	/**
+	* Resactive an image
+	*
+	* @param string $id
+	*	identifier of the image
+	**/
 	public function reactivate_image($id){
 		$service = $this->oidentity;
 		$image = $service->getImage($id);
 		$image->reactivate();
 	}
 
-	// RETOUR A VOIR
-	public function desactivate_function($id){
+	/**
+	* Desactive an image
+	*
+	* @param string $id
+	*	identifier of the image
+	**/
+	public function desactivate_image($id){
 		$service = $this->oidentity;
 		$image = $service->getImage($id);
 		$image->deactivate();
 	}
 
-	// RETOUR A VOIR
+	/**
+	* Upload an image
+	*
+	* @param string $id
+	*	identifier of the image
+	* 
+	* @param string $file_name
+	*	path of the image
+	**/
 	public function upload_image($id, $file_name){
 		$service = $this->oidentity;
 		$image  = $service->getImage($id);
diff --git a/server/test.php b/server/test.php
index ce262fa..322dee4 100644
--- a/server/test.php
+++ b/server/test.php
@@ -43,7 +43,7 @@ $opt['containerFormat'] = 'ami';
 $opt['diskFormat'] = 'iso';
 $opt['visibility'] = 'public';
 $opt['minDisk'] = 1;
-$opt['protected'] = true;
+$opt['protected'] = false;
 $opt['minRam'] = 10;
 
 //$new_image = $image->create_image($opt);
@@ -58,6 +58,7 @@ foreach($images as $i){
 	echo $i->name;
     if($i->name == "Test"){
         $id_image = $i->id;
+        echo $i->status;
     }
     echo "</br>";
 }
@@ -69,5 +70,10 @@ echo "</br>";
 
 //$image->delete_image($id_image);
 
+//$image->desactivate_image($id_image);
+//$image->reactivate_image($id_image);
+
+//$file_name = "/home/yogg/Downloads/TinyCore-6.4.1.iso";
+//$image->upload_image($id_image, $file_name);
 
 ?>
\ No newline at end of file