nilsteampassnet / TeamPass

sources/backups.queries.php

Spacing +26 added lines, -26 removed lines

@@ -68,7 +68,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -129,21 +129,21 @@ 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-            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_' . DB_NAME];
+                $tables[] = $row['Tables_in_'.DB_NAME];
             }
 
             //cycle through
             foreach ($tables as $table) {
                 if (empty($pre) || substr_count($table, $pre) > 0) {
                     // Do query
-                    $result = DB::queryRaw('SELECT * FROM ' . $table);
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
                     DB::queryRaw(
                         'SELECT *
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -155,19 +155,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] = is_null($row[$j]) === false ? addslashes($row[$j]) : '';
                                 $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
                                 if (isset($row[$j])) {
-                                    $return .= '"' . $row[$j] . '"';
+                                    $return .= '"'.$row[$j].'"';
                                 } else {
                                     $return .= 'NULL';
                                 }
@@ -187,8 +187,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);
@@ -200,17 +200,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_key
                     );
 
                     // 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
                     );
                 }
 
@@ -230,9 +230,9 @@ 
                     array(
                         'error' => false,
                         'message' => '',
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' .
-                            $session->get('user-key_tmp') . '&pathIsFiles=1',
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                            '&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.
+                            $session->get('user-key_tmp').'&pathIsFiles=1',
                     ),
                     'encode'
                 );
@@ -281,12 +281,12 @@ 
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $post_backupFile = filter_var($dataReceived['backupFile'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             // Get filename from database
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE increment_id = %i',
                 $post_backupFile
             );
@@ -305,8 +305,8 @@ 
                 // Decrypt the file
                 $ret = prepareFileWithDefuse(
                     'decrypt',
-                    $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
+                    $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
                     $SETTINGS,
                     $post_key
                 );
@@ -323,10 +323,10 @@ 
                 }
 
                 // Do clean
-                fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
+                fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
             } else {
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile;
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile;
             }
 
             //read sql file

sources/admin.queries.php

Spacing +143 added lines, -143 removed lines

@@ -70,7 +70,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -120,7 +120,7 @@ 
                         array(
                             'http' => array(
                                 'ignore_errors' => true,
-                                'proxy' => $SETTINGS['proxy_ip'] . ':' . $SETTINGS['proxy_port'],
+                                'proxy' => $SETTINGS['proxy_ip'].':'.$SETTINGS['proxy_port'],
                             ),
                         )
                     );
@@ -139,16 +139,16 @@ 
                     $json_array = json_decode($json, true);
 
                     // About version
-                    $text .= '<li><u>' . $LANG['your_version'] . '</u> : ' . TP_VERSION;
+                    $text .= '<li><u>'.$LANG['your_version'].'</u> : '.TP_VERSION;
                     if (floatval(TP_VERSION) < 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 {
@@ -159,7 +159,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;
         
 
@@ -189,21 +189,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
@@ -215,19 +215,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';
                             }
@@ -247,8 +247,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);
@@ -260,17 +260,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
                 );
             }
 
@@ -280,7 +280,7 @@ 
             //update LOG
             logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $session->get('user-id'), $session->get('user-login'));
 
-            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . $session->get('user-key_tmp') . '&pathIsFiles=1"}]';
+            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.$session->get('user-key_tmp').'&pathIsFiles=1"}]';
         }
         break;
 
@@ -309,7 +309,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]);
@@ -318,7 +318,7 @@ 
         // Get filename from database
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE increment_id = %i',
             $file
         );
@@ -337,22 +337,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
@@ -369,7 +369,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":""}]';
@@ -407,8 +407,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.'`');
                 }
             }
         }
@@ -416,12 +416,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'
             );
@@ -429,7 +429,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(
@@ -459,8 +459,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -496,7 +496,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', NULL);
 
         // Log
@@ -512,8 +512,8 @@ 
         echo prepareExchangedData(
             [
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success mr-2"></i>',
             ],
             'encode'
@@ -548,7 +548,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
@@ -575,8 +575,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -616,18 +616,18 @@ 
         $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 = '';
@@ -635,8 +635,8 @@ 
                 // it means that file is DEFUSE encrypted
                 try {
                     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 (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
@@ -644,7 +644,7 @@ 
                 }
 
                 if (!empty($err)) {
-                    echo '[{ "result":"backup_decrypt_fails" , "msg":"' . $err . '"}]';
+                    echo '[{ "result":"backup_decrypt_fails" , "msg":"'.$err.'"}]';
                     break;
                 }
             } else {
@@ -663,19 +663,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 && is_null($return) === false) {
                     fwrite($handle, /** @scrutinizer ignore-type */ $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;
 
         /*
@@ -712,7 +712,7 @@ 
         $session->set('user-reencrypt_old_salt', file_get_contents(SECUREPATH.'/'.SECUREFILE));
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH.'/'.SECUREFILE . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time();
+        $old_sk_filename = SECUREPATH.'/'.SECUREFILE.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
             SECUREPATH.'/'.SECUREFILE,
             $old_sk_filename
@@ -740,13 +740,13 @@ 
         logEvents($SETTINGS, 'system', 'change_salt_key', (string) $session->get('user-id'), $session->get('user-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,
@@ -774,7 +774,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);
@@ -856,7 +856,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'Input `' . $objects[0] . '` is not allowed',
+                        'message' => 'Input `'.$objects[0].'` is not allowed',
                         'nbOfItems' => '',
                         'nextAction' => '',
                     ),
@@ -869,9 +869,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) {
@@ -883,7 +883,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',
                         )
@@ -932,9 +932,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) {
@@ -946,7 +946,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',
                         )
@@ -974,7 +974,7 @@ 
                         DB::update(
                             prefixTable('log_items'),
                             array(
-                                'raison' => 'at_pw :' . $encrypt['string'],
+                                'raison' => 'at_pw :'.$encrypt['string'],
                                 'encryption_type' => 'defuse',
                             ),
                             'increment_id = %i',
@@ -999,8 +999,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
@@ -1011,7 +1011,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',
                         )
@@ -1059,9 +1059,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
@@ -1079,20 +1079,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
                             );
                         }
 
@@ -1100,24 +1100,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(
@@ -1143,13 +1143,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 {
@@ -1268,12 +1268,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']
                         );
                     }
                 }
@@ -1292,7 +1292,7 @@ 
         }
 
         // 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(
@@ -1335,17 +1335,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;
@@ -1376,7 +1376,7 @@ 
                 'encode'
             );
         } else {
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             //send email
             sendEmail(
@@ -1411,11 +1411,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',
             ''
@@ -1500,9 +1500,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(
@@ -1570,7 +1570,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // init
         $filesList = array();
@@ -1583,7 +1583,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')
@@ -1648,8 +1648,8 @@ 
         $post_list = filter_var_array($post_list, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $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;
@@ -1662,35 +1662,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
@@ -1725,8 +1725,8 @@ 
                 $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted'
             );
 
-            $message = $lang->get('last_execution') . ' ' .
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+            $message = $lang->get('last_execution').' '.
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                 '<i class="fas fa-check text-success ml-2 mr-3"></i>';
         }
 
@@ -1820,7 +1820,7 @@ 
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
 
             DB::query(
-                'DELETE FROM ' . prefixTable('api') . ' WHERE increment_id = %i',
+                'DELETE FROM '.prefixTable('api').' WHERE increment_id = %i',
                 $post_id
             );
         }
@@ -1915,7 +1915,7 @@ 
             // Delete existing key
         } elseif (null !== $post_action && $post_action === 'delete') {
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE increment_id=%i', $post_id);
+            DB::query('DELETE FROM '.prefixTable('api').' WHERE increment_id=%i', $post_id);
         }
 
         echo prepareExchangedData(
@@ -1930,7 +1930,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(
@@ -1957,7 +1957,7 @@ 
 
     case 'run_duo_config_check':
         //Libraries call
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         // Check KEY
         if ($post_key !== $session->get('key')) {
             echo prepareExchangedData(
@@ -2000,7 +2000,7 @@ 
             echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => $lang->get('duo_config_error') . "<br/>Duo: " . $e->getMessage(),
+                        'message' => $lang->get('duo_config_error')."<br/>Duo: ".$e->getMessage(),
                     ),
                     'encode'
             );
@@ -2020,7 +2020,7 @@ 
                 $duo_error = $lang->get('duo_error_secure');
                 $data["duo_check"] = "failed";
             }*/
-            $duo_error = $lang->get('duo_error_check_config') . "<br/>Duo: " . $e->getMessage();
+            $duo_error = $lang->get('duo_error_check_config')."<br/>Duo: ".$e->getMessage();
             echo prepareExchangedData(
                     array(
                         'error' => true,
@@ -2065,7 +2065,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(
@@ -2091,7 +2091,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(
@@ -2122,7 +2122,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_agses_options':
@@ -2145,7 +2145,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(
@@ -2174,7 +2174,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(
@@ -2203,7 +2203,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(
@@ -2231,7 +2231,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_option_change':
@@ -2271,7 +2271,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',
             'admin',
             $post_field
@@ -2293,7 +2293,7 @@ 
                     array(
                         'valeur' => time(),
                         'type' => 'admin',
-                        'intitule' => $post_field . '_time',
+                        'intitule' => $post_field.'_time',
                     )
                 );
             }
@@ -2311,10 +2311,10 @@ 
             if ($post_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',
                     'admin',
-                    $post_field . '_time'
+                    $post_field.'_time'
                 );
                 $counter = DB::count();
                 if ($counter === 0) {
@@ -2323,7 +2323,7 @@ 
                         array(
                             'valeur' => 0,
                             'type' => 'admin',
-                            'intitule' => $post_field . '_time',
+                            'intitule' => $post_field.'_time',
                         )
                     );
                 } else {
@@ -2343,13 +2343,13 @@ 
         // special Cases
         if ($post_field === 'cpassman_url') {
             // update also jsUrl for CSFP protection
-            $jsUrl = $post_value . '/includes/libraries/csrfp/js/csrfprotector.js';
+            $jsUrl = $post_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_FULL_SPECIAL_CHARS) . '",', $data);
+            $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS).'",', $data);
             file_put_contents($csrfp_file, $newdata);
         } elseif ($post_field === 'restricted_to_input' && (int) $post_value === 0) {
             DB::update(
@@ -2378,7 +2378,7 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'misc' => $counter . ' ; ' . $SETTINGS[$post_field],
+                'misc' => $counter.' ; '.$SETTINGS[$post_field],
                 'message' => empty($post_translate) === false ? $lang->get($post_translate) : '',
             ),
             'encode'
@@ -2421,7 +2421,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(
@@ -2453,7 +2453,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(
@@ -2500,7 +2500,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 {
@@ -2538,7 +2538,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 +42 added lines, -42 removed lines

@@ -63,7 +63,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -138,14 +138,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'] = $lang->get('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']);
                     }
@@ -163,8 +163,8 @@ 
                         'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period,
                         n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification,
                         n.fa_icon, n.fa_icon_selected
-                        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
@@ -197,7 +197,7 @@ 
                     //col7
                     $data7 = DB::queryFirstRow(
                         'SELECT bloquer_creation,bloquer_modification
-                        FROM ' . prefixTable('nested_tree') . '
+                        FROM ' . prefixTable('nested_tree').'
                         WHERE id = %i',
                         intval($t->id)
                     );
@@ -336,7 +336,7 @@ 
             // Get info about this folder
             $dataFolder = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -372,7 +372,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
             );
@@ -401,7 +401,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'
@@ -412,7 +412,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => $lang->get('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -565,7 +565,7 @@ 
             ) {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE title = %s',
                     $post_title
                 );
@@ -585,7 +585,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
             );
@@ -614,7 +614,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'
@@ -624,7 +624,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => $lang->get('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -774,7 +774,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(
@@ -804,7 +804,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(
@@ -817,7 +817,7 @@ 
                 }
 
                 // clear cache cache for each user that have at least one similar role as the current user
-                $usersWithSimilarRoles = empty($session->get('user-roles')) === false  ? getUsersWithRoles(
+                $usersWithSimilarRoles = empty($session->get('user-roles')) === false ? getUsersWithRoles(
                     explode(";", $session->get('user-roles'))
                 ) : [];
                 foreach ($usersWithSimilarRoles as $user) {
@@ -897,17 +897,17 @@ 
                                 prefixTable('misc'),
                                 array(
                                     'type' => 'folder_deleted',
-                                    'intitule' => 'f' . $thisSubFolders->id,
-                                    'valeur' => $thisSubFolders->id . ', ' . $thisSubFolders->parent_id . ', ' .
-                                        $thisSubFolders->title . ', ' . $thisSubFolders->nleft . ', ' . $thisSubFolders->nright . ', ' .
-                                        $thisSubFolders->nlevel . ', 0, 0, 0, 0',
+                                    'intitule' => 'f'.$thisSubFolders->id,
+                                    'valeur' => $thisSubFolders->id.', '.$thisSubFolders->parent_id.', '.
+                                        $thisSubFolders->title.', '.$thisSubFolders->nleft.', '.$thisSubFolders->nright.', '.
+                                        $thisSubFolders->nlevel.', 0, 0, 0, 0',
                                 )
                             );
                             //array for delete folder
                             $folderForDel[] = $thisSubFolders->id;
 
                             //delete items & logs
-                            $itemsInSubFolder = DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE id_tree=%i', $thisSubFolders->id);
+                            $itemsInSubFolder = DB::query('SELECT id FROM '.prefixTable('items').' WHERE id_tree=%i', $thisSubFolders->id);
                             foreach ($itemsInSubFolder as $item) {
                                 DB::update(
                                     prefixTable('items'),
@@ -934,7 +934,7 @@ 
                                 }
 
                                 //Update CACHE table
-                                updateCacheTable('delete_value',(int) $item['id']);
+                                updateCacheTable('delete_value', (int) $item['id']);
 
                                 // --> build json tree  
                                 // update cache_tree
@@ -943,7 +943,7 @@ 
                                     FROM ' . prefixTable('cache_tree').' WHERE user_id = %i',
                                     (int) $session->get('user-id')
                                 );
-                                if (DB::count()>0) {
+                                if (DB::count() > 0) {
                                     // remove id from folders
                                     $a_folders = json_decode($cache_tree['folders'], true);
                                     $key = array_search($item['id'], $a_folders, true);
@@ -989,7 +989,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', null);
 
             // Update timestamp
@@ -1084,7 +1084,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'
@@ -1160,7 +1160,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
                 );
@@ -1168,7 +1168,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']
@@ -1188,7 +1188,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
                 );
@@ -1207,7 +1207,7 @@ 
 
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree = %i',
                     $nodeInfo->id
                 );
@@ -1216,7 +1216,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',
@@ -1227,7 +1227,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',
@@ -1242,7 +1242,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->get('user-id'),
                             $record['id']
@@ -1316,7 +1316,7 @@ 
                         // Manage Custom Fields
                         $categories = DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $record['id']
                         );
@@ -1364,15 +1364,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->get('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'],
@@ -1381,9 +1381,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(
@@ -1457,7 +1457,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', NULL);
 
             // Update timestamp
@@ -1532,7 +1532,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
@@ -1542,7 +1542,7 @@ 
                             'id' => (int) $folder->id,
                             'label' => $folder->title,
                             'level' => $folder->nlevel,
-                            'path' => empty($text) === true ? '' : $text . '</i>]'
+                            'path' => empty($text) === true ? '' : $text.'</i>]'
                         )
                     );
                 }

sources/tasks.queries.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -153,7 +153,7 @@ 
     // get exec from processes table
     $rows = DB::query(
         'SELECT max(finished_at), process_type
-        FROM ' . prefixTable('processes') . '
+        FROM ' . prefixTable('processes').'
         GROUP BY process_type'
     );
     foreach ($rows as $row) {
@@ -169,7 +169,7 @@ 
     // get exec from processes_log table
     $rows = DB::query(
         'SELECT MAX(finished_at) AS max_finished_at, job AS process_type 
-        FROM ' . prefixTable('processes_logs') . '
+        FROM ' . prefixTable('processes_logs').'
         WHERE finished_at >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 7 DAY))
         GROUP BY process_type'
     );

sources/fields.queries.php

Spacing +3 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -538,8 +538,7 @@ 
             $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' :
-                filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
+            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
 
             if (empty($post_fieldId) === false) {
                 // UPDATE FIELD
@@ -555,7 +554,7 @@ 
                         'encrypted_data' => $post_encrypted,
                         'is_mandatory' => $post_mandatory,
                         'masked' => $post_masked,
-                        'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles),
+                        'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles),
                         'order' => calculateOrder($post_fieldId, $post_order),
                     ),
                     'id = %i',

sources/import.queries.php

Spacing +7 added lines, -7 removed lines

@@ -68,7 +68,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -156,7 +156,7 @@ 
             $lexer = new Lexer($config);
             $config->setIgnoreHeaderLine('true');
             $interpreter = new Interpreter();
-            $interpreter->addObserver(function (array $row) use (&$valuesToImport) {
+            $interpreter->addObserver(function(array $row) use (&$valuesToImport) {
                 $valuesToImport[] = array(
                     'Label' => $row[0],
                     'Login' => $row[1],
@@ -497,7 +497,7 @@ 
         {
             // Manage entries
             if (isset($array['Entry']) === true) {
-                foreach($array['Entry'] as $key => $value) {
+                foreach ($array['Entry'] as $key => $value) {
                     if (isset($value['String']) === true) {
                         $itemDefinition = [];
                         $c = count($value['String']);
@@ -532,13 +532,13 @@ 
             }
 
             // Manage GROUPS
-            if (isset($array['Group']) === true && is_array($array['Group'])=== true) {
+            if (isset($array['Group']) === true && is_array($array['Group']) === true) {
                 $currentFolderId = $previousFolder;
                 if (isset($array['Group']['UUID']) === true) {
                     // build expect array format
                     $array['Group'] = [$array['Group']];
                 }
-                foreach($array['Group'] as $key => $value){
+                foreach ($array['Group'] as $key => $value) {
                     // Add this new folder
                     array_push(
                         $newItemsToAdd['folders'],
@@ -631,7 +631,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             $parentId = $arrFolders[$folder['parentFolderId']];
 
@@ -936,7 +936,7 @@ 
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

sources/items.queries.php

Spacing +285 added lines, -286 removed lines

@@ -67,7 +67,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -92,7 +92,7 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 
@@ -342,7 +342,7 @@ 
             // About special settings
             $dataFolderSettings = DB::queryFirstRow(
                 'SELECT bloquer_creation, bloquer_modification, personal_folder
-                FROM ' . prefixTable('nested_tree') . ' 
+                FROM ' . prefixTable('nested_tree').' 
                 WHERE id = %i',
                 $inputData['folderId']
             );
@@ -359,7 +359,7 @@ 
             // Get folder complexity
             $folderComplexity = DB::queryfirstrow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['folderId']
@@ -384,7 +384,7 @@ 
             $itemExists = 0;
             $newID = '';
             $data = DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE label = %s AND inactif = %i',
                 $inputData['label'],
                 0
@@ -471,8 +471,8 @@ 
                     (int) $newID,
                     $objectKey['pwd'],
                     $SETTINGS,
-                    true,   // only for the item creator
-                    false,  // no delete all
+                    true, // only for the item creator
+                    false, // no delete all
                 );
 
                 // update fields
@@ -485,7 +485,7 @@ 
                             // should we encrypt the data
                             $dataTmp = DB::queryFirstRow(
                                 'SELECT encrypted_data
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -525,8 +525,8 @@ 
                                     (int) $newObjectId,
                                     $cryptedStuff['objectKey'],
                                     $SETTINGS,
-                                    true,   // only for the item creator
-                                    false,  // no delete all
+                                    true, // only for the item creator
+                                    false, // no delete all
                                 );
                                 
                             } else {
@@ -555,7 +555,7 @@ 
                 ) {
                     DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $newID
                     );
@@ -624,11 +624,11 @@ 
                 ) {
                     foreach ($post_restricted_to as $userRest) {
                         if (empty($userRest) === false) {
-                            $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest);
+                            $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest);
                             if (empty($listOfRestricted)) {
                                 $listOfRestricted = $dataTmp['login'];
                             } else {
-                                $listOfRestricted .= ';' . $dataTmp['login'];
+                                $listOfRestricted .= ';'.$dataTmp['login'];
                             }
                         }
                     }
@@ -642,11 +642,11 @@ 
                     if (empty($data['restricted_to']) === false) {
                         foreach (explode(';', $data['restricted_to']) as $userRest) {
                             if (empty($userRest) === false) {
-                                $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest);
+                                $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest);
                                 if (empty($oldRestrictionList) === true) {
                                     $oldRestrictionList = $dataTmp['login'];
                                 } else {
-                                    $oldRestrictionList .= ';' . $dataTmp['login'];
+                                    $oldRestrictionList .= ';'.$dataTmp['login'];
                                 }
                             }
                         }
@@ -709,7 +709,7 @@ 
                 if (empty($post_uploaded_file_id) === false) {
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %s',
                         $post_uploaded_file_id
                     );
@@ -763,7 +763,7 @@ 
                                     $lang->get('email_subject_item_updated'),
                                     str_replace(
                                         array('#label', '#link'),
-                                            array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']),
+                                            array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']),
                                             $lang->get('new_item_email_body')
                                     ),
                                     $emailAddress,
@@ -856,11 +856,11 @@ 
             // Prepare variables
             $itemInfos = array();
             $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
-            $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
+            $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
             $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : '';
             $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
-            $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars_decode($dataReceived['tags']) : '';
-            $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
+            $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars_decode($dataReceived['tags']) : '';
+            $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
             $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT);
             $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
             $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT);
@@ -891,8 +891,7 @@ 
             $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var(
                     $dataReceived['to_be_deleted_after_date'],
                     FILTER_SANITIZE_FULL_SPECIAL_CHARS
-                ) :
-                '';
+                ) : '';
             $post_fields = (filter_var_array(
                 $dataReceived['fields'],
                 FILTER_SANITIZE_FULL_SPECIAL_CHARS
@@ -952,7 +951,7 @@ 
             // About special settings
             $dataFolderSettings = DB::queryFirstRow(
                 'SELECT bloquer_creation, bloquer_modification, personal_folder, title
-                FROM ' . prefixTable('nested_tree') . ' 
+                FROM ' . prefixTable('nested_tree').' 
                 WHERE id = %i',
                 $inputData['folderId']
             );
@@ -968,7 +967,7 @@ 
             // Get folder complexity
             $folderComplexity = DB::queryfirstrow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['folderId']
@@ -1006,8 +1005,8 @@ 
             // Get all informations for this item
             $dataItem = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                 WHERE i.id=%i AND l.action = %s',
                 $inputData['itemId'],
                 'at_creation'
@@ -1017,7 +1016,7 @@ 
             //db::debugmode(true);
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %s',
                 $inputData['itemId'],
                 $session->get('user-id')
@@ -1066,9 +1065,9 @@ 
                     'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
                     i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
                     u.login as user_login, u.email as user_email
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
+                    INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
                     WHERE i.id=%i',
                     $inputData['itemId']
                 );
@@ -1076,7 +1075,7 @@ 
                 // Should we log a password change?
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE user_id = %i AND object_id = %i',
                     $session->get('user-id'),
                     $inputData['itemId']
@@ -1144,7 +1143,7 @@ 
                 // Get list of tags
                 $itemTags = DB::queryFirstColumn(
                     'SELECT tag
-                    FROM ' . prefixTable('tags') . '
+                    FROM ' . prefixTable('tags').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1190,7 +1189,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                        'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                     );
                 }
 
@@ -1229,8 +1228,8 @@ 
                                 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
                                 i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
                                 c.masked AS masked, i.id AS field_item_id
-                                FROM ' . prefixTable('categories_items') . ' AS i
-                                INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                                FROM ' . prefixTable('categories_items').' AS i
+                                INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                                 WHERE i.field_id = %i AND i.item_id = %i',
                                 $field['id'],
                                 $inputData['itemId']
@@ -1244,7 +1243,7 @@ 
                                 // Perform new query
                                 $dataTmpCat = DB::queryFirstRow(
                                     'SELECT id, title, encrypted_data, masked
-                                    FROM ' . prefixTable('categories') . '
+                                    FROM ' . prefixTable('categories').'
                                     WHERE id = %i',
                                     $field['id']
                                 );
@@ -1316,7 +1315,7 @@ 
                                     $session->get('user-id'),
                                     'at_modification',
                                     $session->get('user-login'),
-                                    'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
+                                    'at_field : '.$dataTmpCat['title'].' : '.$field['value']
                                 );
                             } else {
                                 // compare the old and new value
@@ -1324,7 +1323,7 @@ 
                                     // Get user sharekey for this field
                                     $userKey = DB::queryFirstRow(
                                         'SELECT share_key
-                                        FROM ' . prefixTable('sharekeys_fields') . '
+                                        FROM ' . prefixTable('sharekeys_fields').'
                                         WHERE user_id = %i AND object_id = %i',
                                         $session->get('user-id'),
                                         $dataTmpCat['field_item_id']
@@ -1398,7 +1397,7 @@ 
                                         $session->get('user-id'),
                                         'at_modification',
                                         $session->get('user-login'),
-                                        'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                        'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                     );
                                 }
                             }
@@ -1423,7 +1422,7 @@ 
                 ) {
                     DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $inputData['itemId']
                     );
@@ -1466,7 +1465,7 @@ 
                     // check if elem exists in Table. If not add it or update it.
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('automatic_del') . '
+                        FROM ' . prefixTable('automatic_del').'
                         WHERE item_id = %i',
                         $inputData['itemId']
                     );
@@ -1493,7 +1492,7 @@ 
                             // Store updates performed
                             array_push(
                                 $arrayOfChanges,
-                                $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled')
+                                $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled')
                             );
 
                             // update LOG
@@ -1536,7 +1535,7 @@ 
                             // Store updates performed
                             array_push(
                                 $arrayOfChanges,
-                                $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled')
+                                $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled')
                             );
 
                             // update LOG
@@ -1569,7 +1568,7 @@ 
                         if (empty($userId) === false) {
                             $dataTmp = DB::queryfirstrow(
                                 'SELECT id, name, lastname
-                                FROM ' . prefixTable('users') . '
+                                FROM ' . prefixTable('users').'
                                 WHERE id= %i',
                                 $userId
                             );
@@ -1577,7 +1576,7 @@ 
                             // Add to array
                             array_push(
                                 $arrayOfUsersRestriction,
-                                $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                                $dataTmp['name'].' '.$dataTmp['lastname']
                             );
                             array_push(
                                 $arrayOfUsersIdRestriction,
@@ -1608,8 +1607,8 @@ 
                     // get values before deleting them
                     $rows = DB::query(
                         'SELECT t.title, t.id AS id
-                        FROM ' . prefixTable('roles_title') . ' as t
-                        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
+                        FROM ' . prefixTable('roles_title').' as t
+                        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
                         WHERE r.item_id = %i
                         ORDER BY t.title ASC',
                         $inputData['itemId']
@@ -1643,7 +1642,7 @@ 
                             );
                             $dataTmp = DB::queryfirstrow(
                                 'SELECT title
-                                FROM ' . prefixTable('roles_title') . '
+                                FROM ' . prefixTable('roles_title').'
                                 WHERE id = %i',
                                 $role
                             );
@@ -1671,7 +1670,7 @@ 
                 // Get current status
                 $otpStatus = DB::queryFirstRow(
                     'SELECT enabled as otp_is_enabled
-                    FROM ' . prefixTable('items_otp') . '
+                    FROM ' . prefixTable('items_otp').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1702,7 +1701,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
+                        'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
                     );
                 } elseif (DB::count() === 0 && empty($post_otp_secret) === false) {
                     // Create the entry in items_otp table
@@ -1746,8 +1745,8 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
-                            implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
+                        'at_restriction : '.(count($diffUsersRestiction) > 0 ?
+                            implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
                     );
                 }
 
@@ -1767,7 +1766,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_label : ' . $data['label'] . ' => ' . $inputData['label']
+                        'at_label : '.$data['label'].' => '.$inputData['label']
                     );
                 }
                 // LOGIN
@@ -1786,7 +1785,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_login : ' . $data['login'] . ' => ' . $post_login
+                        'at_login : '.$data['login'].' => '.$post_login
                     );
                 }
                 // EMAIL
@@ -1805,7 +1804,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_email : ' . $data['email'] . ' => ' . $post_email
+                        'at_email : '.$data['email'].' => '.$post_email
                     );
                 }
                 // URL
@@ -1824,7 +1823,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_url : ' . $data['url'] . ' => ' . $post_url
+                        'at_url : '.$data['url'].' => '.$post_url
                     );
                 }
                 // DESCRIPTION
@@ -1849,7 +1848,7 @@ 
                 // FOLDER
                 if ((int) $data['id_tree'] !== (int) $inputData['folderId']) {
                     // Get name of folders
-                    $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
+                    $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
 
                     // Store updates performed
                     array_push(
@@ -1865,7 +1864,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
+                        'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
                     );
                 }
                 // ANYONE_CAN_MODIFY
@@ -1873,7 +1872,7 @@ 
                     // Store updates performed
                     array_push(
                         $arrayOfChanges,
-                        $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
+                        $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
                     );
 
                     // Log
@@ -1884,15 +1883,15 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
+                        'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
                     );
                 }
 
                 // Reload new values
                 $dataItem = DB::queryfirstrow(
                     'SELECT *
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                     WHERE i.id = %i AND l.action = %s',
                     $inputData['itemId'],
                     'at_creation'
@@ -1901,8 +1900,8 @@ 
                 $history = '';
                 $rows = DB::query(
                     'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
-                    FROM ' . prefixTable('log_items') . ' as l
-                    LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                    FROM ' . prefixTable('log_items').' as l
+                    LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                     WHERE l.action <> %s AND id_item=%s',
                     'at_shown',
                     $inputData['itemId']
@@ -1911,14 +1910,14 @@ 
                     if ($record['raison'] === NULL) continue;
                     $reason = explode(':', $record['raison']);
                     if (count($reason) > 0) {
-                        $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
-                            . $record['login'] . ' - ' . $lang->get($record['action']) . ' - '
-                            . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1]
+                        $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
+                            . $record['login'].' - '.$lang->get($record['action']).' - '
+                            . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1]
                                 : $lang->get(trim($reason[0]))) : '');
                         if (empty($history)) {
                             $history = $sentence;
                         } else {
-                            $history .= '<br />' . $sentence;
+                            $history .= '<br />'.$sentence;
                         }
                     }
                 }
@@ -2045,7 +2044,7 @@ 
         ) {
             // load the original record into an array
             $originalRecord = DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -2064,7 +2063,7 @@ 
 
             // Load the destination folder record into an array
             $dataDestination = DB::queryfirstrow(
-                'SELECT personal_folder FROM ' . prefixTable('nested_tree') . '
+                'SELECT personal_folder FROM '.prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_dest_id
             );
@@ -2072,7 +2071,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->get('user-id'),
                 $inputData['itemId']
@@ -2153,7 +2152,7 @@ 
             // Manage Custom Fields
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -2211,15 +2210,15 @@ 
             $rows = DB::query(
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
                 f.size AS size, f.type AS type, s.share_key AS share_key
-                FROM ' . prefixTable('files') . ' AS f
-                INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                FROM ' . prefixTable('files').' AS f
+                INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                 WHERE s.user_id = %i AND f.id_item = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
             );
             foreach ($rows as $record) {
                 // Check if file still exists
-                if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
+                if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
                     // Step1 - decrypt the file
                     $fileContent = decryptFile(
                         $record['file'],
@@ -2228,8 +2227,8 @@ 
                     );
 
                     // Step2 - create file
-                    $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension'];
-                    $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                    $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension'];
+                    $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                     if ($outstream === false) {
                         echo prepareExchangedData(
                             array(
@@ -2302,7 +2301,7 @@ 
 
             // -------------------------
             // Add specific restrictions
-            $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('restriction_to_roles'),
@@ -2314,7 +2313,7 @@ 
             }
 
             // Add Tags
-            $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('tags'),
@@ -2344,7 +2343,7 @@ 
                 $session->get('user-login')
             );
             // reload cache table
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', null);
 
             echo (string) prepareExchangedData(
@@ -2415,7 +2414,7 @@ 
         // then we can show it
         $item_deleted = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('log_items') . '
+            FROM ' . prefixTable('log_items').'
             WHERE id_item = %i AND action = %s
             ORDER BY date DESC
             LIMIT 0, 1',
@@ -2426,7 +2425,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',
@@ -2450,8 +2449,8 @@ 
         // Get all informations for this item
         $dataItem = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('items') . ' as i
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+            FROM ' . prefixTable('items').' as i
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
             WHERE i.id = %i AND l.action = %s',
             $inputData['id'],
             'at_creation'
@@ -2460,7 +2459,7 @@ 
         // Notification
         DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['id'],
             $session->get('user-id')
@@ -2503,7 +2502,7 @@ 
 
         // manage case of API user
         if ($dataItem['id_user'] === API_USER_ID) {
-            $arrData['author'] = 'API [' . $dataItem['description'] . ']';
+            $arrData['author'] = 'API ['.$dataItem['description'].']';
             $arrData['id_user'] = API_USER_ID;
             $arrData['author_email'] = '';
             $arrData['notification_status'] = false;
@@ -2513,7 +2512,7 @@ 
         $tags = array();
         $rows = DB::query(
             'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -2538,7 +2537,7 @@ 
         // Check if user has a role that is accepted
         $rows_tmp = DB::query(
             'SELECT role_id
-            FROM ' . prefixTable('restriction_to_roles') . '
+            FROM ' . prefixTable('restriction_to_roles').'
             WHERE item_id=%i',
             $inputData['id']
         );
@@ -2552,7 +2551,7 @@ 
         // Get the object key for the user
         $userKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE user_id = %i AND object_id = %i',
             $session->get('user-id'),
             $inputData['id']
@@ -2659,8 +2658,8 @@ 
                 // Add restriction if item is restricted to roles
                 $rows = DB::query(
                     'SELECT t.title, t.id
-                    FROM ' . prefixTable('roles_title') . ' AS t
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
+                    FROM ' . prefixTable('roles_title').' AS t
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
                     WHERE r.item_id = %i
                     ORDER BY t.title ASC',
                     $inputData['id']
@@ -2676,8 +2675,8 @@ 
                 $tmp = array();
                 $rows = DB::query(
                     'SELECT k.label, k.id
-                    FROM ' . prefixTable('kb_items') . ' as i
-                    INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
+                    FROM ' . prefixTable('kb_items').' as i
+                    INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
                     WHERE i.item_id = %i
                     ORDER BY k.label ASC',
                     $inputData['id']
@@ -2760,7 +2759,7 @@ 
                 $arrCatList = array();
                 $rows_tmp = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder=%i',
                     $inputData['folderId']
                 );
@@ -2775,8 +2774,8 @@ 
                         'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
                         i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id,
                         c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
-                        FROM ' . prefixTable('categories_items') . ' AS i
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                        FROM ' . prefixTable('categories_items').' AS i
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                         WHERE i.item_id=%i AND c.parent_id IN %ls',
                         $inputData['id'],
                         $arrCatList
@@ -2787,7 +2786,7 @@ 
                         //db::debugmode(true);
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_fields') . '
+                            FROM ' . prefixTable('sharekeys_fields').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $row['id']
@@ -2805,7 +2804,7 @@ 
                         } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) {
                             // Data is not encrypted in DB
                             $fieldText = [
-                                'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
+                                'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
                                 'encrypted' => false,
                                 'error' => false,
                             ];
@@ -2850,7 +2849,7 @@ 
             if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
                 $rows_tmp = DB::queryfirstrow(
                     'SELECT category_id
-                    FROM ' . prefixTable('templates') . '
+                    FROM ' . prefixTable('templates').'
                     WHERE item_id = %i',
                     $inputData['id']
                 );
@@ -2867,7 +2866,7 @@ 
             // Evaluate if item is ready for all users
             $rows_tmp = DB::queryfirstrow(
                 'SELECT finished_at
-                FROM ' . prefixTable('processes') . '
+                FROM ' . prefixTable('processes').'
                 WHERE item_id = %i',
                 $inputData['id']
             );
@@ -2884,7 +2883,7 @@ 
                 // Is the Item to be deleted?
                 $dataDelete = DB::queryfirstrow(
                     'SELECT * 
-                    FROM ' . prefixTable('automatic_del') . '
+                    FROM ' . prefixTable('automatic_del').'
                     WHERE item_id = %i',
                     $inputData['id']
                 );
@@ -2963,11 +2962,11 @@ 
             if (empty($dataItem['restricted_to']) === false) {
                 foreach (explode(';', $dataItem['restricted_to']) as $userRest) {
                     if (empty($userRest) === false) {
-                        $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest);
+                        $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest);
                         if (empty($listOfRestricted)) {
                             $listOfRestricted = $dataTmp['login'];
                         } else {
-                            $listOfRestricted .= ';' . $dataTmp['login'];
+                            $listOfRestricted .= ';'.$dataTmp['login'];
                         }
                     }
                 }
@@ -3041,9 +3040,9 @@ 
         // Load item data
         $dataItem = DB::queryFirstRow(
             'SELECT i.*, n.title AS folder_title, o.enabled AS otp_for_item_enabled, o.phone_number AS otp_phone_number, o.secret AS otp_secret
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-            INNER JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+            INNER JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id)
             WHERE i.id = %i',
             $inputData['id']
         );
@@ -3065,7 +3064,7 @@ 
         // Check if user has a role that is accepted
         $rows_tmp = DB::query(
             'SELECT role_id
-            FROM ' . prefixTable('restriction_to_roles') . '
+            FROM ' . prefixTable('restriction_to_roles').'
             WHERE item_id=%i',
             $inputData['id']
         );
@@ -3112,7 +3111,7 @@ 
             // launch query
             $rows = DB::query(
                 'SELECT id, name, file, extension, size
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = 1',
                 $inputData['id']
             );
@@ -3121,7 +3120,7 @@ 
                     $attachments,
                     array(
                         'icon' => fileFormatImage(strtolower($record['extension'])),
-                        'filename' => basename($record['name'], '.' . $record['extension']),
+                        'filename' => basename($record['name'], '.'.$record['extension']),
                         'extension' => $record['extension'],
                         'size' => formatSizeUnits((int) $record['size']),
                         'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0,
@@ -3164,7 +3163,7 @@ 
                     array(
                         'latest_items' => implode(';', $session->get('user-latest_items')),
                     ),
-                    'id=' . $session->get('user-id')
+                    'id='.$session->get('user-id')
                 );
             }
 
@@ -3173,8 +3172,8 @@ 
             $listOptionsForRoles = array();
             $rows = DB::query(
                 'SELECT r.role_id AS role_id, t.title AS title
-                FROM ' . prefixTable('roles_values') . ' AS r
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' AS r
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                 WHERE r.folder_id = %i',
                 $dataItem['id_tree']
             );
@@ -3188,9 +3187,9 @@ 
                 );
                 $rows2 = DB::query(
                     'SELECT id, login, fonction_id, email, name, lastname
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE fonction_id LIKE %s',
-                    '%' . $record['role_id'] . '%'
+                    '%'.$record['role_id'].'%'
                 );
                 foreach ($rows2 as $record2) {
                     foreach (explode(';', $record2['fonction_id']) as $role) {
@@ -3203,7 +3202,7 @@ 
                                 array(
                                     'id' => (int) $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -3222,16 +3221,16 @@ 
                 $path = '';
                 foreach ($arbo as $elem) {
                     if (empty($path) === true) {
-                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
                     } else {
-                        $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                        $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                     }
                 }
                 // Build text to show user
                 if (empty($path) === true) {
                     $path = addslashes($dataItem['label']);
                 } else {
-                    $path = addslashes($dataItem['label']) . ' (' . $path . ')';
+                    $path = addslashes($dataItem['label']).' ('.$path.')';
                 }
 
                 // Add Admins to notification list if expected
@@ -3254,7 +3253,7 @@ 
                         array(
                             addslashes($session->get('user-login')),
                             $path,
-                            $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
+                            $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
                         ),
                         $lang->get('email_on_open_notification_mail')
                     ),
@@ -3265,7 +3264,7 @@ 
             }
 
             // has this item a change proposal
-            DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']);
+            DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']);
             $returnArray['has_change_proposal'] = DB::count();
 
             // Setting
@@ -3276,7 +3275,7 @@ 
             if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('otv') . '
+                    FROM ' . prefixTable('otv').'
                     WHERE item_id = %i
                     AND time_limit > %i',
                     $inputData['id'],
@@ -3380,7 +3379,7 @@ 
         // Load item data
         $data = DB::queryFirstRow(
             'SELECT id_tree, id, label
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i OR item_key = %s',
             $inputData['itemId'],
             $inputData['itemKey']
@@ -3454,7 +3453,7 @@ 
         // Load item data
         $dataItem = DB::queryFirstRow(
             'SELECT secret, enabled
-            FROM ' . prefixTable('items_otp') . '
+            FROM ' . prefixTable('items_otp').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -3528,13 +3527,13 @@ 
 
         // Check if user is allowed to access this folder
         if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) {
-            echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
+            echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
             break;
         }
 
         // Check if title doesn't contains html codes
         if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
-            echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]';
+            echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]';
             break;
         }
         // check that title is not numeric
@@ -3545,9 +3544,9 @@ 
 
         // Check if duplicate folders name are allowed
         if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
-            $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
+            $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
             if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) {
-                echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]';
+                echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]';
                 break;
             }
         }
@@ -3555,7 +3554,7 @@ 
         // query on folder
         $data = DB::queryfirstrow(
             'SELECT parent_id, personal_folder
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -3565,20 +3564,20 @@ 
         if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') {
             $data = DB::queryfirstrow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE intitule = %i AND type = %s',
                 $data['parent_id'],
                 'complex'
             );
             if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
-                echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
+                echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
                 break;
             }
         }
 
         // update Folders table
         $tmp = DB::queryFirstRow(
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $dataReceived['folder']
         );
         if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) {
@@ -3646,42 +3645,42 @@ 
                 in_array($post_target_folder_id, $session->get('user-accessible_folders')) === false) && ($post_target_folder_id === '0' &&
                 isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1)
         ) {
-            $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
+            $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
             echo $returnValues;
             break;
         }
 
         $tmp_source = DB::queryFirstRow(
             'SELECT title, parent_id, personal_folder
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $post_source_folder_id
         );
 
         $tmp_target = DB::queryFirstRow(
             'SELECT title, parent_id, personal_folder
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $post_target_folder_id
         );
 
         // check if target is not a child of source
         if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) {
-            $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
+            $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
             echo $returnValues;
             break;
         }
 
         // check if source or target folder is PF. If Yes, then cancel operation
         if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) {
-            $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
+            $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
             echo $returnValues;
             break;
         }
 
         // check if source or target folder is PF. If Yes, then cancel operation
         if ($tmp_source['title'] === $session->get('user-id') || $tmp_target['title'] === $session->get('user-id')) {
-            $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
+            $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
             echo $returnValues;
             break;
         }
@@ -3801,7 +3800,7 @@ 
             $uniqueLoadData['path'] = $arr_arbo;
 
             // store last folder accessed in cookie
-            $arr_cookie_options = array (
+            $arr_cookie_options = array(
                 'expires' => time() + TP_ONE_DAY_SECONDS * 5,
                 'path' => '/', 
                 'secure' => true,
@@ -3819,7 +3818,7 @@ 
             foreach ($session->get('user-roles_array') as $role) {
                 $roleQ = DB::queryfirstrow(
                     'SELECT allow_pw_change
-                    FROM ' . prefixTable('roles_title') . '
+                    FROM ' . prefixTable('roles_title').'
                     WHERE id = %i',
                     $role
                 );
@@ -3850,11 +3849,11 @@ 
                 
                 foreach ($session->get('user-roles_array') as $role) {
                     $access = DB::queryFirstRow(
-                        'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                        'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                         $role,
                         $inputData['id']
                     );
-                    if (DB::count()>0) {
+                    if (DB::count() > 0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
                         } elseif ($access['type'] === 'W') {
@@ -3912,7 +3911,7 @@ 
             } else {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif = %i',
                     0
                 );
@@ -3922,7 +3921,7 @@ 
 
             // Get folder complexity
             $folderComplexity = DB::queryFirstRow(
-                'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
+                'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['id']
             );
@@ -3934,7 +3933,7 @@ 
             if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
                 $folderRow = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder = %i',
                     $inputData['id']
                 );
@@ -4049,13 +4048,13 @@ 
             // List all ITEMS
             if ($folderIsPf === false) {
                 $where->add('i.inactif=%i', 0);
-                $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)");
+                $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)");
                 if (empty($limited_to_items) === false) {
                     $where->add('i.id IN %ls', explode(',', $limited_to_items));
                 }
 
-                $query_limit = ' LIMIT ' .
-                    $start . ',' .
+                $query_limit = ' LIMIT '.
+                    $start.','.
                     $post_nb_items_to_display_once;
                 //db::debugmode(true);
                 $rows = DB::query(
@@ -4066,9 +4065,9 @@ 
                     MIN(l.action) AS log_action,
                     l.id_user AS log_user,
                     i.url AS link
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-                    INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+                    INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
                     WHERE %l
                     GROUP BY i.id, l.date, l.id_user, l.action
                     ORDER BY i.label ASC, l.date DESC' . $query_limit,
@@ -4087,9 +4086,9 @@ 
                     MIN(l.action) AS log_action,
                     l.id_user AS log_user,
                     i.url AS link
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-                    INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+                    INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
                     WHERE %l
                     GROUP BY i.id, l.date, l.id_user, l.action
                     ORDER BY i.label ASC, l.date DESC',
@@ -4120,7 +4119,7 @@ 
                     $item_is_restricted_to_role = false;
                     DB::queryfirstrow(
                         'SELECT role_id
-                        FROM ' . prefixTable('restriction_to_roles') . '
+                        FROM ' . prefixTable('restriction_to_roles').'
                         WHERE item_id = %i',
                         $record['id']
                     );
@@ -4132,7 +4131,7 @@ 
                     $user_is_included_in_role = false;
                     DB::query(
                         'SELECT role_id
-                        FROM ' . prefixTable('restriction_to_roles') . '
+                        FROM ' . prefixTable('restriction_to_roles').'
                         WHERE item_id = %i AND role_id IN %ls',
                         $record['id'],
                         $session->get('user-roles_array')
@@ -4338,9 +4337,9 @@ 
         if ((int) $start === 0) {
             DB::query(
                 'SELECT i.id
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                 WHERE %l
                 ORDER BY i.label ASC, l.date DESC',
                 $where
@@ -4404,8 +4403,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.item_key = %s',
             $session->get('user-id'),
             $inputData['itemKey']
@@ -4456,13 +4455,13 @@ 
         if (null !== $inputData['itemId'] && empty($inputData['itemId']) === false) {
             $dataItem = DB::queryfirstrow(
                 'SELECT perso, anyone_can_modify
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id=%i',
                 $inputData['itemId']
             );
 
             // Lock Item (if already locked), go back and warn
-            $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $inputData['itemId']);
+            $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $inputData['itemId']);
 
             // If token is taken for this Item and delay is passed then delete it.
             if (
@@ -4473,7 +4472,7 @@ 
                 DB::delete(prefixTable('items_edition'), 'item_id = %i', $inputData['itemId']);
                 //reload the previous data
                 $dataTmp = DB::queryFirstRow(
-                    'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i',
+                    'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i',
                     $inputData['itemId']
                 );
             }
@@ -4516,7 +4515,7 @@ 
         // do query on this folder
         $data_this_folder = DB::queryFirstRow(
             'SELECT id, personal_folder, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %s',
             $inputData['folderId']
         );
@@ -4556,8 +4555,8 @@ 
         $visibilite = '';
         $data = DB::queryFirstRow(
             'SELECT m.valeur, n.personal_folder
-            FROM ' . prefixTable('misc') . ' AS m
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
+            FROM ' . prefixTable('misc').' AS m
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
             WHERE type=%s AND intitule = %s',
             'complex',
             $inputData['folderId']
@@ -4570,8 +4569,8 @@ 
             // Prepare Item actual visibility (what Users/Roles can see it)
             $rows = DB::query(
                 'SELECT t.title
-                FROM ' . prefixTable('roles_values') . ' as v
-                INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' as v
+                INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                 WHERE v.folder_id = %i
                 GROUP BY title',
                 $inputData['folderId']
@@ -4580,7 +4579,7 @@ 
                 if (empty($visibilite)) {
                     $visibilite = $record['title'];
                 } else {
-                    $visibilite .= ' - ' . $record['title'];
+                    $visibilite .= ' - '.$record['title'];
                 }
             }
         } else {
@@ -4590,14 +4589,14 @@ 
             // do new query to know if current folder is pf
             $data_pf = DB::queryFirstRow(
                 'SELECT personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %s',
                 $inputData['folderId']
             );
             
             $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
             
-            $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')';
+            $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')';
         }
 
         recupDroitCreationSansComplexite($inputData['folderId']);
@@ -4607,8 +4606,8 @@ 
         $listOptionsForRoles = array();
         $rows = DB::query(
             'SELECT r.role_id AS role_id, t.title AS title
-            FROM ' . prefixTable('roles_values') . ' AS r
-            INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+            FROM ' . prefixTable('roles_values').' AS r
+            INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
             WHERE r.folder_id = %i',
             $inputData['folderId']
         );
@@ -4622,7 +4621,7 @@ 
             );
             $rows2 = DB::query(
                 'SELECT id, login, fonction_id, email, name, lastname
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE admin = 0 AND fonction_id is not null'
             );
             foreach ($rows2 as $record2) {
@@ -4636,7 +4635,7 @@ 
                             array(
                                 'id' => $record2['id'],
                                 'login' => $record2['login'],
-                                'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                'name' => $record2['name'].' '.$record2['lastname'],
                                 'email' => $record2['email'],
                             )
                         );
@@ -4653,13 +4652,13 @@ 
                 //db::debugmode(true);
                 $access = DB::queryFirstRow(
                     'SELECT type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $inputData['folderId']
                 );
                 //db::debugmode(false);
-                if (DB::count()>0) {
+                if (DB::count() > 0) {
                     if ($access['type'] === 'R') {
                         array_push($arrTmp, 10);
                     } elseif ($access['type'] === 'W') {
@@ -4732,7 +4731,7 @@ 
         // Get some info before deleting
         $data = DB::queryFirstRow(
             'SELECT name, id_item, file
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id = %i',
             $fileId
         );
@@ -4740,7 +4739,7 @@ 
         // Load item data
         $data_item = DB::queryFirstRow(
             'SELECT id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $data['id_item']
         );
@@ -4770,7 +4769,7 @@ 
                 $session->get('user-id'),
                 'at_modification',
                 $session->get('user-login'),
-                'at_del_file : ' . $data['name']
+                'at_del_file : '.$data['name']
             );
 
             // DElete sharekeys
@@ -4781,7 +4780,7 @@ 
             );
 
             // Delete file from server
-            fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS);
+            fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS);
         }
 
         echo (string) prepareExchangedData(
@@ -4831,7 +4830,7 @@ 
             // Update SESSION with this new favourite
             $data = DB::queryfirstrow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -4840,7 +4839,7 @@ 
                 [
                     $inputData['itemId'] => [
                         'label' => $data['label'],
-                        'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $inputData['itemId'],
+                        'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$inputData['itemId'],
                     ],
                 ],
                 'add'
@@ -4909,8 +4908,8 @@ 
         // get data about item
         $dataSource = DB::queryfirstrow(
             'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-            FROM ' . prefixTable('items') . ' as i
-            INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+            FROM ' . prefixTable('items').' as i
+            INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
             WHERE i.id=%i',
             $inputData['itemId']
         );
@@ -4918,7 +4917,7 @@ 
         // get data about new folder
         $dataDestination = DB::queryfirstrow(
             'SELECT personal_folder, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -4971,7 +4970,7 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -4988,7 +4987,7 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
@@ -5035,7 +5034,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->get('user-id'),
                 $inputData['itemId']
@@ -5046,8 +5045,8 @@ 
                 // This is a public object
                 $users = DB::query(
                     'SELECT id, public_key
-                    FROM ' . prefixTable('users') . '
-                    WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '")
+                    FROM ' . prefixTable('users').'
+                    WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'")
                     AND public_key != ""'
                 );
                 foreach ($users as $user) {
@@ -5067,14 +5066,14 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
             foreach ($rows as $field) {
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_fields') . '
+                    FROM ' . prefixTable('sharekeys_fields').'
                     WHERE user_id = %i AND object_id = %i',
                     $session->get('user-id'),
                     $field['id']
@@ -5085,8 +5084,8 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
-                        WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '")
+                        FROM ' . prefixTable('users').'
+                        WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'")
                         AND public_key != ""'
                     );
                     foreach ($users as $user) {
@@ -5107,14 +5106,14 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
             foreach ($rows as $attachment) {
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_files') . '
+                    FROM ' . prefixTable('sharekeys_files').'
                     WHERE user_id = %i AND object_id = %i',
                     $session->get('user-id'),
                     $attachment['id']
@@ -5125,8 +5124,8 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
-                        WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '")
+                        FROM ' . prefixTable('users').'
+                        WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'")
                         AND public_key != ""'
                     );
                     foreach ($users as $user) {
@@ -5164,7 +5163,7 @@ 
             $session->get('user-id'),
             'at_modification',
             $session->get('user-login'),
-            'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+            'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
         );
 
         // Update cache table
@@ -5223,8 +5222,8 @@ 
                 // get data about item
                 $dataSource = DB::queryfirstrow(
                     'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                     WHERE i.id=%i',
                     $item_id
                 );
@@ -5246,7 +5245,7 @@ 
 
                 // get data about new folder
                 $dataDestination = DB::queryfirstrow(
-                    'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                    'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                     $inputData['folderId']
                 );
 
@@ -5288,7 +5287,7 @@ 
                     // Get fields for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE item_id = %i',
                         $item_id
                     );
@@ -5305,7 +5304,7 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
@@ -5360,7 +5359,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->get('user-id'),
                         $item_id
@@ -5371,8 +5370,8 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
-                            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '")
+                            FROM ' . prefixTable('users').'
+                            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'")
                             AND public_key != ""'
                         );
                         foreach ($users as $user) {
@@ -5392,14 +5391,14 @@ 
                     // Get fields for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE item_id = %i',
                         $item_id
                     );
                     foreach ($rows as $field) {
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_fields') . '
+                            FROM ' . prefixTable('sharekeys_fields').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $field['id']
@@ -5410,8 +5409,8 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
-                                WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '")
+                                FROM ' . prefixTable('users').'
+                                WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'")
                                 AND public_key != ""'
                             );
                             foreach ($users as $user) {
@@ -5432,14 +5431,14 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
                     foreach ($rows as $attachment) {
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_files') . '
+                            FROM ' . prefixTable('sharekeys_files').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $attachment['id']
@@ -5450,8 +5449,8 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
-                                WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '")
+                                FROM ' . prefixTable('users').'
+                                WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'")
                                 AND public_key != ""'
                             );
                             foreach ($users as $user) {
@@ -5488,13 +5487,13 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                    'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
                 );
             }
         }
 
         // reload cache table
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', null);
 
         echo (string) prepareExchangedData(
@@ -5558,7 +5557,7 @@ 
                 // get info
                 $dataSource = DB::queryfirstrow(
                     'SELECT label, id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item_id
                 );
@@ -5657,8 +5656,8 @@ 
         }
         if ($inputData['cat'] === 'request_access_to_author') {
             // Variables
-            $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]);
-            $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]);
+            $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]);
+            $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]);
 
             // Get path
             $path = geItemReadablePath(
@@ -5672,7 +5671,7 @@ 
                 $lang->get('email_request_access_subject'),
                 str_replace(
                     array('#tp_item_author#', '#tp_user#', '#tp_item#'),
-                    array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
+                    array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
                     $lang->get('email_request_access_mail')
                 ),
                 $dataAuthor['email'],
@@ -5682,7 +5681,7 @@ 
         } elseif ($inputData['cat'] === 'share_this_item') {
             $dataItem = DB::queryfirstrow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id= %i',
                 $inputData['id']
             );
@@ -5705,7 +5704,7 @@ 
                     ),
                     array(
                         empty($SETTINGS['email_server_url']) === false ?
-                            $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'],
+                            $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'],
                         addslashes($session->get('user-login')),
                         addslashes($path),
                     ),
@@ -5806,8 +5805,8 @@ 
         // Get all informations for this item
         $dataItem = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('items') . ' as i
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+            FROM ' . prefixTable('items').' as i
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
             WHERE i.id=%i AND l.action = %s',
             $item_id,
             'at_creation'
@@ -5836,18 +5835,18 @@ 
                 $session->get('user-login'),
                 htmlspecialchars_decode($label, ENT_QUOTES),
                 null,
-                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'])
+                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format'])
             );
             // Prepare new line
             $data = DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
                 $item_id
             );
-            $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison'];
+            $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison'];
             // send back
             $data = array(
                 'error' => '',
-                'new_line' => '<br>' . addslashes($historic),
+                'new_line' => '<br>'.addslashes($historic),
             );
             echo (string) prepareExchangedData(
                 $data,
@@ -5919,7 +5918,7 @@ 
         );
 
         // delete all existing old otv codes
-        $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time());
+        $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time());
         foreach ($rows as $record) {
             DB::delete(prefixTable('otv'), 'id=%i', $record['id']);
         }
@@ -5941,8 +5940,8 @@ 
         // Should we log a password change?
         $itemQ = DB::queryFirstRow(
             'SELECT s.share_key, i.pw
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
             WHERE s.user_id = %i AND s.object_id = %i',
             $session->get('user-id'),
             $dataReceived['id']
@@ -5995,7 +5994,7 @@ 
         if (isset($SETTINGS['otv_expiration_period']) === false) {
             $SETTINGS['otv_expiration_period'] = 7;
         }
-        $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session);
+        $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session);
 
         echo json_encode(
             array(
@@ -6037,7 +6036,7 @@ 
         );
 
         $data = DB::queryFirstRow(
-            'SELECT * FROM ' . prefixTable('otv') . ' WHERE id = %i',
+            'SELECT * FROM '.prefixTable('otv').' WHERE id = %i',
             $dataReceived['otv_id']
         );
 
@@ -6046,13 +6045,13 @@ 
             $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME);
             $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST);
             if (str_contains($domain_host, 'www.') === true) {
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4);
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4);
             } else {
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host;
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host;
             }
-            $url = $domain_scheme.'://'.$domain_host . '/index.php?otv=true&code=' . $data['code'] . '&key=' . $data['encrypted'] . '&stamp=' . $data['time_limit'];
+            $url = $domain_scheme.'://'.$domain_host.'/index.php?otv=true&code='.$data['code'].'&key='.$data['encrypted'].'&stamp='.$data['time_limit'];
         } else {
-            $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&code=' . $data['code'] . '&key=' . $data['encrypted'] . '&stamp=' . $data['time_limit'];
+            $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&code='.$data['code'].'&key='.$data['encrypted'].'&stamp='.$data['time_limit'];
         }
 
         echo (string) prepareExchangedData(
@@ -6087,8 +6086,8 @@ 
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
             f.extension AS extension, f.type AS type,
             s.share_key AS share_key
-            FROM ' . prefixTable('files') . ' AS f
-            INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+            FROM ' . prefixTable('files').' AS f
+            INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
             WHERE s.user_id = %i AND s.object_id = %i',
             $session->get('user-id'),
             $inputData['id']
@@ -6109,7 +6108,7 @@ 
         //$fileName = basename($file_info['name'], '.'.$file_info['extension']);
 
         // prepare image info
-        $post_title = basename($file_info['name'], '.' . $file_info['extension']);
+        $post_title = basename($file_info['name'], '.'.$file_info['extension']);
         $post_title = isBase64($post_title) === true ?
             base64_decode($post_title) : $post_title;
         $image_code = $file_info['file'];
@@ -6126,7 +6125,7 @@ 
         echo (string) prepareExchangedData(
             array(
                 'error' => false,
-                'filename' => $post_title . '.' . $file_info['extension'],
+                'filename' => $post_title.'.'.$file_info['extension'],
                 'file_type' => $file_info['type'],
                 'file_content' => $fileContent,
             ),
@@ -6179,16 +6178,16 @@ 
         $idFolder = $dataReceived['idFolder'];
 
         // don't check if Personal Folder
-        $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder);
+        $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder);
         if ($data['title'] === $session->get('user-id')) {
             // send data
-            echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]';
+            echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]';
         } else {
             if ($inputData['option'] === 'same_folder') {
                 // case unique folder
                 DB::query(
                     'SELECT label
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree = %i AND label = %s',
                     $idFolder,
                     $label
@@ -6200,7 +6199,7 @@ 
                 $arrayPf = array();
                 if (empty($row['id']) === false) {
                     $rows = DB::query(
-                        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+                        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
                         '1'
                     );
                     foreach ($rows as $record) {
@@ -6215,12 +6214,12 @@ 
                 $where->add('id_tree = %i', $idFolder);
                 $where->add('label = %s', $label);
                 if (empty($arrayPf) === false) {
-                    $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')');
+                    $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')');
                 }
 
                 DB::query(
                     'SELECT label
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE %l',
                     $where
                 );
@@ -6232,7 +6231,7 @@ 
             }
 
             // send data
-            echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]';
+            echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]';
         }
         break;
 
@@ -6343,7 +6342,7 @@ 
                     $arbo = $tree->getPath($folder->id, false);
                     $path = '';
                     foreach ($arbo as $elem) {
-                        $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                        $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                     }
 
                     // Build array
@@ -6413,7 +6412,7 @@ 
         if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') {
             $rows = DB::query(
                 'SELECT id, categories
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id IN (%l)',
                 implode(',', $foldersArray)
             );
@@ -6455,7 +6454,7 @@ 
         // get item info
         $dataItem = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id=%i',
             $inputData['itemId']
         );
@@ -6467,8 +6466,8 @@ 
             'SELECT l.date as date, l.action as action, l.raison as raison,
                 u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname,
                 l.old_value as old_value
-            FROM ' . prefixTable('log_items') . ' as l
-            INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+            FROM ' . prefixTable('log_items').' as l
+            INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
             WHERE id_item=%i AND l.action NOT IN (%l)
             ORDER BY date DESC',
             $inputData['itemId'],
@@ -6483,18 +6482,18 @@ 
             
             // imported via API
             if (empty($record['login']) === true) {
-                $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']';
+                $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']';
             }
             
             // Prepare avatar
             if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) {
-                if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
+                if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb'];
                 } else {
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
                 }
             } else {
-                $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
             }
 
             // Prepare action
@@ -6514,7 +6513,7 @@ 
                         $previous_passwords, 
                         [
                             'password' => htmlentities($previous_pwd['string']),
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                         ]
                     );
                 }
@@ -6527,19 +6526,19 @@ 
                 $action = $lang->get($reason[0]);
                 if ($reason[0] === 'at_moved') {
                     $tmp = explode(' -> ', $reason[1]);
-                    $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
+                    $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
                 } elseif ($reason[0] === 'at_field') {
                     $tmp = explode(' => ', $reason[1]);
                     if (count($tmp) > 1) {
-                        $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') .
-                            ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
+                        $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value').
+                            ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
                     } else {
                         $detail = trim($reason[1]);
                     }
                 } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
                     $tmp = explode(' => ', $reason[1]);
                     $detail = empty(trim($tmp[0])) === true ?
-                        $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
+                        $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
                 } elseif ($reason[0] === 'at_automatic_del') {
                     $detail = $lang->get($reason[1]);
                 } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') {
@@ -6548,7 +6547,7 @@ 
                     $tmp = explode(':', $reason[1]);
                     $tmp = explode('.', $tmp[0]);
                     $detail = isBase64($tmp[0]) === true ?
-                        base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0];
+                        base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0];
                 } elseif ($reason[0] === 'at_import') {
                     $detail = '';
                 } elseif (in_array($reason[0], array('csv', 'pdf')) === true) {
@@ -6567,8 +6566,8 @@ 
                 array(
                     'avatar' => $avatar,
                     'login' => $record['login'],
-                    'name' => $record['name'] . ' ' . $record['lastname'],
-                    'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                    'name' => $record['name'].' '.$record['lastname'],
+                    'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                     'action' => $action,
                     'detail' => $detail,
                 )
@@ -6657,18 +6656,18 @@ 
 
         // get some info to add to the notification email
         $resp_user = DB::queryfirstrow(
-            'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
+            'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
             $session->get('user-id')
         );
         $resp_folder = DB::queryfirstrow(
-            'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $folder
         );
 
         // notify Managers
         $rows = DB::query(
             'SELECT email
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
             1
         );
@@ -6699,14 +6698,14 @@ 
         // Get list of users
         $usersList = array();
         $usersString = '';
-        $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+        $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
         foreach ($rows as $record) {
             $usersList[$record['login']] = array(
                 'id' => $record['id'],
                 'login' => $record['login'],
                 'email' => $record['email'],
             );
-            $usersString .= $record['id'] . '#' . $record['login'] . ';';
+            $usersString .= $record['id'].'#'.$record['login'].';';
         }
 
         $data = array(
@@ -6746,7 +6745,7 @@ 
         // Send email
         $dataItem = DB::queryfirstrow(
             'SELECT label, id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $inputData['itemId']
         );
@@ -6800,7 +6799,7 @@ 
 
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['itemId'],
             $session->get('user-id')
@@ -6872,7 +6871,7 @@ 
         // And related logs
         $rows = DB::query(
             'SELECT id, file AS filename
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id_item = %i AND confirmed = %i',
             $inputData['itemId'],
             0
@@ -6886,12 +6885,12 @@ 
             );
 
             // Delete file on server
-            unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
+            unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
 
             // Delete related logs
             $logFile = DB::query(
                 'SELECT increment_id, raison
-                FROM ' . prefixTable('log_items') . '
+                FROM ' . prefixTable('log_items').'
                 WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
                 $inputData['itemId'],
                 $session->get('user-id'),
@@ -6950,7 +6949,7 @@ 
         // Confirm attachments
         $rows = DB::query(
             'SELECT id, file AS filename
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id_item = %i AND confirmed = %i',
             $inputData['itemId'],
             0
@@ -7008,7 +7007,7 @@ 
 
         $data = DB::queryFirstRow(
             'SELECT visible_folders
-            FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+            FROM ' . prefixTable('cache_tree').' WHERE user_id = %i',
             $inputData['userId']
         );
         // Check if tree ID is in visible folders.
@@ -7037,7 +7036,7 @@ 
         // Is there no edit or no delete defined
         $data = DB::queryFirstColumn(
             'SELECT type
-            FROM ' . prefixTable('roles_values') . '
+            FROM ' . prefixTable('roles_values').'
             WHERE role_id IN %ls AND folder_id = %i',
             array_column($session->get('system-array_roles'), 'id'),
             $inputData['treeId'],
@@ -7083,15 +7082,15 @@ 
         case 'autocomplete_tags':
             // Get a list off all existing TAGS
             $listOfTags = '';
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
             foreach ($rows as $record) {
                 if (empty($listOfTags)) {
-                    $listOfTags = '"' . $record['tag'] . '"';
+                    $listOfTags = '"'.$record['tag'].'"';
                 } else {
-                    $listOfTags .= ', "' . $record['tag'] . '"';
+                    $listOfTags .= ', "'.$record['tag'].'"';
                 }
             }
-            echo '[' . $listOfTags . ']';
+            echo '['.$listOfTags.']';
             break;
     }
 }
@@ -7107,7 +7106,7 @@ 
 {
     $data = DB::queryFirstRow(
         'SELECT bloquer_creation, bloquer_modification, personal_folder
-        FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+        FROM ' . prefixTable('nested_tree').' WHERE id = %i',
         $groupe
     );
     // Check if it's in a personal folder. If yes, then force complexity overhead.

sources/utilities.queries.php

Spacing +43 added lines, -43 removed lines

@@ -69,7 +69,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -120,7 +120,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -142,10 +142,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                LEFT JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                LEFT JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -167,7 +167,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -225,10 +225,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -255,7 +255,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -271,7 +271,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -360,10 +360,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -396,7 +396,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -410,7 +410,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -499,7 +499,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -519,7 +519,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     //db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . '
+                        'SELECT * FROM '.prefixTable('log_system').'
                         WHERE type=%s '
                         . 'AND (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -542,7 +542,7 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'error',
                         $post_date_from,
@@ -559,7 +559,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'at_copy',
                         $post_date_from,
@@ -576,7 +576,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'admin_action',
                         $post_date_from,
@@ -593,7 +593,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'failed_auth',
                         $post_date_from,
@@ -663,7 +663,7 @@ 
 
             $tasks = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('processes_tasks') . '
+                FROM ' . prefixTable('processes_tasks').'
                 WHERE process_id = %i',
                 $post_id
             );
@@ -671,37 +671,37 @@ 
             // Get some values
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
             $items_number = DB::count();
 
             DB::query(
                 'SELECT increment_id
-                FROM ' . prefixTable('log_items') . '
+                FROM ' . prefixTable('log_items').'
                 WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
             );
             $logs_number = DB::count();
 
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE encryption_type = "teampass_aes"'
             );
-            $items_categories= DB::count();
+            $items_categories = DB::count();
 
             DB::query(
                 'SELECT id
                 FROM ' . prefixTable('suggestion')
             );
-            $items_suggestions= DB::count();
+            $items_suggestions = DB::count();
 
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
-                WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+                FROM ' . prefixTable('files').'
+                WHERE status = "' . TP_ENCRYPTION_NAME.'"'
             );
-            $items_files= DB::count();
+            $items_files = DB::count();
 
 
             // get list
@@ -716,26 +716,26 @@ 
                     if ($detail['step'] === 'step0' || (int) $detail['index'] === 0) {
                         $task_progress = '0%';
                     } elseif ($detail['step'] === 'step10') {
-                        $task_progress = pourcentage($detail['index'], 1, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], 1, 100).'%';
                     } elseif ($detail['step'] === 'step20') {
-                        $task_progress = pourcentage($detail['index'], $items_number, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_number, 100).'%';
                     } elseif ($detail['step'] === 'step30') {
-                        $task_progress = pourcentage($detail['index'], $logs_number, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $logs_number, 100).'%';
                     } elseif ($detail['step'] === 'step40') {
-                        $task_progress = pourcentage($detail['index'], $items_categories, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_categories, 100).'%';
                     } elseif ($detail['step'] === 'step50') {
-                        $task_progress = pourcentage($detail['index'], $items_suggestions, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_suggestions, 100).'%';
                     } elseif ($detail['step'] === 'step60') {
-                        $task_progress = pourcentage($detail['index'], $items_files, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_files, 100).'%';
                     }
                 }
 
                 array_push(
                     $ret,
                     [
-                        'created_at' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['created_at']),
-                        'updated_at' => is_null($task['updated_at']) === false ? date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['updated_at']) : '',
-                        'finished_at' => is_null($task['finished_at']) === false ? date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['finished_at']) : '',
+                        'created_at' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['created_at']),
+                        'updated_at' => is_null($task['updated_at']) === false ? date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['updated_at']) : '',
+                        'finished_at' => is_null($task['finished_at']) === false ? date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['finished_at']) : '',
                         'progress' => $task['finished_at'] !== null ? '100%' : $task_progress,
                         'is_in_progress' => (int) $task['is_in_progress'],
                         'step' => 'step'.$i,
@@ -784,19 +784,19 @@ 
             // Get info about task
             $taskInfo = DB::queryfirstrow(
                 'SELECT p.process_type as process_type
-                FROM ' . prefixTable('processes') . ' as p
+                FROM ' . prefixTable('processes').' as p
                 WHERE p.increment_id = %i',
                 $post_id
             );
             if ($taskInfo !== null) {
                 // delete task
                 DB::query(
-                    'DELETE FROM ' . prefixTable('processes_tasks') . '
+                    'DELETE FROM '.prefixTable('processes_tasks').'
                     WHERE process_id = %i',
                     $post_id
                 );
                 DB::query(
-                    'DELETE FROM ' . prefixTable('processes') . '
+                    'DELETE FROM '.prefixTable('processes').'
                     WHERE increment_id = %i',
                     $post_id
                 );
@@ -863,7 +863,7 @@ 
                         ->setDayOfMonth('*')
                         ->setMonths('*')
                         ->setDayOfWeek('*')
-                        ->setTaskCommandLine($phpBinaryPath . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
+                        ->setTaskCommandLine($phpBinaryPath.' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
                         ->setComments('Teampass scheduler');
                     
                     $crontabRepository->addJob($crontabJob);

sources/tree.php

Spacing +18 added lines, -18 removed lines

@@ -66,7 +66,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -128,7 +128,7 @@ 
 );
 
 $lastFolderChange = DB::queryfirstrow(
-    'SELECT valeur FROM ' . prefixTable('misc') . '
+    'SELECT valeur FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -463,7 +463,7 @@ 
         foreach ($currentNode->children as $child) {
             recursiveTree(
                 (int) $child,
-                $tree->getNode($child),// get node info for this child
+                $tree->getNode($child), // get node info for this child
                 /** @scrutinizer ignore-type */ $tree,
                 $listFoldersLimitedKeys,
                 $listRestrictedFoldersForItemsKeys,
@@ -509,7 +509,7 @@ 
     $lang = new Language(); 
 
     // prepare json return for current node
-    $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id;
+    $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id;
 
     // handle displaying
     if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) {
@@ -526,17 +526,17 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.$currentNode->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => 'jstreeopen',
-                    'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'],
+                    'title' => 'ID ['.$nodeId.'] '.$nodeData['title'],
                 ),
                 'a_attr' => array(
-                    'id' => 'fld_' . $nodeId,
+                    'id' => 'fld_'.$nodeId,
                     'class' => $nodeData['folderClass'],
-                    'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)',
+                    'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)',
                     'data-title' => $currentNode->title,
                 ),
                 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0,
@@ -552,12 +552,12 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.$currentNode->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => '',
-                    'title' => 'ID [' . $nodeId . '] ' . $lang->get('no_access'),
+                    'title' => 'ID ['.$nodeId.'] '.$lang->get('no_access'),
                 ),
             )
         );
@@ -618,7 +618,7 @@ 
         if (in_array($nodeId, $session_read_only_folders) === true) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 1,
                 'folderClass' => 'folder_not_droppable',
@@ -633,7 +633,7 @@ 
         ) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 0,
                 'folderClass' => 'folder',
@@ -644,7 +644,7 @@ 
         }
         
         return [
-            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
             'title' => '',
             'restricted' => 0,
             'folderClass' => 'folder',
@@ -655,8 +655,8 @@ 
 
     } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) {
         return [
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
-                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''),
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
+                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''),
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -667,8 +667,8 @@ 
 
     } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
         return [
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -778,7 +778,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryfirstrow(
         'SELECT data
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $userId
     );