nilsteampassnet / TeamPass

scripts/background_tasks___functions.php

Spacing +6 added lines, -6 removed lines

@@ -102,11 +102,11 @@ 
 function provideLog(string $message, array $SETTINGS)
 {
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-        error_log((string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message);
+        error_log((string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message);
     }
 }
 
-function performVisibleFoldersHtmlUpdate (int $user_id)
+function performVisibleFoldersHtmlUpdate(int $user_id)
 {
     $html = [];
 
@@ -116,10 +116,10 @@ 
 
     // get current folders visible for user
     $cache_tree = DB::queryFirstRow(
-        'SELECT increment_id, data FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+        'SELECT increment_id, data FROM '.prefixTable('cache_tree').' WHERE user_id = %i',
         $user_id
     );
-    $folders = json_decode($cache_tree['data'], true);//print_r($folders);
+    $folders = json_decode($cache_tree['data'], true); //print_r($folders);
     foreach ($folders as $folder) {
         $idFolder = (int) explode("li_", $folder['id'])[1];
 
@@ -132,7 +132,7 @@ 
 
         // get folder info
         $folder = DB::queryFirstRow(
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $idFolder
         );
 
@@ -167,7 +167,7 @@ 
 function subTaskStatus($taskId)
 {
     $subTasks = DB::query(
-        'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i',
+        'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i',
         $taskId
     );
 

pages/admin.php

Spacing +11 added lines, -11 removed lines

@@ -68,7 +68,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === 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;
 }
 
@@ -199,7 +199,7 @@ 
     // Get last cron execution timestamp
     DB::query(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s and valeur >= %d',
         'admin',
         'last_cron_exec',
@@ -270,7 +270,7 @@ 
                     <div class="card-body">
                         <?php
                         // Display information about server
-                        $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '" . DB_NAME . "'");
+                        $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '".DB_NAME."'");
 
                         // Get OS
                         $uname = php_uname('s');
@@ -326,17 +326,17 @@ 
                         }
 
                         echo 
-                        '<p>' . $os.
+                        '<p>'.$os.
                             '<br><span class="ml-4"></span>'.
                         '</p>'.
                         $internetAccess.
-                        '<p><i class="fa-brands fa-php mr-2"></i>PHP version: ' . phpversion().
+                        '<p><i class="fa-brands fa-php mr-2"></i>PHP version: '.phpversion().
                             '<br><span class="ml-4">Memory limit: '.(ini_get('memory_limit')).'</span>'.
                             '<br><span class="ml-4">Memory usage: '.formatSizeUnits(memory_get_usage()).'</span>'.
                             '<br><span class="ml-4">Maximum time execution: '.ini_get('max_execution_time').'</span>'.
                             '<br><span class="ml-4">Maximum file size upload: '.ini_get('upload_max_filesize').'</span>'.
                         '</p>'.
-                        '<p><i class="fa-solid fa-server mr-2"></i>Server version: ' . DB::serverVersion().
+                        '<p><i class="fa-solid fa-server mr-2"></i>Server version: '.DB::serverVersion().
                             '<br><span class="ml-4">Database size: '.($dbSize['size']).'MB</span>'.
                         '</p>';
 
@@ -344,11 +344,11 @@ 
                         $serverTime = localtime(time(), true);
                         echo '<div class="row">'.
                             '<div class="col-6"><i class="fa-solid fa-clock mr-2"></i>Server time:</div>'.
-                            '<div class="col-6"><span class="badge badge-info">' . 
-                            str_pad(strval($serverTime['tm_hour']), 2, "0", STR_PAD_LEFT) . ':' .
-                            str_pad(strval($serverTime['tm_min']), 2, "0", STR_PAD_LEFT) . ':' .
-                            str_pad(strval($serverTime['tm_sec']), 2, "0", STR_PAD_LEFT) .
-                            '</span></div>' .
+                            '<div class="col-6"><span class="badge badge-info">'. 
+                            str_pad(strval($serverTime['tm_hour']), 2, "0", STR_PAD_LEFT).':'.
+                            str_pad(strval($serverTime['tm_min']), 2, "0", STR_PAD_LEFT).':'.
+                            str_pad(strval($serverTime['tm_sec']), 2, "0", STR_PAD_LEFT).
+                            '</span></div>'.
                         '</div>'.
                         '<div class="row">'.
                             '<div class="col-6"><span class="ml-4">Timezone:</span></div>'.

sources/oauth.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 use TeampassClasses\OAuth2Controller\OAuth2Controller;
 use TeampassClasses\SessionManager\SessionManager;
 
-require_once __DIR__. '/../includes/config/include.php';
+require_once __DIR__.'/../includes/config/include.php';
 require_once __DIR__.'/../sources/main.functions.php';
 
 // init

pages/2fa.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('mfa') === 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;
 }
 
@@ -141,7 +141,7 @@ 
                                     $roles = getRolesTitles();
                                     foreach ($roles as $role) {
                                         echo '
-                                    <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>';
+                                    <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>';
                                     }
                                     ?>
                                 </select>

self-unlock.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 // Load functions
-require_once __DIR__. '/includes/config/include.php';
+require_once __DIR__.'/includes/config/include.php';
 require_once __DIR__.'/sources/main.functions.php';
 
 // init
@@ -53,10 +53,10 @@ 
 // Check for existing lock
 $result = DB::queryFirstField(
     'SELECT 1
-     FROM ' . prefixTable('auth_failures') . '
+     FROM ' . prefixTable('auth_failures').'
      WHERE unlock_at = (
         SELECT MAX(unlock_at)
-        FROM ' . prefixTable('auth_failures') . '
+        FROM ' . prefixTable('auth_failures').'
         WHERE unlock_at > %s
         AND source = %s AND value = %s)
      AND unlock_code = %s',

sources/upload.files.php

Spacing +33 added lines, -33 removed lines

@@ -76,7 +76,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 @@ 
     } else {
         // check if token is expired
         $data = DB::queryFirstRow(
-            'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s',
+            'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s',
             $session->get('user-id'),
             $post_user_token
         );
@@ -154,7 +154,7 @@ 
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
@@ -166,7 +166,7 @@ 
     }
 
     // Set directory used to store file
-    $targetDir = realpath($SETTINGS['cpassman_dir'] . '/includes/avatars');
+    $targetDir = realpath($SETTINGS['cpassman_dir'].'/includes/avatars');
 } else {
     $targetDir = realpath($SETTINGS['path_to_files_folder']);
 }
@@ -219,7 +219,7 @@ 
     $file_name = preg_replace('/[^a-zA-Z0-9-_\.]/', '', strtolower(basename($file->getClientOriginalName())));
     
     if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-        error_log('Invalid file name: ' . $file_name . '.');
+        error_log('Invalid file name: '.$file_name.'.');
         echo handleUploadError('Invalid file name provided.');
         return false;
     }
@@ -233,13 +233,13 @@ 
             $ext = strtolower($ext);
         } else {
             // Case where the file extension is not a string
-            error_log('Invalid file name: ' . $file_name . '.');
+            error_log('Invalid file name: '.$file_name.'.');
             echo handleUploadError('Invalid file extension.');
             return false;
         }
     } else {
         // Case where the file name is not a string
-        error_log('Invalid file name: ' . $file_name . '.');
+        error_log('Invalid file name: '.$file_name.'.');
         echo handleUploadError('Invalid file.');
         return false;
     }
@@ -247,8 +247,8 @@ 
     // Validate against a list of allowed extensions
     $allowed_extensions = explode(
         ',',
-        $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-            ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+        $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+            ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
     );
     if (
         !in_array($ext, $allowed_extensions) 
@@ -267,25 +267,25 @@ 
 
 // is destination folder writable
 if (is_writable($SETTINGS['path_to_files_folder']) === false) {
-    echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.');
+    echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.');
     return false;
 }
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     // $ext is guaranteed to be a string due to prior checks
     $fileNameA = substr($fileName, 0, strlen(/** @scrutinizer ignore-type */$ext));
     $fileNameB = substr($fileName, strlen(/** @scrutinizer ignore-type */$ext));
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (!file_exists($targetDir)) {
@@ -299,7 +299,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($fileClean = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $fileClean;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$fileClean;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -313,7 +313,7 @@ 
 
     closedir($dir);
 } else {
-    echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.');
+    echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.');
     return false;
 }
 
@@ -353,7 +353,7 @@ 
 
                 // Safe destination folder
                 $uploadDir = realpath($SETTINGS['path_to_upload_folder']);
-                $destinationPath = $uploadDir . DIRECTORY_SEPARATOR . $fileName;
+                $destinationPath = $uploadDir.DIRECTORY_SEPARATOR.$fileName;
                 
                 if (move_uploaded_file($tmpFilePath, $destinationPath)) {
                     // Open the moved file in read mode
@@ -394,7 +394,7 @@ 
             return false;
         }
     } else {
-        echo handleUploadError('Failed to move uploaded file to ' . $SETTINGS['path_to_files_folder'] . '.');
+        echo handleUploadError('Failed to move uploaded file to '.$SETTINGS['path_to_files_folder'].'.');
         return false;
     }
 } else {
@@ -410,14 +410,14 @@ 
                 fwrite($out, $buff);
             }
         } else {
-            echo handleUploadError('Failed to open input stream ' . $SETTINGS['path_to_files_folder'] . '.');
+            echo handleUploadError('Failed to open input stream '.$SETTINGS['path_to_files_folder'].'.');
             return false;
         }
 
         fclose($in);
         fclose($out);
     } else {
-        echo handleUploadError('Failed to open output stream ' . $SETTINGS['path_to_files_folder'] . '.');
+        echo handleUploadError('Failed to open output stream '.$SETTINGS['path_to_files_folder'].'.');
         return false;
     }
 }
@@ -450,7 +450,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -479,7 +479,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -512,13 +512,13 @@ 
     // rename the file
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext
     );
 
     // make thumbnail
     $ret = makeThumbnail(
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext,
         40
     );
 
@@ -530,21 +530,21 @@ 
     }
 
     // get current avatar and delete it
-    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $session->get('user-id'));
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS);
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS);
+    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $session->get('user-id'));
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS);
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS);
 
     // store in DB the new avatar
     DB::query(
-        'UPDATE ' . prefixTable('users') . "
-        SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "'
+        'UPDATE '.prefixTable('users')."
+        SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."'
         WHERE id=%i",
         $session->get('user-id')
     );
 
     // store in session
-    $session->set('user-avatar', $newFileName . '.' . $ext);
-    $session->set('user-avatar_thumb', $newFileName . '_thumb' . '.' . $ext);
+    $session->set('user-avatar', $newFileName.'.'.$ext);
+    $session->set('user-avatar_thumb', $newFileName.'_thumb'.'.'.$ext);
 
     // return info
     echo prepareExchangedData(
@@ -563,7 +563,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB

pages/profile.js.php

Spacing +15 added lines, -15 removed lines

@@ -73,7 +73,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;
 }
 ?>
@@ -97,7 +97,7 @@ 
     })
 
     // Select user properties
-    $('#profile-user-language option[value=<?php echo $session->get('user-language');?>').attr('selected','selected');
+    $('#profile-user-language option[value=<?php echo $session->get('user-language'); ?>').attr('selected','selected');
 
 
     // AVATAR IMPORT
@@ -295,7 +295,7 @@ 
 
                     // reload page in case of language change
                     if ($('#profile-user-language').val()
-                        && $('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language');?>') {
+                        && $('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language'); ?>') {
                         // prepare reload
                         $(this).delay(3000).queue(function() {
                             document.location.href = "index.php?page=profile";
@@ -306,7 +306,7 @@ 
                         // Inform user
                         toastr.remove();
                         toastr.info(
-                            '<?php echo $lang->get('alert_page_will_reload') . ' ... ' . $lang->get('please_wait'); ?>',
+                            '<?php echo $lang->get('alert_page_will_reload').' ... '.$lang->get('please_wait'); ?>',
                             '', {
                                 timeOut: 3000,
                                 progressBar: true
@@ -410,27 +410,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -523,27 +523,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -559,7 +559,7 @@ 
         }
     });
 
-    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
+    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
 
     $("#open-dialog-keys-download").on('click', function(event) {
         event.preventDefault();

pages/items.php

Spacing +34 added lines, -34 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('items') === 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;
 }
 // Define Timezone
@@ -90,7 +90,7 @@ 
 
 // Get list of users
 $usersList = [];
-$rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+$rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
 foreach ($rows as $record) {
     $usersList[$record['login']] = [
         'id' => $record['id'],
@@ -101,16 +101,16 @@ 
 // Get list of roles
 $arrRoles = [];
 $listRoles = '';
-$rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+$rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
 foreach ($rows as $reccord) {
     $arrRoles[$reccord['title']] = [
         'id' => $reccord['id'],
         'title' => $reccord['title'],
     ];
     if (empty($listRoles)) {
-        $listRoles = $reccord['id'] . '#' . $reccord['title'];
+        $listRoles = $reccord['id'].'#'.$reccord['title'];
     } else {
-        $listRoles .= ';' . $reccord['id'] . '#' . $reccord['title'];
+        $listRoles .= ';'.$reccord['id'].'#'.$reccord['title'];
     }
 }
 
@@ -185,7 +185,7 @@ 
                         <li class="nav-item"><a class="nav-link" href="#tab_3" data-toggle="tab"><i class="fa-solid fa-archive mr-2"></i><?php echo $lang->get('attachments'); ?></a></li>
                         <?php
                         echo isset($SETTINGS['item_extra_fields']) === true && (int) $SETTINGS['item_extra_fields'] === 1 ? '
-                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields') . '</a></li>' : '';
+                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields').'</a></li>' : '';
                         ?>
                     </ul>
                 </div><!-- /.card-header -->
@@ -254,7 +254,7 @@ 
                                                 <?php
                                                 for ($i = 4; $i <= $SETTINGS['pwd_maximum_length']; ++$i) {
                                                     echo '
-                                                <option>' . $i . '</option>';
+                                                <option>' . $i.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -284,7 +284,7 @@ 
                                     <span class="ml-2 col-md-1 clear-me-html" id="form-item-icon-show"></span>
                                 </div>
                                 <small class='form-text text-muted'>
-                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                                 </small>
                             </div>
 
@@ -472,39 +472,39 @@ 
                             <div class="tab-pane" id="tab_4">
                                 <div id="form-item-field" class="hidden">
                                     <?php
-                                        $session_item_fields = $session->get('system-item_fields');//print_r($session_item_fields);
+                                        $session_item_fields = $session->get('system-item_fields'); //print_r($session_item_fields);
                                         if (isset($session_item_fields) === true) {
                                             foreach ($session_item_fields as $category) {
                                                 //print_r($category);
                                                 echo '
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
-                                                <h5>' . $category['title'] . '</h5>
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
+                                                <h5>' . $category['title'].'</h5>
                                                 <p>';
                                                 foreach ($category['fields'] as $field) {
                                                     if ($field['type'] === 'textarea') {
                                                         echo '
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <label>' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</label>
-                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0"></textarea>
+                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0"></textarea>
                                                     </div>';
                                                     } else {
                                                         echo '
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</span>
                                                         </div>
-                                                        <input type="' . $field['type'] . '" class="form-control form-item-control form-item-field-custom" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0">
+                                                        <input type="' . $field['type'].'" class="form-control form-item-control form-item-field-custom" data-field-name="'.$field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0">
                                                     </div>';
                                                     }
                                                     if (!empty($field['regex'])) {
                                                         echo '
-                                                    <div>Regex: '. $field['regex'] .'</div>
+                                                    <div>Regex: '. $field['regex'].'</div>
                                                         ';
                                                     }
                                                 }
@@ -515,8 +515,8 @@ 
                                                 ) {
                                                     echo '
                                                     <div class="form-check icheck-blue">
-                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'] . '" data-change-ongoing="0" data-field-name="template" id="template_' . $category['id'] . '">
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . $lang->get('main_template') . '</label>
+                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'].'" data-change-ongoing="0" data-field-name="template" id="template_'.$category['id'].'">
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.$lang->get('main_template').'</label>
                                                     </div>';
                                                 }
                                                 echo '
@@ -526,8 +526,8 @@ 
                                         } else {
                                             echo
                                             '<div class="alert alert-info">
-                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information') . '</h5>
-                                                ' . $lang->get('no_fields') . '
+                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information').'</h5>
+                                                ' . $lang->get('no_fields').'
                                             </div>';
                                         } ?>
                                 </div>
@@ -668,7 +668,7 @@ 
                         <p><?php
                             echo str_replace(
         ['##otv_expiration_period##', '. '],
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
         $lang->get('otv_message')
     );
                             ?></p>
@@ -686,9 +686,9 @@ 
 
                     <div class="row">
                         <div class="form-group col-4">
-                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period'];?>)</label>
+                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period']; ?>)</label>
                             <div class="input-group mb-3">
-                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period'];?>" value="<?php echo $SETTINGS['otv_expiration_period'];?>">
+                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period']; ?>" value="<?php echo $SETTINGS['otv_expiration_period']; ?>">
                             </div>
                         </div>
 
@@ -776,7 +776,7 @@ 
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -794,14 +794,14 @@ 
                             <label><?php echo $lang->get('icon'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                         <div class="form-group">
                             <label><?php echo $lang->get('icon_on_selection'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon-selected">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                     </div>
@@ -1212,18 +1212,18 @@ 
                                 <?php
                                     foreach ($session_item_fields as $elem) {
                                         echo '
-                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
-                                    <h5>' . $elem['title'] . '</h5>
+                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
+                                    <h5>' . $elem['title'].'</h5>
                                     <p>
                                         <ul class="list-group list-group-unbordered mb-3">';
                                         foreach ($elem['fields'] as $field) {
                                             echo '
-                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
-                                                <span id="card-item-field-title-' . $field['id'] . '"><b>' . $field['title'] . '</b></span>
-                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'] . '">
+                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
+                                                <span id="card-item-field-title-' . $field['id'].'"><b>'.$field['title'].'</b></span>
+                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'].'">
                                                     <i class="fa-solid fa-copy"></i>
                                                 </button>
-                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
+                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
                                             </li>';
                                         }
                                         echo '

sources/tools.queries.php

Spacing +20 added lines, -20 removed lines

@@ -70,7 +70,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === 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;
 }
 
@@ -335,7 +335,7 @@ 
         // Get PT_USER info
         $userInfo = DB::queryFirstRow(
             'SELECT pw, public_key, private_key, login, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             TP_USER_ID
         );
@@ -372,8 +372,8 @@ 
         // Get one itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT ski.share_key, ski.increment_id AS increment_id, l.id_user
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
+            FROM ' . prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
             WHERE ski.user_id = %i
             ORDER BY RAND()
             LIMIT 1',
@@ -392,7 +392,7 @@ 
                 echo  prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'No issue found, normal process should work. This process is now finished. (item id : ' . $currentUserKey['increment_id'] . ')',
+                        'message' => 'No issue found, normal process should work. This process is now finished. (item id : '.$currentUserKey['increment_id'].')',
                     ),
                     'encode'
                 );
@@ -452,7 +452,7 @@ 
         // Get user info
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $userId
         );
@@ -475,8 +475,8 @@ 
         // Get one itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT ski.share_key, ski.increment_id AS increment_id, l.id_user
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
+            FROM ' . prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
             WHERE ski.user_id = %i
             ORDER BY RAND()
             LIMIT 1',
@@ -514,8 +514,8 @@ 
                 // Get number of users to treat
                 DB::query(
                     'SELECT i.id 
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS si ON i.id = si.object_id
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('sharekeys_items').' AS si ON i.id = si.object_id
                     WHERE i.perso = %i AND si.user_id = %i;',
                     0,
                     $userId
@@ -597,11 +597,11 @@ 
             // Loop on items
             $rows = DB::query(
                 'SELECT si.object_id AS object_id, si.share_key AS share_key, i.pw AS pw, si.increment_id as increment_id
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id)
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id)
                 WHERE si.user_id = %i
                 ORDER BY si.increment_id ASC
-                LIMIT ' . $startIndex . ', ' . $limit,
+                LIMIT ' . $startIndex.', '.$limit,
                 $userId
             );        
             
@@ -625,7 +625,7 @@ 
                     // It will be updated if already exists
                     $currentTPUserKey = DB::queryFirstRow(
                         'SELECT increment_id, user_id, share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['object_id'],
                         TP_USER_ID
@@ -661,7 +661,7 @@ 
             DB::commit();
         } catch (Exception $e) {
             DB::rollback();
-            error_log("Teampass - Error: Keys treatment: " . $e->getMessage());
+            error_log("Teampass - Error: Keys treatment: ".$e->getMessage());
         }
 
         $nextIndex = (int) $startIndex + (int) $limit;
@@ -717,7 +717,7 @@ 
             // Get PT_USER info
             DB::queryFirstRow(
                 'SELECT operation_code
-                FROM ' . prefixTable('sharekeys_backup') . '
+                FROM ' . prefixTable('sharekeys_backup').'
                 WHERE operation_code = %s',
                 $operationCode
             );
@@ -727,7 +727,7 @@ 
                 // using increment_id_value in order to update the correct record
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('sharekeys_backup') . '
+                    FROM ' . prefixTable('sharekeys_backup').'
                     WHERE operation_code = %s',
                     $operationCode
                 );
@@ -746,7 +746,7 @@ 
 
                 // Delete all sharekeys for this operation
                 DB::query(
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
                     WHERE operation_code = %i',
                     $operationCode
                 );
@@ -809,7 +809,7 @@ 
             // Get operation info
             DB::query(
                 'SELECT operation_code
-                FROM ' . prefixTable('sharekeys_backup') . '
+                FROM ' . prefixTable('sharekeys_backup').'
                 WHERE operation_code = %s',
                 $operationCode
             );
@@ -818,7 +818,7 @@ 
             if ($nbKeys > 0) {
                 // Delete all sharekeys for this operation
                 DB::query(
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
                     WHERE operation_code = %s',
                     $operationCode
                 );