nilsteampassnet / TeamPass

includes/core/load.js.php

Spacing +14 added lines, -14 removed lines

@@ -175,7 +175,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-user-change-password-info')
-                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('user_has_to_change_password_info');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('user_has_to_change_password_info'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-user-change-password').removeClass('hidden');
 
@@ -188,7 +188,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-ldap-user-change-password-info')
-                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-ldap-user-change-password').removeClass('hidden');
                             
@@ -216,7 +216,7 @@ 
 
                             if (data.queryResults.auth_type === 'oauth2') {
                                 // LDAP or local account to OAuth2 account
-                                var info_message = '<?php echo $lang->get('oauth2_need_user_old_password');?>';
+                                var info_message = '<?php echo $lang->get('oauth2_need_user_old_password'); ?>';
 
                                 // Hide the "new password" field that users can't fill in manually
                                 $('#new-password-field').hide();
@@ -228,7 +228,7 @@ 
                                 $('#dialog-ldap-user-change-password-current').val(oauth2_encryption_hash);
                             } else {
                                 // LDAP password updated
-                                var info_message = '<?php echo $lang->get('ldap_user_has_changed_his_password');?>';
+                                var info_message = '<?php echo $lang->get('ldap_user_has_changed_his_password'); ?>';
                             }
 
                             // Display info tip
@@ -339,7 +339,7 @@ 
         /*console.log('User has to regenerate keys')
         // HIde
         $('.content-header, .content').addClass('hidden');
-        $('#dialog-user-temporary-code-info').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('renecyption_expected'); ?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -421,13 +421,13 @@ 
             {
                 if (step === 'psk') {
                     // Inform user
-                    $("#user-current-defuse-psk-progress").html('<b><?php echo $lang->get('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
+                    $("#user-current-defuse-psk-progress").html('<b><?php echo $lang->get('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + '] ' +
                         '... <?php echo $lang->get('please_wait'); ?><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
 
                     var data = {
                         'userPsk' : $('#user-current-defuse-psk').val(),
                         'start': start,
-                        'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                        'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                         'user_id': userId,
                         'counterItemsToTreat': counterItemsToTreat
                     };
@@ -503,7 +503,7 @@ 
 
                 // Show passwords inputs and form
                 $('#dialog-ldap-user-change-password-info')
-                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                     .removeClass('hidden');
                 $('#dialog-ldap-user-change-password').removeClass('hidden');
 
@@ -593,7 +593,7 @@ 
                                 '</div>' +
                             '</div>' +
                         '</div>' +
-                        '<div class="row mt-2<?php echo isset($SETTINGS['enable_pf_feature']) === true && (int) $SETTINGS['enable_pf_feature'] === 1  ? '' : ' hidden'; ?>">' +
+                        '<div class="row mt-2<?php echo isset($SETTINGS['enable_pf_feature']) === true && (int) $SETTINGS['enable_pf_feature'] === 1 ? '' : ' hidden'; ?>">' +
                             '<h6><?php echo $lang->get('provide_recovery_keys'); ?></h6>' +
                             '<div class="input-group mb-2">' +
                                 '<div class="input-group-prepend">' +
@@ -608,7 +608,7 @@ 
                                 '<textarea rows="2" id="recovery-private-key" class="form-control form-item-control"></textarea>' +
                             '</div>' +
                         '</div>' +
-                        '<div class="row mt-2<?php echo isset($SETTINGS['enable_pf_feature']) === true && (int) $SETTINGS['enable_pf_feature'] === 1  ? '' : ' hidden'; ?>">' +
+                        '<div class="row mt-2<?php echo isset($SETTINGS['enable_pf_feature']) === true && (int) $SETTINGS['enable_pf_feature'] === 1 ? '' : ' hidden'; ?>">' +
                             '<div class="alert" id="confirm-no-recovery-keys-div">' +
                                 '<div class="form-check">' +
                                     '<input type="checkbox" class="form-check-input" id="confirm-no-recovery-keys">' +
@@ -1172,15 +1172,15 @@ 
             // Prepare data
             var data = {
                 'receipt': $('#temp-user-email').val(),
-                'subject': '[Teampass] <?php echo $lang->get('your_new_password');?>',
-                'body': '<?php echo $lang->get('email_body_temporary_login_password');?>',
+                'subject': '[Teampass] <?php echo $lang->get('your_new_password'); ?>',
+                'body': '<?php echo $lang->get('email_body_temporary_login_password'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : $('#temp-user-pwd').val(),
                 }
             }
             if (debugJavascript === true) console.log(data);
             // Prepare form
-            $('#dialog-admin-change-user-password-info').html('<?php echo $lang->get('sending_email_message');?>');
+            $('#dialog-admin-change-user-password-info').html('<?php echo $lang->get('sending_email_message'); ?>');
             toastr.remove();
             toastr.info(
                 '<?php echo $lang->get('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
@@ -1702,7 +1702,7 @@ 
                         '#warningModal',
                         '<i class="fa-solid fa-clock fa-lg warning mr-2"></i><?php echo $lang->get('index_add_one_hour'); ?>',
                         '<div class="form-group">' +
-                        '<label for="warningModal-input" class="col-form-label"><?php echo $lang->get('extend_session_duration_by') . ' (' . $lang->get('minutes') . ')'; ?>:</label>' +
+                        '<label for="warningModal-input" class="col-form-label"><?php echo $lang->get('extend_session_duration_by').' ('.$lang->get('minutes').')'; ?>:</label>' +
                         '<input type="number" max="'+(60*60*24)+'" class="form-control" id="warningModal-input" value="60">' +
                         '</div>' +
                         '<div class="form-text text-muted"><i class=\"fa-solid fa-info-circle mr-2\"></i><?php echo $lang->get('maximum_session_expiration_time'); ?>: '+data.max_session_duration+'</div>',

api/Model/AuthModel.php

Indentation +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
         $configManager = new ConfigManager();
         $SETTINGS = $configManager->getAllSettings();
         
-		$payload = [
+        $payload = [
             'username' => $login,
             'id' => $id, 
             'exp' => (time() + $SETTINGS['api_token_duration'] + 600),

Spacing +8 added lines, -8 removed lines

@@ -49,7 +49,7 @@ 
     public function getUserAuth(string $login, string $password, string $apikey): array
     {
         // Sanitize
-        include_once API_ROOT_PATH . '/../sources/main.functions.php';
+        include_once API_ROOT_PATH.'/../sources/main.functions.php';
         $inputData = dataSanitizer(
             [
                 'login' => isset($login) === true ? $login : '',
@@ -74,8 +74,8 @@ 
             // Check if user exists
             $userInfo = DB::queryfirstrow(
                 "SELECT u.id, u.pw, u.login, u.admin, u.gestionnaire, u.can_manage_all_users, u.fonction_id, u.can_create_root_folder, u.public_key, u.private_key, u.personal_folder, u.fonction_id, u.groupes_visibles, u.groupes_interdits, a.value AS user_api_key, a.allowed_folders as user_api_allowed_folders, a.enabled, a.allowed_to_create, a.allowed_to_read, a.allowed_to_update, a.allowed_to_delete
-                FROM " . prefixTable('users') . " AS u
-                INNER JOIN " . prefixTable('api') . " AS a ON (a.user_id=u.id)
+                FROM " . prefixTable('users')." AS u
+                INNER JOIN " . prefixTable('api')." AS a ON (a.user_id=u.id)
                 WHERE login = %s",
                 $inputData['login']
             );
@@ -251,7 +251,7 @@ 
         if (count($userFunctionId) > 0) {
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('roles_values') . '
+                FROM ' . prefixTable('roles_values').'
                 WHERE role_id IN %li  AND type IN ("W", "ND", "NE", "NDNE", "R")',
                 $userFunctionId
             );
@@ -277,7 +277,7 @@ 
         $inc = 0;
         $rows = DB::query(
             'SELECT id, id_tree 
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE restricted_to LIKE %s'.
             (count($userFunctionId) > 0 ? ' AND id_tree NOT IN %li' : ''),
             $userInfo['id'],
@@ -292,8 +292,8 @@ 
         // Check for the users roles if some specific rights exist on items
         $rows = DB::query(
             'SELECT i.id_tree, r.item_id
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (r.item_id=i.id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (r.item_id=i.id)
             WHERE '.(count($userFunctionId) > 0 ? ' id_tree NOT IN %li AND ' : '').' i.id_tree != ""
             ORDER BY i.id_tree ASC',
             count($userFunctionId) > 0 ? $userFunctionId : DB::sqleval('0')
@@ -309,7 +309,7 @@ 
         // Add all personal folders
         $rows = DB::queryFirstRow(
             'SELECT id 
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %i AND personal_folder = 1'.
             (count($userFunctionId) > 0 ? ' AND id NOT IN %li' : ''),
             $userInfo['id'],

api/inc/bootstrap.php

Spacing +12 added lines, -12 removed lines

@@ -25,18 +25,18 @@ 
 
 use TeampassClasses\ConfigManager\ConfigManager;
 
-define("API_ROOT_PATH", __DIR__ . "/..");
+define("API_ROOT_PATH", __DIR__."/..");
 
 // include main configuration file
-require API_ROOT_PATH . '/../sources/main.functions.php';
+require API_ROOT_PATH.'/../sources/main.functions.php';
 
 // include the base controller file
-require API_ROOT_PATH . "/Controller/Api/BaseController.php";
+require API_ROOT_PATH."/Controller/Api/BaseController.php";
 
 // include the use model file
-require API_ROOT_PATH . "/Model/UserModel.php";
-require API_ROOT_PATH . "/Model/ItemModel.php";
-require API_ROOT_PATH . "/Model/FolderModel.php";
+require API_ROOT_PATH."/Model/UserModel.php";
+require API_ROOT_PATH."/Model/ItemModel.php";
+require API_ROOT_PATH."/Model/FolderModel.php";
 
 /**
  * Launch expected action for ITEM
@@ -55,9 +55,9 @@ 
         );
     }
     // Perform the action
-    require API_ROOT_PATH . "/Controller/Api/ItemController.php";    
+    require API_ROOT_PATH."/Controller/Api/ItemController.php";    
     $objFeedController = new ItemController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -78,9 +78,9 @@ 
         );
     }
     // Perform the action
-    require API_ROOT_PATH . "/Controller/Api/FolderController.php";
+    require API_ROOT_PATH."/Controller/Api/FolderController.php";
     $objFeedController = new FolderController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -137,7 +137,7 @@ 
  */
 function verifyAuth(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false && is_jwt_valid($bearer_token) === true) {
@@ -167,7 +167,7 @@ 
  */
 function getDataFromToken(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false) {

api/Model/UserModel.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     {
         return DB::query(
             'SELECT * 
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             ORDER BY id ASC LIMIT %i',
             $limit
         );

api/Model/ItemModel.php

Spacing +11 added lines, -11 removed lines

@@ -50,18 +50,18 @@ 
         // Get items
         $rows = DB::query(
             'SELECT i.id, label, description, i.pw, i.url, i.id_tree, i.login, i.email, i.viewed_no, i.fa_icon, i.inactif, i.perso, t.title as folder_label
-            FROM ' . prefixTable('items') . ' AS i
+            FROM ' . prefixTable('items').' AS i
             LEFT JOIN '.prefixTable('nested_tree').' as t ON (t.id = i.id_tree) '.
-            $sqlExtra . 
-            " ORDER BY i.id ASC" .
-            ($limit > 0 ? " LIMIT ". $limit : '')
+            $sqlExtra. 
+            " ORDER BY i.id ASC".
+            ($limit > 0 ? " LIMIT ".$limit : '')
         );
 
         $ret = [];
         foreach ($rows as $row) {
             $userKey = DB::queryfirstrow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $userId,
                 $row['id']
@@ -98,7 +98,7 @@ 
                 if (empty($path) === true) {
                     $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                 } else {
-                    $path .= '/' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                    $path .= '/'.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                 }
             }
 
@@ -148,7 +148,7 @@ 
     ) : array
     {
         try {
-            include_once API_ROOT_PATH . '/../sources/main.functions.php';
+            include_once API_ROOT_PATH.'/../sources/main.functions.php';
 
             // Load config
             $configManager = new ConfigManager();
@@ -271,7 +271,7 @@ 
         }
 
         if (strlen($password) > $SETTINGS['pwd_maximum_length']) {
-            throw new Exception('Password is too long (max allowed is ' . $SETTINGS['pwd_maximum_length'] . ' characters)');
+            throw new Exception('Password is too long (max allowed is '.$SETTINGS['pwd_maximum_length'].' characters)');
         }
     }
 
@@ -284,7 +284,7 @@ 
     {
         $dataFolderSettings = DB::queryFirstRow(
             'SELECT bloquer_creation, bloquer_modification, personal_folder
-            FROM ' . prefixTable('nested_tree') . ' 
+            FROM ' . prefixTable('nested_tree').' 
             WHERE id = %i',
             $folderId
         );
@@ -307,7 +307,7 @@ 
     {
         $folderComplexity = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule = %i',
             'complex',
             $itemInfos['folderId']
@@ -335,7 +335,7 @@ 
     private function checkForDuplicates(string $label, array $SETTINGS, array $itemInfos) : void
     {
         DB::queryFirstRow(
-            'SELECT * FROM ' . prefixTable('items') . '
+            'SELECT * FROM '.prefixTable('items').'
             WHERE label = %s AND inactif = %i',
             $label,
             0

pages/profile.php

Braces +5 added lines, -4 removed lines

@@ -401,12 +401,13 @@
                                             <select class="form-control" id="profile-user-timezone">
                                                 <?php foreach ($zones as $key => $zone): ?>
                                                     <option value="<?php echo $key; ?>"<?php 
-                                                        if ($session->has('user-timezone'))
-                                                            if($session->get('user-timezone') === $key)
+                                                        if ($session->has('user-timezone')) {
+                                                                                                                    if($session->get('user-timezone') === $key)
                                                                 echo ' selected';
-                                                            elseif ($session->get('user-timezone') === 'not_defined')
-                                                                if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
+                                                        } elseif ($session->get('user-timezone') === 'not_defined') {
+                                                                                                                            if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
                                                                     echo ' selected';
+                                                            }
                                                     ?>><?php echo $zone; ?></option>
                                                 <?php endforeach; ?>
                                             </select>

Spacing +31 added lines, -31 removed lines

@@ -67,7 +67,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -100,49 +100,49 @@ 
 $zones = timezone_list();
 // prepare list of languages
 $languages = DB::query(
-    'SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC'
+    'SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC'
 );
 
 // Do some stats
 $userItemsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_creation" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userModificationNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_modification" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userSeenItemsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_shown" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userSeenPasswordsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item)
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_password_shown" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userInfo = DB::queryFirstRow(
     'SELECT avatar, last_pw_change
-    FROM ' . prefixTable('users') . ' 
+    FROM ' . prefixTable('users').' 
     WHERE id = %i',
     $session->get('user-id')
 );
 
 if (empty($userInfo['avatar']) === true) {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
 } else {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
+    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
 }
 
 // Get Groups name
@@ -150,7 +150,7 @@ 
 foreach ($session->get('user-roles_array') as $role) {
     $tmp = DB::queryFirstRow(
         'SELECT title 
-        FROM ' . prefixTable('roles_title') . ' 
+        FROM ' . prefixTable('roles_title').' 
         WHERE id = %i',
         $role
     );
@@ -196,7 +196,7 @@ 
                         <h3 id="profile-username" class="text-center">
                             <?php
                             if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) {
-                                echo $session->get('user-name') . ' ' . $session->get('user-lastname');
+                                echo $session->get('user-name').' '.$session->get('user-lastname');
                             } else {
                                 echo $session->get('user-login');
                             }
@@ -264,7 +264,7 @@ 
                                             } else {
                                                 echo date('d/m/Y', (int) $session->get('user-last_connection'));
                                             }
-                                            echo ' ' . $lang->get('at') . ' ';
+                                            echo ' '.$lang->get('at').' ';
                                             if (isset($SETTINGS['time_format']) === true) {
                                                 echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection'));
                                             } else {
@@ -274,7 +274,7 @@ 
                                         </a>
                                     </li>
                                     <?php
-                                    if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) {
+                                    if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) {
                                         // Handle last password change string
                                         if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) {
                                             if (isset($SETTINGS['date_format']) === true) {
@@ -294,12 +294,12 @@ 
                                         ) {
                                             $numDaysBeforePwExpiration = '';
                                         } else {
-                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $LANG['days'] . '.';
+                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$LANG['days'].'.';
                                         }
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b>
-                                        <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
+                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b>
+                                        <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
                                     </li>';
                                     }
                                     ?>
@@ -319,7 +319,7 @@ 
                                     if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b>
+                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b>
                                         <button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy  pointer"></i></button>
                                         <a class="float-right mr-2" id="profile-user-api-token">',
                                             null !== $session->get('user-api_key') ? $session->get('user-api_key') : '',
@@ -337,12 +337,12 @@ 
                                         <?php
                                         $rows = DB::query(
                                             'SELECT label AS labelAction, date, null
-                                                    FROM ' . prefixTable('log_system') . '
+                                                    FROM ' . prefixTable('log_system').'
                                                     WHERE qui = %i
                                                     UNION
                                                     SELECT l.action, l.date, i.label AS itemLabel
-                                                    FROM ' . prefixTable('log_items') . ' AS l
-                                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+                                                    FROM ' . prefixTable('log_items').' AS l
+                                                    INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
                                                     WHERE l.id_user = %i AND l.action IN ("at_access")
                                                     ORDER BY date DESC
                                                     LIMIT 0, 40',
@@ -356,9 +356,9 @@ 
                                                 $text = $lang->get($record['labelAction']);
                                             }
                                             if (empty($record['NULL']) === false) {
-                                                $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
+                                                $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
                                             }
-                                            echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>';
+                                            echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>';
                                         }
                                         ?>
                                     </ul>
@@ -392,13 +392,13 @@ 
                                 <?php endif; /* disable_user_edit_profile */
                                 if (($SETTINGS['disable_user_edit_timezone'] ?? '0') === '0') : ?>
                                     <div class="form-group">
-                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label>
+                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label>
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-timezone">
                                                 <?php foreach ($zones as $key => $zone): ?>
                                                     <option value="<?php echo $key; ?>"<?php 
                                                         if ($session->has('user-timezone'))
-                                                            if($session->get('user-timezone') === $key)
+                                                            if ($session->get('user-timezone') === $key)
                                                                 echo ' selected';
                                                             elseif ($session->get('user-timezone') === 'not_defined')
                                                                 if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
@@ -416,10 +416,10 @@ 
                                             <select class="form-control" id="profile-user-language">
                                                 <?php
                                                     foreach ($languages as $language) {
-                                                        echo '<option value="' . $language['name'] . '"',
+                                                        echo '<option value="'.$language['name'].'"',
                                                         strtolower($session->get('user-language')) === strtolower($language['name']) ?
                                                         ' selected="selected"' : '',
-                                                    '>' . $language['label'] . '</option>';
+                                                    '>'.$language['label'].'</option>';
                                                     }
                                                 ?>
                                             </select>
@@ -432,11 +432,11 @@ 
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-treeloadstrategy">
                                                 
-                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>>
+                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : ''; ?>>
                                                     <?php echo $lang->get('sequential'); ?>
                                                 </option>
                                                 
-                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>>
+                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>>
                                                     <?php echo $lang->get('full'); ?>
                                                 </option>
                                             </select>
@@ -449,11 +449,11 @@ 
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-split_view_mode">
                                                 
-                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : '';?>>
+                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('no'); ?>
                                                 </option>
                                                 
-                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : '';?>>
+                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('yes'); ?>
                                                 </option>
                                             </select>
@@ -471,7 +471,7 @@ 
                                                 <?php 
                                                 }
                                                 if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
-                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>';
+                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>';
                                                 }
                                                 ?>
                                                 <div id="profile-avatar-file-container" class="hidden"></div>

api/Controller/Api/ItemController.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
             // SQL where clause with folders list
             if (isset($arrQueryStringParams['folders']) === true) {
                 // convert the folders to an array
-                $arrQueryStringParams['folders'] = explode(',', str_replace( array('[',']') , ''  , $arrQueryStringParams['folders']));
+                $arrQueryStringParams['folders'] = explode(',', str_replace(array('[', ']'), '', $arrQueryStringParams['folders']));
 
                 // ensure to only use the intersection
                 $foldersList = implode(',', array_intersect($arrQueryStringParams['folders'], $userData['folders_list']));
@@ -216,7 +216,7 @@ 
                 } else {
                     // Gérer le cas où les paramètres ne sont pas un tableau
                     $strErrorDesc = 'Data not consistent';
-                    $strErrorHeader = 'Expected array, received ' . gettype($arrQueryStringParams);
+                    $strErrorHeader = 'Expected array, received '.gettype($arrQueryStringParams);
                 }
             }
         } else {
@@ -263,10 +263,10 @@ 
             // SQL where clause with item id
             if (isset($arrQueryStringParams['id']) === true) {
                 // build sql where clause by ID
-                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'] . $sql_constraint;
+                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'].$sql_constraint;
             } else if (isset($arrQueryStringParams['label']) === true) {
                 // build sql where clause by LABEL
-                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']) . $sql_constraint;
+                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']).$sql_constraint;
             } else if (isset($arrQueryStringParams['description']) === true) {
                 // build sql where clause by LABEL
                 $sqlExtra = ' WHERE i.description '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['description'] : ' = '.$arrQueryStringParams['description']).$sql_constraint;

sources/import.queries.php

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -166,7 +166,7 @@ 
             $lexer = new Lexer($config);
             $config->setIgnoreHeaderLine('true');
             $interpreter = new Interpreter();
-            $interpreter->addObserver(function (array $row) use (&$valuesToImport,$header) {
+            $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) {
                 $rowData = array_combine($header, $row);
                 $valuesToImport[] = array(
                     'Label' => $rowData['label'],
@@ -707,7 +707,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             $parentId = $arrFolders[$folder['parentFolderId']];
 
@@ -778,7 +778,7 @@ 
         DB::startTransaction();
 
         // Import all items
-        foreach($post_items as $item) {
+        foreach ($post_items as $item) {
             // get info about this folder
             $destinationFolderMore = DB::queryFirstRow(
                 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
@@ -1019,7 +1019,7 @@ 
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

api/inc/jwt_utils.php

Indentation +51 added lines, -51 removed lines

@@ -37,45 +37,45 @@ 
  * @return boolean
  */
 function is_jwt_valid($jwt) {
-	try {
-		$decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'));
+    try {
+        $decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'));
 
-		// Check if expiration is reached
-		if ($decoded['exp'] - time() < 0) {
-			return false;
-		}
+        // Check if expiration is reached
+        if ($decoded['exp'] - time() < 0) {
+            return false;
+        }
 /*
 		$decoded1 = JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'), $headers = new stdClass());
 		print_r($headers);
 */
 
-		return true;
-	} catch (InvalidArgumentException $e) {
-		// provided key/key-array is empty or malformed.
-		return false;
-	} catch (DomainException $e) {
-		// provided algorithm is unsupported OR
-		// provided key is invalid OR
-		// unknown error thrown in openSSL or libsodium OR
-		// libsodium is required but not available.
-		return false;
-	} catch (SignatureInvalidException $e) {
-		// provided JWT signature verification failed.
-		return false;
-	} catch (BeforeValidException $e) {
-		// provided JWT is trying to be used before "nbf" claim OR
-		// provided JWT is trying to be used before "iat" claim.
-		return false;
-	} catch (ExpiredException $e) {
-		// provided JWT is trying to be used after "exp" claim.
-		return false;
-	} catch (UnexpectedValueException $e) {
-		// provided JWT is malformed OR
-		// provided JWT is missing an algorithm / using an unsupported algorithm OR
-		// provided JWT algorithm does not match provided key OR
-		// provided key ID in key/key-array is empty or invalid.
-		return false;
-	}
+        return true;
+    } catch (InvalidArgumentException $e) {
+        // provided key/key-array is empty or malformed.
+        return false;
+    } catch (DomainException $e) {
+        // provided algorithm is unsupported OR
+        // provided key is invalid OR
+        // unknown error thrown in openSSL or libsodium OR
+        // libsodium is required but not available.
+        return false;
+    } catch (SignatureInvalidException $e) {
+        // provided JWT signature verification failed.
+        return false;
+    } catch (BeforeValidException $e) {
+        // provided JWT is trying to be used before "nbf" claim OR
+        // provided JWT is trying to be used before "iat" claim.
+        return false;
+    } catch (ExpiredException $e) {
+        // provided JWT is trying to be used after "exp" claim.
+        return false;
+    } catch (UnexpectedValueException $e) {
+        // provided JWT is malformed OR
+        // provided JWT is missing an algorithm / using an unsupported algorithm OR
+        // provided JWT algorithm does not match provided key OR
+        // provided key ID in key/key-array is empty or invalid.
+        return false;
+    }
 }
 
 function base64url_encode($data) {
@@ -84,24 +84,24 @@ 
 
 function get_authorization_header()
 {
-	$request = symfonyRequest::createFromGlobals();
-	$authorizationHeader = $request->headers->get('Authorization');
-	$headers = null;
+    $request = symfonyRequest::createFromGlobals();
+    $authorizationHeader = $request->headers->get('Authorization');
+    $headers = null;
 	
-	// Check if the authorization header is not empty
-	if (!empty($authorizationHeader)) {
-		$headers = trim($authorizationHeader);
-	} else if (function_exists('apache_request_headers') === true) {
-		$requestHeaders = (array) apache_request_headers();
-		// Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
-		$requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
-		//print_r($requestHeaders);
-		if (isset($requestHeaders['Authorization']) === true) {
-			$headers = trim($requestHeaders['Authorization']);
-		}
-	}
+    // Check if the authorization header is not empty
+    if (!empty($authorizationHeader)) {
+        $headers = trim($authorizationHeader);
+    } else if (function_exists('apache_request_headers') === true) {
+        $requestHeaders = (array) apache_request_headers();
+        // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
+        $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+        //print_r($requestHeaders);
+        if (isset($requestHeaders['Authorization']) === true) {
+            $headers = trim($requestHeaders['Authorization']);
+        }
+    }
 	
-	return $headers;
+    return $headers;
 }
 
 function get_bearer_token() {
@@ -118,8 +118,8 @@ 
 
 function get_bearer_data($jwt) {
     // split the jwt
-	$tokenParts = explode('.', $jwt);
-	$payload = base64_decode($tokenParts[1]);
+    $tokenParts = explode('.', $jwt);
+    $payload = base64_decode($tokenParts[1]);
 	
     // HEADER: Get the access token from the header
     if (empty($payload) === false) {