nilsteampassnet / TeamPass

api/index.php

Spacing +6 added lines, -6 removed lines

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

sources/ldap.queries.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,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;
 }
 
@@ -154,7 +154,7 @@ 
                     $openLdapExtra = new OpenLdapExtra();
                     break;
                 default:
-                    throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+                    throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
             }
         } catch (Exception $e) {
             if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -173,7 +173,7 @@ 
             // 2- Get user info from AD
             // We want to isolate attribute ldap_user_attribute or mostly samAccountName
             $userADInfos = $ldapConnection->query()
-                ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username)
+                ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username)
                 ->firstOrFail();
 
             // Is user enabled? Only ActiveDirectory
@@ -194,7 +194,7 @@ 
         } catch (\LdapRecord\Query\ObjectNotFoundException $e) {
             $error = $e->getDetailedError();
             if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
             } 
             // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent
             echo prepareExchangedData(
@@ -213,7 +213,7 @@ 
             // For OpenLDAP and others, we use attribute dn
             $userAuthAttempt = $ldapConnection->auth()->attempt(
                 $SETTINGS['ldap_type'] === 'ActiveDirectory' ?
-                    $userADInfos['userprincipalname'][0] :  // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
+                    $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
                     $userADInfos['dn'],
                 $post_password
             );
@@ -232,7 +232,7 @@ 
         } catch (\LdapRecord\Query\ObjectNotFoundException $e) {
             $error = $e->getDetailedError();
             if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
             }
             // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent
             echo prepareExchangedData(

scripts/background_tasks___functions.php

Spacing +6 added lines, -6 removed lines

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

pages/tasks.php

Braces +1 added lines, -2 removed lines

@@ -149,8 +149,7 @@
                                             </div>
         <?php
     }
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
         error_log('TEAMPASS Error - tasks page - '.$e->getMessage());
     }

Spacing +7 added lines, -7 removed lines

@@ -64,7 +64,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === 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;
 }
 
@@ -126,7 +126,7 @@ 
     // Get last cron execution timestamp
     $queryResults = DB::query(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s and valeur >= %d',
         'admin',
         'last_cron_exec',
@@ -234,7 +234,7 @@ 
                                             $task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="users_personal_folder_task">
@@ -256,7 +256,7 @@ 
                                             $task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="clean_orphan_objects_task">
@@ -278,7 +278,7 @@ 
                                             $task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="purge_temporary_files_task">
@@ -300,7 +300,7 @@ 
                                             $task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="reload_cache_table_task">
@@ -517,7 +517,7 @@ 
                         <h5><?php echo $lang->get('day_of_month'); ?></h5>              
                         <select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;">
                             <?php
-                            for ($i=1; $i<=31; $i++) {
+                            for ($i = 1; $i <= 31; $i++) {
                                 echo '<option value="'.$i.'">'.$lang->get('day').' '.$i.'</option>';
                             }
                             ?>

pages/admin.php

Braces +1 added lines, -2 removed lines

@@ -222,8 +222,7 @@
                             </div>
         <?php
     }
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
         error_log('TEAMPASS Error - admin page - '.$e->getMessage());
     }

Spacing +11 added lines, -11 removed lines

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

sources/oauth.php

Spacing +1 added lines, -1 removed lines

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

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 +111 added lines, -111 removed lines

@@ -79,7 +79,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;
 }
 
@@ -267,7 +267,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'];
 
@@ -322,7 +322,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();
 
@@ -357,7 +357,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']
         );
@@ -506,7 +506,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)
             );
@@ -624,7 +624,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']
         );
@@ -708,7 +708,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'];
 
@@ -746,7 +746,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'];
 
@@ -790,7 +790,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'];
 
@@ -834,7 +834,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) {
@@ -935,7 +935,7 @@ 
                 )
             );
 
-            return '[{"token" : "' . $token . '"}]';
+            return '[{"token" : "'.$token.'"}]';
 
         /*
         * Default case
@@ -951,7 +951,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) {
         /*
@@ -1020,7 +1020,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'
@@ -1072,7 +1072,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -1127,7 +1127,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
         );
 
@@ -1148,8 +1148,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 {
@@ -1162,8 +1162,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'
             );
@@ -1267,14 +1267,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
         );
@@ -1328,7 +1328,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']
@@ -1339,11 +1339,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'),
@@ -1405,7 +1405,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'))
                 ),
             ),
@@ -1421,7 +1421,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'))
             ),
         ),
@@ -1438,7 +1438,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'
         );
@@ -1446,7 +1446,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'
             );
@@ -1498,8 +1498,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',
@@ -1531,7 +1531,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();
     }
 
@@ -1566,13 +1566,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 {
@@ -1659,7 +1659,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 = '';
@@ -1689,7 +1689,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"
@@ -1697,9 +1697,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'];
             }
         }
     }
@@ -1711,7 +1711,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $data['current_page'] . '
+' . $data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1726,39 +1726,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)
@@ -1798,7 +1798,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
         );
@@ -1807,9 +1807,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
@@ -1903,7 +1903,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1984,7 +1984,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2082,7 +2082,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $userId
         );
@@ -2148,7 +2148,7 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2218,7 +2218,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2366,15 +2366,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')
@@ -2406,7 +2406,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
@@ -2439,7 +2439,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2464,15 +2464,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')
@@ -2504,7 +2504,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
@@ -2526,7 +2526,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"'
     );
 
@@ -2551,15 +2551,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')
@@ -2591,7 +2591,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
@@ -2613,7 +2613,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2638,14 +2638,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')
@@ -2677,7 +2677,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
@@ -2723,15 +2723,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')
@@ -2763,7 +2763,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
@@ -2785,8 +2785,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;
@@ -2819,9 +2819,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"
         );
@@ -2829,7 +2829,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')
@@ -2856,7 +2856,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
@@ -2879,7 +2879,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2907,7 +2907,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
         );
@@ -2933,7 +2933,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'
@@ -2946,7 +2946,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'),
@@ -2990,7 +2990,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,
@@ -3001,13 +3001,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'),
@@ -3030,7 +3030,7 @@ 
                         );
 
                         // Unlink original file
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                     }
                 }
 
@@ -3038,7 +3038,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'
@@ -3108,7 +3108,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
         );
@@ -3155,7 +3155,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
         );
@@ -3205,7 +3205,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => $lang->get('done'),'',
+                        'message' => $lang->get('done'), '',
                     ),
                     'encode'
                 );
@@ -3254,7 +3254,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT u.auth_type, u.login, u.private_key, u.special
-            FROM ' . prefixTable('users') . ' AS u
+            FROM ' . prefixTable('users').' AS u
             WHERE u.id = %i',
             $post_user_id
         );
@@ -3290,7 +3290,7 @@ 
                     return prepareExchangedData(
                         array(
                             'error' => false,
-                            'message' => $lang->get('done'),'',
+                            'message' => $lang->get('done'), '',
                         ),
                         'encode'
                     );
@@ -3312,8 +3312,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',
@@ -3381,8 +3381,8 @@ 
                             'process_type' => 'create_user_keys',
                             'arguments' => json_encode([
                                 'new_user_id' => (int) $post_user_id,
-                                'new_user_pwd' => cryption($post_previous_pwd, '','encrypt')['string'],
-                                'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'],
+                                'new_user_pwd' => cryption($post_previous_pwd, '', 'encrypt')['string'],
+                                'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'],
                                 'send_email' => 0,
                                 'otp_provided_new_value' => 0,
                                 'user_self_change' => 1,
@@ -3452,7 +3452,7 @@ 
             id,
             private_key,
             created_at
-        FROM " . prefixTable('user_private_keys') . "
+        FROM " . prefixTable('user_private_keys')."
         WHERE user_id = %i
         ORDER BY created_at DESC, id DESC",
         $userId
@@ -3480,9 +3480,9 @@ 
             // Select one personal item share_key to test decryption
             $currentUserItemKey = DB::queryFirstRow(
                 'SELECT si.share_key, si.increment_id, l.id_user, i.perso
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('log_items') . ' AS l ON si.object_id = l.id_item
-                INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = l.id_item
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('log_items').' AS l ON si.object_id = l.id_item
+                INNER JOIN ' . prefixTable('items').' AS i ON i.id = l.id_item
                 WHERE si.user_id = %i AND i.perso = 1 AND si.share_key != ""
                 ORDER BY RAND()
                 LIMIT 1',
@@ -3543,7 +3543,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>

self-unlock.php

Spacing +3 added lines, -3 removed lines

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