nilsteampassnet / TeamPass

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/users.queries.php

Spacing +141 added lines, -141 removed lines

@@ -47,8 +47,8 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $isprofileupdate = filter_input(INPUT_POST, 'isprofileupdate', FILTER_SANITIZE_STRING);
 if (
     checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
@@ -59,7 +59,7 @@ 
         || $isprofileupdate === false
     ) {
         $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
         exit();
     } else {
         // Do special check to allow user to change attributes of his profile
@@ -68,20 +68,20 @@ 
             || checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
         ) {
             $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-            include $SETTINGS['cpassman_dir'] . '/error.php';
+            include $SETTINGS['cpassman_dir'].'/error.php';
             exit();
         }
     }
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -130,7 +130,7 @@ 
             // Prepare variables
             $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
             $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL);
-            $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
+            $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
             $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING);
             $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING);
             $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT);
@@ -159,7 +159,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $login
             );
@@ -389,7 +389,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -408,7 +408,7 @@ 
                 );
                 // delete personal folder and subfolders
                 $data = DB::queryfirstrow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %s AND personal_folder = %i',
                     $post_id,
                     '1'
@@ -421,7 +421,7 @@ 
                         DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                         // delete items & logs
                         $items = DB::query(
-                            'SELECT id FROM ' . prefixTable('items') . '
+                            'SELECT id FROM '.prefixTable('items').'
                             WHERE id_tree=%i AND perso = %i',
                             $folder->id,
                             '1'
@@ -478,7 +478,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -520,7 +520,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -563,7 +563,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -607,7 +607,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -650,7 +650,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -693,7 +693,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -733,7 +733,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -772,7 +772,7 @@ 
             $return = array();
             // Check if folder exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('nested_tree') . '
+                'SELECT * FROM '.prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING),
                 '0'
@@ -785,7 +785,7 @@ 
             }
             // Check if role exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('roles_title') . '
+                'SELECT * FROM '.prefixTable('roles_title').'
                 WHERE title = %s',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING)
             );
@@ -805,7 +805,7 @@ 
         case 'user_log_items':
             $nb_pages = 1;
             $logs = $sql_filter = '';
-            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . '&nbsp;:&nbsp;</td>';
+            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').'&nbsp;:&nbsp;</td>';
 
             // Prepare POST variables
             $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT);
@@ -817,14 +817,14 @@ 
                     && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING))
                     && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all'
                 ) {
-                    $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'";
+                    $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'";
                 }
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                     WHERE l.id_user = %i ' . $sql_filter,
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
@@ -842,19 +842,19 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT l.date as date, u.login as login, i.label as label, l.action as action
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                    WHERE l.id_user = %i ' . $sql_filter . '
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                    WHERE l.id_user = %i ' . $sql_filter.'
                     ORDER BY date DESC
-                    LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page),
+                    LIMIT ' . intval($start).','.intval($post_nb_items_by_page),
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
             } else {
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1=%i',
                     'user_mngt',
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
@@ -873,7 +873,7 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1 = %i
                     ORDER BY date DESC
                     LIMIT %i, %i',
@@ -887,7 +887,7 @@ 
             if (isset($counter) && $counter != 0) {
                 $nb_pages = ceil($counter / intval($post_nb_items_by_page));
                 for ($i = 1; $i <= $nb_pages; ++$i) {
-                    $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>';
+                    $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
                 }
             }
             $pages .= '</tr></table>';
@@ -896,7 +896,7 @@ 
                     if ($post_scope === 'user_mngt') {
                         $user = DB::queryfirstrow(
                             'SELECT login
-                            from ' . prefixTable('users') . '
+                            from ' . prefixTable('users').'
                             WHERE id=%i',
                             $record['qui']
                         );
@@ -906,7 +906,7 @@ 
                         if ($tmp[0] == 'at_user_initial_pwd_changed') {
                             $label = langHdl('log_user_initial_pwd_changed');
                         } elseif ($tmp[0] == 'at_user_email_changed') {
-                            $label = langHdl('log_user_email_changed') . $tmp[1];
+                            $label = langHdl('log_user_email_changed').$tmp[1];
                         } elseif ($tmp[0] == 'at_user_added') {
                             $label = langHdl('log_user_created');
                         } elseif ($tmp[0] == 'at_user_locked') {
@@ -917,14 +917,14 @@ 
                             $label = langHdl('log_user_pwd_changed');
                         }
                         // prepare log
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>';
                     } else {
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . langHdl($record['action']) . '</td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.langHdl($record['action']).'</td></tr>';
                     }
                 }
             }
 
-            echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]';
+            echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]';
             break;
 
             /*
@@ -949,7 +949,7 @@ 
             } else {
                 // Get folder id for Admin
                 $admin_folder = DB::queryFirstRow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %i AND personal_folder = %i',
                     intval($_SESSION['user_id']),
                     '1'
@@ -960,15 +960,15 @@ 
                     // Get each Items in PF
                     $rows = DB::query(
                         'SELECT i.pw, i.label, l.id_user
-                        FROM ' . prefixTable('items') . ' as i
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id)
+                        FROM ' . prefixTable('items').' as i
+                        LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id)
                         WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i',
                         'at_creation',
                         '1',
                         intval($folder->id)
                     );
                     foreach ($rows as $record) {
-                        echo $record['label'] . ' - ';
+                        echo $record['label'].' - ';
                         // Change user
                         DB::update(
                             prefixTable('log_items'),
@@ -1003,7 +1003,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_user_id
             );
@@ -1040,7 +1040,7 @@ 
 
             // Do
             $rows = DB::query(
-                'SELECT id FROM ' . prefixTable('users') . '
+                'SELECT id FROM '.prefixTable('users').'
                 WHERE timestamp != %s AND admin != %i',
                 '',
                 '1'
@@ -1049,7 +1049,7 @@ 
                 // Get info about user to delete
                 $data_user = DB::queryfirstrow(
                     'SELECT admin, isAdministratedByRole, gestionnaire
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $record['id']
                 );
@@ -1103,7 +1103,7 @@ 
             // Get info about user
             $rowUser = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1121,7 +1121,7 @@ 
                 $arrFldAllowed = array();
 
                 //Build tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
@@ -1132,7 +1132,7 @@ 
                 // array of roles for actual user
                 $my_functions = explode(';', $_SESSION['fonction_id']);
 
-                $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title'));
+                $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title'));
                 foreach ($rows as $record) {
                     if (
                         (int) $_SESSION['is_admin'] === 1
@@ -1168,7 +1168,7 @@ 
                 $rolesList = array();
                 $managedBy = array();
                 $selected = '';
-                $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+                $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
                 foreach ($rows as $reccord) {
                     $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']);
                 }
@@ -1199,7 +1199,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => langHdl('managers_of') . ' ' . $fonction['title'],
+                                'title' => langHdl('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -1281,9 +1281,9 @@ 
 
                 // get USER STATUS
                 if ($rowUser['disabled'] == 1) {
-                    $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">' . langHdl('user_info_unlock_question') . '</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . langHdl('user_info_delete_question') . '</label>';
+                    $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">'.langHdl('user_info_unlock_question').'</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.langHdl('user_info_delete_question').'</label>';
                 } else {
-                    $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk">&nbsp;' . langHdl('user_info_lock_question');
+                    $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk">&nbsp;'.langHdl('user_info_lock_question');
                 }
 
                 $arrData['error'] = false;
@@ -1375,7 +1375,7 @@ 
                 // count number of admins
                 $users = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 1 AND email != "" AND pw != ""'
                 );
                 if (DB::count() === 1) {
@@ -1461,7 +1461,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1482,7 +1482,7 @@ 
                     );
                     // delete personal folder and subfolders
                     $data = DB::queryfirstrow(
-                        'SELECT id FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id FROM '.prefixTable('nested_tree').'
                         WHERE title = %s AND personal_folder = %i',
                         $post_id,
                         '1'
@@ -1495,7 +1495,7 @@ 
                             DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                             // delete items & logs
                             $items = DB::query(
-                                'SELECT id FROM ' . prefixTable('items') . '
+                                'SELECT id FROM '.prefixTable('items').'
                                 WHERE id_tree=%i AND perso = %i',
                                 $folder->id,
                                 '1'
@@ -1516,7 +1516,7 @@ 
                 } else {
                     // Get old data about user
                     $oldData = DB::queryfirstrow(
-                        'SELECT * FROM ' . prefixTable('users') . '
+                        'SELECT * FROM '.prefixTable('users').'
                         WHERE id = %i',
                         $post_id
                     );
@@ -1546,7 +1546,7 @@ 
 
                     // update LOG
                     if ($oldData['email'] !== $post_email) {
-                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
+                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
                     }
                 }
                 echo prepareExchangedData(
@@ -1601,7 +1601,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1651,7 +1651,7 @@ 
             }
 
             DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('users') . '
+                'SELECT * FROM '.prefixTable('users').'
                 WHERE login = %s',
                 filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING)
             );
@@ -1700,14 +1700,14 @@ 
             $arrData = array();
 
             //Build tree
-            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $tree->register();
             $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
             // get User info
             $rowUser = DB::queryFirstRow(
                 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1725,7 +1725,7 @@ 
                 // refine folders based upon roles
                 $rows = DB::query(
                     'SELECT folder_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id IN %ls
                     ORDER BY folder_id ASC',
                     $arrData['functions']
@@ -1754,7 +1754,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1767,34 +1767,34 @@ 
 
                             // manage right icon
                             if ($fld['type'] == 'W') {
-                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'ND') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } elseif ($fld['type'] == 'NE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'NDNE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } else {
-                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>';
+                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>';
                             }
 
-                            $html .= '<tr><td>' . $ident . $row['title'] .
-                                ' <small>[' . $row['id'] . ']</small></td><td>' . $label . '</td></tr>';
+                            $html .= '<tr><td>'.$ident.$row['title'].
+                                ' <small>['.$row['id'].']</small></td><td>'.$label.'</td></tr>';
                             break;
                         }
                     }
                 }
 
-                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' .
-                    $html . '</tbody></table>';
+                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'.
+                    $html.'</tbody></table>';
             } else {
                 $html_full = '';
             }
@@ -1840,7 +1840,7 @@ 
             if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i AND isAdministratedByRole IN %ls',
                     '0',
                     array_filter($_SESSION['user_roles'])
@@ -1848,7 +1848,7 @@ 
             } else {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i',
                     '0'
                 );
@@ -1860,7 +1860,7 @@ 
                 $groupIds = [];
                 foreach (explode(';', $record['fonction_id']) as $group) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                        'SELECT id, title FROM '.prefixTable('roles_title').'
                         WHERE id = %i',
                         $group
                     );
@@ -1872,7 +1872,7 @@ 
 
                 // Get managed_by
                 $managedBy = DB::queryfirstrow(
-                    'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                    'SELECT id, title FROM '.prefixTable('roles_title').'
                     WHERE id = %i',
                     $record['isAdministratedByRole']
                 );
@@ -1882,7 +1882,7 @@ 
                 $foldersAllowedIds = [];
                 foreach (explode(';', $record['groupes_visibles']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1895,7 +1895,7 @@ 
                 $foldersForbiddenIds = [];
                 foreach (explode(';', $record['groupes_interdits']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1913,7 +1913,7 @@ 
                         'login' => $record['login'],
                         'groups' => implode(', ', $groups),
                         'groupIds' => $groupIds,
-                        'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'],
+                        'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'],
                         'managedById' => $managedBy === null ? 0 : $managedBy['id'],
                         'foldersAllowed' => implode(', ', $foldersAllowed),
                         'foldersAllowedIds' => $foldersAllowedIds,
@@ -1991,7 +1991,7 @@ 
 
             // Get info about user
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_source_id
             );
@@ -2151,14 +2151,14 @@ 
             if (empty($post_context) === false && $post_context === 'add_one_role_to_user') {
                 $data_user = DB::queryfirstrow(
                     'SELECT fonction_id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
 
                 if ($data_user) {
                     // Ensure array is unique
-                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value;
+                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value;
                     $post_new_value = implode(';', array_unique(explode(';', $post_new_value)));
                 } else {
                     // User not found
@@ -2213,7 +2213,7 @@ 
             if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') {
                 $record = DB::queryFirstRow(
                     'SELECT user_ip_lastdate
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $_SESSION['user_id']
                 );
@@ -2305,38 +2305,38 @@ 
             ];
 
             // Load expected libraries
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
             $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
             $ad->register();
@@ -2352,7 +2352,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                     ),
                     'encode'
                 );
@@ -2372,11 +2372,11 @@ 
                 ['objectclass', '=', 'inetorgperson'],
             ])->get();
             
-            foreach($users as $i => $adUser) {
+            foreach ($users as $i => $adUser) {
                 //print_r($user);
 
                 // Build the list of all groups in AD
-                foreach($adUser['memberof'] as $j => $adUserGroup) {
+                foreach ($adUser['memberof'] as $j => $adUserGroup) {
                     if (empty($adUserGroup) === false) {
                         $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3);
                         if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) {
@@ -2391,7 +2391,7 @@ 
                     // Get his ID
                     DB::queryfirstrow(
                         'SELECT id, fonction_id, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2426,7 +2426,7 @@ 
             }
 
             // Get all groups in Teampass
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2492,7 +2492,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -2596,7 +2596,7 @@ 
                 );
 
                 // Rebuild tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
                 $tree->rebuild();
@@ -2664,7 +2664,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2740,7 +2740,7 @@ 
             // Check if user already exists
             $userInfo = DB::queryfirstrow(
                 'SELECT id, private_key, public_key
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_userid
             );
@@ -2775,7 +2775,7 @@ 
             if (count($_SESSION['personal_folders']) > 0) {
                 DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree IN %ls',
                     $_SESSION['personal_folders']
                 );
@@ -2853,7 +2853,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2907,7 +2907,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );
@@ -2940,7 +2940,7 @@ 
             logEvents(
                 $SETTINGS,
                 'user_mngt',
-                'at_user_new_' . $value[0] . ':' . $value[1],
+                'at_user_new_'.$value[0].':'.$value[1],
                 (string) $_SESSION['user_id'],
                 $_SESSION['login'],
                 filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING)
@@ -2972,7 +2972,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );

sources/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;
     }
 }

index.php

Spacing +82 added lines, -82 removed lines

@@ -72,8 +72,8 @@ 
 }
 
 // Include files
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 // Quick major version check -> upgrade needed?
 if (isset($SETTINGS['cpassman_version']) === true && version_compare(TP_VERSION, $SETTINGS['cpassman_version']) > 0) {
     // Perform redirection
@@ -86,7 +86,7 @@ 
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
 if (isset($SETTINGS['cpassman_url']) === false || $SETTINGS['cpassman_url'] === '') {
@@ -94,8 +94,8 @@ 
 }
 
 // Include files
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 // Open MYSQL database connection
 require_once './includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
@@ -108,7 +108,7 @@ 
 DB::$port = DB_PORT;
 DB::$encoding = DB_ENCODING;
 // Load Core library
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
 // Prepare POST variables
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
 // Prepare superGlobal variables
@@ -138,7 +138,7 @@ 
     // case of user has change language in the login page
     $dataLanguage = DB::queryFirstRow(
         'SELECT flag, name
-        FROM ' . prefixTable('languages') . '
+        FROM ' . prefixTable('languages').'
         WHERE name = %s',
         $get['language']
     );
@@ -148,8 +148,8 @@ 
     //get default language
     $dataLanguage = DB::queryFirstRow(
         'SELECT m.valeur AS valeur, l.flag AS flag
-        FROM ' . prefixTable('misc') . ' AS m
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
+        FROM ' . prefixTable('misc').' AS m
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
         WHERE m.type=%s_type AND m.intitule=%s_intitule',
         [
             'type' => 'admin',
@@ -191,23 +191,23 @@ 
 
 // Load user languages files
 if (in_array($session_user_language, $languagesList) === true) {
-    if (file_exists($SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php') === true) {
-        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php';
+    if (file_exists($SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php') === true) {
+        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php';
     }
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
 }
 
 // load 2FA Google
 if (isset($SETTINGS['google_authentication']) === true && $SETTINGS['google_authentication'] === '1') {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
 }
 
 // load 2FA Yubico
 if (isset($SETTINGS['yubico_authentication']) === true && $SETTINGS['yubico_authentication'] === '1') {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
 }
 
 // Some template adjust
@@ -264,7 +264,7 @@ 
     <!-- Toastr -->
     <link rel="stylesheet" href="plugins/toastr/toastr.min.css" />
     <!-- favicon -->
-    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon'];?>"/>
+    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon']; ?>"/>
 </head>
 
 
@@ -295,7 +295,7 @@ 
             ),
             'SESSION'
         );
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
     }
 } elseif (
     $session_validite_pw !== null
@@ -339,7 +339,7 @@ 
                         <div class="dropdown show">
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
                                 <?php
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right">
@@ -377,7 +377,7 @@ 
             <!-- Main Sidebar Container -->
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
                 <!-- Brand Logo -->
-                <a href="<?php echo $SETTINGS['cpassman_url'] . '/index.php?page=items'; ?>" class="brand-link">
+                <a href="<?php echo $SETTINGS['cpassman_url'].'/index.php?page=items'; ?>" class="brand-link">
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
                 </a>
@@ -395,7 +395,7 @@ 
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
                         <i class="nav-icon fas fa-key"></i>
                         <p>
-                            ' . langHdl('pw') . '
+                            ' . langHdl('pw').'
                         </p>
                         </a>
                     </li>';
@@ -411,7 +411,7 @@ 
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
                         <i class="nav-icon fas fa-file-import"></i>
                         <p>
-                            ' . langHdl('import') . '
+                            ' . langHdl('import').'
                         </p>
                         </a>
                     </li>';
@@ -432,7 +432,7 @@ 
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
                         <i class="nav-icon fas fa-file-export"></i>
                         <p>
-                            ' . langHdl('export') . '
+                            ' . langHdl('export').'
                         </p>
                         </a>
                     </li>';
@@ -459,7 +459,7 @@ 
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
                         <i class="nav-icon fas fa-search"></i>
                         <p>
-                            ' . langHdl('find') . '
+                            ' . langHdl('find').'
                         </p>
                         </a>
                     </li>';
@@ -476,7 +476,7 @@ 
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'admin' ? ' favourites' : '', '">
                         <i class="nav-icon fas fa-star"></i>
                         <p>
-                            ' . langHdl('favorites') . '
+                            ' . langHdl('favorites').'
                         </p>
                         </a>
                     </li>';
@@ -506,7 +506,7 @@ 
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
                         <i class="nav-icon fas fa-lightbulb"></i>
                         <p>
-                            ' . langHdl('suggestion_menu') . '
+                            ' . langHdl('suggestion_menu').'
                         </p>
                         </a>
                     </li>';
@@ -519,7 +519,7 @@ 
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
                         <i class="nav-icon fas fa-info"></i>
                         <p>
-                            ' . langHdl('admin_main') . '
+                            ' . langHdl('admin_main').'
                         </p>
                         </a>
                     </li>
@@ -527,7 +527,7 @@ 
                         <a href="#" class="nav-link">
                             <i class="nav-icon fas fa-wrench"></i>
                             <p>
-                                ' . langHdl('admin_settings') . '
+                                ' . langHdl('admin_settings').'
                                 <i class="fas fa-angle-left right"></i>
                             </p>
                         </a>
@@ -535,55 +535,55 @@ 
                             <li class="nav-item">
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
                                     <i class="fas fa-check-double nav-icon"></i>
-                                    <p>' . langHdl('options') . '</p>
+                                    <p>' . langHdl('options').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
                                     <i class="fas fa-qrcode nav-icon"></i>
-                                    <p>' . langHdl('mfa_short') . '</p>
+                                    <p>' . langHdl('mfa_short').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
                                     <i class="fas fa-cubes nav-icon"></i>
-                                    <p>' . langHdl('api') . '</p>
+                                    <p>' . langHdl('api').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
                                     <i class="fas fa-database nav-icon"></i>
-                                    <p>' . langHdl('backups') . '</p>
+                                    <p>' . langHdl('backups').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
                                     <i class="fas fa-envelope nav-icon"></i>
-                                    <p>' . langHdl('emails') . '</p>
+                                    <p>' . langHdl('emails').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
                                     <i class="fas fa-keyboard nav-icon"></i>
-                                    <p>' . langHdl('fields') . '</p>
+                                    <p>' . langHdl('fields').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
                                     <i class="fas fa-id-card nav-icon"></i>
-                                    <p>' . langHdl('ldap') . '</p>
+                                    <p>' . langHdl('ldap').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
                                     <i class="fas fa-file-upload nav-icon"></i>
-                                    <p>' . langHdl('uploads') . '</p>
+                                    <p>' . langHdl('uploads').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
                                     <i class="fas fa-chart-bar nav-icon"></i>
-                                    <p>' . langHdl('statistics') . '</p>
+                                    <p>' . langHdl('statistics').'</p>
                                 </a>
                             </li>
                         </ul>
@@ -592,7 +592,7 @@ 
                         <a href="#" data-name="actions" class="nav-link', $get['page'] === 'actions' ? ' active' : '', '">
                         <i class="nav-icon fas fa-cogs"></i>
                         <p>
-                            ' . langHdl('actions') . '
+                            ' . langHdl('actions').'
                         </p>
                         </a>
                     </li>';
@@ -608,7 +608,7 @@ 
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
                         <i class="nav-icon fas fa-folder-open"></i>
                         <p>
-                            ' . langHdl('folders') . '
+                            ' . langHdl('folders').'
                         </p>
                         </a>
                     </li>
@@ -616,7 +616,7 @@ 
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
                         <i class="nav-icon fas fa-graduation-cap"></i>
                         <p>
-                            ' . langHdl('roles') . '
+                            ' . langHdl('roles').'
                         </p>
                         </a>
                     </li>
@@ -624,38 +624,38 @@ 
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
                         <i class="nav-icon fas fa-users"></i>
                         <p>
-                            ' . langHdl('users') . '
+                            ' . langHdl('users').'
                         </p>
                         </a>
                     </li>
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
                         <a href="#" class="nav-link">
                         <i class="nav-icon fas fa-cubes"></i>
-                        <p>' . langHdl('admin_views') . '<i class="fas fa-angle-left right"></i></p>
+                        <p>' . langHdl('admin_views').'<i class="fas fa-angle-left right"></i></p>
                         </a>
                         <ul class="nav nav-treeview">
                           <li class="nav-item">
                             <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
                               <i class="far fa-calendar-alt nav-icon"></i>
-                              <p>' . langHdl('renewal') . '</p>
+                              <p>' . langHdl('renewal').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
                               <i class="fas fa-trash-alt nav-icon"></i>
-                              <p>' . langHdl('deletion') . '</p>
+                              <p>' . langHdl('deletion').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
                               <i class="fas fa-history nav-icon"></i>
-                              <p>' . langHdl('logs') . '</p>
+                              <p>' . langHdl('logs').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
                               <i class="fas fa-database nav-icon"></i>
-                              <p>' . langHdl('database') . '</p>
+                              <p>' . langHdl('database').'</p>
                             </a>
                           </li>
                         </ul>
@@ -666,10 +666,10 @@ 
                     <!-- /.sidebar-menu -->
                 <div class="menu-footer">
                     <div class="" id="sidebar-footer">
-                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' .
-                            date($SETTINGS['date_format'], (int) $server['request_time']) . ' - ' .
+                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time').' '.
+                            date($SETTINGS['date_format'], (int) $server['request_time']).' - '.
                             date($SETTINGS['time_format'], (int) $server['request_time']); ?>"></i>
-                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . langHdl('users_online'); ?>"></i>
+                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.langHdl('users_online'); ?>"></i>
                         <a href="<?php echo READTHEDOC_URL; ?>" target="_blank" class="text-info"><i class="fas fa-book mr-2 infotip" title="<?php echo langHdl('documentation_canal'); ?> ReadTheDocs"></i></a>
                         <a href="<?php echo REDDIT_URL; ?>" target="_blank" class="text-info"><i class="fab fa-reddit-alien mr-2 infotip" title="<?php echo langHdl('admin_help'); ?>"></i></a>
                         <i class="fas fa-bug infotip pointer text-info" title="<?php echo langHdl('bugs_page'); ?>" onclick="generateBugReport()"></i>
@@ -972,18 +972,18 @@ 
                     } elseif ($get['page'] === 'items') {
                         // SHow page with Items
                         if ((int) $session_user_admin !== 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
                         } elseif ((int) $session_user_admin === 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
                         } else {
                             $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
                         // Define if user is allowed to see management pages
                         if ($session_user_admin === 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . $mngPages[$get['page']];
+                            include $SETTINGS['cpassman_dir'].'/pages/'.$mngPages[$get['page']];
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
                             if ($get['page'] !== 'manage_main'
                                 && $get['page'] !== 'manage_settings'
@@ -992,15 +992,15 @@ 
                             } else {
                                 $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
                                 //not allowed page
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
+                                include $SETTINGS['cpassman_dir'].'/error.php';
                             }
                         } else {
                             $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
                     } elseif (empty($get['page']) === false) {
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php';
+                        include $SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php';
                     } else {
                         $_SESSION['error']['code'] = ERR_NOT_EXIST;
                         //page doesn't exist
@@ -1090,7 +1090,7 @@ 
     $superGlobal->put('initialUrl', '', 'SESSION');
 
     // LOGIN form
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
 }
 
     ?>
@@ -1280,61 +1280,61 @@ 
     isset($_SESSION['CPM']) === true
     && isset($SETTINGS['cpassman_dir']) === true
 ) {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
     if ($menuAdmin === true) {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
         if ($get['page'] === '2fa') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
         } elseif ($get['page'] === 'api') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
         } elseif ($get['page'] === 'backups') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
         } elseif ($get['page'] === 'emails') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
         } elseif ($get['page'] === 'ldap') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
         } elseif ($get['page'] === 'uploads') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
         } elseif ($get['page'] === 'actions') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/actions.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/actions.js.php';
         } elseif ($get['page'] === 'fields') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
         } elseif ($get['page'] === 'options') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
         } elseif ($get['page'] === 'statistics') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
         }
     } elseif (isset($get['page']) === true && $get['page'] !== '') {
         if ($get['page'] === 'items') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
         } elseif ($get['page'] === 'import') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
         } elseif ($get['page'] === 'export') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
         } elseif ($get['page'] === 'offline') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
         } elseif ($get['page'] === 'search') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
         } elseif ($get['page'] === 'profile') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
         } elseif ($get['page'] === 'favourites') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
         } elseif ($get['page'] === 'folders') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
         } elseif ($get['page'] === 'users') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
         } elseif ($get['page'] === 'roles') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
         } elseif ($get['page'] === 'utilities.deletion') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
         } elseif ($get['page'] === 'utilities.logs') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
         } elseif ($get['page'] === 'utilities.database') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
         } elseif ($get['page'] === 'utilities.renewal') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
         }
     } else {
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
     }
 }

pages/items.php

Spacing +30 added lines, -30 removed lines

@@ -43,18 +43,18 @@ 
 }
 
 /* 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'], curPage($SETTINGS), $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
 // Prepare SESSION variables
@@ -69,7 +69,7 @@ 
 
 // Get list of users
 $usersList = [];
-$rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+$rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
 foreach ($rows as $record) {
     $usersList[$record['login']] = [
         'id' => $record['id'],
@@ -80,16 +80,16 @@ 
 // Get list of roles
 $arrRoles = [];
 $listRoles = '';
-$rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+$rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
 foreach ($rows as $reccord) {
     $arrRoles[$reccord['title']] = [
         'id' => $reccord['id'],
         'title' => $reccord['title'],
     ];
     if (empty($listRoles)) {
-        $listRoles = $reccord['id'] . '#' . $reccord['title'];
+        $listRoles = $reccord['id'].'#'.$reccord['title'];
     } else {
-        $listRoles .= ';' . $reccord['id'] . '#' . $reccord['title'];
+        $listRoles .= ';'.$reccord['id'].'#'.$reccord['title'];
     }
 }
 ?>
@@ -163,9 +163,9 @@ 
                         <li class="nav-item"><a class="nav-link" href="#tab_3" data-toggle="tab"><i class="fas fa-archive mr-2"></i><?php echo langHdl('attachments'); ?></a></li>
                         <?php
                         echo isset($SETTINGS['item_extra_fields']) === true && (int) $SETTINGS['item_extra_fields'] === 1 ? '
-                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fas fa-cubes mr-2"></i>' . langHdl('fields') . '</a></li>' : '';
+                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fas fa-cubes mr-2"></i>' . langHdl('fields').'</a></li>' : '';
 echo isset($SETTINGS['insert_manual_entry_item_history']) === true && (int) $SETTINGS['insert_manual_entry_item_history'] === 1 ? '
-                            <li class="nav-item"><a class="nav-link" href="#tab_5" data-toggle="tab"><i class="fas fa-history mr-2"></i>' . langHdl('history') . '</a></li>' : '';
+                            <li class="nav-item"><a class="nav-link" href="#tab_5" data-toggle="tab"><i class="fas fa-history mr-2"></i>' . langHdl('history').'</a></li>' : '';
                         ?>
                     </ul>
                 </div><!-- /.card-header -->
@@ -234,7 +234,7 @@ 
                                                 <?php
                                                 for ($i = 4; $i <= $SETTINGS['pwd_maximum_length']; ++$i) {
                                                     echo '
-                                                <option>' . $i . '</option>';
+                                                <option>' . $i.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -403,29 +403,29 @@ 
                                         if (isset($_SESSION['item_fields']) === true) {
                                             foreach ($_SESSION['item_fields'] as $category) {
                                                 echo '
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
-                                                <h5>' . $category['title'] . '</h5>
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
+                                                <h5>' . $category['title'].'</h5>
                                                 <p>';
                                                 foreach ($category['fields'] as $field) {
                                                     if ($field['type'] === 'textarea') {
                                                         echo '
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <label>' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fas fa-fire text-danger ml-1 infotip" title="' . langHdl('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fas fa-fire text-danger ml-1 infotip" title="'.langHdl('is_mandatory').'"></span>' : '',
                                                             '</label>
-                                                        <textarea class="form-control form-item-control form-item-field-custom track-change" rows="2" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-change-ongoing="0"></textarea>
+                                                        <textarea class="form-control form-item-control form-item-field-custom track-change" rows="2" data-field-name="' . $field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-change-ongoing="0"></textarea>
                                                     </div>';
                                                     } else {
                                                         echo '
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fas fa-fire text-danger ml-1 infotip" title="' . langHdl('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fas fa-fire text-danger ml-1 infotip" title="'.langHdl('is_mandatory').'"></span>' : '',
                                                             '</span>
                                                         </div>
-                                                        <input type="' . $field['type'] . '" class="form-control form-item-control form-item-field-custom track-change" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-change-ongoing="0">
+                                                        <input type="' . $field['type'].'" class="form-control form-item-control form-item-field-custom track-change" data-field-name="'.$field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-change-ongoing="0">
                                                     </div>';
                                                     }
                                                 }
@@ -436,8 +436,8 @@ 
                                                 ) {
                                                     echo '
                                                     <div class="form-check icheck-blue">
-                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'] . '" data-change-ongoing="0" data-field-name="template" id="template_' . $category['id'] . '">
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . langHdl('main_template') . '</label>
+                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'].'" data-change-ongoing="0" data-field-name="template" id="template_'.$category['id'].'">
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.langHdl('main_template').'</label>
                                                     </div>';
                                                 }
                                                 echo '
@@ -667,18 +667,18 @@ 
                         <?php
                             foreach ($_SESSION['item_fields'] as $elem) {
                                 echo '
-                        <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
-                            <h5>' . $elem['title'] . '</h5>
+                        <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
+                            <h5>' . $elem['title'].'</h5>
                             <p>
                                 <ul class="list-group list-group-unbordered mb-3">';
                                 foreach ($elem['fields'] as $field) {
                                     echo '
-                                    <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
-                                        <b>' . $field['title'] . '</b>
-                                        <button type="button" class="float-right btn btn-outline-info btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="#card-item-field-value-' . $field['id'] . '">
+                                    <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
+                                        <b>' . $field['title'].'</b>
+                                        <button type="button" class="float-right btn btn-outline-info btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="#card-item-field-value-' . $field['id'].'">
                                             <i class="fas fa-copy"></i>
                                         </button>
-                                        <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
+                                        <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
                                     </li>';
                                 }
                                 echo '
@@ -1050,7 +1050,7 @@ 
                         <p><?php
                             echo str_replace(
         ['##otv_expiration_period##', '. '],
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
         langHdl('otv_message')
     );
                             ?></p>
@@ -1124,7 +1124,7 @@ 
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
                                 }
                                 ?>
                             </select>

sources/main.functions.php

Spacing +217 added lines, -217 removed lines

@@ -119,24 +119,24 @@ 
  */
 function cryption(string $message, string $ascii_key, string $type, array $SETTINGS): array
 {
-    $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH . '/teampass-seckey.txt') : $ascii_key;
+    $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH.'/teampass-seckey.txt') : $ascii_key;
     $err = false;
     // load PhpEncryption library
     if (isset($SETTINGS['cpassman_dir']) === false || empty($SETTINGS['cpassman_dir']) === true) {
         $path = '../includes/libraries/Encryption/Encryption/';
     } else {
-        $path = $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/';
-    }
-
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+        $path = $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/';
+    }
+
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     // convert KEY
     $key = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key);
     try {
@@ -180,15 +180,15 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     $key = \Defuse\Crypto\Key::createNewRandomKey();
     $key = $key->saveToAsciiSafeString();
     return $key;
@@ -210,15 +210,15 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     $protected_key = \Defuse\Crypto\KeyProtectedByPassword::createRandomPasswordProtectedKey($psk);
     return $protected_key->saveToAsciiSafeString(); // save this in user table
 }
@@ -240,15 +240,15 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     try {
         $protected_key = \Defuse\Crypto\KeyProtectedByPassword::loadFromAsciiSafeString($protected_key_encoded);
         $user_key = $protected_key->unlockKey($psk);
@@ -287,7 +287,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -333,8 +333,8 @@ 
  */
 function db_error_handler(array $params): void
 {
-    echo 'Error: ' . $params['error'] . "<br>\n";
-    echo 'Query: ' . $params['query'] . "<br>\n";
+    echo 'Error: '.$params['error']."<br>\n";
+    echo 'Query: '.$params['query']."<br>\n";
     throw new Exception('Error - Query', 1);
 }
 
@@ -356,12 +356,12 @@ 
     $SETTINGS
 ) {
     //load ClassLoader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -372,7 +372,7 @@ 
     DB::$port = DB_PORT;
     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(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     // Check if user is ADMINISTRATOR
@@ -415,7 +415,7 @@ 
 function identAdmin($idFonctions, $SETTINGS, $tree)
 {
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Init
     $groupesVisibles = [];
@@ -434,7 +434,7 @@ 
     $globalsVisibleFolders = $superGlobal->get('groupes_visibles', 'SESSION');
     $globalsPersonalVisibleFolders = $superGlobal->get('personal_visible_groups', 'SESSION');
     // Get list of Folders
-    $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
         array_push($groupesVisibles, $record['id']);
     }
@@ -453,7 +453,7 @@ 
     }
     // Get ID of personal folder
     $persfld = DB::queryfirstrow(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %s',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %s',
         $globalsUserId
     );
     if (empty($persfld['id']) === false) {
@@ -474,20 +474,20 @@ 
     // get complete list of ROLES
     $tmp = explode(';', $idFonctions);
     $rows = DB::query(
-        'SELECT * FROM ' . prefixTable('roles_title') . '
+        'SELECT * FROM '.prefixTable('roles_title').'
         ORDER BY title ASC'
     );
     foreach ($rows as $record) {
-        if (! empty($record['id']) && ! in_array($record['id'], $tmp)) {
+        if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
             array_push($tmp, $record['id']);
         }
     }
     $superGlobal->put('fonction_id', implode(';', $tmp), 'SESSION');
     $superGlobal->put('is_admin', 1, 'SESSION');
     // Check if admin has created Folders and Roles
-    DB::query('SELECT * FROM ' . prefixTable('nested_tree') . '');
+    DB::query('SELECT * FROM '.prefixTable('nested_tree').'');
     $superGlobal->put('nb_folders', DB::count(), 'SESSION');
-    DB::query('SELECT * FROM ' . prefixTable('roles_title'));
+    DB::query('SELECT * FROM '.prefixTable('roles_title'));
     $superGlobal->put('nb_roles', DB::count(), 'SESSION');
 }
 
@@ -529,7 +529,7 @@ 
     object $tree
 ) {
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Init
     $superGlobal->put('groupes_visibles', [], 'SESSION');
@@ -557,7 +557,7 @@ 
     // Get list of folders depending on Roles
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('roles_values') . '
+        FROM ' . prefixTable('roles_values').'
         WHERE role_id IN %li AND type IN %ls',
         $userRoles,
         ['W', 'ND', 'NE', 'NDNE', 'R']
@@ -582,10 +582,10 @@ 
     // Does this user is allowed to see other items
     $inc = 0;
     $rows = DB::query(
-        'SELECT id, id_tree FROM ' . prefixTable('items') . '
+        'SELECT id, id_tree FROM '.prefixTable('items').'
             WHERE restricted_to LIKE %ss AND inactif = %s'.
             (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''),
-        $globalsUserId . ';',
+        $globalsUserId.';',
         '0'
     );
     foreach ($rows as $record) {
@@ -599,8 +599,8 @@ 
     // Check for the users roles if some specific rights exist on items
     $rows = DB::query(
         'SELECT i.id_tree, r.item_id
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id)
         WHERE r.role_id IN %li AND i.id_tree <> ""
         ORDER BY i.id_tree ASC',
         $userRoles
@@ -621,7 +621,7 @@ 
     ) {
         $persoFld = DB::queryfirstrow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i'.
             (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''),
             $globalsUserId,
@@ -655,7 +655,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -697,16 +697,16 @@ 
         'SESSION'
     );
     // Folders and Roles numbers
-    DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . '');
+    DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').'');
     $superGlobal->put('nb_folders', DB::count(), 'SESSION');
-    DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title'));
+    DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title'));
     $superGlobal->put('nb_roles', DB::count(), 'SESSION');
     // check if change proposals on User's items
     if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) {
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('items_change') . ' AS c
-            LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item)
+            FROM ' . prefixTable('items_change').' AS c
+            LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item)
             WHERE i.action = %s AND i.id_user = %i',
             'at_creation',
             $globalsUserId
@@ -750,9 +750,9 @@ 
  */
 function cacheTableRefresh(array $SETTINGS): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -767,12 +767,12 @@ 
     $tree->register();
     $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     // truncate table
-    DB::query('TRUNCATE TABLE ' . prefixTable('cache'));
+    DB::query('TRUNCATE TABLE '.prefixTable('cache'));
     // reload date
     $rows = DB::query(
         '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)
         AND l.action = %s
         AND i.inactif = %i',
         'at_creation',
@@ -784,18 +784,18 @@ 
             $tags = '';
             $itemTags = DB::query(
                 'SELECT tag
-                            FROM ' . prefixTable('tags') . '
+                            FROM ' . prefixTable('tags').'
                             WHERE item_id = %i AND tag != ""',
                 $record['id']
             );
             foreach ($itemTags as $itemTag) {
-                $tags .= $itemTag['tag'] . ' ';
+                $tags .= $itemTag['tag'].' ';
             }
 
             // Get renewal period
             $resNT = DB::queryfirstrow(
                 'SELECT renewal_period
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $record['id_tree']
             );
@@ -808,7 +808,7 @@ 
                     // Is this a User id?
                     $user = DB::queryfirstrow(
                         'SELECT id, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -826,11 +826,11 @@ 
                     'id' => $record['id'],
                     'label' => $record['label'],
                     'description' => $record['description'] ?? '',
-                    'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0',
+                    'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0',
                     'tags' => $tags,
                     'id_tree' => $record['id_tree'],
                     'perso' => $record['perso'],
-                    'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0',
+                    'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0',
                     'login' => $record['login'] ?? '',
                     'folder' => implode(' > ', $folder),
                     'author' => $record['id_user'],
@@ -850,12 +850,12 @@ 
  */
 function cacheTableUpdate(array $SETTINGS, ?int $ident = null): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -872,7 +872,7 @@ 
     // get new value from db
     $data = DB::queryfirstrow(
         'SELECT label, description, id_tree, perso, restricted_to, login, url
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id=%i',
         $ident
     );
@@ -880,12 +880,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -896,7 +896,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -914,10 +914,10 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => $tags,
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => $data['perso'],
-            'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0',
+            'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0',
             'login' => $data['login'] ?? '',
             'folder' => implode(' » ', $folder),
             'author' => $superGlobal->get('user_id', 'SESSION'),
@@ -935,14 +935,14 @@ 
  */
 function cacheTableAdd(array $SETTINGS, ?int $ident = null): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get superglobals
     $globalsUserId = $superGlobal->get('user_id', 'SESSION');
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -959,8 +959,8 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date
-        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',
         $ident,
@@ -970,12 +970,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -986,7 +986,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -1005,7 +1005,7 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => isset($tags) && empty($tags) === false ? $tags : 'None',
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0',
             'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0',
@@ -1027,52 +1027,52 @@ 
 function getStatisticsData(array $SETTINGS): array
 {
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         0
     );
     $counter_folders = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         1
     );
     $counter_folders_perso = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         0
     );
     $counter_items = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         1
     );
     $counter_items_perso = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ''
+        'SELECT id FROM '.prefixTable('users').''
     );
     $counter_users = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE admin = %i',
         1
     );
     $admins = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i',
         1
     );
     $managers = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i',
         1
     );
     $readOnly = DB::count();
     // list the languages
     $usedLang = [];
     $tp_languages = DB::query(
-        'SELECT name FROM ' . prefixTable('languages')
+        'SELECT name FROM '.prefixTable('languages')
     );
     foreach ($tp_languages as $tp_language) {
         DB::query(
-            'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s',
+            'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s',
             $tp_language['name']
         );
         $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0);
@@ -1081,12 +1081,12 @@ 
     // get list of ips
     $usedIp = [];
     $tp_ips = DB::query(
-        'SELECT user_ip FROM ' . prefixTable('users')
+        'SELECT user_ip FROM '.prefixTable('users')
     );
     foreach ($tp_ips as $ip) {
         if (array_key_exists($ip['user_ip'], $usedIp)) {
             $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']];
-        } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
+        } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
             $usedIp[$ip['user_ip']] = 1;
         }
     }
@@ -1152,21 +1152,21 @@ 
     }
 
     // Load settings
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get user language
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $superGlobal->get('user_language', 'SESSION') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$superGlobal->get('user_language', 'SESSION').'.php';
     // Load library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // load PHPMailer
     $mail = new SplClassLoader('PHPMailer\PHPMailer', '../includes/libraries');
     $mail->register();
     $mail = new PHPMailer\PHPMailer\PHPMailer(true);
     try {
         // send to user
-        $mail->setLanguage('en', $SETTINGS['cpassman_dir'] . '/includes/libraries/PHPMailer/PHPMailer/language/');
+        $mail->setLanguage('en', $SETTINGS['cpassman_dir'].'/includes/libraries/PHPMailer/PHPMailer/language/');
         $mail->SMTPDebug = 0;
         //value 1 can be used to debug - 4 for debuging connections
         $mail->Port = $SETTINGS['email_port'];
@@ -1258,7 +1258,7 @@ 
         <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;">
         <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;">
         <br><div style="float:right;">' .
-        $textMail .
+        $textMail.
         '<br><br></td></tr></table>
     </td></tr></table>
     <br></body></html>';
@@ -1269,7 +1269,7 @@ 
  */
 function generateKey(): string
 {
-    return substr(md5(rand() . rand()), 0, 15);
+    return substr(md5(rand().rand()), 0, 15);
 }
 
 /**
@@ -1340,7 +1340,7 @@ 
 {
     array_walk_recursive(
         $array,
-        static function (&$item): void {
+        static function(&$item): void {
             if (mb_detect_encoding((string) $item, 'utf-8', true) === false) {
                 $item = utf8_encode($item);
             }
@@ -1375,7 +1375,7 @@ 
     }
 
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get superglobals
     if ($key !== null) {
@@ -1386,9 +1386,9 @@ 
     }
 
     //load ClassLoader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Load AES
-    $aes = new SplClassLoader('Encryption\Crypt', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $aes = new SplClassLoader('Encryption\Crypt', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $aes->register();
     if ($type === 'encode' && is_array($data) === true) {
         // Ensure UTF8 format
@@ -1475,8 +1475,8 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
-    if (! empty($safeTable)) {
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
+    if (!empty($safeTable)) {
         // sanitize string
         return $safeTable;
     }
@@ -1504,13 +1504,13 @@ 
     bool $lowercase = false,
     array $SETTINGS = []
 ): string {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $generator->register();
     $generator = new PasswordGenerator\Generator\ComputerPasswordGenerator();
     // Is PHP7 being used?
     if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-        $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $php7generator->register();
         $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
     }
@@ -1540,7 +1540,7 @@ 
 function send_syslog($message, $host, $port, $component = 'teampass'): void
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message;
+    $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message;
     socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $host, $port);
     socket_close($sock);
 }
@@ -1562,7 +1562,7 @@ 
     }
 
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -1586,14 +1586,14 @@ 
     if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) {
         if ($type === 'user_mngt') {
             send_syslog(
-                'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ',
+                'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
             );
         } else {
             send_syslog(
-                'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ',
+                'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
@@ -1625,7 +1625,7 @@ 
     ?string $encryption_type = null
 ): void {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -1669,7 +1669,7 @@ 
         if (empty($item_label) === true) {
             $dataItem = DB::queryfirstrow(
                 'SELECT id, id_tree, label
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $item_id
             );
@@ -1677,11 +1677,11 @@ 
         }
 
         send_syslog(
-            'action=' . str_replace('at_', '', $action) .
-                ' attribute=' . str_replace('at_', '', $attribute[0]) .
-                ' itemno=' . $item_id .
-                ' user=' . is_null($login) === true ? '' : addslashes((string) $login) .
-                ' itemname="' . addslashes($item_label) . '"',
+            'action='.str_replace('at_', '', $action).
+                ' attribute='.str_replace('at_', '', $attribute[0]).
+                ' itemno='.$item_id.
+                ' user='.is_null($login) === true ? '' : addslashes((string) $login).
+                ' itemname="'.addslashes($item_label).'"',
             $SETTINGS['syslog_host'],
             $SETTINGS['syslog_port'],
             'teampass'
@@ -1707,7 +1707,7 @@ 
         && $action === 'at_shown'
     ) {
         // Load superglobal
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         // Get superglobals
         $globalsLastname = $superGlobal->get('lastname', 'SESSION');
@@ -1716,7 +1716,7 @@ 
         // Get info about item
         $dataItem = DB::queryfirstrow(
             'SELECT id, id_tree, label
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $item_id
         );
@@ -1730,9 +1730,9 @@ 
                 'body' => str_replace(
                     ['#tp_user#', '#tp_item#', '#tp_link#'],
                     [
-                        addslashes($globalsName . ' ' . $globalsLastname),
+                        addslashes($globalsName.' '.$globalsLastname),
                         addslashes($item_label),
-                        $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $item_id,
+                        $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$item_id,
                     ],
                     langHdl('email_on_open_notification_mail')
                 ),
@@ -1754,7 +1754,7 @@ 
 function notifyChangesToSubscribers(int $item_id, string $label, array $changes, array $SETTINGS): void
 {
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get superglobals
     $globalsUserId = $superGlobal->get('user_id', 'SESSION');
@@ -1764,8 +1764,8 @@ 
     $notification = DB::queryOneColumn(
         'email',
         'SELECT *
-        FROM ' . prefixTable('notification') . ' AS n
-        INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id)
+        FROM ' . prefixTable('notification').' AS n
+        INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id)
         WHERE n.item_id = %i AND n.user_id != %i',
         $item_id,
         $globalsUserId
@@ -1776,7 +1776,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -1807,7 +1807,7 @@ 
 function geItemReadablePath(int $id_tree, string $label, array $SETTINGS): string
 {
     // Class loader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Load Tree
     $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries');
     $tree->register();
@@ -1816,15 +1816,15 @@ 
     $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($label) === false) {
-        return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')';
+        return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')';
     }
     return empty($path) === true ? '' : $path;
 }
@@ -1879,9 +1879,9 @@ 
  */
 function handleConfigFile($action, $SETTINGS, $field = null, $value = null)
 {
-    $tp_config_file = $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+    $tp_config_file = $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -1894,8 +1894,8 @@ 
     if (file_exists($tp_config_file) === false || $action === 'rebuild') {
         // perform a copy
         if (file_exists($tp_config_file)) {
-            if (! copy($tp_config_file, $tp_config_file . '.' . date('Y_m_d_His', time()))) {
-                return "ERROR: Could not copy file '" . $tp_config_file . "'";
+            if (!copy($tp_config_file, $tp_config_file.'.'.date('Y_m_d_His', time()))) {
+                return "ERROR: Could not copy file '".$tp_config_file."'";
             }
         }
 
@@ -1905,11 +1905,11 @@ 
         $data[1] = "global \$SETTINGS;\n";
         $data[2] = "\$SETTINGS = array (\n";
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s',
             'admin'
         );
         foreach ($rows as $record) {
-            array_push($data, "    '" . $record['intitule'] . "' => '" . $record['valeur'] . "',\n");
+            array_push($data, "    '".$record['intitule']."' => '".$record['valeur']."',\n");
         }
         array_push($data, ");\n");
         $data = array_unique($data);
@@ -1923,15 +1923,15 @@ 
                 break;
             }
 
-            if (stristr($line, "'" . $field . "' => '")) {
-                $data[$inc] = "    '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n";
+            if (stristr($line, "'".$field."' => '")) {
+                $data[$inc] = "    '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n";
                 $bFound = true;
                 break;
             }
             ++$inc;
         }
         if ($bFound === false) {
-            $data[$inc] = "    '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n);\n";
+            $data[$inc] = "    '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n);\n";
         }
     }
 
@@ -1957,7 +1957,7 @@ 
 {
     global $SETTINGS;
     /* LOAD CPASSMAN SETTINGS */
-    if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
+    if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
         $SETTINGS = [];
         $SETTINGS['duplicate_folder'] = 0;
         //by default, this is set to 0;
@@ -1967,7 +1967,7 @@ 
         //by default, this value is set to 5;
         $settings = [];
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2',
             [
                 'type' => 'admin',
                 'type2' => 'settings',
@@ -1994,7 +1994,7 @@ 
     $source_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -2005,7 +2005,7 @@ 
     $target_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -2040,9 +2040,9 @@ 
     $password = null
 ) {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php';
     $antiXss = new voku\helper\AntiXSS();
     // Protect against bad inputs
     if (is_array($source_file) === true || is_array($target_file) === true) {
@@ -2054,7 +2054,7 @@ 
     $target_file = $antiXss->xss_clean($target_file);
     if (empty($password) === true || is_null($password) === true) {
         // get KEY to define password
-        $ascii_key = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $ascii_key = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
         $password = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key);
     }
 
@@ -2099,15 +2099,15 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php';
     try {
         \Defuse\Crypto\File::encryptFileWithPassword(
             $source_file,
@@ -2144,15 +2144,15 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php';
     try {
         \Defuse\Crypto\File::decryptFileWithPassword(
             $source_file,
@@ -2197,9 +2197,9 @@ 
 function fileDelete(string $file, array $SETTINGS): void
 {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
     $file = $antiXss->xss_clean($file);
     if (is_file($file)) {
@@ -2243,7 +2243,7 @@ 
 
 function recursiveChmod($path, $filePerm = 0644, $dirPerm = 0755) {
     // Check if the path exists
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2278,7 +2278,7 @@ 
  */
 function accessToItemIsGranted(int $item_id, $SETTINGS)
 {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Prepare superGlobal variables
     $session_groupes_visibles = $superGlobal->get('groupes_visibles', 'SESSION');
@@ -2286,7 +2286,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2359,8 +2359,8 @@ 
 function performDBQuery(array $SETTINGS, string $fields, string $table): array
 {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -2372,7 +2372,7 @@ 
     DB::$encoding = DB_ENCODING;
     // Insert log in DB
     return DB::query(
-        'SELECT ' . $fields . '
+        'SELECT '.$fields.'
         FROM ' . prefixTable($table)
     );
 }
@@ -2385,11 +2385,11 @@ 
 function formatSizeUnits(int $bytes): string
 {
     if ($bytes >= 1073741824) {
-        $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+        $bytes = number_format($bytes / 1073741824, 2).' GB';
     } elseif ($bytes >= 1048576) {
-        $bytes = number_format($bytes / 1048576, 2) . ' MB';
+        $bytes = number_format($bytes / 1048576, 2).' MB';
     } elseif ($bytes >= 1024) {
-        $bytes = number_format($bytes / 1024, 2) . ' KB';
+        $bytes = number_format($bytes / 1024, 2).' KB';
     } elseif ($bytes > 1) {
         $bytes .= ' bytes';
     } elseif ($bytes === 1) {
@@ -2584,14 +2584,14 @@ 
 
     // Encrypt the file content
     $plaintext = file_get_contents(
-        filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL)
+        filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL)
     );
     $ciphertext = $cipher->encrypt($plaintext);
     // Save new file
     $hash = md5($plaintext);
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
     file_put_contents($fileOut, $ciphertext);
-    unlink($fileInPath . '/' . $fileInName);
+    unlink($fileInPath.'/'.$fileInName);
     return [
         'fileHash' => base64_encode($hash),
         'objectKey' => base64_encode($objectKey),
@@ -2607,7 +2607,7 @@ 
  */
 function decryptFile(string $fileName, string $filePath, string $key): string
 {
-    if (! defined('FILE_BUFFER_SIZE')) {
+    if (!defined('FILE_BUFFER_SIZE')) {
         define('FILE_BUFFER_SIZE', 128 * 1024);
     }
 
@@ -2626,7 +2626,7 @@ 
     $cipher->enableContinuousBuffer();
     $cipher->disablePadding();
     // Get file content
-    $ciphertext = file_get_contents($filePath . '/' . TP_FILE_PREFIX . $fileName);
+    $ciphertext = file_get_contents($filePath.'/'.TP_FILE_PREFIX.$fileName);
     // Decrypt file content and return
     return base64_encode($cipher->decrypt($ciphertext));
 }
@@ -2676,8 +2676,8 @@ 
     array $SETTINGS
 ): void {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -2694,7 +2694,7 @@ 
         $post_object_id
     );
     // Superglobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Prepare superGlobal variables
     $sessionPpersonaFolders = $superGlobal->get('personal_folders', 'SESSION');
@@ -2719,8 +2719,8 @@ 
         // Create sharekey for each user
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
-            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '")
+            FROM ' . prefixTable('users').'
+            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'")
             AND public_key != ""'
         );
         foreach ($users as $user) {
@@ -2748,7 +2748,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -2816,13 +2816,13 @@ 
         ],
     ];
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
     $connection = new Connection($config);
@@ -2831,7 +2831,7 @@ 
         $connection->connect();
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
-        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage();
+        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage();
         return false;
     }
 
@@ -2840,7 +2840,7 @@ 
         $connection->auth()->attempt($SETTINGS['ldap_user_attribute'].'='.$login.','.$SETTINGS['ldap_bdn'], $password, $stayAuthenticated = true);
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
-        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage();
+        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage();
         return false;
     }
 
@@ -2858,8 +2858,8 @@ 
 function deleteUserObjetsKeys(int $userId, array $SETTINGS): bool
 {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -2917,7 +2917,7 @@ 
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
             $now->setTimezone(new DateTimeZone($timezone));
             $offsets[] = $offset = $now->getOffset();
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
         }
 
         array_multisort($offsets, $timezones);
@@ -2937,7 +2937,7 @@ 
 {
     $hours = intval($offset / 3600);
     $minutes = abs(intval($offset % 3600 / 60));
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
 }
 
 /**

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();