salimkanoun / GaelO

src/views/administrator/tracker_user_view.php

Braces +7 added lines, -3 removed lines

@@ -148,9 +148,13 @@
     					<td><?=$userEvent['username']; ?></td>

     					<td>

     					<?php 

-						   if ($userEvent['action_type'] == "Change Password") echo('Password Changed');

-						   else if ($userEvent['action_type'] == "Ask New Password") echo('Asked New Password');

-						   else if ($userEvent['action_type'] == "Account Blocked") echo('Account Blocked');

+						   if ($userEvent['action_type'] == "Change Password") {
+						   	echo('Password Changed');
+						   } else if ($userEvent['action_type'] == "Ask New Password") {
+						   	echo('Asked New Password');
+						   } else if ($userEvent['action_type'] == "Account Blocked") {
+						   	echo('Account Blocked');
+						   }
 						?>

     					</td>

     				</tr>

src/views/administrator/modify_user_view.php

Braces +7 added lines, -5 removed lines

@@ -95,11 +95,11 @@ 
 						User::UNCONFIRMED,

 						User::DEACTIVATED

 					);

-				}else if ($userObject->userStatus == User::UNCONFIRMED) {

+				} else if ($userObject->userStatus == User::UNCONFIRMED) {

 					$possibleStatus=array(

 						User::DEACTIVATED

 					);

-				}else if ($userObject->userStatus == User::DEACTIVATED) {

+				} else if ($userObject->userStatus == User::DEACTIVATED) {

 					$possibleStatus=array(

 						User::UNCONFIRMED

 					);

@@ -109,7 +109,7 @@ 
 				foreach ($possibleStatus as $status) {

 					if ($status == "Unconfirmed") {

 						echo '<option value="'.$status.'">Password Reset</option>';

-					}else {

+					} else {

 						echo '<option value="'.$status.'">'.$status.'</option>';

 					}

 				}

@@ -206,7 +206,8 @@ 
 			<label class="col-form-label">Administrator :</label> <input

 				class="form-group col" type="checkbox" name="administrator"

 				value="1" id="administrator"

-				<?php if ($userObject->isAdministrator == 1) echo("checked")?>>

+				<?php if ($userObject->isAdministrator == 1) {
+	echo("checked")?>>

 		</div>

 

 		<div class="form-group row">

@@ -216,7 +217,8 @@ 
 				<SELECT class="custom-select" name="job">

                   <?php

 				// Current job appear first in selector

-				echo '<option value="'.$userObject->userJob.'">'.$userObject->userJob.'</option>';

+				echo '<option value="'.$userObject->userJob.'">'.$userObject->userJob.'</option>';
+}
 				// add other possible job

 				foreach ($jobs as $job) {

 					if ($job != $userObject->userJob) {

src/controllers/change_password_controller.php

Braces +7 added lines, -7 removed lines

@@ -43,23 +43,23 @@ 
 		//Check that reported old password is correct, if unconfirmed we use the temp password value
 		if ($userObject->userStatus == User::UNCONFIRMED) {
 			$checkCurrentPassword=password_verify($old_password, $currentTempPassword);
-		}else {
+		} else {
 			$checkCurrentPassword=password_verify($old_password, $currentPassword);
 		}
 
 		if ($mdp1 != $mdp2) {
 			$answer['result']="DifferentPassword";
 				
-		}else if (!$checkCurrentPassword) {
+		} else if (!$checkCurrentPassword) {
 			$answer['result']="WrongOldPassword";
 			
-		}else if (strlen($mdp1) < 8 || preg_match('/[^a-z0-9]/i', $mdp1) || strtolower($mdp1) == $mdp1) {
+		} else if (strlen($mdp1) < 8 || preg_match('/[^a-z0-9]/i', $mdp1) || strtolower($mdp1) == $mdp1) {
 			$answer['result']="IncorrectFormat";
 			
-		}else if (password_verify($mdp1, $currentTempPassword) || password_verify($mdp1, $currentPassword) || password_verify($mdp1, $twoPreviousPassword[0]) || password_verify($mdp1, $twoPreviousPassword[1])) {
+		} else if (password_verify($mdp1, $currentTempPassword) || password_verify($mdp1, $currentPassword) || password_verify($mdp1, $twoPreviousPassword[0]) || password_verify($mdp1, $twoPreviousPassword[1])) {
 			$answer['result']="SamePrevious";
 			
-		}else if ($mdp1 == $mdp2 && strtolower($mdp1) != $mdp1 && $checkCurrentPassword && !password_verify($mdp1, $currentTempPassword) && !password_verify($mdp1, $twoPreviousPassword[0]) && !password_verify($mdp1, $twoPreviousPassword[1]) && !password_verify($mdp1, $currentPassword)) {
+		} else if ($mdp1 == $mdp2 && strtolower($mdp1) != $mdp1 && $checkCurrentPassword && !password_verify($mdp1, $currentTempPassword) && !password_verify($mdp1, $twoPreviousPassword[0]) && !password_verify($mdp1, $twoPreviousPassword[1]) && !password_verify($mdp1, $currentPassword)) {
 				$answer['result']="OK";
 				//Update the database with new password
 				$userObject->updateUserPassword($mdp1, User::ACTIVATED);
@@ -70,12 +70,12 @@ 
 
 		echo(json_encode($answer));
 		
-	}else {
+	} else {
 	    
 		require 'views/change_password_view.php';
 	    
 	}
 	
-}else {
+} else {
 	require 'includes/no_access.php';
 }

src/controllers/my_account_controller.php

Braces +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
     
 	require 'views/my_account_view.php';
     
-}else {
+} else {
 	require 'includes/no_access.php';
 }
\ No newline at end of file

src/controllers/supervisor/documentation_upload_controller.php

Braces +3 added lines, -3 removed lines

@@ -63,14 +63,14 @@
 			header('Location: /index.php');
 			exit;
 		//if error when moving file.
-		}else {
+		} else {
 			echo 'Failed ! Err'.$_FILES['documentationfile']["error"];
 		}
-	}else {
+	} else {
 		echo $erreur;
 	}
 
-}else {
+} else {
 	require 'includes/no_access.php';
 }
 

src/controllers/supervisor/download_manager_controller.php

Braces +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
 	$usersInStudy=$studyObject->getAllRolesByUsers();
 
 	require 'views/supervisor/download_manager_view.php';
-}else {
+} else {
 	require 'includes/no_access.php';
 }

src/controllers/supervisor/import_patients_controller.php

Braces +3 added lines, -3 removed lines

@@ -50,18 +50,18 @@
 		echo($htmlReport);
 		echo("Report Sent by Email");
         
-	}else {
+	} else {
         
 		if (GAELO_DATE_FORMAT == 'd.m.Y') {
 			$importFormat="DD/MM/YYYY";
             
-		}else if (GAELO_DATE_FORMAT == 'm.d.Y') {
+		} else if (GAELO_DATE_FORMAT == 'm.d.Y') {
 			$importFormat="MM/DD/YYYY";
 		}
         
 		require 'views/supervisor/import_patients_view.php';
 	}
     
-}else {
+} else {
 	require 'includes/no_access.php';
 }

src/controllers/supervisor/tracker_controller.php

Braces +3 added lines, -3 removed lines

@@ -29,14 +29,14 @@
 		$trackerData=Tracker::getTrackerByRoleStudy($askedRole, $linkpdo, $_SESSION['study']);
 		require 'views/supervisor/tracker/tracker_script.php';
 		require 'views/supervisor/tracker/tracker_'.(strtolower($askedRole)).'.php';
-	}else if ($askedRole == "Message") {
+	} else if ($askedRole == "Message") {
 		$trackerMessages=Tracker::getMessageStudy($_SESSION['study'], $linkpdo);
 		require 'views/supervisor/tracker/tracker_script.php';
 		require 'views/supervisor/tracker/tracker_message.php';
-	}else {
+	} else {
 		require 'includes/no_access.php';
 	}
     
-}else {
+} else {
 	require 'includes/no_access.php';
 }
\ No newline at end of file

src/controllers/supervisor/supervisor_root_controller.php

Braces +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	
 	require 'views/supervisor/supervisor_root_view.php';
 
-}else {
+} else {
 	require 'includes/no_access.php';
 }
 
@@ -52,7 +52,7 @@ 
 		$jsonObject['code']="<a onclick='linkPatientInfos(".$patientObject->patientCode.")' href='javascript:void(0);'>".$patientObject->patientCode."</a>";
 		if (!$patientObject->patientWithdraw) {
 			$jsonObject['withdraw']="Included";
-		}else {
+		} else {
 			$jsonObject['withdraw']="Withdrawn";
 		}
 		$jsonObject['visit_modality']=$visitObject->visitGroupObject->groupModality;