nilsteampassnet / TeamPass

index.php

Braces +6 added lines, -2 removed lines

@@ -81,8 +81,9 @@ 
 $session = SessionManager::getSession();
 
 // Random encryption key
-if ($session->get('key') === null)
+if ($session->get('key') === null) {
     $session->set('key', generateQuickPassword(30, false));
+}
 
 $request = SymfonyRequest::createFromGlobals();
 $configManager = new ConfigManager(__DIR__, $request->getRequestUri());
@@ -943,7 +944,10 @@ 
                                     <input type="password" class="form-control" id="dialog-ldap-user-build-keys-database-code">
                                     <br/>
                                 </div>
-                                <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') echo ' hidden'; ?>">
+                                <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') {
+    echo ' hidden';
+}
+?>">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><?php echo $lang->get('provide_your_current_password'); ?></span>
                                     </div>

Spacing +181 added lines, -181 removed lines

@@ -72,7 +72,7 @@ 
 csrfProtector::init();
 
 // Load functions
-require_once __DIR__. '/includes/config/include.php';
+require_once __DIR__.'/includes/config/include.php';
 require_once __DIR__.'/sources/main.functions.php';
 
 // init
@@ -106,7 +106,7 @@ 
 $SETTINGS = $antiXss->xss_clean($SETTINGS);
 
 // Load Core library
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
 // Prepare POST variables
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 $session_user_language = $session->get('user-language');
@@ -160,7 +160,7 @@ 
 if ($hasSuperPrivilege > 0) {
     if (defined('MYSQL_LOG') && MYSQL_LOG === true) {
         DB::query("SET GLOBAL general_log = 'ON'");
-        DB::query("SET GLOBAL general_log_file = " . (defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'"));
+        DB::query("SET GLOBAL general_log_file = ".(defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'"));
     } else {
         DB::query("SET GLOBAL general_log = 'OFF'");
     }
@@ -171,8 +171,8 @@ 
     //get default language
     $dataLanguage = DB::queryFirstRow(
         'SELECT m.valeur AS valeur, l.flag AS flag
-        FROM ' . prefixTable('misc') . ' AS m
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
+        FROM ' . prefixTable('misc').' AS m
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
         WHERE m.type=%s_type AND m.intitule=%s_intitule',
         [
             'type' => 'admin',
@@ -203,7 +203,7 @@ 
         $session_user_language = $SETTINGS['default_language'];
     }
 }
-$lang = new Language($session_user_language, __DIR__. '/includes/language/'); 
+$lang = new Language($session_user_language, __DIR__.'/includes/language/'); 
 
 if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') {
     $SETTINGS['cpassman_dir'] = __DIR__;
@@ -277,29 +277,29 @@ 
     </script>
 
     <!-- IonIcons -->
-    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Theme style -->
-    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
+    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
     <!-- Theme style -->
-    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Google Font: Source Sans Pro -->
-    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Altertify -->
-    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
+    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
     <!-- Toastr -->
-    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
+    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
     <!-- favicon -->
-    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon;?>"/>
+    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/>
     <!-- manifest (PWA) -->
-    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Custom style -->
     <?php
-    if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?>
-        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?>
+        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <?php
     } ?>
 </head>
@@ -346,7 +346,7 @@ 
                         <div class="dropdown show">
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
                                 <?php
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right">
@@ -370,7 +370,7 @@ 
                                     </a>
                                 <?php
                                     } ?>
-                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys">
+                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys">
                                     <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?>
                                 </a>
 
@@ -404,7 +404,7 @@ 
             <!-- Main Sidebar Container -->
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
                 <!-- Brand Logo -->
-                <a href="<?php echo $cpassman_url . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
+                <a href="<?php echo $cpassman_url.'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
                 </a>
@@ -422,7 +422,7 @@ 
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-key"></i>
                         <p>
-                            ' . $lang->get('pw') . '
+                            ' . $lang->get('pw').'
                         </p>
                         </a>
                     </li>';
@@ -435,7 +435,7 @@ 
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-file-import"></i>
                         <p>
-                            ' . $lang->get('import') . '
+                            ' . $lang->get('import').'
                         </p>
                         </a>
                     </li>';
@@ -456,7 +456,7 @@ 
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-file-export"></i>
                         <p>
-                            ' . $lang->get('export') . '
+                            ' . $lang->get('export').'
                         </p>
                         </a>
                     </li>';
@@ -483,7 +483,7 @@ 
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-search"></i>
                         <p>
-                            ' . $lang->get('find') . '
+                            ' . $lang->get('find').'
                         </p>
                         </a>
                     </li>';
@@ -499,7 +499,7 @@ 
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'favourites' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-star"></i>
                         <p>
-                            ' . $lang->get('favorites') . '
+                            ' . $lang->get('favorites').'
                         </p>
                         </a>
                     </li>';
@@ -529,7 +529,7 @@ 
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-lightbulb"></i>
                         <p>
-                            ' . $lang->get('suggestion_menu') . '
+                            ' . $lang->get('suggestion_menu').'
                         </p>
                         </a>
                     </li>';
@@ -542,7 +542,7 @@ 
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-info"></i>
                         <p>
-                            ' . $lang->get('admin_main') . '
+                            ' . $lang->get('admin_main').'
                         </p>
                         </a>
                     </li>
@@ -550,7 +550,7 @@ 
                         <a href="#" class="nav-link">
                             <i class="nav-icon fa-solid fa-wrench"></i>
                             <p>
-                                ' . $lang->get('admin_settings') . '
+                                ' . $lang->get('admin_settings').'
                                 <i class="fa-solid fa-angle-left right"></i>
                             </p>
                         </a>
@@ -558,63 +558,63 @@ 
                             <li class="nav-item">
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
                                     <i class="fa-solid fa-check-double nav-icon"></i>
-                                    <p>' . $lang->get('options') . '</p>
+                                    <p>' . $lang->get('options').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
                                     <i class="fa-solid fa-qrcode nav-icon"></i>
-                                    <p>' . $lang->get('mfa_short') . '</p>
+                                    <p>' . $lang->get('mfa_short').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
                                     <i class="fa-solid fa-cubes nav-icon"></i>
-                                    <p>' . $lang->get('api') . '</p>
+                                    <p>' . $lang->get('api').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
                                     <i class="fa-solid fa-database nav-icon"></i>
-                                    <p>' . $lang->get('backups') . '</p>
+                                    <p>' . $lang->get('backups').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
                                     <i class="fa-solid fa-envelope nav-icon"></i>
-                                    <p>' . $lang->get('emails') . '</p>
+                                    <p>' . $lang->get('emails').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
                                     <i class="fa-solid fa-keyboard nav-icon"></i>
-                                    <p>' . $lang->get('fields') . '</p>
+                                    <p>' . $lang->get('fields').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
                                     <i class="fa-solid fa-id-card nav-icon"></i>
-                                    <p>' . $lang->get('ldap') . '</p>
+                                    <p>' . $lang->get('ldap').'</p>
                                 </a>
                             </li>
 
                             <li class="nav-item">
                                 <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '">
                                     <i class="fa-solid fa-plug nav-icon"></i>
-                                    <p>' . $lang->get('oauth') . '</p>
+                                    <p>' . $lang->get('oauth').'</p>
                                 </a>
                             </li>
                             
                             <li class="nav-item">
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
                                     <i class="fa-solid fa-file-upload nav-icon"></i>
-                                    <p>' . $lang->get('uploads') . '</p>
+                                    <p>' . $lang->get('uploads').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
                                     <i class="fa-solid fa-chart-bar nav-icon"></i>
-                                    <p>' . $lang->get('statistics') . '</p>
+                                    <p>' . $lang->get('statistics').'</p>
                                 </a>
                             </li>
                         </ul>
@@ -625,7 +625,7 @@ 
                     <li class="nav-item">
                         <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '">
                         <i class="fa-solid fa-tasks nav-icon"></i>
-                        <p>' . $lang->get('tasks') . '</p>
+                        <p>' . $lang->get('tasks').'</p>
                         </a>
                     </li>';
         }
@@ -636,7 +636,7 @@ 
                         <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-person-drowning"></i>
                         <p>
-                            ' . $lang->get('tools') . '
+                            ' . $lang->get('tools').'
                         </p>
                         </a>
                     </li>';
@@ -646,7 +646,7 @@ 
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-file-import"></i>
                         <p>
-                            ' . $lang->get('import') . '
+                            ' . $lang->get('import').'
                         </p>
                         </a>
                     </li>';
@@ -662,7 +662,7 @@ 
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-folder-open"></i>
                         <p>
-                            ' . $lang->get('folders') . '
+                            ' . $lang->get('folders').'
                         </p>
                         </a>
                     </li>
@@ -670,7 +670,7 @@ 
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-graduation-cap"></i>
                         <p>
-                            ' . $lang->get('roles') . '
+                            ' . $lang->get('roles').'
                         </p>
                         </a>
                     </li>
@@ -678,38 +678,38 @@ 
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-users"></i>
                         <p>
-                            ' . $lang->get('users') . '
+                            ' . $lang->get('users').'
                         </p>
                         </a>
                     </li>
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
                         <a href="#" class="nav-link">
                         <i class="nav-icon fa-solid fa-cubes"></i>
-                        <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p>
+                        <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p>
                         </a>
                         <ul class="nav nav-treeview">
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
                                 <i class="far fa-calendar-alt nav-icon"></i>
-                                <p>' . $lang->get('renewal') . '</p>
+                                <p>' . $lang->get('renewal').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
                                 <i class="fa-solid fa-trash-alt nav-icon"></i>
-                                <p>' . $lang->get('deletion') . '</p>
+                                <p>' . $lang->get('deletion').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
                                 <i class="fa-solid fa-history nav-icon"></i>
-                                <p>' . $lang->get('logs') . '</p>
+                                <p>' . $lang->get('logs').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
                                 <i class="fa-solid fa-database nav-icon"></i>
-                                <p>' . $lang->get('database') . '</p>
+                                <p>' . $lang->get('database').'</p>
                                 </a>
                             </li>
                         </ul>
@@ -720,10 +720,10 @@ 
                     <!-- /.sidebar-menu -->
                 <div class="menu-footer">
                     <div class="" id="sidebar-footer">
-                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time') . ' ' .
-                            date($date_format, (int) $server['request_time']) . ' - ' .
+                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time').' '.
+                            date($date_format, (int) $server['request_time']).' - '.
                             date($time_format, (int) $server['request_time']), ENT_QUOTES, 'UTF-8'); ?>"></i>
-                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i>
+                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i>
                         <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo $lang->get('documentation_canal'); ?>"></i></a>
                         <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo $lang->get('admin_help'); ?>"></i></a>
                         <?php if ($session_user_admin === 1) : ?><i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo $lang->get('bugs_page'); ?>" onclick="generateBugReport()"></i><?php endif; ?>
@@ -874,7 +874,7 @@ 
                                 </div>
                                 <div class="mt-3">                                    
                                     <label>
-                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password');?></span>
+                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password'); ?></span>
                                         <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer">
                                     </label>
                                 </div>
@@ -1041,34 +1041,34 @@ 
                     if ($get['page'] === 'items') {
                         // SHow page with Items
                         if ((int) $session_user_admin !== 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
                         } elseif ((int) $session_user_admin === 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
                         } else {
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
                         // Define if user is allowed to see management pages
                         if ($session_user_admin === 1) {
                             // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]);
+                            include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]);
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
                             if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings'
                             ) {
                                 $session->set('system-error_code', ERR_NOT_ALLOWED);
                                 //not allowed page
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
+                                include $SETTINGS['cpassman_dir'].'/error.php';
                             }
                         } else {
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
-                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) {
+                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) {
                         // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php');
+                        include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php');
                     } else {
                         $session->set('system-array_roles', ERR_NOT_EXIST);
                         //page doesn't exist
@@ -1097,7 +1097,7 @@ 
             <footer class="main-footer">
                 <!-- To the right -->
                 <div class="float-right d-none d-sm-inline">
-                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>
+                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>
                 </div>
                 <!-- Default to the left -->
                 <strong>Copyright &copy; <?php echo TP_COPYRIGHT; ?> <a href="<?php echo TEAMPASS_URL; ?>"><?php echo TP_TOOL_NAME; ?></a>.</strong> All rights reserved.
@@ -1111,7 +1111,7 @@ 
         echo '
 <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />';
 // display an item in the context of OTV link
-} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
+} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
     && empty($get['otv']) === false
 ) {
     // case where one-shot viewer
@@ -1130,7 +1130,7 @@ 
                 FILTER_SANITIZE_URL
             )
         );
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
     }
 } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) ||
         empty($session->get('user-id')) === true
@@ -1155,7 +1155,7 @@ 
     }
     
     // LOGIN form  
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
     
 } else {
     // Clear session
@@ -1188,153 +1188,153 @@ 
     <!-- REQUIRED SCRIPTS -->
 
     <!-- Font Awesome Icons -->
-    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
+    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
     <!-- jQuery -->
-    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
     <!-- jQuery UI -->
-    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Popper -->
-    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- Bootstrap -->
-    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- AdminLTE -->
-    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- Altertify -->
     <!--<script type="text/javascript" src="plugins/alertifyjs/alertify.min.js"></script>-->
     <!-- Toastr -->
-    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- STORE.JS -->
-    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- cryptojs-aesphp -->
-    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- pace -->
-    <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- select2 -->
-    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- simplePassMeter -->
-    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- platform -->
-    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- radiobuttons -->
-    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- ICHECK -->
     <!--<link rel="stylesheet" href="./plugins/icheck-material/icheck-material.min.css">-->
-    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- bootstrap-add-clear -->
-    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- DOMPurify -->
-    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
 
     <?php
     $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS);
     if ($menuAdmin === true) {
         ?>
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
         <!-- InputMask -->
-        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <!-- Sortable -->
         <!--<script src="./plugins/sortable/jquery.sortable.js"></script>-->
         <!-- PLUPLOAD -->
-        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <!-- DataTables -->
-        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <?php
     } elseif (isset($get['page']) === true) {
         if (in_array($get['page'], ['items', 'import']) === true) {
             ?>
-            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
             <!-- countdownTimer -->
-            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- SUMMERNOTE -->
-            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- date-picker -->
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- time-picker -->
-            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PLUPLOAD -->
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- VALIDATE -->
-            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PWSTRENGHT -->
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- TOGGLE -->
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
         <?php
         } elseif (in_array($get['page'], ['search', 'folders', 'users', 'roles', 'utilities.deletion', 'utilities.logs', 'utilities.database', 'utilities.renewal', 'tasks']) === true) {
             ?>
             <!-- DataTables -->
-            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- dater picker -->
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- daterange picker -->
-            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- SlimScroll -->
-            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- FastClick -->
-            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <?php
         } elseif ($get['page'] === 'profile') {
             ?>
             <!-- FILESAVER -->
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PLUPLOAD -->
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <?php
         } elseif ($get['page'] === 'export') {
             ?>
             <!-- FILESAVER -->
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PWSTRENGHT -->
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <?php
         }
     }
     ?>
     <!-- functions -->
-    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <input type="hidden" id="encryptClientServerStatus" value="<?php echo $SETTINGS['encryptClientServer'] ?? 1; ?>" />
 
     </body>
@@ -1376,7 +1376,7 @@ 
     };
 </script>
 
-<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
 
 <script>
     $(document).ready(function() {
@@ -1435,65 +1435,65 @@ 
 
 // Load links, css and javascripts
 if (isset($SETTINGS['cpassman_dir']) === true) {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
     if ($menuAdmin === true) {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
         if ($get['page'] === '2fa') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
         } elseif ($get['page'] === 'api') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
         } elseif ($get['page'] === 'backups') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
         } elseif ($get['page'] === 'emails') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
         } elseif ($get['page'] === 'ldap') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
         } elseif ($get['page'] === 'uploads') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
         } elseif ($get['page'] === 'fields') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
         } elseif ($get['page'] === 'options') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
         } elseif ($get['page'] === 'statistics') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
         } elseif ($get['page'] === 'tasks') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php';
         } elseif ($get['page'] === 'oauth' && WIP === true) {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php';        
+            include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php';        
         } elseif ($get['page'] === 'tools') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php';
         }
     } elseif (isset($get['page']) === true && $get['page'] !== '') {
         if ($get['page'] === 'items') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
         } elseif ($get['page'] === 'import') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
         } elseif ($get['page'] === 'export') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
         } elseif ($get['page'] === 'offline') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
         } elseif ($get['page'] === 'search') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
         } elseif ($get['page'] === 'profile') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
         } elseif ($get['page'] === 'favourites') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
         } elseif ($get['page'] === 'folders') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
         } elseif ($get['page'] === 'users') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
         } elseif ($get['page'] === 'roles') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
         } elseif ($get['page'] === 'utilities.deletion') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
         } elseif ($get['page'] === 'utilities.logs') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
         } elseif ($get['page'] === 'utilities.database') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
         } elseif ($get['page'] === 'utilities.renewal') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
         }
     } else {
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
     }
 }

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

includes/core/login.oauth2.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,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

sources/tree.php

Spacing +19 added lines, -19 removed lines

@@ -64,7 +64,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;
 }
 
@@ -125,7 +125,7 @@ 
 );
 
 $lastFolderChange = DB::queryfirstrow(
-    'SELECT valeur FROM ' . prefixTable('misc') . '
+    'SELECT valeur FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -346,7 +346,7 @@ 
         $nbItemsInSubfolders = (int) $node->nb_items_in_subfolders;
         $nbItemsInFolder = (int) $node->nb_items_in_folder;
         $nbSubfolders = (int) $node->nb_subfolders;
-        break;  // Get out as soon as we find a valid node.
+        break; // Get out as soon as we find a valid node.
     }
     
     if ($displayThisNode === true) {
@@ -458,7 +458,7 @@ 
         foreach ($currentNode->children as $child) {
             recursiveTree(
                 (int) $child,
-                $tree->getNode($child),// get node info for this child
+                $tree->getNode($child), // get node info for this child
                 /** @scrutinizer ignore-type */ $tree,
                 $listFoldersLimitedKeys,
                 $listRestrictedFoldersForItemsKeys,
@@ -505,7 +505,7 @@ 
     $lang = new Language($session->get('user-language') ?? 'english');
 
     // prepare json return for current node
-    $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id;
+    $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id;
 
     // handle displaying
     if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) {
@@ -522,17 +522,17 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
                 'li_attr' => array(
                     'class' => 'jstreeopen',
-                    'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'],
+                    'title' => 'ID ['.$nodeId.'] '.$nodeData['title'],
                 ),
                 'a_attr' => array(
-                    'id' => 'fld_' . $nodeId,
+                    'id' => 'fld_'.$nodeId,
                     'class' => $nodeData['folderClass'],
-                    'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)',
+                    'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)',
                     'data-title' => htmlspecialchars($currentNode->title),
                 ),
                 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0,
@@ -548,12 +548,12 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
                 'li_attr' => array(
                     'class' => '',
-                    'title' => 'ID [' . $nodeId . '] ' . $lang->get('no_access'),
+                    'title' => 'ID ['.$nodeId.'] '.$lang->get('no_access'),
                 ),
             )
         );
@@ -613,7 +613,7 @@ 
         if (in_array($nodeId, $session_read_only_folders) === true) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 1,
                 'folderClass' => 'folder_not_droppable',
@@ -628,7 +628,7 @@ 
         ) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 0,
                 'folderClass' => 'folder',
@@ -639,7 +639,7 @@ 
         }
         
         return [
-            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
             'title' => '',
             'restricted' => 0,
             'folderClass' => 'folder',
@@ -650,8 +650,8 @@ 
 
     } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) {
         return [
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
-                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''),
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
+                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''),
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -662,8 +662,8 @@ 
 
     } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
         return [
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -773,7 +773,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryfirstrow(
         'SELECT data
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $userId
     );

sources/main.queries.php

Indentation +1 added lines, -1 removed lines

@@ -830,7 +830,7 @@
                 'encode'
             );
 
-         /*
+            /*
          * Generate BUG report
          */
         case 'generate_bug_report'://action_system

Spacing +105 added lines, -105 removed lines

@@ -81,7 +81,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;
 }
 
@@ -269,7 +269,7 @@ 
 
             // Get current user hash
             $userHash = DB::queryFirstRow(
-                "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                 $session->get('user-id')
             )['pw'];
 
@@ -325,7 +325,7 @@ 
  * @param string $post_key
  * @return string
  */
-function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string
+function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string
 {
     $session = SessionManager::getSession();
 
@@ -360,7 +360,7 @@ 
     if (isset($dataReceived['user_id'])) {
         // Get info about user to modify
         $targetUserInfos = DB::queryfirstrow(
-            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
             WHERE id = %i',
             $dataReceived['user_id']
         );
@@ -509,7 +509,7 @@ 
         case 'mail_me'://action_mail
             // Get info about user to send email
             $data_user = DB::queryfirstrow(
-                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE email = %s',
                 filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS)
             );
@@ -622,7 +622,7 @@ 
     if (isset($dataReceived['user_id'])) {
         // Get info about user to modify
         $targetUserInfos = DB::queryfirstrow(
-            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
             WHERE id = %i',
             $dataReceived['user_id']
         );
@@ -701,7 +701,7 @@ 
 
             // Get current user hash
             $userHash = DB::queryFirstRow(
-                "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                 $session->get('user-id')
             )['pw'];
 
@@ -739,7 +739,7 @@ 
 
                 // Get current user hash
                 $userHash = DB::queryFirstRow(
-                    "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+                    "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
                     $session->get('user-id')
                 )['pw'];
 
@@ -783,7 +783,7 @@ 
 
                 // Get current user hash
                 $userHash = DB::queryFirstRow(
-                    "SELECT pw FROM " . prefixtable('users') . " WHERE id = %i;",
+                    "SELECT pw FROM ".prefixtable('users')." WHERE id = %i;",
                     $session->get('user-id')
                 )['pw'];
 
@@ -827,7 +827,7 @@ 
  * @param array $SETTINGS
  * @return string
  */
-function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     $session = SessionManager::getSession();
     switch ($post_type) {
@@ -928,7 +928,7 @@ 
                 )
             );
 
-            return '[{"token" : "' . $token . '"}]';
+            return '[{"token" : "'.$token.'"}]';
 
         /*
         * Default case
@@ -944,7 +944,7 @@ 
 }
 
 
-function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
+function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
 {
     switch ($post_type) {
         /*
@@ -1013,7 +1013,7 @@ 
         array(
             'error' => false,
             'timestamp' => $session->get('user-session_duration'),
-            'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60),
+            'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60),
             'max_session_duration' => $maximum_session_expiration_time,
         ),
         'encode'
@@ -1065,7 +1065,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -1120,7 +1120,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
+            FROM ' . prefixTable('users').' WHERE id = %i',
             $post_user_id
         );
 
@@ -1141,8 +1141,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -1155,8 +1155,8 @@ 
             return prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' .
-                        $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'.
+                        $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -1260,14 +1260,14 @@ 
         // Get data about user
         $dataUser = DB::queryfirstrow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $dataUser = DB::queryfirstrow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -1321,7 +1321,7 @@ 
     // Check if token already used
     $dataToken = DB::queryfirstrow(
         'SELECT end_timestamp, reason
-        FROM ' . prefixTable('tokens') . '
+        FROM ' . prefixTable('tokens').'
         WHERE token = %s AND user_id = %i',
         $post_token,
         $dataUser['id']
@@ -1332,11 +1332,11 @@ 
         return prepareExchangedData(
             array(
                 'error' => true,
-                'message' => 'TOKEN already used',//$lang->get('no_email_set'),
+                'message' => 'TOKEN already used', //$lang->get('no_email_set'),
             ),
             'encode'
         );
-    } elseif(DB::count() === 0) {
+    } elseif (DB::count() === 0) {
         // Store token for this action
         DB::insert(
             prefixTable('tokens'),
@@ -1398,7 +1398,7 @@ 
                 'email' => $dataUser['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
+                    '<b>'.obfuscateEmail($dataUser['email']).'</b>',
                     addslashes($lang->get('admin_email_result_ok'))
                 ),
             ),
@@ -1414,7 +1414,7 @@ 
             'email' => $dataUser['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
+                '<b>'.obfuscateEmail($dataUser['email']).'</b>',
                 addslashes($lang->get('admin_email_result_ok'))
             ),
         ),
@@ -1431,7 +1431,7 @@ 
 
     if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -1439,7 +1439,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
@@ -1491,8 +1491,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -1524,7 +1524,7 @@ 
     if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true
         && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1559,13 +1559,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1652,7 +1652,7 @@ 
             $url_found = $value;
             if (empty($url_found) === false) {
                 $tmp = parse_url($url_found);
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : '');
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : '');
                 $value = $anonym_url;
             } else {
                 $value = '';
@@ -1682,7 +1682,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1690,9 +1690,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1701,7 +1701,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $data['current_page'] . '
+' . $data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1716,39 +1716,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . '
+**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.'
 
 **Teampass configuration variables:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . '
+**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].'
 
-**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits
+**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1788,7 +1788,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw, auth_type
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1797,9 +1797,9 @@ 
             // Get one item
             $currentUserKey = DB::queryFirstRow(
                 'SELECT object_id, share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON  (i.id = si.object_id)
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON  (i.id_tree = nt.id)
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON  (i.id = si.object_id)
+                INNER JOIN ' . prefixTable('nested_tree').' AS nt ON  (i.id_tree = nt.id)
                 WHERE user_id = %i AND nt.personal_folder = %i',
                 $post_user_id,
                 0
@@ -1893,7 +1893,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1974,7 +1974,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2072,7 +2072,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2138,7 +2138,7 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2208,7 +2208,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2356,15 +2356,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        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, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $session->get('user-id')
@@ -2396,7 +2396,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-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
@@ -2429,7 +2429,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2454,15 +2454,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'],
             $session->get('user-id')
@@ -2494,7 +2494,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-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
@@ -2516,7 +2516,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"'
     );
 
@@ -2541,15 +2541,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'],
             $session->get('user-id')
@@ -2581,7 +2581,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-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
@@ -2603,7 +2603,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2628,14 +2628,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'],
             $session->get('user-id')
@@ -2667,7 +2667,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-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
@@ -2713,15 +2713,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE 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
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $session->get('user-id')
@@ -2753,7 +2753,7 @@ 
             if ((int) $post_user_id !== (int) $session->get('user-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
@@ -2775,8 +2775,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2809,9 +2809,9 @@ 
     if (count($session->get('user-personal_folders')) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $session->get('user-personal_folders'),
             "defuse"
         );
@@ -2819,7 +2819,7 @@ 
             // 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'],
                 $session->get('user-id')
@@ -2846,7 +2846,7 @@ 
                 if ((int) $post_user_id !== (int) $session->get('user-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
@@ -2869,7 +2869,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2897,7 +2897,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2923,7 +2923,7 @@ 
                 if ($post_counterItemsToTreat === -1) {
                     DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
                         $session->get('user-personal_folders'),
                         'teampass_aes'
@@ -2936,7 +2936,7 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s
                     LIMIT ' . $post_length,
                     $session->get('user-personal_folders'),
@@ -2980,7 +2980,7 @@ 
                     // Loop on files
                     $rows = DB::query(
                         'SELECT id, file
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE status != %s
                         AND id_item = %i',
                         TP_ENCRYPTION_NAME,
@@ -2991,13 +2991,13 @@ 
                         // Now decrypt the file
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                             $post_user_psk
                         );
 
                         // Encrypt the file
-                        $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                        $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                         DB::update(
                             prefixTable('files'),
@@ -3020,7 +3020,7 @@ 
                         );
 
                         // Unlink original file
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                     }
                 }
 
@@ -3028,7 +3028,7 @@ 
                 $next_start = (int) $post_start + (int) $post_length;
                 DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
                     $session->get('user-personal_folders'),
                     'teampass_aes'
@@ -3098,7 +3098,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, keys_recovery_time
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3145,7 +3145,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3195,7 +3195,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => $lang->get('done'),'',
+                        'message' => $lang->get('done'), '',
                     ),
                     'encode'
                 );
@@ -3243,7 +3243,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key, special
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -3277,7 +3277,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => $lang->get('done'),'',
+                        'message' => $lang->get('done'), '',
                     ),
                     'encode'
                 );
@@ -3299,8 +3299,8 @@ 
             // Get one itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT ski.share_key, ski.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',
@@ -3390,7 +3390,7 @@ 
             $session->get('user-id')
         );
         // Return data
-        return '[{"new_value":"' . $session->get('user-session_duration') . '"}]';
+        return '[{"new_value":"'.$session->get('user-session_duration').'"}]';
     }
     
     return '[{"new_value":"expired"}]';

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>

pages/options.php

Spacing +6 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('options') === 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;
 }
 
@@ -322,7 +322,7 @@ 
                                     // get list of all timezones
                                     foreach ($zones as $key => $zone) {
                                         echo '
-                                <option value="' . $key . '"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>' . $zone . '</option>';
+                                <option value="' . $key.'"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>'.$zone.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -373,7 +373,7 @@ 
                                     <?php
                                     foreach ($languagesList as $teampassLang) {
                                         echo '
-                                <option value="' . $teampassLang . '"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>' . $teampassLang . '</option>';
+                                <option value="' . $teampassLang.'"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>'.$teampassLang.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -470,7 +470,7 @@ 
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $complex) {
                                     echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -802,7 +802,7 @@ 
                                         $roles = getRolesTitles();
                                         foreach ($roles as $role) {
                                             echo '
-                                    <option value="' . htmlspecialchars($role['id']) . '"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>' . htmlspecialchars(addslashes($role['title'])) . '</option>';
+                                    <option value="' . htmlspecialchars($role['id']).'"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>'.htmlspecialchars(addslashes($role['title'])).'</option>';
                                         }
                                     }
                                     ?>
@@ -1029,7 +1029,7 @@ 
                                     <?php
                                     foreach (TP_PW_COMPLEXITY as $complex) {
                                         echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                     }
                                     ?>
                                 </select>

sources/backups.queries.php

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,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;
 }
 
@@ -138,21 +138,21 @@ 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             $return = '';
 
             //Get all tables
             $tables = array();
             $result = DB::query('SHOW TABLES');
             foreach ($result as $row) {
-                $tables[] = $row['Tables_in_' . DB_NAME];
+                $tables[] = $row['Tables_in_'.DB_NAME];
             }
 
             //cycle through
             foreach ($tables as $table) {
                 if (empty($pre) || substr_count($table, $pre) > 0) {
                     // Do query
-                    $result = DB::queryRaw('SELECT * FROM ' . $table);
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
                     DB::queryRaw(
                         'SELECT *
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -164,17 +164,17 @@ 
                     $numFields = DB::count();
 
                     // prepare a drop table
-                    $return .= 'DROP TABLE ' . $table . ';';
-                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
-                    $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                    $return .= 'DROP TABLE '.$table.';';
+                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
+                    $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                     //prepare all fields and datas
                     for ($i = 0; $i < $numFields; ++$i) {
                         while ($row = $result->fetch_row()) {
-                            $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                            $return .= 'INSERT INTO '.$table.' VALUES(';
                             for ($j = 0; $j < $numFields; ++$j) {
                                 // Manage NULL values
-                                $value = $row[$j] === null ? 'NULL' : '"' . addslashes(preg_replace("/\n/", '\\n', $row[$j])) . '"';                    
+                                $value = $row[$j] === null ? 'NULL' : '"'.addslashes(preg_replace("/\n/", '\\n', $row[$j])).'"';                    
                                 $return .= $value;
                                 if ($j < ($numFields - 1)) {
                                     $return .= ',';
@@ -192,8 +192,8 @@ 
                 $token = GenerateCryptKey(20, false, true, true, false, true);
 
                 //save file
-                $filename = time() . '-' . $token . '.sql';
-                $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+                $filename = time().'-'.$token.'.sql';
+                $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
                 if ($handle !== false) {
                     //write file
                     fwrite($handle, $return);
@@ -205,16 +205,16 @@ 
                     // Encrypt the file
                     prepareFileWithDefuse(
                         'encrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                         $post_key
                     );
 
                     // Do clean
-                    unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                    unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                     rename(
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename
                     );
                 }
 
@@ -234,9 +234,9 @@ 
                     array(
                         'error' => false,
                         'message' => '',
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' .
-                            $session->get('user-key_tmp') . '&pathIsFiles=1',
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                            '&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.
+                            $session->get('user-key_tmp').'&pathIsFiles=1',
                     ),
                     'encode'
                 );
@@ -303,13 +303,13 @@ 
             
             if (WIP === true) error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
 
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             if (empty($post_clearFilename) === true) {
                 // Get filename from database
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE increment_id = %i',
                     $post_backupFile
                 );
@@ -329,8 +329,8 @@ 
                     
                     $ret = prepareFileWithDefuse(
                         'decrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
                         $post_key
                     );
                     
@@ -346,8 +346,8 @@ 
                     }
 
                     // Do clean
-                    fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
-                    $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
+                    fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
+                    $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
                 } else {
                     echo prepareExchangedData(
                         array(

Braces +3 added lines, -1 removed lines

@@ -301,7 +301,9 @@
                 break;
             }
             
-            if (WIP === true) error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
+            if (WIP === true) {
+                error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
+            }
 
             include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
 

sources/admin.queries.php

Spacing +124 added lines, -124 removed lines

@@ -72,7 +72,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;
 }
 
@@ -133,21 +133,21 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $return = '';
 
         //Get all tables
         $tables = array();
         $result = DB::query('SHOW TABLES');
         foreach ($result as $row) {
-            $tables[] = $row['Tables_in_' . $database];
+            $tables[] = $row['Tables_in_'.$database];
         }
 
         //cycle through
         foreach ($tables as $table) {
             if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) {
                 // Do query
-                $result = DB::queryRaw('SELECT * FROM ' . $table);
+                $result = DB::queryRaw('SELECT * FROM '.$table);
                 DB::queryRaw(
                     'SELECT *
                     FROM INFORMATION_SCHEMA.COLUMNS
@@ -159,19 +159,19 @@ 
                 $numFields = DB::count();
 
                 // prepare a drop table
-                $return .= 'DROP TABLE ' . $table . ';';
-                $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
-                $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                $return .= 'DROP TABLE '.$table.';';
+                $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
+                $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                 //prepare all fields and datas
                 for ($i = 0; $i < $numFields; ++$i) {
                     while ($row = $result->fetch_row()) {
-                        $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                        $return .= 'INSERT INTO '.$table.' VALUES(';
                         for ($j = 0; $j < $numFields; ++$j) {
                             $row[$j] = addslashes($row[$j]);
                             $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
                             if (isset($row[$j])) {
-                                $return .= '"' . $row[$j] . '"';
+                                $return .= '"'.$row[$j].'"';
                             } else {
                                 $return .= 'NULL';
                             }
@@ -191,8 +191,8 @@ 
             $token = GenerateCryptKey(20, false, true, true, false, true);
 
             //save file
-            $filename = time() . '-' . $token . '.sql';
-            $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+            $filename = time().'-'.$token.'.sql';
+            $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
             if ($handle !== false) {
                 //write file
                 fwrite($handle, $return);
@@ -204,16 +204,16 @@ 
                 // Encrypt the file
                 prepareFileWithDefuse(
                     'encrypt',
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                     $post_option
                 );
 
                 // Do clean
-                unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                 rename(
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename
                 );
             }
 
@@ -223,7 +223,7 @@ 
             //update LOG
             logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $session->get('user-id'), $session->get('user-login'));
 
-            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . $session->get('user-key_tmp') . '&pathIsFiles=1"}]';
+            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.$session->get('user-key_tmp').'&pathIsFiles=1"}]';
         }
         break;
 
@@ -252,7 +252,7 @@ 
             );
             break;
         }
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $dataPost = explode('&', $post_option);
         $file = htmlspecialchars($dataPost[0]);
@@ -261,7 +261,7 @@ 
         // Get filename from database
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE increment_id = %i',
             $file
         );
@@ -280,8 +280,8 @@ 
             // Decrypt the file
             $ret = prepareFileWithDefuse(
                 'decrypt',
-                $SETTINGS['path_to_files_folder'] . '/' . $file,
-                $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file,
+                $SETTINGS['path_to_files_folder'].'/'.$file,
+                $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file,
                 $key
             );
 
@@ -292,10 +292,10 @@ 
             }
 
             // Do clean
-            fileDelete($SETTINGS['path_to_files_folder'] . '/' . $file, $SETTINGS);
-            $file = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file;
+            fileDelete($SETTINGS['path_to_files_folder'].'/'.$file, $SETTINGS);
+            $file = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file;
         } else {
-            $file = $SETTINGS['path_to_files_folder'] . '/' . $file;
+            $file = $SETTINGS['path_to_files_folder'].'/'.$file;
         }
 
         //read sql file
@@ -312,7 +312,7 @@ 
         fclose($handle);
 
         //delete file
-        unlink($SETTINGS['path_to_files_folder'] . '/' . $file);
+        unlink($SETTINGS['path_to_files_folder'].'/'.$file);
 
         //Show done
         echo '[{"result":"db_restore" , "message":""}]';
@@ -350,8 +350,8 @@ 
             foreach ($table as $i => $tablename) {
                 if (substr_count($tablename, DB_PREFIX) > 0) {
                     // launch optimization quieries
-                    DB::query('ANALYZE TABLE `' . $tablename . '`');
-                    DB::query('OPTIMIZE TABLE `' . $tablename . '`');
+                    DB::query('ANALYZE TABLE `'.$tablename.'`');
+                    DB::query('OPTIMIZE TABLE `'.$tablename.'`');
                 }
             }
         }
@@ -359,12 +359,12 @@ 
         //Clean up LOG_ITEMS table
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             ORDER BY id ASC'
         );
         foreach ($rows as $item) {
             DB::query(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s',
                 $item['id'],
                 'at_creation'
             );
@@ -372,7 +372,7 @@ 
             if ($counter === 0) {
                 //Create new at_creation entry
                 $rowTmp = DB::queryFirstRow(
-                    'SELECT date, id_user FROM ' . prefixTable('log_items') . ' WHERE id_item=%i ORDER BY date ASC',
+                    'SELECT date, id_user FROM '.prefixTable('log_items').' WHERE id_item=%i ORDER BY date ASC',
                     $item['id']
                 );
                 DB::insert(
@@ -402,8 +402,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -439,7 +439,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', NULL);
 
         // Log
@@ -455,8 +455,8 @@ 
         echo prepareExchangedData(
             [
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success mr-2"></i>',
             ],
             'encode'
@@ -498,7 +498,7 @@ 
         $session->set('user-reencrypt_old_salt', file_get_contents(SECUREPATH.'/'.SECUREFILE));
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH.'/'.SECUREFILE . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time();
+        $old_sk_filename = SECUREPATH.'/'.SECUREFILE.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
             SECUREPATH.'/'.SECUREFILE,
             $old_sk_filename
@@ -527,13 +527,13 @@ 
         logEvents($SETTINGS, 'system', 'change_salt_key', (string) $session->get('user-id'), $session->get('user-login'));
 
         // get number of items to change
-        DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', 0);
+        DB::query('SELECT id FROM '.prefixTable('items').' WHERE perso = %i', 0);
         $nb_of_items = DB::count();
 
         // create backup table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
         DB::query(
-            'CREATE TABLE `' . prefixTable('sk_reencrypt_backup') . '` (
+            'CREATE TABLE `'.prefixTable('sk_reencrypt_backup').'` (
             `id` int(12) NOT null AUTO_INCREMENT,
             `current_table` varchar(100) NOT NULL,
             `current_field` varchar(500) NOT NULL,
@@ -561,7 +561,7 @@ 
         );
 
         // delete previous backup files
-        $files = glob($SETTINGS['path_to_upload_folder'] . '/*'); // get all file names
+        $files = glob($SETTINGS['path_to_upload_folder'].'/*'); // get all file names
         foreach ($files as $file) { // iterate files
             if (is_file($file)) {
                 $file_parts = pathinfo($file);
@@ -643,7 +643,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'Input `' . $objects[0] . '` is not allowed',
+                        'message' => 'Input `'.$objects[0].'` is not allowed',
                         'nbOfItems' => '',
                         'nextAction' => '',
                     ),
@@ -656,9 +656,9 @@ 
                 //change all encrypted data in Items (passwords)
                 $rows = DB::query(
                     'SELECT id, pw, pw_iv
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = %s
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     '0'
                 );
                 foreach ($rows as $record) {
@@ -670,7 +670,7 @@ 
                             'current_field' => 'pw',
                             'value_id' => $record['id'],
                             'value' => $record['pw'],
-                            'current_sql' => 'UPDATE ' . prefixTable('items') . " SET pw = '" . $record['pw'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('items')." SET pw = '".$record['pw']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -719,9 +719,9 @@ 
                 //change all encrypted data in Logs (passwords)
                 $rows = DB::query(
                     'SELECT raison, increment_id
-                    FROM ' . prefixTable('log_items') . "
+                    FROM ' . prefixTable('log_items')."
                     WHERE action = %s AND raison LIKE 'at_pw :%'
-                    LIMIT " . $post_start . ', ' . $post_length,
+                    LIMIT " . $post_start.', '.$post_length,
                     'at_modification'
                 );
                 foreach ($rows as $record) {
@@ -733,7 +733,7 @@ 
                             'current_field' => 'raison',
                             'value_id' => $record['increment_id'],
                             'value' => $record['raison'],
-                            'current_sql' => 'UPDATE ' . prefixTable('log_items') . " SET raison = '" . $record['raison'] . "' WHERE increment_id = '" . $record['increment_id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('log_items')." SET raison = '".$record['raison']."' WHERE increment_id = '".$record['increment_id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -761,7 +761,7 @@ 
                         DB::update(
                             prefixTable('log_items'),
                             array(
-                                'raison' => 'at_pw :' . $encrypt['string'],
+                                'raison' => 'at_pw :'.$encrypt['string'],
                                 'encryption_type' => 'defuse',
                             ),
                             'increment_id = %i',
@@ -786,8 +786,8 @@ 
                 //change all encrypted data in CATEGORIES (passwords)
                 $rows = DB::query(
                     'SELECT id, data
-                    FROM ' . prefixTable('categories_items') . '
-                    LIMIT ' . $post_start . ', ' . $post_length
+                    FROM ' . prefixTable('categories_items').'
+                    LIMIT ' . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -798,7 +798,7 @@ 
                             'current_field' => 'data',
                             'value_id' => $record['id'],
                             'value' => $record['data'],
-                            'current_sql' => 'UPDATE ' . prefixTable('categories_items') . " SET data = '" . $record['data'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('categories_items')." SET data = '".$record['data']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -846,9 +846,9 @@ 
                 // Change all encrypted data in FILES (passwords)
                 $rows = DB::query(
                     'SELECT id, file, status
-                    FROM ' . prefixTable('files') . "
+                    FROM ' . prefixTable('files')."
                     WHERE status = 'encrypted'
-                    LIMIT " . $post_start . ', ' . $post_length
+                    LIMIT " . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -866,20 +866,20 @@ 
                     );
                     $newID = DB::insertId();
 
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                         // make a copy of file
                         if (!copy(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '.copy'
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'.copy'
                         )) {
                             $error = 'Copy not possible';
                             exit;
                         } else {
                             // prepare a bck of file (that will not be deleted)
-                            $backup_filename = $record['file'] . '.bck-change-sk.' . time();
+                            $backup_filename = $record['file'].'.bck-change-sk.'.time();
                             copy(
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $backup_filename
+                                $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$backup_filename
                             );
                         }
 
@@ -887,22 +887,22 @@ 
                         // STEP1 - Do decryption
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted'
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted'
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file']);
 
                         // STEP2 - Do encryption
                         prepareFileWithDefuse(
                             'encryp',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file']
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file']
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted');
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted');
 
                         // Update backup table
                         DB::update(
@@ -928,13 +928,13 @@ 
                 // do some things for new object
                 if (isset($objects[0])) {
                     if ($objects[0] === 'logs') {
-                        DB::query('SELECT increment_id FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT increment_id FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     } elseif ($objects[0] === 'files') {
-                        DB::query('SELECT id FROM ' . prefixTable('files'));
+                        DB::query('SELECT id FROM '.prefixTable('files'));
                     } elseif ($objects[0] === 'categories') {
-                        DB::query('SELECT id FROM ' . prefixTable('categories_items'));
+                        DB::query('SELECT id FROM '.prefixTable('categories_items'));
                     } elseif ($objects[0] === 'custfields') {
-                        DB::query('SELECT raison FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT raison FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     }
                     $nb_of_items = DB::count();
                 } else {
@@ -1054,12 +1054,12 @@ 
                 );
             } elseif ($record['current_table'] === 'files') {
                 // restore backup file
-                if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value'])) {
-                    unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value']);
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
+                if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value'])) {
+                    unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value']);
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
                         rename(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value2'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value']
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value2'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value']
                         );
                     }
                 }
@@ -1078,7 +1078,7 @@ 
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         // Send back
         echo prepareExchangedData(
@@ -1121,17 +1121,17 @@ 
         // delete files
         $rows = DB::query(
             'SELECT value, value2
-            FROM ' . prefixTable('sk_reencrypt_backup') . "
+            FROM ' . prefixTable('sk_reencrypt_backup')."
             WHERE current_table = 'files'"
         );
         foreach ($rows as $record) {
-            if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
-                unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value2']);
+            if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
+                unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value2']);
             }
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         echo '[{"status":"done"}]';
         break;
@@ -1162,7 +1162,7 @@ 
                 'encode'
             );
         } else {
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             //send email
             $emailSettings = new EmailSettings($SETTINGS);
@@ -1200,13 +1200,13 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $emailSettings = new EmailSettings($SETTINGS);
         $emailService = new EmailService();
 
         $rows = DB::query(
             'SELECT *
-            FROM ' . prefixTable('emails') . '
+            FROM ' . prefixTable('emails').'
             WHERE status = %s OR status = %s',
             'not_sent',
             ''
@@ -1292,13 +1292,13 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // Instatiate email settings and service
         $emailSettings = new EmailSettings($SETTINGS);
         $emailService = new EmailService();
 
-        $rows = DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', '');
+        $rows = DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', '');
         foreach ($rows as $record) {
             //send email
             $email = $emailService->sendMail(
@@ -1367,7 +1367,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // init
         $filesList = array();
@@ -1380,7 +1380,7 @@ 
                 FROM ' . prefixTable('files')
             );
             foreach ($rows as $record) {
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                     $addFile = false;
                     if (($post_option === 'attachments-decrypt' && $record['status'] === 'encrypted')
                         || ($post_option === 'attachments-encrypt' && $record['status'] === 'clear')
@@ -1445,8 +1445,8 @@ 
         $post_list = filter_var_array($post_list, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $post_counter = filter_var($post_counter, FILTER_SANITIZE_NUMBER_INT);
 
-        include $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $cpt = 0;
         $continu = true;
@@ -1459,33 +1459,33 @@ 
                 // Get file name
                 $file_info = DB::queryfirstrow(
                     'SELECT file
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id = %i',
                     $file
                 );
 
                 // skip file is Coherancey not respected
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'])) {
                     // Case where we want to decrypt
                     if ($post_option === 'decrypt') {
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                         );
                         // Case where we want to encrypt
                     } elseif ($post_option === 'encrypt') {
                         prepareFileWithDefuse(
                             'encrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                         );
                     }
                     // Do file cleanup
-                    fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], $SETTINGS);
+                    fileDelete($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], $SETTINGS);
                     rename(
-                        $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
-                        $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file']
+                        $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
+                        $SETTINGS['path_to_upload_folder'].'/'.$file_info['file']
                     );
 
                     // store in DB
@@ -1520,8 +1520,8 @@ 
                 $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted'
             );
 
-            $message = $lang->get('last_execution') . ' ' .
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+            $message = $lang->get('last_execution').' '.
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                 '<i class="fas fa-check text-success ml-2 mr-3"></i>';
         }
 
@@ -1615,7 +1615,7 @@ 
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
 
             DB::query(
-                'DELETE FROM ' . prefixTable('api') . ' WHERE increment_id = %i',
+                'DELETE FROM '.prefixTable('api').' WHERE increment_id = %i',
                 $post_id
             );
         }
@@ -1710,7 +1710,7 @@ 
             // Delete existing key
         } elseif (null !== $post_action && $post_action === 'delete') {
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE increment_id=%i', $post_id);
+            DB::query('DELETE FROM '.prefixTable('api').' WHERE increment_id=%i', $post_id);
         }
 
         echo prepareExchangedData(
@@ -1725,7 +1725,7 @@ 
 
     case 'save_api_status':
         // Do query
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'api');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'api');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -1754,7 +1754,7 @@ 
 
     case 'run_duo_config_check':
         //Libraries call
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         // Check KEY
         if ($post_key !== $session->get('key')) {
             echo prepareExchangedData(
@@ -1860,7 +1860,7 @@ 
         } else {
             $tmp = 1;
         }
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -1888,7 +1888,7 @@ 
 
         // ga_website_name
         if (is_null($dataReceived['ga_website_name']) === false) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -1918,7 +1918,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_agses_options':
@@ -1941,7 +1941,7 @@ 
 
         // agses_hosted_url
         if (!is_null($dataReceived['agses_hosted_url'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -1972,7 +1972,7 @@ 
 
         // agses_hosted_id
         if (!is_null($dataReceived['agses_hosted_id'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2003,7 +2003,7 @@ 
 
         // agses_hosted_apikey
         if (!is_null($dataReceived['agses_hosted_apikey'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2033,7 +2033,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_option_change':
@@ -2073,7 +2073,7 @@ 
 
         // Check if setting is already in DB. If NO then insert, if YES then update.
         $data = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . '
+            'SELECT * FROM '.prefixTable('misc').'
             WHERE type = %s AND intitule = %s',
             'admin',
             $post_field
@@ -2096,7 +2096,7 @@ 
                     array(
                         'valeur' => time(),
                         'type' => 'admin',
-                        'intitule' => $post_field . '_time',
+                        'intitule' => $post_field.'_time',
                         'updated_at' => time(),
                     )
                 );
@@ -2118,10 +2118,10 @@ 
             if ($post_field === 'send_stats') {
                 // Check if previous time exists, if not them insert this value in DB
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('misc') . '
+                    'SELECT * FROM '.prefixTable('misc').'
                     WHERE type = %s AND intitule = %s',
                     'admin',
-                    $post_field . '_time'
+                    $post_field.'_time'
                 );
                 $counter = DB::count();
                 if ($counter === 0) {
@@ -2130,7 +2130,7 @@ 
                         array(
                             'valeur' => 0,
                             'type' => 'admin',
-                            'intitule' => $post_field . '_time',
+                            'intitule' => $post_field.'_time',
                             'created_at' => time(),
                         )
                     );
@@ -2152,13 +2152,13 @@ 
         // special Cases
         if ($post_field === 'cpassman_url') {
             // update also jsUrl for CSFP protection
-            $jsUrl = $post_value . '/includes/libraries/csrfp/js/csrfprotector.js';
+            $jsUrl = $post_value.'/includes/libraries/csrfp/js/csrfprotector.js';
             $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php';
             $data = file_get_contents($csrfp_file);
             $posJsUrl = strpos($data, '"jsUrl" => "');
             $posEndLine = strpos($data, '",', $posJsUrl);
             $line = substr($data, $posJsUrl, ($posEndLine - $posJsUrl + 2));
-            $newdata = str_replace($line, '"jsUrl" => "' . filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . '",', $data);
+            $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS).'",', $data);
             file_put_contents($csrfp_file, $newdata);
         } elseif ($post_field === 'restricted_to_input' && (int) $post_value === 0) {
             DB::update(
@@ -2183,7 +2183,7 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'misc' => $counter . ' ; ' . $SETTINGS[$post_field],
+                'misc' => $counter.' ; '.$SETTINGS[$post_field],
                 'message' => empty($post_translate) === false ? $lang->get($post_translate) : '',
             ),
             'encode'
@@ -2226,7 +2226,7 @@ 
 
         // send statistics
         if (null !== $post_status) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2257,7 +2257,7 @@ 
 
         // send statistics items
         if (null !== $post_list) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2303,7 +2303,7 @@ 
             break;
         }
 
-        if (DB::query("SHOW TABLES LIKE '" . prefixTable('sk_reencrypt_backup') . "'")) {
+        if (DB::query("SHOW TABLES LIKE '".prefixTable('sk_reencrypt_backup')."'")) {
             if (DB::count() === 1) {
                 echo 1;
             } else {
@@ -2341,7 +2341,7 @@ 
 
         $rows = DB::query(
             'SELECT id, title
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 ORDER BY title ASC'
         );
         foreach ($rows as $record) {
@@ -2457,7 +2457,7 @@ 
 function tablesIntegrityCheck(): array
 {
     // Get integrity tables file
-    $integrityTablesFile = TEAMPASS_ROOT_PATH . '/includes/tables_integrity.json';
+    $integrityTablesFile = TEAMPASS_ROOT_PATH.'/includes/tables_integrity.json';
     if (file_exists($integrityTablesFile) === false) {
         return [
             'error' => true,
@@ -2475,7 +2475,7 @@ 
     // Get all tables
     $tables = [];
     foreach (DB::queryFirstColumn("SHOW TABLES") as $table) {
-        $tables[] = str_replace(DB_PREFIX, "", $table);;
+        $tables[] = str_replace(DB_PREFIX, "", $table); ;
     }
     // Prepare the integrity check
     $tablesInError = [];