salimkanoun / GaelO

src/models/Orthanc.php

Spacing +15 added lines, -15 removed lines

@@ -39,20 +39,20 @@ 
 		//Set Time Limit at 3H as operation could be really long
 		set_time_limit(10800);
 
-		$this->client = new Client();
+		$this->client=new Client();
 		//Set address of Orthanc server
 		if ($exposed) {
 			$this->url=GAELO_ORTHANC_EXPOSED_INTERNAL_ADDRESS.':'.GAELO_ORTHANC_EXPOSED_INTERNAL_PORT;
-			$this->login = GAELO_ORTHANC_EXPOSED_INTERNAL_LOGIN;
-			$this->password = GAELO_ORTHANC_EXPOSED_INTERNAL_PASSWORD;
+			$this->login=GAELO_ORTHANC_EXPOSED_INTERNAL_LOGIN;
+			$this->password=GAELO_ORTHANC_EXPOSED_INTERNAL_PASSWORD;
 			$this->context=array(
 				'http' => array(
 					'header'  => "Authorization: Basic ".base64_encode(GAELO_ORTHANC_EXPOSED_INTERNAL_LOGIN.':'.GAELO_ORTHANC_EXPOSED_INTERNAL_PASSWORD)
 	   			));
 		}else {
 			$this->url=GAELO_ORTHANC_PACS_ADDRESS.':'.GAELO_ORTHANC_PACS_PORT;
-			$this->login = GAELO_ORTHANC_PACS_LOGIN;
-			$this->password = GAELO_ORTHANC_PACS_PASSWORD;
+			$this->login=GAELO_ORTHANC_PACS_LOGIN;
+			$this->password=GAELO_ORTHANC_PACS_PASSWORD;
 			$this->context=array(
 	   			'http' => array(
 	   				'header'  => "Authorization: Basic ".base64_encode(GAELO_ORTHANC_PACS_LOGIN.':'.GAELO_ORTHANC_PACS_PASSWORD)
@@ -128,16 +128,16 @@ 
 			$uidList=array($uidList);
 		}
 
-		$options = [
+		$options=[
 			'auth' => [$this->login, $this->password],
 			'headers'  => ['content-type' => 'application/json', 'Accept' => 'application/zip'],
 			'body' => json_encode(array('Transcode'=>'1.2.840.10008.1.2.1', 'Resources' => $uidList)),
 			'stream' => true
 		];
 
-		$response = $this->client->request('POST', $this->url.'/tools/create-archive' , $options);
+		$response=$this->client->request('POST', $this->url.'/tools/create-archive', $options);
 
-		$zipStream = $response->getBody();
+		$zipStream=$response->getBody();
 		
 		return $zipStream;
 	}
@@ -357,18 +357,18 @@ 
 	/**
 	 * This method has the advantage to stream the content and avoid running out memory
 	 */
-	public function importFileGuzzle(string $file){
-		try{
-			$body = fopen($file, 'r');
+	public function importFileGuzzle(string $file) {
+		try {
+			$body=fopen($file, 'r');
 
-			$options = ['auth' => [$this->login, $this->password],
+			$options=['auth' => [$this->login, $this->password],
 			'headers'  => ['content-type' => 'application/dicom', 'Accept' => 'application/json'],
 			'body' => $body];
 
-			$response = $this->client->request('POST', $this->url.'/instances' , $options);
+			$response=$this->client->request('POST', $this->url.'/instances', $options);
 			
-			return (string) $response->getBody();
-		} catch (Exception $e1) {
+			return (string)$response->getBody();
+		}catch (Exception $e1) {
 			error_log("Error during import Dcm ".$e1->getMessage());
 		}
 	}

src/scripts/download_dicom.php

Braces +5 added lines, -6 removed lines

@@ -39,19 +39,18 @@ 
 	$json=json_decode($postdata, true);
 	//SK ICI VERIFIER QUE LES id SONT BIEN DE L ETUDE AVEC LES DROITS ? Securite
 	$ids=$json['json'];
-}
-else if ($_SESSION['role'] == User::REVIEWER) {
+} else if ($_SESSION['role'] == User::REVIEWER) {
 	$permissionCheck=$userObject->isVisitAllowed($_POST['id_visit'], $_SESSION['role']);
 	$visitObject=new Visit($_POST['id_visit'], $linkpdo);
 	$ids=$visitObject->getSeriesOrthancID();
     
-}else if ($_SESSION['role'] == User::CONTROLLER) {
+} else if ($_SESSION['role'] == User::CONTROLLER) {
 	$permissionCheck=$userObject->isVisitAllowed($_POST['id_visit'], $_SESSION['role']);
 	$visitObject=new Visit($_POST['id_visit'], $linkpdo);
 	if (in_array($visitObject->qcStatus, array(Visit::QC_NOT_DONE, Visit::QC_WAIT_DEFINITVE_CONCLUSION))) {
 		$ids=$visitObject->getSeriesOrthancID();
 	}
-}else if ($_SESSION['role'] == User::INVESTIGATOR) {
+} else if ($_SESSION['role'] == User::INVESTIGATOR) {
 	$permissionCheck=$userObject->isVisitAllowed($_POST['id_visit'], $_SESSION['role']);
 	$visitObject=new Visit($_POST['id_visit'], $linkpdo);
 	if ($visitObject->uploadStatus == Visit::DONE) {
@@ -75,7 +74,7 @@ 
 		$date=Date('Ymd_his');
 		header('Content-Disposition: attachment; filename="Dicom-'.$_SESSION['study'].'_'.$date.'.zip"');
 	//For reviewer file name is identified by study_visit
-	}else {
+	} else {
 		$name=$_SESSION['study'].$visitObject->visitType;
 		header('Content-Disposition: attachment; filename="Dicom'.$name.'.zip"');
 	}
@@ -84,7 +83,7 @@ 
 		echo $zipStream->read(512);
 	}
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.'); 
 }
\ No newline at end of file

src/rest/download-dicom.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		echo $zipStream->read(512);
 	}
 	
-} else {
+}else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.'); 
 }
\ No newline at end of file