salimkanoun / GaelO

src/models/Documentation.php

Braces +13 added lines, -6 removed lines

@@ -60,12 +60,19 @@
      */
     
     public function isDocumentationAllowedForRole(String $role){
-        if($role==User::INVESTIGATOR) return $this->accessInvestigator;
-        else if($role==User::CONTROLLER) return $this->accessController;
-        else if($role==User::MONITOR) return $this->accessMonitor;
-        else if($role==User::REVIEWER) return $this->accessReviewer;
-        else if($role==User::SUPERVISOR) return true;
-        else return false;
+        if($role==User::INVESTIGATOR) {
+        	return $this->accessInvestigator;
+        } else if($role==User::CONTROLLER) {
+        	return $this->accessController;
+        } else if($role==User::MONITOR) {
+        	return $this->accessMonitor;
+        } else if($role==User::REVIEWER) {
+        	return $this->accessReviewer;
+        } else if($role==User::SUPERVISOR) {
+        	return true;
+        } else {
+        	return false;
+        }
     }
     
     /**

src/models/Patient.php

Braces +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
             require_once($specificObjectFile);
             $objectName=$this->patientStudy."_Patient_Visit_Manager";
             return new $objectName($this, $visitGroupObject, $this->linkpdo);
-        }else{
+        } else{
             return new Patient_Visit_Manager($this, $visitGroupObject, $this->linkpdo);
         }
 
@@ -207,7 +207,7 @@ 
         foreach($possiblevisitsGroups as $visitGroup){
             try{
                 $availableVisits=$this->getPatientVisitManager($visitGroup)->getAvailableVisitsToCreate();
-            }catch (Exception $e){
+            } catch (Exception $e){
                 $availableVisits=array($e->getMessage());
             }
 

src/models/Group_Visit_Manager.php

Braces +3 added lines, -1 removed lines

@@ -124,7 +124,9 @@
             $visitObject = new Visit($visitId, $this->linkpdo);
 
             if (!empty($username)) {
-                if ($visitObject->isAwaitingReviewForReviewerUser($username)) $visitObjectArray[] = $visitObject;
+                if ($visitObject->isAwaitingReviewForReviewerUser($username)) {
+                	$visitObjectArray[] = $visitObject;
+                }
             } else {
                 $visitObjectArray[] = $visitObject;
             }

src/models/Orthanc_Serie.php

Braces +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 		
 		if(in_array($this->sopClassUid, $scUids)){
 			return true;
-		}else {
+		} else {
 			return false;
 		}
 		

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/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/Import_Patient.php

Braces +15 added lines, -14 removed lines

@@ -58,8 +58,7 @@ 
 			    if(GAELO_DATE_FORMAT=='m.d.Y'){
 			    	$birthDay=intval($birthDateArray[1]);
 			    	$birthMonth=intval($birthDateArray[0]);
-			    }
-			    else if(GAELO_DATE_FORMAT=='d.m.Y'){
+			    } else if(GAELO_DATE_FORMAT=='d.m.Y'){
 			    	$birthDay=intval($birthDateArray[0]);
 			    	$birthMonth=intval($birthDateArray[1]);
 			    }
@@ -71,8 +70,7 @@ 
 				//Store the patient result import process in this object
 				if ($insertddb){
 						$this->sucessList[] = $patientNumber;
-				}
-				else{
+				} else{
 					$patientFailed['PatientNumber']=$patientNumber;
 					$patientFailed['Reason']="Can't write to DB, wrong date or other wrong input";
 					$this->failList[]=$patientFailed;
@@ -84,8 +82,7 @@ 
 				if(!$isExistingCenter) {
 				    if( empty($patientInvestigatorNumCenter) ){
 				        $this->failList['Missing Num Center'][]=$patientNumber;
-				    }
-				    else {
+				    } else {
 				        $this->failList['Unknown Center'][]=$patientNumber;
 				    }
 
@@ -117,8 +114,7 @@ 
 	    if(GAELO_DATE_FORMAT=='m.d.Y'){
 	        $registrationDay=intval($dateNbArray[1]);
 	        $registrationMonth=intval($dateNbArray[0]);
-	    }
-	    else if(GAELO_DATE_FORMAT=='d.m.Y'){
+	    } else if(GAELO_DATE_FORMAT=='d.m.Y'){
 	        $registrationDay=intval($dateNbArray[0]);
 	        $registrationMonth=intval($dateNbArray[1]);
 	    }
@@ -148,7 +144,7 @@ 
 	private function isNewPatient($patientCode){
 	    try{
 	        new Patient($patientCode, $this->linkpdo);
-	    }catch(Exception $e1){
+	    } catch(Exception $e1){
 	        return true;
 	    }
 	    
@@ -176,11 +172,13 @@ 
      * @return boolean
      */
 	private function isExistingCenter($patientNumCenter){
-	    if(is_null($patientNumCenter) || strlen($patientNumCenter)==0) return false;
+	    if(is_null($patientNumCenter) || strlen($patientNumCenter)==0) {
+	    	return false;
+	    }
 	    
 	    try{
 	        new Center($this->linkpdo, $patientNumCenter);
-	    }catch(Exception $e1){
+	    } catch(Exception $e1){
 	        return false;
 	    }
 	    
@@ -250,11 +248,14 @@ 
 	        foreach ($this->failList as $key=>$value){
 	            if(! empty($value)){
 	                $failReport=$failReport.$key.':<br>';
-	                if(is_array($value)) $failReport=$failReport.implode('<br>',$value).'<br>';
-	                else $failReport=$failReport.$value.'<br>';
+	                if(is_array($value)) {
+	                	$failReport=$failReport.implode('<br>',$value).'<br>';
+	                } else {
+	                	$failReport=$failReport.$value.'<br>';
+	                }
 	            }
 	        }
-	    }else{
+	    } else{
 	        $failReport=$failReport.' None <br>' ;
 	    }
 	    

src/models/Fill_Orthanc_Table.php

Braces +4 added lines, -4 removed lines

@@ -64,10 +64,10 @@ 
                 }
                 $this->visitObject->changeUploadStatus(Visit::DONE, $this->username);
                 
-            }catch(Exception $e1){
+            } catch(Exception $e1){
                 throw new Exception("Error during import ".$e1->getMessage());
             }
-        }else{
+        } else{
             throw new Exception("Error during import Study Already Known");
         }
     }
@@ -267,12 +267,12 @@ 
             if($dateObject!==false){
                 $parsedDateTime=$dateObject->format('H:i:s');
             }
-        }else if($type==1){
+        } else if($type==1){
             $dateObject=DateTime::createFromFormat('Ymd', $string);
             if($dateObject!==false){
                 $parsedDateTime=$dateObject->format('Y-m-d');
             }
-        }else if($type==0){
+        } else if($type==0){
             $dateObject=DateTime::createFromFormat('YmdHis', $string);
             if($dateObject!==false){
                 $parsedDateTime=$dateObject->format('Y-m-d H:i:s');

src/models/Orthanc_Study.php

Braces +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	    			)
 	    	);
 	    	
-	    }else{
+	    } else{
 	    	$this->url=$url;
 	    	$this->context = $context;	
 	    }