Maj Library

1 files changed, 12 insertions, 14 deletions

diff --git a/server/core/Image.php b/server/core/Image.php
index b192716..f2af5cc 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -45,18 +45,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");
 	}
 
 
@@ -80,8 +70,12 @@ class image implements Core{
 	*	options for the image creation
 	*
 	**/
+<<<<<<< HEAD
 	private function createImage(array $opt){
 
+=======
+	private function createImage(){
+>>>>>>> develop
 		$opt = $this->app->getPostParam("opt");
 
 
@@ -377,7 +371,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");
 
@@ -414,9 +408,13 @@ 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)){
@@ -620,7 +618,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");