nilsteampassnet / TeamPass

includes/core/login.php

Spacing +28 added lines, -28 removed lines

@@ -40,13 +40,13 @@ 
     <div class="login-logo">',
     (isset($SETTINGS['custom_logo']) === true
         && empty($SETTINGS['custom_logo']) === false) ?
-        '<img src="' . (string) $SETTINGS['custom_logo'] . '" alt="" style="text-align:center;" />' : '',
+        '<img src="'.(string) $SETTINGS['custom_logo'].'" alt="" style="text-align:center;" />' : '',
     '
         <div style="margin-top:20px;">
             <img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">
         </div>
         <div style="font-weight:bold;">
-            ' . TP_TOOL_NAME . '
+            ' . TP_TOOL_NAME.'
         </div>
     </div>
 
@@ -84,7 +84,7 @@ 
             <input type="text" id="login" class="form-control" placeholder="', filter_var($username, FILTER_SANITIZE_STRING), '" readonly>';
 } else {
     echo '
-            <input type="text" id="login" class="form-control" placeholder="' . langHdl('index_login') . '">';
+            <input type="text" id="login" class="form-control" placeholder="' . langHdl('index_login').'">';
 }
 
 echo '
@@ -99,7 +99,7 @@ 
             <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fas fa-lock fa-fw"></i></span>
             </div>
-          <input type="password" id="pw" class="form-control submit-button" placeholder="' . langHdl('index_password') . '">
+          <input type="password" id="pw" class="form-control submit-button" placeholder="' . langHdl('index_password').'">
         </div>';
 }
 
@@ -108,7 +108,7 @@ 
             <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fas fa-clock fa-fw"></i></span>
             </div>
-          <input type="text" id="session_duration" class="form-control submit-button" placeholder="' . langHdl('index_session_duration') . '&nbsp;(' . langHdl('minutes') . ')" value="', isset($SETTINGS['default_session_expiration_time']) === true ? $SETTINGS['default_session_expiration_time'] : '', '">
+          <input type="text" id="session_duration" class="form-control submit-button" placeholder="' . langHdl('index_session_duration').'&nbsp;('.langHdl('minutes').')" value="', isset($SETTINGS['default_session_expiration_time']) === true ? $SETTINGS['default_session_expiration_time'] : '', '">
         </div>';
 
 // 2FA auth selector
@@ -121,7 +121,7 @@ 
     '" />
         <div class="row mb-3 hidden" id="2fa_methods_selector">
             <div class="col-12">
-                <h8 class="login-box-msg">' . langHdl('2fa_authentication_selector') . '</h8>
+                <h8 class="login-box-msg">' . langHdl('2fa_authentication_selector').'</h8>
                 <div class="2fa-methods text-center mt-2">',
     isset($SETTINGS['google_authentication']) === true && (int) $SETTINGS['google_authentication'] === 1 ?
         '
@@ -170,10 +170,10 @@ 
                 <div class="col-1">
                 </div>
                 <div class="col-8">
-                    <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . langHdl('ga_identification_code') . '" />
+                    <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . langHdl('ga_identification_code').'" />
                 </div>
                 <div class="col-1">
-                    <i class="fas fa-envelope form-control-feedback pointer infotip text-info" title="' . langHdl('i_need_to_generate_new_ga_code') . '" onclick="send_user_new_temporary_ga_code()"></i>
+                    <i class="fas fa-envelope form-control-feedback pointer infotip text-info" title="' . langHdl('i_need_to_generate_new_ga_code').'" onclick="send_user_new_temporary_ga_code()"></i>
                 </div>
             </div>
             <div id="div-2fa-google-qr" class="row mt-2 "></div>
@@ -190,7 +190,7 @@ 
 <script>
 var seconds = 1;
 function updateLogonButton(timeToGo){
-    document.getElementById("but_identify_user").value = "' . langHdl('duration_login_attempt') . ' " + timeToGo;
+    document.getElementById("but_identify_user").value = "' . langHdl('duration_login_attempt').' " + timeToGo;
 }
 $( window ).on( "load", function() {
     updateLogonButton(seconds);
@@ -199,7 +199,7 @@ 
         if (seconds >= 0) {
             updateLogonButton(seconds);
         } else if(seconds === 0) {
-            launchIdentify("", "' . $nextUrl . '");
+            launchIdentify("", "' . $nextUrl.'");
         }
         updateLogonButton(seconds);
     },
@@ -220,15 +220,15 @@ 
             <div class="col-8">
                 <div id="yubiko-new-key" class="alert alert-info hidden">
                     <p>
-                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . langHdl('yubico_user_id') . '">
+                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . langHdl('yubico_user_id').'">
                     </p>
                     <p>
-                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . langHdl('yubico_user_key') . '">
+                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . langHdl('yubico_user_key').'">
                     </p>
                 </div>
-                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . langHdl('press_your_yubico_key') . '">
+                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . langHdl('press_your_yubico_key').'">
                 <div class="row">
-                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . langHdl('register_new_yubiko_key') . '</span>
+                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . langHdl('register_new_yubiko_key').'</span>
                 </div>
             </div>
         </div>';
@@ -237,22 +237,22 @@ 
 echo '
         <div class="row mb-3 mt-5">
             <div class="col-12">
-                <button id="but_identify_user" class="btn btn-primary btn-block">' . langHdl('log_in') . '</button>
+                <button id="but_identify_user" class="btn btn-primary btn-block">' . langHdl('log_in').'</button>
                 
                 <!-- In case of upgrade, the user has to provide his One Time Code -->
                 <div class="card-body user-one-time-code-card-body hidden">
-                    <h5 class="login-box-msg">' . langHdl('provide_personal_one_time_code') . '</h5>
+                    <h5 class="login-box-msg">' . langHdl('provide_personal_one_time_code').'</h5>
 
                     <div class="input-group has-feedback mb-2 mt-4">
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fas fa-unlock-alt"></i></span>
                         </div>
-                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . langHdl('one_time_code') . '">
+                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . langHdl('one_time_code').'">
                     </div>
 
                     <div class="row mb-3">
                         <div class="col-12">
-                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . langHdl('confirm') . '</button>
+                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . langHdl('confirm').'</button>
                         </div>
                     </div>
                 </div>
@@ -270,10 +270,10 @@ 
 // In case of password change
 echo '
     <div class="card-body confirm-password-card-body hidden">
-        <h5 class="login-box-msg">' . langHdl('new_password_required') . '</h5>
+        <h5 class="login-box-msg">' . langHdl('new_password_required').'</h5>
 
         <div class="alert alert-info">
-            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('password_strength') . '
+            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('password_strength').'
             <span id="confirm-password-level" class="ml-2 font-weight-bold"></span></div>
         </div>
 
@@ -283,20 +283,20 @@ 
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-key"></i></span>
                     </div>
-                    <input type="password" id="current-user-password" class="form-control" placeholder="' . langHdl('current_password') . '">
+                    <input type="password" id="current-user-password" class="form-control" placeholder="' . langHdl('current_password').'">
                 </div>
             </div>
             <div class="input-group has-feedback mb-2 mt-4">
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-key"></i></span>
                 </div>
-                <input type="password" id="new-user-password" class="form-control" placeholder="' . langHdl('index_new_pw') . '">
+                <input type="password" id="new-user-password" class="form-control" placeholder="' . langHdl('index_new_pw').'">
             </div>
             <div class="input-group has-feedback mb-2">
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-key"></i></span>
                 </div>
-                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . langHdl('index_change_pw_confirmation') . '">
+                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . langHdl('index_change_pw_confirmation').'">
             </div>
             <div class="row mb-3">
                 <div class="col-md-12 offset-sm-4 text-center">
@@ -307,7 +307,7 @@ 
             </div>
             <div class="row mb-3">
                 <div class="col-12">
-                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . langHdl('confirm') . '</button>
+                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . langHdl('confirm').'</button>
                 </div>
             </div>
         </div>
@@ -315,20 +315,20 @@ 
 
     <div class="card-body hidden" id="card-user-treat-psk">
         <div class="alert alert-info">
-            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('user_has_psk_info') . '</div>
+            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('user_has_psk_info').'</div>
         </div>
         <div class="input-group has-feedback mb-2">
             <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-key"></i></span>
             </div>
-            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . langHdl('home_personal_saltkey') . '">
+            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . langHdl('home_personal_saltkey').'">
         </div>
         <div class="row mb-3 mt-4">
             <div class="col-12">
-                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . langHdl('launch') . '</button>
+                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . langHdl('launch').'</button>
             </div>
             <div class="col-12 mt-3">
-                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . langHdl('i_cannot_remember') . '</button>
+                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . langHdl('i_cannot_remember').'</button>
             </div>
         </div>
     </div>

includes/core/load.js.php

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
                                     console.log('User has to regenerate keys')
                                     // HIde
                                     $('.content-header, .content').addClass('hidden');
-                                    $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+                                    $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
                                     // Show passwords inputs and form
                                     $('#dialog-user-temporary-code').removeClass('hidden');
@@ -97,7 +97,7 @@ 
 
                                     // Show passwords inputs and form
                                     $('#dialog-user-change-password-info')
-                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info');?>')
+                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info'); ?>')
                                         .removeClass('hidden');
                                     $('#dialog-user-change-password').removeClass('hidden');
 
@@ -110,7 +110,7 @@ 
 
                                     // Show passwords inputs and form
                                     $('#dialog-ldap-user-change-password-info')
-                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                                         .removeClass('hidden');
                                     $('#dialog-ldap-user-change-password').removeClass('hidden');
                                     
@@ -168,7 +168,7 @@ 
         console.log('User has to regenerate keys')
         // HIde
         $('.content-header, .content').addClass('hidden');
-        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -1026,7 +1026,7 @@ 
             '#warningModal',
             '<i class="fas fa-clock fa-lg warning mr-2"></i><?php echo langHdl('index_add_one_hour'); ?>',
             '<div class="form-group">' +
-            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration') . ' (' . langHdl('minutes') . ')'; ?>:</label>' +
+            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration').' ('.langHdl('minutes').')'; ?>:</label>' +
             '<input type="text" class="form-control" id="warningModal-input" value="<?php echo isset($_SESSION['user']['session_duration']) === true ? (int) $_SESSION['user']['session_duration'] / 60 : 60; ?>">' +
             '</div>',
             '<?php echo langHdl('confirm'); ?>',

index.php

Spacing +87 added lines, -87 removed lines

@@ -65,8 +65,8 @@ 
 }
 
 // Include files
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
 // Quick major version check -> upgrade needed?
 if (isset($SETTINGS['cpassman_version']) === true && version_compare(TP_VERSION, $SETTINGS['cpassman_version']) > 0) {
@@ -80,9 +80,9 @@ 
     exit();
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
 $antiXss = new voku\helper\AntiXSS();
 
 if (isset($SETTINGS['cpassman_url']) === false || $SETTINGS['cpassman_url'] === '') {
@@ -90,8 +90,8 @@ 
 }
 
 // Include files
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // Open MYSQL database connection
 require_once './includes/libraries/Database/Meekrodb/db.class.php';
@@ -106,7 +106,7 @@ 
 DB::$encoding = DB_ENCODING;
 
 // 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_STRING);
@@ -150,7 +150,7 @@ 
     // case of user has change language in the login page
     $dataLanguage = DB::queryFirstRow(
         'SELECT flag, name
-        FROM ' . prefixTable('languages') . '
+        FROM ' . prefixTable('languages').'
         WHERE name = %s',
         $_GET['language']
     );
@@ -160,8 +160,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,22 +203,22 @@ 
 
 // Load user languages files
 if (in_array($session_user_language, $languagesList) === true) {
-    if (file_exists($SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php') === true) {
-        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php';
+    if (file_exists($SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php') === true) {
+        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php';
     }
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
 }
 
 // load 2FA Google
 if (isset($SETTINGS['google_authentication']) === true && $SETTINGS['google_authentication'] === '1') {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
 }
 
 // load 2FA Yubico
 if (isset($SETTINGS['yubico_authentication']) === true && $SETTINGS['yubico_authentication'] === '1') {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
 }
 
 // Some template adjust
@@ -275,7 +275,7 @@ 
     <!-- Toastr -->
     <link rel="stylesheet" href="plugins/toastr/toastr.min.css" />
     <!-- favicon -->
-    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon'];?>"/>
+    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon']; ?>"/>
 </head>
 
 
@@ -316,7 +316,7 @@ 
             ),
             'SESSION'
         );
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
     }
 } elseif (
     $session_validite_pw !== null
@@ -329,13 +329,13 @@ 
     // Do some template preparation
     // Avatar
     if ($session_user_avatar_thumb !== null && empty($session_user_avatar_thumb) === false) {
-        if (file_exists('includes/avatars/' . $session_user_avatar_thumb)) {
-            $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $session_user_avatar_thumb;
+        if (file_exists('includes/avatars/'.$session_user_avatar_thumb)) {
+            $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$session_user_avatar_thumb;
         } else {
-            $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+            $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
         }
     } else {
-        $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+        $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
     }
     ?>
 
@@ -373,7 +373,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">
@@ -411,7 +411,7 @@ 
             <!-- Main Sidebar Container -->
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
                 <!-- Brand Logo -->
-                <a href="<?php echo $SETTINGS['cpassman_url'] . "/index.php?page=items"; ?>" class="brand-link">
+                <a href="<?php echo $SETTINGS['cpassman_url']."/index.php?page=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>
@@ -429,7 +429,7 @@ 
                         <a href="#" data-name="items" class="nav-link', $pageSel === 'items' ? ' active' : '', '">
                         <i class="nav-icon fas fa-key"></i>
                         <p>
-                            ' . langHdl('pw') . '
+                            ' . langHdl('pw').'
                         </p>
                         </a>
                     </li>';
@@ -445,7 +445,7 @@ 
                         <a href="#" data-name="import" class="nav-link', $pageSel === 'import' ? ' active' : '', '">
                         <i class="nav-icon fas fa-file-import"></i>
                         <p>
-                            ' . langHdl('import') . '
+                            ' . langHdl('import').'
                         </p>
                         </a>
                     </li>';
@@ -466,7 +466,7 @@ 
                         <a href="#" data-name="export" class="nav-link', $pageSel === 'export' ? ' active' : '', '">
                         <i class="nav-icon fas fa-file-export"></i>
                         <p>
-                            ' . langHdl('export') . '
+                            ' . langHdl('export').'
                         </p>
                         </a>
                     </li>';
@@ -493,7 +493,7 @@ 
                         <a href="#" data-name="search" class="nav-link', $pageSel === 'search' ? ' active' : '', '">
                         <i class="nav-icon fas fa-search"></i>
                         <p>
-                            ' . langHdl('find') . '
+                            ' . langHdl('find').'
                         </p>
                         </a>
                     </li>';
@@ -510,7 +510,7 @@ 
                         <a href="#" data-name="favourites" class="nav-link', $pageSel === 'admin' ? ' favourites' : '', '">
                         <i class="nav-icon fas fa-star"></i>
                         <p>
-                            ' . langHdl('favorites') . '
+                            ' . langHdl('favorites').'
                         </p>
                         </a>
                     </li>';
@@ -540,7 +540,7 @@ 
                         <a href="#" data-name="suggestion" class="nav-link', $pageSel === 'suggestion' ? ' active' : '', '">
                         <i class="nav-icon fas fa-lightbulb"></i>
                         <p>
-                            ' . langHdl('suggestion_menu') . '
+                            ' . langHdl('suggestion_menu').'
                         </p>
                         </a>
                     </li>';
@@ -553,7 +553,7 @@ 
                         <a href="#" data-name="admin" class="nav-link', $pageSel === 'admin' ? ' active' : '', '">
                         <i class="nav-icon fas fa-info"></i>
                         <p>
-                            ' . langHdl('admin_main') . '
+                            ' . langHdl('admin_main').'
                         </p>
                         </a>
                     </li>
@@ -561,7 +561,7 @@ 
                         <a href="#" class="nav-link">
                             <i class="nav-icon fas fa-wrench"></i>
                             <p>
-                                ' . langHdl('admin_settings') . '
+                                ' . langHdl('admin_settings').'
                                 <i class="fas fa-angle-left right"></i>
                             </p>
                         </a>
@@ -569,55 +569,55 @@ 
                             <li class="nav-item">
                                 <a href="#" data-name="options" class="nav-link', $pageSel === 'options' ? ' active' : '', '">
                                     <i class="fas fa-check-double nav-icon"></i>
-                                    <p>' . langHdl('options') . '</p>
+                                    <p>' . langHdl('options').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="2fa" class="nav-link', $pageSel === '2fa' ? ' active' : '', '">
                                     <i class="fas fa-qrcode nav-icon"></i>
-                                    <p>' . langHdl('mfa_short') . '</p>
+                                    <p>' . langHdl('mfa_short').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="api" class="nav-link', $pageSel === 'api' ? ' active' : '', '">
                                     <i class="fas fa-cubes nav-icon"></i>
-                                    <p>' . langHdl('api') . '</p>
+                                    <p>' . langHdl('api').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="backups" class="nav-link', $pageSel === 'backups' ? ' active' : '', '">
                                     <i class="fas fa-database nav-icon"></i>
-                                    <p>' . langHdl('backups') . '</p>
+                                    <p>' . langHdl('backups').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="emails" class="nav-link', $pageSel === 'emails' ? ' active' : '', '">
                                     <i class="fas fa-envelope nav-icon"></i>
-                                    <p>' . langHdl('emails') . '</p>
+                                    <p>' . langHdl('emails').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="fields" class="nav-link', $pageSel === 'fields' ? ' active' : '', '">
                                     <i class="fas fa-keyboard nav-icon"></i>
-                                    <p>' . langHdl('fields') . '</p>
+                                    <p>' . langHdl('fields').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="ldap" class="nav-link', $pageSel === 'ldap' ? ' active' : '', '">
                                     <i class="fas fa-id-card nav-icon"></i>
-                                    <p>' . langHdl('ldap') . '</p>
+                                    <p>' . langHdl('ldap').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="uploads" class="nav-link', $pageSel === 'uploads' ? ' active' : '', '">
                                     <i class="fas fa-file-upload nav-icon"></i>
-                                    <p>' . langHdl('uploads') . '</p>
+                                    <p>' . langHdl('uploads').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="statistics" class="nav-link', $pageSel === 'statistics' ? ' active' : '', '">
                                     <i class="fas fa-chart-bar nav-icon"></i>
-                                    <p>' . langHdl('statistics') . '</p>
+                                    <p>' . langHdl('statistics').'</p>
                                 </a>
                             </li>
                         </ul>
@@ -626,7 +626,7 @@ 
                         <a href="#" data-name="actions" class="nav-link', $pageSel === 'actions' ? ' active' : '', '">
                         <i class="nav-icon fas fa-cogs"></i>
                         <p>
-                            ' . langHdl('actions') . '
+                            ' . langHdl('actions').'
                         </p>
                         </a>
                     </li>';
@@ -642,7 +642,7 @@ 
                         <a href="#" data-name="folders" class="nav-link', $pageSel === 'folders' ? ' active' : '', '">
                         <i class="nav-icon fas fa-folder-open"></i>
                         <p>
-                            ' . langHdl('folders') . '
+                            ' . langHdl('folders').'
                         </p>
                         </a>
                     </li>
@@ -650,7 +650,7 @@ 
                         <a href="#" data-name="roles" class="nav-link', $pageSel === 'roles' ? ' active' : '', '">
                         <i class="nav-icon fas fa-graduation-cap"></i>
                         <p>
-                            ' . langHdl('roles') . '
+                            ' . langHdl('roles').'
                         </p>
                         </a>
                     </li>
@@ -658,38 +658,38 @@ 
                         <a href="#" data-name="users" class="nav-link', $pageSel === 'users' ? ' active' : '', '">
                         <i class="nav-icon fas fa-users"></i>
                         <p>
-                            ' . langHdl('users') . '
+                            ' . langHdl('users').'
                         </p>
                         </a>
                     </li>
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
                         <a href="#" class="nav-link">
                         <i class="nav-icon fas fa-cubes"></i>
-                        <p>' . langHdl('admin_views') . '<i class="fas fa-angle-left right"></i></p>
+                        <p>' . langHdl('admin_views').'<i class="fas 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', $pageSel === 'utilities.renewal' ? ' active' : '', '">
                               <i class="far fa-calendar-alt nav-icon"></i>
-                              <p>' . langHdl('renewal') . '</p>
+                              <p>' . langHdl('renewal').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.deletion" class="nav-link', $pageSel === 'utilities.deletion' ? ' active' : '', '">
                               <i class="fas fa-trash-alt nav-icon"></i>
-                              <p>' . langHdl('deletion') . '</p>
+                              <p>' . langHdl('deletion').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.logs" class="nav-link', $pageSel === 'utilities.logs' ? ' active' : '', '">
                               <i class="fas fa-history nav-icon"></i>
-                              <p>' . langHdl('logs') . '</p>
+                              <p>' . langHdl('logs').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.database" class="nav-link', $pageSel === 'utilities.database' ? ' active' : '', '">
                               <i class="fas fa-database nav-icon"></i>
-                              <p>' . langHdl('database') . '</p>
+                              <p>' . langHdl('database').'</p>
                             </a>
                           </li>
                         </ul>
@@ -700,10 +700,10 @@ 
                     <!-- /.sidebar-menu -->
                 <div class="menu-footer" style="">
                     <div class="" id="sidebar-footer">
-                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' .
-                                                                                                @date($SETTINGS['date_format'], (string) $_SERVER['REQUEST_TIME']) . ' - ' .
+                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time').' '.
+                                                                                                @date($SETTINGS['date_format'], (string) $_SERVER['REQUEST_TIME']).' - '.
                                                                                                 @date($SETTINGS['time_format'], (string) $_SERVER['REQUEST_TIME']); ?>"></i>
-                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . langHdl('users_online'); ?>"></i>
+                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.langHdl('users_online'); ?>"></i>
                         <a href="<?php echo READTHEDOC_URL; ?>" target="_blank" class="text-info"><i class="fas fa-book mr-2 infotip" title="<?php echo langHdl('documentation_canal'); ?> ReadTheDocs"></i></a>
                         <a href="<?php echo REDDIT_URL; ?>" target="_blank" class="text-info"><i class="fab fa-reddit-alien mr-2 infotip" title="<?php echo langHdl('admin_help'); ?>"></i></a>
                         <i class="fas fa-bug infotip pointer text-info" title="<?php echo langHdl('bugs_page'); ?>" onclick="generateBugReport()"></i>
@@ -1004,17 +1004,17 @@ 
                         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['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) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . $mngPages[$_GET['page']];
+                            include $SETTINGS['cpassman_dir'].'/pages/'.$mngPages[$_GET['page']];
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
                             if (
                                 isset($_GET['page']) === true
@@ -1025,17 +1025,17 @@ 
                                 //include $SETTINGS['cpassman_dir'] . '/pages/' . $mngPages[$_GET['page']];
                             } else {
                                 $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
+                                include $SETTINGS['cpassman_dir'].'/error.php';
                             }
                         } else {
                             $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
                     } elseif (
                         isset($_GET['page']) === true
                         && filter_var($_GET['page'], FILTER_SANITIZE_STRING) !== false
                     ) {
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . $_GET['page'] . '.php';
+                        include $SETTINGS['cpassman_dir'].'/pages/'.$_GET['page'].'.php';
                     } else {
                         $_SESSION['error']['code'] = ERR_NOT_EXIST; //page doesn't exist
                         include $SETTINGS['cpassman_dir'].'/error.php';
@@ -1130,7 +1130,7 @@ 
         }
 
         // LOGIN form
-        include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
+        include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
     }
 
     ?>
@@ -1314,60 +1314,60 @@ 
     isset($_SESSION['CPM']) === true
     && 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 ($pageSel === '2fa') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
         } elseif ($pageSel === 'api') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
         } elseif ($pageSel === 'backups') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
         } elseif ($pageSel === 'emails') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
         } elseif ($pageSel === 'ldap') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
         } elseif ($pageSel === 'uploads') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
         } elseif ($pageSel === 'actions') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/actions.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/actions.js.php';
         } elseif ($pageSel === 'fields') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
         } elseif ($pageSel === 'options') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
         } elseif ($pageSel === 'statistics') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
         }
     } elseif ($pageSel === 'items') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
     } elseif ($pageSel === 'import') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
     } elseif ($pageSel === 'export') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
     } elseif ($pageSel === 'offline') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
     } elseif ($pageSel === 'search') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
     } elseif ($pageSel === 'profile') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
     } elseif ($pageSel === 'favourites') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
     } elseif ($pageSel === 'folders') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
     } elseif ($pageSel === 'users') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
     } elseif ($pageSel === 'roles') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
     } elseif ($pageSel === 'utilities.deletion') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
     } elseif ($pageSel === 'utilities.logs') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
     } elseif ($pageSel === 'utilities.database') {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
     } elseif ($pageSel === '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/ldap.queries.php

Spacing +41 added lines, -41 removed lines

@@ -44,26 +44,26 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, no-store, must-revalidate');
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // connect to the server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -86,7 +86,7 @@ 
 $aes->register();
 
 // Load AntiXSS
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
 $antiXss = new voku\helper\AntiXSS();
 
 // Prepare POST variables
@@ -140,35 +140,35 @@ 
         ];
 
         // Load expected libraries
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
 
         $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
         $ad->register();
@@ -183,7 +183,7 @@ 
             echo prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );
@@ -204,7 +204,7 @@ 
             echo prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );

sources/users.queries.php

Spacing +165 added lines, -165 removed lines

@@ -45,8 +45,8 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $isprofileupdate = filter_input(INPUT_POST, 'isprofileupdate', FILTER_SANITIZE_STRING);
 if (
     checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
@@ -57,7 +57,7 @@ 
         || $isprofileupdate === false
     ) {
         $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
         exit();
     } else {
         // Do special check to allow user to change attributes of his profile
@@ -66,20 +66,20 @@ 
             || checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
         ) {
             $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-            include $SETTINGS['cpassman_dir'] . '/error.php';
+            include $SETTINGS['cpassman_dir'].'/error.php';
             exit();
         }
     }
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -136,7 +136,7 @@ 
             // Prepare variables
             $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
             $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL);
-            $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
+            $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
             $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING);
             $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING);
             $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT);
@@ -165,7 +165,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $login
             );
@@ -387,7 +387,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -406,7 +406,7 @@ 
                 );
                 // delete personal folder and subfolders
                 $data = DB::queryfirstrow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %s AND personal_folder = %i',
                     $post_id,
                     '1'
@@ -419,7 +419,7 @@ 
                         DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                         // delete items & logs
                         $items = DB::query(
-                            'SELECT id FROM ' . prefixTable('items') . '
+                            'SELECT id FROM '.prefixTable('items').'
                             WHERE id_tree=%i AND perso = %i',
                             $folder->id,
                             '1'
@@ -476,7 +476,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -518,7 +518,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -561,7 +561,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -605,7 +605,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -648,7 +648,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -691,7 +691,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -731,7 +731,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -770,7 +770,7 @@ 
             $return = array();
             // Check if folder exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('nested_tree') . '
+                'SELECT * FROM '.prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING),
                 '0'
@@ -783,7 +783,7 @@ 
             }
             // Check if role exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('roles_title') . '
+                'SELECT * FROM '.prefixTable('roles_title').'
                 WHERE title = %s',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING)
             );
@@ -803,7 +803,7 @@ 
         case 'user_log_items':
             $nb_pages = 1;
             $logs = $sql_filter = '';
-            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . '&nbsp;:&nbsp;</td>';
+            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').'&nbsp;:&nbsp;</td>';
 
             // Prepare POST variables
             $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT);
@@ -815,14 +815,14 @@ 
                     && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING))
                     && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all'
                 ) {
-                    $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'";
+                    $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'";
                 }
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                     WHERE l.id_user = %i ' . $sql_filter,
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
@@ -840,19 +840,19 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT l.date as date, u.login as login, i.label as label, l.action as action
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                    WHERE l.id_user = %i ' . $sql_filter . '
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                    WHERE l.id_user = %i ' . $sql_filter.'
                     ORDER BY date DESC
-                    LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page),
+                    LIMIT ' . intval($start).','.intval($post_nb_items_by_page),
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
             } else {
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1=%i',
                     'user_mngt',
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
@@ -871,7 +871,7 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1 = %i
                     ORDER BY date DESC
                     LIMIT %i, %i',
@@ -885,7 +885,7 @@ 
             if (isset($counter) && $counter != 0) {
                 $nb_pages = ceil($counter / intval($post_nb_items_by_page));
                 for ($i = 1; $i <= $nb_pages; ++$i) {
-                    $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>';
+                    $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
                 }
             }
             $pages .= '</tr></table>';
@@ -894,13 +894,13 @@ 
                     if ($post_scope === 'user_mngt') {
                         $user = DB::queryfirstrow(
                             'SELECT login
-                            from ' . prefixTable('users') . '
+                            from ' . prefixTable('users').'
                             WHERE id=%i',
                             $record['qui']
                         );
                         $user_1 = DB::queryfirstrow(
                             'SELECT login
-                            from ' . prefixTable('users') . '
+                            from ' . prefixTable('users').'
                             WHERE id=%i',
                             filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                         );
@@ -910,7 +910,7 @@ 
                         if ($tmp[0] == 'at_user_initial_pwd_changed') {
                             $label = langHdl('log_user_initial_pwd_changed');
                         } elseif ($tmp[0] == 'at_user_email_changed') {
-                            $label = langHdl('log_user_email_changed') . $tmp[1];
+                            $label = langHdl('log_user_email_changed').$tmp[1];
                         } elseif ($tmp[0] == 'at_user_added') {
                             $label = langHdl('log_user_created');
                         } elseif ($tmp[0] == 'at_user_locked') {
@@ -921,14 +921,14 @@ 
                             $label = langHdl('log_user_pwd_changed');
                         }
                         // prepare log
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>';
                     } else {
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . langHdl($record['action']) . '</td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.langHdl($record['action']).'</td></tr>';
                     }
                 }
             }
 
-            echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]';
+            echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]';
             break;
 
             /*
@@ -953,14 +953,14 @@ 
             } else {
                 // Get folder id for Admin
                 $admin_folder = DB::queryFirstRow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %i AND personal_folder = %i',
                     intval($_SESSION['user_id']),
                     '1'
                 );
                 // Get folder id for User
                 $user_folder = DB::queryFirstRow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title=%i AND personal_folder = %i',
                     intval($user_id),
                     '1'
@@ -970,15 +970,15 @@ 
                     // Get each Items in PF
                     $rows = DB::query(
                         'SELECT i.pw, i.label, l.id_user
-                        FROM ' . prefixTable('items') . ' as i
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id)
+                        FROM ' . prefixTable('items').' as i
+                        LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id)
                         WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i',
                         'at_creation',
                         '1',
                         intval($folder->id)
                     );
                     foreach ($rows as $record) {
-                        echo $record['label'] . ' - ';
+                        echo $record['label'].' - ';
                         // Change user
                         DB::update(
                             prefixTable('log_items'),
@@ -1013,7 +1013,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_user_id
             );
@@ -1050,7 +1050,7 @@ 
 
             // Do
             $rows = DB::query(
-                'SELECT id FROM ' . prefixTable('users') . '
+                'SELECT id FROM '.prefixTable('users').'
                 WHERE timestamp != %s AND admin != %i',
                 '',
                 '1'
@@ -1059,7 +1059,7 @@ 
                 // Get info about user to delete
                 $data_user = DB::queryfirstrow(
                     'SELECT admin, isAdministratedByRole, gestionnaire
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $record['id']
                 );
@@ -1113,7 +1113,7 @@ 
             // Get info about user
             $rowUser = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1131,7 +1131,7 @@ 
                 $arrFldAllowed = array();
 
                 //Build tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
@@ -1142,7 +1142,7 @@ 
                 // array of roles for actual user
                 $my_functions = explode(';', $_SESSION['fonction_id']);
 
-                $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title'));
+                $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title'));
                 foreach ($rows as $record) {
                     if (
                         (int) $_SESSION['is_admin'] === 1
@@ -1178,7 +1178,7 @@ 
                 $rolesList = array();
                 $managedBy = array();
                 $selected = '';
-                $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+                $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
                 foreach ($rows as $reccord) {
                     $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']);
                 }
@@ -1209,7 +1209,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => langHdl('managers_of') . ' ' . $fonction['title'],
+                                'title' => langHdl('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -1291,9 +1291,9 @@ 
 
                 // get USER STATUS
                 if ($rowUser['disabled'] == 1) {
-                    $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">' . langHdl('user_info_unlock_question') . '</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . langHdl('user_info_delete_question') . '</label>';
+                    $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">'.langHdl('user_info_unlock_question').'</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.langHdl('user_info_delete_question').'</label>';
                 } else {
-                    $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk">&nbsp;' . langHdl('user_info_lock_question');
+                    $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk">&nbsp;'.langHdl('user_info_lock_question');
                 }
 
                 $arrData['error'] = false;
@@ -1430,19 +1430,19 @@ 
 
             // Empty user
             if (empty($post_login) === true) {
-                echo '[ { "error" : "' . langHdl('error_empty_data') . '" } ]';
+                echo '[ { "error" : "'.langHdl('error_empty_data').'" } ]';
                 break;
             }
 
             // User has email?
             if (empty($post_email) === true) {
-                echo '[ { "error" : "' . langHdl('error_no_email') . '" } ]';
+                echo '[ { "error" : "'.langHdl('error_no_email').'" } ]';
                 break;
             }
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1463,7 +1463,7 @@ 
                     );
                     // delete personal folder and subfolders
                     $data = DB::queryfirstrow(
-                        'SELECT id FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id FROM '.prefixTable('nested_tree').'
                         WHERE title = %s AND personal_folder = %i',
                         $post_id,
                         '1'
@@ -1476,7 +1476,7 @@ 
                             DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                             // delete items & logs
                             $items = DB::query(
-                                'SELECT id FROM ' . prefixTable('items') . '
+                                'SELECT id FROM '.prefixTable('items').'
                                 WHERE id_tree=%i AND perso = %i',
                                 $folder->id,
                                 '1'
@@ -1497,7 +1497,7 @@ 
                 } else {
                     // Get old data about user
                     $oldData = DB::queryfirstrow(
-                        'SELECT * FROM ' . prefixTable('users') . '
+                        'SELECT * FROM '.prefixTable('users').'
                         WHERE id = %i',
                         $post_id
                     );
@@ -1534,7 +1534,7 @@ 
 
                     // update LOG
                     if ($oldData['email'] !== $post_email) {
-                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], intval($_SESSION['user_id']), $_SESSION['login'], $post_id);
+                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], intval($_SESSION['user_id']), $_SESSION['login'], $post_id);
                     }
 
                     if ((int) $oldData['disabled'] !== (int) $post_user_disabled) {
@@ -1594,7 +1594,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1644,7 +1644,7 @@ 
             }
 
             DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('users') . '
+                'SELECT * FROM '.prefixTable('users').'
                 WHERE login = %s',
                 filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING)
             );
@@ -1693,14 +1693,14 @@ 
             $arrData = array();
 
             //Build tree
-            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $tree->register();
             $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
             // get User info
             $rowUser = DB::queryFirstRow(
                 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1719,7 +1719,7 @@ 
                 // refine folders based upon roles
                 $rows = DB::query(
                     'SELECT folder_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id IN %ls
                     ORDER BY folder_id ASC',
                     $arrData['functions']
@@ -1748,7 +1748,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1761,37 +1761,37 @@ 
 
                             // manage right icon
                             if ($fld['type'] == 'W') {
-                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'ND') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } elseif ($fld['type'] == 'NE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'NDNE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } else {
                                 $color = '#FEBC11';
                                 $allowed = 'R';
                                 $title = langHdl('read');
-                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>';
+                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>';
                             }
 
-                            $html .= '<tr><td>' . $ident . $row['title'] .
-                                ' <small>[' . $row['id'] . ']</small></td><td>' . $label . '</td></tr>';
+                            $html .= '<tr><td>'.$ident.$row['title'].
+                                ' <small>['.$row['id'].']</small></td><td>'.$label.'</td></tr>';
                             break;
                         }
                     }
                 }
 
-                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' .
-                    $html . '</tbody></table>';
+                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'.
+                    $html.'</tbody></table>';
             } else {
                 $html_full = '';
             }
@@ -1837,7 +1837,7 @@ 
             if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i AND isAdministratedByRole IN %ls',
                     '0',
                     array_filter($_SESSION['user_roles'])
@@ -1845,7 +1845,7 @@ 
             } else {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i',
                     '0'
                 );
@@ -1857,7 +1857,7 @@ 
                 $groupIds = [];
                 foreach (explode(';', $record['fonction_id']) as $group) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                        'SELECT id, title FROM '.prefixTable('roles_title').'
                         WHERE id = %i',
                         $group
                     );
@@ -1869,7 +1869,7 @@ 
 
                 // Get managed_by
                 $managedBy = DB::queryfirstrow(
-                    'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                    'SELECT id, title FROM '.prefixTable('roles_title').'
                     WHERE id = %i',
                     $record['isAdministratedByRole']
                 );
@@ -1879,7 +1879,7 @@ 
                 $foldersAllowedIds = [];
                 foreach (explode(';', $record['groupes_visibles']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1892,7 +1892,7 @@ 
                 $foldersForbiddenIds = [];
                 foreach (explode(';', $record['groupes_interdits']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1910,7 +1910,7 @@ 
                         'login' => $record['login'],
                         'groups' => implode(', ', $groups),
                         'groupIds' => $groupIds,
-                        'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'],
+                        'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'],
                         'managedById' => $managedBy === null ? 0 : $managedBy['id'],
                         'foldersAllowed' => implode(', ', $foldersAllowed),
                         'foldersAllowedIds' => $foldersAllowedIds,
@@ -1988,7 +1988,7 @@ 
 
             // Get info about user
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_source_id
             );
@@ -2148,14 +2148,14 @@ 
             if (empty($post_context) === false && $post_context = 'add_one_role_to_user') {
                 $data_user = DB::queryfirstrow(
                     'SELECT fonction_id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
 
                 if ($data_user) {
                     // Ensure array is unique
-                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value;
+                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value;
                     $post_new_value = implode(';', array_unique(explode(';', $post_new_value)));
                 } else {
                     // User not found
@@ -2210,7 +2210,7 @@ 
             if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') {
                 $record = DB::queryFirstRow(
                     'SELECT user_ip_lastdate
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $_SESSION['user_id']
                 );
@@ -2302,38 +2302,38 @@ 
             ];
 
             // Load expected libraries
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
             $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
             $ad->register();
@@ -2349,7 +2349,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                     ),
                     'encode'
                 );
@@ -2369,11 +2369,11 @@ 
                 ['objectclass', '=', 'inetorgperson'],
             ])->get();
             
-            foreach($users as $i => $adUser) {
+            foreach ($users as $i => $adUser) {
                 //print_r($user);
 
                 // Build the list of all groups in AD
-                foreach($adUser['memberof'] as $j => $adUserGroup) {
+                foreach ($adUser['memberof'] as $j => $adUserGroup) {
                     if (empty($adUserGroup) === false) {
                         $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3);
                         if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) {
@@ -2388,7 +2388,7 @@ 
                     // Get his ID
                     $user = DB::queryfirstrow(
                         'SELECT id, fonction_id, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2423,7 +2423,7 @@ 
             }
 
             // Get all groups in Teampass
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2457,7 +2457,7 @@ 
             $debug_ldap = $ldap_suffix = '';
 
             // Get list of existing Roles in Teampass
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2470,35 +2470,35 @@ 
 
             //Multiple Domain Names
             if (strpos(html_entity_decode($dataReceived['username']), '\\') === true) {
-                $ldap_suffix = '@' . substr(html_entity_decode($dataReceived['username']), 0, strpos(html_entity_decode($dataReceived['username']), '\\'));
+                $ldap_suffix = '@'.substr(html_entity_decode($dataReceived['username']), 0, strpos(html_entity_decode($dataReceived['username']), '\\'));
                 $dataReceived['username'] = substr(html_entity_decode($dataReceived['username']), strpos(html_entity_decode($dataReceived['username']), '\\') + 1);
             }
             if ($SETTINGS['ldap_type'] === 'posix-search') {
                 $ldapURIs = '';
                 foreach (explode(',', $SETTINGS['ldap_hosts']) as $domainControler) {
                     if ((int) $SETTINGS['ldap_ssl'] === 1) {
-                        $ldapURIs .= 'ldaps://' . $domainControler . ':' . $SETTINGS['ldap_port'] . ' ';
+                        $ldapURIs .= 'ldaps://'.$domainControler.':'.$SETTINGS['ldap_port'].' ';
                     } else {
-                        $ldapURIs .= 'ldap://' . $domainControler . ':' . $SETTINGS['ldap_port'] . ' ';
+                        $ldapURIs .= 'ldap://'.$domainControler.':'.$SETTINGS['ldap_port'].' ';
                     }
                 }
 
-                $debug_ldap .= 'LDAP URIs : ' . $ldapURIs . '<br/>';
+                $debug_ldap .= 'LDAP URIs : '.$ldapURIs.'<br/>';
                 $ldapconn = ldap_connect($ldapURIs);
 
                 if ($SETTINGS['ldap_ssl']) {
                     ldap_start_tls($ldapconn);
                 }
 
-                $debug_ldap .= 'LDAP connection : ' . ($ldapconn ? 'Connected' : 'Failed') . '<br/>';
+                $debug_ldap .= 'LDAP connection : '.($ldapconn ? 'Connected' : 'Failed').'<br/>';
 
                 if ($ldapconn) {
-                    $debug_ldap .= 'DN : ' . $SETTINGS['ldap_bind_dn'] . ' -- ' . $SETTINGS['ldap_bind_passwd'] . '<br/>';
+                    $debug_ldap .= 'DN : '.$SETTINGS['ldap_bind_dn'].' -- '.$SETTINGS['ldap_bind_passwd'].'<br/>';
                     ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
                     ldap_set_option($ldapconn, LDAP_OPT_REFERRALS, 0);
                     $ldapbind = ldap_bind($ldapconn, $SETTINGS['ldap_bind_dn'], $SETTINGS['ldap_bind_passwd']);
 
-                    $debug_ldap .= 'LDAP bind : ' . ($ldapbind ? 'Bound' : 'Failed') . '<br/>';
+                    $debug_ldap .= 'LDAP bind : '.($ldapbind ? 'Bound' : 'Failed').'<br/>';
 
                     if ($ldapbind) {
                         //$filter = '(&(' . $SETTINGS['ldap_user_attribute'] . '=' . $dataReceived['username'] . ')(objectClass=' . $SETTINGS['ldap_object_class'] . '))';
@@ -2536,7 +2536,7 @@ 
                                     // Get his ID
                                     $user = DB::queryfirstrow(
                                         'SELECT id, fonction_id, auth_type
-                                        FROM ' . prefixTable('users') . '
+                                        FROM ' . prefixTable('users').'
                                         WHERE login = %s',
                                         $userLogin
                                     );
@@ -2551,7 +2551,7 @@ 
                                             foreach (explode(';', $user['fonction_id']) as $group) {
                                                 $entry = DB::queryfirstrow(
                                                     'SELECT title
-                                                    FROM ' . prefixTable('roles_title') . '
+                                                    FROM ' . prefixTable('roles_title').'
                                                     WHERE id = %i',
                                                     $group
                                                 );
@@ -2627,20 +2627,20 @@ 
                     $debug_ldap .= 'Error - Could not connect to server!';
                 }
             } else {
-                $debug_ldap .= 'Get all ldap params: <br/>' .
-                    '  - base_dn : ' . $SETTINGS['ldap_domain_dn'] . '<br/>' .
-                    '  - account_suffix : ' . $SETTINGS['ldap_suffix'] . '<br/>' .
-                    '  - domain_controllers : ' . $SETTINGS['ldap_hosts'] . '<br/>' .
-                    '  - ad_port : ' . $SETTINGS['ldap_port'] . '<br/>' .
-                    '  - use_ssl : ' . $SETTINGS['ldap_ssl'] . '<br/>' .
-                    '  - use_tls : ' . $SETTINGS['ldap_tls'] . '<br/>*********<br/>';
+                $debug_ldap .= 'Get all ldap params: <br/>'.
+                    '  - base_dn : '.$SETTINGS['ldap_domain_dn'].'<br/>'.
+                    '  - account_suffix : '.$SETTINGS['ldap_suffix'].'<br/>'.
+                    '  - domain_controllers : '.$SETTINGS['ldap_hosts'].'<br/>'.
+                    '  - ad_port : '.$SETTINGS['ldap_port'].'<br/>'.
+                    '  - use_ssl : '.$SETTINGS['ldap_ssl'].'<br/>'.
+                    '  - use_tls : '.$SETTINGS['ldap_tls'].'<br/>*********<br/>';
 
                 $adldap = new SplClassLoader('adLDAP', '../includes/libraries/LDAP');
                 $adldap->register();
 
                 // Posix style LDAP handles user searches a bit differently
                 if ($SETTINGS['ldap_type'] === 'posix') {
-                    $ldap_suffix = ',' . $SETTINGS['ldap_suffix'] . ',' . $SETTINGS['ldap_domain_dn'];
+                    $ldap_suffix = ','.$SETTINGS['ldap_suffix'].','.$SETTINGS['ldap_domain_dn'];
                 } elseif ($SETTINGS['ldap_type'] === 'windows' && $ldap_suffix === '') { //Multiple Domain Names
                     $ldap_suffix = $SETTINGS['ldap_suffix'];
                 }
@@ -2655,11 +2655,11 @@ 
                     )
                 );
 
-                $debug_ldap .= 'Create new adldap object : ' . $adldap->getLastError() . '<br/><br/>';
+                $debug_ldap .= 'Create new adldap object : '.$adldap->getLastError().'<br/><br/>';
 
                 // openLDAP expects an attribute=value pair
                 if ($SETTINGS['ldap_type'] === 'posix') {
-                    $auth_username = $SETTINGS['ldap_user_attribute'] . '=' . $dataReceived['username'];
+                    $auth_username = $SETTINGS['ldap_user_attribute'].'='.$dataReceived['username'];
                 } else {
                     $auth_username = $dataReceived['username'];
                 }
@@ -2671,8 +2671,8 @@ 
                     $ldapConnection = 'Not possible to get connected with this user';
                 }
 
-                $debug_ldap .= 'After authenticate : ' . $adldap->getLastError() . '<br/><br/>' .
-                    'ldap status : ' . $ldapConnection; //Debug
+                $debug_ldap .= 'After authenticate : '.$adldap->getLastError().'<br/><br/>'.
+                    'ldap status : '.$ldapConnection; //Debug
             }
 
             echo prepareExchangedData(
@@ -2732,7 +2732,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -2832,7 +2832,7 @@ 
                 );
 
                 // Rebuild tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
                 $tree->rebuild();
@@ -2898,7 +2898,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2974,7 +2974,7 @@ 
             // Check if user already exists
             $userInfo = DB::queryfirstrow(
                 'SELECT id, private_key, public_key
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_userid
             );
@@ -3009,7 +3009,7 @@ 
             if (count($_SESSION['personal_folders']) > 0) {
                 DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree IN %ls',
                     $_SESSION['personal_folders']
                 );
@@ -3057,7 +3057,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );
@@ -3090,7 +3090,7 @@ 
             logEvents(
                 $SETTINGS,
                 'user_mngt',
-                'at_user_new_' . $value[0] . ':' . $value[1],
+                'at_user_new_'.$value[0].':'.$value[1],
                 $_SESSION['user_id'],
                 $_SESSION['login'],
                 filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING)
@@ -3122,7 +3122,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );

sources/identify.php

Spacing +93 added lines, -93 removed lines

@@ -43,12 +43,12 @@ 
 }
 
 // Load AntiXSS
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
 $antiXss = new voku\helper\AntiXSS();
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // init
 $ldap_suffix = '';
@@ -57,12 +57,12 @@ 
 
 // If Debug then clean the files
 if (DEBUGLDAP === true) {
-    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
+    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
     $fp = fopen(DEBUGLDAPFILE, 'w');
     fclose($fp);
 }
 if (DEBUGDUO === true) {
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
     $fp = fopen(DEBUGDUOFILE, 'w');
     fclose($fp);
 }
@@ -79,7 +79,7 @@ 
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -99,7 +99,7 @@ 
     // Get DUO keys
     $duoData = DB::query(
         'SELECT intitule, valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s',
         'duoSecurity'
     );
@@ -108,7 +108,7 @@ 
     }
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $sig_request = Duo::signRequest(
         $_GLOBALS['IKEY'],
         $_GLOBALS['SKEY'],
@@ -120,17 +120,17 @@ 
         debugIdentify(
             DEBUGDUO,
             DEBUGDUOFILE,
-            "\n\n-----\n\n" .
-                'sig request : ' . $post_login . "\n" .
-                'resp : ' . $sig_request . "\n"
+            "\n\n-----\n\n".
+                'sig request : '.$post_login."\n".
+                'resp : '.$sig_request."\n"
         );
     }
 
     // load csrfprotector
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
 
     // return result
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
     // ---
     // ---
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -140,7 +140,7 @@ 
     //--------
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $authenticated_username = Duo::verifyResponse(
         $SETTINGS['duo_ikey'],
         $SETTINGS['duo_skey'],
@@ -152,9 +152,9 @@ 
         debugIdentify(
             DEBUGDUO,
             DEBUGDUOFILE,
-            "\n\n-----\n\n" .
-                'sig response : ' . $post_sig_response . "\n" .
-                'resp : ' . $authenticated_username . "\n"
+            "\n\n-----\n\n".
+                'sig response : '.$post_sig_response."\n".
+                'resp : '.$authenticated_username."\n"
         );
     }
 
@@ -165,7 +165,7 @@ 
             // is user in Teampass?
             $userInfo = DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -176,9 +176,9 @@ 
             }
         }
 
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     } else {
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     }
     // ---
     // ---
@@ -189,7 +189,7 @@ 
 
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare GET variables
@@ -282,19 +282,19 @@ 
     } else {
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
     }
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
     header('Content-type: text/html; charset=utf-8');
     error_reporting(E_ERROR);
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare GET variables
@@ -308,11 +308,11 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        "Content of data sent '" . filter_var($sentData, FILTER_SANITIZE_STRING) . "'\n"
+        "Content of data sent '".filter_var($sentData, FILTER_SANITIZE_STRING)."'\n"
     );
 
     // connect to the server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -324,7 +324,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
     //echo $dataReceived." -->".empty($sessionKey)."<-- ".$sessionKey." ** " ;
     // decrypt and retreive data in JSON format
     if (empty($sessionKey) === true) {
@@ -411,7 +411,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE login=%s',
         $username
     );
@@ -634,7 +634,7 @@ 
         //$arrAttempts = array();
         $rows = DB::query(
             'SELECT date
-            FROM ' . prefixTable('log_system') . "
+            FROM ' . prefixTable('log_system')."
             WHERE field_1 = %s
             AND type = 'failed_auth'
             AND label = 'user_password_not_correct'
@@ -650,7 +650,7 @@ 
             foreach ($rows as $record) {
                 array_push(
                     $arrAttempts,
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date'])
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date'])
                 );
             }
         }
@@ -790,7 +790,7 @@ 
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
             $resRoles = DB::queryFirstRow(
                 'SELECT title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id=%i',
                 $role
             );
@@ -811,7 +811,7 @@ 
 
         // build complete array of roles
         $superGlobal->put('arr_roles_full', array(), 'SESSION');
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
         foreach ($rows as $record) {
             $superGlobal->put(
                 $record['id'],
@@ -906,7 +906,7 @@ 
             if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -915,7 +915,7 @@ 
                     array(
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&amp;group=' . $dataLastItems['id_tree'] . '&amp;id=' . $item,
+                        'url' => 'index.php?page=items&amp;group='.$dataLastItems['id_tree'].'&amp;id='.$item,
                     ),
                     'SESSION',
                     'latest_items_tab'
@@ -932,12 +932,12 @@ 
         ) {
             // get all Admin users
             $receivers = '';
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             foreach ($rows as $record) {
                 if (empty($receivers)) {
                     $receivers = $record['email'];
                 } else {
-                    $receivers = ',' . $record['email'];
+                    $receivers = ','.$record['email'];
                 }
             }
             // Add email to table
@@ -953,7 +953,7 @@ 
                             '#tp_time#',
                         ),
                         array(
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], $superGlobal->get('last_connection', 'SESSION')),
                             date($SETTINGS['time_format'], $superGlobal->get('last_connection', 'SESSION')),
                         ),
@@ -1102,8 +1102,8 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        "\n\n----\n" .
-            'Identified : ' . filter_var($return, FILTER_SANITIZE_STRING) . "\n\n"
+        "\n\n----\n".
+            'Identified : '.filter_var($return, FILTER_SANITIZE_STRING)."\n\n"
     );
 
     echo prepareExchangedData(
@@ -1169,44 +1169,44 @@ 
     ];
     
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/illuminate/Contracts/Auth/Authenticatable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/illuminate/Contracts/Auth/Authenticatable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
@@ -1221,7 +1221,7 @@ 
 
         return array(
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage()." ".$config['username'],
+            'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage()." ".$config['username'],
              
         );
     }
@@ -1266,7 +1266,7 @@ 
     }*/
 
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1282,7 +1282,7 @@ 
             'id = %i',
             $userInfo['id']
         );
-    } else if ($userInfo['special']=== 'user_added_from_ldap') {
+    } else if ($userInfo['special'] === 'user_added_from_ldap') {
         // Case where user has been added from LDAP and never being connected to TP
         // We need to create his keys
         $userKeys = generateUserKeys($passwordClear);
@@ -1335,7 +1335,7 @@ 
 function yubicoMFACheck($dataReceived, $userInfo, $SETTINGS)
 {
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1378,7 +1378,7 @@ 
     }
 
     // Now check yubico validity
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
     $auth = $yubi->verify($yubico_key); //, null, null, null, 60
 
@@ -1433,7 +1433,7 @@ 
             'gestionnaire' => '0',
             'can_manage_all_users' => '0',
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
-            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
+            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
             'groupes_interdits' => '',
             'groupes_visibles' => '',
             'last_pw_change' => time(),
@@ -1459,7 +1459,7 @@ 
         );
 
         // Rebuild tree
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $tree->register();
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
         $tree->rebuild();
@@ -1490,7 +1490,7 @@ 
         && empty($dataReceived['GACode']) === false
     ) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1500,7 +1500,7 @@ 
         $proceedIdentification = false;
         
         // load library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
 
         // create new instance
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
@@ -1526,7 +1526,7 @@ 
 
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
 
@@ -1541,7 +1541,7 @@ 
             );
 
             $firstTime = array(
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1594,8 +1594,8 @@ 
     $userPasswordVerified = false;
 
     // load passwordLib library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
 

sources/main.queries.php

Spacing +144 added lines, -144 removed lines

@@ -43,8 +43,8 @@ 
 }
 
 // DO CHECKS
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING);
 if (
     isset($post_type) === true
@@ -60,7 +60,7 @@ 
     && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false
 ) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 } elseif ((isset($_SESSION['user_id']) === true
         && isset($_SESSION['key'])) === true
@@ -71,7 +71,7 @@ 
     mainQuery($SETTINGS);
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -102,15 +102,15 @@ 
         date_default_timezone_set('UTC');
     }
 
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
     // Includes
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
     // Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -122,7 +122,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
     // Prepare post variables
     $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING);
@@ -191,7 +191,7 @@ 
                     echo prepareExchangedData(
                         array(
                             'error' => true,
-                            'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('error_not_allowed_to') . '</div>',
+                            'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('error_not_allowed_to').'</div>',
                         ),
                         'encode'
                     );
@@ -201,7 +201,7 @@ 
                 // check if expected security level is reached
                 $dataUser = DB::queryfirstrow(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -223,8 +223,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 {
@@ -237,8 +237,8 @@ 
                     echo prepareExchangedData(
                         array(
                             'error' => true,
-                            'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
-                                langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                            'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
+                                langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                         ),
                         'encode'
                     );
@@ -439,14 +439,14 @@ 
                 // Get data about user
                 $data = DB::queryfirstrow(
                     'SELECT id, email, pw
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE login = %s',
                     $post_login
                 );
             } else {
                 $data = DB::queryfirstrow(
                     'SELECT id, login, email, pw
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_id
                 );
@@ -457,7 +457,7 @@ 
             $counter = DB::count();
 
             // load passwordLib library
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $pwdlib->register();
             $pwdlib = new PasswordLib\PasswordLib();
 
@@ -503,7 +503,7 @@ 
                     );
                 } else {
                     // generate new GA user code
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
                     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
                     $gaSecretKey = $tfa->createSecret();
                     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -598,7 +598,7 @@ 
                                 'email' => $data['email'],
                                 'email_result' => str_replace(
                                     '#email#',
-                                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                                    '<b>'.obfuscateEmail($data['email']).'</b>',
                                     addslashes(langHdl('admin_email_result_ok'))
                                 ),
                             ),
@@ -613,7 +613,7 @@ 
                                 'email' => $data['email'],
                                 'email_result' => str_replace(
                                     '#email#',
-                                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                                    '<b>'.obfuscateEmail($data['email']).'</b>',
                                     addslashes(langHdl('admin_email_result_ok'))
                                 ),
                             ),
@@ -641,7 +641,7 @@ 
                     $_SESSION['user_id']
                 );
                 // Return data
-                echo '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
+                echo '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
             } else {
                 echo '[{"new_value":"expired"}]';
             }
@@ -666,26 +666,26 @@ 
             // Get account and pw associated to email
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
             $counter = DB::count();
             if ($counter != 0) {
                 $data = DB::queryFirstRow(
-                    'SELECT login, pw, email FROM ' . prefixTable('users') . ' WHERE login = %s',
+                    'SELECT login, pw, email FROM '.prefixTable('users').' WHERE login = %s',
                     $post_login
                 );
-                $textMail = langHdl('forgot_pw_email_body_1') . ' <a href="' .
-                    $SETTINGS['cpassman_url'] . '/index.php?action=password_recovery&key=' . $key .
-                    '&login=' . $post_login . '">' . $SETTINGS['cpassman_url'] .
-                    '/index.php?action=password_recovery&key=' . $key . '&login=' . $post_login . '</a>.<br><br>' . langHdl('thku');
-                $textMailAlt = langHdl('forgot_pw_email_altbody_1') . ' ' . langHdl('at_login') . ' : ' . $post_login . ' - ' .
-                    langHdl('index_password') . ' : ' . md5($data['pw']);
+                $textMail = langHdl('forgot_pw_email_body_1').' <a href="'.
+                    $SETTINGS['cpassman_url'].'/index.php?action=password_recovery&key='.$key.
+                    '&login='.$post_login.'">'.$SETTINGS['cpassman_url'].
+                    '/index.php?action=password_recovery&key='.$key.'&login='.$post_login.'</a>.<br><br>'.langHdl('thku');
+                $textMailAlt = langHdl('forgot_pw_email_altbody_1').' '.langHdl('at_login').' : '.$post_login.' - '.
+                    langHdl('index_password').' : '.md5($data['pw']);
 
                 // Check if email has already a key in DB
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('misc') . ' WHERE intitule = %s AND type = %s',
+                    'SELECT * FROM '.prefixTable('misc').' WHERE intitule = %s AND type = %s',
                     $post_login,
                     'password_recovery'
                 );
@@ -723,10 +723,10 @@ 
                     true
                 );
 
-                echo '[{"error":"' . $ret['error'] . '" , "message":"' . $ret['message'] . '"}]';
+                echo '[{"error":"'.$ret['error'].'" , "message":"'.$ret['message'].'"}]';
             } else {
                 // no one has this email ... alert
-                echo '[{"error":"error_email" , "message":"' . langHdl('forgot_my_pw_error_email_not_exist') . '"}]';
+                echo '[{"error":"error_email" , "message":"'.langHdl('forgot_my_pw_error_email_not_exist').'"}]';
             }
             break;
 
@@ -745,7 +745,7 @@ 
             // check if key is okay
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE intitule = %s AND type = %s',
                 $login,
                 'password_recovery'
@@ -781,7 +781,7 @@ 
                 );
                 // Get email
                 $dataUser = DB::queryFirstRow(
-                    'SELECT email FROM ' . prefixTable('users') . ' WHERE login = %s',
+                    'SELECT email FROM '.prefixTable('users').' WHERE login = %s',
                     $login
                 );
 
@@ -790,10 +790,10 @@ 
                 $ret = json_decode(
                     sendEmail(
                         langHdl('forgot_pw_email_subject_confirm'),
-                        langHdl('forgot_pw_email_body') . ' ' . $newPwNotCrypted,
+                        langHdl('forgot_pw_email_body').' '.$newPwNotCrypted,
                         $dataUser['email'],
                         $SETTINGS,
-                        strip_tags(langHdl('forgot_pw_email_body')) . ' ' . $newPwNotCrypted
+                        strip_tags(langHdl('forgot_pw_email_body')).' '.$newPwNotCrypted
                     ),
                     true
                 );
@@ -902,7 +902,7 @@ 
                     // Store PSK
                     $_SESSION['user']['session_psk'] = $user_key_encoded;
                     setcookie(
-                        'TeamPass_PFSK_' . md5($_SESSION['user_id']),
+                        'TeamPass_PFSK_'.md5($_SESSION['user_id']),
                         $user_key_encoded,
                         (!isset($SETTINGS['personal_saltkey_cookie_duration']) || $SETTINGS['personal_saltkey_cookie_duration'] == 0) ? time() + 60 * 60 * 24 : time() + 60 * 60 * 24 * $SETTINGS['personal_saltkey_cookie_duration'],
                         '/'
@@ -950,7 +950,7 @@ 
             // Get key from user
             $userInfo = DB::queryfirstrow(
                 'SELECT encrypted_psk
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $_SESSION['user_id']
             );
@@ -1045,8 +1045,8 @@ 
             // Build list of items to be re-encrypted
             $rows = DB::query(
                 'SELECT i.id as id, i.pw as pw
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
                 WHERE i.perso = %i AND l.id_user= %i AND l.action = %s',
                 '1',
                 $_SESSION['user_id'],
@@ -1058,14 +1058,14 @@ 
                     if (empty($list)) {
                         $list = $record['id'];
                     } else {
-                        $list .= ',' . $record['id'];
+                        $list .= ','.$record['id'];
                     }
                 }
             }
 
             // change salt
             setcookie(
-                'TeamPass_PFSK_' . md5($_SESSION['user_id']),
+                'TeamPass_PFSK_'.md5($_SESSION['user_id']),
                 $_SESSION['user']['session_psk'],
                 time() + 60 * 60 * 24 * $SETTINGS['personal_saltkey_cookie_duration'],
                 '/'
@@ -1112,8 +1112,8 @@ 
                     // delete all previous items of this user
                     $rows = DB::query(
                         'SELECT i.id as id
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
                         WHERE i.perso = %i AND l.id_user= %i AND l.action = %s',
                         '1',
                         $_SESSION['user_id'],
@@ -1158,7 +1158,7 @@ 
 
                     // change salt
                     setcookie(
-                        'TeamPass_PFSK_' . md5($_SESSION['user_id']),
+                        'TeamPass_PFSK_'.md5($_SESSION['user_id']),
                         $_SESSION['user']['session_psk'],
                         time() + 60 * 60 * 24 * $SETTINGS['personal_saltkey_cookie_duration'],
                         '/'
@@ -1211,7 +1211,7 @@ 
                 && $SETTINGS['enable_send_email_on_user_login'] === '1'
             ) {
                 $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'
                 );
@@ -1219,12 +1219,12 @@ 
                 if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
                     $rows = DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('emails') .
+                        FROM ' . prefixTable('emails').
                             ' WHERE status != %s',
                         'sent'
                     );
                     foreach ($rows as $record) {
-                        echo $record['increment_id'] . " >> ";
+                        echo $record['increment_id']." >> ";
                         // Send email
                         $ret = json_decode(
                             sendEmail(
@@ -1342,7 +1342,7 @@ 
          */
         case 'check_login_exists':
             $data = DB::query(
-                'SELECT login, psk FROM ' . prefixTable('users') . '
+                'SELECT login, psk FROM '.prefixTable('users').'
                 WHERE login = %i',
                 stripslashes(filter_input(INPUT_POST, 'userId', FILTER_SANITIZE_NUMBER_INT))
             );
@@ -1352,7 +1352,7 @@ 
                 $userOk = true;
             }
 
-            echo '[{"login" : "' . $userOk . '", "psk":"0"}]';
+            echo '[{"login" : "'.$userOk.'", "psk":"0"}]';
             break;
             /*
          * Make statistics on item
@@ -1363,7 +1363,7 @@ 
                 && filter_input(INPUT_POST, 'scope', FILTER_SANITIZE_STRING) === 'item'
             ) {
                 $data = DB::queryfirstrow(
-                    'SELECT view FROM ' . prefixTable('statistics') . ' WHERE scope = %s AND item_id = %i',
+                    'SELECT view FROM '.prefixTable('statistics').' WHERE scope = %s AND item_id = %i',
                     'item',
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
@@ -1404,8 +1404,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',
@@ -1438,7 +1438,7 @@ 
                 isset($SETTINGS['enable_suggestion']) && $SETTINGS['enable_suggestion'] == 1
                 && ($_SESSION['user_admin'] == 1 || $_SESSION['user_manager'] == 1)
             ) {
-                DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+                DB::query('SELECT * FROM '.prefixTable('suggestion'));
                 $nb_suggestions_waiting = DB::count();
             }
 
@@ -1462,7 +1462,7 @@ 
             $pwdlib = new PasswordLib\PasswordLib();
             // generate key
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
             break;
 
             /*
@@ -1491,7 +1491,7 @@ 
                 )
             );
 
-            echo '[{"token" : "' . $token . '"}]';
+            echo '[{"token" : "'.$token.'"}]';
             break;
 
             /*
@@ -1517,14 +1517,14 @@ 
 
             if ($_SESSION['user_manager'] === '1' || $_SESSION['is_admin'] === '1') {
                 $count = 0;
-                DB::query('SELECT * FROM ' . prefixTable('items_change'));
+                DB::query('SELECT * FROM '.prefixTable('items_change'));
                 $count += DB::count();
-                DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+                DB::query('SELECT * FROM '.prefixTable('suggestion'));
                 $count += DB::count();
 
-                echo '[ { "error" : "" , "count" : "' . $count . '" , "show_sug_in_menu" : "0"} ]';
+                echo '[ { "error" : "" , "count" : "'.$count.'" , "show_sug_in_menu" : "0"} ]';
             } elseif (isset($_SESSION['nb_item_change_proposals']) && $_SESSION['nb_item_change_proposals'] > 0) {
-                echo '[ { "error" : "" , "count" : "' . $_SESSION['nb_item_change_proposals'] . '" , "show_sug_in_menu" : "1"} ]';
+                echo '[ { "error" : "" , "count" : "'.$_SESSION['nb_item_change_proposals'].'" , "show_sug_in_menu" : "1"} ]';
             } else {
                 echo '[ { "error" : "" , "count" : "" , "show_sug_in_menu" : "0"} ]';
             }
@@ -1559,9 +1559,9 @@ 
                         $tmp = '';
                         foreach ($stats_data[$data] as $key => $value) {
                             if (empty($tmp)) {
-                                $tmp = $key . '-' . $value;
+                                $tmp = $key.'-'.$value;
                             } else {
-                                $tmp .= ',' . $key . '-' . $value;
+                                $tmp .= ','.$key.'-'.$value;
                             }
                         }
                         $statsToSend[$data] = $tmp;
@@ -1569,9 +1569,9 @@ 
                         $tmp = '';
                         foreach ($stats_data[$data] as $key => $value) {
                             if (empty($tmp)) {
-                                $tmp = $key . '-' . $value;
+                                $tmp = $key.'-'.$value;
                             } else {
-                                $tmp .= ',' . $key . '-' . $value;
+                                $tmp .= ','.$key.'-'.$value;
                             }
                         }
                         $statsToSend[$data] = $tmp;
@@ -1660,8 +1660,8 @@ 
                     if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
                         $url_found = substr($line, 19, strlen($line) - 22);
                         $tmp = parse_url($url_found);
-                        $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
-                        $line = "'cpassman_url' => '" . $anonym_url . "\n";
+                        $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
+                        $line = "'cpassman_url' => '".$anonym_url."\n";
                     }
 
                     // Anonymize all urls
@@ -1686,7 +1686,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"
@@ -1694,10 +1694,10 @@ 
             if (DB::count() > 0) {
                 foreach ($rows as $record) {
                     if (empty($teampass_errors) === true) {
-                        $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['error_date']) . ' - ' . $record['label'];
+                        $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['error_date']).' - '.$record['label'];
                     } else {
                         $teampass_errors .= '
- * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['error_date']) . ' - ' . $record['label'];
+ * ' . date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['error_date']).' - '.$record['label'];
                     }
                 }
             }
@@ -1706,7 +1706,7 @@ 
 
             // Now prepare text
             $txt = '### Page on which it happened
-' . $post_data['current_page'] . '
+' . $post_data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1721,39 +1721,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 ? langHdl('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION_FULL . '
+**Teampass version:** ' . TP_VERSION_FULL.'
 
 **Teampass configuration file:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
 
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
+**Operating system:** ' . $post_data['os'].' - '.$post_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)
@@ -1858,7 +1858,7 @@ 
                 // Check if user exists
                 $userInfo = DB::queryFirstRow(
                     'SELECT public_key, private_key, pw
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -1866,14 +1866,14 @@ 
                     // Get one item
                     $record = DB::queryFirstRow(
                         'SELECT id, pw
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE perso = 0'
                     );
 
                     // 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'],
                         $post_user_id
@@ -1902,7 +1902,7 @@ 
                     } else {
                         // Use the password check
                         // load passwordLib library
-                        $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                        $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
                         $pwdlib->register();
                         $pwdlib = new PasswordLib\PasswordLib();
                         
@@ -1965,7 +1965,7 @@ 
                 // Get user info
                 $userData = DB::queryFirstRow(
                     'SELECT email, auth_type, login
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -1991,7 +1991,7 @@ 
                     } else {
                         // Use the password check
                         // load passwordLib library
-                        $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                        $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
                         $pwdlib->register();
                         $pwdlib = new PasswordLib\PasswordLib();
                         
@@ -2080,7 +2080,7 @@ 
                 // Get user info
                 $userData = DB::queryFirstRow(
                     'SELECT private_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -2101,7 +2101,7 @@ 
                     );
 
                     // Load superGlobals
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -2163,7 +2163,7 @@ 
                 // Get user info
                 $userData = DB::queryFirstRow(
                     'SELECT email, auth_type, login
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -2231,7 +2231,7 @@ 
                             array(
                                 'error' => false,
                                 'message' => '',
-                                'debug' => $post_user_password. ' - Email was sent',
+                                'debug' => $post_user_password.' - Email was sent',
                             ),
                             'encode'
                         );
@@ -2365,7 +2365,7 @@ 
                     // Get user info
                     $userData = DB::queryFirstRow(
                         'SELECT email, auth_type, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $post_user_id
                     );
@@ -2434,13 +2434,13 @@ 
                 // Check if user exists
                 DB::queryFirstRow(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
                 if (DB::count() > 0) {
                     // Include libraries
-                    include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+                    include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
                     // CLear old sharekeys
                     if ($post_self_change === false) {
@@ -2509,13 +2509,13 @@ 
                 // Check if user exists
                 $userInfo = DB::queryFirstRow(
                     'SELECT public_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
                 if (DB::count() > 0) {
                     // Include libraries
-                    include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+                    include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
                     // WHAT STEP TO PERFORM?
                     if ($post_action === 'step0') {
@@ -2531,15 +2531,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['user_id']
@@ -2566,7 +2566,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['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
@@ -2599,7 +2599,7 @@ 
                         // SHould we change step?
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('items') . '
+                            FROM ' . prefixTable('items').'
                             WHERE perso = 0'
                         );
                         $next_start = (int) $post_start + (int) $post_length;
@@ -2615,15 +2615,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['user_id']
@@ -2650,7 +2650,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['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
@@ -2672,7 +2672,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"'
                         );
                         $next_start = (int) $post_start + (int) $post_length;
@@ -2688,15 +2688,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['user_id']
@@ -2723,7 +2723,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['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
@@ -2745,7 +2745,7 @@ 
                         // SHould we change step?
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE encryption_type = "teampass_aes"'
                         );
                         $next_start = (int) $post_start + (int) $post_length;
@@ -2761,14 +2761,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['user_id']
@@ -2795,7 +2795,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['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
@@ -2832,15 +2832,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['user_id']
@@ -2867,7 +2867,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['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
@@ -2889,8 +2889,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;
                         if ($next_start > DB::count()) {
@@ -2910,16 +2910,16 @@ 
                             if (count($_SESSION['personal_folders']) > 0) {
                                 $rows = DB::query(
                                     'SELECT id, pw
-                                    FROM ' . prefixTable('items') . '
+                                    FROM ' . prefixTable('items').'
                                     WHERE perso = 1 AND id_tree IN %ls
-                                    LIMIT ' . $post_start . ', ' . $post_length,
+                                    LIMIT ' . $post_start.', '.$post_length,
                                     $_SESSION['personal_folders']
                                 );
                                 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['user_id']
@@ -2946,7 +2946,7 @@ 
                                         if ((int) $post_user_id !== (int) $_SESSION['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
@@ -2969,7 +2969,7 @@ 
                             // SHould we change step?
                             DB::query(
                                 'SELECT *
-                                FROM ' . prefixTable('items') . '
+                                FROM ' . prefixTable('items').'
                                 WHERE perso = 0'
                             );
                             $next_start = (int) $post_start + (int) $post_length;
@@ -3056,7 +3056,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
                 );
@@ -3081,9 +3081,9 @@ 
                             // Loop on persoanl items
                             $rows = DB::query(
                                 'SELECT id, pw
-                                FROM ' . prefixTable('items') . '
+                                FROM ' . prefixTable('items').'
                                 WHERE perso = 1 AND id_tree IN %ls
-                                LIMIT ' . $post_start . ', ' . $post_length,
+                                LIMIT ' . $post_start.', '.$post_length,
                                 $_SESSION['personal_folders']
                             );
                             $countUserPersonalItems = DB::count();
@@ -3126,7 +3126,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,
@@ -3137,13 +3137,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',
                                             $dataReceived['userPsk']
                                         );
 
                                         // 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'),
@@ -3166,7 +3166,7 @@ 
                                         );
 
                                         // Unlink original file
-                                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                                     }
                                 }
                             }
@@ -3259,7 +3259,7 @@ 
                     // Get user info
                     $userData = DB::queryFirstRow(
                         'SELECT '.$post_fields.'
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $post_user_id
                     );
@@ -3319,7 +3319,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
                         );
@@ -3330,7 +3330,7 @@ 
                             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
 
                             // Load superGlobals
-                            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
                             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -3363,7 +3363,7 @@ 
                                 echo prepareExchangedData(
                                     array(
                                         'error' => false,
-                                        'message' => langHdl('done'),'',
+                                        'message' => langHdl('done'), '',
                                     ),
                                     'encode'
                                 );
@@ -3425,7 +3425,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
                         );
@@ -3459,14 +3459,14 @@ 
                                 // Get one item
                                 $record = DB::queryFirstRow(
                                     'SELECT id, pw
-                                    FROM ' . prefixTable('items') . '
+                                    FROM ' . prefixTable('items').'
                                     WHERE perso = 0'
                                 );
 
                                 // 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'],
                                     $post_user_id
@@ -3499,7 +3499,7 @@ 
                                         );
                                         
                                         // Load superGlobals
-                                        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                                        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                                         $superGlobal = new protect\SuperGlobal\SuperGlobal();
                                         $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');