nilsteampassnet / TeamPass

pages/2fa.js.php

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
 }
 echo "ici";
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>

pages/2fa.php

Spacing +4 added lines, -4 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 
@@ -115,7 +115,7 @@ 
                                     );
                                     foreach ($roles as $role) {
                                         echo '
-                                    <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>';
+                                    <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>';
                                     }
                                     ?>
                                 </select>

pages/actions.php

Spacing +27 added lines, -27 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 
@@ -90,14 +90,14 @@ 
                                 <?php
                                 echo langHdl('rebuild_config_file');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_rebuild_config_file'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -119,14 +119,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_check_pf');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_check_pf'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -146,14 +146,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_db_clean_items');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_db_clean_items'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -175,14 +175,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_db_optimize');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_db_optimize'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -201,14 +201,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_purge_old_files');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_purge_old_files'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -230,14 +230,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_reload_cache_table');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_reload_cache_table'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -260,14 +260,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_change_salt_key');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_change_sk'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -290,14 +290,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_attachments_cryption');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_change_file_encryption'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {

sources/expired.datatables.php

Spacing +29 added lines, -29 removed lines

@@ -28,7 +28,7 @@ 
 require_once 'SecureHandler.php';
 session_name('teampass_session');
 session_start();
-if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) {
+if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) {
     die('Hacking attempt...');
 }
 
@@ -42,22 +42,22 @@ 
 }
 
 // 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'], 'folders', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    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/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.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));
 }
@@ -68,9 +68,9 @@ 
 DB::$port = DB_PORT;
 DB::$encoding = DB_ENCODING;
 // Class loader
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 //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');
 //Columns name
@@ -81,22 +81,22 @@ 
 $sOrder = $sLimit = '';
 // Is a date sent?
 if (isset($_GET['dateCriteria']) === true && empty($_GET['dateCriteria']) === false) {
-    $sWhere .= ' AND a.del_value < ' . round(filter_var($_GET['dateCriteria'], FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
+    $sWhere .= ' AND a.del_value < '.round(filter_var($_GET['dateCriteria'], FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
 }
 //echo $sWhere;
 /* BUILD QUERY */
 //Paging
 $sLimit = '';
 if (isset($_GET['length']) === true && (int) $_GET['length'] !== -1) {
-    $sLimit = ' LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . '';
+    $sLimit = ' LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).'';
 }
 
 //Ordering
 if (isset($_GET['order'][0]['dir']) && in_array($_GET['order'][0]['dir'], $aSortTypes)) {
     $sOrder = 'ORDER BY  ';
     if (preg_match('#^(asc|desc)$#i', $_GET['order'][0]['column'])) {
-        $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
-            . filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_STRING) . ', ';
+        $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
+            . filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_STRING).', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -117,29 +117,29 @@ 
     && $_GET['letter'] !== 'None'
 ) {
     $sWhere .= ' AND ';
-    $sWhere .= $aColumns[1] . " LIKE '" . filter_var($_GET['letter'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . filter_var($_GET['letter'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . filter_var($_GET['letter'], FILTER_SANITIZE_STRING) . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".filter_var($_GET['letter'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".filter_var($_GET['letter'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".filter_var($_GET['letter'], FILTER_SANITIZE_STRING)."%' ";
 } elseif (isset($_GET['search']['value']) === true && $_GET['search']['value'] !== '') {
     $sWhere = ' AND ';
-    $sWhere .= $aColumns[1] . " LIKE '" . filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING) . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING)."%' ";
 }
 
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
     $sWhere.
     (string) $sOrder
 );
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
-        $sWhere .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
+        $sWhere.
         $sLimit
 );
 $iFilteredTotal = DB::count();
@@ -157,18 +157,18 @@ 
     // start the line
     $sOutput .= '[';
     // Column 1
-    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"' . $record['item_id'] . '\"  data-item-tree-id=\"' . $record['id_tree'] . '\"></i>", ';
+    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"'.$record['item_id'].'\"  data-item-tree-id=\"'.$record['id_tree'].'\"></i>", ';
     // Column 2
-    $sOutput .= '"' . $record['label'] . '", ';
+    $sOutput .= '"'.$record['label'].'", ';
     // Column 3
-    $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", ';
+    $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", ';
     // Column 4
     $path = [];
     $treeDesc = $tree->getPath($record['id_tree'], true);
     foreach ($treeDesc as $t) {
         array_push($path, $t->title);
     }
-    $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],';
+    $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],';
 }
 
 if ($iTotal > 0) {
@@ -181,4 +181,4 @@ 
 }
 
 // finalize output
-echo '{"recordsTotal": ' . $iTotal . ', "recordsFiltered": ' . $iFilteredTotal . ', "data": ' . $sOutput;
+echo '{"recordsTotal": '.$iTotal.', "recordsFiltered": '.$iFilteredTotal.', "data": '.$sOutput;

sources/utilities.queries.php

Spacing +26 added lines, -26 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // 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'], 'utilities.database', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -55,14 +55,14 @@ 
     date_default_timezone_set('UTC');
 }
 
-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/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
 
 //Connect to DB
-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));
 }
@@ -102,7 +102,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -123,10 +123,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                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)
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.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)
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -148,7 +148,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -203,10 +203,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -232,7 +232,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -248,7 +248,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -333,10 +333,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -368,7 +368,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -382,7 +382,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -478,7 +478,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE action=%s ' .  'AND date BETWEEN %i AND %i'
                         . ($post_filter_action === 'all' ? '' : ' AND action = %s')
                         . ($post_filter_user === -1 ? '' : ' AND id_user = %i'),
@@ -500,7 +500,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'user_connection',
                         $post_date_from,
@@ -517,7 +517,7 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'error',
                         $post_date_from,
@@ -534,7 +534,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND date BETWEEN %i AND %i',
                         'at_copy',
                         $post_date_from,
@@ -551,7 +551,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'admin_action',
                         $post_date_from,
@@ -568,7 +568,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'failed_auth',
                         $post_date_from,

sources/export.queries.php

Spacing +78 added lines, -78 removed lines

@@ -50,26 +50,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'], 'items', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // No time limit
 set_time_limit(0);
 
-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');
 error_reporting(E_ERROR);
-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';
+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));
 }
@@ -81,12 +81,12 @@ 
 DB::$encoding = DB_ENCODING;
 
 // 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($pre . 'nested_tree', 'id', 'parent_id', 'title');
+$tree = new Tree\NestedTree\NestedTree($pre.'nested_tree', 'id', 'parent_id', 'title');
 
 // User's language loading
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
 // Prepare POST variables
 $id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT);
@@ -137,9 +137,9 @@ 
                         'SELECT i.id as id, i.id_tree as id_tree, i.restricted_to as restricted_to, i.perso as perso,
                             i.label as label, i.description as description, i.pw as pw, i.login as login, i.url as url,
                             i.email as email,l.date as date, i.pw_iv as pw_iv,n.renewal_period as renewal_period
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -162,8 +162,8 @@ 
                                 // Run query
                                 $dataItem = DB::queryfirstrow(
                                     'SELECT i.pw AS pw, s.share_key AS share_key
-                                    FROM ' . prefixTable('items') . ' AS i
-                                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                    FROM ' . prefixTable('items').' AS i
+                                    INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                     WHERE user_id = %i AND i.id = %i',
                                     $_SESSION['user_id'],
                                     $record['id']
@@ -187,8 +187,8 @@ 
                                 $arr_kbs = [];
                                 $rows_kb = DB::query(
                                     'SELECT b.label, b.id
-                                    FROM ' . prefixTable('kb_items') . ' AS a
-                                    INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                    FROM ' . prefixTable('kb_items').' AS a
+                                    INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                     WHERE a.item_id = %i',
                                     $record['id']
                                 );
@@ -200,7 +200,7 @@ 
                                 $arr_tags = [];
                                 $rows_tag = DB::query(
                                     'SELECT tag
-                                    FROM ' . prefixTable('tags') . '
+                                    FROM ' . prefixTable('tags').'
                                     WHERE item_id = %i',
                                     $record['id']
                                 );
@@ -247,14 +247,14 @@ 
                 $tmp .= array2csv($value);
             }
 
-            echo '[{"content":"' . base64_encode($tmp) . '"}]';
+            echo '[{"content":"'.base64_encode($tmp).'"}]';
             break;
 
             /*
          * PDF - step 1 - Prepare database
          */
         case 'initialize_export_table':
-            DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+            DB::query('TRUNCATE TABLE '.prefixTable('export'));
             break;
 
             /*
@@ -298,9 +298,9 @@ 
                     'SELECT i.id as id, i.restricted_to as restricted_to, i.perso as perso, i.label as label, i.description as description, i.pw as pw, i.login as login, i.url as url, i.email as email,
                         l.date as date, i.pw_iv as pw_iv,
                         n.renewal_period as renewal_period
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -326,8 +326,8 @@ 
                             // Run query
                             $dataItem = DB::queryfirstrow(
                                 'SELECT i.pw AS pw, s.share_key AS share_key
-                                FROM ' . prefixTable('items') . ' AS i
-                                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                FROM ' . prefixTable('items').' AS i
+                                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                 WHERE user_id = %i AND i.id = %i',
                                 $_SESSION['user_id'],
                                 $record['id']
@@ -351,8 +351,8 @@ 
                             $arr_kbs = '';
                             $rows_kb = DB::query(
                                 'SELECT b.label, b.id
-                                FROM ' . prefixTable('kb_items') . ' AS a
-                                INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                FROM ' . prefixTable('kb_items').' AS a
+                                INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                 WHERE a.item_id = %i',
                                 $record['id']
                             );
@@ -360,7 +360,7 @@ 
                                 if (empty($arr_kbs)) {
                                     $arr_kbs = $rec_kb['label'];
                                 } else {
-                                    $arr_kbs .= ' | ' . $rec_kb['label'];
+                                    $arr_kbs .= ' | '.$rec_kb['label'];
                                 }
                             }
 
@@ -368,7 +368,7 @@ 
                             $arr_tags = '';
                             $rows_tag = DB::query(
                                 'SELECT tag
-                                FROM ' . prefixTable('tags') . '
+                                FROM ' . prefixTable('tags').'
                                 WHERE item_id = %i',
                                 $record['id']
                             );
@@ -376,7 +376,7 @@ 
                                 if (empty($arr_tags)) {
                                     $arr_tags = $rec_tag['tag'];
                                 } else {
-                                    $arr_tags .= ' ' . $rec_tag['tag'];
+                                    $arr_tags .= ' '.$rec_tag['tag'];
                                 }
                             }
 
@@ -444,7 +444,7 @@ 
             header('Content-type: application/pdf');
 
             // query
-            $rows = DB::query('SELECT * FROM ' . prefixTable('export'));
+            $rows = DB::query('SELECT * FROM '.prefixTable('export'));
             $counter = DB::count();
             if ($counter > 0) {
                 // print
@@ -452,8 +452,8 @@ 
                 $prev_path = '';
 
                 //Prepare the PDF file
-                require_once($SETTINGS['cpassman_dir'] . '/includes/libraries/Pdf/tcpdf/config/tcpdf_config.php');
-                include $SETTINGS['cpassman_dir'] . '/includes/libraries/Pdf/tcpdf/tcpdf.php';
+                require_once($SETTINGS['cpassman_dir'].'/includes/libraries/Pdf/tcpdf/config/tcpdf_config.php');
+                include $SETTINGS['cpassman_dir'].'/includes/libraries/Pdf/tcpdf/tcpdf.php';
 
                 $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
                 $pdf->SetProtection(array('print'), $dataReceived['pdf_password'], null);
@@ -465,7 +465,7 @@ 
 
                 // set default header data
                 $pdf->SetHeaderData(
-                    $SETTINGS['cpassman_dir'] . '/includes/images/teampass-logo2-home.png',
+                    $SETTINGS['cpassman_dir'].'/includes/images/teampass-logo2-home.png',
                     PDF_HEADER_LOGO_WIDTH,
                     'Teampass export',
                     $_SESSION['lastname']." ".$_SESSION['name'].' @ '.date($SETTINGS['date_format']." ".$SETTINGS['time_format'], (int) time())
@@ -569,7 +569,7 @@ 
                 logEvents($SETTINGS, 'pdf_export', '', (string) $_SESSION['user_id'], $_SESSION['login']);
 
                 //clean table
-                DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+                DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
                 // Send back the file in Blob
                 echo $pdf->Output(null, 'I');
@@ -581,8 +581,8 @@ 
             // step 1:
             // - prepare export file
             // - get full list of objects id to export
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
             $idsList = array();
 
             foreach (explode(';', $post_ids) as $id) {
@@ -594,9 +594,9 @@ 
                     // count elements to display
                     $result = DB::query(
                         'SELECT i.id AS id, i.label AS label, i.restricted_to AS restricted_to, i.perso AS perso
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                     WHERE i.inactif = %i
                     AND i.id_tree= %i
                     AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -624,9 +624,9 @@ 
 
             // prepare export file
             //save the file
-            $html_file = '/teampass_export_' . time() . '_' . generateKey() . '.html';
+            $html_file = '/teampass_export_'.time().'_'.generateKey().'.html';
             //print_r($full_listing);
-            $outstream = fopen($SETTINGS['path_to_files_folder'] . $html_file, 'w');
+            $outstream = fopen($SETTINGS['path_to_files_folder'].$html_file, 'w');
             if ($outstream === false) {
                 echo '[{"error":"true"}]';
                 break;
@@ -650,12 +650,12 @@ 
     </style>
     </head>
     <body>
-    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $post_pdf_password) . '" />
+    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $post_pdf_password).'" />
     <div id="header">
-    ' . TP_TOOL_NAME . ' - Off Line mode
+    ' . TP_TOOL_NAME.' - Off Line mode
     </div>
     <div style="margin:10px; font-size:9px;">
-    <i>This page was generated by <b>' . $_SESSION['name'] . ' ' . $_SESSION['lastname'] . '</b>, the ' . date('Y/m/d H:i:s') . '.</i>
+    <i>This page was generated by <b>' . $_SESSION['name'].' '.$_SESSION['lastname'].'</b>, the '.date('Y/m/d H:i:s').'.</i>
     <span id="info_page" style="margin-left:20px; font-weight:bold; font-size: 14px; color:red;"></span>
     </div>
     <div id="information"></div>
@@ -666,11 +666,11 @@ 
     <div>
     <table id="itemsTable">
         <thead><tr>
-            <th style="width:15%;">' . $LANG['label'] . '</th>
-            <th style="width:10%;">' . $LANG['pw'] . '</th>
-            <th style="width:30%;">' . $LANG['description'] . '</th>
-            <th style="width:5%;">' . $LANG['user_login'] . '</th>
-            <th style="width:20%;">' . $LANG['url'] . '</th>
+            <th style="width:15%;">' . $LANG['label'].'</th>
+            <th style="width:10%;">' . $LANG['pw'].'</th>
+            <th style="width:30%;">' . $LANG['description'].'</th>
+            <th style="width:5%;">' . $LANG['user_login'].'</th>
+            <th style="width:20%;">' . $LANG['url'].'</th>
         </tr></thead>
         <tbody id="itemsTable_tbody">'
             );
@@ -695,22 +695,22 @@ 
                 || in_array($post_idTree, $_SESSION['groupes_visibles']) === false
                 || (in_array($post_idTree, $_SESSION['no_access_folders']) === true)
             ) {
-                echo '[{"loop":"true", "number":"' . $post_number . '", "cpt":"' . $post_cpt . '", "file":"' . $post_file . '", "idsList":"' . $post_idsList . '" , "file_link":"' . $post_file_link . '"}]';
+                echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
                 break;
             }
 
             $full_listing = array();
             $items_id_list = array();
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
 
             $rows = DB::query(
                 'SELECT i.id as id, i.url as url, i.perso as perso, i.label as label, i.description as description, i.pw as pw, i.login as login, i.id_tree as id_tree,
                 l.date as date, i.pw_iv as pw_iv,
                 n.renewal_period as renewal_period
-            FROM ' . prefixTable('items') . ' as i
-            INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+            FROM ' . prefixTable('items').' as i
+            INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+            INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
             WHERE i.inactif = %i
             AND i.id_tree= %i
             AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -770,7 +770,7 @@ 
             }
 
             //save in export file
-            $outstream = fopen($post_file . '.txt', 'a');
+            $outstream = fopen($post_file.'.txt', 'a');
             if ($outstream === false) {
                 echo '[{"error":"true"}]';
                 break;
@@ -808,13 +808,13 @@ 
                         if (empty($arboHtml)) {
                             $arboHtml = $arboHtml_tmp;
                         } else {
-                            $arboHtml .= ' » ' . $arboHtml_tmp;
+                            $arboHtml .= ' » '.$arboHtml_tmp;
                         }
                     }
                     fputs(
                         $outstream,
                         '
-        <tr class="path"><td colspan="5">' . $arboHtml . '</td></tr>'
+        <tr class="path"><td colspan="5">' . $arboHtml.'</td></tr>'
                     );
                     $idTree = $elem['id_tree'];
                 }
@@ -823,12 +823,12 @@ 
                 fputs(
                     $outstream,
                     '
-        <tr class="' . $lineType . '">
-            <td>' . addslashes($elem['label']) . '</td>
-            <td align="center"><span class="span_pw" id="span_' . $elem['id'] . '"><a href="#" onclick="decryptme(' . $elem['id'] . ', \'' . $encPw . '\');return false;">Decrypt </a></span><input type="hidden" id="hide_' . $elem['id'] . '" value="' . $encPw . '" /></td>
-            <td>' . $desc . '</td>
-            <td align="center">' . $login . '</td>
-            <td align="center">' . $url . '</td>
+        <tr class="' . $lineType.'">
+            <td>' . addslashes($elem['label']).'</td>
+            <td align="center"><span class="span_pw" id="span_' . $elem['id'].'"><a href="#" onclick="decryptme('.$elem['id'].', \''.$encPw.'\');return false;">Decrypt </a></span><input type="hidden" id="hide_'.$elem['id'].'" value="'.$encPw.'" /></td>
+            <td>' . $desc.'</td>
+            <td align="center">' . $login.'</td>
+            <td align="center">' . $url.'</td>
             </tr>'
                 );
             }
@@ -836,29 +836,29 @@ 
             fclose($outstream);
 
             // send back and continue
-            echo '[{"loop":"true", "number":"' . $post_number . '", "cpt":"' . $post_cpt . '", "file":"' . $post_file . '", "idsList":"' . $post_idsList . '" , "file_link":"' . $post_file_link . '"}]';
+            echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
             break;
 
             //CASE export in HTML format - Iteration loop
         case 'export_to_html_format_finalize':
             // Load includes
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
 
             // read the content of the temporary file
-            $handle = fopen($post_file . '.txt', 'r');
+            $handle = fopen($post_file.'.txt', 'r');
             if ($handle === false) {
                 echo '[{"error":"true"}]';
                 break;
             }
-            $contents = fread($handle, filesize($post_file . '.txt'));
+            $contents = fread($handle, filesize($post_file.'.txt'));
             if ($contents === false) {
                 echo '[{"error":"true"}]';
                 break;
             }
             fclose($handle);
-            if (is_file($post_file . '.txt')) {
-                unlink($post_file . '.txt');
+            if (is_file($post_file.'.txt')) {
+                unlink($post_file.'.txt');
             }
 
             // Encrypt its content
@@ -869,7 +869,7 @@ 
                 if (empty($encrypted_text) === true) {
                     $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $post_pdf_password);
                 } else {
-                    $encrypted_text .= '|#|#|' . GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $post_pdf_password);
+                    $encrypted_text .= '|#|#|'.GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $post_pdf_password);
                 }
             }
 
@@ -886,9 +886,9 @@ 
         </table></div>
         <input type="button" value="Hide all" onclick="hideAll()" />
         <div id="footer" style="text-align:center;">
-            <a href="https://teampass.net/about/" target="_blank" style="">' . TP_TOOL_NAME . '&nbsp;' . TP_VERSION_FULL . '&nbsp;' . TP_COPYRIGHT . '</a>
+            <a href="https://teampass.net/about/" target="_blank" style="">' . TP_TOOL_NAME.'&nbsp;'.TP_VERSION_FULL.'&nbsp;'.TP_COPYRIGHT.'</a>
         </div>
-        <div id="enc_html" style="display:none;">' . $encrypted_text . '</div>
+        <div id="enc_html" style="display:none;">' . $encrypted_text.'</div>
         </body>
     </html>
     <script type="text/javascript">
@@ -994,9 +994,9 @@ 
 
             fclose($outstream);
 
-            echo '[{"text":"<a href=\'' .
-                $post_file_link .
-                '\' target=\'_blank\'>' . $LANG['pdf_download'] . '</a>"}]';
+            echo '[{"text":"<a href=\''.
+                $post_file_link.
+                '\' target=\'_blank\'>'.$LANG['pdf_download'].'</a>"}]';
             break;
     }
 }

sources/items.queries.php

Spacing +283 added lines, -283 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // 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'], 'items', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -55,8 +55,8 @@ 
     date_default_timezone_set('UTC');
 }
 
-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/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
@@ -78,7 +78,7 @@ 
 }
 
 // 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));
 }
@@ -90,7 +90,7 @@ 
 DB::$encoding = DB_ENCODING;
 
 // Class loader
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Load Tree
 $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries');
@@ -98,7 +98,7 @@ 
 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
 // Superglobal library
-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();
 
 // Prepare POST variables
@@ -306,7 +306,7 @@ 
                 // About special settings
                 $dataFolderSettings = DB::queryFirstRow(
                     'SELECT bloquer_creation, bloquer_modification, personal_folder
-                    FROM ' . prefixTable('nested_tree') . ' 
+                    FROM ' . prefixTable('nested_tree').' 
                     WHERE id = %i',
                     $post_folder_id
                 );
@@ -323,7 +323,7 @@ 
                 // Get folder complexity
                 $folderComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_folder_id
@@ -348,7 +348,7 @@ 
                 $itemExists = 0;
                 $newID = '';
                 $data = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE label = %s AND inactif = %i',
                     $post_label,
                     0
@@ -474,7 +474,7 @@ 
                                 // should we encrypt the data
                                 $dataTmp = DB::queryFirstRow(
                                     'SELECT encrypted_data
-                                    FROM ' . prefixTable('categories') . '
+                                    FROM ' . prefixTable('categories').'
                                     WHERE id = %i',
                                     $field_data[0]
                                 );
@@ -530,7 +530,7 @@ 
                     ) {
                         DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('templates') . '
+                            FROM ' . prefixTable('templates').'
                             WHERE item_id = %i',
                             $newID
                         );
@@ -599,11 +599,11 @@ 
                     ) {
                         foreach ($post_restricted_to as $userRest) {
                             if (empty($userRest) === false) {
-                                $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest);
+                                $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest);
                                 if (empty($listOfRestricted)) {
                                     $listOfRestricted = $dataTmp['login'];
                                 } else {
-                                    $listOfRestricted .= ';' . $dataTmp['login'];
+                                    $listOfRestricted .= ';'.$dataTmp['login'];
                                 }
                             }
                         }
@@ -617,11 +617,11 @@ 
                         if (empty($data['restricted_to']) === false) {
                             foreach (explode(';', $data['restricted_to']) as $userRest) {
                                 if (empty($userRest) === false) {
-                                    $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest);
+                                    $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest);
                                     if (empty($oldRestrictionList) === true) {
                                         $oldRestrictionList = $dataTmp['login'];
                                     } else {
-                                        $oldRestrictionList .= ';' . $dataTmp['login'];
+                                        $oldRestrictionList .= ';'.$dataTmp['login'];
                                     }
                                 }
                             }
@@ -684,7 +684,7 @@ 
                     if (empty($post_uploaded_file_id) === false) {
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %s',
                             $post_uploaded_file_id
                         );
@@ -724,14 +724,14 @@ 
                                     langHdl('email_subject'),
                                     str_replace(
                                         array('#label', '#link'),
-                                        array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']),
+                                        array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']),
                                         langHdl('new_item_email_body')
                                     ),
                                     $emailAddress,
                                     $SETTINGS,
                                     str_replace(
                                         array('#label', '#link'),
-                                        array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']),
+                                        array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']),
                                         langHdl('new_item_email_body')
                                     )
                                 );
@@ -894,7 +894,7 @@ 
                 // About special settings
                 $dataFolderSettings = DB::queryFirstRow(
                     'SELECT bloquer_creation, bloquer_modification, personal_folder
-                    FROM ' . prefixTable('nested_tree') . ' 
+                    FROM ' . prefixTable('nested_tree').' 
                     WHERE id = %i',
                     $post_folder_id
                 );
@@ -910,7 +910,7 @@ 
                 // Get folder complexity
                 $folderComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_folder_id
@@ -949,8 +949,8 @@ 
                 // Get all informations for this item
                 $dataItem = DB::queryfirstrow(
                     'SELECT *
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                     WHERE i.id=%i AND l.action = %s',
                     $post_item_id,
                     'at_creation'
@@ -960,7 +960,7 @@ 
 				//db::debugmode(true);
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %s',
                     $post_item_id,
                     $_SESSION['user_id']
@@ -1008,9 +1008,9 @@ 
                         'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
                         i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
                         u.login as user_login, u.email as user_email
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
-                        INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
+                        INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
                         WHERE i.id=%i',
                         $post_item_id
                     );
@@ -1018,7 +1018,7 @@ 
                     // Should we log a password change?
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $post_item_id
@@ -1077,7 +1077,7 @@ 
                     // Get list of tags
                     $itemTags = DB::queryFirstColumn(
                         'SELECT tag
-                        FROM ' . prefixTable('tags') . '
+                        FROM ' . prefixTable('tags').'
                         WHERE item_id = %i',
                         $post_item_id
                     );
@@ -1120,7 +1120,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                            'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                         );
                     }
 
@@ -1157,8 +1157,8 @@ 
                                     'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
                                     i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
                                     c.masked AS masked, i.id AS field_item_id
-                                    FROM ' . prefixTable('categories_items') . ' AS i
-                                    INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                                    FROM ' . prefixTable('categories_items').' AS i
+                                    INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                                     WHERE i.field_id = %i AND i.item_id = %i',
                                     $field['id'],
                                     $post_item_id
@@ -1172,7 +1172,7 @@ 
                                     // Perform new query
                                     $dataTmpCat = DB::queryFirstRow(
                                         'SELECT id, title, encrypted_data, masked
-                                        FROM ' . prefixTable('categories') . '
+                                        FROM ' . prefixTable('categories').'
                                         WHERE id = %i',
                                         $field['id']
                                     );
@@ -1244,7 +1244,7 @@ 
                                         $_SESSION['user_id'],
                                         'at_modification',
                                         $_SESSION['login'],
-                                        'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
+                                        'at_field : '.$dataTmpCat['title'].' : '.$field['value']
                                     );
                                 } else {
                                     // compare the old and new value
@@ -1252,7 +1252,7 @@ 
                                         // Get user sharekey for this field
                                         $userKey = DB::queryFirstRow(
                                             'SELECT share_key
-                                            FROM ' . prefixTable('sharekeys_fields') . '
+                                            FROM ' . prefixTable('sharekeys_fields').'
                                             WHERE user_id = %i AND object_id = %i',
                                             $_SESSION['user_id'],
                                             $dataTmpCat['field_item_id']
@@ -1322,7 +1322,7 @@ 
                                             $_SESSION['user_id'],
                                             'at_modification',
                                             $_SESSION['login'],
-                                            'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                            'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                         );
                                     }
                                 }
@@ -1347,7 +1347,7 @@ 
                     ) {
                         DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('templates') . '
+                            FROM ' . prefixTable('templates').'
                             WHERE item_id = %i',
                             $post_item_id
                         );
@@ -1390,7 +1390,7 @@ 
                         // check if elem exists in Table. If not add it or update it.
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('automatic_del') . '
+                            FROM ' . prefixTable('automatic_del').'
                             WHERE item_id = %i',
                             $post_item_id
                         );
@@ -1417,7 +1417,7 @@ 
                                 // Store updates performed
                                 array_push(
                                     $arrayOfChanges,
-                                    langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled')
+                                    langHdl('automatic_deletion_engaged').': '.langHdl('enabled')
                                 );
 
                                 // update LOG
@@ -1460,7 +1460,7 @@ 
                                 // Store updates performed
                                 array_push(
                                     $arrayOfChanges,
-                                    langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled')
+                                    langHdl('automatic_deletion_engaged').': '.langHdl('disabled')
                                 );
 
                                 // update LOG
@@ -1493,7 +1493,7 @@ 
                             if (empty($userId) === false) {
                                 $dataTmp = DB::queryfirstrow(
                                     'SELECT id, name, lastname
-                                    FROM ' . prefixTable('users') . '
+                                    FROM ' . prefixTable('users').'
                                     WHERE id= %i',
                                     $userId
                                 );
@@ -1501,7 +1501,7 @@ 
                                 // Add to array
                                 array_push(
                                     $arrayOfUsersRestriction,
-                                    $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                                    $dataTmp['name'].' '.$dataTmp['lastname']
                                 );
                                 array_push(
                                     $arrayOfUsersIdRestriction,
@@ -1532,8 +1532,8 @@ 
                         // get values before deleting them
                         $rows = DB::query(
                             'SELECT t.title, t.id AS id
-                            FROM ' . prefixTable('roles_title') . ' as t
-                            INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
+                            FROM ' . prefixTable('roles_title').' as t
+                            INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
                             WHERE r.item_id = %i
                             ORDER BY t.title ASC',
                             $post_item_id
@@ -1567,7 +1567,7 @@ 
                                 );
                                 $dataTmp = DB::queryfirstrow(
                                     'SELECT title
-                                    FROM ' . prefixTable('roles_title') . '
+                                    FROM ' . prefixTable('roles_title').'
                                     WHERE id = %i',
                                     $role
                                 );
@@ -1608,8 +1608,8 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
-                                implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
+                            'at_restriction : '.(count($diffUsersRestiction) > 0 ?
+                                implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
                         );
                     }
 
@@ -1629,7 +1629,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_label : ' . $data['label'] . ' => ' . $post_label
+                            'at_label : '.$data['label'].' => '.$post_label
                         );
                     }
                     // LOGIN
@@ -1648,7 +1648,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_login : ' . $data['login'] . ' => ' . $post_login
+                            'at_login : '.$data['login'].' => '.$post_login
                         );
                     }
                     // EMAIL
@@ -1667,7 +1667,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_email : ' . $data['email'] . ' => ' . $post_email
+                            'at_email : '.$data['email'].' => '.$post_email
                         );
                     }
                     // URL
@@ -1686,7 +1686,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_url : ' . $data['url'] . ' => ' . $post_url
+                            'at_url : '.$data['url'].' => '.$post_url
                         );
                     }
                     // DESCRIPTION
@@ -1711,7 +1711,7 @@ 
                     // FOLDER
                     if ((int) $data['id_tree'] !== (int) $post_folder_id) {
                         // Get name of folders
-                        $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $post_folder_id));
+                        $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $post_folder_id));
 
                         // Store updates performed
                         array_push(
@@ -1727,7 +1727,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
+                            'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
                         );
                     }
                     // ANYONE_CAN_MODIFY
@@ -1735,7 +1735,7 @@ 
                         // Store updates performed
                         array_push(
                             $arrayOfChanges,
-                            langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled'))
+                            langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled'))
                         );
 
                         // Log
@@ -1746,15 +1746,15 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
+                            'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
                         );
                     }
 
                     // Reload new values
                     $dataItem = DB::queryfirstrow(
                         'SELECT *
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                         WHERE i.id = %i AND l.action = %s',
                         $post_item_id,
                         'at_creation'
@@ -1763,8 +1763,8 @@ 
                     $history = '';
                     $rows = DB::query(
                         'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
-                        FROM ' . prefixTable('log_items') . ' as l
-                        LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                        FROM ' . prefixTable('log_items').' as l
+                        LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                         WHERE l.action <> %s AND id_item=%s',
                         'at_shown',
                         $post_item_id
@@ -1773,14 +1773,14 @@ 
                         if ($record['raison'] === NULL) continue;
                         $reason = explode(':', $record['raison']);
                         if (count($reason) > 0) {
-                            $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
-                                . $record['login'] . ' - ' . langHdl($record['action']) . ' - '
-                                . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1]
+                            $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
+                                . $record['login'].' - '.langHdl($record['action']).' - '
+                                . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1]
                                     : langHdl(trim($reason[0]))) : '');
                             if (empty($history)) {
                                 $history = $sentence;
                             } else {
-                                $history .= '<br />' . $sentence;
+                                $history .= '<br />'.$sentence;
                             }
                         }
                     }
@@ -1902,7 +1902,7 @@ 
             ) {
                 // load the original record into an array
                 $originalRecord = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE id = %i',
                     $post_item_id
                 );
@@ -1921,7 +1921,7 @@ 
 
                 // Load the destination folder record into an array
                 $dataDestination = DB::queryfirstrow(
-                    'SELECT personal_folder FROM ' . prefixTable('nested_tree') . '
+                    'SELECT personal_folder FROM '.prefixTable('nested_tree').'
                     WHERE id = %i',
                     $post_dest_id
                 );
@@ -1929,7 +1929,7 @@ 
                 // Get the ITEM object key for the user
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE user_id = %i AND object_id = %i',
                     $_SESSION['user_id'],
                     $post_item_id
@@ -2001,7 +2001,7 @@ 
                 // Manage Custom Fields
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
@@ -2049,15 +2049,15 @@ 
                 $rows = DB::query(
                     'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
                     f.size AS size, f.type AS type, s.share_key AS share_key
-                    FROM ' . prefixTable('files') . ' AS f
-                    INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                    FROM ' . prefixTable('files').' AS f
+                    INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                     WHERE s.user_id = %i AND f.id_item = %i',
                     $_SESSION['user_id'],
                     $post_item_id
                 );
                 foreach ($rows as $record) {
                     // Check if file still exists
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
+                    if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
                         // Step1 - decrypt the file
                         $fileContent = decryptFile(
                             $record['file'],
@@ -2066,8 +2066,8 @@ 
                         );
 
                         // Step2 - create file
-                        $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension'];
-                        $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                        $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension'];
+                        $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                         if ($outstream === false) {
                             echo prepareExchangedData(
                                 array(
@@ -2117,7 +2117,7 @@ 
 
                 // -------------------------
                 // Add specific restrictions
-                $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $post_item_id);
+                $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $post_item_id);
                 foreach ($rows as $record) {
                     DB::insert(
                         prefixTable('restriction_to_roles'),
@@ -2129,7 +2129,7 @@ 
                 }
 
                 // Add Tags
-                $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $post_item_id);
+                $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $post_item_id);
                 foreach ($rows as $record) {
                     DB::insert(
                         prefixTable('tags'),
@@ -2159,7 +2159,7 @@ 
                     $_SESSION['login']
                 );
                 // reload cache table
-                include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+                include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
                 updateCacheTable('reload', $SETTINGS, null);
 
                 echo (string) prepareExchangedData(
@@ -2227,7 +2227,7 @@ 
             // then we can show it
             $item_deleted = DB::queryFirstRow(
                 'SELECT *
-                FROM ' . prefixTable('log_items') . '
+                FROM ' . prefixTable('log_items').'
                 WHERE id_item = %i AND action = %s
                 ORDER BY date DESC
                 LIMIT 0, 1',
@@ -2238,7 +2238,7 @@ 
 
             $item_restored = DB::queryFirstRow(
                 'SELECT *
-                FROM ' . prefixTable('log_items') . '
+                FROM ' . prefixTable('log_items').'
                 WHERE id_item = %i AND action = %s
                 ORDER BY date DESC
                 LIMIT 0, 1',
@@ -2262,8 +2262,8 @@ 
             // Get all informations for this item
             $dataItem = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                 WHERE i.id = %i AND l.action = %s',
                 $post_id,
                 'at_creation'
@@ -2272,7 +2272,7 @@ 
             // Notification
             DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('notification') . '
+                FROM ' . prefixTable('notification').'
                 WHERE item_id = %i AND user_id = %i',
                 $post_id,
                 $_SESSION['user_id']
@@ -2319,13 +2319,13 @@ 
                     && (int) $SETTINGS['enable_email_notification_on_item_shown'] === 1
                     && (int) $user['admin'] === 1
                 ) {
-                    $_SESSION['listNotificationEmails'] .= $user['email'] . ',';
+                    $_SESSION['listNotificationEmails'] .= $user['email'].',';
                 }
             }
 
             // manage case of API user
             if ($dataItem['id_user'] === API_USER_ID) {
-                $arrData['author'] = 'API [' . $dataItem['description'] . ']';
+                $arrData['author'] = 'API ['.$dataItem['description'].']';
                 $arrData['id_user'] = API_USER_ID;
                 $arrData['author_email'] = '';
                 $arrData['notification_status'] = false;
@@ -2335,7 +2335,7 @@ 
             $tags = array();
             $rows = DB::query(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i',
                 $post_id
             );
@@ -2360,7 +2360,7 @@ 
             // Check if user has a role that is accepted
             $rows_tmp = DB::query(
                 'SELECT role_id
-                FROM ' . prefixTable('restriction_to_roles') . '
+                FROM ' . prefixTable('restriction_to_roles').'
                 WHERE item_id=%i',
                 $post_id
             );
@@ -2374,7 +2374,7 @@ 
             // Get the object key for the user
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -2459,8 +2459,8 @@ 
                     // Add restriction if item is restricted to roles
                     $rows = DB::query(
                         'SELECT t.title, t.id
-                        FROM ' . prefixTable('roles_title') . ' AS t
-                        INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
+                        FROM ' . prefixTable('roles_title').' AS t
+                        INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
                         WHERE r.item_id = %i
                         ORDER BY t.title ASC',
                         $post_id
@@ -2476,8 +2476,8 @@ 
                     $tmp = array();
                     $rows = DB::query(
                         'SELECT k.label, k.id
-                        FROM ' . prefixTable('kb_items') . ' as i
-                        INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
+                        FROM ' . prefixTable('kb_items').' as i
+                        INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
                         WHERE i.item_id = %i
                         ORDER BY k.label ASC',
                         $post_id
@@ -2557,7 +2557,7 @@ 
                     $arrCatList = array();
                     $rows_tmp = DB::query(
                         'SELECT id_category
-                        FROM ' . prefixTable('categories_folders') . '
+                        FROM ' . prefixTable('categories_folders').'
                         WHERE id_folder=%i',
                         $post_folder_id
                     );
@@ -2572,8 +2572,8 @@ 
                             'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
                             i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id,
                             c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
-                            FROM ' . prefixTable('categories_items') . ' AS i
-                            INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                            FROM ' . prefixTable('categories_items').' AS i
+                            INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                             WHERE i.item_id=%i AND c.parent_id IN %ls',
                             $post_id,
                             $arrCatList
@@ -2584,11 +2584,11 @@ 
 							//db::debugmode(true);
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_fields') . '
+                                FROM ' . prefixTable('sharekeys_fields').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $row['id']
-                            );//db::debugmode(false);
+                            ); //db::debugmode(false);
                             $fieldText = [];
                             if (DB::count() === 0) {
                                 // Not encrypted
@@ -2630,7 +2630,7 @@ 
                 if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
                     $rows_tmp = DB::queryfirstrow(
                         'SELECT category_id
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $post_id
                     );
@@ -2655,7 +2655,7 @@ 
                     // Is the Item to be deleted?
                     $dataDelete = DB::queryfirstrow(
                         'SELECT * 
-                        FROM ' . prefixTable('automatic_del') . '
+                        FROM ' . prefixTable('automatic_del').'
                         WHERE item_id = %i',
                         $post_id
                     );
@@ -2737,11 +2737,11 @@ 
                 if (empty($dataItem['restricted_to']) === false) {
                     foreach (explode(';', $dataItem['restricted_to']) as $userRest) {
                         if (empty($userRest) === false) {
-                            $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest);
+                            $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest);
                             if (empty($listOfRestricted)) {
                                 $listOfRestricted = $dataTmp['login'];
                             } else {
-                                $listOfRestricted .= ';' . $dataTmp['login'];
+                                $listOfRestricted .= ';'.$dataTmp['login'];
                             }
                         }
                     }
@@ -2798,8 +2798,8 @@ 
             // Load item data
             $dataItem = DB::queryFirstRow(
                 'SELECT i.*, n.title AS folder_title
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
                 WHERE i.id = %i',
                 $post_id
             );
@@ -2821,7 +2821,7 @@ 
             // Check if user has a role that is accepted
             $rows_tmp = DB::query(
                 'SELECT role_id
-                FROM ' . prefixTable('restriction_to_roles') . '
+                FROM ' . prefixTable('restriction_to_roles').'
                 WHERE item_id=%i',
                 $post_id
             );
@@ -2867,7 +2867,7 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT id, name, file, extension, size
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i AND confirmed = 1',
                     $post_id
                 );
@@ -2876,7 +2876,7 @@ 
                         $attachments,
                         array(
                             'icon' => fileFormatImage(strtolower($record['extension'])),
-                            'filename' => basename($record['name'], '.' . $record['extension']),
+                            'filename' => basename($record['name'], '.'.$record['extension']),
                             'extension' => $record['extension'],
                             'size' => formatSizeUnits((int) $record['size']),
                             'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0,
@@ -2902,7 +2902,7 @@ 
                         array(
                             'latest_items' => implode(';', $_SESSION['latest_items']),
                         ),
-                        'id=' . $_SESSION['user_id']
+                        'id='.$_SESSION['user_id']
                     );
                 }
 
@@ -2911,8 +2911,8 @@ 
                 $listOptionsForRoles = array();
                 $rows = DB::query(
                     'SELECT r.role_id AS role_id, t.title AS title
-                    FROM ' . prefixTable('roles_values') . ' AS r
-                    INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' AS r
+                    INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                     WHERE r.folder_id = %i',
                     $dataItem['id_tree']
                 );
@@ -2926,9 +2926,9 @@ 
                     );
                     $rows2 = DB::query(
                         'SELECT id, login, fonction_id, email, name, lastname
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE fonction_id LIKE %s',
-                        '%' . $record['role_id'] . '%'
+                        '%'.$record['role_id'].'%'
                     );
                     foreach ($rows2 as $record2) {
                         foreach (explode(';', $record2['fonction_id']) as $role) {
@@ -2941,7 +2941,7 @@ 
                                     array(
                                         'id' => (int) $record2['id'],
                                         'login' => $record2['login'],
-                                        'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                        'name' => $record2['name'].' '.$record2['lastname'],
                                         'email' => $record2['email'],
                                     )
                                 );
@@ -2960,16 +2960,16 @@ 
                     $path = '';
                     foreach ($arbo as $elem) {
                         if (empty($path) === true) {
-                            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+                            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
                         } else {
-                            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                         }
                     }
                     // Build text to show user
                     if (empty($path) === true) {
                         $path = addslashes($dataItem['label']);
                     } else {
-                        $path = addslashes($dataItem['label']) . ' (' . $path . ')';
+                        $path = addslashes($dataItem['label']).' ('.$path.')';
                     }
 
                     // send back infos
@@ -2983,7 +2983,7 @@ 
                                 array(
                                     addslashes($_SESSION['login']),
                                     $path,
-                                    $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
+                                    $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
                                 ),
                                 langHdl('email_on_open_notification_mail')
                             ),
@@ -2994,7 +2994,7 @@ 
                 }
 
                 // has this item a change proposal
-                DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id);
+                DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id);
                 $returnArray['has_change_proposal'] = DB::count();
 
                 // Setting
@@ -3085,7 +3085,7 @@ 
             // Load item data
             $data = DB::queryFirstRow(
                 'SELECT id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_item_id
             );
@@ -3155,13 +3155,13 @@ 
 
             // Check if user is allowed to access this folder
             if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) {
-                echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 break;
             }
 
             // Check if title doesn't contains html codes
             if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
-                echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]';
+                echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]';
                 break;
             }
             // check that title is not numeric
@@ -3172,9 +3172,9 @@ 
 
             // Check if duplicate folders name are allowed
             if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
-                $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
+                $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
                 if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) {
-                    echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]';
+                    echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]';
                     break;
                 }
             }
@@ -3182,7 +3182,7 @@ 
             // query on folder
             $data = DB::queryfirstrow(
                 'SELECT parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -3192,20 +3192,20 @@ 
             if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE intitule = %i AND type = %s',
                     $data['parent_id'],
                     'complex'
                 );
                 if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
-                    echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
+                    echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
                     break;
                 }
             }
 
             // update Folders table
             $tmp = DB::queryFirstRow(
-                'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
                 $dataReceived['folder']
             );
             if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) {
@@ -3270,42 +3270,42 @@ 
                     in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' &&
                     isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1)
             ) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             $tmp_source = DB::queryFirstRow(
                 'SELECT title, parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_source_folder_id
             );
 
             $tmp_target = DB::queryFirstRow(
                 'SELECT title, parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_target_folder_id
             );
 
             // check if target is not a child of source
             if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             // check if source or target folder is PF. If Yes, then cancel operation
             if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             // check if source or target folder is PF. If Yes, then cancel operation
             if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
@@ -3427,7 +3427,7 @@ 
                 foreach ($_SESSION['user_roles'] as $role) {
                     $roleQ = DB::queryfirstrow(
                         'SELECT allow_pw_change
-                        FROM ' . prefixTable('roles_title') . '
+                        FROM ' . prefixTable('roles_title').'
                         WHERE id = %i',
                         $role
                     );
@@ -3452,11 +3452,11 @@ 
                     
                     foreach ($_SESSION['user_roles'] as $role) {
                         $access = DB::queryFirstRow(
-                            'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                            'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                             $role,
                             $post_id
                         );
-                        if (DB::count()>0) {
+                        if (DB::count() > 0) {
                             if ($access['type'] === 'R') {
                                 array_push($arrTmp, 10);
                             } elseif ($access['type'] === 'W') {
@@ -3520,7 +3520,7 @@ 
                 } else {
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE inactif = %i',
                         0
                     );
@@ -3530,7 +3530,7 @@ 
 
                 // Get folder complexity
                 $folderComplexity = DB::queryFirstRow(
-                    'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
+                    'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_id
                 );
@@ -3542,7 +3542,7 @@ 
                 if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
                     $folderRow = DB::query(
                         'SELECT id_category
-                        FROM ' . prefixTable('categories_folders') . '
+                        FROM ' . prefixTable('categories_folders').'
                         WHERE id_folder = %i',
                         $post_id
                     );
@@ -3656,13 +3656,13 @@ 
                 // List all ITEMS
                 if ($folderIsPf === false) {
                     $where->add('i.inactif=%i', 0);
-                    $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)");
+                    $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)");
                     if (empty($limited_to_items) === false) {
                         $where->add('i.id IN %ls', explode(',', $limited_to_items));
                     }
 
-                    $query_limit = ' LIMIT ' .
-                        $start . ',' .
+                    $query_limit = ' LIMIT '.
+                        $start.','.
                         $post_nb_items_to_display_once;
                     //db::debugmode(true);
                     $rows = DB::query(
@@ -3673,9 +3673,9 @@ 
                         MIN(l.action) AS log_action,
                         l.id_user AS log_user,
                         i.url AS link
-                        FROM ' . prefixTable('items') . ' AS i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' AS i
+                        INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
                         WHERE %l
                         GROUP BY i.id, l.date, l.id_user, l.action
                         ORDER BY i.label ASC, l.date DESC' . $query_limit,
@@ -3694,9 +3694,9 @@ 
                         MIN(l.action) AS log_action,
                         l.id_user AS log_user,
                         i.url AS link
-                        FROM ' . prefixTable('items') . ' AS i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' AS i
+                        INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
                         WHERE %l
                         GROUP BY i.id, l.date, l.id_user, l.action
                         ORDER BY i.label ASC, l.date DESC',
@@ -3726,7 +3726,7 @@ 
                         $item_is_restricted_to_role = false;
                         DB::queryfirstrow(
                             'SELECT role_id
-                            FROM ' . prefixTable('restriction_to_roles') . '
+                            FROM ' . prefixTable('restriction_to_roles').'
                             WHERE item_id = %i',
                             $record['id']
                         );
@@ -3738,7 +3738,7 @@ 
                         $user_is_included_in_role = false;
                         DB::query(
                             'SELECT role_id
-                            FROM ' . prefixTable('restriction_to_roles') . '
+                            FROM ' . prefixTable('restriction_to_roles').'
                             WHERE item_id = %i AND role_id IN %ls',
                             $record['id'],
                             $_SESSION['user_roles']
@@ -3942,9 +3942,9 @@ 
             if ((int) $start === 0) {
                 DB::query(
                     'SELECT i.id
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                     WHERE %l
                     ORDER BY i.label ASC, l.date DESC',
                     $where
@@ -4008,8 +4008,8 @@ 
             // Run query
             $dataItem = DB::queryfirstrow(
                 'SELECT i.pw AS pw, s.share_key AS share_key
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                 WHERE user_id = %i AND i.id = %i',
                 $_SESSION['user_id'],
                 $post_item_id
@@ -4052,7 +4052,7 @@ 
             if (null !== $post_item_id && empty($post_item_id) === false) {
                 $dataItem = DB::queryfirstrow(
                     'SELECT perso, anyone_can_modify
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $post_item_id
                 );
@@ -4089,7 +4089,7 @@ 
                 */
 
                 // Lock Item (if already locked), go back and warn
-                $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id);
+                $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id);
 
                 // If token is taken for this Item and delay is passed then delete it.
                 if (
@@ -4100,7 +4100,7 @@ 
                     DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id);
                     //reload the previous data
                     $dataTmp = DB::queryFirstRow(
-                        'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i',
+                        'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i',
                         $post_item_id
                     );
                 }
@@ -4140,7 +4140,7 @@ 
             // do query on this folder
             $data_this_folder = DB::queryFirstRow(
                 'SELECT id, personal_folder, title
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %s',
                 $post_groupe
             );
@@ -4177,8 +4177,8 @@ 
             $visibilite = '';
             $data = DB::queryFirstRow(
                 'SELECT m.valeur, n.personal_folder
-                FROM ' . prefixTable('misc') . ' AS m
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
+                FROM ' . prefixTable('misc').' AS m
+                INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
                 WHERE type=%s AND intitule = %s',
                 'complex',
                 $post_groupe
@@ -4191,8 +4191,8 @@ 
                 // Prepare Item actual visibility (what Users/Roles can see it)
                 $rows = DB::query(
                     'SELECT t.title
-                    FROM ' . prefixTable('roles_values') . ' as v
-                    INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' as v
+                    INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                     WHERE v.folder_id = %i
                     GROUP BY title',
                     $post_groupe
@@ -4201,7 +4201,7 @@ 
                     if (empty($visibilite)) {
                         $visibilite = $record['title'];
                     } else {
-                        $visibilite .= ' - ' . $record['title'];
+                        $visibilite .= ' - '.$record['title'];
                     }
                 }
             } else {
@@ -4211,14 +4211,14 @@ 
                 // do new query to know if current folder is pf
                 $data_pf = DB::queryFirstRow(
                     'SELECT personal_folder
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE id = %s',
                     $post_groupe
                 );
                 
                 $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
                 
-                $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')';
+                $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')';
             }
 
             recupDroitCreationSansComplexite($post_groupe);
@@ -4228,8 +4228,8 @@ 
             $listOptionsForRoles = array();
             $rows = DB::query(
                 'SELECT r.role_id AS role_id, t.title AS title
-                FROM ' . prefixTable('roles_values') . ' AS r
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' AS r
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                 WHERE r.folder_id = %i',
                 $post_groupe
             );
@@ -4243,7 +4243,7 @@ 
                 );
                 $rows2 = DB::query(
                     'SELECT id, login, fonction_id, email, name, lastname
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 0'
                 );
                 foreach ($rows2 as $record2) {
@@ -4257,7 +4257,7 @@ 
                                 array(
                                     'id' => $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -4274,13 +4274,13 @@ 
 					//db::debugmode(true);
 					$access = DB::queryFirstRow(
 						'SELECT type
-						FROM ' . prefixTable('roles_values') . '
+						FROM ' . prefixTable('roles_values').'
 						WHERE role_id = %i AND folder_id = %i',
 						$role,
 						$post_groupe
 					);
 					//db::debugmode(false);
-                    if (DB::count()>0) {
+                    if (DB::count() > 0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
                         } elseif ($access['type'] === 'W') {
@@ -4350,7 +4350,7 @@ 
             // Get some info before deleting
             $data = DB::queryFirstRow(
                 'SELECT name, id_item, file
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id = %i',
                 $fileId
             );
@@ -4358,7 +4358,7 @@ 
             // Load item data
             $data_item = DB::queryFirstRow(
                 'SELECT id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $data['id_item']
             );
@@ -4385,7 +4385,7 @@ 
                     $_SESSION['user_id'],
                     'at_modification',
                     $_SESSION['login'],
-                    'at_del_file : ' . $data['name']
+                    'at_del_file : '.$data['name']
                 );
 
                 // DElete sharekeys
@@ -4396,7 +4396,7 @@ 
                 );
 
                 // Delete file from server
-                fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS);
+                fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS);
             }
 
             echo (string) prepareExchangedData(
@@ -4415,7 +4415,7 @@ 
         case 'clear_html_tags':
             // Get information for this item
             $dataItem = DB::queryfirstrow(
-                'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i',
+                'SELECT description FROM '.prefixTable('items').' WHERE id=%i',
                 filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT)
             );
             // Clean up the string
@@ -4453,12 +4453,12 @@ 
                 // Update SESSION with this new favourite
                 $data = DB::queryfirstrow(
                     'SELECT label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id = ' . mysqli_real_escape_string($link, $post_item_id)
                 );
                 $_SESSION['favourites_tab'][$post_item_id] = array(
                     'label' => $data['label'],
-                    'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $post_item_id,
+                    'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$post_item_id,
                 );
             } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) {
                 // delete from session
@@ -4527,8 +4527,8 @@ 
             // get data about item
             $dataSource = DB::queryfirstrow(
                 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                 WHERE i.id=%i',
                 $post_item_id
             );
@@ -4536,7 +4536,7 @@ 
             // get data about new folder
             $dataDestination = DB::queryfirstrow(
                 'SELECT personal_folder, title
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -4588,7 +4588,7 @@ 
                 // Get fields for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
@@ -4605,7 +4605,7 @@ 
                 // Get FILES for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $post_item_id
                 );
@@ -4650,7 +4650,7 @@ 
                 // Get the ITEM object key for the user
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE user_id = %i AND object_id = %i',
                     $_SESSION['user_id'],
                     $post_item_id
@@ -4661,8 +4661,8 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
-                        WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                        FROM ' . prefixTable('users').'
+                        WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                         AND public_key != ""'
                     );
                     foreach ($users as $user) {
@@ -4682,14 +4682,14 @@ 
                 // Get fields for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
                 foreach ($rows as $field) {
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_fields') . '
+                        FROM ' . prefixTable('sharekeys_fields').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $field['id']
@@ -4700,8 +4700,8 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
-                            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                            FROM ' . prefixTable('users').'
+                            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                             AND public_key != ""'
                         );
                         foreach ($users as $user) {
@@ -4722,14 +4722,14 @@ 
                 // Get FILES for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $post_item_id
                 );
                 foreach ($rows as $attachment) {
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_files') . '
+                        FROM ' . prefixTable('sharekeys_files').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $attachment['id']
@@ -4740,8 +4740,8 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
-                            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                            FROM ' . prefixTable('users').'
+                            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                             AND public_key != ""'
                         );
                         foreach ($users as $user) {
@@ -4778,7 +4778,7 @@ 
                 $_SESSION['user_id'],
                 'at_modification',
                 $_SESSION['login'],
-                'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
             );
 
             $returnValues = array(
@@ -4831,8 +4831,8 @@ 
                     // get data about item
                     $dataSource = DB::queryfirstrow(
                         'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                         WHERE i.id=%i',
                         $item_id
                     );
@@ -4854,7 +4854,7 @@ 
 
                     // get data about new folder
                     $dataDestination = DB::queryfirstrow(
-                        'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                        'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                         $post_folder_id
                     );
 
@@ -4895,7 +4895,7 @@ 
                         // Get fields for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $item_id
                         );
@@ -4912,7 +4912,7 @@ 
                         // Get FILES for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $item_id
                         );
@@ -4965,7 +4965,7 @@ 
                         // Get the ITEM object key for the user
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_items') . '
+                            FROM ' . prefixTable('sharekeys_items').'
                             WHERE user_id = %i AND object_id = %i',
                             $_SESSION['user_id'],
                             $item_id
@@ -4976,8 +4976,8 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
-                                WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                FROM ' . prefixTable('users').'
+                                WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                 AND public_key != ""'
                             );
                             foreach ($users as $user) {
@@ -4997,14 +4997,14 @@ 
                         // Get fields for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $item_id
                         );
                         foreach ($rows as $field) {
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_fields') . '
+                                FROM ' . prefixTable('sharekeys_fields').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $field['id']
@@ -5015,8 +5015,8 @@ 
                                 // This is a public object
                                 $users = DB::query(
                                     'SELECT id, public_key
-                                    FROM ' . prefixTable('users') . '
-                                    WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                    FROM ' . prefixTable('users').'
+                                    WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                     AND public_key != ""'
                                 );
                                 foreach ($users as $user) {
@@ -5037,14 +5037,14 @@ 
                         // Get FILES for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $item_id
                         );
                         foreach ($rows as $attachment) {
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_files') . '
+                                FROM ' . prefixTable('sharekeys_files').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $attachment['id']
@@ -5055,8 +5055,8 @@ 
                                 // This is a public object
                                 $users = DB::query(
                                     'SELECT id, public_key
-                                    FROM ' . prefixTable('users') . '
-                                    WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                    FROM ' . prefixTable('users').'
+                                    WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                     AND public_key != ""'
                                 );
                                 foreach ($users as $user) {
@@ -5092,13 +5092,13 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                        'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
                     );
                 }
             }
 
             // reload cache table
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', $SETTINGS, null);
 
             echo (string) prepareExchangedData(
@@ -5162,7 +5162,7 @@ 
                     // get info
                     $dataSource = DB::queryfirstrow(
                         'SELECT label, id_tree
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id=%i',
                         $item_id
                     );
@@ -5262,8 +5262,8 @@ 
                     $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING));
                 }
                 // Variables
-                $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]);
-                $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]);
+                $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]);
+                $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]);
 
                 // Get path
                 $path = geItemReadablePath(
@@ -5277,7 +5277,7 @@ 
                         langHdl('email_request_access_subject'),
                         str_replace(
                             array('#tp_item_author#', '#tp_user#', '#tp_item#'),
-                            array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path),
+                            array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path),
                             langHdl('email_request_access_mail')
                         ),
                         $dataAuthor['email'],
@@ -5288,7 +5288,7 @@ 
             } elseif ($post_cat === 'share_this_item') {
                 $dataItem = DB::queryfirstrow(
                     'SELECT label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id= %i',
                     $post_id
                 );
@@ -5312,7 +5312,7 @@ 
                             ),
                             array(
                                 empty($SETTINGS['email_server_url']) === false ?
-                                    $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id,
+                                    $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id,
                                 addslashes($_SESSION['login']),
                                 addslashes($path),
                             ),
@@ -5347,7 +5347,7 @@ 
             if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') {
                 // Check if values already exist
                 $data = DB::queryfirstrow(
-                    'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i',
+                    'SELECT notification FROM '.prefixTable('items').' WHERE id = %i',
                     $post_item_id
                 );
                 $notifiedUsers = explode(';', $data['notification']);
@@ -5358,8 +5358,8 @@ 
                         prefixTable('items'),
                         array(
                             'notification' => empty($data['notification']) ?
-                                filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';'
-                                : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
+                                filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';'
+                                : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
                         ),
                         'id=%i',
                         $post_item_id
@@ -5375,7 +5375,7 @@ 
                         array(
                             'notification' => empty($data['notification']) ?
                                 filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT)
-                                : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
+                                : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
                         ),
                         'id=%i',
                         $post_item_id
@@ -5400,8 +5400,8 @@ 
             // Get all informations for this item
             $dataItem = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                 WHERE i.id=%i AND l.action = %s',
                 $dataReceived['item_id'],
                 'at_creation'
@@ -5432,14 +5432,14 @@ 
                 );
                 // Prepare new line
                 $data = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
+                    'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
                     $dataReceived['item_id']
                 );
-                $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison'];
+                $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison'];
                 // send back
                 $data = array(
                     'error' => '',
-                    'new_line' => '<br>' . addslashes($historic),
+                    'new_line' => '<br>'.addslashes($historic),
                 );
                 echo (string) prepareExchangedData($data, 'encode');
             } else {
@@ -5473,7 +5473,7 @@ 
         */
         case 'is_item_changed':
             $data = DB::queryFirstRow(
-                'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC',
+                'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC',
                 'at_modification',
                 $post_item_id
             );
@@ -5497,7 +5497,7 @@ 
             }
 
             // delete all existing old otv codes
-            $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400));
+            $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400));
             foreach ($rows as $record) {
                 DB::delete(prefixTable('otv'), 'id=%i', $record['id']);
             }
@@ -5519,8 +5519,8 @@ 
             // Should we log a password change?
             $itemQ = DB::queryFirstRow(
                 'SELECT s.share_key, i.pw
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
                 WHERE s.user_id = %i AND s.object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -5570,7 +5570,7 @@ 
             if (isset($SETTINGS['otv_expiration_period']) === false) {
                 $SETTINGS['otv_expiration_period'] = 7;
             }
-            $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session);
+            $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session);
             //$exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400));
 
             echo json_encode(
@@ -5608,8 +5608,8 @@ 
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
                 f.extension AS extension, f.type AS type,
                 s.share_key AS share_key
-                FROM ' . prefixTable('files') . ' AS f
-                INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                FROM ' . prefixTable('files').' AS f
+                INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                 WHERE s.user_id = %i AND s.object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -5630,7 +5630,7 @@ 
             //$fileName = basename($file_info['name'], '.'.$file_info['extension']);
 
             // prepare image info
-            $post_title = basename($file_info['name'], '.' . $file_info['extension']);
+            $post_title = basename($file_info['name'], '.'.$file_info['extension']);
             $post_title = isBase64($post_title) === true ?
                 base64_decode($post_title) : $post_title;
             $image_code = $file_info['file'];
@@ -5647,7 +5647,7 @@ 
             echo (string) prepareExchangedData(
                 array(
                     'error' => false,
-                    'filename' => $post_title . '.' . $file_info['extension'],
+                    'filename' => $post_title.'.'.$file_info['extension'],
                     'file_type' => $file_info['type'],
                     'file_content' => $fileContent,
                 ),
@@ -5668,11 +5668,11 @@ 
 
             // get file info
             $result = DB::queryfirstrow(
-                'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i',
+                'SELECT file FROM '.prefixTable('files').' WHERE id=%i',
                 intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1))
             );
 
-            fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS);
+            fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS);
 
             break;
 
@@ -5695,16 +5695,16 @@ 
             $idFolder = $dataReceived['idFolder'];
 
             // don't check if Personal Folder
-            $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder);
+            $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder);
             if ($data['title'] === $_SESSION['user_id']) {
                 // send data
-                echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]';
+                echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]';
             } else {
                 if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') {
                     // case unique folder
                     DB::query(
                         'SELECT label
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i AND label = %s',
                         $idFolder,
                         $label
@@ -5716,7 +5716,7 @@ 
                     $arrayPf = array();
                     if (empty($row['id']) === false) {
                         $rows = DB::query(
-                            'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+                            'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
                             '1'
                         );
                         foreach ($rows as $record) {
@@ -5731,12 +5731,12 @@ 
                     $where->add('id_tree = %i', $idFolder);
                     $where->add('label = %s', $label);
                     if (empty($arrayPf) === false) {
-                        $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')');
+                        $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')');
                     }
 
                     DB::query(
                         'SELECT label
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE %l',
                         $where
                     );
@@ -5748,7 +5748,7 @@ 
                 }
 
                 // send data
-                echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]';
+                echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]';
             }
             break;
 
@@ -5805,7 +5805,7 @@ 
             }
 
             //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');
             $tree->rebuild();
@@ -5856,7 +5856,7 @@ 
                             if (empty($arr_data['folders'][$inc]['path']) === true) {
                                 $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                             } else {
-                                $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                                $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                             }
                         }
 
@@ -5922,8 +5922,8 @@ 
                     $rows_tmp = DB::query(
                         'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
                         f.id_category AS category_id
-                        FROM ' . prefixTable('categories_folders') . ' AS f
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
+                        FROM ' . prefixTable('categories_folders').' AS f
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
                         WHERE id_folder=%i',
                         $folder
                     );
@@ -5950,7 +5950,7 @@ 
                 $valTemp = '';
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule=%i',
                     'complex',
                     $folder
@@ -5967,14 +5967,14 @@ 
                 $valTemp = '';
                 $rows_tmp = DB::query(
                     'SELECT t.title
-                    FROM ' . prefixTable('roles_values') . ' as v
-                    INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' as v
+                    INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                     WHERE v.folder_id = %i
                     GROUP BY title',
                     $folder
                 );
                 foreach ($rows_tmp as $record) {
-                    $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
+                    $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
                 }
                 $arr_data[$folder]['visibilityRoles'] = $valTemp;
             }
@@ -6002,7 +6002,7 @@ 
             // get item info
             $dataItem = DB::queryFirstRow(
                 'SELECT *
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id=%i',
                 $post_item_id
             );
@@ -6012,8 +6012,8 @@ 
             $rows = DB::query(
                 'SELECT l.date as date, l.action as action, l.raison as raison, l.raison_iv AS raison_iv,
                 u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname
-                FROM ' . prefixTable('log_items') . ' as l
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                FROM ' . prefixTable('log_items').' as l
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                 WHERE id_item=%i AND action <> %s
                 ORDER BY date DESC',
                 $post_item_id,
@@ -6028,7 +6028,7 @@ 
                 
                 // imported via API
                 if (empty($record['login'])) {
-                    $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']';
+                    $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']';
                 }
 
                 if (
@@ -6039,13 +6039,13 @@ 
                 ) {
                     // Prepare avatar
                     if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) {
-                        if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
-                            $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
+                        if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
+                            $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['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';
                     }
 
                     // Prepare action
@@ -6062,19 +6062,19 @@ 
                         $action = langHdl($reason[0]);
                         if ($reason[0] === 'at_moved') {
                             $tmp = explode(' -> ', $reason[1]);
-                            $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
+                            $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
                         } elseif ($reason[0] === 'at_field') {
                             $tmp = explode(' => ', $reason[1]);
                             if (count($tmp) > 1) {
-                                $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') .
-                                    ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
+                                $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value').
+                                    ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
                             } else {
                                 $detail = trim($reason[1]);
                             }
                         } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
                             $tmp = explode(' => ', $reason[1]);
                             $detail = empty(trim($tmp[0])) === true ?
-                                langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
+                                langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
                         } elseif ($reason[0] === 'at_automatic_del') {
                             $detail = langHdl($reason[1]);
                         } elseif ($reason[0] === 'at_anyoneconmodify') {
@@ -6083,7 +6083,7 @@ 
                             $tmp = explode(':', $reason[1]);
                             $tmp = explode('.', $tmp[0]);
                             $detail = isBase64($tmp[0]) === true ?
-                                base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0];
+                                base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0];
                         } elseif ($reason[0] === 'at_import') {
                             $detail = '';
                         } elseif (in_array($reason[0], array('csv', 'pdf')) === true) {
@@ -6102,8 +6102,8 @@ 
                         array(
                             'avatar' => $avatar,
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                            'name' => $record['name'].' '.$record['lastname'],
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                             'action' => $action,
                             'detail' => $detail,
                         )
@@ -6184,18 +6184,18 @@ 
 
             // get some info to add to the notification email
             $resp_user = DB::queryfirstrow(
-                'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
+                'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
                 $_SESSION['user_id']
             );
             $resp_folder = DB::queryfirstrow(
-                'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                 $folder
             );
 
             // notify Managers
             $rows = DB::query(
                 'SELECT email
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
                 1
             );
@@ -6226,14 +6226,14 @@ 
             // Get list of users
             $usersList = array();
             $usersString = '';
-            $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+            $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
             foreach ($rows as $record) {
                 $usersList[$record['login']] = array(
                     'id' => $record['id'],
                     'login' => $record['login'],
                     'email' => $record['email'],
                 );
-                $usersString .= $record['id'] . '#' . $record['login'] . ';';
+                $usersString .= $record['id'].'#'.$record['login'].';';
             }
 
             $data = array(
@@ -6267,7 +6267,7 @@ 
             // Send email
             $dataItem = DB::queryfirstrow(
                 'SELECT label, id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_item_id
             );
@@ -6361,7 +6361,7 @@ 
 
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('notification') . '
+                FROM ' . prefixTable('notification').'
                 WHERE item_id = %i AND user_id = %i',
                 $post_item_id,
                 $_SESSION['user_id']
@@ -6427,7 +6427,7 @@ 
             // And related logs
             $rows = DB::query(
                 'SELECT id, file AS filename
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = %i',
                 $post_item_id,
                 0
@@ -6441,12 +6441,12 @@ 
                 );
 
                 // Delete file on server
-                unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
+                unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
 
                 // Delete related logs
                 $logFile = DB::query(
                     'SELECT increment_id, raison
-                    FROM ' . prefixTable('log_items') . '
+                    FROM ' . prefixTable('log_items').'
                     WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
                     $post_item_id,
                     $_SESSION['user_id'],
@@ -6499,7 +6499,7 @@ 
             // Confirm attachments
             $rows = DB::query(
                 'SELECT id, file AS filename
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = %i',
                 $post_item_id,
                 0
@@ -6536,15 +6536,15 @@ 
         case 'autocomplete_tags':
             // Get a list off all existing TAGS
             $listOfTags = '';
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $get['term']);
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $get['term']);
             foreach ($rows as $record) {
                 if (empty($listOfTags)) {
-                    $listOfTags = '"' . $record['tag'] . '"';
+                    $listOfTags = '"'.$record['tag'].'"';
                 } else {
-                    $listOfTags .= ', "' . $record['tag'] . '"';
+                    $listOfTags .= ', "'.$record['tag'].'"';
                 }
             }
-            echo '[' . $listOfTags . ']';
+            echo '['.$listOfTags.']';
             break;
     }
 }
@@ -6560,7 +6560,7 @@ 
 {
     $data = DB::queryFirstRow(
         'SELECT bloquer_creation, bloquer_modification, personal_folder
-        FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+        FROM ' . prefixTable('nested_tree').' WHERE id = %i',
         $groupe
     );
     // Check if it's in a personal folder. If yes, then force complexity overhead.

sources/core.php

Spacing +23 added lines, -23 removed lines

@@ -50,22 +50,22 @@ 
     // Load AntiXSS
     include_once '../includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
-    if (! headers_sent()) {    //If headers not sent yet... then do php redirect
-        header('Location: ' . $antiXss->xss_clean($url));
+    if (!headers_sent()) {    //If headers not sent yet... then do php redirect
+        header('Location: '.$antiXss->xss_clean($url));
         exit;
     }
 
     //If headers are sent... do java redirect... if java disabled, do html redirect.
     echo '<script type="text/javascript">';
-    echo 'window.location.href="' . $antiXss->xss_clean($url) . '";';
+    echo 'window.location.href="'.$antiXss->xss_clean($url).'";';
     echo '</script>';
     echo '<noscript>';
-    echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />';
+    echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />';
     echo '</noscript>';
 }
 
 // Include files
-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();
 // Prepare GET variables
 $server = [];
@@ -88,7 +88,7 @@ 
     && isset($SETTINGS['enable_sts']) === true
     && (int) $SETTINGS['enable_sts'] === 1
 ) {
-    redirect('https://' . $server['http_host'] . $server['request_uri']);
+    redirect('https://'.$server['http_host'].$server['request_uri']);
 }
 
 // Load pwComplexity
@@ -113,11 +113,11 @@ 
 // LOAD CPASSMAN SETTINGS
 if (
     isset($SETTINGS['cpassman_dir']) === true
-    && is_dir($SETTINGS['cpassman_dir'] . '/install') === true
+    && is_dir($SETTINGS['cpassman_dir'].'/install') === true
 ) {
     // Should we delete folder INSTALL?
     $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',
         'install',
         'clear_install_folder'
     );
@@ -135,11 +135,11 @@ 
             if ($directories !== false) {
                 $files = array_diff($directories, ['.', '..']);
                 foreach ($files as $file) {
-                    if (is_dir($dir . '/' . $file)) {
-                        delTree($dir . '/' . $file);
+                    if (is_dir($dir.'/'.$file)) {
+                        delTree($dir.'/'.$file);
                     } else {
                         try {
-                            unlink($dir . '/' . $file);
+                            unlink($dir.'/'.$file);
                         } catch (Exception $e) {
                             // do nothing... php will ignore and continue
                         }
@@ -152,13 +152,13 @@ 
             }
         }
 
-        if (is_dir($SETTINGS['cpassman_dir'] . '/install')) {
+        if (is_dir($SETTINGS['cpassman_dir'].'/install')) {
             // Set the permissions on the install directory and delete
             // is server Windows or Linux?
             if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-                recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440);
+                recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440);
             }
-            delTree($SETTINGS['cpassman_dir'] . '/install');
+            delTree($SETTINGS['cpassman_dir'].'/install');
         }
 
         // Delete temporary install table
@@ -176,7 +176,7 @@ 
 // Load Languages stuff
 if (isset($languagesList) === false) {
     $languagesList = [];
-    $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC');
+    $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC');
     foreach ($rows as $record) {
         array_push($languagesList, $record['name']);
         if (isset($_SESSION['user_language']) && $record['name'] === $_SESSION['user_language']) {
@@ -234,7 +234,7 @@ 
 // CHECK IF SESSION EXISTS AND IF SESSION IS VALID
 if (empty($_SESSION['sessionDuration']) === false) {
     $dataSession = DB::queryFirstRow(
-        'SELECT key_tempo FROM ' . prefixTable('users') . ' WHERE id=%i',
+        'SELECT key_tempo FROM '.prefixTable('users').' WHERE id=%i',
         $_SESSION['user_id']
     );
 } else {
@@ -298,7 +298,7 @@ 
     && (isset($_SESSION['user_admin']) === true && $_SESSION['user_admin'] === 1)
 ) {
     $row = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule',
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule',
         [
             'type' => 'admin',
             'intitule' => 'cpassman_version',
@@ -358,7 +358,7 @@ 
 
         syslog(
             LOG_WARNING,
-            'Unlog user: ' . date('Y/m/d H:i:s') . " {$server['remote_addr']} ({$server['http_user_agent']})"
+            'Unlog user: '.date('Y/m/d H:i:s')." {$server['remote_addr']} ({$server['http_user_agent']})"
         );
         // erase session table
         $_SESSION = [];
@@ -409,7 +409,7 @@ 
 if (isset($_SESSION['user_id']) === true && empty($_SESSION['user_id']) === false) {
     // query on user
     $data = DB::queryfirstrow(
-        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion FROM ' . prefixTable('users') . ' WHERE id=%i',
+        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion FROM '.prefixTable('users').' WHERE id=%i',
         $_SESSION['user_id']
     );
     //Check if user has been deleted or unlogged
@@ -490,7 +490,7 @@ 
     $_SESSION['item_fields'] = [];
     $rows = DB::query(
         'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE level=%i',
         '0'
     );
@@ -499,7 +499,7 @@ 
         // get each field
         $rows2 = DB::query(
             'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE parent_id=%i
             ORDER BY `order` ASC',
             $record['id']
@@ -576,7 +576,7 @@ 
 if (
     isset($SETTINGS['roles_allowed_to_print']) === true
     && isset($_SESSION['user_roles']) === true
-    && (! isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout']))
+    && (!isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout']))
 ) {
     foreach (explode(';', $SETTINGS['roles_allowed_to_print']) as $role) {
         if (in_array($role, $_SESSION['user_roles']) === true) {
@@ -586,5 +586,5 @@ 
 }
 
 /* CHECK NUMBER OF USER ONLINE */
-DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600);
+DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600);
 $_SESSION['nb_users_online'] = DB::count();

sources/admin.queries.php

Spacing +189 added lines, -189 removed lines

@@ -46,25 +46,25 @@ 
 }
 
 /* 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'], 'options', $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/SplClassLoader.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));
 }
@@ -117,7 +117,7 @@ 
                         array(
                             'http' => array(
                                 'ignore_errors' => true,
-                                'proxy' => $SETTINGS['proxy_ip'] . ':' . $SETTINGS['proxy_port'],
+                                'proxy' => $SETTINGS['proxy_ip'].':'.$SETTINGS['proxy_port'],
                             ),
                         )
                     );
@@ -136,16 +136,16 @@ 
                     $json_array = json_decode($json, true);
 
                     // About version
-                    $text .= '<li><u>' . $LANG['your_version'] . '</u> : ' . TP_VERSION_FULL;
+                    $text .= '<li><u>'.$LANG['your_version'].'</u> : '.TP_VERSION_FULL;
                     if (floatval(TP_VERSION_FULL) < floatval($json_array['info']['version'])) {
-                        $text .= '&nbsp;&nbsp;<b>' . $LANG['please_update'] . '</b>';
+                        $text .= '&nbsp;&nbsp;<b>'.$LANG['please_update'].'</b>';
                     }
                     $text .= '</li>';
 
                     // Libraries
                     $text .= '<li><u>Libraries</u> :</li>';
                     foreach ($json_array['libraries'] as $key => $val) {
-                        $text .= "<li>&nbsp;<span class='fa fa-caret-right'></span>&nbsp;" . $key . " (<a href='" . $val . "' target='_blank'>" . $val . '</a>)</li>';
+                        $text .= "<li>&nbsp;<span class='fa fa-caret-right'></span>&nbsp;".$key." (<a href='".$val."' target='_blank'>".$val.'</a>)</li>';
                     }
                 }
             } else {
@@ -156,7 +156,7 @@ 
         }
         $text .= '</ul>';
 
-        echo '[{"error":"' . $error . '" , "output":"' . str_replace(array("\n", "\t", "\r"), '', $text) . '"}]';
+        echo '[{"error":"'.$error.'" , "output":"'.str_replace(array("\n", "\t", "\r"), '', $text).'"}]';
         break;
 
         //##########################################################
@@ -188,7 +188,7 @@ 
         //get through all users
         $rows = DB::query(
             'SELECT id, login, email
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             ORDER BY login ASC'
         );
         foreach ($rows as $record) {
@@ -205,7 +205,7 @@ 
             //if folder doesn't exist then create it
             $data = DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 $record['id'],
                 0
@@ -267,8 +267,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -302,7 +302,7 @@ 
         }
 
         //Libraries call
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         //init
         $foldersIds = array();
@@ -316,7 +316,7 @@ 
             }
         }
 
-        $items = DB::query('SELECT id,label FROM ' . prefixTable('items') . ' WHERE id_tree NOT IN %li', $foldersIds);
+        $items = DB::query('SELECT id,label FROM '.prefixTable('items').' WHERE id_tree NOT IN %li', $foldersIds);
         foreach ($items as $item) {
             //Delete item
             DB::DELETE(prefixTable('items'), 'id = %i', $item['id']);
@@ -337,12 +337,12 @@ 
         // delete orphan items
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             ORDER BY id ASC'
         );
         foreach ($rows as $item) {
             DB::query(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s',
                 $item['id'],
                 'at_creation'
             );
@@ -372,11 +372,11 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2 mr-3"></i>
                     <i class="fas fa-chevron-right mr-2"></i>' .
-                    $nbItemsDeleted . ' ' . langHdl('deleted_items'),
+                    $nbItemsDeleted.' '.langHdl('deleted_items'),
             ),
             'encode'
         );
@@ -408,21 +408,21 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $return = '';
 
         //Get all tables
         $tables = array();
         $result = DB::query('SHOW TABLES');
         foreach ($result as $row) {
-            $tables[] = $row['Tables_in_' . $database];
+            $tables[] = $row['Tables_in_'.$database];
         }
 
         //cycle through
         foreach ($tables as $table) {
             if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) {
                 // Do query
-                $result = DB::queryRaw('SELECT * FROM ' . $table);
+                $result = DB::queryRaw('SELECT * FROM '.$table);
                 DB::queryRaw(
                     'SELECT *
                     FROM INFORMATION_SCHEMA.COLUMNS
@@ -434,19 +434,19 @@ 
                 $numFields = DB::count();
 
                 // prepare a drop table
-                $return .= 'DROP TABLE ' . $table . ';';
-                $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
-                $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                $return .= 'DROP TABLE '.$table.';';
+                $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
+                $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                 //prepare all fields and datas
                 for ($i = 0; $i < $numFields; ++$i) {
                     while ($row = $result->fetch_row()) {
-                        $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                        $return .= 'INSERT INTO '.$table.' VALUES(';
                         for ($j = 0; $j < $numFields; ++$j) {
                             $row[$j] = addslashes($row[$j]);
                             $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
                             if (isset($row[$j])) {
-                                $return .= '"' . $row[$j] . '"';
+                                $return .= '"'.$row[$j].'"';
                             } else {
                                 $return .= 'NULL';
                             }
@@ -466,8 +466,8 @@ 
             $token = GenerateCryptKey(20, false, true, true, false, true, $SETTINGS);
 
             //save file
-            $filename = time() . '-' . $token . '.sql';
-            $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+            $filename = time().'-'.$token.'.sql';
+            $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
             if ($handle !== false) {
                 //write file
                 fwrite($handle, $return);
@@ -479,17 +479,17 @@ 
                 // Encrypt the file
                 prepareFileWithDefuse(
                     'encrypt',
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                     $SETTINGS,
                     $post_option
                 );
 
                 // Do clean
-                unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                 rename(
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename
                 );
             }
 
@@ -499,7 +499,7 @@ 
             //update LOG
             logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $_SESSION['user_id'], $_SESSION['login']);
 
-            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' . $_SESSION['key_tmp'] . '&pathIsFiles=1"}]';
+            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='.$_SESSION['key_tmp'].'&pathIsFiles=1"}]';
         }
         break;
 
@@ -528,7 +528,7 @@ 
             );
             break;
         }
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $dataPost = explode('&', $post_option);
         $file = htmlspecialchars($dataPost[0]);
@@ -537,7 +537,7 @@ 
         // Get filename from database
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE increment_id = %i',
             $file
         );
@@ -556,22 +556,22 @@ 
             // Decrypt the file
             $ret = prepareFileWithDefuse(
                 'decrypt',
-                $SETTINGS['path_to_files_folder'] . '/' . $file,
-                $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file,
+                $SETTINGS['path_to_files_folder'].'/'.$file,
+                $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file,
                 $SETTINGS,
                 $key
             );
 
             if (empty($ret) === false) {
-                echo '[{"result":"db_restore" , "message":"' . $ret . '"}]';
+                echo '[{"result":"db_restore" , "message":"'.$ret.'"}]';
                 break;
             }
 
             // Do clean
-            fileDelete($SETTINGS['path_to_files_folder'] . '/' . $file, $SETTINGS);
-            $file = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file;
+            fileDelete($SETTINGS['path_to_files_folder'].'/'.$file, $SETTINGS);
+            $file = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file;
         } else {
-            $file = $SETTINGS['path_to_files_folder'] . '/' . $file;
+            $file = $SETTINGS['path_to_files_folder'].'/'.$file;
         }
 
         //read sql file
@@ -588,7 +588,7 @@ 
         fclose($handle);
 
         //delete file
-        unlink($SETTINGS['path_to_files_folder'] . '/' . $file);
+        unlink($SETTINGS['path_to_files_folder'].'/'.$file);
 
         //Show done
         echo '[{"result":"db_restore" , "message":""}]';
@@ -626,8 +626,8 @@ 
             foreach ($table as $i => $tablename) {
                 if (substr_count($tablename, DB_PREFIX) > 0) {
                     // launch optimization quieries
-                    DB::query('ANALYZE TABLE `' . $tablename . '`');
-                    DB::query('OPTIMIZE TABLE `' . $tablename . '`');
+                    DB::query('ANALYZE TABLE `'.$tablename.'`');
+                    DB::query('OPTIMIZE TABLE `'.$tablename.'`');
                 }
             }
         }
@@ -635,12 +635,12 @@ 
         //Clean up LOG_ITEMS table
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             ORDER BY id ASC'
         );
         foreach ($rows as $item) {
             DB::query(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s',
                 $item['id'],
                 'at_creation'
             );
@@ -648,7 +648,7 @@ 
             if ($counter === 0) {
                 //Create new at_creation entry
                 $rowTmp = DB::queryFirstRow(
-                    'SELECT date, id_user FROM ' . prefixTable('log_items') . ' WHERE id_item=%i ORDER BY date ASC',
+                    'SELECT date, id_user FROM '.prefixTable('log_items').' WHERE id_item=%i ORDER BY date ASC',
                     $item['id']
                 );
                 DB::insert(
@@ -678,8 +678,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -712,14 +712,14 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         //read folder
         if (is_dir($SETTINGS['path_to_files_folder']) === false) {
             echo prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => langHdl('file_folder_not_accessible') . ": " . $SETTINGS['path_to_files_folder'],
+                    'message' => langHdl('file_folder_not_accessible').": ".$SETTINGS['path_to_files_folder'],
                 ),
                 'encode'
             );
@@ -731,8 +731,8 @@ 
             //delete file FILES
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..' && $f !== '.htaccess') {
-                    if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) {
-                        fileDelete($dir . '/' . $f, $SETTINGS);
+                    if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) {
+                        fileDelete($dir.'/'.$f, $SETTINGS);
                     }
                 }
             }
@@ -746,7 +746,7 @@ 
             echo prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => langHdl('file_folder_not_accessible') . ": " . $SETTINGS['path_to_upload_folder'],
+                    'message' => langHdl('file_folder_not_accessible').": ".$SETTINGS['path_to_upload_folder'],
                 ),
                 'encode'
             );
@@ -760,7 +760,7 @@ 
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..') {
                     if (strpos($f, '_delete.') > 0) {
-                        fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS);
+                        fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS);
                     }
                 }
             }
@@ -782,11 +782,11 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2 mr-3"></i>
                     <i class="fas fa-chevron-right mr-2"></i>' .
-                    $nbItemsDeleted . ' ' . langHdl('deleted_items'),
+                    $nbItemsDeleted.' '.langHdl('deleted_items'),
             ),
             'encode'
         );
@@ -819,7 +819,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', $SETTINGS, NULL);
 
         // Log
@@ -835,8 +835,8 @@ 
         echo prepareExchangedData(
             [
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success mr-2"></i>',
             ],
             'encode'
@@ -871,7 +871,7 @@ 
         }
 
         // Perform
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $ret = handleConfigFile('rebuild', $SETTINGS);
 
         // Log
@@ -898,8 +898,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -939,33 +939,33 @@ 
         $filename = $post_option;
         $tp_settings = [];
         //get backups infos
-        $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s', 'admin');
+        $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s', 'admin');
         foreach ($rows as $record) {
             $tp_settings[$record['intitule']] = $record['valeur'];
         }
 
         // check if backup file is in DB.
         // If YES then it is encrypted with DEFUSE
-        $bck = DB::queryFirstRow('SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'backup', 'filename');
+        $bck = DB::queryFirstRow('SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'backup', 'filename');
 
         //read file
         $return = '';
-        $Fnm = $tp_settings['bck_script_path'] . '/' . $filename . '.sql';
+        $Fnm = $tp_settings['bck_script_path'].'/'.$filename.'.sql';
         if (file_exists($Fnm)) {
             if (!empty($bck) && $bck['valeur'] === $filename) {
                 $err = '';
 
                 // it means that file is DEFUSE encrypted
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Crypto.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/DerivedKeys.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/File.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Core.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Crypto.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/DerivedKeys.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/File.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Core.php';
 
                 try {
                     \Defuse\Crypto\File::decryptFileWithPassword(
-                        $SETTINGS['bck_script_path'] . '/' . $post_option . '.sql',
-                        $SETTINGS['bck_script_path'] . '/' . str_replace('encrypted', 'clear', $filename) . '.sql',
+                        $SETTINGS['bck_script_path'].'/'.$post_option.'.sql',
+                        $SETTINGS['bck_script_path'].'/'.str_replace('encrypted', 'clear', $filename).'.sql',
                         base64_decode($SETTINGS['bck_script_key'])
                     );
                 } catch (Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
@@ -973,7 +973,7 @@ 
                 }
 
                 if (!empty($err)) {
-                    echo '[{ "result":"backup_decrypt_fails" , "msg":"' . $err . '"}]';
+                    echo '[{ "result":"backup_decrypt_fails" , "msg":"'.$err.'"}]';
                     break;
                 }
             } else {
@@ -995,19 +995,19 @@ 
                 );
 
                 //save the file
-                $handle = fopen($tp_settings['bck_script_path'] . '/' . $filename . '.clear.sql', 'w+');
+                $handle = fopen($tp_settings['bck_script_path'].'/'.$filename.'.clear.sql', 'w+');
                 if ($handle !== false) {
                     fwrite($handle, $return);
                     fclose($handle);
                 }
             }
             $result = 'backup_decrypt_success';
-            $msg = $tp_settings['bck_script_path'] . '/' . $filename . '.clear.sql';
+            $msg = $tp_settings['bck_script_path'].'/'.$filename.'.clear.sql';
         } else {
             $result = 'backup_decrypt_fails';
-            $msg = 'File not found: ' . $Fnm;
+            $msg = 'File not found: '.$Fnm;
         }
-        echo '[{ "result":"' . $result . '" , "msg":"' . $msg . '"}]';
+        echo '[{ "result":"'.$result.'" , "msg":"'.$msg.'"}]';
         break;
 
         /*
@@ -1041,22 +1041,22 @@ 
         require_once 'main.functions.php';
 
         // store old sk
-        $_SESSION['reencrypt_old_salt'] = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $_SESSION['reencrypt_old_salt'] = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH . '/teampass-seckey.txt.' . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time();
+        $old_sk_filename = SECUREPATH.'/teampass-seckey.txt.'.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
-            SECUREPATH . '/teampass-seckey.txt',
+            SECUREPATH.'/teampass-seckey.txt',
             $old_sk_filename
         );
         $new_key = defuse_generate_key();
         file_put_contents(
-            SECUREPATH . '/teampass-seckey.txt',
+            SECUREPATH.'/teampass-seckey.txt',
             $new_key
         );
 
         // store new sk
-        $_SESSION['reencrypt_new_salt'] = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $_SESSION['reencrypt_new_salt'] = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
 
         //put tool in maintenance.
         DB::update(
@@ -1072,13 +1072,13 @@ 
         logEvents($SETTINGS, 'system', 'change_salt_key', (string) $_SESSION['user_id'], $_SESSION['login']);
 
         // get number of items to change
-        DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', 0);
+        DB::query('SELECT id FROM '.prefixTable('items').' WHERE perso = %i', 0);
         $nb_of_items = DB::count();
 
         // create backup table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
         DB::query(
-            'CREATE TABLE `' . prefixTable('sk_reencrypt_backup') . '` (
+            'CREATE TABLE `'.prefixTable('sk_reencrypt_backup').'` (
             `id` int(12) NOT null AUTO_INCREMENT,
             `current_table` varchar(100) NOT NULL,
             `current_field` varchar(500) NOT NULL,
@@ -1106,7 +1106,7 @@ 
         );
 
         // delete previous backup files
-        $files = glob($SETTINGS['path_to_upload_folder'] . '/*'); // get all file names
+        $files = glob($SETTINGS['path_to_upload_folder'].'/*'); // get all file names
         foreach ($files as $file) { // iterate files
             if (is_file($file)) {
                 $file_parts = pathinfo($file);
@@ -1188,7 +1188,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'Input `' . $objects[0] . '` is not allowed',
+                        'message' => 'Input `'.$objects[0].'` is not allowed',
                         'nbOfItems' => '',
                         'nextAction' => '',
                     ),
@@ -1201,9 +1201,9 @@ 
                 //change all encrypted data in Items (passwords)
                 $rows = DB::query(
                     'SELECT id, pw, pw_iv
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = %s
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     '0'
                 );
                 foreach ($rows as $record) {
@@ -1215,7 +1215,7 @@ 
                             'current_field' => 'pw',
                             'value_id' => $record['id'],
                             'value' => $record['pw'],
-                            'current_sql' => 'UPDATE ' . prefixTable('items') . " SET pw = '" . $record['pw'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('items')." SET pw = '".$record['pw']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -1264,9 +1264,9 @@ 
                 //change all encrypted data in Logs (passwords)
                 $rows = DB::query(
                     'SELECT raison, increment_id
-                    FROM ' . prefixTable('log_items') . "
+                    FROM ' . prefixTable('log_items')."
                     WHERE action = %s AND raison LIKE 'at_pw :%'
-                    LIMIT " . $post_start . ', ' . $post_length,
+                    LIMIT " . $post_start.', '.$post_length,
                     'at_modification'
                 );
                 foreach ($rows as $record) {
@@ -1278,7 +1278,7 @@ 
                             'current_field' => 'raison',
                             'value_id' => $record['increment_id'],
                             'value' => $record['raison'],
-                            'current_sql' => 'UPDATE ' . prefixTable('log_items') . " SET raison = '" . $record['raison'] . "' WHERE increment_id = '" . $record['increment_id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('log_items')." SET raison = '".$record['raison']."' WHERE increment_id = '".$record['increment_id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -1306,7 +1306,7 @@ 
                         DB::update(
                             prefixTable('log_items'),
                             array(
-                                'raison' => 'at_pw :' . $encrypt['string'],
+                                'raison' => 'at_pw :'.$encrypt['string'],
                                 'encryption_type' => 'defuse',
                             ),
                             'increment_id = %i',
@@ -1331,8 +1331,8 @@ 
                 //change all encrypted data in CATEGORIES (passwords)
                 $rows = DB::query(
                     'SELECT id, data
-                    FROM ' . prefixTable('categories_items') . '
-                    LIMIT ' . $post_start . ', ' . $post_length
+                    FROM ' . prefixTable('categories_items').'
+                    LIMIT ' . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -1343,7 +1343,7 @@ 
                             'current_field' => 'data',
                             'value_id' => $record['id'],
                             'value' => $record['data'],
-                            'current_sql' => 'UPDATE ' . prefixTable('categories_items') . " SET data = '" . $record['data'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('categories_items')." SET data = '".$record['data']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -1391,9 +1391,9 @@ 
                 // Change all encrypted data in FILES (passwords)
                 $rows = DB::query(
                     'SELECT id, file, status
-                    FROM ' . prefixTable('files') . "
+                    FROM ' . prefixTable('files')."
                     WHERE status = 'encrypted'
-                    LIMIT " . $post_start . ', ' . $post_length
+                    LIMIT " . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -1411,20 +1411,20 @@ 
                     );
                     $newID = DB::insertId();
 
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                         // make a copy of file
                         if (!copy(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '.copy'
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'.copy'
                         )) {
                             $error = 'Copy not possible';
                             exit;
                         } else {
                             // prepare a bck of file (that will not be deleted)
-                            $backup_filename = $record['file'] . '.bck-change-sk.' . time();
+                            $backup_filename = $record['file'].'.bck-change-sk.'.time();
                             copy(
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $backup_filename
+                                $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$backup_filename
                             );
                         }
 
@@ -1432,24 +1432,24 @@ 
                         // STEP1 - Do decryption
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted',
                             $SETTINGS
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file']);
 
                         // STEP2 - Do encryption
                         prepareFileWithDefuse(
                             'encryp',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
                             $SETTINGS
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted');
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted');
 
                         // Update backup table
                         DB::update(
@@ -1475,13 +1475,13 @@ 
                 // do some things for new object
                 if (isset($objects[0])) {
                     if ($objects[0] === 'logs') {
-                        DB::query('SELECT increment_id FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT increment_id FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     } elseif ($objects[0] === 'files') {
-                        DB::query('SELECT id FROM ' . prefixTable('files'));
+                        DB::query('SELECT id FROM '.prefixTable('files'));
                     } elseif ($objects[0] === 'categories') {
-                        DB::query('SELECT id FROM ' . prefixTable('categories_items'));
+                        DB::query('SELECT id FROM '.prefixTable('categories_items'));
                     } elseif ($objects[0] === 'custfields') {
-                        DB::query('SELECT raison FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT raison FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     }
                     $nb_of_items = DB::count();
                 } else {
@@ -1600,12 +1600,12 @@ 
                 );
             } elseif ($record['current_table'] === 'files') {
                 // restore backup file
-                if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value'])) {
-                    unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value']);
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
+                if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value'])) {
+                    unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value']);
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
                         rename(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value2'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value']
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value2'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value']
                         );
                     }
                 }
@@ -1616,15 +1616,15 @@ 
 
         // restore saltkey file
         if (file_exists($previous_saltkey_filename)) {
-            unlink(SECUREPATH . '/teampass-seckey.txt');
+            unlink(SECUREPATH.'/teampass-seckey.txt');
             rename(
                 $previous_saltkey_filename,
-                SECUREPATH . '/teampass-seckey.txt'
+                SECUREPATH.'/teampass-seckey.txt'
             );
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         // Send back
         echo prepareExchangedData(
@@ -1667,17 +1667,17 @@ 
         // delete files
         $rows = DB::query(
             'SELECT value, value2
-            FROM ' . prefixTable('sk_reencrypt_backup') . "
+            FROM ' . prefixTable('sk_reencrypt_backup')."
             WHERE current_table = 'files'"
         );
         foreach ($rows as $record) {
-            if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
-                unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value2']);
+            if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
+                unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value2']);
             }
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         echo '[{"status":"done"}]';
         break;
@@ -1709,7 +1709,7 @@ 
             );
             break;
         } else {
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             //send email
             sendEmail(
@@ -1745,11 +1745,11 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $rows = DB::query(
             'SELECT *
-            FROM ' . prefixTable('emails') . '
+            FROM ' . prefixTable('emails').'
             WHERE status = %s OR status = %s',
             'not_sent',
             ''
@@ -1834,9 +1834,9 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
-        $rows = DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', '');
+        $rows = DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', '');
         foreach ($rows as $record) {
             //send email
             $ret = json_decode(
@@ -1904,7 +1904,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // init
         $filesList = array();
@@ -1917,7 +1917,7 @@ 
                 FROM ' . prefixTable('files')
             );
             foreach ($rows as $record) {
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                     $addFile = false;
                     if (($post_option === 'attachments-decrypt' && $record['status'] === 'encrypted')
                         || ($post_option === 'attachments-encrypt' && $record['status'] === 'clear')
@@ -1982,8 +1982,8 @@ 
         $post_list = filter_var_array($post_list, FILTER_SANITIZE_STRING);
         $post_counter = filter_var($post_counter, FILTER_SANITIZE_NUMBER_INT);
 
-        include $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $cpt = 0;
         $continu = true;
@@ -1991,15 +1991,15 @@ 
         $message = '';
 
         // load PhpEncryption library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Crypto.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Encoding.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/DerivedKeys.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Key.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/File.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/RuntimeTests.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Core.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Crypto.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Encoding.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/DerivedKeys.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Key.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/File.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/RuntimeTests.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Core.php';
 
         // treat 10 files
         foreach ($post_list as $file) {
@@ -2007,35 +2007,35 @@ 
                 // Get file name
                 $file_info = DB::queryfirstrow(
                     'SELECT file
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id = %i',
                     $file
                 );
 
                 // skip file is Coherancey not respected
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'])) {
                     // Case where we want to decrypt
                     if ($post_option === 'decrypt') {
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                             $SETTINGS
                         );
                         // Case where we want to encrypt
                     } elseif ($post_option === 'encrypt') {
                         prepareFileWithDefuse(
                             'encrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                             $SETTINGS
                         );
                     }
                     // Do file cleanup
-                    fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], $SETTINGS);
+                    fileDelete($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], $SETTINGS);
                     rename(
-                        $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
-                        $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file']
+                        $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
+                        $SETTINGS['path_to_upload_folder'].'/'.$file_info['file']
                     );
 
                     // store in DB
@@ -2070,8 +2070,8 @@ 
                 $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted'
             );
 
-            $message = langHdl('last_execution') . ' ' .
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+            $message = langHdl('last_execution').' '.
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                 '<i class="fas fa-check text-success ml-2 mr-3"></i>';
         }
 
@@ -2157,7 +2157,7 @@ 
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_STRING);
 
             DB::query(
-                'DELETE FROM ' . prefixTable('api') . ' WHERE id = %i',
+                'DELETE FROM '.prefixTable('api').' WHERE id = %i',
                 $post_id
             );
         }
@@ -2249,7 +2249,7 @@ 
             // Delete existing key
         } elseif (null !== $post_action && $post_action === 'delete') {
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_STRING);
-            DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE id=%i', $post_id);
+            DB::query('DELETE FROM '.prefixTable('api').' WHERE id=%i', $post_id);
         }
 
         echo prepareExchangedData(
@@ -2264,7 +2264,7 @@ 
 
     case 'save_api_status':
         // Do query
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'api');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'api');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -2290,7 +2290,7 @@ 
         break;
 
     case 'save_duo_status':
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'duo');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'duo');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -2333,7 +2333,7 @@ 
         foreach ($dataReceived as $key => $value) {
             DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %s',
                 'admin',
                 $key
@@ -2401,7 +2401,7 @@ 
         } else {
             $tmp = 1;
         }
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -2427,7 +2427,7 @@ 
 
         // ga_website_name
         if (is_null($dataReceived['ga_website_name']) === false) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2458,7 +2458,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_agses_options':
@@ -2481,7 +2481,7 @@ 
 
         // agses_hosted_url
         if (!is_null($dataReceived['agses_hosted_url'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2510,7 +2510,7 @@ 
 
         // agses_hosted_id
         if (!is_null($dataReceived['agses_hosted_id'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2539,7 +2539,7 @@ 
 
         // agses_hosted_apikey
         if (!is_null($dataReceived['agses_hosted_apikey'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2567,7 +2567,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_option_change':
@@ -2603,7 +2603,7 @@ 
 
         // Check if setting is already in DB. If NO then insert, if YES then update.
         $data = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . '
+            'SELECT * FROM '.prefixTable('misc').'
             WHERE type = %s AND intitule = %s',
             $type,
             $dataReceived['field']
@@ -2625,7 +2625,7 @@ 
                     array(
                         'valeur' => time(),
                         'type' => $type,
-                        'intitule' => $dataReceived['field'] . '_time',
+                        'intitule' => $dataReceived['field'].'_time',
                     )
                 );
             }
@@ -2643,10 +2643,10 @@ 
             if ($dataReceived['field'] === 'send_stats') {
                 // Check if previous time exists, if not them insert this value in DB
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('misc') . '
+                    'SELECT * FROM '.prefixTable('misc').'
                     WHERE type = %s AND intitule = %s',
                     $type,
-                    $dataReceived['field'] . '_time'
+                    $dataReceived['field'].'_time'
                 );
                 $counter = DB::count();
                 if ($counter === 0) {
@@ -2655,7 +2655,7 @@ 
                         array(
                             'valeur' => 0,
                             'type' => $type,
-                            'intitule' => $dataReceived['field'] . '_time',
+                            'intitule' => $dataReceived['field'].'_time',
                         )
                     );
                 } else {
@@ -2675,13 +2675,13 @@ 
         // special Cases
         if ($dataReceived['field'] === 'cpassman_url') {
             // update also jsUrl for CSFP protection
-            $jsUrl = $dataReceived['value'] . '/includes/libraries/csrfp/js/csrfprotector.js';
+            $jsUrl = $dataReceived['value'].'/includes/libraries/csrfp/js/csrfprotector.js';
             $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php';
             $data = file_get_contents($csrfp_file);
             $posJsUrl = strpos($data, '"jsUrl" => "');
             $posEndLine = strpos($data, '",', $posJsUrl);
             $line = substr($data, $posJsUrl, ($posEndLine - $posJsUrl + 2));
-            $newdata = str_replace($line, '"jsUrl" => "' . filter_var($jsUrl, FILTER_SANITIZE_STRING) . '",', $data);
+            $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_STRING).'",', $data);
             file_put_contents($csrfp_file, $newdata);
         } elseif ($dataReceived['field'] === 'restricted_to_input' && $dataReceived['value'] === '0') {
             DB::update(
@@ -2705,7 +2705,7 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'misc' => $counter . ' ; ' . $SETTINGS[$dataReceived['field']],
+                'misc' => $counter.' ; '.$SETTINGS[$dataReceived['field']],
             ),
             'encode'
         );
@@ -2747,7 +2747,7 @@ 
 
         // send statistics
         if (null !== $post_status) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2779,7 +2779,7 @@ 
 
         // send statistics items
         if (null !== $post_list) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2826,7 +2826,7 @@ 
             break;
         }
 
-        if (DB::query("SHOW TABLES LIKE '" . prefixTable('sk_reencrypt_backup') . "'")) {
+        if (DB::query("SHOW TABLES LIKE '".prefixTable('sk_reencrypt_backup')."'")) {
             if (DB::count() === 1) {
                 echo 1;
             } else {
@@ -2864,7 +2864,7 @@ 
 
         $rows = DB::query(
             'SELECT id, title
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 ORDER BY title ASC'
         );
         foreach ($rows as $record) {