From 6ce1bbc7be91aa6441c3ff168a734ed25479eb72 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Mon, 29 Feb 2016 15:29:30 +0100
Subject: Add error management

---
 server/core/Image.php | 571 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 431 insertions(+), 140 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Image.php b/server/core/Image.php
index 3001eea..4025595 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -1,7 +1,4 @@
 <?php
-
-//require 'CoreInterface.php';
-
 /**
 * File containing the Image Class.
 *
@@ -12,16 +9,18 @@
 * 
 * @todo Complete the functions with errors detection and finish the descriptions
 */
- 
- 
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Common\Error\BaseError;
+use OpenStack\Common\Error\NotImplementedError;
+use OpenStack\Common\Error\UserInputError;
+
 /**
 * Image Class of the back-end application
 *
 * ADD CLASS DESCRIPTION
 *
 */
-class image{ 
-	//implements Core
+class image implements Core{ 
 
 	/** @var App $app protected, contains the main app object */
 	protected $app;
@@ -29,10 +28,6 @@ class image{
 	/** @var OpenStack\Identity $libClass protected, contains the library Identity object */
 	protected $libClass;
 	
-	/** @var array $actions protected, contains the functions which can be call by the front-end */
-	protected $actions = array();
-
-	
 	/**
 	* Image constructor
 	*
@@ -43,12 +38,36 @@ class image{
 	* @return Image
 	*/
 	public function __construct($app){
-		$this->app = $app;
-		$this->libClass = $app->getLibClass("Image");
+		if(!isset($app)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			$this->app = $app;
+			$this->libClass = $app->getLibClass("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);
+        }
 	}
 
 
-	
+	/**
+	* Execute an action
+	*
+	* @param String $action name of another function of this class
+	*
+	* @return void
+	*/
+	public function action($action){
+		
+		 $this->{$action.""}();
+		
+	}
 
 	/**
 	* Details about an image
@@ -57,55 +76,96 @@ class image{
 	*	options for the image creation
 	*
 	**/
-	public function create_image(array $opt){
-		// VOIR SI MAUVAIS TYPE
-		$options = Array();
-		if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris
-		}
-		else{
-			//ERROR
-		}
-		if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
-			$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'];
+	private function createImage(array $opt){
+
+		if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect parameter");
 		}
-		if(isset($opt['properties'])){ // type dict ?
-			$options['properties'] = $opt['properties'];
-		}	
 
-		$image = $this->oidentity->createImage($options);
 
+		try{	
+			// VOIR SI MAUVAIS TYPE
+			$options = Array();
+			if(isset($opt['name'])){ // if the image name already exists -> error
+				$imagesList = listImage();
+				if(isset($images)){
+    				foreach($imagesList as $image){
+    					if(strcmp($image->name, $opt['name']) == 0){
+
+    					}
+    				}
+    			}
+
+			}
+			else{
+				$this->app->setOutput("Error", "Image name already exists");
+			}
+			if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
+				if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error
+
+				}
+				$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);
+        }
 		return $image;
 	}
 
-	/*
-	* List images
+	/**
+	* List the images of the server
+	*
+	* @return the list with all images on the server
 	*/
-	public function list_images(){
-		// vérifier si au moins une image
-		$service = $this->oidentity;
-		$images = $service->listImages();
-		return $images;
+	private function listImage(){
+		try{
+			$l = $this->libClass->listImages();
+			if(!isset($l)){ // if the list is empty there is no images
+				$this->app->setOutput("Error", "No 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);
+        }
+		return $l;
+
 	}
 
 	/**
@@ -115,11 +175,27 @@ class image{
 	*	identifier of the image
 	*
 	**/
-	public function image_details($id){
-		//vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		return $image;
+	private function detailsImage($id){
+		if(!isset($id)){
+			// Renvoyer erreur 
+		}
+		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");
+			}
+			
+			return $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);
+        }
 	}
 
 	/**
@@ -131,33 +207,53 @@ class image{
 	* @param array $opt
 	*	options for the image creation
 	**/
-	public function update_image($id, array $opt){
-		//vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$options = Array();
-
-		// 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'];
+	private function updateImage($id, array $opt){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter"); 
 		}
-		if(isset($opt['visibility'])){ // public, private
-			$options['visibility'] = $opt['visibility'];
+		if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect opt parameter");
 		}
-		if(isset($opt['tags'])){ // list
-			$options['tags'] = $opt['tags'];
-		}
-		$image->update($options);
 
+		try{
+			//vérifier existence image
+			$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");
+			}
+
+			$options = Array();
+
+			// 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);
+        }
 		return $image;
 	}
 
@@ -167,11 +263,30 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function delete_image($id){
+	private function deleteImage($id){
 		// si protected = true, demander de le mettre a false
 		// vérifier existence image
-		$service = $this->oidentity;
-		$service->getImage($id)->delete();
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Image doesn't exist");
+		}
+
+		try{
+			$service = $this->libClass;
+			$image = $this->libClass->getImage($id);
+			if($image == null){ // if the image don'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);
+        }
+		
 	}
 
 	/**
@@ -180,11 +295,27 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function reactivate_image($id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$image->reactivate();
+	private function reactivateImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image
+			$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->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);
+        }
 	}
 
 	/**
@@ -193,11 +324,27 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function desactivate_image($id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$image->deactivate();
+	private function desactivateImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image
+			$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);
+        }
 	}
 
 	/**
@@ -209,12 +356,31 @@ class image{
 	* @param string $file_name
 	*	path of the image
 	**/
-	public function upload_image($id, $file_name){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image  = $service->getImage($id);
-		$stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR
-		$image->uploadData($stream);
+	private function uploadImage($id, $file_name){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter");
+		}
+		if(!isset($file_name)){
+			$this->app->setOutput("Error", "Incorrect file_name parameter");
+		}
+		try{
+			// vérifier existence image
+			$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(fopen($file_name, 'r'));
+			$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);
+        }
 	}
 
 	/**
@@ -223,12 +389,28 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function download_image($id){
-		// vérifier existence image 
-		$service = $this->oidentity;
-		$image  = $service->getImage($id);
-		$stream = $image->downloadData();
-		return $stream;
+	private function downloadImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image 
+			$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);
+        }
+        return $stream;
 	}
 
 	/**
@@ -240,12 +422,30 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function add_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member_id = $service>getImage($image_id)->addMember($member_id);
+	private function addMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		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_id = $image->addMember($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);
+        }
 	}
 
 	
@@ -255,11 +455,33 @@ class image{
 	* @param string $image_id
 	*	identifier of the image
 	**/
-	public function list_member($image_id, $member_id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($image_id);
-		$members = $image->listMembers();
+	private function listMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id"); 
+		}
+		try{
+			// vérifier existence image
+			$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($member == 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);
+        }
 		return $members;
 	}
 
@@ -272,12 +494,37 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function detail_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member = $service>getImage($image_id)->getMember($member_id);
+	private function detailMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id"); 
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			// vérifier existence image
+			// on doit être le proprio de l'image
+			// vérifier membre existe
+			$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");
+			}
+		}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);
+        }
 		return $member;
 	}
 	
@@ -290,12 +537,34 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function remove_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$service>getImage($image_id)->getMember($member_id)->delete();
+	private function removeMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id"); 
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		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);
+        }
 	}
 
 	/**
@@ -310,13 +579,35 @@ class image{
 	* @param string $status
 	*	new status for the member
 	**/
-	public function update_member($image_id, $member_id, $status){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status);
+	private function updateMemberImage($image_id, $member_id, $status){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		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);
+        }
 	}
 
 }
-?> 
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 0298591cee4365f82e41c077f799270ba1647e5b Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Wed, 2 Mar 2016 16:00:46 +0100
Subject: Architecture modification

---
 server/Test/imageTests.php | 89 ++++++++++++++++------------------------------
 server/core/Image.php      | 71 ++++++++++++++++++++++++------------
 2 files changed, 79 insertions(+), 81 deletions(-)

(limited to 'server/core')

diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
index 94ff7b6..3af12fc 100644
--- a/server/Test/imageTests.php
+++ b/server/Test/imageTests.php
@@ -1,35 +1,6 @@
 <?php
-require '../vendor/autoload.php';
-include('/istic-openstack/server/init.php');
-
-/*
-$options = Array();
-$options["user"]  = Array("name"=>"admin", "password"=>"ae5or6cn", "domain"=>["id"=>"Default"]);
-$options["scope"] = Array("project"=>Array("name"=>"admin", "domain"=>["id"=>"Default"]));
-$options["authUrl"] = "http://148.60.11.31:5000/v3"; 
-	 
-$openstack = new OpenStack\OpenStack($options);
-
-//$identity = $openstack->identityV3();
-//var_dump($identity);
-// Since usernames will not be unique across an entire OpenStack installation,
-// when authenticating with them you must also provide your domain ID. You do
-// not have to do this if you authenticate with a user ID.
-/*$token = $identity->generateToken([
-    'user' => [
-        'name'     => 'admin',
-        'password' => 'ae5or6cn',
-        'domain'   => [
-            'id' => 'Default'
-        ]
-    ]
-	]);
- */
-//$compute = $openstack->computeV2(["region" => "RegionOne"]);
-//$image= $openstack->imagesV2(["region" => "RegionOne"]);
-//var_dump($compute->client);
-//$servers = $compute->listServers(true);
-echo 'toto';
+include('InitTest.php');
+include_once("../core/Image.php");
 
 $image = new Image($App);
 
@@ -43,52 +14,54 @@ $opt['minDisk'] = 1;
 $opt['protected'] = false;
 $opt['minRam'] = 10;
 
-//$new_image = $image->create_image($opt);
-
+//$new_image = $image->createImage($opt);
 
 //Liste des images
-$images = $image->list_images();
-
-echo "Images présentes :";
-echo "</br>";
-
-foreach($images as $i){
-	echo $i->name;
-    if($i->name == "Test"){
-        $id_image = $i->id;
-        $list = $i->tags;
-        echo $i->status;
+$image->action("listImage");
+//$images = $image->listImage();
+$im = $App->show();
+$images = json_decode($im, true)["Images"]; 
+if(isset($images)){
+    echo "Images présentes :";
+    echo "</br>";
+    foreach($images as $i){
+    	echo $i['name'];
+        echo "</br>";
     }
     echo "</br>";
-}
-echo "</br>";
 
-if(isset($list)){
-	foreach ($list as $l) {
-	    echo $l;
-	    echo "</br>";
-	}
+    if(isset($list)){
+    foreach ($list as $l) {
+        echo $l;
+        echo "</br>";
+    }
+}
 }
+else{
+    echo "Aucune image présente\n";
+}
+
+
 
 // Détails Image
-//$details = $image->image_details($id_image);
+//$details = $image->imageDetails($id_image);
 
-//$image->delete_image('123456');
+//$image->deleteImage('123456');
 
-//$image->desactivate_image($id_image);
-//$image->reactivate_image($id_image);
+//$image->desactivateImage($id_image);
+//$image->reactivateImage($id_image);
 
 //$file_name = "/home/yogg/Downloads/TinyCore-6.4.1.iso";
-//$image->upload_image($id_image, $file_name);
+//$image->uploadImage($id_image, $file_name);
 
-//$image->download_image($id_image);
+//$image->downloadImage($id_image);
 
 /*
 $opt_update = Array();
 $opt_update['name'] = "Test";
 $opt_update['tags'] = null;
 
-$update = $image->update_image($id_image, $opt_update);
+$update = $image->updateImage($id_image, $opt_update);
 echo $update->name;
 */
 
diff --git a/server/core/Image.php b/server/core/Image.php
index 4025595..ddd8390 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -14,6 +14,8 @@ use OpenStack\Common\Error\BaseError;
 use OpenStack\Common\Error\NotImplementedError;
 use OpenStack\Common\Error\UserInputError;
 
+include("CoreInterface.php");
+
 /**
 * Image Class of the back-end application
 *
@@ -77,6 +79,7 @@ class image implements Core{
 	*
 	**/
 	private function createImage(array $opt){
+		$opt = $this->app->getPostParam("opt");
 
 		if(!isset($opt)){
 			$this->app->setOutput("Error", "Incorrect parameter");
@@ -141,7 +144,7 @@ class image implements Core{
         }catch(NotImplementedError $e){
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         }
-		return $image;
+		$this->app->setOutput("Images", $image);
 	}
 
 	/**
@@ -151,9 +154,10 @@ class image implements Core{
 	*/
 	private function listImage(){
 		try{
+			$result = array();
 			$l = $this->libClass->listImages();
-			if(!isset($l)){ // if the list is empty there is no images
-				$this->app->setOutput("Error", "No image");
+			foreach($l as $tmp){
+				$result[] = $tmp;
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -164,8 +168,7 @@ class image implements Core{
         }catch(NotImplementedError $e){
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         }
-		return $l;
-
+		$this->app->setOutput("Images", $result);
 	}
 
 	/**
@@ -175,9 +178,10 @@ class image implements Core{
 	*	identifier of the image
 	*
 	**/
-	private function detailsImage($id){
+	private function detailsImage(){
+		$id = $this->app->getPostParam("id");
 		if(!isset($id)){
-			// Renvoyer erreur 
+			$this->app->setOutput("Error", "Incorrect id parameter"); 
 		}
 		try{
 			$service = $this->libClass;
@@ -185,8 +189,7 @@ class image implements Core{
 			if($image == null){ // if the image don't exists -> error
 				$this->app->setOutput("Error", "Image doesn't exist");
 			}
-			
-			return $image;
+			$this->app->setOutput("Images", $image);
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
@@ -207,7 +210,9 @@ class image implements Core{
 	* @param array $opt
 	*	options for the image creation
 	**/
-	private function updateImage($id, array $opt){
+	private function updateImage(){
+		$id = $this->app->getPostParam("id");
+		$opt = $this->app->getPostParam("opt");
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect id parameter"); 
 		}
@@ -254,7 +259,7 @@ class image implements Core{
         }catch(NotImplementedError $e){
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         }
-		return $image;
+		$this->app->setOutput("Images", $image);
 	}
 
 	/**
@@ -263,9 +268,10 @@ class image implements Core{
 	* @param string $id
 	*	identifier of the image
 	**/
-	private function deleteImage($id){
+	private function deleteImage(){
 		// si protected = true, demander de le mettre a false
 		// vérifier existence image
+		$id = $this->app->getPostParam("id");
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Image doesn't exist");
 		}
@@ -285,8 +291,7 @@ class image implements Core{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        }
-		
+        }	
 	}
 
 	/**
@@ -295,7 +300,8 @@ class image implements Core{
 	* @param string $id
 	*	identifier of the image
 	**/
-	private function reactivateImage($id){
+	private function reactivateImage(){
+		$id = $this->app->getPostParam("id");
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
@@ -324,7 +330,8 @@ class image implements Core{
 	* @param string $id
 	*	identifier of the image
 	**/
-	private function desactivateImage($id){
+	private function desactivateImage(){
+		$id = $this->app->getPostParam("id");
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
@@ -357,6 +364,9 @@ class image implements Core{
 	*	path of the image
 	**/
 	private function uploadImage($id, $file_name){
+		$id = $this->app->getPostParam("id");
+		$file_name = $this->app->getPostParam("file_name");
+
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect id parameter");
 		}
@@ -390,6 +400,7 @@ class image implements Core{
 	*	identifier of the image
 	**/
 	private function downloadImage($id){
+		$id = $this->app->getPostParam("id");
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
@@ -410,7 +421,7 @@ class image implements Core{
         }catch(NotImplementedError $e){
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         }
-        return $stream;
+        $this->app->setOutput("Images", $stream);
 	}
 
 	/**
@@ -422,7 +433,10 @@ class image implements Core{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	private function addMemberImage($image_id, $member_id){
+	private function addMemberImage(){
+		$image_id = $this->app->getPostParam("image_id");
+		$member_id = $this->app->getPostParam("member_id");
+
 		if(!isset($image_id)){
 			$this->app->setOutput("Error", "Incorrect parameter image_id");
 		}
@@ -455,7 +469,9 @@ class image implements Core{
 	* @param string $image_id
 	*	identifier of the image
 	**/
-	private function listMemberImage($image_id, $member_id){
+	private function listMemberImage(){
+		$image_id = $this->app->getPostParam("image_id");
+		$member_id = $this->app->getPostParam("member_id");
 		if(!isset($image_id)){
 			$this->app->setOutput("Error", "Incorrect parameter image_id");
 		}
@@ -482,7 +498,7 @@ class image implements Core{
         }catch(NotImplementedError $e){
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         }
-		return $members;
+		$this->app->setOutput("Images", $member);
 	}
 
 	/**
@@ -494,7 +510,9 @@ class image implements Core{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	private function detailMemberImage($image_id, $member_id){
+	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 parameter image_id"); 
 		}
@@ -525,7 +543,7 @@ class image implements Core{
         }catch(NotImplementedError $e){
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         }
-		return $member;
+		$this->app->setOutput("Images", $member);
 	}
 	
 	/**
@@ -537,7 +555,10 @@ class image implements Core{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	private function removeMemberImage($image_id, $member_id){
+	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 parameter image_id"); 
 		}
@@ -580,6 +601,10 @@ class image implements Core{
 	*	new status for the member
 	**/
 	private function updateMemberImage($image_id, $member_id, $status){
+		$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 parameter image_id");
 		}
-- 
cgit v1.2.3


From f4e59ee82c5947496d1810d53483c5a0afd57fe8 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sat, 5 Mar 2016 13:58:52 +0100
Subject: - added more details in the listServers, listImages, listFlavors
 functions - updated all functions to provide basic error-handling - defined
 updateServer and deleteServer

---
 server/core/Compute.php | 111 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 93 insertions(+), 18 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index a5b8375..4a50f4a 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -12,11 +12,11 @@ class compute
         protected $libClass;
 
 
-    public function __construct($app)
-    {
-                $this->app = $app;
-                $this->libClass = $app->getLibClass("Compute");
-    }
+	    public function __construct($app)
+    	{
+       	         $this->app = $app;
+        	 $this->libClass = $app->getLibClass("Compute");
+    	}
 	/**
 	* Execute an action
 	*
@@ -41,13 +41,26 @@ class compute
 		$servers[$server->id] = Array();
 		$server->flavor->retrieve();
 		$server->image->retrieve();
+		$server->retrieve();
 		$servers[$server->id]["id"]  = $server->id;
 		$servers[$server->id]["name"] = $server->name;
-		$servers[$server->id]["imageId"] = $server->image->id; 
-		$servers[$server->id]["flavorId"] = $server->flavor->id; 
-		$servers[$server->id]["status"] = $server->status;
+		$servers[$server->id]["image"] = $server->image; 
 		$servers[$server->id]["ram"] = $server->flavor->ram;
 		$servers[$server->id]["disk"] = $server->flavor->disk;
+		$servers[$server->id]["flavor"] = $server->flavor; 
+		$servers[$server->id]["status"] = $server->status;
+		$servers[$server->id]["created"] = $server->created;
+		$servers[$server->id]["updated"] = $server->updated;
+		$servers[$server->id]["ipv4"] = $server->ipv4;
+		$servers[$server->id]["ipv6"] = $server->ipv6;
+		$servers[$server->id]["progress"] = $server->progress;
+		$servers[$server->id]["hostId"] = $server->hostId;
+		$servers[$server->id]["tenantId"] = $server->tenantId;
+		$servers[$server->id]["userId"] = $server->userId;
+		$servers[$server->id]["taskState"] = $server->taskState;
+		$servers[$server->id]["addresses"] = $server->addresses;
+		$servers[$server->id]["links"] = $server->links;
+		$servers[$server->id]["metadata"] = $server->metadata;
 		}
 		$this->app->setOutput("Servers", $servers);
                 return;
@@ -62,8 +75,13 @@ class compute
 		$flavors = Array();
 		foreach($flavorList as $flavor){
 		$flavors[$flavor->id] = Array();
+		$flavor->retrieve();
 		$flavors[$flavor->id]["id"]  = $flavor->id;
 		$flavors[$flavor->id]["name"] = $flavor->name;
+		$flavors[$flavor->id]["ram"] = $flavor->ram;
+		$flavors[$flavor->id]["disk"] = $flavor->disk;
+		$flavors[$flavor->id]["vcpus"] = $flavor->vcpus;
+		$flavors[$flavor->id]["links"] = $flavor->links;
 		}
 		$this->app->setOutput("Flavors", $flavors);
                 return;
@@ -78,8 +96,17 @@ class compute
 		$images = Array();
 		foreach($imageList as $image){
 		$images[$image->id] = Array();
+		$image->retrieve();
 		$images[$image->id]["id"]  = $image->id;
 		$images[$image->id]["name"] = $image->name;
+		$images[$image->id]["status"] = $image->status;
+		$images[$image->id]["created"] = $image->created;
+		$images[$image->id]["updated"] = $image->updated;
+		$images[$image->id]["minDisk"] = $image->minDisk;
+		$images[$image->id]["minRam"] = $image->minRam;
+		$images[$image->id]["progress"] = $image->progress;
+		$images[$image->id]["links"] = $image->links;
+		$images[$image->id]["metadata"] = $image->metadata;
 		}
 		$this->app->setOutput("Images", $images);
                 return;
@@ -87,11 +114,18 @@ class compute
         /**
          * Create server.
          * @return array
-         * 
+         */ 
         public function createServer()
         {
-
-                $server = $this->libClass->createServer();
+		$name = $this->app->getPostParam("name");
+		$imageId = $this->app->getPostParam("imageId");
+		$flavorId = $this->app->getPostParam("flavorId");
+		if(!isset($name) || !isset($imageId) || !isset($flavorId)){
+			$this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID.");
+			return;
+		}
+		$opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId);
+                $server = $this->libClass->createServer($opt);
         }
 	*/
         /**
@@ -101,6 +135,10 @@ class compute
         public function getServer()
         {
 		$serverId = $this->app->getPostParam("serverId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Server ID is missing, son!");
+			return;
+		}
 		$opt = array('id' => $serverId);
                 $server = $this->libClass->getServer($opt);
 		$server->retrieve();
@@ -114,6 +152,10 @@ class compute
         public function getFlavor()
         {
 		$flavorId = $this->app->getPostParam("flavorId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Flavor ID is missing, son!");
+			return;
+		}
 		$opt = array('id' => $flavorId);
                 $flavor = $this->libClass->getFlavor($opt);
 		$flavor->retrieve();
@@ -127,23 +169,56 @@ class compute
         public function getImage()
         {
 		$imageId = $this->app->getPostParam("imageId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Image ID is missing, son!");
+			return;
+		}
 		$opt = array('id' => $imageId);
                 $image = $this->libClass->getImage($opt);
 		$image->retrieve();
 		$this->app->setOutput("MyImage", $image);
                 return;
         }
-        /* working on tests
-
-        public function update()
+        public function updateServer()
         {
-                $image = $this->app->getServer(array $options = []);
-
+               	$serverId = $this->app->getPostParam("serverId");
+               	$newName = $this->app->getPostParam("newName");
+               	$newIpv4 = $this->app->getPostParam("newIpv4");
+               	$newIpv6 = $this->app->getPostParam("newIpv6");
+		if(!isset($serverId)|| !(isset($newName) || isset($newIpv4) || isset($newIpv6)) ){
+			$this->app->setOutput("Error", "You'll have to provide server ID and the new attribute(IP(v4/v6)/Name) you desire to update!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		if (isset($newName)){
+			if(isset($newIpv4)){
+				if(isset($newIpv6){
+					$attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); 
+				}
+				$attr = array('name' => $newName, 'accessIPv4' => $newIPv4); 
+			}
+			$attr = array('name' => $newName); 
+		}			
+		$server->update($attr);
+		$this->app->setOutput("Success", $serverId." has been updated successfully.");
+                return;
         }
-        public function delete()
+	*/
+        public function deleteServer()
         {
-                //TODO
+               	$serverId = $this->app->getPostParam("serverId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Server ID is missing, son!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$server->delete();
+		$this->app->setOutput("Success", $serverId." has been deleted successfully.");
+                return;
         }
+	/*
         public function changePassword($newPassword)
         {
                 //TODO
-- 
cgit v1.2.3


From c43e532f766c3f97a34e6fad3dd990f7992e710b Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sat, 5 Mar 2016 14:05:52 +0100
Subject: added createServer and corrected certain minor bugs

---
 server/core/Compute.php | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 4a50f4a..8524c86 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -111,24 +111,7 @@ class compute
 		$this->app->setOutput("Images", $images);
                 return;
         }
-        /**
-         * Create server.
-         * @return array
-         */ 
-        public function createServer()
-        {
-		$name = $this->app->getPostParam("name");
-		$imageId = $this->app->getPostParam("imageId");
-		$flavorId = $this->app->getPostParam("flavorId");
-		if(!isset($name) || !isset($imageId) || !isset($flavorId)){
-			$this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID.");
-			return;
-		}
-		$opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId);
-                $server = $this->libClass->createServer($opt);
-        }
-	*/
-        /**
+       /**
          * Get server details.
          * @return array
          */
@@ -179,6 +162,27 @@ class compute
 		$this->app->setOutput("MyImage", $image);
                 return;
         }
+        /**
+         * Create server.
+         * @return array
+         */ 
+        public function createServer()
+        {
+		$name = $this->app->getPostParam("name");
+		$imageId = $this->app->getPostParam("imageId");
+		$flavorId = $this->app->getPostParam("flavorId");
+		if(!isset($name) || !isset($imageId) || !isset($flavorId)){
+			$this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID.");
+			return;
+		}
+		$opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId);
+                $server = $this->libClass->createServer($opt);
+        }
+ 
+	/**
+	* update a server
+	* @return void
+	*/
         public function updateServer()
         {
                	$serverId = $this->app->getPostParam("serverId");
@@ -204,6 +208,9 @@ class compute
 		$this->app->setOutput("Success", $serverId." has been updated successfully.");
                 return;
         }
+	/**
+	* Delete a server
+	* @return void
 	*/
         public function deleteServer()
         {
-- 
cgit v1.2.3


From dad2e1de334b6c8d9e579a0f75272d8661ed2aa3 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sat, 5 Mar 2016 14:12:27 +0100
Subject: corrected syntax errors

---
 server/core/Compute.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 8524c86..d134b94 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -200,9 +200,9 @@ class compute
 				if(isset($newIpv6){
 					$attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); 
 				}
-				$attr = array('name' => $newName, 'accessIPv4' => $newIPv4); 
+				else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); 
 			}
-			$attr = array('name' => $newName); 
+			else $attr = array('name' => $newName); 
 		}			
 		$server->update($attr);
 		$this->app->setOutput("Success", $serverId." has been updated successfully.");
-- 
cgit v1.2.3


From eb37fe6b4868b280a8173c57500e1cfd3f77c7e7 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 6 Mar 2016 13:50:17 +0100
Subject: syntax correction

---
 server/core/Compute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index d134b94..f02eb8b 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -197,7 +197,7 @@ class compute
                 $server = $this->libClass->getServer($opt);
 		if (isset($newName)){
 			if(isset($newIpv4)){
-				if(isset($newIpv6){
+				if(isset($newIpv6)){
 					$attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); 
 				}
 				else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); 
-- 
cgit v1.2.3


From 78a4f8574fb074fef30b2a646c052f68743ee37e Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Wed, 9 Mar 2016 14:31:14 +0100
Subject: modif in image constructor

---
 server/core/Image.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Image.php b/server/core/Image.php
index ddd8390..426cf9d 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -43,18 +43,8 @@ class image implements Core{
 		if(!isset($app)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
-		try{
-			$this->app = $app;
-			$this->libClass = $app->getLibClass("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);
-        }
+		$this->app = $app;
+		$this->libClass = $app->getLibClass("Image");
 	}
 
 
-- 
cgit v1.2.3


From 73c33feded940dcfc542b54394cd1e3efd9ba9d7 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Wed, 9 Mar 2016 14:35:08 +0100
Subject: modifs on Image constructor

---
 server/core/Image.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Image.php b/server/core/Image.php
index ddd8390..426cf9d 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -43,18 +43,8 @@ class image implements Core{
 		if(!isset($app)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
-		try{
-			$this->app = $app;
-			$this->libClass = $app->getLibClass("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);
-        }
+		$this->app = $app;
+		$this->libClass = $app->getLibClass("Image");
 	}
 
 
-- 
cgit v1.2.3


From a706b0d5655f6aa94d2a245cf4250c3e37538e1d Mon Sep 17 00:00:00 2001
From: EoleDev <root@serverpc.home>
Date: Wed, 9 Mar 2016 14:53:48 +0100
Subject: Debut revoke

---
 server/core/App.php                         | 32 +++++++++++---
 server/core/LibOverride/genTokenOptions.php | 28 +++++++++++-
 server/index.php                            | 68 ++++++++++++++++-------------
 3 files changed, 91 insertions(+), 37 deletions(-)
 mode change 100644 => 100755 server/index.php

(limited to 'server/core')

diff --git a/server/core/App.php b/server/core/App.php
index edb75f6..de886a6 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -56,10 +56,10 @@ class App{
 				return $this->openstack->networkingV2($opt);
 				break;
 			case "Compute":
-                                if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();
-                                $opt = $this->tokenClass->getOptions($service);
-                                return $this->openstack->computeV2($opt);
-                                break;
+				if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();
+				$opt = $this->tokenClass->getOptions($service);
+				return $this->openstack->computeV2($opt);
+				break;
 		}
 		
 	}
@@ -81,7 +81,29 @@ class App{
 			$this->errorClass->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
 			$this->errorClass->NotImplementedHandler($e);
-        }
+    }
+		
+	}
+	
+	public function deauthenticate(){
+		
+		try{
+			
+			$this->tokenClass->revokeComputeToken();
+			$this->tokenClass->revokeImageToken();
+			$this->tokenClass->revokeNetworkToken();
+			$this->tokenClass->revokeIdentityToken();
+			
+			$this->setOutput("deauthenticate", "Ok");
+		}catch(BadResponseError $e){
+			$this->errorClass->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->errorClass->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->errorClass->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->errorClass->NotImplementedHandler($e);
+    }
 		
 	}
 	
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 50826ed..47f026a 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -75,6 +75,12 @@ class genTokenOptions
 		$this->optionsGlobal['Identity'] = $options;
 	}
 	
+	public function revokeIdentityToken(){
+		$token = $this->unserializeToken($this->backup['Identity']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadIdentityBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'false';
@@ -123,6 +129,12 @@ class genTokenOptions
 		$this->optionsGlobal['Image'] = $options;
 	}
 	
+	public function revokeImageToken(){
+		$token = $this->unserializeToken($this->backup['Image']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadImageBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'glance';
@@ -157,7 +169,7 @@ class genTokenOptions
 
 		$stack = HandlerStack::create();
 		
-        $stack->push(Middleware::authHandler($options['authHandler'], $token));
+    $stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
@@ -170,6 +182,12 @@ class genTokenOptions
 		$this->optionsGlobal['Network'] = $options;
 	}
 	
+	public function revokeNetworkToken(){
+		$token = $this->unserializeToken($this->backup['Network']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadNetworkBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'neutron';
@@ -217,6 +235,12 @@ class genTokenOptions
 		$this->optionsGlobal['Compute'] = $options;
 	}
 	
+	public function revokeComputeToken(){
+		$token = $this->unserializeToken($this->backup['Compute']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadComputeBackup($opt){
 		
 		$options = $this->optionsGlobal['Common'];
@@ -245,7 +269,7 @@ class genTokenOptions
 	private function saveBackup($name, $data){
 		$token = $this->serializeToken($data["token"]);
 		$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"];
-		error_log(print_r($path, true), 0);
+		//error_log(print_r($path, true), 0);
 		file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
 		$this->backup["roles"] = $token["roles"];
 		$this->backup["project"] = $token['saved']["project"]["name"];
diff --git a/server/index.php b/server/index.php
old mode 100644
new mode 100755
index f888671..31feb08
--- a/server/index.php
+++ b/server/index.php
@@ -6,7 +6,7 @@
 	if(isset($_POST["task"]) && isset($_POST["action"])){
 		$task = $_POST["task"];
 		$action = $_POST["action"];
-	}else if(isset($_POST["task"]) && $_POST["task"] == "Authenticate"){
+	}else if(isset($_POST["task"]) && $_POST["task"] == "Authenticate" || $_POST["task"] == "Deauthenticate"){
 		$task = $_POST["task"];
 	}else{
 		//Gestion Erreur
@@ -17,36 +17,44 @@
 		$App->authenticate();
 		$App->show();
 		
-	}
-	
-	switch($task)
-	{
-		case "identity":
-			include_once("core/Identity.php");
-			$identityObject = new identity($App);
-			$identityObject->action($action);
-			$App->show();
-			break;
+	}else if($task == "Deauthenticate"){
+		
+		$App->deauthenticate();
+		$App->show();
 		
-		case "network":
-                        include_once("core/Network.php");
-                        $networkObject = new network($App);
-                        $networkObject->action($action);
-                        $App->show();
-                        break;	
+	}else{
+		switch($task)
+		{
+			case "identity":
+				include_once("core/Identity.php");
+				$identityObject = new identity($App);
+				$identityObject->action($action);
+				$App->show();
+				break;
+			
+			case "network":
+				include_once("core/Network.php");
+				$networkObject = new network($App);
+				$networkObject->action($action);
+				$App->show();
+				break;	
+			
+			case "image":
+				include_once("core/Image.php");
+				$imageObject = new image($App);
+				$imageObject->action($action);
+				$App->show();
+				break;
+	
+			case "compute":
+				include_once("core/Compute.php");
+				$computeObject = new compute($App);
+				$computeObject->action($action);
+				$App->show();
+				break;
+		}
 		
-		case "image":
-			include_once("core/Image.php");
-			$imageObject = new image($App);
-			$imageObject->action($action);
-			$App->show();
-			break;
-
-		case "compute":
-			include_once("core/Compute.php");
-			$computeObject = new compute($App);
-			$computeObject->action($action);
-			$App->show();
-			break;
 	}
 	
+	
+	
-- 
cgit v1.2.3


From c8d1eeda92d2c4720dc495313a1006ec81510693 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Wed, 9 Mar 2016 15:21:46 +0100
Subject: MAJ Library

---
 server/core/App.php                         |  8 ++++----
 server/core/ErrorManagement.php             | 10 +++++-----
 server/core/Identity.php                    |  2 +-
 server/core/LibOverride/genTokenOptions.php |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'server/core')

diff --git a/server/core/App.php b/server/core/App.php
index edb75f6..ceda7c9 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -3,10 +3,10 @@ include_once("core/Plugin_Api.php");
 include_once("core/LibOverride/genTokenOptions.php");
 include_once("core/ErrorManagement.php");
 
-use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Error\BaseError;
-use OpenStack\Common\Error\NotImplementedError;
-use OpenStack\Common\Error\UserInputError;
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
 
 class App{
 	
diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php
index 6bff61f..4ba3493 100755
--- a/server/core/ErrorManagement.php
+++ b/server/core/ErrorManagement.php
@@ -1,9 +1,9 @@
 <?php
 
-use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Error\BaseError;
-use OpenStack\Common\Error\NotImplementedError;
-use OpenStack\Common\Error\UserInputError;
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
 
 
 Class errorManagement{
@@ -36,4 +36,4 @@ Class errorManagement{
 	
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/server/core/Identity.php b/server/core/Identity.php
index 2638985..7100c9f 100755
--- a/server/core/Identity.php
+++ b/server/core/Identity.php
@@ -9,7 +9,7 @@
 * 
 * @todo Complete the functions and finish the descriptions
 */
-use OpenStack\Common\Error;
+use OpenCloud\Common\Error;
  
 /**
 * Identity Class of the back-end application
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 50826ed..18d880f 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -1,12 +1,12 @@
 <?php
 
 use GuzzleHttp\Client;
-use OpenStack\Common\Transport\HandlerStack;
-use OpenStack\Common\Transport\Middleware;
+use OpenCloud\Common\Transport\HandlerStack;
+use OpenCloud\Common\Transport\Middleware;
 use OpenStack\Identity\v3\Service;
 use OpenStack\Identity\v3\Api;
-use OpenStack\Common\Auth\Token;
-use OpenStack\Common\Transport\Utils;
+use OpenCloud\Common\Auth\Token;
+use OpenCloud\Common\Transport\Utils;
 use OpenStack\Identity\v3\Models;
 
 class genTokenOptions
-- 
cgit v1.2.3


From 5c6f6c97b7b906476ad5b9ed193e0140dd66f977 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Wed, 9 Mar 2016 15:26:01 +0100
Subject: solve syntax error

---
 server/core/Image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/core')

diff --git a/server/core/Image.php b/server/core/Image.php
index 426cf9d..b21073b 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -68,7 +68,7 @@ class image implements Core{
 	*	options for the image creation
 	*
 	**/
-	private function createImage(array $opt){
+	private function createImage(){
 		$opt = $this->app->getPostParam("opt");
 
 		if(!isset($opt)){
-- 
cgit v1.2.3


From aee0bda9d47f9d279ff9b5b4a4a263fc5613863e Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Wed, 9 Mar 2016 15:39:43 +0100
Subject: correct errors

---
 server/core/Image.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Image.php b/server/core/Image.php
index b21073b..f509cd6 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -353,7 +353,7 @@ class image implements Core{
 	* @param string $file_name
 	*	path of the image
 	**/
-	private function uploadImage($id, $file_name){
+	private function uploadImage(){
 		$id = $this->app->getPostParam("id");
 		$file_name = $this->app->getPostParam("file_name");
 
@@ -389,7 +389,7 @@ class image implements Core{
 	* @param string $id
 	*	identifier of the image
 	**/
-	private function downloadImage($id){
+	private function downloadImage(){
 		$id = $this->app->getPostParam("id");
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
@@ -590,7 +590,7 @@ class image implements Core{
 	* @param string $status
 	*	new status for the member
 	**/
-	private function updateMemberImage($image_id, $member_id, $status){
+	private function updateMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
 		$member_id = $this->app->getPostParam("member_id");
 		$status = $this->app->getPostParam("status");
-- 
cgit v1.2.3


From 3da0e2d81c544a85cb940eef8c39f82cecbf8155 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 15 Mar 2016 22:04:03 +0100
Subject: opencloud changes

---
 server/core/Compute.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index f02eb8b..64a88aa 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -1,7 +1,6 @@
 <?php
 //namespace istic-openstack\Server\core;
-// TODO introduce error-handling based on errors specific to the compute module
-use OpenStack\Common\Error;
+use OpenCloud\Common\Error;
 
 class compute 
 {
-- 
cgit v1.2.3


From b8e08062f35c6327dbdb210c6b3d1045bd30c1c1 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 15 Mar 2016 22:39:05 +0100
Subject: defined rest of the server functions

---
 server/core/Compute.php | 106 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 95 insertions(+), 11 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 64a88aa..37fc8ad 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -224,31 +224,115 @@ class compute
 		$this->app->setOutput("Success", $serverId." has been deleted successfully.");
                 return;
         }
-	/*
-        public function changePassword($newPassword)
+	/**
+	* Change the password of a server
+	* @return void
+	*/
+        public function changePassword()
         {
-                //TODO
+		$serverId = $this->app->getPostParam("serverId");
+		$password = $this->app->getPostParam("newPassword");
+		if(!isset($serverId) || !isset($password)){
+			$this->app->setOutput("Error", "Server ID or new password missing.");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$server->changePassword($password);	
+		$this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully.");
+		return;
         }
-        public function reboot($type = Enum::REBOOT_SOFT)
+        /**
+	* Reboot a server
+	* @return void
+	*/
+        public function reboot()
         {
-                //TODO
+               	$serverId = $this->app->getPostParam("serverId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Server ID is missing, son!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$server->reboot();
+		$this->app->setOutput("Success", $serverId." has been deleted successfully.");
+                return;
         }
-        public function rebuild(array $options)
+       	/**
+	* Rebuild a server
+	* @return void
+	*/
+        public function rebuild()
         {
-                //TODO
+               	$serverId = $this->app->getPostParam("serverId");
+               	$imageId = $this->app->getPostParam("imageId");
+               	$newName = $this->app->getPostParam("newName");
+               	$adminPass = $this->app->getPostParam("adminPass");
+		if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){
+			$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); 
+		$server->rebuild($attr);
+		$this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image.");
+                return;
         }
-        public function resize($flavorId)
+       	/**
+	* Resize a server
+	* A call to this method has to be followed by either confirmResize or revertResize
+	* @return void
+	*/
+        public function resize()
         {
-                //TODO
+               	$serverId = $this->app->getPostParam("serverId");
+               	$newFlavorId = $this->app->getPostParam("newFlavorId");
+		if(!isset($serverId)|| !isset($flavorId)){
+			$this->app->setOutput("Error", "You'll have to provide server ID and the new flavor ID!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$server->resize($newFlavorId);
+                return;
         }
+        /**
+	* Confirm resize operation on a server
+	* @return void
+	*/
         public function confirmResize()
         {
-                //TODO
+               	$serverId = $this->app->getPostParam("serverId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Server ID is missing!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$server->confirmResize();
+		$this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor.");
+                return;
         }
+        /**
+	* Revert resize operation on a server
+	* @return void
+	*/
         public function revertResize()
         {
-                //TODO
+               	$serverId = $this->app->getPostParam("serverId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Server ID is missing!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$server->revertResize();
+		$this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor.");
+                return;
         }
+	/*
         public function createImage(array $options)
         {
                 //TODO
-- 
cgit v1.2.3


From 11dc33c440f97410a2358f7e615d2adc5e69f072 Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Tue, 15 Mar 2016 23:45:19 +0100
Subject: Error / Conflict Correction

---
 server/core/Compute.php |  2 +-
 server/core/Image.php   | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 server/core/Compute.php
 mode change 100644 => 100755 server/core/Image.php

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
old mode 100644
new mode 100755
index 37fc8ad..b658580
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -269,7 +269,7 @@ class compute
                	$imageId = $this->app->getPostParam("imageId");
                	$newName = $this->app->getPostParam("newName");
                	$adminPass = $this->app->getPostParam("adminPass");
-		if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){
+		if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) {
 			$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
 			return;
 		}
diff --git a/server/core/Image.php b/server/core/Image.php
old mode 100644
new mode 100755
index f2af5cc..d37c828
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -70,12 +70,7 @@ class image implements Core{
 	*	options for the image creation
 	*
 	**/
-<<<<<<< HEAD
-	private function createImage(array $opt){
-
-=======
 	private function createImage(){
->>>>>>> develop
 		$opt = $this->app->getPostParam("opt");
 
 
@@ -408,15 +403,9 @@ class image implements Core{
 	* @param string $id
 	*	identifier of the image
 	**/
-<<<<<<< HEAD
-	private function downloadImage($id){
-<<<<<<< HEAD
-=======
-=======
 	private function downloadImage(){
->>>>>>> develop
 		$id = $this->app->getPostParam("id");
->>>>>>> develop
+
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
-- 
cgit v1.2.3


From e01936a73e75350a40fafd80995b1525a11c9da1 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Thu, 17 Mar 2016 09:46:32 +0100
Subject: add commentaries, update error management and correct some mistakes
 in Image.php, resolve conflict in AppTestClass.php

---
 server/Test/AppTestClass.php |  12 --
 server/core/Image.php        | 279 +++++++++++++++++++++----------------------
 2 files changed, 133 insertions(+), 158 deletions(-)

(limited to 'server/core')

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index b398088..5e8efc7 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,24 +1,12 @@
 <?php
 include_once("../core/Plugin_Api.php");
 include_once("../core/LibOverride/genTokenOptions.php");
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
 include_once("../core/ErrorManagement.php");
 
 use OpenCloud\Common\Error\BadResponseError;
 use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
 use OpenCloud\Common\Error\UserInputError;
->>>>>>> Stashed changes
-=======
-include_once("../core/ErrorManagement.php");
-
-use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Error\BaseError;
-use OpenStack\Common\Error\NotImplementedError;
-use OpenStack\Common\Error\UserInputError;
->>>>>>> develop
 
 class AppTest{
 	
diff --git a/server/core/Image.php b/server/core/Image.php
index d37c828..f309943 100755
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -9,15 +9,13 @@
 * 
 * @todo Complete the functions with errors detection and finish the descriptions
 */
-use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Error\BaseError;
-use OpenStack\Common\Error\NotImplementedError;
-use OpenStack\Common\Error\UserInputError;
-
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
 
 include("CoreInterface.php");
 
-
 /**
 * Image Class of the back-end application
 *
@@ -37,13 +35,11 @@ class image implements Core{
 	*
 	* @param App $app the main app object
 	*
-	* @throws [Type] [<description>]
-	*
 	* @return Image
 	*/
 	public function __construct($app){
 		if(!isset($app)){
-			$this->app->setOutput("Error", "Incorrect parameter");
+			$this->app->setOutput("Error", "Incorrect parameter app");
 		}
 		$this->app = $app;
 		$this->libClass = $app->getLibClass("Image");
@@ -58,47 +54,46 @@ class image implements Core{
 	* @return void
 	*/
 	public function action($action){
-		
-		 $this->{$action.""}();
-		
+		 $this->{$action.""}();	
 	}
 
 	/**
-	* Details about an image
+	* Create a new image
 	*
-	* @param array $opt
-	*	options for the image creation
+	* @param array $opt Options for the image creation (name is required, others are optionals)
 	*
-	**/
+	* @return Image
+	*/
 	private function createImage(){
 		$opt = $this->app->getPostParam("opt");
 
-
 		if(!isset($opt)){
-			$this->app->setOutput("Error", "Incorrect parameter");
+			$this->app->setOutput("Error", "Incorrect parameter opt");
 		}
 
-
 		try{	
-			// VOIR SI MAUVAIS TYPE
 			$options = Array();
-			if(isset($opt['name'])){ // if the image name already exists -> error
+
+			// Check the image name
+			if(isset($opt['name'])){ 
 				$imagesList = listImage();
-				if(isset($images)){
+				if(isset($imagesList)){
     				foreach($imagesList as $image){
-    					if(strcmp($image->name, $opt['name']) == 0){
-
+    					if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error
+    						$this->app->setOutput("Error", "Image name already exists");
     					}
     				}
     			}
 
 			}
 			else{
-				$this->app->setOutput("Error", "Image name already exists");
+				$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'];
 			}
@@ -131,11 +126,11 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 		$this->app->setOutput("Images", $image);
 
@@ -144,7 +139,7 @@ class image implements Core{
 	/**
 	* List the images of the server
 	*
-	* @return the list with all images on the server
+	* @return List of Image
 	*/
 	private function listImage(){
 		try{
@@ -156,11 +151,11 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 
 		$this->app->setOutput("Images", $result);
@@ -170,10 +165,10 @@ class image implements Core{
 	/**
 	* Details about an image
 	*
-	* @param string $id
-	*	identifier of the image
-	*
-	**/
+	* @param String $id Identifier of the image
+	*	
+	* @return Image
+	*/
 	private function detailsImage(){
 		$id = $this->app->getPostParam("id");
 		if(!isset($id)){
@@ -186,29 +181,26 @@ class image implements Core{
 			if($image == null){ // if the image don't exists -> error
 				$this->app->setOutput("Error", "Image doesn't exist");
 			}
-
 			$this->app->setOutput("Images", $image);
-
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 	}
 
 	/**
-	* Details about an image
+	* Update informations about an image
 	*
-	* @param string $id
-	*	id of the image
-	*
-	* @param array $opt
-	*	options for the image creation
-	**/
+	* @param String $id id of the image
+	* @param array  $opt Options for the image creation
+	*	
+	* @return Image
+	*/
 
 	private function updateImage(){
 		$id = $this->app->getPostParam("id");
@@ -254,11 +246,11 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 		$this->app->setOutput("Images", $image);
 	}
@@ -266,9 +258,10 @@ class image implements Core{
 	/**
 	* Delete an image
 	*
-	* @param string $id
-	*	identifier of the image
-	**/
+	* @param String $id Identifier of the image
+	*	
+	* @return void
+	*/
 	private function deleteImage(){
 		// si protected = true, demander de le mettre a false
 		// vérifier existence image
@@ -280,27 +273,28 @@ class image implements Core{
 		try{
 			$service = $this->libClass;
 			$image = $this->libClass->getImage($id);
-			if($image == null){ // if the image don't exists -> error
+			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);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }	
 	}
 
 	/**
 	* Resactive an image
 	*
-	* @param string $id
-	*	identifier of the image
-	**/
+	* @param String $id Identifier of the image
+	*	
+	* @return void
+	*/
 	private function reactivateImage(){
 		$id = $this->app->getPostParam("id");
 
@@ -308,7 +302,6 @@ class image implements Core{
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
 		try{
-			// vérifier existence image
 			$service = $this->libClass;
 			$image = $service->getImage($id);
 			if($image == null){ // if the image don't exists -> error
@@ -318,20 +311,21 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 	}
 
 	/**
 	* Desactive an image
 	*
-	* @param string $id
-	*	identifier of the image
-	**/
+	* @param String $id Identifier of the image
+	*
+	* @return void	
+	*/
 	private function desactivateImage(){
 		$id = $this->app->getPostParam("id");
 
@@ -349,23 +343,22 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 	}
 
 	/**
 	* Upload an image
 	*
-	* @param string $id
-	*	identifier of the image
-	* 
-	* @param string $file_name
-	*	path of the 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");
@@ -375,7 +368,7 @@ class image implements Core{
 			$this->app->setOutput("Error", "Incorrect id parameter");
 		}
 		if(!isset($file_name)){
-			$this->app->setOutput("Error", "Incorrect file_name parameter");
+			$this->app->setOutput("Error", "Incorrect file name parameter");
 		}
 		try{
 			// vérifier existence image
@@ -389,25 +382,26 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 	}
 
 	/**
 	* Download an image
 	*
-	* @param string $id
-	*	identifier of the image
-	**/
+	* @param String $id Identifier of the image
+	*
+	* @return Stream
+	*/
 	private function downloadImage(){
 		$id = $this->app->getPostParam("id");
 
 		if(!isset($id)){
-			$this->app->setOutput("Error", "Incorrect parameter");
+			$this->app->setOutput("Error", "Incorrect id parameter");
 		}
 		try{
 			// vérifier existence image 
@@ -420,11 +414,11 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
         $this->app->setOutput("Images", $stream);
 	}
@@ -432,21 +426,20 @@ class image implements Core{
 	/**
 	* Add a member to image
 	*
-	* @param string $image_id
-	*	identifier of the image
-	*
-	* @param string $member_id
-	*	identifier of the member
-	**/
+	* @param String $image_id Identifier of the image
+	* @param String $member_id Identifier of the member
+	*	
+	* @return Member
+	*/
 	private function addMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
 		$member_id = $this->app->getPostParam("member_id");
 
 		if(!isset($image_id)){
-			$this->app->setOutput("Error", "Incorrect parameter image_id");
+			$this->app->setOutput("Error", "Incorrect image id parameter");
 		}
 		if(!isset($member_id)){
-			$this->app->setOutput("Error", "Incorrect parameter member_id");
+			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
 		try{
 			$service = $this->libClass;	
@@ -456,14 +449,15 @@ class image implements Core{
 				$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);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 	}
 
@@ -471,18 +465,19 @@ class image implements Core{
 	/**
 	* List members of an image
 	*
-	* @param string $image_id
-	*	identifier of the image
-	**/
+	* @param String $image_id identifier of the image
+	*
+	* @return List of Member 	
+	*/
 	private function listMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
 		$member_id = $this->app->getPostParam("member_id");
 
 		if(!isset($image_id)){
-			$this->app->setOutput("Error", "Incorrect parameter image_id");
+			$this->app->setOutput("Error", "Incorrect image id parameter");
 		}
 		if(!isset($member_id)){
-			$this->app->setOutput("Error", "Incorrect parameter member_id"); 
+			$this->app->setOutput("Error", "Incorrect member id parameter"); 
 		}
 		try{
 			// vérifier existence image
@@ -492,44 +487,40 @@ class image implements Core{
 				$this->app->setOutput("Error", "Image doesn't exist"); 
 			}
 			$members = $image->listMembers();
-			if($member == null){ // if the image don't exists -> error
+			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);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
-		$this->app->setOutput("Images", $member);
+		$this->app->setOutput("Images", $members);
 	}
 
 	/**
 	* Show details of a member of an image
 	*
-	* @param string $image_id
-	*	identifier of the image
+	* @param String $image_id Identifier of the image
+	* @param String $member_id Identifier of the member
 	*
-	* @param string $member_id
-	*	identifier of the member
-	**/
+	* @return Member
+	*/
 	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 parameter image_id"); 
+			$this->app->setOutput("Error", "Incorrect image id parameter"); 
 		}
 		if(!isset($member_id)){
-			$this->app->setOutput("Error", "Incorrect parameter member_id");
+			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
 		try{
-			// vérifier existence image
-			// on doit être le proprio de l'image
-			// vérifier membre existe
 			$service = $this->libClass;	
 
 			$image  = $service->getImage($id);
@@ -544,11 +535,11 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 		$this->app->setOutput("Images", $member);
 	}
@@ -556,21 +547,20 @@ class image implements Core{
 	/**
 	* Remove a member of an image
 	*
-	* @param string $image_id
-	*	identifier of the image
-	*
-	* @param string $member_id
-	*	identifier of the member
-	**/
+	* @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 parameter image_id"); 
+			$this->app->setOutput("Error", "Incorrect image id parameter"); 
 		}
 		if(!isset($member_id)){
-			$this->app->setOutput("Error", "Incorrect parameter member_id");
+			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
 		try{
 			$service = $this->libClass;	
@@ -587,25 +577,22 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($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 $image_id Identifier of the image
+	* @param String $member_id Identifier of the member
+	* @param String $status New status for the member
 	*
-	* @param string $status
-	*	new status for the member
+	* @return void	
 	**/
 	private function updateMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
@@ -613,10 +600,10 @@ class image implements Core{
 		$status = $this->app->getPostParam("status");
 
 		if(!isset($image_id)){
-			$this->app->setOutput("Error", "Incorrect parameter image_id");
+			$this->app->setOutput("Error", "Incorrect image id parameter");
 		}
 		if(!isset($member_id)){
-			$this->app->setOutput("Error", "Incorrect parameter member_id");
+			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
 		try{
 			$service = $this->libClass;		
@@ -633,11 +620,11 @@ class image implements Core{
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
         }
 	}
 
-- 
cgit v1.2.3


From fe0eb3a9e259b4fe09df364f0660ebc62185f9dd Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Thu, 17 Mar 2016 11:34:56 +0100
Subject: add exception management, correct mistakes in error management in
 Image.php and add function to simplify parameters using in tests

---
 server/Test/AppTestClass.php    |   8 +-
 server/Test/imageTests.php      |  68 ++---
 server/core/ErrorManagement.php |   4 +
 server/core/Image.php           | 549 ++++++++++++++++++++++------------------
 4 files changed, 339 insertions(+), 290 deletions(-)

(limited to 'server/core')

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 5e8efc7..e1631c5 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -89,10 +89,16 @@ class AppTest{
 	}
 	
 	public function getPostParam($name){
-		
+
 		return $this->postParams[$name];
 		
 	}
+
+	public function setPostParam($name, $value){
+		
+		$this->postParams[$name] = $value;
+
+	}
 	
 	public function setOutput($key, $out){
 		
diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
index 3af12fc..883387d 100644
--- a/server/Test/imageTests.php
+++ b/server/Test/imageTests.php
@@ -14,55 +14,39 @@ $opt['minDisk'] = 1;
 $opt['protected'] = false;
 $opt['minRam'] = 10;
 
-//$new_image = $image->createImage($opt);
+//$App->setPostParam('id', 'sdfihlus154dfhj');
+$err = $image->action("createImage");
+
 
 //Liste des images
 $image->action("listImage");
-//$images = $image->listImage();
 $im = $App->show();
-$images = json_decode($im, true)["Images"]; 
-if(isset($images)){
-    echo "Images présentes :";
-    echo "</br>";
-    foreach($images as $i){
-    	echo $i['name'];
-        echo "</br>";
-    }
+$images = json_decode($im, true)["Images"];
+$recup;
+
+echo "Images présentes :";
+echo "</br>";
+foreach($images as $i){
+    $recup = $i;
+    echo $recup['name'];
     echo "</br>";
+    //echo $recup['id'];
+ }
+echo "</br>";
+echo "Erreur capturée: ";
+echo "</br>";
+   
+    /*
+    //$App->setPostParam('id', $recup['id']);
+    $App->setPostParam('id', 'sdfihlus154dfhj');
+    $err = $image->action("detailsImage");
+    $temp = $App->show();
+    $ret = json_decode($temp, true)["Images"];
+    echo $ret['id'];
+    */
+    //$App->getPostParam("id");
 
-    if(isset($list)){
-    foreach ($list as $l) {
-        echo $l;
-        echo "</br>";
-    }
-}
-}
-else{
-    echo "Aucune image présente\n";
-}
-
-
-
-// Détails Image
-//$details = $image->imageDetails($id_image);
-
-//$image->deleteImage('123456');
-
-//$image->desactivateImage($id_image);
-//$image->reactivateImage($id_image);
-
-//$file_name = "/home/yogg/Downloads/TinyCore-6.4.1.iso";
-//$image->uploadImage($id_image, $file_name);
-
-//$image->downloadImage($id_image);
 
-/*
-$opt_update = Array();
-$opt_update['name'] = "Test";
-$opt_update['tags'] = null;
 
-$update = $image->updateImage($id_image, $opt_update);
-echo $update->name;
-*/
 
 ?>
\ No newline at end of file
diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php
index 4ba3493..ff66339 100755
--- a/server/core/ErrorManagement.php
+++ b/server/core/ErrorManagement.php
@@ -32,6 +32,10 @@ Class errorManagement{
 	public function UserInputHandler($error){
 		
 	}
+
+	public function OtherException($error){
+		$this->app->setOutput("Error", $error->getMessage);
+	}
 	
 	
 }
diff --git a/server/core/Image.php b/server/core/Image.php
index f309943..71e19ce 100755
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -131,6 +131,8 @@ class image implements Core{
 			$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);
 
@@ -156,6 +158,8 @@ class image implements Core{
 			$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);
@@ -171,26 +175,33 @@ class image implements Core{
 	*/
 	private function detailsImage(){
 		$id = $this->app->getPostParam("id");
+
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect id parameter"); 
-
 		}
-		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");
-			}
-			$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);
-        }
+		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{
+					echo 'toto';
+					$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);
+        	}
+	    }
 	}
 
 	/**
@@ -209,50 +220,53 @@ class image implements Core{
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect id parameter"); 
 		}
-		if(!isset($opt)){
+		else if(!isset($opt)){
 			$this->app->setOutput("Error", "Incorrect opt parameter");
 		}
+		else{
+			try{
+				//vérifier existence image
+				$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");
+				}
 
-		try{
-			//vérifier existence image
-			$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");
-			}
-
-			$options = Array();
+				$options = Array();
 
-			// 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);
-        }
-		$this->app->setOutput("Images", $image);
+				// 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);
+		}
 	}
 
 	/**
@@ -269,23 +283,26 @@ class image implements Core{
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Image doesn't exist");
 		}
-
-		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);
-        }	
+		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);
+	        }	
+	    }
 	}
 
 	/**
@@ -301,22 +318,27 @@ class image implements Core{
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
-		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->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);
-        }
+		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->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);
+	        }
+	    }
 	}
 
 	/**
@@ -332,23 +354,28 @@ class image implements Core{
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect parameter");
 		}
-		try{
-			// vérifier existence image
-			$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);
-        }
+		else
+		{
+			try{
+				// vérifier existence image
+				$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);
+	        }
+	    }
 	}
 
 	/**
@@ -367,26 +394,30 @@ class image implements Core{
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect id parameter");
 		}
-		if(!isset($file_name)){
+		else if(!isset($file_name)){
 			$this->app->setOutput("Error", "Incorrect file name parameter");
 		}
-		try{
-			// vérifier existence image
-			$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(fopen($file_name, 'r'));
-			$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);
+		else{
+			try{
+				// vérifier existence image
+				$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(fopen($file_name, 'r'));
+				$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);
+        	}
         }
 	}
 
@@ -403,24 +434,28 @@ class image implements Core{
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect id parameter");
 		}
-		try{
-			// vérifier existence image 
-			$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);
-        }
-        $this->app->setOutput("Images", $stream);
+		else{
+			try{
+				// vérifier existence image 
+				$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);
+	    }
 	}
 
 	/**
@@ -438,27 +473,31 @@ class image implements Core{
 		if(!isset($image_id)){
 			$this->app->setOutput("Error", "Incorrect image id parameter");
 		}
-		if(!isset($member_id)){
+		else if(!isset($member_id)){
 			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
-		try{
-			$service = $this->libClass;	
+		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_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);
-        }
+				$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);
+	        }
+	    }
 	}
 
 	
@@ -476,30 +515,34 @@ class image implements Core{
 		if(!isset($image_id)){
 			$this->app->setOutput("Error", "Incorrect image id parameter");
 		}
-		if(!isset($member_id)){
+		else if(!isset($member_id)){
 			$this->app->setOutput("Error", "Incorrect member id parameter"); 
 		}
-		try{
-			// vérifier existence image
-			$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);
-        }
-		$this->app->setOutput("Images", $members);
+		else{
+			try{
+				// vérifier existence image
+				$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);
+		}
 	}
 
 	/**
@@ -517,31 +560,35 @@ class image implements Core{
 		if(!isset($image_id)){
 			$this->app->setOutput("Error", "Incorrect image id parameter"); 
 		}
-		if(!isset($member_id)){
+		else if(!isset($member_id)){
 			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
-		try{
-			$service = $this->libClass;	
+		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  = $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");
-			}
-		}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);
-        }
-		$this->app->setOutput("Images", $member);
+				$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);
+		}
 	}
 	
 	/**
@@ -559,30 +606,34 @@ class image implements Core{
 		if(!isset($image_id)){
 			$this->app->setOutput("Error", "Incorrect image id parameter"); 
 		}
-		if(!isset($member_id)){
+		else if(!isset($member_id)){
 			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
-		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);
-        }
+		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);
+	        }
+	    }
 	}
 
 	/**
@@ -602,30 +653,34 @@ class image implements Core{
 		if(!isset($image_id)){
 			$this->app->setOutput("Error", "Incorrect image id parameter");
 		}
-		if(!isset($member_id)){
+		else if(!isset($member_id)){
 			$this->app->setOutput("Error", "Incorrect member id parameter");
 		}
-		try{
-			$service = $this->libClass;		
+		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);
-        }
+				$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);
+	        }
+      	}
 	}
 
 }
-- 
cgit v1.2.3


From 700a849da8a6905ba33ccf47cdbc5c031e1994f3 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Sun, 20 Mar 2016 10:41:58 +0100
Subject: add other exceptions management and correct syntax on exception
 mangement

---
 server/core/Identity.php | 713 ++++++++++++++++++++++++++++-------------------
 1 file changed, 429 insertions(+), 284 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Identity.php b/server/core/Identity.php
index 7100c9f..464522a 100755
--- a/server/core/Identity.php
+++ b/server/core/Identity.php
@@ -87,13 +87,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 		
 	}
@@ -111,13 +113,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 		
 	}
@@ -144,13 +148,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 		
 	}
@@ -187,13 +193,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -220,14 +228,17 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
+        
 	}-
 	
 	/**
@@ -266,13 +277,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 		
 	}
@@ -291,13 +304,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 		
 	}
@@ -325,13 +340,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -374,13 +391,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -407,13 +426,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -442,13 +463,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -480,13 +503,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -519,13 +544,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -557,13 +584,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -592,13 +621,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -630,13 +661,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -669,13 +702,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -714,13 +749,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -754,13 +791,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -786,13 +825,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -810,13 +851,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -849,13 +892,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -881,13 +926,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -914,13 +961,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -947,13 +996,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -981,13 +1032,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -1022,13 +1075,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1056,13 +1111,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1090,13 +1147,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1125,13 +1184,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1160,13 +1221,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1195,13 +1258,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1228,13 +1293,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -1261,13 +1328,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -1294,13 +1363,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 		
 	}
@@ -1328,13 +1399,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -1361,13 +1434,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }*/
 	}
 	
@@ -1398,13 +1473,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1422,13 +1499,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1455,13 +1534,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1495,13 +1576,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1528,13 +1611,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1563,13 +1648,17 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1602,13 +1691,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1643,13 +1734,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1682,13 +1775,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1718,13 +1813,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1757,13 +1854,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1798,13 +1897,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1837,13 +1938,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1871,13 +1974,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1895,13 +2000,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1919,13 +2026,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1954,13 +2063,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -1978,13 +2089,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2009,13 +2122,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2043,13 +2158,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2081,13 +2198,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2123,13 +2242,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2159,13 +2280,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2201,13 +2324,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2249,13 +2374,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2285,13 +2412,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2317,13 +2446,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2362,13 +2493,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2386,13 +2519,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2419,13 +2554,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2458,13 +2595,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2491,13 +2630,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2525,13 +2666,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 	
@@ -2559,13 +2702,15 @@ class identity implements Core{
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
-			$this->app->getErrorInstance->BadResponseHandler($e);
+			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
-			$this->app->getErrorInstance->UserInputHandler($e);
+			$this->app->getErrorInstance()->UserInputHandler($e);
         }catch(BaseError $e){
-			$this->app->getErrorInstance->BaseErrorHandler($e);
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
         }catch(NotImplementedError $e){
-			$this->app->getErrorInstance->NotImplementedHandler($e);
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	$this->app->getErrorInstance()->OtherException($e);
         }
 	}
 }
-- 
cgit v1.2.3


From 1fa4dcbab660a7185165b106b178a12de0917f59 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Mon, 21 Mar 2016 10:19:26 +0100
Subject: correct error in error management !

---
 server/Test/imageTests.php      | 21 ++++++++++-----------
 server/core/ErrorManagement.php |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'server/core')

diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
index 883387d..d184d44 100644
--- a/server/Test/imageTests.php
+++ b/server/Test/imageTests.php
@@ -15,7 +15,7 @@ $opt['protected'] = false;
 $opt['minRam'] = 10;
 
 //$App->setPostParam('id', 'sdfihlus154dfhj');
-$err = $image->action("createImage");
+//$err = $image->action("createImage");
 
 
 //Liste des images
@@ -35,16 +35,15 @@ foreach($images as $i){
 echo "</br>";
 echo "Erreur capturée: ";
 echo "</br>";
-   
-    /*
-    //$App->setPostParam('id', $recup['id']);
-    $App->setPostParam('id', 'sdfihlus154dfhj');
-    $err = $image->action("detailsImage");
-    $temp = $App->show();
-    $ret = json_decode($temp, true)["Images"];
-    echo $ret['id'];
-    */
-    //$App->getPostParam("id");
+ 
+/*  
+$App->setPostParam('id', 354);
+$err = $image->action("deleteImage");
+$temp = $App->show();
+$ret = json_decode($temp, true)["Images"];
+echo $ret['id'];
+*/ 
+
 
 
 
diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php
index ff66339..3257dd3 100755
--- a/server/core/ErrorManagement.php
+++ b/server/core/ErrorManagement.php
@@ -34,7 +34,7 @@ Class errorManagement{
 	}
 
 	public function OtherException($error){
-		$this->app->setOutput("Error", $error->getMessage);
+		$this->app->setOutput("Error", $error->getMessage());
 	}
 	
 	
-- 
cgit v1.2.3


From 3372268aa1fc8ecca9e9a82e50ca59c6865c015d Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 22 Mar 2016 16:55:59 +0100
Subject: completed error management and all functions of Compute module

---
 server/core/Compute.php | 314 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 285 insertions(+), 29 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 37fc8ad..370f5a0 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -34,6 +34,7 @@ class compute
      	*/
         public function listServers()
         {
+		try{
                 $serverList = $this->libClass->listServers(true);
 		$servers = Array();
 		foreach($serverList as $server){
@@ -62,6 +63,22 @@ class compute
 		$servers[$server->id]["metadata"] = $server->metadata;
 		}
 		$this->app->setOutput("Servers", $servers);
+		}
+		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);
+	        }
                 return;
         }
         /**
@@ -70,6 +87,7 @@ class compute
          */
         public function listFlavors()
         {
+		try{
                 $flavorList = $this->libClass->listFlavors();
 		$flavors = Array();
 		foreach($flavorList as $flavor){
@@ -83,6 +101,22 @@ class compute
 		$flavors[$flavor->id]["links"] = $flavor->links;
 		}
 		$this->app->setOutput("Flavors", $flavors);
+		}
+		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);
+	        }
                 return;
         }
         /**
@@ -91,7 +125,8 @@ class compute
          */
         public function listImages()
         {
-                $imageList = $this->libClass->listImages();
+               	try{
+	        $imageList = $this->libClass->listImages();
 		$images = Array();
 		foreach($imageList as $image){
 		$images[$image->id] = Array();
@@ -108,6 +143,22 @@ class compute
 		$images[$image->id]["metadata"] = $image->metadata;
 		}
 		$this->app->setOutput("Images", $images);
+		}
+		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);
+	        }
                 return;
         }
        /**
@@ -116,7 +167,8 @@ class compute
          */
         public function getServer()
         {
-		$serverId = $this->app->getPostParam("serverId");
+	       	try{
+	      	$serverId = $this->app->getPostParam("serverId");
 		if(!isset($serverId)){
 			$this->app->setOutput("Error", "Server ID is missing, son!");
 			return;
@@ -125,6 +177,22 @@ class compute
                 $server = $this->libClass->getServer($opt);
 		$server->retrieve();
 		$this->app->setOutput("MyServer", $server);
+		}
+		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);
+	        }
                 return;
         }
         /**
@@ -133,6 +201,7 @@ class compute
          */
         public function getFlavor()
         {
+		try{
 		$flavorId = $this->app->getPostParam("flavorId");
 		if(!isset($serverId)){
 			$this->app->setOutput("Error", "Flavor ID is missing, son!");
@@ -142,6 +211,22 @@ class compute
                 $flavor = $this->libClass->getFlavor($opt);
 		$flavor->retrieve();
 		$this->app->setOutput("MyFlavor", $flavor);
+		}
+		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);
+	        }
                 return;
         }
         /**
@@ -150,6 +235,7 @@ class compute
          */
         public function getImage()
         {
+		try{
 		$imageId = $this->app->getPostParam("imageId");
 		if(!isset($serverId)){
 			$this->app->setOutput("Error", "Image ID is missing, son!");
@@ -159,6 +245,22 @@ class compute
                 $image = $this->libClass->getImage($opt);
 		$image->retrieve();
 		$this->app->setOutput("MyImage", $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);
+	        }
                 return;
         }
         /**
@@ -167,6 +269,7 @@ class compute
          */ 
         public function createServer()
         {
+		try{
 		$name = $this->app->getPostParam("name");
 		$imageId = $this->app->getPostParam("imageId");
 		$flavorId = $this->app->getPostParam("flavorId");
@@ -176,6 +279,23 @@ class compute
 		}
 		$opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId);
                 $server = $this->libClass->createServer($opt);
+		}
+		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);
+	        }
+		return;
         }
  
 	/**
@@ -184,6 +304,7 @@ class compute
 	*/
         public function updateServer()
         {
+		try{
                	$serverId = $this->app->getPostParam("serverId");
                	$newName = $this->app->getPostParam("newName");
                	$newIpv4 = $this->app->getPostParam("newIpv4");
@@ -205,6 +326,22 @@ class compute
 		}			
 		$server->update($attr);
 		$this->app->setOutput("Success", $serverId." has been updated successfully.");
+		}
+		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);
+	        }
                 return;
         }
 	/**
@@ -213,6 +350,7 @@ class compute
 	*/
         public function deleteServer()
         {
+		try{
                	$serverId = $this->app->getPostParam("serverId");
 		if(!isset($serverId)){
 			$this->app->setOutput("Error", "Server ID is missing, son!");
@@ -222,6 +360,22 @@ class compute
                 $server = $this->libClass->getServer($opt);
 		$server->delete();
 		$this->app->setOutput("Success", $serverId." has been deleted successfully.");
+		}
+		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);
+	        }
                 return;
         }
 	/**
@@ -230,6 +384,7 @@ class compute
 	*/
         public function changePassword()
         {
+		try{
 		$serverId = $this->app->getPostParam("serverId");
 		$password = $this->app->getPostParam("newPassword");
 		if(!isset($serverId) || !isset($password)){
@@ -240,6 +395,22 @@ class compute
                 $server = $this->libClass->getServer($opt);
 		$server->changePassword($password);	
 		$this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully.");
+		}
+		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);
+	        }
 		return;
         }
         /**
@@ -248,6 +419,7 @@ class compute
 	*/
         public function reboot()
         {
+		try{
                	$serverId = $this->app->getPostParam("serverId");
 		if(!isset($serverId)){
 			$this->app->setOutput("Error", "Server ID is missing, son!");
@@ -257,6 +429,22 @@ class compute
                 $server = $this->libClass->getServer($opt);
 		$server->reboot();
 		$this->app->setOutput("Success", $serverId." has been deleted successfully.");
+		}
+		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);
+	        }
                 return;
         }
        	/**
@@ -265,6 +453,7 @@ class compute
 	*/
         public function rebuild()
         {
+		try{
                	$serverId = $this->app->getPostParam("serverId");
                	$imageId = $this->app->getPostParam("imageId");
                	$newName = $this->app->getPostParam("newName");
@@ -278,6 +467,22 @@ class compute
 		$attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); 
 		$server->rebuild($attr);
 		$this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new 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);
+	        }
                 return;
         }
        	/**
@@ -287,6 +492,7 @@ class compute
 	*/
         public function resize()
         {
+		try{
                	$serverId = $this->app->getPostParam("serverId");
                	$newFlavorId = $this->app->getPostParam("newFlavorId");
 		if(!isset($serverId)|| !isset($flavorId)){
@@ -296,6 +502,22 @@ class compute
 		$opt = array('id' => $serverId);
                 $server = $this->libClass->getServer($opt);
 		$server->resize($newFlavorId);
+		}
+		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);
+	        }
                 return;
         }
         /**
@@ -304,6 +526,7 @@ class compute
 	*/
         public function confirmResize()
         {
+		try{
                	$serverId = $this->app->getPostParam("serverId");
 		if(!isset($serverId)){
 			$this->app->setOutput("Error", "Server ID is missing!");
@@ -313,6 +536,22 @@ class compute
                 $server = $this->libClass->getServer($opt);
 		$server->confirmResize();
 		$this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor.");
+		}
+		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);
+	        }
                 return;
         }
         /**
@@ -321,6 +560,7 @@ class compute
 	*/
         public function revertResize()
         {
+		try{
                	$serverId = $this->app->getPostParam("serverId");
 		if(!isset($serverId)){
 			$this->app->setOutput("Error", "Server ID is missing!");
@@ -330,37 +570,53 @@ class compute
                 $server = $this->libClass->getServer($opt);
 		$server->revertResize();
 		$this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor.");
+		}
+		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);
+	        }
                 return;
         }
-	/*
-        public function createImage(array $options)
-        {
-                //TODO
-        }
         public function listAddresses(array $options = [])
         {
-                //TODO
-        }
-        public function getMetadata()
-        {
-                //TODO
-        }
-        public function resetMetadata(array $metadata)
-        {
-                //TODO
-        }
-        public function mergeMetadata(array $metadata)
-        {
-                //TODO
-        }
-        public function getMetadataItem($key)
-        {
-                //TODO
-        }
-        public function deleteMetadataItem($key)
-        {
-                //TODO
+		try{
+		$serverId = $this->app->getPostParam("serverId");
+		if(!isset($serverId)){
+			$this->app->setOutput("Error", "Server ID is missing!");
+			return;
+		}
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
+		$addresses = $server->listAddresses();
+		$this->app->setOutput("Addresses", $addresses);
+		}
+		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);
+	        }
+                return;
         }
-*/
 }
  
-- 
cgit v1.2.3


From 7a61955d8566ec14fbabcfa5b3eab13d3631352f Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 22 Mar 2016 17:05:39 +0100
Subject: indentation and comments

---
 server/core/Compute.php | 411 ++++++++++++++++++++++++------------------------
 1 file changed, 208 insertions(+), 203 deletions(-)

(limited to 'server/core')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 370f5a0..4d94705 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -35,34 +35,34 @@ class compute
         public function listServers()
         {
 		try{
-                $serverList = $this->libClass->listServers(true);
-		$servers = Array();
-		foreach($serverList as $server){
-		$servers[$server->id] = Array();
-		$server->flavor->retrieve();
-		$server->image->retrieve();
-		$server->retrieve();
-		$servers[$server->id]["id"]  = $server->id;
-		$servers[$server->id]["name"] = $server->name;
-		$servers[$server->id]["image"] = $server->image; 
-		$servers[$server->id]["ram"] = $server->flavor->ram;
-		$servers[$server->id]["disk"] = $server->flavor->disk;
-		$servers[$server->id]["flavor"] = $server->flavor; 
-		$servers[$server->id]["status"] = $server->status;
-		$servers[$server->id]["created"] = $server->created;
-		$servers[$server->id]["updated"] = $server->updated;
-		$servers[$server->id]["ipv4"] = $server->ipv4;
-		$servers[$server->id]["ipv6"] = $server->ipv6;
-		$servers[$server->id]["progress"] = $server->progress;
-		$servers[$server->id]["hostId"] = $server->hostId;
-		$servers[$server->id]["tenantId"] = $server->tenantId;
-		$servers[$server->id]["userId"] = $server->userId;
-		$servers[$server->id]["taskState"] = $server->taskState;
-		$servers[$server->id]["addresses"] = $server->addresses;
-		$servers[$server->id]["links"] = $server->links;
-		$servers[$server->id]["metadata"] = $server->metadata;
-		}
-		$this->app->setOutput("Servers", $servers);
+			$serverList = $this->libClass->listServers(true);
+			$servers = Array();
+			foreach($serverList as $server){
+			$servers[$server->id] = Array();
+			$server->flavor->retrieve();
+			$server->image->retrieve();
+			$server->retrieve();
+			$servers[$server->id]["id"]  = $server->id;
+			$servers[$server->id]["name"] = $server->name;
+			$servers[$server->id]["image"] = $server->image; 
+			$servers[$server->id]["ram"] = $server->flavor->ram;
+			$servers[$server->id]["disk"] = $server->flavor->disk;
+			$servers[$server->id]["flavor"] = $server->flavor; 
+			$servers[$server->id]["status"] = $server->status;
+			$servers[$server->id]["created"] = $server->created;
+			$servers[$server->id]["updated"] = $server->updated;
+			$servers[$server->id]["ipv4"] = $server->ipv4;
+			$servers[$server->id]["ipv6"] = $server->ipv6;
+			$servers[$server->id]["progress"] = $server->progress;
+			$servers[$server->id]["hostId"] = $server->hostId;
+			$servers[$server->id]["tenantId"] = $server->tenantId;
+			$servers[$server->id]["userId"] = $server->userId;
+			$servers[$server->id]["taskState"] = $server->taskState;
+			$servers[$server->id]["addresses"] = $server->addresses;
+			$servers[$server->id]["links"] = $server->links;
+			$servers[$server->id]["metadata"] = $server->metadata;
+			}
+			$this->app->setOutput("Servers", $servers);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -77,7 +77,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -88,17 +88,17 @@ class compute
         public function listFlavors()
         {
 		try{
-                $flavorList = $this->libClass->listFlavors();
-		$flavors = Array();
-		foreach($flavorList as $flavor){
-		$flavors[$flavor->id] = Array();
-		$flavor->retrieve();
-		$flavors[$flavor->id]["id"]  = $flavor->id;
-		$flavors[$flavor->id]["name"] = $flavor->name;
-		$flavors[$flavor->id]["ram"] = $flavor->ram;
-		$flavors[$flavor->id]["disk"] = $flavor->disk;
-		$flavors[$flavor->id]["vcpus"] = $flavor->vcpus;
-		$flavors[$flavor->id]["links"] = $flavor->links;
+			$flavorList = $this->libClass->listFlavors();
+			$flavors = Array();
+			foreach($flavorList as $flavor){
+			$flavors[$flavor->id] = Array();
+			$flavor->retrieve();
+			$flavors[$flavor->id]["id"]  = $flavor->id;
+			$flavors[$flavor->id]["name"] = $flavor->name;
+			$flavors[$flavor->id]["ram"] = $flavor->ram;
+			$flavors[$flavor->id]["disk"] = $flavor->disk;
+			$flavors[$flavor->id]["vcpus"] = $flavor->vcpus;
+			$flavors[$flavor->id]["links"] = $flavor->links;
 		}
 		$this->app->setOutput("Flavors", $flavors);
 		}
@@ -115,7 +115,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -126,21 +126,21 @@ class compute
         public function listImages()
         {
                	try{
-	        $imageList = $this->libClass->listImages();
-		$images = Array();
-		foreach($imageList as $image){
-		$images[$image->id] = Array();
-		$image->retrieve();
-		$images[$image->id]["id"]  = $image->id;
-		$images[$image->id]["name"] = $image->name;
-		$images[$image->id]["status"] = $image->status;
-		$images[$image->id]["created"] = $image->created;
-		$images[$image->id]["updated"] = $image->updated;
-		$images[$image->id]["minDisk"] = $image->minDisk;
-		$images[$image->id]["minRam"] = $image->minRam;
-		$images[$image->id]["progress"] = $image->progress;
-		$images[$image->id]["links"] = $image->links;
-		$images[$image->id]["metadata"] = $image->metadata;
+			$imageList = $this->libClass->listImages();
+			$images = Array();
+			foreach($imageList as $image){
+			$images[$image->id] = Array();
+			$image->retrieve();
+			$images[$image->id]["id"]  = $image->id;
+			$images[$image->id]["name"] = $image->name;
+			$images[$image->id]["status"] = $image->status;
+			$images[$image->id]["created"] = $image->created;
+			$images[$image->id]["updated"] = $image->updated;
+			$images[$image->id]["minDisk"] = $image->minDisk;
+			$images[$image->id]["minRam"] = $image->minRam;
+			$images[$image->id]["progress"] = $image->progress;
+			$images[$image->id]["links"] = $image->links;
+			$images[$image->id]["metadata"] = $image->metadata;
 		}
 		$this->app->setOutput("Images", $images);
 		}
@@ -157,7 +157,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -168,15 +168,15 @@ class compute
         public function getServer()
         {
 	       	try{
-	      	$serverId = $this->app->getPostParam("serverId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Server ID is missing, son!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$server->retrieve();
-		$this->app->setOutput("MyServer", $server);
+			$serverId = $this->app->getPostParam("serverId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Server ID is missing, son!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$server->retrieve();
+			$this->app->setOutput("MyServer", $server);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -191,7 +191,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -202,15 +202,15 @@ class compute
         public function getFlavor()
         {
 		try{
-		$flavorId = $this->app->getPostParam("flavorId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Flavor ID is missing, son!");
-			return;
-		}
-		$opt = array('id' => $flavorId);
-                $flavor = $this->libClass->getFlavor($opt);
-		$flavor->retrieve();
-		$this->app->setOutput("MyFlavor", $flavor);
+			$flavorId = $this->app->getPostParam("flavorId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Flavor ID is missing, son!");
+				return;
+			}
+			$opt = array('id' => $flavorId);
+			$flavor = $this->libClass->getFlavor($opt);
+			$flavor->retrieve();
+			$this->app->setOutput("MyFlavor", $flavor);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -225,7 +225,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -236,15 +236,15 @@ class compute
         public function getImage()
         {
 		try{
-		$imageId = $this->app->getPostParam("imageId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Image ID is missing, son!");
-			return;
-		}
-		$opt = array('id' => $imageId);
-                $image = $this->libClass->getImage($opt);
-		$image->retrieve();
-		$this->app->setOutput("MyImage", $image);
+			$imageId = $this->app->getPostParam("imageId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Image ID is missing, son!");
+				return;
+			}
+			$opt = array('id' => $imageId);
+			$image = $this->libClass->getImage($opt);
+			$image->retrieve();
+			$this->app->setOutput("MyImage", $image);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -259,7 +259,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -270,15 +270,15 @@ class compute
         public function createServer()
         {
 		try{
-		$name = $this->app->getPostParam("name");
-		$imageId = $this->app->getPostParam("imageId");
-		$flavorId = $this->app->getPostParam("flavorId");
-		if(!isset($name) || !isset($imageId) || !isset($flavorId)){
-			$this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID.");
-			return;
-		}
-		$opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId);
-                $server = $this->libClass->createServer($opt);
+			$name = $this->app->getPostParam("name");
+			$imageId = $this->app->getPostParam("imageId");
+			$flavorId = $this->app->getPostParam("flavorId");
+			if(!isset($name) || !isset($imageId) || !isset($flavorId)){
+				$this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID.");
+				return;
+			}
+			$opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId);
+			$server = $this->libClass->createServer($opt);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -293,7 +293,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
 		return;
         }
@@ -305,27 +305,27 @@ class compute
         public function updateServer()
         {
 		try{
-               	$serverId = $this->app->getPostParam("serverId");
-               	$newName = $this->app->getPostParam("newName");
-               	$newIpv4 = $this->app->getPostParam("newIpv4");
-               	$newIpv6 = $this->app->getPostParam("newIpv6");
-		if(!isset($serverId)|| !(isset($newName) || isset($newIpv4) || isset($newIpv6)) ){
-			$this->app->setOutput("Error", "You'll have to provide server ID and the new attribute(IP(v4/v6)/Name) you desire to update!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		if (isset($newName)){
-			if(isset($newIpv4)){
-				if(isset($newIpv6)){
-					$attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); 
-				}
-				else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); 
+			$serverId = $this->app->getPostParam("serverId");
+			$newName = $this->app->getPostParam("newName");
+			$newIpv4 = $this->app->getPostParam("newIpv4");
+			$newIpv6 = $this->app->getPostParam("newIpv6");
+			if(!isset($serverId)|| !(isset($newName) || isset($newIpv4) || isset($newIpv6)) ){
+				$this->app->setOutput("Error", "You'll have to provide server ID and the new attribute(IP(v4/v6)/Name) you desire to update!");
+				return;
 			}
-			else $attr = array('name' => $newName); 
-		}			
-		$server->update($attr);
-		$this->app->setOutput("Success", $serverId." has been updated successfully.");
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			if (isset($newName)){
+				if(isset($newIpv4)){
+					if(isset($newIpv6)){
+						$attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); 
+					}
+					else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); 
+				}
+				else $attr = array('name' => $newName); 
+			}			
+			$server->update($attr);
+			$this->app->setOutput("Success", $serverId." has been updated successfully.");
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -340,7 +340,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -351,15 +351,15 @@ class compute
         public function deleteServer()
         {
 		try{
-               	$serverId = $this->app->getPostParam("serverId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Server ID is missing, son!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$server->delete();
-		$this->app->setOutput("Success", $serverId." has been deleted successfully.");
+			$serverId = $this->app->getPostParam("serverId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Server ID is missing, son!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$server->delete();
+			$this->app->setOutput("Success", $serverId." has been deleted successfully.");
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -374,7 +374,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -385,16 +385,16 @@ class compute
         public function changePassword()
         {
 		try{
-		$serverId = $this->app->getPostParam("serverId");
-		$password = $this->app->getPostParam("newPassword");
-		if(!isset($serverId) || !isset($password)){
-			$this->app->setOutput("Error", "Server ID or new password missing.");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$server->changePassword($password);	
-		$this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully.");
+			$serverId = $this->app->getPostParam("serverId");
+			$password = $this->app->getPostParam("newPassword");
+			if(!isset($serverId) || !isset($password)){
+				$this->app->setOutput("Error", "Server ID or new password missing.");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$server->changePassword($password);	
+			$this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully.");
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -409,7 +409,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
 		return;
         }
@@ -420,15 +420,15 @@ class compute
         public function reboot()
         {
 		try{
-               	$serverId = $this->app->getPostParam("serverId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Server ID is missing, son!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$server->reboot();
-		$this->app->setOutput("Success", $serverId." has been deleted successfully.");
+			$serverId = $this->app->getPostParam("serverId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Server ID is missing, son!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$server->reboot();
+			$this->app->setOutput("Success", $serverId." has been deleted successfully.");
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -443,7 +443,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -454,19 +454,19 @@ class compute
         public function rebuild()
         {
 		try{
-               	$serverId = $this->app->getPostParam("serverId");
-               	$imageId = $this->app->getPostParam("imageId");
-               	$newName = $this->app->getPostParam("newName");
-               	$adminPass = $this->app->getPostParam("adminPass");
-		if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){
-			$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); 
-		$server->rebuild($attr);
-		$this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image.");
+			$serverId = $this->app->getPostParam("serverId");
+			$imageId = $this->app->getPostParam("imageId");
+			$newName = $this->app->getPostParam("newName");
+			$adminPass = $this->app->getPostParam("adminPass");
+			if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){
+				$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); 
+			$server->rebuild($attr);
+			$this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image.");
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -481,7 +481,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -493,15 +493,15 @@ class compute
         public function resize()
         {
 		try{
-               	$serverId = $this->app->getPostParam("serverId");
-               	$newFlavorId = $this->app->getPostParam("newFlavorId");
-		if(!isset($serverId)|| !isset($flavorId)){
-			$this->app->setOutput("Error", "You'll have to provide server ID and the new flavor ID!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$server->resize($newFlavorId);
+			$serverId = $this->app->getPostParam("serverId");
+			$newFlavorId = $this->app->getPostParam("newFlavorId");
+			if(!isset($serverId)|| !isset($flavorId)){
+				$this->app->setOutput("Error", "You'll have to provide server ID and the new flavor ID!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$server->resize($newFlavorId);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -516,7 +516,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -527,15 +527,15 @@ class compute
         public function confirmResize()
         {
 		try{
-               	$serverId = $this->app->getPostParam("serverId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Server ID is missing!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$server->confirmResize();
-		$this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor.");
+			$serverId = $this->app->getPostParam("serverId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Server ID is missing!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$server->confirmResize();
+			$this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor.");
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -550,7 +550,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
@@ -561,15 +561,15 @@ class compute
         public function revertResize()
         {
 		try{
-               	$serverId = $this->app->getPostParam("serverId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Server ID is missing!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$server->revertResize();
-		$this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor.");
+			$serverId = $this->app->getPostParam("serverId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Server ID is missing!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$server->revertResize();
+			$this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor.");
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -584,22 +584,27 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
+	/**
+	* List private and public addresses of a server
+	* @return void
+	*/
+        
         public function listAddresses(array $options = [])
         {
 		try{
-		$serverId = $this->app->getPostParam("serverId");
-		if(!isset($serverId)){
-			$this->app->setOutput("Error", "Server ID is missing!");
-			return;
-		}
-		$opt = array('id' => $serverId);
-                $server = $this->libClass->getServer($opt);
-		$addresses = $server->listAddresses();
-		$this->app->setOutput("Addresses", $addresses);
+			$serverId = $this->app->getPostParam("serverId");
+			if(!isset($serverId)){
+				$this->app->setOutput("Error", "Server ID is missing!");
+				return;
+			}
+			$opt = array('id' => $serverId);
+			$server = $this->libClass->getServer($opt);
+			$addresses = $server->listAddresses();
+			$this->app->setOutput("Addresses", $addresses);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -614,7 +619,7 @@ class compute
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
 	        }
 		catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
+			$this->app->getErrorInstance()->OtherException($e);
 	        }
                 return;
         }
-- 
cgit v1.2.3