salimkanoun / GaelO

src/models/Patient_Visit_Manager.php

Braces +11 added lines, -11 removed lines

@@ -141,7 +141,7 @@ 
 
 		if (empty($createdVisitOrder)) {
 			$lastCreatedVisitOrder=-1;
-		}else {
+		} else {
 			$lastCreatedVisitOrder=max($createdVisitOrder);
 		}
 
@@ -154,12 +154,12 @@ 
 
 			if ($possibleVisit->visitOrder < $lastCreatedVisitOrder) {
 				$availableVisitName[]=$possibleVisit->name;
-			}else if ($possibleVisit->visitOrder > $lastCreatedVisitOrder) {
+			} else if ($possibleVisit->visitOrder > $lastCreatedVisitOrder) {
 				if ($possibleVisit->optionalVisit) {
 					//If optional add optional visit and look for the next order
 					$availableVisitName[]=$possibleVisit->name;
 					$lastCreatedVisitOrder++;
-				}else if ($possibleVisit->visitOrder > $lastCreatedVisitOrder) {
+				} else if ($possibleVisit->visitOrder > $lastCreatedVisitOrder) {
 					$availableVisitName[]=$possibleVisit->name;
 					break;
 				}
@@ -186,7 +186,7 @@ 
 			if (!empty($this->getAvailableVisitsToCreate())) {
 				return true;
 			}
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			//if exception happens no visits are missing
 			return false;
 		}
@@ -231,20 +231,20 @@ 
 
 			if ($testedDate >= $dateDownLimit && $testedDate <= $dateDownLimit) {
 				$visitAnswer['compliancy']=Patient_Visit_Manager::COMPLIANCY_YES;
-			}else {
+			} else {
 				$visitAnswer['compliancy']=Patient_Visit_Manager::COMPLIANCY_NO;
 			}
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			//Visit Not Created
 			//If optional visit no status determination
 			if ($visitType->optionalVisit) {
 				$visitAnswer['status']=Patient_Visit_Manager::OPTIONAL_VISIT;
-			}else {
+			} else {
 				//Compare actual time with theorical date to determine status
 				$testedDate=new DateTime(date("Y-m-d"));
 				if ($testedDate <= $dateUpLimit) {
 					$visitAnswer['status']=Patient_Visit_Manager::PENDING;
-				}else {
+				} else {
 					$visitAnswer['status']=Patient_Visit_Manager::SHOULD_BE_DONE;
 				}
 			}
@@ -254,7 +254,7 @@ 
 		if ($this->patientObject->patientWithdraw && $visitAnswer['acquisition_date'] == null) {
 			if ($this->patientObject->patientWithdrawDate < $dateDownLimit) {
 				$visitAnswer['status']=Patient_Visit_Manager::VISIT_WITHDRAWN;
-			}else if ($this->patientObject->patientWithdrawDate > $dateDownLimit) {
+			} else if ($this->patientObject->patientWithdrawDate > $dateDownLimit) {
 				$visitAnswer['status']=Patient_Visit_Manager::VISIT_POSSIBLY_WITHDRAWN;
 			}
 		}
@@ -295,7 +295,7 @@ 
 
 		if (empty($visitId)) {
 			throw new Exception("Visit Non Existing");
-		}else {
+		} else {
 			return new Visit($visitId, $this->linkpdo);
 		}
         
@@ -310,7 +310,7 @@ 
 
 		if (empty($visitId)) {
 			throw new Exception("Visit Non Existing");
-		}else {
+		} else {
 			return new Visit($visitId, $this->linkpdo);
 		}
 

src/models/Tree.php

Braces +15 added lines, -11 removed lines

@@ -45,20 +45,20 @@ 
 	  //Add upload status / user form in class 
 	  if ($visitObject->statusDone == Visit::DONE && $visitObject->uploadStatus == Visit::NOT_DONE && $visitObject->stateInvestigatorForm != Visit::DONE) {
 		$class="NotBoth";
-	  }else if ($visitObject->statusDone == Visit::DONE && $visitObject->stateInvestigatorForm != Visit::DONE) {
+	  } else if ($visitObject->statusDone == Visit::DONE && $visitObject->stateInvestigatorForm != Visit::DONE) {
 		$class="NotForm";
-	  }else if ($visitObject->statusDone == Visit::DONE && $visitObject->uploadStatus == Visit::NOT_DONE) {
+	  } else if ($visitObject->statusDone == Visit::DONE && $visitObject->uploadStatus == Visit::NOT_DONE) {
 		$class="NotUpload";
-	  }else {
+	  } else {
 		$class="OK";
 	  }
-	}else if ($this->role == User::CONTROLLER) {
+	} else if ($this->role == User::CONTROLLER) {
 	  if ($visitObject->stateQualityControl == Visit::QC_ACCEPTED || $visitObject->stateQualityControl == Visit::QC_REFUSED) {
 		$class="OK";
-	  }else if ($visitObject->stateQualityControl == Visit::QC_NOT_DONE || $visitObject->stateQualityControl == Visit::QC_WAIT_DEFINITVE_CONCLUSION) {
+	  } else if ($visitObject->stateQualityControl == Visit::QC_NOT_DONE || $visitObject->stateQualityControl == Visit::QC_WAIT_DEFINITVE_CONCLUSION) {
 		$class="NotBoth";
 	  }
-	}else if ($this->role == User::REVIEWER) {
+	} else if ($this->role == User::REVIEWER) {
 	  //Add status of review process (need to remove space from status string)
 	  $class=str_replace(" ", "", $visitObject->reviewStatus); ;
 	}
@@ -145,9 +145,13 @@ 
 	$resultTree=[];
 	foreach ($patientsArray as $patientObject) {
 	  //If investigator display all created visits
-	  if ($this->role == User::INVESTIGATOR) $visitsArray=$patientObject->getAllCreatedPatientsVisits();
+	  if ($this->role == User::INVESTIGATOR) {
+	  	$visitsArray=$patientObject->getAllCreatedPatientsVisits();
+	  }
 	  //if Reviewer display all QC accepted visits
-	  if ($this->role == User::REVIEWER) $visitsArray=$patientObject->getAllQcDonePatientsVisits();
+	  if ($this->role == User::REVIEWER) {
+	  	$visitsArray=$patientObject->getAllQcDonePatientsVisits();
+	  }
 	  $stortedVisits=$this->processVisitsArray($visitsArray);
 	  $resultTree[$patientObject->patientCode]['patientObject']=$patientObject;
 	  $resultTree[$patientObject->patientCode]['modalities']=$stortedVisits;
@@ -206,7 +210,7 @@ 
 	  $patientObjectArray=$this->studyObject->getPatientsLinkedToUserCenters($this->username);
 
 	  $treeStructure=$this->makeTreeFromPatients($patientObjectArray);
-	}else if ($this->role == User::CONTROLLER) {
+	} else if ($this->role == User::CONTROLLER) {
 
 	  $controllerVisitsArray=[];
 
@@ -217,7 +221,7 @@ 
 	  }
 
 	  $treeStructure=$this->makeTreeFromVisits($controllerVisitsArray);
-	}else if ($this->role == User::MONITOR) {
+	} else if ($this->role == User::MONITOR) {
 
 	  $monitorVisitsArray=[];
 
@@ -228,7 +232,7 @@ 
 	  }
 
 	  $treeStructure=$this->makeTreeFromVisits($monitorVisitsArray);
-	}else if ($this->role == User::REVIEWER) {
+	} else if ($this->role == User::REVIEWER) {
 	  //SK attention une review pending fait reafficher toutes les reviews du patient
 	  //que soit la modalite
 	  //peut etre jouer avec le job des users pour filtrer le group de visite

src/models/Export_Study_Data.php

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) { }
 		}
 	}
 
@@ -214,12 +214,12 @@ 
 		$localReviews=[];
 		try {
 			$localReviews[]=$visitObject->getReviewsObject(true);
-		}catch (Exception $e) { }
+		} catch (Exception $e) { }
 
 		$expertReviews=[];
 		try {
 			$expertReviews=$visitObject->getReviewsObject(false);
-		}catch (Exception $e) { }
+		} catch (Exception $e) { }
 
 		//Merge all reviews in an array
 		$reviewObjects=array_merge($localReviews, $expertReviews);
@@ -314,29 +314,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;
 		}

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];
 

src/models/Session.php

Braces +7 added lines, -5 removed lines

@@ -47,10 +47,10 @@ 
 			session_unset(); // unset $_SESSION variable for the run-time
 			session_destroy(); // destroy session data in storage
 			self::redirectAndEndScript();
-		}else if (empty($_SESSION)) {
+		} else if (empty($_SESSION)) {
 			//if session already empty
 			self::redirectAndEndScript();
-		}else {
+		} else {
 			$_SESSION['LAST_ACTIVITY']=time(); // update last activity time stamp
 		}
         
@@ -84,14 +84,16 @@ 
 		//Instanciate PDO connexion with SSL or not
 		if (DATABASE_SSL) {
 			$linkpdo=new PDO('mysql:host='.DATABASE_HOST.';dbname='.DATABASE_NAME.';charset=UTF8', ''.DATABASE_USERNAME.'', ''.DATABASE_PASSWORD.'', self::getSSLPDOArrayOptions());    
-		}else {
+		} else {
 			$linkpdo=new PDO('mysql:host='.DATABASE_HOST.';dbname='.DATABASE_NAME.';charset=UTF8', ''.DATABASE_USERNAME.'', ''.DATABASE_PASSWORD.'');   
 		}
 
 		$linkpdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         
 		//Load preferences from the database
-		if (!defined('GAELO_PATIENT_CODE_LENGHT')) Session::loadPreferencesInConstants($linkpdo);
+		if (!defined('GAELO_PATIENT_CODE_LENGHT')) {
+			Session::loadPreferencesInConstants($linkpdo);
+		}
         
 		return $linkpdo;
 	}
@@ -121,7 +123,7 @@ 
 			$log->pushHandler(new RotatingFileHandler($_SERVER["DOCUMENT_ROOT"].'/data/logs/gaelO.log', Logger::INFO));
 			$log->pushProcessor(new WebProcessor());
 			$log->info($stringInfo);
-		}else {
+		} else {
 			error_log("Can't write logs folder");
 		}
 	}

src/models/Visit_Type_Iterator.php

Braces +10 added lines, -4 removed lines

@@ -37,8 +37,11 @@ 
 	public function hasPrevious()
 	{
 		$this->previous();
-		if ($this->valid()) return $this->current();
-		else return false;
+		if ($this->valid()) {
+			return $this->current();
+		} else {
+			return false;
+		}
 	}
 
 	public function next()
@@ -49,8 +52,11 @@ 
 	public function hasNext()
 	{
 		$this->next();
-		if ($this->valid()) return $this->current();
-		else return false;
+		if ($this->valid()) {
+			return $this->current();
+		} else {
+			return false;
+		}
 	}
 
 	public function rewind()

src/models/Tracker.php

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 				'role' => $role
 			));
            
-		}else {
+		} else {
 			$queryTracker=$linkpdo->prepare('SELECT * FROM tracker WHERE study = :study AND role=:role');
 			$queryTracker->execute(array('study' => $study,
 				'role' => $role,

src/models/Dicom_Web_Access.php

Braces +20 added lines, -10 removed lines

@@ -33,8 +33,11 @@ 
 		$this->userRole=$userRole;
 		$this->linkpdo=$linkpdo;
         
-		if ($this->endsWith($requestedURI, "/series")) $this->isStudyMetadataRequested=true; 
-		else $this->isSerieRequested=true;
+		if ($this->endsWith($requestedURI, "/series")) {
+			$this->isStudyMetadataRequested=true;
+		} else {
+			$this->isSerieRequested=true;
+		}
         
 	}
     
@@ -55,8 +58,11 @@ 
 	 * @return string
 	 */
 	private function getUID() {
-		if ($this->isSerieRequested) $level="series";
-		else if ($this->isStudyMetadataRequested) $level="studies";
+		if ($this->isSerieRequested) {
+			$level="series";
+		} else if ($this->isStudyMetadataRequested) {
+			$level="studies";
+		}
 		$studySubString=strstr($this->requestedURI, "/".$level."/");
 		$studySubString=str_replace("/".$level."/", "", $studySubString);
 		$endStudyUIDPosition=strpos($studySubString, "/");
@@ -73,12 +79,16 @@ 
        
 		if ($this->isSerieRequested) {
 			$seriesObject=Series_Details::getSerieObjectByUID($uid, $this->linkpdo);
-			if ($this->userRole != User::SUPERVISOR && $seriesObject->deleted) throw new Exception('Deleted Series');
+			if ($this->userRole != User::SUPERVISOR && $seriesObject->deleted) {
+				throw new Exception('Deleted Series');
+			}
 			$studyObject=$seriesObject->studyDetailsObject;
             
-		}else if ($this->isStudyMetadataRequested) {
+		} else if ($this->isStudyMetadataRequested) {
 			$studyObject=Study_Details::getStudyObjectByUID($uid, $this->linkpdo);
-			if ($this->userRole != User::SUPERVISOR && $studyObject->deleted) throw new Exception('Deleted Study');
+			if ($this->userRole != User::SUPERVISOR && $studyObject->deleted) {
+				throw new Exception('Deleted Study');
+			}
 		}
         
 		return $studyObject->idVisit;
@@ -98,14 +108,14 @@ 
 		if ($this->userRole == User::REVIEWER || ($this->userRole == User::INVESTIGATOR && $visitObject->uploadStatus == Visit::DONE)) {
 			//Check that visit is in patient that is still awaiting for some reviews
 			$visitCheck=$this->userObject->isVisitAllowed($id_visit, $this->userRole);
-		}else if ($this->userRole == User::CONTROLLER) {
+		} else if ($this->userRole == User::CONTROLLER) {
 			//Check that QC status still require an action from Controller
 			if (in_array($visitObject->stateQualityControl, array(Visit::QC_WAIT_DEFINITVE_CONCLUSION, Visit::QC_NOT_DONE))) {
 				$visitCheck=$this->userObject->isVisitAllowed($id_visit, $this->userRole);
 			}
-		}else if ($this->userRole == User::SUPERVISOR) {
+		} else if ($this->userRole == User::SUPERVISOR) {
 			$visitCheck=$this->userObject->isVisitAllowed($id_visit, $this->userRole);
-		}else {
+		} else {
 			//Other roles can't have access to images
 			$visitCheck=false;
 		}

src/models/Orthanc.php

Braces +9 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
 				'http' => array(
 					'header'  => "Authorization: Basic ".base64_encode(GAELO_ORTHANC_EXPOSED_INTERNAL_LOGIN.':'.GAELO_ORTHANC_EXPOSED_INTERNAL_PASSWORD)
 	   			));
-		}else {
+		} else {
 			$this->url=GAELO_ORTHANC_PACS_ADDRESS.':'.GAELO_ORTHANC_PACS_PORT;
 			$this->context=array(
 	   			'http' => array(
@@ -297,7 +297,11 @@ 
 			return $answer;
 		}
 	    
-		if (!$gzip) $data['Compression']="none"; else $data['Compression']="gzip";
+		if (!$gzip) {
+			$data['Compression']="none";
+		} else {
+			$data['Compression']="gzip";
+		}
 	    
 		$data['Peer']=$peer;
 	    
@@ -342,7 +346,7 @@ 
 			$context=stream_context_create($opts);
 			$result=file_get_contents($this->url.'/instances', false, $context);
     	    
-		}catch (Exception $e1) {
+		} catch (Exception $e1) {
 			error_log("Error during import Dcm ".$e1->getMessage());
 		}
 		return $result;
@@ -407,7 +411,7 @@ 
 			$tagsObjects[]=new TagAnon("0008,103E", TagAnon::KEEP); //series Description
            
     
-		}else if ($profile == "Full") {
+		} else if ($profile == "Full") {
 			$date=TagAnon::CLEAR;
 			$body=TagAnon::CLEAR;
             
@@ -471,7 +475,7 @@ 
     	    
 			if ($tag->choice == TagAnon::REPLACE) {
 				$jsonArrayAnon['Replace'][$tag->tag]=$tag->newValue;
-			}else if ($tag->choice == TagAnon::KEEP) {
+			} else if ($tag->choice == TagAnon::KEEP) {
 				$jsonArrayAnon['Keep'][]=$tag->tag;
 			}
             

Spacing +2 added lines, -2 removed lines

@@ -130,8 +130,8 @@
 	    
 		$context=stream_context_create($opts);
 
-		$tempFile = tmpfile();
-		stream_copy_to_stream ( fopen($this->url.'/tools/create-archive', 'rb', false, $context) , $tempFile);
+		$tempFile=tmpfile();
+		stream_copy_to_stream(fopen($this->url.'/tools/create-archive', 'rb', false, $context), $tempFile);
 	    
 		return $tempFile;
 	}

src/models/Global_Data.php

Braces +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
 	public static function getCountryCode(PDO $linkpdo, string $countryName) {
 		if (GAELO_COUNTRY_LANGUAGE == "FR") {
 			$request="SELECT country_code FROM country WHERE country_fr = :countryName";
-		}else if (GAELO_COUNTRY_LANGUAGE == "US") {
+		} else if (GAELO_COUNTRY_LANGUAGE == "US") {
 			$request="SELECT country_code FROM country WHERE country_us = :countryName";
 		}
         
@@ -69,7 +69,7 @@ 
         
 		if ($onlyActivated) {
 			$connecter=$linkpdo->prepare('SELECT name FROM studies WHERE active=1 ORDER BY name');
-		}else {
+		} else {
 			$connecter=$linkpdo->prepare('SELECT name FROM studies ORDER BY name');
 		}
 		$connecter->execute();
@@ -240,12 +240,12 @@ 
 		try {
 			if (DATABASE_SSL) {
 				$dump=new IMysqldump\Mysqldump('mysql:host='.DATABASE_HOST.';dbname='.DATABASE_NAME.'', ''.DATABASE_USERNAME.'', ''.DATABASE_PASSWORD.'', array(), Session::getSSLPDOArrayOptions());
-			}else {
+			} else {
 				$dump=new IMysqldump\Mysqldump('mysql:host='.DATABASE_HOST.';dbname='.DATABASE_NAME.'', ''.DATABASE_USERNAME.'', ''.DATABASE_PASSWORD.'');   
 			}
             
 			$dump->start($fileSql);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			echo 'mysqldump-php error: '.$e->getMessage();
 		}