salimkanoun / GaelO

src/scripts/get_possible_import.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 		}
 	}
     
-} else {
+}else {
 	$availableVisits=[];
 }
 

src/scripts/validate_dicom_upload_tus.php

Spacing +13 added lines, -13 removed lines

@@ -37,16 +37,16 @@ 
 Session::checkSession();
 $linkpdo=Session::getLinkpdo();
 
-$timeStamp = time();
-$id_visit = $_POST['id_visit'];
-$nbOfInstances = $_POST['totalDicomFiles'];
+$timeStamp=time();
+$id_visit=$_POST['id_visit'];
+$nbOfInstances=$_POST['totalDicomFiles'];
 $anonFromOrthancId=$_POST['originalOrthancStudyID'];
 $username=$_SESSION['username'];
 $study=$_SESSION['study'];
 $role=$_SESSION['role'];
-$tusFilesID = $_POST['sucessIDsUploaded'];
+$tusFilesID=$_POST['sucessIDsUploaded'];
 
-$unzipedPath = $_SERVER['DOCUMENT_ROOT'].'/data/upload/temp/'.$timeStamp.'_'.$id_visit;
+$unzipedPath=$_SERVER['DOCUMENT_ROOT'].'/data/upload/temp/'.$timeStamp.'_'.$id_visit;
 
 $visitObject=new Visit($id_visit, $linkpdo);
 $userObject=new User($username, $linkpdo);
@@ -71,8 +71,8 @@ 
 		}
 
 		//Unzip each uploaded file and remove them from tus
-		foreach($tusFilesID as $fileName){
-			$tempZipPath = get_tus_file($fileName);
+		foreach ($tusFilesID as $fileName) {
+			$tempZipPath=get_tus_file($fileName);
 
 			$zipSize=filesize($tempZipPath);
 			$uncompressedzipSize=get_zip_originalsize($tempZipPath);
@@ -168,7 +168,7 @@ 
 		$files[]=$file->getPathname();
     }
     
-    if(sizeof($files) != $nbOfInstances){
+    if (sizeof($files) != $nbOfInstances) {
         throw new Exception("Number Of Uploaded Files dosen't match expected instance number");
     }
 	
@@ -271,23 +271,23 @@ 
 
 function get_tus_file($fileName) {
     
-    $client = new Client([
+    $client=new Client([
         // Base URI is used with relative requests
 		'base_uri' => TUS_SERVER.'/tus/',
 		'headers' => ['Tus-Resumable' => '1.0.0']
     ]);
-	$downloadedFileName = tempnam(sys_get_temp_dir(), 'dicom');
+	$downloadedFileName=tempnam(sys_get_temp_dir(), 'dicom');
 
-	$resource  = fopen( $downloadedFileName, 'r+');
+	$resource=fopen($downloadedFileName, 'r+');
 	
 	$client->request('GET', $fileName, ['sink' => $resource]);
 
     return $downloadedFileName;
 }
 
-function delete_tus_file($fileName){
+function delete_tus_file($fileName) {
 
-    $client = new Client([
+    $client=new Client([
         // Base URI is used with relative requests
 		'base_uri' => TUS_SERVER.'/tus/',
 		'headers' => ['Tus-Resumable' => '1.0.0']

Braces +9 added lines, -6 removed lines

@@ -134,14 +134,14 @@ 
 		//Log import
 		Tracker::logActivity($username, $role, $study, $visitObject->id_visit, "Upload Series", $logDetails);
 	
-	}catch (Throwable $e1) {
+	} catch (Throwable $e1) {
 		error_log($e1->getMessage());
 		handleException($e1);
 		header('HTTP/1.0 500 Internal Server Error');
 	}
 		
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.');
 }
@@ -196,11 +196,11 @@ 
 	
 	if (count($importedMap) == 1 && $importedInstances == $nbOfInstances) {
 		return $importedMap;
-	}else {
+	} else {
 		//These error shall never occur
 		if (count($importedMap) > 1) {
 			throw new Exception("More than one study in Zip");
-		}else if ($importedInstances != $nbOfInstances) {
+		} else if ($importedInstances != $nbOfInstances) {
 			throw new Exception("Imported DICOM not matching announced number of Instances");
 			
 		}
@@ -216,8 +216,11 @@ 
 	$it=new RecursiveDirectoryIterator($directory, FilesystemIterator::SKIP_DOTS);
 	$it=new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
 	foreach ($it as $file) {
-		if ($file->isDir()) rmdir($file->getPathname());
-		else unlink($file->getPathname());
+		if ($file->isDir()) {
+			rmdir($file->getPathname());
+		} else {
+			unlink($file->getPathname());
+		}
 	}
 	rmdir($directory);
 }