@@ -17,7 +17,9 @@ discard block |
||
| 17 | 17 | * Display connexion form hand check access permission |
| 18 | 18 | */ |
| 19 | 19 | |
| 20 | -if (session_status() == PHP_SESSION_NONE) session_start(); |
|
| 20 | +if (session_status() == PHP_SESSION_NONE) { |
|
| 21 | + session_start(); |
|
| 22 | +} |
|
| 21 | 23 | |
| 22 | 24 | //If session already opened, redirect to main |
| 23 | 25 | if (isset($_SESSION['username'])) { |
@@ -42,7 +44,7 @@ discard block |
||
| 42 | 44 | $email->addAminEmails(); |
| 43 | 45 | $email->sendAdminLoggedAlertEmail($_POST['username'], $_SERVER['REMOTE_ADDR']); |
| 44 | 46 | |
| 45 | - }else { |
|
| 47 | + } else { |
|
| 46 | 48 | $_SESSION['admin']=false; |
| 47 | 49 | } |
| 48 | 50 | |
@@ -53,7 +55,7 @@ discard block |
||
| 53 | 55 | $result['result']="user"; |
| 54 | 56 | |
| 55 | 57 | //If not allowed, action depend on reason |
| 56 | - }else { |
|
| 58 | + } else { |
|
| 57 | 59 | //Case outdated password or unconfirmed status, open temp session to redirect to change password |
| 58 | 60 | if ($userObject->passwordCorrect && (!$userObject->passwordDateValide || $userObject->userStatus == "Unconfirmed")) { |
| 59 | 61 | //mot de passe non valide, on le change |
@@ -61,17 +63,17 @@ discard block |
||
| 61 | 63 | $result['result']="temporary"; |
| 62 | 64 | $result['isPasswordDateValid']=$userObject->passwordDateValide; |
| 63 | 65 | //case unactivated or blocked account |
| 64 | - }else if ($userObject->passwordCorrect && ($userObject->userStatus != null && $userObject->userStatus != "Activated")) { |
|
| 66 | + } else if ($userObject->passwordCorrect && ($userObject->userStatus != null && $userObject->userStatus != "Activated")) { |
|
| 65 | 67 | $result['result']=$userObject->userStatus; |
| 66 | 68 | //case non existing user |
| 67 | - }else if (!$userObject->isExistingUser) { |
|
| 69 | + } else if (!$userObject->isExistingUser) { |
|
| 68 | 70 | $result['result']="unknown"; |
| 69 | 71 | //Case wrong password |
| 70 | - }else { |
|
| 72 | + } else { |
|
| 71 | 73 | //if too much tentative, account blocked |
| 72 | 74 | if ($userObject->loginAttempt > 2) { |
| 73 | 75 | $result['result']="NowBlocked"; |
| 74 | - }else { |
|
| 76 | + } else { |
|
| 75 | 77 | $result['result']="WrongPassword"; |
| 76 | 78 | $result['attempt']=$userObject->loginAttempt; |
| 77 | 79 | } |
@@ -81,11 +83,11 @@ discard block |
||
| 81 | 83 | //Echo answer for Ajax |
| 82 | 84 | echo(json_encode($result)); |
| 83 | 85 | //No data sent, display the form and it's script |
| 84 | -}else { |
|
| 86 | +} else { |
|
| 85 | 87 | |
| 86 | 88 | try { |
| 87 | 89 | Session::getLinkpdo(); |
| 88 | - }catch (Exception $e) { |
|
| 90 | + } catch (Exception $e) { |
|
| 89 | 91 | error_log("Can't Connect DB"); |
| 90 | 92 | } |
| 91 | 93 | |
@@ -36,6 +36,6 @@ |
||
| 36 | 36 | |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -}else { |
|
| 39 | +} else { |
|
| 40 | 40 | require 'views/request_view.php'; |
| 41 | 41 | } |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | unlink($tempZip); |
| 64 | 64 | unlink($fileSql); |
| 65 | 65 | |
| 66 | -}else {
|
|
| 66 | +} else {
|
|
| 67 | 67 | require 'includes/no_access.php'; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -27,6 +27,6 @@ |
||
| 27 | 27 | $etudes=Global_Data::getAllStudies($linkpdo, true); |
| 28 | 28 | require 'views/administrator/root_administrator_view.php'; |
| 29 | 29 | |
| 30 | -}else { |
|
| 30 | +} else { |
|
| 31 | 31 | require 'includes/no_access.php'; |
| 32 | 32 | } |
@@ -26,13 +26,13 @@ |
||
| 26 | 26 | //Get users data |
| 27 | 27 | if ($_SESSION['study'] == "All Studies") {
|
| 28 | 28 | $usersObjects=Global_Data::getAllUsers($linkpdo); |
| 29 | - }else {
|
|
| 29 | + } else {
|
|
| 30 | 30 | $studyObject=new Study($_SESSION['study'], $linkpdo); |
| 31 | 31 | $usersObjects=$studyObject->getUsersWithRoleInStudy(); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | require 'views/administrator/user_table_view.php'; |
| 35 | 35 | |
| 36 | -}else {
|
|
| 36 | +} else {
|
|
| 37 | 37 | require 'includes/no_access.php'; |
| 38 | 38 | } |
| 39 | 39 | \ No newline at end of file |
@@ -26,6 +26,6 @@ |
||
| 26 | 26 | |
| 27 | 27 | require 'views/administrator/tracker_admin_view.php'; |
| 28 | 28 | |
| 29 | -}else {
|
|
| 29 | +} else {
|
|
| 30 | 30 | require 'includes/no_access.php'; |
| 31 | 31 | } |
| 32 | 32 | \ No newline at end of file |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | try { |
| 46 | 46 | Center::addCenter($linkpdo, $code, $details['name'], $details['country_code']); |
| 47 | - }catch (Exception $e1) { |
|
| 47 | + } catch (Exception $e1) { |
|
| 48 | 48 | error_log($e1); |
| 49 | 49 | echo(json_encode("Error")); |
| 50 | 50 | return; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $centerObject=new Center($linkpdo, $code); |
| 66 | 66 | $centerObject->updateCenter($centersInputArray[$code]['name'], $centersInputArray[$code]['country_code']); |
| 67 | 67 | $modified_centers[$code]=$centersInputArray[$code]; |
| 68 | - }catch (Exception $e1) { |
|
| 68 | + } catch (Exception $e1) { |
|
| 69 | 69 | error_log($e1); |
| 70 | 70 | echo(json_encode("Error")); |
| 71 | 71 | return; |
@@ -82,12 +82,12 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | echo(json_encode("Success")); |
| 84 | 84 | |
| 85 | - }else { |
|
| 85 | + } else { |
|
| 86 | 86 | $countries=Global_Data::getAllcountries($linkpdo); |
| 87 | 87 | require 'views/administrator/modify_centers_view.php'; |
| 88 | 88 | |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | -}else { |
|
| 91 | +} else { |
|
| 92 | 92 | require 'includes/no_access.php'; |
| 93 | 93 | } |
| 94 | 94 | \ No newline at end of file |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | if (!isset($_POST['profile'])) {
|
| 42 | 42 | $role="@"; |
| 43 | - }else {
|
|
| 43 | + } else {
|
|
| 44 | 44 | $role=$_POST['profile']; //format nameRole@nameStudy |
| 45 | 45 | } |
| 46 | 46 | |
@@ -64,8 +64,7 @@ discard block |
||
| 64 | 64 | //Chech that data are complete and write to the database |
| 65 | 65 | if (empty($_POST['username']) || empty($_POST['last_name']) || empty($_POST['first_name']) || empty($_POST['email']) || !is_numeric($_POST['main_center'])) {
|
| 66 | 66 | $answer="Form Uncomplete"; |
| 67 | - } |
|
| 68 | - else if (!preg_match('/^[a-z0-9\-_.]+@[a-z0-9\-_.]+\.[a-z]{2,4}$/i', $email)) {
|
|
| 67 | + } else if (!preg_match('/^[a-z0-9\-_.]+@[a-z0-9\-_.]+\.[a-z]{2,4}$/i', $email)) {
|
|
| 69 | 68 | $answer="Email Not Valid"; |
| 70 | 69 | } |
| 71 | 70 | |
@@ -166,7 +165,7 @@ discard block |
||
| 166 | 165 | //Output answer for Ajax |
| 167 | 166 | echo(json_encode($answer)); |
| 168 | 167 | |
| 169 | - }else {
|
|
| 168 | + } else {
|
|
| 170 | 169 | |
| 171 | 170 | $username=$_GET['username']; |
| 172 | 171 | |
@@ -188,7 +187,7 @@ discard block |
||
| 188 | 187 | } |
| 189 | 188 | |
| 190 | 189 | |
| 191 | -}else {
|
|
| 190 | +} else {
|
|
| 192 | 191 | require 'includes/no_access.php'; |
| 193 | 192 | } |
| 194 | 193 | |
@@ -206,7 +205,7 @@ discard block |
||
| 206 | 205 | $userObject->deleteRole($study, $role); |
| 207 | 206 | } |
| 208 | 207 | } |
| 209 | - }catch (Exception $e) { }
|
|
| 208 | + } catch (Exception $e) { }
|
|
| 210 | 209 | } |
| 211 | 210 | |
| 212 | 211 | |
@@ -223,5 +222,5 @@ discard block |
||
| 223 | 222 | $userObject->addRole($role, $study); |
| 224 | 223 | } |
| 225 | 224 | } |
| 226 | - }catch (Exception $e) { }
|
|
| 225 | + } catch (Exception $e) { }
|
|
| 227 | 226 | } |
@@ -26,10 +26,10 @@ |
||
| 26 | 26 | Global_Data::updatePlateformPreferences($_POST, $linkpdo); |
| 27 | 27 | echo(json_encode("Success"));
|
| 28 | 28 | |
| 29 | - }else {
|
|
| 29 | + } else {
|
|
| 30 | 30 | require 'views/administrator/preferences_view.php'; |
| 31 | 31 | |
| 32 | 32 | } |
| 33 | -}else {
|
|
| 33 | +} else {
|
|
| 34 | 34 | require 'includes/no_access.php'; |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |