| @@ -38,7 +38,7 @@ | ||
| 38 | 38 | "error" => '', | 
| 39 | 39 | ); | 
| 40 | 40 | |
| 41 | -        }catch (Exception $e) {     | |
| 41 | +        } catch (Exception $e) {     | |
| 42 | 42 | return false; | 
| 43 | 43 | } | 
| 44 | 44 | } | 
| @@ -2603,7 +2603,9 @@ | ||
| 2603 | 2603 | } | 
| 2604 | 2604 | |
| 2605 | 2605 |              foreach ($results as $adUser) { | 
| 2606 | - if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; | |
| 2606 | +                if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) { | |
| 2607 | + continue; | |
| 2608 | + } | |
| 2607 | 2609 | // Build the list of all groups in AD | 
| 2608 | 2610 |                  if (isset($adUser['memberof']) === true) { | 
| 2609 | 2611 |                      foreach($adUser['memberof'] as $j => $adUserGroup) { | 
| @@ -149,7 +149,9 @@ | ||
| 149 | 149 | } | 
| 150 | 150 | $filePath = realpath($filePath); | 
| 151 | 151 | |
| 152 | -    if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - "); | |
| 152 | +    if (WIP === true) { | |
| 153 | +        error_log('downloadFile.php: filePath: ' . $filePath." - "); | |
| 154 | + } | |
| 153 | 155 | |
| 154 | 156 |      if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) { | 
| 155 | 157 |          header('Content-Description: File Transfer'); | 
| @@ -58,7 +58,9 @@ | ||
| 58 | 58 | $get['state'] = filter_var($_GET['state'], FILTER_SANITIZE_SPECIAL_CHARS); | 
| 59 | 59 | $get['session_state'] = filter_var($_GET['session_state'], FILTER_SANITIZE_SPECIAL_CHARS); | 
| 60 | 60 | |
| 61 | -    if (WIP === true) error_log('---- OAUTH2 START ----'); | |
| 61 | +    if (WIP === true) { | |
| 62 | +        error_log('---- OAUTH2 START ----'); | |
| 63 | + } | |
| 62 | 64 | |
| 63 | 65 | // Création d'une instance du contrôleur | 
| 64 | 66 | $OAuth2 = new OAuth2Controller($SETTINGS); | 
| @@ -401,12 +401,13 @@ | ||
| 401 | 401 | <select class="form-control" id="profile-user-timezone"> | 
| 402 | 402 | <?php foreach ($zones as $key => $zone): ?> | 
| 403 | 403 | <option value="<?php echo $key; ?>"<?php | 
| 404 | -                                                        if ($session->has('user-timezone')) | |
| 405 | -                                                            if($session->get('user-timezone') === $key) | |
| 404 | +                                                        if ($session->has('user-timezone')) { | |
| 405 | +                                                                                                                    if($session->get('user-timezone') === $key) | |
| 406 | 406 | echo ' selected'; | 
| 407 | -                                                            elseif ($session->get('user-timezone') === 'not_defined') | |
| 408 | - if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key) | |
| 407 | +                                                        } elseif ($session->get('user-timezone') === 'not_defined') { | |
| 408 | + if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key) | |
| 409 | 409 | echo ' selected'; | 
| 410 | + } | |
| 410 | 411 | ?>><?php echo $zone; ?></option> | 
| 411 | 412 | <?php endforeach; ?> | 
| 412 | 413 | </select> | 
| @@ -149,8 +149,7 @@ | ||
| 149 | 149 | </div> | 
| 150 | 150 | <?php | 
| 151 | 151 | } | 
| 152 | -} | |
| 153 | -catch (Exception $e) { | |
| 152 | +} catch (Exception $e) { | |
| 154 | 153 |      if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { | 
| 155 | 154 |          error_log('TEAMPASS Error - tasks page - '.$e->getMessage()); | 
| 156 | 155 | } | 
| @@ -222,8 +222,7 @@ | ||
| 222 | 222 | </div> | 
| 223 | 223 | <?php | 
| 224 | 224 | } | 
| 225 | -} | |
| 226 | -catch (Exception $e) { | |
| 225 | +} catch (Exception $e) { | |
| 227 | 226 |      if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { | 
| 228 | 227 |          error_log('TEAMPASS Error - admin page - '.$e->getMessage()); | 
| 229 | 228 | } | 
| @@ -81,8 +81,9 @@ discard block | ||
| 81 | 81 | $session = SessionManager::getSession(); | 
| 82 | 82 | |
| 83 | 83 | // Random encryption key | 
| 84 | -if ($session->get('key') === null) | |
| 84 | +if ($session->get('key') === null) { | |
| 85 | 85 |      $session->set('key', generateQuickPassword(30, false)); | 
| 86 | +} | |
| 86 | 87 | |
| 87 | 88 | $request = SymfonyRequest::createFromGlobals(); | 
| 88 | 89 | $configManager = new ConfigManager(__DIR__, $request->getRequestUri()); | 
| @@ -943,7 +944,10 @@ discard block | ||
| 943 | 944 | <input type="password" class="form-control" id="dialog-ldap-user-build-keys-database-code"> | 
| 944 | 945 | <br/> | 
| 945 | 946 | </div> | 
| 946 | - <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') echo ' hidden'; ?>"> | |
| 947 | +                                <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') { | |
| 948 | + echo ' hidden'; | |
| 949 | +} | |
| 950 | +?>"> | |
| 947 | 951 | <div class="input-group-prepend"> | 
| 948 | 952 |                                          <span class="input-group-text"><?php echo $lang->get('provide_your_current_password'); ?></span> | 
| 949 | 953 | </div> | 
| @@ -2401,7 +2401,9 @@ discard block | ||
| 2401 | 2401 | // Complete $userInfo | 
| 2402 | 2402 | $userInfo['has_been_created'] = 1; | 
| 2403 | 2403 | |
| 2404 | -        if (WIP === true) error_log("--- USER CREATED ---"); | |
| 2404 | +        if (WIP === true) { | |
| 2405 | +            error_log("--- USER CREATED ---"); | |
| 2406 | + } | |
| 2405 | 2407 | |
| 2406 | 2408 | return [ | 
| 2407 | 2409 | 'error' => false, | 
| @@ -2437,7 +2439,9 @@ discard block | ||
| 2437 | 2439 | } | 
| 2438 | 2440 | |
| 2439 | 2441 | // Oauth2 user already exists and authenticated | 
| 2440 | -        if (WIP === true) error_log("--- USER AUTHENTICATED ---"); | |
| 2442 | +        if (WIP === true) { | |
| 2443 | +            error_log("--- USER AUTHENTICATED ---"); | |
| 2444 | + } | |
| 2441 | 2445 | $userInfo['has_been_created'] = 0; | 
| 2442 | 2446 | |
| 2443 | 2447 | $passwordManager = new PasswordManager(); | 
| @@ -2667,8 +2671,9 @@ discard block | ||
| 2667 | 2671 | ); | 
| 2668 | 2672 | |
| 2669 | 2673 | // No valid email address for user | 
| 2670 | - if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL)) | |
| 2671 | - return; | |
| 2674 | +        if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL)) { | |
| 2675 | + return; | |
| 2676 | + } | |
| 2672 | 2677 | |
| 2673 | 2678 | $unlock_url = $SETTINGS['cpassman_url'].'/self-unlock.php?login='.$value.'&otp='.$unlock_code; | 
| 2674 | 2679 | |