nilsteampassnet / TeamPass

scripts/task_maintenance_reload_cache_table.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 function reloadCacheTable(): void
 {
     // Load expected files
-    require_once __DIR__. '/../sources/main.functions.php';
+    require_once __DIR__.'/../sources/main.functions.php';
 
     updateCacheTable('reload', NULL);
 }
\ No newline at end of file

sources/items.logs.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,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;
 }
 
@@ -130,7 +130,7 @@ 
             
             if (
                 is_array($dataReceived) && // check if the data is an array
-                array_diff_key(array_flip($requiredKeys), $dataReceived) === [] &&  // check if all required keys have a valuekeys are present
+                array_diff_key(array_flip($requiredKeys), $dataReceived) === [] && // check if all required keys have a valuekeys are present
                 count(array_filter($dataReceived)) === count($requiredKeys) && // check if all required 
                 in_array($dataReceived['action'], ['at_password_shown', 'at_password_copied'], true) && // only log these actions
                 $session->get('user-id') === (int) filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT) // only log actions of the current user

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/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/FolderModel.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
         // Get folders
         $rows = DB::query(
             'SELECT id, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE nlevel = %i',
             1
         );
@@ -69,12 +69,12 @@ 
         $ret = [];
         $childrens = DB::query(
             'SELECT id, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE parent_id = %i',
             $parentId
         );
 
-        if ( count($childrens) > 0) {
+        if (count($childrens) > 0) {
             foreach ($childrens as $children) {
 				$isVisible = in_array((int) $children['id'], $foldersId);
                 $childs = $this->getFoldersChildren($children['id'], $foldersId);
@@ -116,7 +116,7 @@ 
     ): array
     {
         // Validate inputs
-        include_once API_ROOT_PATH . '/../sources/main.functions.php';
+        include_once API_ROOT_PATH.'/../sources/main.functions.php';
         $data = [
             'title' => $title,
             'parent_id' => $parent_id,
@@ -181,7 +181,7 @@ 
                 'error' => true,
                 'error_header' => 'HTTP/1.1 422 Unprocessable Entity',
                 'error_message' => 'Invalid parameters'
-            ];}
+            ]; }
 
         // Create folder
         require_once TEAMPASS_ROOT_PATH.'/sources/folders.class.php';

api/Model/AuthModel.php

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/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

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;