nilsteampassnet / TeamPass

pages/roles.php

Spacing +12 added lines, -12 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'roles', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 
@@ -94,17 +94,17 @@ 
                                 $arrUserRoles = array_filter($_SESSION['user_roles']);
                                 $where = '';
                                 if (count($arrUserRoles) > 0 && (int) $_SESSION['is_admin'] !== 1) {
-                                    $where = ' WHERE id IN (' . implode(',', $arrUserRoles) . ')';
+                                    $where = ' WHERE id IN ('.implode(',', $arrUserRoles).')';
                                 }
-                                $rows = DB::query('SELECT * FROM ' . prefixTable('roles_title') . $where);
+                                $rows = DB::query('SELECT * FROM '.prefixTable('roles_title').$where);
                                 foreach ($rows as $reccord) {
                                     echo '
-                                    <option value="' . $reccord['id'] . '"
-                                        data-complexity-text="' . addslashes(TP_PW_COMPLEXITY[$reccord['complexity']][1]) . '"
-                                        data-complexity-icon="' . TP_PW_COMPLEXITY[$reccord['complexity']][2] . '"
-                                        data-complexity="' . TP_PW_COMPLEXITY[$reccord['complexity']][0] . '"
-                                        data-allow-edit-all="' . $reccord['allow_pw_change'] . '">'.
-                                        $reccord['title'] . '</option>';
+                                    <option value="' . $reccord['id'].'"
+                                        data-complexity-text="' . addslashes(TP_PW_COMPLEXITY[$reccord['complexity']][1]).'"
+                                        data-complexity-icon="' . TP_PW_COMPLEXITY[$reccord['complexity']][2].'"
+                                        data-complexity="' . TP_PW_COMPLEXITY[$reccord['complexity']][0].'"
+                                        data-allow-edit-all="' . $reccord['allow_pw_change'].'">'.
+                                        $reccord['title'].'</option>';
                                 }
                                 ?>
                             </select>
@@ -125,7 +125,7 @@ 
                                         <?php
                                         foreach (TP_PW_COMPLEXITY as $entry) {
                                             echo '
-                                        <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
+                                        <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
                                         }
                                         ?>
                                     </select>

pages/2fa.js.php

Spacing +2 added lines, -2 removed lines

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

pages/2fa.php

Spacing +4 added lines, -4 removed lines

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

pages/actions.php

Spacing +27 added lines, -27 removed lines

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

sources/expired.datatables.php

Spacing +29 added lines, -29 removed lines

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

sources/export.queries.php

Spacing +78 added lines, -78 removed lines

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

sources/core.php

Spacing +23 added lines, -23 removed lines

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

sources/admin.queries.php

Spacing +189 added lines, -189 removed lines

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

sources/folders.queries.php

Spacing +46 added lines, -46 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'], '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();
 }
 
@@ -55,14 +55,14 @@ 
     date_default_timezone_set('UTC');
 }
 
-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));
 }
@@ -132,14 +132,14 @@ 
                     && $t->personal_folder == 0
                 ) {
                     // get $t->parent_id
-                    $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $t->parent_id);
+                    $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $t->parent_id);
                     if ($t->nlevel == 1) {
                         $data['title'] = langHdl('root');
                     }
 
                     // get rights on this folder
                     $arrayRights = array();
-                    $rows = DB::query('SELECT fonction_id  FROM ' . prefixTable('rights') . ' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
+                    $rows = DB::query('SELECT fonction_id  FROM '.prefixTable('rights').' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
                     foreach ($rows as $record) {
                         array_push($arrayRights, $record['fonction_id']);
                     }
@@ -156,8 +156,8 @@ 
                     $node_data = DB::queryFirstRow(
                         'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period,
                         n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification
-                        FROM ' . prefixTable('misc') . ' AS m,
-                        ' . prefixTable('nested_tree') . ' AS n
+                        FROM ' . prefixTable('misc').' AS m,
+                        ' . prefixTable('nested_tree').' AS n
                         WHERE m.type=%s AND m.intitule = n.id AND m.intitule = %i',
                         'complex',
                         $t->id
@@ -190,7 +190,7 @@ 
                     //col7
                     $data7 = DB::queryFirstRow(
                         'SELECT bloquer_creation,bloquer_modification
-                        FROM ' . prefixTable('nested_tree') . '
+                        FROM ' . prefixTable('nested_tree').'
                         WHERE id = %i',
                         intval($t->id)
                     );
@@ -325,7 +325,7 @@ 
             // Get info about this folder
             $dataFolder = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -361,7 +361,7 @@ 
             //check if parent folder is personal
             $dataParent = DB::queryfirstrow(
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_parent_id
             );
@@ -390,7 +390,7 @@ 
                     // get complexity level for this folder
                     $data = DB::queryfirstrow(
                         'SELECT valeur
-                        FROM ' . prefixTable('misc') . '
+                        FROM ' . prefixTable('misc').'
                         WHERE intitule = %i AND type = %s',
                         $post_parent_id,
                         'complex'
@@ -401,7 +401,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => langHdl('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -554,7 +554,7 @@ 
             ) {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE title = %s',
                     $post_title
                 );
@@ -574,7 +574,7 @@ 
             //check if parent folder is personal
             $data = DB::queryfirstrow(
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_parent_id
             );
@@ -603,7 +603,7 @@ 
                     // get complexity level for this folder
                     $data = DB::queryfirstrow(
                         'SELECT valeur
-                        FROM ' . prefixTable('misc') . '
+                        FROM ' . prefixTable('misc').'
                         WHERE intitule = %i AND type = %s',
                         $post_parent_id,
                         'complex'
@@ -613,7 +613,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => langHdl('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -687,7 +687,7 @@ 
                     && (int) $SETTINGS['subfolder_rights_as_parent'] === 1
                 ) {
                     //If it is a subfolder, then give access to it for all roles that allows the parent folder
-                    $rows = DB::query('SELECT role_id, type FROM ' . prefixTable('roles_values') . ' WHERE folder_id = %i', $post_parent_id);
+                    $rows = DB::query('SELECT role_id, type FROM '.prefixTable('roles_values').' WHERE folder_id = %i', $post_parent_id);
                     foreach ($rows as $record) {
                         //add access to this subfolder
                         DB::insert(
@@ -702,7 +702,7 @@ 
                 }
 
                 // if parent folder has Custom Fields Categories then add to this child one too
-                $rows = DB::query('SELECT id_category FROM ' . prefixTable('categories_folders') . ' WHERE id_folder = %i', $post_parent_id);
+                $rows = DB::query('SELECT id_category FROM '.prefixTable('categories_folders').' WHERE id_folder = %i', $post_parent_id);
                 foreach ($rows as $record) {
                     //add CF Category to this subfolder
                     DB::insert(
@@ -779,17 +779,17 @@ 
                                 prefixTable('misc'),
                                 array(
                                     'type' => 'folder_deleted',
-                                    'intitule' => 'f' . $folder->id,
-                                    'valeur' => $folder->id . ', ' . $folder->parent_id . ', ' .
-                                        $folder->title . ', ' . $folder->nleft . ', ' . $folder->nright . ', ' .
-                                        $folder->nlevel . ', 0, 0, 0, 0',
+                                    'intitule' => 'f'.$folder->id,
+                                    'valeur' => $folder->id.', '.$folder->parent_id.', '.
+                                        $folder->title.', '.$folder->nleft.', '.$folder->nright.', '.
+                                        $folder->nlevel.', 0, 0, 0, 0',
                                 )
                             );
                             //array for delete folder
                             $folderForDel[] = $folder->id;
 
                             //delete items & logs
-                            $items = DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE id_tree=%i', $folder->id);
+                            $items = DB::query('SELECT id FROM '.prefixTable('items').' WHERE id_tree=%i', $folder->id);
                             foreach ($items as $item) {
                                 DB::update(
                                     prefixTable('items'),
@@ -846,7 +846,7 @@ 
             $tree->rebuild();
 
             // 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 prepareExchangedData(
@@ -932,7 +932,7 @@ 
                 // get complexity of current node
                 $nodeComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE intitule = %i AND type= %s',
                     $nodeInfo->id,
                     'complex'
@@ -1007,7 +1007,7 @@ 
                 // If it is a subfolder, then give access to it for all roles that allows the parent folder
                 $rows = DB::query(
                     'SELECT role_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE folder_id = %i',
                     $parentId
                 );
@@ -1015,7 +1015,7 @@ 
                     // Add access to this subfolder after checking that it is not already set
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('roles_values') . '
+                        FROM ' . prefixTable('roles_values').'
                         WHERE folder_id = %i AND role_id = %i',
                         $newFolderId,
                         $record['role_id']
@@ -1035,7 +1035,7 @@ 
                 // if parent folder has Custom Fields Categories then add to this child one too
                 $rows = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder = %i',
                     $nodeInfo->id
                 );
@@ -1054,7 +1054,7 @@ 
 
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree = %i',
                     $nodeInfo->id
                 );
@@ -1063,7 +1063,7 @@ 
                     // if it is then don't copy 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',
@@ -1074,7 +1074,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',
@@ -1089,7 +1089,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'],
                             $record['id']
@@ -1163,7 +1163,7 @@ 
                         // Manage Custom Fields
                         $categories = DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $record['id']
                         );
@@ -1211,15 +1211,15 @@ 
                         $files = 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'],
                             $record['id']
                         );
                         foreach ($files as $file) {
                             // Check if file still exists
-                            if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($file['file'])) === true) {
+                            if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($file['file'])) === true) {
                                 // Step1 - decrypt the file
                                 $fileContent = decryptFile(
                                     $file['file'],
@@ -1228,9 +1228,9 @@ 
                                 );
 
                                 // Step2 - create file
-                                $newFileName = md5(time() . '_' . $file['id']) . '.' . $file['extension'];
+                                $newFileName = md5(time().'_'.$file['id']).'.'.$file['extension'];
 
-                                $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                                $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                                 if ($outstream === false) {
                                     echo prepareExchangedData(
                                         array(
@@ -1305,7 +1305,7 @@ 
             $tree->rebuild();
 
             // 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);
 
             $data = array(
@@ -1367,7 +1367,7 @@ 
                     // Get path
                     $text = '';
                     foreach ($tree->getPath($folder->id, false) as $fld) {
-                        $text .= empty($text) === true ? '     [<i>' . $fld->title : ' > ' . $fld->title;
+                        $text .= empty($text) === true ? '     [<i>'.$fld->title : ' > '.$fld->title;
                     }
 
                     // Save array
@@ -1377,7 +1377,7 @@ 
                             'id' => (int) $folder->id,
                             'label' => $folder->title,
                             'level' => $folder->nlevel,
-                            'path' => empty($text) === true ? '' : $text . '</i>]'
+                            'path' => empty($text) === true ? '' : $text.'</i>]'
                         )
                     );
                 }