Inspection of "Update News" - salimkanoun/GaelO - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( c54534...1da791 )

by Salim

created 2021-05-09 09:26 UTC

Status

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/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_reverse_proxy.php';
     
-}else {
+} else {
 	require 'includes/404.php';
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/scripts/tus_reverse_proxy.php 3 patches

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

@@ -63,6 +63,6 @@
 block discarded – undo
 	// Output response to the browser.
 	(new Narrowspark\HttpEmitter\SapiEmitter)->emit($response);
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 }

Please login to merge, or discard this patch.

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

@@ -32,9 +32,9 @@  discard block
 block discarded – undo
 
 if ($roleAllowed ) {   
 
-    unset($_GET['page']);
+	unset($_GET['page']);
 	// Create a PSR7 request based on the current browser request.
-    $request=ServerRequestFactory::fromGlobals();
+	$request=ServerRequestFactory::fromGlobals();
     
 	// Create a guzzle client
 	$guzzle=new GuzzleHttp\Client();
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
 		$url = getenv("HOST_URL");
 		$port = getenv("HOST_PORT");
 		$protocol = getenv("HOST_PROTOCOL");
-        $request=$request->withHeader('X-Forwarded-Host', $url.':'.$port);
-        $request=$request->withHeader('X-Forwarded-Proto', $protocol);
+		$request=$request->withHeader('X-Forwarded-Host', $url.':'.$port);
+		$request=$request->withHeader('X-Forwarded-Proto', $protocol);
 		$response=$next($request, $response);
         
 		return $response;
 	}) -> to(TUS_SERVER);
-    //error_log(print_r($response, true));
+	//error_log(print_r($response, true));
 	// Output response to the browser.
 	(new Narrowspark\HttpEmitter\SapiEmitter)->emit($response);
 

Please login to merge, or discard this patch.

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

@@ -28,9 +28,9 @@  discard block
 block discarded – undo
 $linkpdo=Session::getLinkpdo();
 
 $userObject=new User($_SESSION['username'], $linkpdo);
-$roleAllowed = $userObject->isRoleAllowed($_SESSION['study'], User::INVESTIGATOR);
+$roleAllowed=$userObject->isRoleAllowed($_SESSION['study'], User::INVESTIGATOR);
 
-if ($roleAllowed ) {   
+if ($roleAllowed) {   
 
     unset($_GET['page']);
 	// Create a PSR7 request based on the current browser request.
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
     
 	// Forward the request and get the response.
 	$response=$proxy -> forward($request) -> filter(function($request, $response, $next) {
-		$url = getenv("HOST_URL");
-		$port = getenv("HOST_PORT");
-		$protocol = getenv("HOST_PROTOCOL");
+		$url=getenv("HOST_URL");
+		$port=getenv("HOST_PORT");
+		$protocol=getenv("HOST_PROTOCOL");
         $request=$request->withHeader('X-Forwarded-Host', $url.':'.$port);
         $request=$request->withHeader('X-Forwarded-Proto', $protocol);
 		$response=$next($request, $response);

Please login to merge, or discard this patch.

src/includes/table_visit.php 1 patch

Braces +8 added lines, -5 removed lines patch added patch discarded remove patch

@@ -18,10 +18,11 @@  discard block
 block discarded – undo
  * @param Patient $patient
  */
 function build_patient_visit_table(Patient $patient, String $role) {
-	if ($patient->patientWithdraw)
-		$patientStatus="Withdrawn";
-	else
-		$patientStatus="Included";
+	if ($patient->patientWithdraw) {
+			$patientStatus="Withdrawn";
+	} else {
+			$patientStatus="Included";
+	}
     
 	$patientCenter=$patient->getPatientCenter();
 	?>
@@ -97,7 +98,9 @@  discard block
 block discarded – undo
 			foreach ($visitObjects as $visitObject) {
 				$numberOfSeries=count($visitObject->getSeriesOrthancID());
                 
-				if ($numberOfSeries == 0) $numberOfSeries="Not Uploaded";
+				if ($numberOfSeries == 0) {
+					$numberOfSeries="Not Uploaded";
+				}
 				?>    
                 <tr>
 					 <td><?=$visitObject->visitGroupObject->groupModality?></td>

Please login to merge, or discard this patch.

src/views/investigator/visit_interface_view.php 1 patch

Braces +11 added lines, -7 removed lines patch added patch discarded remove patch

@@ -232,7 +232,7 @@  discard block
 block discarded – undo
 function replaceEmpty($data) {
 	if (empty($data)) {
 		return ('/');
-	}else {
+	} else {
 		return (htmlspecialchars($data));
 	}
 }
@@ -246,7 +246,9 @@  discard block
 block discarded – undo
     
 	$series_number=count($data_series);
     
-	if ($series_number == 0) return;
+	if ($series_number == 0) {
+		return;
+	}
     
 	$colspan=$series_number+1;
 	?>
@@ -271,8 +273,8 @@  discard block
 block discarded – undo
 							<td>Series Number</td>
 							<?php 
 							for ($i=0; $i < $series_number; $i++) {
-								if (empty($data_series[$i]->seriesNumber))
-									?>
+								if (empty($data_series[$i]->seriesNumber)) {
+																	?>
 									<td> 
 										<?=replaceEmpty($data_series[$i]->seriesNumber)?>
 									</td>
@@ -282,7 +284,9 @@  discard block
 block discarded – undo
 						<tr>
 							<td>Manufacturer</td>
 							<?php 
-							for ($i=0; $i < $series_number; $i++) {
+							for ($i=0;
+								}
+								$i < $series_number; $i++) {
 								?>
 								<td>
 									<?=replaceEmpty($data_series[$i]->manufacturer)?>
@@ -334,7 +338,7 @@  discard block
 block discarded – undo
 								<td>
 								<?php if (empty($data_series[$i]->injectedDose)) {
 									echo('/');
-								}else {
+								} else {
 									echo(htmlspecialchars($data_series[$i]->injectedDose/10 ** 6));
 								}
 								?>
@@ -375,7 +379,7 @@  discard block
 block discarded – undo
 								<td>
 								<?php if (empty($data_series[$i]->injectedActivity)) {
 									echo('/');
-								}else {
+								} else {
 									echo(htmlspecialchars($data_series[$i]->injectedActivity/10 ** 6));
 								}
 								?>

Please login to merge, or discard this patch.

src/scripts/study.php 2 patches

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

@@ -42,7 +42,7 @@
 block discarded – undo
 		$studyName=$_POST['studyName'];
 		$visitsGroupArray=$_POST['visitsData'];
 		$patientCodePrefix=$_POST['patientCodePrefix'];
-		if(empty($patientCodePrefix)) $patientCodePrefix = null;
+		if (empty($patientCodePrefix)) $patientCodePrefix=null;
 		//Add the new study as an active study
 		Study::createStudy($studyName, $patientCodePrefix, $linkpdo);
          

Please login to merge, or discard this patch.

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -35,14 +35,16 @@  discard block
 block discarded – undo
 
 	}
 
-}else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+} else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
 	if ($_SESSION['admin']) {
 
 		$studyName=$_POST['studyName'];
 		$visitsGroupArray=$_POST['visitsData'];
 		$patientCodePrefix=$_POST['patientCodePrefix'];
-		if(empty($patientCodePrefix)) $patientCodePrefix = null;
+		if(empty($patientCodePrefix)) {
+			$patientCodePrefix = null;
+		}
 		//Add the new study as an active study
 		Study::createStudy($studyName, $patientCodePrefix, $linkpdo);
          
@@ -100,12 +102,12 @@  discard block
 block discarded – undo
         
 		echo(json_encode(true));
         
-	}else {
+	} else {
 		echo(json_encode(false));
 	}
     
 
 
-}else if ($_SERVER['REQUEST_METHOD'] === 'PUT') {
+} else if ($_SERVER['REQUEST_METHOD'] === 'PUT') {
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/rest/add_review_attached_file.php 2 patches

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

@@ -43,11 +43,11 @@
 block discarded – undo
 	try{
 		$formProcessor->storeAssociatedFile($fileKey, $fileMime, $fileSize, $tempFileLocation);
 		header('HTTP/1.0 200 OK');
-	}catch (Throwable $t){
+	} catch (Throwable $t){
 		header('HTTP/1.0 400 Bad Request');
 	}
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.');
 }
\ No newline at end of file

Please login to merge, or discard this patch.

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

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 $visitObject=new Visit($visitId, $linkpdo);
 $accessCheck=$userObject->isVisitAllowed($visitId, User::REVIEWER);
 
-if ( $accessCheck ) {
+if ($accessCheck) {
 	$formProcessor=$visitObject->getFromProcessor(false, $username);
 
 	if (!$formProcessor instanceof Form_Processor_File) {
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
 	$fileMime=$_FILES['files']['type'];
 	$tempFileLocation=$_FILES['files']['tmp_name'];
 	$fileSize=$_FILES['files']['size'];
-	try{
+	try {
 		$formProcessor->storeAssociatedFile($fileKey, $fileMime, $fileSize, $tempFileLocation);
 		header('HTTP/1.0 200 OK');
-	}catch (Throwable $t){
+	}catch (Throwable $t) {
 		header('HTTP/1.0 400 Bad Request');
 	}
 

Please login to merge, or discard this patch.

src/rest/get_review_attached_file.php 2 patches

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

@@ -26,7 +26,7 @@
 block discarded – undo
 $visitObject=new Visit($idVisit, $linkpdo);
 $accessCheck=$userObject->isRoleAllowed($visitObject->study, User::REVIEWER);
 
-if ( $accessCheck ) {
+if ($accessCheck) {
     
 	$reviewObject=$visitObject->queryExistingReviewForReviewer($username);
 

Please login to merge, or discard this patch.

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

@@ -45,11 +45,11 @@
 block discarded – undo
 			flush();
 		}
 		fclose($file);
-	}else {
+	} else {
 		throw new Exception("Can't Find Attached File");
 	}
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.');
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -63,6 +63,6 @@
		block discarded – undo
63	63	// Output response to the browser.
64	64	(new Narrowspark\HttpEmitter\SapiEmitter)->emit($response);
65	65
66		-}else {
	66	+} else {
67	67	header('HTTP/1.0 403 Forbidden');
68	68	}

		@@ -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

		@@ -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_reverse_proxy.php';
153	153
154		-}else {
	154	+} else {
155	155	require 'includes/404.php';
156	156	}
157	157	\ No newline at end of file

		@@ -32,9 +32,9 @@ discard block
		block discarded – undo
32	32
33	33	if ($roleAllowed ) {
34	34
35		- unset($_GET['page']);
	35	+ unset($_GET['page']);
36	36	// Create a PSR7 request based on the current browser request.
37		- $request=ServerRequestFactory::fromGlobals();
	37	+ $request=ServerRequestFactory::fromGlobals();
38	38
39	39	// Create a guzzle client
40	40	$guzzle=new GuzzleHttp\Client();
		@@ -50,13 +50,13 @@ discard block
		block discarded – undo
50	50	$url = getenv("HOST_URL");
51	51	$port = getenv("HOST_PORT");
52	52	$protocol = getenv("HOST_PROTOCOL");
53		- $request=$request->withHeader('X-Forwarded-Host', $url.':'.$port);
54		- $request=$request->withHeader('X-Forwarded-Proto', $protocol);
	53	+ $request=$request->withHeader('X-Forwarded-Host', $url.':'.$port);
	54	+ $request=$request->withHeader('X-Forwarded-Proto', $protocol);
55	55	$response=$next($request, $response);
56	56
57	57	return $response;
58	58	}) -> to(TUS_SERVER);
59		- //error_log(print_r($response, true));
	59	+ //error_log(print_r($response, true));
60	60	// Output response to the browser.
61	61	(new Narrowspark\HttpEmitter\SapiEmitter)->emit($response);
62	62

		@@ -28,9 +28,9 @@ discard block
		block discarded – undo
28	28	$linkpdo=Session::getLinkpdo();
29	29
30	30	$userObject=new User($_SESSION['username'], $linkpdo);
31		-$roleAllowed = $userObject->isRoleAllowed($_SESSION['study'], User::INVESTIGATOR);
	31	+$roleAllowed=$userObject->isRoleAllowed($_SESSION['study'], User::INVESTIGATOR);
32	32
33		-if ($roleAllowed ) {
	33	+if ($roleAllowed) {
34	34
35	35	unset($_GET['page']);
36	36	// Create a PSR7 request based on the current browser request.
		@@ -47,9 +47,9 @@ discard block
		block discarded – undo
47	47
48	48	// Forward the request and get the response.
49	49	$response=$proxy -> forward($request) -> filter(function($request, $response, $next) {
50		- $url = getenv("HOST_URL");
51		- $port = getenv("HOST_PORT");
52		- $protocol = getenv("HOST_PROTOCOL");
	50	+ $url=getenv("HOST_URL");
	51	+ $port=getenv("HOST_PORT");
	52	+ $protocol=getenv("HOST_PROTOCOL");
53	53	$request=$request->withHeader('X-Forwarded-Host', $url.':'.$port);
54	54	$request=$request->withHeader('X-Forwarded-Proto', $protocol);
55	55	$response=$next($request, $response);

		@@ -18,10 +18,11 @@ discard block
		block discarded – undo
18	18	* @param Patient $patient
19	19	*/
20	20	function build_patient_visit_table(Patient $patient, String $role) {
21		- if ($patient->patientWithdraw)
22		- $patientStatus="Withdrawn";
23		- else
24		- $patientStatus="Included";
	21	+ if ($patient->patientWithdraw) {
	22	+ $patientStatus="Withdrawn";
	23	+ } else {
	24	+ $patientStatus="Included";
	25	+ }
25	26
26	27	$patientCenter=$patient->getPatientCenter();
27	28	?>
		@@ -97,7 +98,9 @@ discard block
		block discarded – undo
97	98	foreach ($visitObjects as $visitObject) {
98	99	$numberOfSeries=count($visitObject->getSeriesOrthancID());
99	100
100		- if ($numberOfSeries == 0) $numberOfSeries="Not Uploaded";
	101	+ if ($numberOfSeries == 0) {
	102	+ $numberOfSeries="Not Uploaded";
	103	+ }
101	104	?>
102	105	<tr>
103	106	<td><?=$visitObject->visitGroupObject->groupModality?></td>

		@@ -232,7 +232,7 @@ discard block
		block discarded – undo
232	232	function replaceEmpty($data) {
233	233	if (empty($data)) {
234	234	return ('/');
235		- }else {
	235	+ } else {
236	236	return (htmlspecialchars($data));
237	237	}
238	238	}
		@@ -246,7 +246,9 @@ discard block
		block discarded – undo
246	246
247	247	$series_number=count($data_series);
248	248
249		- if ($series_number == 0) return;
	249	+ if ($series_number == 0) {
	250	+ return;
	251	+ }
250	252
251	253	$colspan=$series_number+1;
252	254	?>
		@@ -271,8 +273,8 @@ discard block
		block discarded – undo
271	273	<td>Series Number</td>
272	274	<?php
273	275	for ($i=0; $i < $series_number; $i++) {
274		- if (empty($data_series[$i]->seriesNumber))
275		- ?>
	276	+ if (empty($data_series[$i]->seriesNumber)) {
	277	+ ?>
276	278	<td>
277	279	<?=replaceEmpty($data_series[$i]->seriesNumber)?>
278	280	</td>
		@@ -282,7 +284,9 @@ discard block
		block discarded – undo
282	284	<tr>
283	285	<td>Manufacturer</td>
284	286	<?php
285		- for ($i=0; $i < $series_number; $i++) {
	287	+ for ($i=0;
	288	+ }
	289	+ $i < $series_number; $i++) {
286	290	?>
287	291	<td>
288	292	<?=replaceEmpty($data_series[$i]->manufacturer)?>
		@@ -334,7 +338,7 @@ discard block
		block discarded – undo
334	338	<td>
335	339	<?php if (empty($data_series[$i]->injectedDose)) {
336	340	echo('/');
337		- }else {
	341	+ } else {
338	342	echo(htmlspecialchars($data_series[$i]->injectedDose/10 ** 6));
339	343	}
340	344	?>
		@@ -375,7 +379,7 @@ discard block
		block discarded – undo
375	379	<td>
376	380	<?php if (empty($data_series[$i]->injectedActivity)) {
377	381	echo('/');
378		- }else {
	382	+ } else {
379	383	echo(htmlspecialchars($data_series[$i]->injectedActivity/10 ** 6));
380	384	}
381	385	?>

		@@ -42,7 +42,7 @@
		block discarded – undo
42	42	$studyName=$_POST['studyName'];
43	43	$visitsGroupArray=$_POST['visitsData'];
44	44	$patientCodePrefix=$_POST['patientCodePrefix'];
45		- if(empty($patientCodePrefix)) $patientCodePrefix = null;
	45	+ if (empty($patientCodePrefix)) $patientCodePrefix=null;
46	46	//Add the new study as an active study
47	47	Study::createStudy($studyName, $patientCodePrefix, $linkpdo);
48	48

		@@ -35,14 +35,16 @@ discard block
		block discarded – undo
35	35
36	36	}
37	37
38		-}else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
	38	+} else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
39	39
40	40	if ($_SESSION['admin']) {
41	41
42	42	$studyName=$_POST['studyName'];
43	43	$visitsGroupArray=$_POST['visitsData'];
44	44	$patientCodePrefix=$_POST['patientCodePrefix'];
45		- if(empty($patientCodePrefix)) $patientCodePrefix = null;
	45	+ if(empty($patientCodePrefix)) {
	46	+ $patientCodePrefix = null;
	47	+ }
46	48	//Add the new study as an active study
47	49	Study::createStudy($studyName, $patientCodePrefix, $linkpdo);
48	50
		@@ -100,12 +102,12 @@ discard block
		block discarded – undo
100	102
101	103	echo(json_encode(true));
102	104
103		- }else {
	105	+ } else {
104	106	echo(json_encode(false));
105	107	}
106	108
107	109
108	110
109		-}else if ($_SERVER['REQUEST_METHOD'] === 'PUT') {
	111	+} else if ($_SERVER['REQUEST_METHOD'] === 'PUT') {
110	112
111	113	}
112	114	\ No newline at end of file

		@@ -43,11 +43,11 @@
		block discarded – undo
43	43	try{
44	44	$formProcessor->storeAssociatedFile($fileKey, $fileMime, $fileSize, $tempFileLocation);
45	45	header('HTTP/1.0 200 OK');
46		- }catch (Throwable $t){
	46	+ } catch (Throwable $t){
47	47	header('HTTP/1.0 400 Bad Request');
48	48	}
49	49
50		-}else {
	50	+} else {
51	51	header('HTTP/1.0 403 Forbidden');
52	52	die('You are not allowed to access this file.');
53	53	}
54	54	\ No newline at end of file

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	$visitObject=new Visit($visitId, $linkpdo);
25	25	$accessCheck=$userObject->isVisitAllowed($visitId, User::REVIEWER);
26	26
27		-if ( $accessCheck ) {
	27	+if ($accessCheck) {
28	28	$formProcessor=$visitObject->getFromProcessor(false, $username);
29	29
30	30	if (!$formProcessor instanceof Form_Processor_File) {
		@@ -36,10 +36,10 @@ discard block
		block discarded – undo
36	36	$fileMime=$_FILES['files']['type'];
37	37	$tempFileLocation=$_FILES['files']['tmp_name'];
38	38	$fileSize=$_FILES['files']['size'];
39		- try{
	39	+ try {
40	40	$formProcessor->storeAssociatedFile($fileKey, $fileMime, $fileSize, $tempFileLocation);
41	41	header('HTTP/1.0 200 OK');
42		- }catch (Throwable $t){
	42	+ }catch (Throwable $t) {
43	43	header('HTTP/1.0 400 Bad Request');
44	44	}
45	45

		@@ -26,7 +26,7 @@
		block discarded – undo
26	26	$visitObject=new Visit($idVisit, $linkpdo);
27	27	$accessCheck=$userObject->isRoleAllowed($visitObject->study, User::REVIEWER);
28	28
29		-if ( $accessCheck ) {
	29	+if ($accessCheck) {
30	30
31	31	$reviewObject=$visitObject->queryExistingReviewForReviewer($username);
32	32

		@@ -45,11 +45,11 @@
		block discarded – undo
45	45	flush();
46	46	}
47	47	fclose($file);
48		- }else {
	48	+ } else {
49	49	throw new Exception("Can't Find Attached File");
50	50	}
51	51
52		-}else {
	52	+} else {
53	53	header('HTTP/1.0 403 Forbidden');
54	54	die('You are not allowed to access this file.');
55	55	}
56	56	\ No newline at end of file

salimkanoun / GaelO

Push — master ( c54534...1da791 )

Status

Category

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

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

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

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

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

Braces +8 added lines, -5 removed lines patch added patch discarded remove patch

Braces +11 added lines, -7 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

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

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

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

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