Inspection of "Uploader v2" - salimkanoun/GaelO - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#57)

by Salim

created 2020-07-30 13:33 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -438,13 +438,13 @@
 block discarded – undo
 			if ($this->getVisitCharacteristics()->reviewNeeded) {
 				//If review needed make it available for reviewers
 				$this->changeReviewAvailability(true);
-			}else if( ! $this->getVisitCharacteristics()->qcNeeded) {
+			}else if (!$this->getVisitCharacteristics()->qcNeeded) {
 				//The visit is QC accepted and will not go further as Review is not needed
 				//Inform supervisors that the visit is well recieved
 				//Do this only if QC is not needed as supervisor will get QC notification otherwise (avoid dual mail)
 				$this->sendUploadNotificationToSupervisor();
 			}
-		}else if ($controlDecision == Visit::QC_REFUSED){
+		}else if ($controlDecision == Visit::QC_REFUSED) {
 			$this->changeReviewAvailability(false);
 		}
         

Please login to merge, or discard this patch.

Braces +13 added lines, -10 removed lines patch added patch discarded remove patch

@@ -369,13 +369,16 @@  discard block
 block discarded – undo
 		$filteredReview=array_filter($reviewsObjects, function($review) use ($username) {
 			if ($review->username == $username) {
 				return true;
-			}else {
+			} else {
 				return false;
 			}
 		});
 		$filteredReview=array_values($filteredReview);
-		if (sizeof($filteredReview) == 1) return $filteredReview[0];
-		else throw new Exception('No review for reviwer');
+		if (sizeof($filteredReview) == 1) {
+			return $filteredReview[0];
+		} else {
+			throw new Exception('No review for reviwer');
+		}
 
 	}
 
@@ -394,7 +397,7 @@  discard block
 block discarded – undo
     	
 		if (empty($dataVisits)) {
 			return true;
-		}else {
+		} else {
 			return false;
 		}
     	
@@ -438,13 +441,13 @@  discard block
 block discarded – undo
 			if ($this->getVisitCharacteristics()->reviewNeeded) {
 				//If review needed make it available for reviewers
 				$this->changeReviewAvailability(true);
-			}else if( ! $this->getVisitCharacteristics()->qcNeeded) {
+			} else if( ! $this->getVisitCharacteristics()->qcNeeded) {
 				//The visit is QC accepted and will not go further as Review is not needed
 				//Inform supervisors that the visit is well recieved
 				//Do this only if QC is not needed as supervisor will get QC notification otherwise (avoid dual mail)
 				$this->sendUploadNotificationToSupervisor();
 			}
-		}else if ($controlDecision == Visit::QC_REFUSED){
+		} else if ($controlDecision == Visit::QC_REFUSED){
 			$this->changeReviewAvailability(false);
 		}
         
@@ -587,7 +590,7 @@  discard block
 block discarded – undo
 			require_once($specificObjectFile);
 			$objectName=$modality."_".$this->study."_".$this->visitType;
 			$formProcessor=new $objectName($this, $local, $username, $this->linkpdo);
-		}else {
+		} else {
 			throw new Exception('Missing From Processor for this visit');
 		}
     	
@@ -619,7 +622,7 @@  discard block
 block discarded – undo
 
 			return true;
             
-		}else {
+		} else {
 			return false;
 		}
 	}
@@ -659,7 +662,7 @@  discard block
 block discarded – undo
 
 		try {
 			$reviewObject=$this->queryExistingReviewForReviewer($username);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			//User does not have any review, so visit still awaiting it's review
 			return true;
 		}
@@ -668,7 +671,7 @@  discard block
 block discarded – undo
 		//not awaiting review if form already validated
 		if ($reviewObject->validated) {
 			return false;
-		}else {
+		} else {
 			return true;
 		}
         

Please login to merge, or discard this patch.

src/router.php 1 patch

Braces +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -20,137 +20,137 @@
 block discarded – undo
 if (!isset($_GET['page'])) {
 	require 'controllers/index_controller.php';
     
-}else if ($_GET['page'] == 'controller_form') {
+} else if ($_GET['page'] == 'controller_form') {
 	require 'controllers/investigator/controller_form_controller.php';
     
-}else if ($_GET['page'] == 'corrective_action') {
+} else if ($_GET['page'] == 'corrective_action') {
 	require 'controllers/investigator/corrective_action_controller.php';
     
-}else if ($_GET['page'] == 'root_investigator') {
+} else if ($_GET['page'] == 'root_investigator') {
 	require 'controllers/investigator/root_investigator_controller.php';
     
-}else if ($_GET['page'] == 'documentation') {
+} else if ($_GET['page'] == 'documentation') {
 	require 'controllers/investigator/documentation_controller.php';
     
-}else if ($_GET['page'] == 'patient_interface') {
+} else if ($_GET['page'] == 'patient_interface') {
 	require 'controllers/investigator/patient_interface_controller.php';
     
-}else if ($_GET['page'] == 'ask_unlock') {
+} else if ($_GET['page'] == 'ask_unlock') {
 	require 'controllers/investigator/ask_unlock_controller.php';
     
-}else if ($_GET['page'] == 'visit_interface') {
+} else if ($_GET['page'] == 'visit_interface') {
 	require 'controllers/investigator/visit_interface_controller.php';
     
-}else if ($_GET['page'] == 'new_visit') {
+} else if ($_GET['page'] == 'new_visit') {
 	require 'controllers/investigator/new_visit_controller.php';
     
-}else if ($_GET['page'] == 'specific_form') {
+} else if ($_GET['page'] == 'specific_form') {
 	require 'controllers/investigator/specific_form_controller.php';
     
-}else if ($_GET['page'] == 'administrator') {
+} else if ($_GET['page'] == 'administrator') {
 	require 'controllers/administrator/root_administrator_controller.php';
     
-}else if ($_GET['page'] == 'study_activation') {
+} else if ($_GET['page'] == 'study_activation') {
 	require 'controllers/administrator/study_activation_controller.php';
     
-}else if ($_GET['page'] == 'modify_centers') {
+} else if ($_GET['page'] == 'modify_centers') {
 	require 'controllers/administrator/modify_centers_controller.php';
     
-}else if ($_GET['page'] == 'preferences') {
+} else if ($_GET['page'] == 'preferences') {
 	require 'controllers/administrator/preferences_controller.php';
     
-}else if ($_GET['page'] == 'user_table') {
+} else if ($_GET['page'] == 'user_table') {
 	require 'controllers/administrator/user_table_controller.php';
     
-}else if ($_GET['page'] == 'new_user') {
+} else if ($_GET['page'] == 'new_user') {
 	require 'controllers/administrator/new_user_controller.php';
     
-}else if ($_GET['page'] == 'modify_user') {
+} else if ($_GET['page'] == 'modify_user') {
 	require 'controllers/administrator/modify_user_controller.php';
     
-}else if ($_GET['page'] == 'my_account') {
+} else if ($_GET['page'] == 'my_account') {
 	require 'controllers/my_account_controller.php';
     
-}else if ($_GET['page'] == 'export_database') {
+} else if ($_GET['page'] == 'export_database') {
 	require 'controllers/administrator/export_database_controller.php';
     
-}else if ($_GET['page'] == 'tracker_user') {
+} else if ($_GET['page'] == 'tracker_user') {
 	require 'controllers/administrator/tracker_user_controller.php';
     
-}else if ($_GET['page'] == 'tracker_admin') {
+} else if ($_GET['page'] == 'tracker_admin') {
 	require 'controllers/administrator/tracker_admin_controller.php';
     
-}else if ($_GET['page'] == 'create_study') {
+} else if ($_GET['page'] == 'create_study') {
 	require 'controllers/administrator/create_study_controller.php';
     
-}else if ($_GET['page'] == 'visit_builder') {
+} else if ($_GET['page'] == 'visit_builder') {
 	require 'controllers/administrator/visit_builder_controller.php';
     
-}else if ($_GET['page'] == 'preferences') {
+} else if ($_GET['page'] == 'preferences') {
 	require 'controllers/administrator/preferences_controller.php';
     
-}else if ($_GET['page'] == 'change_patient_status') {
+} else if ($_GET['page'] == 'change_patient_status') {
 	require 'controllers/supervisor/change_patient_status_controller.php';
     
-}else if ($_GET['page'] == 'documentation_supervisor') {
+} else if ($_GET['page'] == 'documentation_supervisor') {
 	require 'controllers/supervisor/documentation_controller.php';
     
-}else if ($_GET['page'] == 'documentation_upload') {
+} else if ($_GET['page'] == 'documentation_upload') {
 	require 'controllers/supervisor/documentation_upload_controller.php';
     
-}else if ($_GET['page'] == 'users_details') {
+} else if ($_GET['page'] == 'users_details') {
 	require 'controllers/supervisor/users_details_controller.php';
     
-}else if ($_GET['page'] == 'import_patients') {
+} else if ($_GET['page'] == 'import_patients') {
 	require 'controllers/supervisor/import_patients_controller.php';
     
-}else if ($_GET['page'] == 'patient_infos') {
+} else if ($_GET['page'] == 'patient_infos') {
 	require 'controllers/supervisor/patient_infos_controller.php';
     
-}else if ($_GET['page'] == 'visit_infos') {
+} else if ($_GET['page'] == 'visit_infos') {
 	require 'controllers/supervisor/visit_infos_controller.php';
     
-}else if ($_GET['page'] == 'root_supervisor') {
+} else if ($_GET['page'] == 'root_supervisor') {
 	require 'controllers/supervisor/supervisor_root_controller.php';
     
-}else if ($_GET['page'] == 'upload_manager') {
+} else if ($_GET['page'] == 'upload_manager') {
 	require 'controllers/supervisor/upload_manager_controller.php';
     
-}else if ($_GET['page'] == 'review_manager') {
+} else if ($_GET['page'] == 'review_manager') {
 	require 'controllers/supervisor/review_manager_controller.php';
     
-}else if ($_GET['page'] == 'download_manager') {
+} else if ($_GET['page'] == 'download_manager') {
 	require 'controllers/supervisor/download_manager_controller.php';
     
-}else if ($_GET['page'] == 'tracker') {
+} else if ($_GET['page'] == 'tracker') {
 	require 'controllers/supervisor/tracker_controller.php';
     
-}else if ($_GET['page'] == 'statistics') {
+} else if ($_GET['page'] == 'statistics') {
 	require 'controllers/supervisor/statistics_controller.php';
     
-}else if ($_GET['page'] == 'change_password') {
+} else if ($_GET['page'] == 'change_password') {
 	require 'controllers/change_password_controller.php';
     
-}else if ($_GET['page'] == 'forgot_password') {
+} else if ($_GET['page'] == 'forgot_password') {
 	require 'controllers/forgot_password_controller.php';
     
-}else if ($_GET['page'] == 'request') {
+} else if ($_GET['page'] == 'request') {
 	require 'controllers/request_controller.php';
     
-}else if ($_GET['page'] == 'messenger') {
+} else if ($_GET['page'] == 'messenger') {
 	require 'controllers/messenger_controller.php';
     
-}else if ($_GET['page'] == 'main') {
+} else if ($_GET['page'] == 'main') {
 	require 'controllers/main_controller.php';
     
-}else if (strpos($_GET['page'], 'orthanc') === 0) {
+} else if (strpos($_GET['page'], 'orthanc') === 0) {
 	//Start with Orthanc to reach orthanc
 	require 'scripts/dicom_web.php';
     
-}else if (strpos($_GET['page'], 'tus') === 0) {
+} else if (strpos($_GET['page'], 'tus') === 0) {
 	//tus subrouter
 	require 'scripts/tus_upload.php';
     
-}else {
+} else {
 	require 'includes/404.php';
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/scripts/validate_dicom_upload_tus.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -178,11 +178,11 @@
 block discarded – undo
 			continue;
 		}
 		$files[]=$file->getPathname();
-    }
+	}
     
-    if(sizeof($files) != $nbOfInstances){
-        throw new Exception("Number Of Uploaded Files dosen't match expected instance number");
-    }
+	if(sizeof($files) != $nbOfInstances){
+		throw new Exception("Number Of Uploaded Files dosen't match expected instance number");
+	}
 	
 	$importedMap=null;
 	$importedInstances=0;

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -35,15 +35,15 @@  discard block
 block discarded – undo
 Session::checkSession();
 $linkpdo=Session::getLinkpdo();
 
-$timeStamp = $_POST['timeStamp'];
-$id_visit = $_POST['id_visit'];
-$nbOfInstances = $_POST['totalDicomFiles'];
+$timeStamp=$_POST['timeStamp'];
+$id_visit=$_POST['id_visit'];
+$nbOfInstances=$_POST['totalDicomFiles'];
 $anonFromOrthancId=$_POST['originalOrthancStudyID'];
 $username=$_SESSION['username'];
 $study=$_SESSION['study'];
 $role=$_SESSION['role'];
 
-$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);
@@ -74,15 +74,15 @@  discard block
 block discarded – undo
 	}
 
 	\TusPhp\Config::set($_SERVER['DOCUMENT_ROOT'].'/data/_config/tus_server.php');
-	$server = new \TusPhp\Tus\Server();
+	$server=new \TusPhp\Tus\Server();
 
-	$tusCache =  $server->getCache();
+	$tusCache=$server->getCache();
 
-	$cacheContent = $tusCache->getCacheContents();
+	$cacheContent=$tusCache->getCacheContents();
 
-	foreach($cacheContent as $key => $uploadObject){
+	foreach ($cacheContent as $key => $uploadObject) {
 
-		if($uploadObject['metadata']['idVisit'] == $id_visit){
+		if ($uploadObject['metadata']['idVisit'] == $id_visit) {
 
 			$zipSize=filesize($uploadObject['file_path']);
 			$uncompressedzipSize=get_zip_originalsize($uploadObject['file_path']);
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
 		$files[]=$file->getPathname();
     }
     
-    if(sizeof($files) != $nbOfInstances){
+    if (sizeof($files) != $nbOfInstances) {
         throw new Exception("Number Of Uploaded Files dosen't match expected instance number");
     }
 	

Please login to merge, or discard this patch.

src/data/cron/cron.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -29,8 +29,8 @@
 block discarded – undo
 //Define action and timing
 
 //Execute each hour TUS script to remove expired incomplete upload
-$tusConfigFile = dirname(__DIR__, 1).'/data/_config/tus_server.php';
-$rootPath = dirname(__DIR__, 2);
+$tusConfigFile=dirname(__DIR__, 1).'/data/_config/tus_server.php';
+$rootPath=dirname(__DIR__, 2);
 $scheduler->raw($rootPath.'/vendor/bin/tus tus:expired --config='.$tusConfigFile)->hourly()->output('/var/log/tus_cron.log');
 
 

Please login to merge, or discard this patch.

src/data/_config/tus_server.php 2 patches

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -2,20 +2,20 @@
 block discarded – undo
 
 return [
 
-    /**
-     * Redis connection parameters.
-     */
-    'redis' => [
-        'host' => getenv('REDIS_HOST') !== false ? getenv('REDIS_HOST') : '127.0.0.1',
-        'port' => getenv('REDIS_PORT') !== false ? getenv('REDIS_PORT') : '6379',
-        'database' => getenv('REDIS_DB') !== false ? getenv('REDIS_DB') : 0,
-    ],
+	/**
+	 * Redis connection parameters.
+	 */
+	'redis' => [
+		'host' => getenv('REDIS_HOST') !== false ? getenv('REDIS_HOST') : '127.0.0.1',
+		'port' => getenv('REDIS_PORT') !== false ? getenv('REDIS_PORT') : '6379',
+		'database' => getenv('REDIS_DB') !== false ? getenv('REDIS_DB') : 0,
+	],
 
-    /**
-     * File cache configs.
-     */
-    'file' => [
-        'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload' . DIRECTORY_SEPARATOR . '.cache' . DIRECTORY_SEPARATOR,
-        'name' => 'tus_php.server.cache',
-    ],
+	/**
+	 * File cache configs.
+	 */
+	'file' => [
+		'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload' . DIRECTORY_SEPARATOR . '.cache' . DIRECTORY_SEPARATOR,
+		'name' => 'tus_php.server.cache',
+	],
 ];
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -15,7 +15,7 @@
 block discarded – undo
      * File cache configs.
      */
     'file' => [
-        'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload' . DIRECTORY_SEPARATOR . '.cache' . DIRECTORY_SEPARATOR,
+        'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload'.DIRECTORY_SEPARATOR.'.cache'.DIRECTORY_SEPARATOR,
         'name' => 'tus_php.server.cache',
     ],
 ];
\ No newline at end of file

Please login to merge, or discard this patch.

src/scripts/tus_upload.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 define('UPLOADS_DIR', $_SERVER['DOCUMENT_ROOT'].'/data/upload/temp');
 
 \TusPhp\Config::set($_SERVER['DOCUMENT_ROOT'].'/data/_config/tus_server.php');
-$server = new \TusPhp\Tus\Server(); //Either redis, file or apcu. Leave empty for file based cache.
+$server=new \TusPhp\Tus\Server(); //Either redis, file or apcu. Leave empty for file based cache.
 $server->setUploadDir(UPLOADS_DIR);
 //Overring the 'file' default root path by 'tus'
 $server->setApiPath('/tus');
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 $server->getRequest()->getRequest()->setTrustedProxies(['127.0.0.1', 'REMOTE_ADDR'], Request::HEADER_X_FORWARDED_ALL);
 
 
-$response = $server->serve();
+$response=$server->serve();
 
 $response->send();
 

Please login to merge, or discard this patch.

		@@ -438,13 +438,13 @@
		block discarded – undo
438	438	if ($this->getVisitCharacteristics()->reviewNeeded) {
439	439	//If review needed make it available for reviewers
440	440	$this->changeReviewAvailability(true);
441		- }else if( ! $this->getVisitCharacteristics()->qcNeeded) {
	441	+ }else if (!$this->getVisitCharacteristics()->qcNeeded) {
442	442	//The visit is QC accepted and will not go further as Review is not needed
443	443	//Inform supervisors that the visit is well recieved
444	444	//Do this only if QC is not needed as supervisor will get QC notification otherwise (avoid dual mail)
445	445	$this->sendUploadNotificationToSupervisor();
446	446	}
447		- }else if ($controlDecision == Visit::QC_REFUSED){
	447	+ }else if ($controlDecision == Visit::QC_REFUSED) {
448	448	$this->changeReviewAvailability(false);
449	449	}
450	450

		@@ -369,13 +369,16 @@ discard block
		block discarded – undo
369	369	$filteredReview=array_filter($reviewsObjects, function($review) use ($username) {
370	370	if ($review->username == $username) {
371	371	return true;
372		- }else {
	372	+ } else {
373	373	return false;
374	374	}
375	375	});
376	376	$filteredReview=array_values($filteredReview);
377		- if (sizeof($filteredReview) == 1) return $filteredReview[0];
378		- else throw new Exception('No review for reviwer');
	377	+ if (sizeof($filteredReview) == 1) {
	378	+ return $filteredReview[0];
	379	+ } else {
	380	+ throw new Exception('No review for reviwer');
	381	+ }
379	382
380	383	}
381	384
		@@ -394,7 +397,7 @@ discard block
		block discarded – undo
394	397
395	398	if (empty($dataVisits)) {
396	399	return true;
397		- }else {
	400	+ } else {
398	401	return false;
399	402	}
400	403
		@@ -438,13 +441,13 @@ discard block
		block discarded – undo
438	441	if ($this->getVisitCharacteristics()->reviewNeeded) {
439	442	//If review needed make it available for reviewers
440	443	$this->changeReviewAvailability(true);
441		- }else if( ! $this->getVisitCharacteristics()->qcNeeded) {
	444	+ } else if( ! $this->getVisitCharacteristics()->qcNeeded) {
442	445	//The visit is QC accepted and will not go further as Review is not needed
443	446	//Inform supervisors that the visit is well recieved
444	447	//Do this only if QC is not needed as supervisor will get QC notification otherwise (avoid dual mail)
445	448	$this->sendUploadNotificationToSupervisor();
446	449	}
447		- }else if ($controlDecision == Visit::QC_REFUSED){
	450	+ } else if ($controlDecision == Visit::QC_REFUSED){
448	451	$this->changeReviewAvailability(false);
449	452	}
450	453
		@@ -587,7 +590,7 @@ discard block
		block discarded – undo
587	590	require_once($specificObjectFile);
588	591	$objectName=$modality."_".$this->study."_".$this->visitType;
589	592	$formProcessor=new $objectName($this, $local, $username, $this->linkpdo);
590		- }else {
	593	+ } else {
591	594	throw new Exception('Missing From Processor for this visit');
592	595	}
593	596
		@@ -619,7 +622,7 @@ discard block
		block discarded – undo
619	622
620	623	return true;
621	624
622		- }else {
	625	+ } else {
623	626	return false;
624	627	}
625	628	}
		@@ -659,7 +662,7 @@ discard block
		block discarded – undo
659	662
660	663	try {
661	664	$reviewObject=$this->queryExistingReviewForReviewer($username);
662		- }catch (Exception $e) {
	665	+ } catch (Exception $e) {
663	666	//User does not have any review, so visit still awaiting it's review
664	667	return true;
665	668	}
		@@ -668,7 +671,7 @@ discard block
		block discarded – undo
668	671	//not awaiting review if form already validated
669	672	if ($reviewObject->validated) {
670	673	return false;
671		- }else {
	674	+ } else {
672	675	return true;
673	676	}
674	677

		@@ -20,137 +20,137 @@
		block discarded – undo
20	20	if (!isset($_GET['page'])) {
21	21	require 'controllers/index_controller.php';
22	22
23		-}else if ($_GET['page'] == 'controller_form') {
	23	+} else if ($_GET['page'] == 'controller_form') {
24	24	require 'controllers/investigator/controller_form_controller.php';
25	25
26		-}else if ($_GET['page'] == 'corrective_action') {
	26	+} else if ($_GET['page'] == 'corrective_action') {
27	27	require 'controllers/investigator/corrective_action_controller.php';
28	28
29		-}else if ($_GET['page'] == 'root_investigator') {
	29	+} else if ($_GET['page'] == 'root_investigator') {
30	30	require 'controllers/investigator/root_investigator_controller.php';
31	31
32		-}else if ($_GET['page'] == 'documentation') {
	32	+} else if ($_GET['page'] == 'documentation') {
33	33	require 'controllers/investigator/documentation_controller.php';
34	34
35		-}else if ($_GET['page'] == 'patient_interface') {
	35	+} else if ($_GET['page'] == 'patient_interface') {
36	36	require 'controllers/investigator/patient_interface_controller.php';
37	37
38		-}else if ($_GET['page'] == 'ask_unlock') {
	38	+} else if ($_GET['page'] == 'ask_unlock') {
39	39	require 'controllers/investigator/ask_unlock_controller.php';
40	40
41		-}else if ($_GET['page'] == 'visit_interface') {
	41	+} else if ($_GET['page'] == 'visit_interface') {
42	42	require 'controllers/investigator/visit_interface_controller.php';
43	43
44		-}else if ($_GET['page'] == 'new_visit') {
	44	+} else if ($_GET['page'] == 'new_visit') {
45	45	require 'controllers/investigator/new_visit_controller.php';
46	46
47		-}else if ($_GET['page'] == 'specific_form') {
	47	+} else if ($_GET['page'] == 'specific_form') {
48	48	require 'controllers/investigator/specific_form_controller.php';
49	49
50		-}else if ($_GET['page'] == 'administrator') {
	50	+} else if ($_GET['page'] == 'administrator') {
51	51	require 'controllers/administrator/root_administrator_controller.php';
52	52
53		-}else if ($_GET['page'] == 'study_activation') {
	53	+} else if ($_GET['page'] == 'study_activation') {
54	54	require 'controllers/administrator/study_activation_controller.php';
55	55
56		-}else if ($_GET['page'] == 'modify_centers') {
	56	+} else if ($_GET['page'] == 'modify_centers') {
57	57	require 'controllers/administrator/modify_centers_controller.php';
58	58
59		-}else if ($_GET['page'] == 'preferences') {
	59	+} else if ($_GET['page'] == 'preferences') {
60	60	require 'controllers/administrator/preferences_controller.php';
61	61
62		-}else if ($_GET['page'] == 'user_table') {
	62	+} else if ($_GET['page'] == 'user_table') {
63	63	require 'controllers/administrator/user_table_controller.php';
64	64
65		-}else if ($_GET['page'] == 'new_user') {
	65	+} else if ($_GET['page'] == 'new_user') {
66	66	require 'controllers/administrator/new_user_controller.php';
67	67
68		-}else if ($_GET['page'] == 'modify_user') {
	68	+} else if ($_GET['page'] == 'modify_user') {
69	69	require 'controllers/administrator/modify_user_controller.php';
70	70
71		-}else if ($_GET['page'] == 'my_account') {
	71	+} else if ($_GET['page'] == 'my_account') {
72	72	require 'controllers/my_account_controller.php';
73	73
74		-}else if ($_GET['page'] == 'export_database') {
	74	+} else if ($_GET['page'] == 'export_database') {
75	75	require 'controllers/administrator/export_database_controller.php';
76	76
77		-}else if ($_GET['page'] == 'tracker_user') {
	77	+} else if ($_GET['page'] == 'tracker_user') {
78	78	require 'controllers/administrator/tracker_user_controller.php';
79	79
80		-}else if ($_GET['page'] == 'tracker_admin') {
	80	+} else if ($_GET['page'] == 'tracker_admin') {
81	81	require 'controllers/administrator/tracker_admin_controller.php';
82	82
83		-}else if ($_GET['page'] == 'create_study') {
	83	+} else if ($_GET['page'] == 'create_study') {
84	84	require 'controllers/administrator/create_study_controller.php';
85	85
86		-}else if ($_GET['page'] == 'visit_builder') {
	86	+} else if ($_GET['page'] == 'visit_builder') {
87	87	require 'controllers/administrator/visit_builder_controller.php';
88	88
89		-}else if ($_GET['page'] == 'preferences') {
	89	+} else if ($_GET['page'] == 'preferences') {
90	90	require 'controllers/administrator/preferences_controller.php';
91	91
92		-}else if ($_GET['page'] == 'change_patient_status') {
	92	+} else if ($_GET['page'] == 'change_patient_status') {
93	93	require 'controllers/supervisor/change_patient_status_controller.php';
94	94
95		-}else if ($_GET['page'] == 'documentation_supervisor') {
	95	+} else if ($_GET['page'] == 'documentation_supervisor') {
96	96	require 'controllers/supervisor/documentation_controller.php';
97	97
98		-}else if ($_GET['page'] == 'documentation_upload') {
	98	+} else if ($_GET['page'] == 'documentation_upload') {
99	99	require 'controllers/supervisor/documentation_upload_controller.php';
100	100
101		-}else if ($_GET['page'] == 'users_details') {
	101	+} else if ($_GET['page'] == 'users_details') {
102	102	require 'controllers/supervisor/users_details_controller.php';
103	103
104		-}else if ($_GET['page'] == 'import_patients') {
	104	+} else if ($_GET['page'] == 'import_patients') {
105	105	require 'controllers/supervisor/import_patients_controller.php';
106	106
107		-}else if ($_GET['page'] == 'patient_infos') {
	107	+} else if ($_GET['page'] == 'patient_infos') {
108	108	require 'controllers/supervisor/patient_infos_controller.php';
109	109
110		-}else if ($_GET['page'] == 'visit_infos') {
	110	+} else if ($_GET['page'] == 'visit_infos') {
111	111	require 'controllers/supervisor/visit_infos_controller.php';
112	112
113		-}else if ($_GET['page'] == 'root_supervisor') {
	113	+} else if ($_GET['page'] == 'root_supervisor') {
114	114	require 'controllers/supervisor/supervisor_root_controller.php';
115	115
116		-}else if ($_GET['page'] == 'upload_manager') {
	116	+} else if ($_GET['page'] == 'upload_manager') {
117	117	require 'controllers/supervisor/upload_manager_controller.php';
118	118
119		-}else if ($_GET['page'] == 'review_manager') {
	119	+} else if ($_GET['page'] == 'review_manager') {
120	120	require 'controllers/supervisor/review_manager_controller.php';
121	121
122		-}else if ($_GET['page'] == 'download_manager') {
	122	+} else if ($_GET['page'] == 'download_manager') {
123	123	require 'controllers/supervisor/download_manager_controller.php';
124	124
125		-}else if ($_GET['page'] == 'tracker') {
	125	+} else if ($_GET['page'] == 'tracker') {
126	126	require 'controllers/supervisor/tracker_controller.php';
127	127
128		-}else if ($_GET['page'] == 'statistics') {
	128	+} else if ($_GET['page'] == 'statistics') {
129	129	require 'controllers/supervisor/statistics_controller.php';
130	130
131		-}else if ($_GET['page'] == 'change_password') {
	131	+} else if ($_GET['page'] == 'change_password') {
132	132	require 'controllers/change_password_controller.php';
133	133
134		-}else if ($_GET['page'] == 'forgot_password') {
	134	+} else if ($_GET['page'] == 'forgot_password') {
135	135	require 'controllers/forgot_password_controller.php';
136	136
137		-}else if ($_GET['page'] == 'request') {
	137	+} else if ($_GET['page'] == 'request') {
138	138	require 'controllers/request_controller.php';
139	139
140		-}else if ($_GET['page'] == 'messenger') {
	140	+} else if ($_GET['page'] == 'messenger') {
141	141	require 'controllers/messenger_controller.php';
142	142
143		-}else if ($_GET['page'] == 'main') {
	143	+} else if ($_GET['page'] == 'main') {
144	144	require 'controllers/main_controller.php';
145	145
146		-}else if (strpos($_GET['page'], 'orthanc') === 0) {
	146	+} else if (strpos($_GET['page'], 'orthanc') === 0) {
147	147	//Start with Orthanc to reach orthanc
148	148	require 'scripts/dicom_web.php';
149	149
150		-}else if (strpos($_GET['page'], 'tus') === 0) {
	150	+} else if (strpos($_GET['page'], 'tus') === 0) {
151	151	//tus subrouter
152	152	require 'scripts/tus_upload.php';
153	153
154		-}else {
	154	+} else {
155	155	require 'includes/404.php';
156	156	}
157	157	\ No newline at end of file

		@@ -178,11 +178,11 @@
		block discarded – undo
178	178	continue;
179	179	}
180	180	$files[]=$file->getPathname();
181		- }
	181	+ }
182	182
183		- if(sizeof($files) != $nbOfInstances){
184		- throw new Exception("Number Of Uploaded Files dosen't match expected instance number");
185		- }
	183	+ if(sizeof($files) != $nbOfInstances){
	184	+ throw new Exception("Number Of Uploaded Files dosen't match expected instance number");
	185	+ }
186	186
187	187	$importedMap=null;
188	188	$importedInstances=0;

		@@ -35,15 +35,15 @@ discard block
		block discarded – undo
35	35	Session::checkSession();
36	36	$linkpdo=Session::getLinkpdo();
37	37
38		-$timeStamp = $_POST['timeStamp'];
39		-$id_visit = $_POST['id_visit'];
40		-$nbOfInstances = $_POST['totalDicomFiles'];
	38	+$timeStamp=$_POST['timeStamp'];
	39	+$id_visit=$_POST['id_visit'];
	40	+$nbOfInstances=$_POST['totalDicomFiles'];
41	41	$anonFromOrthancId=$_POST['originalOrthancStudyID'];
42	42	$username=$_SESSION['username'];
43	43	$study=$_SESSION['study'];
44	44	$role=$_SESSION['role'];
45	45
46		-$unzipedPath = $_SERVER['DOCUMENT_ROOT'].'/data/upload/temp/'.$timeStamp.'_'.$id_visit;
	46	+$unzipedPath=$_SERVER['DOCUMENT_ROOT'].'/data/upload/temp/'.$timeStamp.'_'.$id_visit;
47	47
48	48	$visitObject=new Visit($id_visit, $linkpdo);
49	49	$userObject=new User($username, $linkpdo);
		@@ -74,15 +74,15 @@ discard block
		block discarded – undo
74	74	}
75	75
76	76	\TusPhp\Config::set($_SERVER['DOCUMENT_ROOT'].'/data/_config/tus_server.php');
77		- $server = new \TusPhp\Tus\Server();
	77	+ $server=new \TusPhp\Tus\Server();
78	78
79		- $tusCache = $server->getCache();
	79	+ $tusCache=$server->getCache();
80	80
81		- $cacheContent = $tusCache->getCacheContents();
	81	+ $cacheContent=$tusCache->getCacheContents();
82	82
83		- foreach($cacheContent as $key => $uploadObject){
	83	+ foreach ($cacheContent as $key => $uploadObject) {
84	84
85		- if($uploadObject['metadata']['idVisit'] == $id_visit){
	85	+ if ($uploadObject['metadata']['idVisit'] == $id_visit) {
86	86
87	87	$zipSize=filesize($uploadObject['file_path']);
88	88	$uncompressedzipSize=get_zip_originalsize($uploadObject['file_path']);
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180	$files[]=$file->getPathname();
181	181	}
182	182
183		- if(sizeof($files) != $nbOfInstances){
	183	+ if (sizeof($files) != $nbOfInstances) {
184	184	throw new Exception("Number Of Uploaded Files dosen't match expected instance number");
185	185	}
186	186

		@@ -29,8 +29,8 @@
		block discarded – undo
29	29	//Define action and timing
30	30
31	31	//Execute each hour TUS script to remove expired incomplete upload
32		-$tusConfigFile = dirname(__DIR__, 1).'/data/_config/tus_server.php';
33		-$rootPath = dirname(__DIR__, 2);
	32	+$tusConfigFile=dirname(__DIR__, 1).'/data/_config/tus_server.php';
	33	+$rootPath=dirname(__DIR__, 2);
34	34	$scheduler->raw($rootPath.'/vendor/bin/tus tus:expired --config='.$tusConfigFile)->hourly()->output('/var/log/tus_cron.log');
35	35
36	36

		@@ -2,20 +2,20 @@
		block discarded – undo
2	2
3	3	return [
4	4
5		- /**
6		- * Redis connection parameters.
7		- */
8		- 'redis' => [
9		- 'host' => getenv('REDIS_HOST') !== false ? getenv('REDIS_HOST') : '127.0.0.1',
10		- 'port' => getenv('REDIS_PORT') !== false ? getenv('REDIS_PORT') : '6379',
11		- 'database' => getenv('REDIS_DB') !== false ? getenv('REDIS_DB') : 0,
12		- ],
	5	+ /**
	6	+ * Redis connection parameters.
	7	+ */
	8	+ 'redis' => [
	9	+ 'host' => getenv('REDIS_HOST') !== false ? getenv('REDIS_HOST') : '127.0.0.1',
	10	+ 'port' => getenv('REDIS_PORT') !== false ? getenv('REDIS_PORT') : '6379',
	11	+ 'database' => getenv('REDIS_DB') !== false ? getenv('REDIS_DB') : 0,
	12	+ ],
13	13
14		- /**
15		- * File cache configs.
16		- */
17		- 'file' => [
18		- 'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload' . DIRECTORY_SEPARATOR . '.cache' . DIRECTORY_SEPARATOR,
19		- 'name' => 'tus_php.server.cache',
20		- ],
	14	+ /**
	15	+ * File cache configs.
	16	+ */
	17	+ 'file' => [
	18	+ 'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload' . DIRECTORY_SEPARATOR . '.cache' . DIRECTORY_SEPARATOR,
	19	+ 'name' => 'tus_php.server.cache',
	20	+ ],
21	21	];
22	22	\ No newline at end of file

		@@ -15,7 +15,7 @@
		block discarded – undo
15	15	* File cache configs.
16	16	*/
17	17	'file' => [
18		- 'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload' . DIRECTORY_SEPARATOR . '.cache' . DIRECTORY_SEPARATOR,
	18	+ 'dir' => $_SERVER['DOCUMENT_ROOT'].'/data/upload'.DIRECTORY_SEPARATOR.'.cache'.DIRECTORY_SEPARATOR,
19	19	'name' => 'tus_php.server.cache',
20	20	],
21	21	];
22	22	\ No newline at end of file

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	define('UPLOADS_DIR', $_SERVER['DOCUMENT_ROOT'].'/data/upload/temp');
10	10
11	11	\TusPhp\Config::set($_SERVER['DOCUMENT_ROOT'].'/data/_config/tus_server.php');
12		-$server = new \TusPhp\Tus\Server(); //Either redis, file or apcu. Leave empty for file based cache.
	12	+$server=new \TusPhp\Tus\Server(); //Either redis, file or apcu. Leave empty for file based cache.
13	13	$server->setUploadDir(UPLOADS_DIR);
14	14	//Overring the 'file' default root path by 'tus'
15	15	$server->setApiPath('/tus');
		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	$server->getRequest()->getRequest()->setTrustedProxies(['127.0.0.1', 'REMOTE_ADDR'], Request::HEADER_X_FORWARDED_ALL);
18	18
19	19
20		-$response = $server->serve();
	20	+$response=$server->serve();
21	21
22	22	$response->send();
23	23

salimkanoun / GaelO

Pull Request — master (#57)

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +13 added lines, -10 removed lines patch added patch discarded remove patch

Braces +44 added lines, -44 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch