nilsteampassnet / TeamPass

scripts/background_tasks___do_calculation.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
     // get count of Items in this folder
     $get = DB::queryfirstrow(
         'SELECT count(*) as num_results
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE inactif = %i AND id_tree = %i',
         0,
         $child->id
@@ -80,14 +80,14 @@ 
     $ret[$child->id]['id'] = $child->id;
 
     // get number of subfolders
-    $nodeDescendants =$tree->getDescendants($child->id, false, false, true);
+    $nodeDescendants = $tree->getDescendants($child->id, false, false, true);
     $ret[$child->id]['subfoldersCount'] = count($nodeDescendants);
 
     // get items number in subfolders
     if (count($nodeDescendants) > 0) {
         $get = DB::queryfirstrow(
             'SELECT count(*) as num_results
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE inactif = %i AND id_tree IN (%l)',
             0,
             implode(',', $nodeDescendants)

scripts/background_tasks___items_handler.php

Spacing +9 added lines, -9 removed lines

@@ -74,7 +74,7 @@ 
 DB::debugmode(false);
 $process_to_perform = DB::queryfirstrow(
     'SELECT *
-    FROM ' . prefixTable('processes') . '
+    FROM ' . prefixTable('processes').'
     WHERE is_in_progress = %i AND process_type IN ("item_copy", "new_item", "update_item")
     ORDER BY increment_id ASC',
     1
@@ -91,7 +91,7 @@ 
     // search for next process to handle
     $process_to_perform = DB::queryfirstrow(
         'SELECT *
-        FROM ' . prefixTable('processes') . '
+        FROM ' . prefixTable('processes').'
         WHERE is_in_progress = %i AND finished_at = "" AND process_type IN ("item_copy", "new_item", "update_item")
         ORDER BY increment_id ASC',
         0
@@ -108,7 +108,7 @@ 
             $process_to_perform['increment_id']
         );
 
-        provideLog('[PROCESS][#'. $process_to_perform['increment_id'].'][START]', $SETTINGS);
+        provideLog('[PROCESS][#'.$process_to_perform['increment_id'].'][START]', $SETTINGS);
         handleTask(
             $process_to_perform['increment_id'],
             json_decode($process_to_perform['arguments'], true),
@@ -125,7 +125,7 @@ 
 // launch a new iterative process
 $process_to_perform = DB::queryfirstrow(
     'SELECT *
-    FROM ' . prefixTable('processes') . '
+    FROM ' . prefixTable('processes').'
     WHERE is_in_progress = %i AND process_type IN ("item_copy", "new_item", "update_item")
     ORDER BY increment_id ASC',
     1
@@ -147,10 +147,10 @@ 
  */
 function handleTask(int $processId, array $ProcessArguments, array $SETTINGS): bool
 {
-    provideLog('[PROCESS][#'. $processId.'][START]', $SETTINGS);
+    provideLog('[PROCESS][#'.$processId.'][START]', $SETTINGS);
     $task_to_perform = DB::queryfirstrow(
         'SELECT *
-        FROM ' . prefixTable('processes_tasks') . '
+        FROM ' . prefixTable('processes_tasks').'
         WHERE process_id = %i AND finished_at IS NULL
         ORDER BY increment_id ASC',
         $processId
@@ -163,7 +163,7 @@ 
         // check if a linux process is not currently on going
         // if sub_task_in_progress === 1 then exit
         if ((int) $task_to_perform['sub_task_in_progress'] === 0) {
-            provideLog('[TASK][#'. $task_to_perform['increment_id'].'][START]', $SETTINGS);
+            provideLog('[TASK][#'.$task_to_perform['increment_id'].'][START]', $SETTINGS);
 
             // handle next task
             $args = json_decode($task_to_perform['task'], true);
@@ -244,7 +244,7 @@ 
             DB::update(
                 prefixTable('processes_tasks'),
                 array(
-                    'sub_task_in_progress' => 0,    // flag sub task is no more in prgoress
+                    'sub_task_in_progress' => 0, // flag sub task is no more in prgoress
                     'task' => json_encode(["status" => "Done"]),
                     'is_in_progress' => -1,
                     'finished_at' => time(),
@@ -278,7 +278,7 @@ 
 
         } else {
             // Task is currently being in progress by another server process
-            provideLog('[TASK][#'. $task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
+            provideLog('[TASK][#'.$task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
             return false;
         }
     }

scripts/task_maintenance_reload_cache_table.php

Spacing +2 added lines, -2 removed lines

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

api/Model/ItemModel.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
  */
 use TeampassClasses\NestedTree\NestedTree;
 
-require_once API_ROOT_PATH . "/Model/Database.php";
+require_once API_ROOT_PATH."/Model/Database.php";
 
 class ItemModel extends Database
 {
@@ -46,16 +46,16 @@ 
             "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
             LEFT JOIN ".prefixTable('nested_tree')." as t ON (t.id = i.id_tree) ".
-            $sqlExtra . 
-            " ORDER BY i.id ASC" .
+            $sqlExtra. 
+            " ORDER BY i.id ASC".
             //($limit > 0 ? " LIMIT ?". ["i", $limit] : '')
-            ($limit > 0 ? " LIMIT ". $limit : '')
+            ($limit > 0 ? " LIMIT ".$limit : '')
         );
         $ret = [];
         foreach ($rows as $row) {
             $userKey = $this->select(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = '.$userId.' AND object_id = '.$row['id']                
             );
             if (count($userKey) === 0 || empty($row['pw']) === true) {
@@ -89,7 +89,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);
                 }
             }
 

api/index.php

Spacing +6 added lines, -6 removed lines

@@ -30,13 +30,13 @@ 
 header("Access-Control-Allow-Methods: POST");
 header("Access-Control-Max-Age: 3600");
 header("Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With");
-require __DIR__ . "/inc/bootstrap.php";
+require __DIR__."/inc/bootstrap.php";
 
 // sanitize url segments
 $base = new BaseController();
 $uri = $base->getUriSegments();
 if (is_array($uri) === false || is_string($uri) === true) {
-    $uri = [$uri];  // ensure $uril is table
+    $uri = [$uri]; // ensure $uril is table
 }
 
 // Prepare DB password
@@ -52,9 +52,9 @@ 
 if ($uri[0] === 'authorize') {
     // Is API enabled in Teampass settings
     if ($apiStatus['error'] === false) {
-        require API_ROOT_PATH . "/Controller/Api/AuthController.php";
+        require API_ROOT_PATH."/Controller/Api/AuthController.php";
         $objFeedController = new AuthController();
-        $strMethodName = $uri[0] . 'Action';
+        $strMethodName = $uri[0].'Action';
         $objFeedController->{$strMethodName}();
     } else {
         // Error management
@@ -80,9 +80,9 @@ 
 
     // action related to USER
     } elseif ($controller === 'user') {
-        require API_ROOT_PATH . "/Controller/Api/UserController.php";
+        require API_ROOT_PATH."/Controller/Api/UserController.php";
         $objFeedController = new UserController();
-        $strMethodName = (string) $action . 'Action';
+        $strMethodName = (string) $action.'Action';
         $objFeedController->{$strMethodName}();
 
     // action related to ITEM

includes/core/load.js.php

Spacing +12 added lines, -12 removed lines

@@ -160,7 +160,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');
 
@@ -173,7 +173,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');
                             
@@ -300,7 +300,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');
@@ -382,13 +382,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,
                     };
                     // Do query
@@ -465,7 +465,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');
 
@@ -554,7 +554,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">' +
@@ -569,7 +569,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">' +
@@ -1073,15 +1073,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>'
@@ -1593,7 +1593,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>',

scripts/background_tasks___user_keys_creation.php

Spacing +43 added lines, -44 removed lines

@@ -76,7 +76,7 @@ 
 DB::debugmode(false);
 $process_to_perform = DB::queryfirstrow(
     'SELECT *
-    FROM ' . prefixTable('processes') . '
+    FROM ' . prefixTable('processes').'
     WHERE is_in_progress = %i AND process_type = %s
     ORDER BY increment_id ASC',
     1,
@@ -96,7 +96,7 @@ 
     // search for next process to handle
     $process_to_perform = DB::queryfirstrow(
         'SELECT *
-        FROM ' . prefixTable('processes') . '
+        FROM ' . prefixTable('processes').'
         WHERE is_in_progress = %i AND finished_at = "" AND process_type = %s
         ORDER BY increment_id ASC',
         0,
@@ -114,7 +114,7 @@ 
             $process_to_perform['increment_id']
         );
 
-        provideLog('[PROCESS][#'. $process_to_perform['increment_id'].'][START]', $SETTINGS);
+        provideLog('[PROCESS][#'.$process_to_perform['increment_id'].'][START]', $SETTINGS);
         handleTask(
             $process_to_perform['increment_id'],
             json_decode($process_to_perform['arguments'], true),
@@ -129,7 +129,7 @@ 
 // launch a new iterative process
 $process_to_perform = DB::queryfirstrow(
     'SELECT *
-    FROM ' . prefixTable('processes') . '
+    FROM ' . prefixTable('processes').'
     WHERE is_in_progress = %i AND process_type = %s
     ORDER BY increment_id ASC',
     1,
@@ -153,11 +153,11 @@ 
  */
 function handleTask(int $processId, array $ProcessArguments, array $SETTINGS): bool
 {
-    provideLog('[PROCESS][#'. $processId.'][START]', $SETTINGS);
+    provideLog('[PROCESS][#'.$processId.'][START]', $SETTINGS);
     //DB::debugmode(false);
     $task_to_perform = DB::queryfirstrow(
         'SELECT *
-        FROM ' . prefixTable('processes_tasks') . '
+        FROM ' . prefixTable('processes_tasks').'
         WHERE process_id = %i AND finished_at IS NULL
         ORDER BY increment_id ASC',
         $processId
@@ -172,7 +172,7 @@ 
         // check if a linux process is not currently on going
         // if sub_task_in_progress === 1 then exit
         if ((int) $task_to_perform['sub_task_in_progress'] === 0) {
-            provideLog('[TASK][#'. $task_to_perform['increment_id'].'][START]', $SETTINGS);
+            provideLog('[TASK][#'.$task_to_perform['increment_id'].'][START]', $SETTINGS);
 
             // handle next task
             $args = json_decode($task_to_perform['task'], true);
@@ -225,10 +225,9 @@ 
             DB::update(
                 prefixTable('processes_tasks'),
                 array(
-                    'sub_task_in_progress' => 0,    // flag sub task is no more in prgoress
+                    'sub_task_in_progress' => 0, // flag sub task is no more in prgoress
                     'task' => $taskStatus['new_action'] !== $args['step'] ? 
-                    json_encode(["status" => "Done"]) :
-                    json_encode([
+                    json_encode(["status" => "Done"]) : json_encode([
                         "step" => $taskStatus['new_action'],
                         "index" => $taskStatus['new_index'],
                         "nb" => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : $args['nb'],
@@ -264,7 +263,7 @@ 
 
         } else {
             // Task is currently being in progress by another server process
-            provideLog('[TASK][#'. $task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
+            provideLog('[TASK][#'.$task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
             return false;
         }
     }
@@ -297,7 +296,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -426,13 +425,13 @@ 
 {
     $userInfo = DB::queryFirstRow(
         'SELECT pw, public_key, private_key, login, name
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $owner_id
     );
     
     // decrypt owner password
-    $pwd = cryption($owner_pwd, '','decrypt', $SETTINGS)['string'];
+    $pwd = cryption($owner_pwd, '', 'decrypt', $SETTINGS)['string'];
     provideLog('[USER][INFO] ID:'.$owner_id, $SETTINGS);
     //provideLog('[DEBUG] '.$pwd." -- ", $SETTINGS);
     // decrypt private key and send back
@@ -471,17 +470,17 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw, perso
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         '.(isset($extra_arguments['only_personal_items']) === true && $extra_arguments['only_personal_items'] === 1 ? 'WHERE perso = 1' : '').'
         ORDER BY id ASC
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     //    WHERE perso = 0
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             //$extra_arguments['owner_id']
@@ -510,7 +509,7 @@ 
         
         $currentUserKey = DB::queryFirstRow(
             'SELECT increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $post_user_id
@@ -581,15 +580,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $extra_arguments['owner_id']
@@ -621,7 +620,7 @@ 
             if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -643,7 +642,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -683,15 +682,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $extra_arguments['owner_id']
@@ -719,7 +718,7 @@ 
                 if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -742,7 +741,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -782,14 +781,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $extra_arguments['owner_id']
@@ -821,7 +820,7 @@ 
             if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -881,16 +880,16 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT f.id AS id, i.perso AS perso
-        FROM ' . prefixTable('files') . ' AS f
-        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').' AS f
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             (int) $record['perso'] === 0 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id']
@@ -918,7 +917,7 @@ 
 
         $currentUserKey = DB::queryFirstRow(
             'SELECT increment_id
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $post_user_id
@@ -980,8 +979,8 @@ 
     // SHould we change step? Finished ?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
     $counter = DB::count();
     $next_start = (int) $post_start + (int) $post_length;
@@ -1045,7 +1044,7 @@ 
     // get user info
     $userInfo = DB::queryFirstRow(
         'SELECT email, login, auth_type, special, lastname, name
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $extra_arguments['new_user_id']
     );
@@ -1059,13 +1058,13 @@ 
         sendMailToUser(
             filter_var($userInfo['email'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             empty($extra_arguments['email_body']) === false ? $extra_arguments['email_body'] : $lang->get('email_body_user_config_1'),
-            'TEAMPASS - ' . $lang->get('login_credentials'),
+            'TEAMPASS - '.$lang->get('login_credentials'),
             (array) filter_var_array(
                 [
-                    '#code#' => cryption($extra_arguments['new_user_code'], '','decrypt', $SETTINGS)['string'],
+                    '#code#' => cryption($extra_arguments['new_user_code'], '', 'decrypt', $SETTINGS)['string'],
                     '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '',
                     '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '',
-                    '#password#' => cryption($extra_arguments['new_user_pwd'], '','decrypt', $SETTINGS)['string'],
+                    '#password#' => cryption($extra_arguments['new_user_pwd'], '', 'decrypt', $SETTINGS)['string'],
                 ],
                 FILTER_SANITIZE_FULL_SPECIAL_CHARS
             ),

api/Model/Database.php

Spacing +12 added lines, -12 removed lines

@@ -31,7 +31,7 @@ 
         try {
             $this->connection = new \mysqli(DB_HOST, DB_USER, DB_PASSWD_CLEAR, DB_NAME);
 
-            if ( mysqli_connect_errno()) {
+            if (mysqli_connect_errno()) {
                 throw new Exception("Could not connect to database.");   
             }
         } catch (Exception $e) {
@@ -39,37 +39,37 @@ 
         }           
     }
 
-    public function select($query = "" , $params = [])
+    public function select($query = "", $params = [])
     {
         try {
-            $stmt = $this->executeStatement( $query , $params );
+            $stmt = $this->executeStatement($query, $params);
             $result = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);               
             $stmt->close();
 
             return $result;
-        } catch(Exception $e) {
-            throw New Exception( $e->getMessage() );
+        } catch (Exception $e) {
+            throw New Exception($e->getMessage());
         }
     }
 
-    private function executeStatement($query = "" , $params = [])
+    private function executeStatement($query = "", $params = [])
     {
         try {
-            $stmt = $this->connection->prepare( $query );
+            $stmt = $this->connection->prepare($query);
 
-            if($stmt === false) {
-                throw New Exception("Unable to do prepared statement: " . $query);
+            if ($stmt === false) {
+                throw New Exception("Unable to do prepared statement: ".$query);
             }
 
-            if( $params ) {
+            if ($params) {
                 $stmt->bind_param($params[0], $params[1]);
             }
 
             $stmt->execute();
 
             return $stmt;
-        } catch(Exception $e) {
-            throw New Exception( $e->getMessage() );
+        } catch (Exception $e) {
+            throw New Exception($e->getMessage());
         }   
     }
 }
\ No newline at end of file

api/inc/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -26,22 +26,22 @@ 
 
 use TeampassClasses\SuperGlobal\SuperGlobal;
 
-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';
 
 // init
 loadClasses('DB');
 $superGlobal = new SuperGlobal();
 
 // 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
@@ -52,10 +52,10 @@ 
  */
 function itemAction(array $actions, array $userData)
 {
-    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);
 }
 
@@ -68,10 +68,10 @@ 
  */
 function folderAction(array $actions, array $userData)
 {
-    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);
 }
 
@@ -82,7 +82,7 @@ 
  */
 function apiIsEnabled(): string
 {
-    include API_ROOT_PATH . '/../includes/config/tp.config.php';
+    include API_ROOT_PATH.'/../includes/config/tp.config.php';
 
     if (isset($SETTINGS) === true && isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
         return json_encode(
@@ -111,7 +111,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) {
@@ -141,7 +141,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) {