salimkanoun / GaelO

src/rest/check_login.php

Braces +4 added lines, -4 removed lines

@@ -41,18 +41,18 @@
 	if (!$userObject->isExistingUser) {
 		header('HTTP/1.1 420 Non existing user');
         
-	}else if (!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide) {
+	} else if (!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide) {
 		header('HTTP/1.1 420 Wrong Password '.$userObject->loginAttempt."/3 wrong attempt");
         
-	}else if (!$userObject->passwordDateValide) {
+	} else if (!$userObject->passwordDateValide) {
 		header('HTTP/1.1 420 Outdated Password, go to website to renew it');
         
-	}else if ($userObject->userStatus != User::ACTIVATED) {
+	} else if ($userObject->userStatus != User::ACTIVATED) {
 		header('HTTP/1.1 420 Account '.$userObject->userStatus);
 	}
     
 	exit();
     
-}else {
+} else {
 	header("HTTP/1.1 200 OK");
 }

src/views/supervisor/visit_infos_view.php

Braces +55 added lines, -29 removed lines

@@ -168,11 +168,17 @@ 
 	<table class='table table-striped'>
     	<tr>
     		<th>Filled in by</th>
-    		<td><?php if (!empty($localReviewObject)) echo(htmlspecialchars($localReviewObject->username)); ?></td>
+    		<td><?php if (!empty($localReviewObject)) {
+	echo(htmlspecialchars($localReviewObject->username));
+}
+?></td>
     	</tr>
     	<tr>
     		<th>Date</th>
-    		<td><?php if (!empty($localReviewObject)) echo($localReviewObject->reviewDate); ?></td>
+    		<td><?php if (!empty($localReviewObject)) {
+	echo($localReviewObject->reviewDate);
+}
+?></td>
     	</tr>
     </table>
    
@@ -194,16 +200,24 @@ 
 	<table class='table table-striped'>
     	<tr>
     		<th>Conclusion Date</th>
-    		<td><?php if (!empty($visitObject->reviewConclusionDate)) echo($visitObject->reviewConclusionDate); else echo("N/A") ?></td>
+    		<td><?php if (!empty($visitObject->reviewConclusionDate)) {
+	echo($visitObject->reviewConclusionDate);
+} else {
+	echo("N/A") ?></td>
     	</tr>
     	<tr>
     		<th>Conclusion Value</th>
-    		<td><?php if (!empty($visitObject->reviewConclusion)) echo(htmlspecialchars($visitObject->reviewConclusion)); else echo("N/A") ?></td>
+    		<td><?php if (!empty($visitObject->reviewConclusion)) echo(htmlspecialchars($visitObject->reviewConclusion));
+}
+else {
+	echo("N/A") ?></td>
     	</tr>
     </table>
     
 	<?php make_interface_tableau_review_supervisor($data_reviews)?>
-	<?php makeHistoryTable("Form", $trackerVisitResponses, false); ?>
+	<?php makeHistoryTable("Form", $trackerVisitResponses, false);
+}
+?>
 </div>
 
 <?php
@@ -211,11 +225,11 @@ 
     
 	if ($actionGroup == "Visit") {
 		$actionArray=array("Create Visit", "Delete Visit", "Reactivate Visit");
-	}else if ($actionGroup == "Form") {
+	} else if ($actionGroup == "Form") {
 		$actionArray=array("Save Form", "Unlock Form", "Delete Form");
-	}else if ($actionGroup == "Qc") {
+	} else if ($actionGroup == "Qc") {
 		$actionArray=array("Reset QC", "Quality Control", "Corrective Action");
-	}else if ($actionGroup == "Serie") {
+	} else if ($actionGroup == "Serie") {
 		$actionArray=array("Import Series", "Change Serie");
 	}
 	?>
@@ -240,8 +254,12 @@ 
 						$details=json_decode($response['action_details'], true);
             	        
 						if ($actionGroup == "Form") { 
-							if ($formInvestigator && $details['local_review'] == "0") continue(1);
-							if (!$formInvestigator && $details['local_review'] == "1") continue(1);  
+							if ($formInvestigator && $details['local_review'] == "0") {
+								continue(1);
+							}
+							if (!$formInvestigator && $details['local_review'] == "1") {
+								continue(1);
+							}
 						}
             	        
 					?>
@@ -269,7 +287,7 @@ 
 	if (empty($dicomStudies)) {
 		//If no available studies, show all deleted studies in the DB
 		make_interface_tableau_study_supervisor($visitObject);
-	}else {
+	} else {
 		make_interface_tableau_series_supervisor($visitObject);
 	}
     
@@ -323,7 +341,7 @@ 
 						if (empty ($data_studies[$i]->studyDescription)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_studies[$i]->studyDescription)?></td>
                 		<?php 
 						}
@@ -337,7 +355,7 @@ 
 						if (empty ($data_studies[$i]->studyAcquisitionDateTime)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_studies[$i]->studyAcquisitionDateTime)?></td>
                 		<?php 
 						}
@@ -402,7 +420,7 @@ 
 						if (empty ($data_series[$i]->seriesNumber)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td>Serie <?=htmlspecialchars($data_series [$i]->seriesNumber)?></td>
                 		<?php 
 						}
@@ -416,7 +434,7 @@ 
 						if (empty ($data_series[$i]->seriesDescription)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_series [$i]->seriesDescription)?></td>
                 		<?php 
 						}
@@ -430,7 +448,7 @@ 
 						if (empty ($data_series[$i]->manufacturer)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_series [$i]->manufacturer)?></td>
                 		<?php 
 						}
@@ -444,7 +462,7 @@ 
 						if (empty ($data_series[$i]->modality)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_series [$i]->modality)?></td>
                 		<?php 
 						}
@@ -458,7 +476,7 @@ 
 						if (empty ($data_series[$i]->acquisitionDateTime)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_series [$i]->acquisitionDateTime)?></td>
                 		<?php 
 						}
@@ -472,7 +490,7 @@ 
 						if (empty ($data_series[$i]->injectedDose)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars(($data_series [$i]->injectedDose/10**6)) ?></td>
                 		<?php 
 						}
@@ -486,7 +504,7 @@ 
 						if (empty ($data_series[$i]->injectedDateTime)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_series [$i]->injectedDateTime) ?></td>
                 		<?php 
 						}
@@ -500,7 +518,7 @@ 
 						if (empty ($data_series[$i]->injectedActivity)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars(($data_series [$i]->injectedActivity/10**6)) ?></td>
                 		<?php 
 						}
@@ -514,7 +532,7 @@ 
 						if (empty ($data_series[$i]->patientWeight)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=htmlspecialchars($data_series [$i]->patientWeight)?></td>
                 		<?php 
 						}
@@ -528,7 +546,7 @@ 
 						if (empty ($data_series[$i]->numberInstances)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=$data_series [$i]->numberInstances?></td>
                 		<?php 
 						}
@@ -542,7 +560,7 @@ 
 						if (empty ($data_series[$i]->uploadDate)) { ?>
                         	<td>/</td>
                     	<?php
-						}else { ?>
+						} else { ?>
                             <td><?=$data_series [$i]->uploadDate?></td>
                 		<?php 
 						}
@@ -642,8 +660,12 @@ 
 					for ($i=0; $i < $res_nb_reviews; $i++) {
 					?>
                         <td><?=$data_reviews[$i]->username?>
-                        <?php  if ($data_reviews[$i]->isLocal) echo('- Local Investigator');
-							   if ($data_reviews[$i]->isAdjudication) echo('- Adjudication Form');
+                        <?php  if ($data_reviews[$i]->isLocal) {
+	echo('- Local Investigator');
+}
+							   if ($data_reviews[$i]->isAdjudication) {
+							   	echo('- Adjudication Form');
+							   }
 						?>
         				</td>
                     <?php 
@@ -681,7 +703,11 @@ 
 				?>
                     <td>
                     	<?php 
-						   if ($data_reviews[$i]->validated) echo('Validated'); else echo('Draft');
+						   if ($data_reviews[$i]->validated) {
+						   	echo('Validated');
+						   } else {
+						   	echo('Draft');
+						   }
 						?>
                 	</td>
             	<?php 
@@ -702,7 +728,7 @@ 
             		        </td>
             		        <?php
 						//if not validated (not locked) show only delete button
-						}else {
+						} else {
 							?>
                             <td>
             		        	<a href="scripts/delete_form.php?id_review=<?=$data_reviews[$i]->id_review?>&id_visit=<?=$data_reviews[$i]->id_visit?>" class="ajaxLinkConfirm refreshVisitSupervisor"><input class="btn btn-danger" type="button" value="Delete Form"> </a>
@@ -710,7 +736,7 @@ 
         		        <?php 
 						}
                 
-					}else {
+					} else {
 					?>
         				<td></td>
         			<?php 

src/views/supervisor/tracker/tracker_supervisor.php

Braces +30 added lines, -10 removed lines

@@ -124,52 +124,72 @@
 				</td>
 				<td>
 					<?php 
-					if ($supervisorEvent['action_type'] == "Edit Patient") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Edit Patient") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td>
 					<?php 
-					if ($supervisorEvent['action_type'] == "Patient Withdraw") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Patient Withdraw") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td>
 					<?php 
-					if ($supervisorEvent['action_type'] == "Delete Visit") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Delete Visit") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td>
 					<?php 
-					if ($supervisorEvent['action_type'] == "Change Serie") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Change Serie") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>	
 				<td> 
 					<?php 
-					if ($supervisorEvent['action_type'] == "Reset QC") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Reset QC") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td> 
 					<?php 
-					if ($supervisorEvent['action_type'] == "Unlock Form") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Unlock Form") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td> 
 					<?php 
-					if ($supervisorEvent['action_type'] == "Delete Form") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Delete Form") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td> 
 					<?php 
-					if ($supervisorEvent['action_type'] == "Add Documentation") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Add Documentation") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td> 
 					<?php 
-					if ($supervisorEvent['action_type'] == "Update Documentation") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Update Documentation") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 				<td>
 					<?php 
-					if ($supervisorEvent['action_type'] == "Reactivate Visit") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					if ($supervisorEvent['action_type'] == "Reactivate Visit") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>
 				</td>
 

src/views/investigator/specific_form_view.php

Braces +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
 					}

             		

             	<?php

-				}else if (($_SESSION['role']) == User::REVIEWER) {

+				} else if (($_SESSION['role']) == User::REVIEWER) {

 				?>

 					$('#contenu').empty();

 					//Refresh the tree

@@ -135,7 +135,7 @@ 
             	<input class="btn btn-dark" type="button" id="draft" name="draft" value="draft" /> 

         		<input class="btn btn-dark" type="button" id="validate" name="validate" value="validate" />

     		<?php 

-		}else {

+		} else {

 			//Add Ask Unlock Button

 			if (!$local || ($local && $visitObject->qcStatus != Visit::QC_ACCEPTED && $visitObject->qcStatus != Visit::QC_REFUSED)) {

 			?>

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	//If not disable by role add action button

 	if (!$roleDisable) {

         

-		if ( ($local && !$validatedForm) || (!$local && $visitObject->reviewAvailable && !$validatedForm) ) {

+		if (($local && !$validatedForm) || (!$local && $visitObject->reviewAvailable && !$validatedForm)) {

 			// If investigator Role and form not validated, add Draft and Validate button

 			?>

             	<input class="btn btn-dark" type="button" id="draft" name="draft" value="draft" /> 

src/views/investigator/controller_form_view.php

Braces +2 added lines, -2 removed lines

@@ -19,13 +19,13 @@
         <?php
 		if ($visitObject->formQualityControl == true) {
 			?> $('input:radio[name="formDecision"]').filter('[value="accepted"]').attr("checked", true); <?php
-		}else {
+		} else {
 			?> $('input:radio[name="formDecision"]').filter('[value="refused"]').attr("checked", true); <?php
 		}
         
 		if ($visitObject->imageQualityControl == true) {
 			?> $('input:radio[name="imageDecision"]').filter('[value="accepted"]').attr("checked", true); <?php
-		}else {
+		} else {
 			?> $('input:radio[name="imageDecision"]').filter('[value="refused"]').attr("checked", true); <?php
 		}
 		?>

src/views/administrator/tracker_admin_view.php

Braces +15 added lines, -5 removed lines

@@ -157,27 +157,37 @@
 					<td><?php echo($administratorEvent['username']); ?></td>

 					<td>

 					<?php 

-					if ($administratorEvent['action_type'] == "Create User") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');

+					if ($administratorEvent['action_type'] == "Create User") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>

 					</td>

 					<td>

 					<?php 

-					if ($administratorEvent['action_type'] == "Edit User") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');

+					if ($administratorEvent['action_type'] == "Edit User") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>

 					</td>

 					<td> 

 					<?php 

-					if ($administratorEvent['action_type'] == "Change Center") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');

+					if ($administratorEvent['action_type'] == "Change Center") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>

 					</td>

 					<td> 

 					<?php 

-					if ($administratorEvent['action_type'] == "Create Study") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');

+					if ($administratorEvent['action_type'] == "Create Study") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>

 					</td>

 					<td> 

 					<?php 

-					if ($administratorEvent['action_type'] == "Change Study Activation") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');

+					if ($administratorEvent['action_type'] == "Change Study Activation") {
+						echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>');
+					}
 					?>

 					</td>

 

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';
 }