nilsteampassnet / TeamPass

api/Controller/Api/AuthController.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
         $arrQueryStringParams = $this->getQueryStringParams();
 
         if (strtoupper($requestMethod) === 'POST') {
-            require API_ROOT_PATH . "/Model/AuthModel.php";
+            require API_ROOT_PATH."/Model/AuthModel.php";
             try {
                 $authModel = new AuthModel();
                 $arrUser = $authModel->getUserAuth(
@@ -50,7 +50,7 @@ 
                 if (array_key_exists("token", $arrUser)) {
                     $responseData = json_encode($arrUser);
                 } else {
-                    $strErrorDesc = $arrUser['error'] . " (" . $arrUser['info'] . ")";
+                    $strErrorDesc = $arrUser['error']." (".$arrUser['info'].")";
                     $strErrorHeader = 'HTTP/1.1 401 Unauthorized';
                 }
             } catch (Error $e) {

scripts/background_tasks___functions.php

Spacing +1 added lines, -1 removed lines

@@ -89,5 +89,5 @@
  */
 function provideLog(string $message, array $SETTINGS)
 {
-    echo '\n' . (string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message . '\n';
+    echo '\n'.(string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message.'\n';
 }
\ No newline at end of file

includes/core/load.js.php

Spacing +12 added lines, -12 removed lines

@@ -154,7 +154,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-user-change-password-info')
-                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-user-change-password').removeClass('hidden');
 
@@ -167,7 +167,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 langHdl('ldap_user_has_changed_his_password');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-ldap-user-change-password').removeClass('hidden');
                             
@@ -289,7 +289,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 langHdl('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -371,13 +371,13 @@ 
             {
                 if (step === 'psk') {
                     // Inform user
-                    $("#user-current-defuse-psk-progress").html('<b><?php echo langHdl('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
+                    $("#user-current-defuse-psk-progress").html('<b><?php echo langHdl('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + '] ' +
                         '... <?php echo langHdl('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
@@ -454,7 +454,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 langHdl('ldap_user_has_changed_his_password');?>')
+                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                     .removeClass('hidden');
                 $('#dialog-ldap-user-change-password').removeClass('hidden');
 
@@ -543,7 +543,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 langHdl('provide_recovery_keys'); ?></h6>' +
                             '<div class="input-group mb-2">' +
                                 '<div class="input-group-prepend">' +
@@ -558,7 +558,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">' +
@@ -1062,15 +1062,15 @@ 
             // Prepare data
             var data = {
                 'receipt': $('#temp-user-email').val(),
-                'subject': '[Teampass] <?php echo langHdl('your_new_password');?>',
-                'body': '<?php echo langHdl('email_body_temporary_login_password');?>',
+                'subject': '[Teampass] <?php echo langHdl('your_new_password'); ?>',
+                'body': '<?php echo langHdl('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 langHdl('sending_email_message');?>');
+            $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message'); ?>');
             toastr.remove();
             toastr.info(
                 '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
@@ -1583,7 +1583,7 @@ 
                         '#warningModal',
                         '<i class="fa-solid fa-clock fa-lg warning mr-2"></i><?php echo langHdl('index_add_one_hour'); ?>',
                         '<div class="form-group">' +
-                        '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('extend_session_duration_by') . ' (' . langHdl('minutes') . ')'; ?>:</label>' +
+                        '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('extend_session_duration_by').' ('.langHdl('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 langHdl('maximum_session_expiration_time'); ?>: '+data.max_session_duration+'</div>',

scripts/background_tasks___items_handler.php

Spacing +9 added lines, -9 removed lines

@@ -67,7 +67,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
@@ -84,7 +84,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
@@ -101,7 +101,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),
@@ -118,7 +118,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
@@ -140,11 +140,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
@@ -164,7 +164,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);
@@ -245,7 +245,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(),
@@ -279,7 +279,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/background_tasks___user_keys_creation.php

Spacing +43 added lines, -44 removed lines

@@ -71,7 +71,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,
@@ -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 = %s
         ORDER BY increment_id ASC',
         0,
@@ -109,7 +109,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),
@@ -124,7 +124,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,
@@ -148,11 +148,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
@@ -167,7 +167,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);
@@ -220,10 +220,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'],
@@ -259,7 +258,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;
         }
     }
@@ -292,7 +291,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
         );
@@ -423,13 +422,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
@@ -470,17 +469,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']
@@ -509,7 +508,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
@@ -580,15 +579,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']
@@ -620,7 +619,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
@@ -642,7 +641,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
@@ -883,16 +882,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']
@@ -920,7 +919,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
@@ -982,8 +981,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;
@@ -1047,7 +1046,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']
     );
@@ -1061,13 +1060,13 @@ 
         sendMailToUser(
             filter_var($userInfo['email'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             empty($extra_arguments['email_body']) === false ? $extra_arguments['email_body'] : langHdl('email_body_user_config_1'),
-            'TEAMPASS - ' . langHdl('login_credentials'),
+            'TEAMPASS - '.langHdl('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
             ),

pages/utilities.renewal.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.renewal') === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 

pages/uploads.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('uploads') === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 

pages/folders.php

Spacing +11 added lines, -11 removed lines

@@ -64,7 +64,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('folders') === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -100,28 +100,28 @@ 
 $complexityHtml = '<div id="hidden-select-complexity" class="hidden"><select id="select-complexity" class="form-control form-item-control save-me">';
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
-$complexityHtml .= $complexitySelect . '</select></div>';
+$complexityHtml .= $complexitySelect.'</select></div>';
 
 /* Get full tree structure */
 $tst = $tree->getDescendants();
 // prepare options list
-$droplist = '<option value="na">---' . langHdl('select') . '---</option>';
+$droplist = '<option value="na">---'.langHdl('select').'---</option>';
 if ((int) $_SESSION['is_admin'] === 1 || (int) $_SESSION['user_manager'] === 1 || (int) $_SESSION['can_create_root_folder'] === 1) {
-    $droplist .= '<option value="0">' . langHdl('root') . '</option>';
+    $droplist .= '<option value="0">'.langHdl('root').'</option>';
 }
 foreach ($tst as $t) {
     if (
         in_array($t->id, $_SESSION['groupes_visibles']) === true
         && in_array($t->id, $_SESSION['personal_visible_groups']) === false
     ) {
-        $droplist .= '<option value="' . $t->id . '">' . addslashes($t->title);
+        $droplist .= '<option value="'.$t->id.'">'.addslashes($t->title);
         $text = '';
         foreach ($tree->getPath($t->id, false) as $fld) {
-            $text .= empty($text) === true ? '     [' . $fld->title : ' > ' . $fld->title;
+            $text .= empty($text) === true ? '     ['.$fld->title : ' > '.$fld->title;
         }
-        $droplist .= (empty($text) === true ? '' : $text . '</i>]') . '</option>';
+        $droplist .= (empty($text) === true ? '' : $text.'</i>]').'</option>';
     }
 }
 
@@ -200,14 +200,14 @@ 
                                     <label><?php echo langHdl('icon'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon" data-field="icon">
                                     <small class='form-text text-muted'>
-                                        <?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
                                     <label><?php echo langHdl('icon_on_selection'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon-selected" data-field="iconSelected">
                                     <small class='form-text text-muted'>
-                                        <?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
@@ -298,7 +298,7 @@ 
                                 <th scope="col" min-width="200px"><?php echo langHdl('group'); ?></th>
                                 <th scope="col" min-width="200px"><?php echo langHdl('group_parent'); ?></th>
                                 <th scope="col" width="50px"><i class="fas fa-gavel fa-lg infotip" title="<?php echo langHdl('password_strength'); ?>"></i></th>
-                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo langHdl('group_pw_duration') . ' ' . langHdl('group_pw_duration_tip'); ?>"></i></th>
+                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo langHdl('group_pw_duration').' '.langHdl('group_pw_duration_tip'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-pen fa-lg infotip" title="<?php echo langHdl('auth_creation_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-edit fa-lg infotip" title="<?php echo langHdl('auth_modification_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-folder fa-lg infotip" title="<?php echo langHdl('icon'); ?>"></i></th>

pages/utilities.renewal.js.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }