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/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/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();
 		}
 

src/models/User.php

Braces +17 added lines, -14 removed lines

@@ -76,8 +76,7 @@ 
 		//If no match in database => User doesn't exist
 		if (empty($queryResults)) {
 			$this->isExistingUser=false;
-		}
-		else {
+		} else {
 			$this->isExistingUser=true;
 		}
         
@@ -130,8 +129,7 @@ 
 		//If password delay over 90 => out dated password, need to be changed
 		if (intVal($delayDay) <= 90) {
 			$this->passwordDateValide=true;
-		}
-		else {
+		} else {
 			$this->passwordDateValide=false;
 		}
 
@@ -139,7 +137,7 @@ 
 		if ($this->userStatus == User::UNCONFIRMED) {
 			//Use the temp password for check
 			$this->passwordCorrect=password_verify($password, $this->tempPassword);
-		}else {
+		} else {
 			//use the current password for check
 			$this->passwordCorrect=password_verify($password, $this->password);
 		}
@@ -185,7 +183,7 @@ 
 
 			}
 		    
-		}else {
+		} else {
 			//If blocked status, re-send email notification
 			if ($this->userStatus == "Blocked") {
 				$this->sendBlockedEmail();
@@ -244,8 +242,7 @@ 
        
 		if ($rownb == 0) {
 			return false;
-		}
-		else {
+		} else {
 			return true;
 		}
 
@@ -326,7 +323,9 @@ 
 	 */
 	public function isPatientAllowed($patientCode, string $role) {
         
-		if (empty($role)) return false;
+		if (empty($role)) {
+			return false;
+		}
 
 		$patientObject=new Patient($patientCode, $this->linkpdo);
         
@@ -338,7 +337,7 @@ 
 			}
         
 		//For other patient's permission is defined by patient's study availabilty
-		}else {
+		} else {
 			if ($this->isRoleAllowed($patientObject->patientStudy, $role)) {
 				return true;
 			}
@@ -360,21 +359,25 @@ 
 	 */
 	public function isVisitAllowed($id_visit, string $role) {
         
-		if (empty($role)) return false;
+		if (empty($role)) {
+			return false;
+		}
         
 		$visitData=new Visit($id_visit, $this->linkpdo);
         
 		//Check that called Role exists for users and visit is not deleted
 		if ($this->isRoleAllowed($visitData->study, $role) && !$visitData->deleted) {
 			if ($role == $this::INVESTIGATOR) { 
-				if ($this->isPatientAllowed($visitData->patientCode, $role)) return true;
-			}else if ($role == $this::REVIEWER) {
+				if ($this->isPatientAllowed($visitData->patientCode, $role)) {
+					return true;
+				}
+			} else if ($role == $this::REVIEWER) {
 				//For reviewer the visit access is allowed if one of the created visits is still awaiting review
 				//This is made to allow access to references scans
 				$patientObject=$visitData->getPatient();
 				$isAwaitingReview=$patientObject->getPatientStudy()->isHavingAwaitingReviewImagingVisit();
 				return $isAwaitingReview;
-			}else {
+			} else {
 				//Controller, Supervisor, Admin, Monitor simply accept when role is available in patient's study (no specific rules)
 				return true;
 			}

src/models/Study.php

Braces +6 added lines, -2 removed lines

@@ -205,7 +205,7 @@ 
 			$documentationQuery=$this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study");
             
-		}else {
+		} else {
 			$documentationQuery=$this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study
                                                     AND ".$role."= 1 AND deleted=0");
@@ -294,7 +294,11 @@ 
 		));
 		$result=$connecter->fetchAll(PDO::FETCH_COLUMN);
         
-		if (count($result) > 0) return false; else return true;
+		if (count($result) > 0) {
+			return false;
+		} else {
+			return true;
+		}
         
 	}