salimkanoun / GaelO

src/controllers/investigator/visit_interface_controller.php

Spacing +1 added lines, -1 removed lines

@@ -40,6 +40,6 @@
 	require 'includes/table_visit.php';
 	require 'views/investigator/visit_interface_view.php';
    
-} else {
+}else {
 	require 'includes/no_access.php';
 }

src/controllers/supervisor/review_manager_controller.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     
 	require 'views/supervisor/review_manager_view.php';
     
-} else {
+}else {
     
 	require 'includes/no_access.php';
 }

src/models/FTP_Reader.php

Braces +9 added lines, -9 removed lines

@@ -77,10 +77,10 @@ 
 			$isAvailable=$this->isSearchedFileAvailable($fileArray);
 			if ($isAvailable) {
 				return array($this->ftpFileName);
-			}else {
+			} else {
 				throw new Exception('Target File Not Found');
 			}
-		}else {
+		} else {
 			return $fileArray;
 		}
 	}
@@ -112,7 +112,7 @@ 
 		if ($this->ftpIsSftp) {
 
 			$filesArray=$this->getSftp();
-		}else {
+		} else {
 			$filesArray=$this->getFtp();
 			//$ftpConnect = ftp_ssl_connect ($this->ftpHost, $this->ftpPort) or die("Can't Connect to Server ".$this->ftpHost);
 
@@ -136,7 +136,7 @@ 
 
 			return $sftp;
 
-		}else {
+		} else {
 
 			if (!$ftpConnect=ftp_connect($this->ftpHost, $this->ftpPort)) {
 				throw new Exception('Cant Connect to Server'.$this->ftpHost);
@@ -169,7 +169,7 @@ 
 
 			return $result;
 
-		}else {      
+		} else {      
 
 			$ftp=$this->connectAndGoToFolder();
 
@@ -191,7 +191,7 @@ 
 		$fileArray=array_filter($fileArray, function($file) {
 			if ($file == '.' || $file == '..') {
 				return false;
-			}else {
+			} else {
 				return true;
 			}
 		});
@@ -230,7 +230,7 @@ 
 		$fileArray=array_filter($fileArray, function($file) {
 			if ($file == '.' || $file == '..') {
 				return false;
-			}else {
+			} else {
 				return true;
 			}
 		});
@@ -274,7 +274,7 @@ 
 			if ($i == 0) {
 				//First line is column definition
 				$titles=$columns;
-			}else {
+			} else {
 				$patient=[];
 				//For each column associate data into an associative array
 				for ($j=0; $j < sizeof($columns); $j++) {
@@ -295,7 +295,7 @@ 
 			$email->setSubject('Auto Import Failed');
 			$email->addAminEmails();
 			$email->sendEmail();
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			echo('sendEmailException');
 			echo($e->getMessage());
 		}

src/controllers/investigator/controller_form_controller.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 		if (isset($_POST['ask_corrective_action'])) {
 			$controlDecision=Visit::QC_CORRECTIVE_ACTION_ASKED;
 			//Make Investigator Form as Draft and update form status in visit
-			if($visitObject->getVisitCharacteristics()->localFormNeeded){
+			if ($visitObject->getVisitCharacteristics()->localFormNeeded) {
 
 				try {
 					$localReviewObject=$visitObject->getReviewsObject(true);

Braces +8 added lines, -8 removed lines

@@ -61,7 +61,7 @@ 
 				try {
 					$localReviewObject=$visitObject->getReviewsObject(true);
 					$localReviewObject->unlockForm();
-				}catch (Exception $e) {
+				} catch (Exception $e) {
 					error_log($e->getMessage());
 				}
 	
@@ -91,25 +91,25 @@ 
 		//Changing Boolean in text to send email
 		if ($formAccepted) {
 			$formAccepted="Accepted";
-		}else {
+		} else {
 			$formAccepted="Refused";
 		}
         
 		if ($imageAccepted) {
 			$imageAccepted="Accepted";
-		}else {
+		} else {
 			$imageAccepted="Refused";
 		}
         
 		if (empty($_POST['formComment'])) {
 			$commentForm="N/A";
-		}else {
+		} else {
 			$commentForm=$_POST['formComment'];
 		}
         
 		if (empty($_POST['imageComment'])) {
 			$commentImage="N/A";
-		}else {
+		} else {
 			$commentImage=$_POST['imageComment'];
 		}
 
@@ -124,17 +124,17 @@ 
         
 
 	  //if send form with uncorrect permission, refuse
-	  }else if (isset($_POST['refuse']) || isset($_POST['accept']) || isset($_POST['ask_corrective_action'])
+	  } else if (isset($_POST['refuse']) || isset($_POST['accept']) || isset($_POST['ask_corrective_action'])
 			   && $role != User::CONTROLLER
 		  && (!in_array($visitObject->stateQualityControl, array(Visit::QC_NOT_DONE, Visit::QC_WAIT_DEFINITVE_CONCLUSION)))) {
            
 		  print("No Access");        
            
-	  }else {
+	  } else {
 		//if No form submitted, display the html form +- results
 		$visitType=$visitObject->getVisitCharacteristics();
 		require 'views/investigator/controller_form_view.php';
 	}
-}else {
+} else {
 	require 'includes/no_access.php';
 }

src/scripts/remove_review_attached_file.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		die('Delete File Error');
 	}
 
-	echo( json_encode((true)) );
+	echo(json_encode((true)));
 
 }else {
 	header('HTTP/1.0 403 Forbidden');

Braces +7 added lines, -4 removed lines

@@ -31,19 +31,22 @@
 
 if ($accessCheck && in_array($_SESSION['role'], array(User::INVESTIGATOR, User::REVIEWER))) {
 
-	if ($_SESSION['role'] == User::INVESTIGATOR) $reviewObject=$visitObject->getReviewsObject(true);
-	else $reviewObject=$visitObject->queryExistingReviewForReviewer($_SESSION['username']);
+	if ($_SESSION['role'] == User::INVESTIGATOR) {
+		$reviewObject=$visitObject->getReviewsObject(true);
+	} else {
+		$reviewObject=$visitObject->queryExistingReviewForReviewer($_SESSION['username']);
+	}
 
 	try {
 		$reviewObject->deleteAssociatedFile($fileKey);
-	}catch (Exception $e) {
+	} catch (Exception $e) {
 		header('HTTP/1.0 403 Forbidden');
 		die('Delete File Error');
 	}
 
 	echo( json_encode((true)) );
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.');
 }
\ No newline at end of file

src/scripts/add_review_attached_file.php

Spacing +4 added lines, -4 removed lines

@@ -44,11 +44,11 @@
 	$fileMime=$_FILES['files']['type'][0];
 	$tempFileLocation=$_FILES['files']['tmp_name'][0];
 	$fileSize=$_FILES['files']['size'][0];
-	try{
+	try {
 		$formProcessor->storeAssociatedFile($fileKey, $fileMime, $fileSize, $tempFileLocation);
-		echo( json_encode((true)) );
-	}catch (Throwable $t){
-		echo (json_encode((false)) );
+		echo(json_encode((true)));
+	}catch (Throwable $t) {
+		echo (json_encode((false)));
 	}
 
 }else {

Braces +2 added lines, -2 removed lines

@@ -47,11 +47,11 @@
 	try{
 		$formProcessor->storeAssociatedFile($fileKey, $fileMime, $fileSize, $tempFileLocation);
 		echo( json_encode((true)) );
-	}catch (Throwable $t){
+	} catch (Throwable $t){
 		echo (json_encode((false)) );
 	}
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.');
 }
\ No newline at end of file

src/scripts/is_review_attached_file.php

Braces +7 added lines, -4 removed lines

@@ -31,17 +31,20 @@
 if ($accessCheck && in_array($_SESSION['role'], array(User::INVESTIGATOR, User::REVIEWER))) {
 
 	try {
-		if ($_SESSION['role'] == User::INVESTIGATOR) $reviewObject=$visitObject->getReviewsObject(true);
-		else $reviewObject=$visitObject->queryExistingReviewForReviewer($_SESSION['username']);
+		if ($_SESSION['role'] == User::INVESTIGATOR) {
+			$reviewObject=$visitObject->getReviewsObject(true);
+		} else {
+			$reviewObject=$visitObject->queryExistingReviewForReviewer($_SESSION['username']);
+		}
 		$filePath=$reviewObject->getAssociatedFilePath($fileKey);
 		$answer=is_file($filePath);
-	}catch (Exception $e) {
+	} catch (Exception $e) {
 		$answer=false;
 	}
 
 	echo(json_encode($answer));
 
-}else {
+} else {
 	header('HTTP/1.0 403 Forbidden');
 	die('You are not allowed to access this file.');
 }
\ No newline at end of file

src/models/Review.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
 		));
 		$reviewData=$dataFetcher->fetch(PDO::FETCH_ASSOC);
 
-		if(empty($reviewData)) throw new Exception('No Review '.$id_review.' found');
+		if (empty($reviewData)) throw new Exception('No Review '.$id_review.' found');
         
 		$this->id_visit=$reviewData['id_visit'];
 		$this->username=$reviewData['username'];
@@ -183,9 +183,9 @@ 
 	 */
 	public function getAssociatedFilePath(string $fileKey) : String {
 		$fileArray=$this->associatedFiles;
-		if(array_key_exists($fileKey, $fileArray)){
+		if (array_key_exists($fileKey, $fileArray)) {
 			return $this->getAssociatedFileRootPath().'/'.$fileArray[$fileKey];
-		} else {
+		}else {
 			throw new Exception('Non Existing Key');
 		}
 		
@@ -194,9 +194,9 @@ 
 	public function deleteAssociatedFile($fileKey) {
 
 		if (!$this->validated) {
-			$filePath = $this->getAssociatedFilePath($fileKey);
-			if( ! is_file( $filePath ) ) throw new Exception('No File To Delete');
-			unlink( $filePath );
+			$filePath=$this->getAssociatedFilePath($fileKey);
+			if (!is_file($filePath)) throw new Exception('No File To Delete');
+			unlink($filePath);
 			unset($this->associatedFiles[$fileKey]);
 			$this->updateAssociatedFiles($this->associatedFiles);
 

Braces +10 added lines, -6 removed lines

@@ -40,7 +40,9 @@ 
 		));
 		$reviewData=$dataFetcher->fetch(PDO::FETCH_ASSOC);
 
-		if(empty($reviewData)) throw new Exception('No Review '.$id_review.' found');
+		if(empty($reviewData)) {
+			throw new Exception('No Review '.$id_review.' found');
+		}
         
 		$this->id_visit=$reviewData['id_visit'];
 		$this->username=$reviewData['username'];
@@ -109,7 +111,7 @@ 
 		if ($this->isLocal) {
 			$visitObject->resetQC();
 			$visitObject->changeVisitStateInvestigatorForm(Visit::LOCAL_FORM_NOT_DONE);
-		}else {
+		} else {
 			$formProcessor=$visitObject->getFromProcessor($this->isLocal, $this->username);
 			$formProcessor->setVisitValidation();
 		}
@@ -162,7 +164,7 @@ 
         
 		if ($result) {
 			return $finalFilename;
-		}else {
+		} else {
 			throw New Exception('Error writing associated File');
 		}
         
@@ -195,12 +197,14 @@ 
 
 		if (!$this->validated) {
 			$filePath = $this->getAssociatedFilePath($fileKey);
-			if( ! is_file( $filePath ) ) throw new Exception('No File To Delete');
+			if( ! is_file( $filePath ) ) {
+				throw new Exception('No File To Delete');
+			}
 			unlink( $filePath );
 			unset($this->associatedFiles[$fileKey]);
 			$this->updateAssociatedFiles($this->associatedFiles);
 
-		}else {
+		} else {
 			throw new Exception('Validated Review, can\'t remove file');
 		}
 
@@ -233,7 +237,7 @@ 
         
 		if ($this->isLocal) {
 			$visitObject->changeVisitStateInvestigatorForm(Visit::LOCAL_FORM_DRAFT);
-		}else {
+		} else {
 			$formProcessor=$visitObject->getFromProcessor($this->isLocal, $this->username);
 			$formProcessor->setVisitValidation();
 		}

src/models/Export_Study_Data.php

Spacing +4 added lines, -4 removed lines

@@ -83,7 +83,7 @@ 
 			foreach ($reviewsObjects as $reviewObject) {
 
 				foreach ($reviewObject->associatedFiles as $associatedFileKey => $associatedFilePath) {
-					$associatedFileLocation = $reviewObject->getAssociatedFilePath($associatedFileKey);
+					$associatedFileLocation=$reviewObject->getAssociatedFilePath($associatedFileKey);
 					$zip->addFile($associatedFileLocation);
 
 				};
@@ -256,9 +256,9 @@ 
 		$reviewDatas=$this->getGenericData($review);
 		$specificData=$review->getSpecificData();
 		unset($specificData["id_review"]);
-		$specificDataArray = [];
-		if( !empty($specificData) ){
-			$specificDataArray = array_values($specificData);
+		$specificDataArray=[];
+		if (!empty($specificData)) {
+			$specificDataArray=array_values($specificData);
 		}
 		$reviewLine=[...$reviewDatas, ...$specificDataArray];
 

Braces +14 added lines, -14 removed lines

@@ -38,7 +38,7 @@ 
 			try {
 				$modalityCreatedVisit=$this->studyObject->getStudySpecificGroupManager($visitGroup->groupModality)->getCreatedVisits();
 				array_push($this->allcreatedVisits, ...$modalityCreatedVisit);
-			}catch (Exception $e) { }
+			} catch (Exception $e) { }
 		}
 	}
 
@@ -215,12 +215,12 @@ 
 		$localReviews=[];
 		try {
 			$localReviews[]=$visitObject->getReviewsObject(true);
-		}catch (Exception $e) { }
+		} catch (Exception $e) { }
 
 		$expertReviews=[];
 		try {
 			$expertReviews=$visitObject->getReviewsObject(false, true);
-		}catch (Exception $e) { }
+		} catch (Exception $e) { }
 
 		//Merge all reviews in an array
 		$reviewObjects=array_merge($localReviews, $expertReviews);
@@ -318,29 +318,29 @@ 
 
 		if ($visitObject->statusDone == Visit::NOT_DONE) {
 			return 0;
-		}else if ($visitObject->uploadStatus == Visit::NOT_DONE || $visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
+		} else if ($visitObject->uploadStatus == Visit::NOT_DONE || $visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
 			if ($visitObject->uploadStatus == Visit::NOT_DONE && $visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
 				return 1;
-			}else if ($visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
+			} else if ($visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
 				return 3;
-			}else if ($visitObject->uploadStatus == Visit::NOT_DONE) {
+			} else if ($visitObject->uploadStatus == Visit::NOT_DONE) {
 				return 2;
 			}
-		}else if ($visitObject->qcStatus == Visit::QC_NOT_DONE) {
+		} else if ($visitObject->qcStatus == Visit::QC_NOT_DONE) {
 			return 4;
-		}else if ($visitObject->qcStatus == Visit::QC_CORRECTIVE_ACTION_ASKED) {
+		} else if ($visitObject->qcStatus == Visit::QC_CORRECTIVE_ACTION_ASKED) {
 			return 5;
-		}else if ($visitObject->qcStatus == Visit::QC_REFUSED) {
+		} else if ($visitObject->qcStatus == Visit::QC_REFUSED) {
 			return 6;
-		}else if ($visitObject->reviewStatus == Visit::NOT_DONE) {
+		} else if ($visitObject->reviewStatus == Visit::NOT_DONE) {
 			return 7;
-		}else if ($visitObject->reviewStatus == Visit::REVIEW_ONGOING) {
+		} else if ($visitObject->reviewStatus == Visit::REVIEW_ONGOING) {
 			return 8;
-		}else if ($visitObject->reviewStatus == Visit::REVIEW_WAIT_ADJUDICATION) {
+		} else if ($visitObject->reviewStatus == Visit::REVIEW_WAIT_ADJUDICATION) {
 			return 9;
-		}else if ($visitObject->reviewStatus == Visit::REVIEW_DONE) {
+		} else if ($visitObject->reviewStatus == Visit::REVIEW_DONE) {
 			return 10;
-		}else {
+		} else {
 			//If none of these case return -1, should not happen
 			return -1;
 		}