nilsteampassnet / TeamPass

pages/admin.js.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toastr-top-right'
@@ -151,7 +151,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toastr-top-right'

pages/uploads.js.php

Spacing +2 added lines, -2 removed lines

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

pages/uploads.php

Spacing +3 added lines, -3 removed lines

@@ -35,15 +35,15 @@
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // LDAP type currently loaded
 $ldap_type = isset($SETTINGS['ldap_type']) ? $SETTINGS['ldap_type'] : '';

sources/upload.files.php

Spacing +32 added lines, -32 removed lines

@@ -55,16 +55,16 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // load functions
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // Prepare POST variables
 $post_user_token = filter_input(INPUT_POST, 'user_token', FILTER_SANITIZE_STRING);
@@ -99,7 +99,7 @@ 
     } else {
         // check if token is expired
         $data = DB::queryFirstRow(
-            'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s',
+            'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s',
             $_SESSION['user_id'],
             $post_user_token
         );
@@ -121,12 +121,12 @@ 
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
 if (null !== $post_type_upload && $post_type_upload === 'upload_profile_photo') {
-    $targetDir = $SETTINGS['cpassman_dir'] . '/includes/avatars';
+    $targetDir = $SETTINGS['cpassman_dir'].'/includes/avatars';
 } else {
     $targetDir = $SETTINGS['path_to_files_folder'];
 }
@@ -180,7 +180,7 @@ 
 
 // Validate file name (for our purposes we'll just remove invalid characters)
 $file_name = preg_replace(
-    '/[^' . $valid_chars_regex . '\.]/',
+    '/[^'.$valid_chars_regex.'\.]/',
     '',
     filter_var(
         strtolower(basename($_FILES['file']['name'])),
@@ -188,7 +188,7 @@ 
     )
 );
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-    handleUploadError('Invalid file name: ' . $file_name . '.');
+    handleUploadError('Invalid file name: '.$file_name.'.');
 }
 
 // Validate file extension
@@ -202,8 +202,8 @@ 
         $ext,
         explode(
             ',',
-            $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-                ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+            $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+                ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
         )
     ) === false
 ) {
@@ -212,27 +212,27 @@ 
 
 // is destination folder writable
 if (is_writable($SETTINGS['path_to_files_folder']) === false) {
-    handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.');
+    handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.');
 }
 
 // Clean the fileName for security reasons
 $fileName = preg_replace('/[^\w\.]+/', '_', $fileName);
-$fileName = preg_replace('/[^' . $valid_chars_regex . '\.]/', '', strtolower(basename($fileName)));
+$fileName = preg_replace('/[^'.$valid_chars_regex.'\.]/', '', strtolower(basename($fileName)));
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     $fileNameA = substr($fileName, 0, strlen($ext));
     $fileNameB = substr($fileName, strlen($ext));
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (!file_exists($targetDir)) {
@@ -246,7 +246,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($file = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -336,7 +336,7 @@ 
 $newFileName = bin2hex(GenerateCryptKey(16, false, true, true, false, true, $SETTINGS));
 
 //Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 DB::$host = DB_HOST;
 DB::$user = DB_USER;
 DB::$password = defuseReturnDecrypted(DB_PASSWD, $SETTINGS);
@@ -352,7 +352,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -380,7 +380,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -412,13 +412,13 @@ 
     // rename the file
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext
     );
 
     // make thumbnail
     $ret = makeThumbnail(
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext,
         40
     );
 
@@ -429,21 +429,21 @@ 
     }
 
     // get current avatar and delete it
-    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $_SESSION['user_id']);
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS);
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS);
+    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $_SESSION['user_id']);
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS);
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS);
 
     // store in DB the new avatar
     DB::query(
-        'UPDATE ' . prefixTable('users') . "
-        SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "'
+        'UPDATE '.prefixTable('users')."
+        SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."'
         WHERE id=%i",
         $_SESSION['user_id']
     );
 
     // store in session
-    $_SESSION['user_avatar'] = $newFileName . '.' . $ext;
-    $_SESSION['user_avatar_thumb'] = $newFileName . '_thumb' . '.' . $ext;
+    $_SESSION['user_avatar'] = $newFileName.'.'.$ext;
+    $_SESSION['user_avatar_thumb'] = $newFileName.'_thumb'.'.'.$ext;
 
     // return info
     echo prepareExchangedData(
@@ -461,7 +461,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB

sources/upload.attachments.php

Spacing +24 added lines, -24 removed lines

@@ -39,11 +39,11 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) !== true) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -69,7 +69,7 @@ 
 $post_isPersonal = filter_input(INPUT_POST, 'isPersonal', FILTER_SANITIZE_NUMBER_INT);
 
 // load functions
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // Get parameters
 $chunk = isset($_REQUEST['chunk']) ? (int) $_REQUEST['chunk'] : 0;
@@ -82,8 +82,8 @@ 
     exit();
 } else {
     //Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -143,7 +143,7 @@ 
         // check if token is expired
         $data = DB::queryFirstRow(
             'SELECT end_timestamp
-            FROM ' . prefixTable('tokens') . '
+            FROM ' . prefixTable('tokens').'
             WHERE user_id = %i AND token = %s',
             $_SESSION['user_id'],
             $post_user_token
@@ -168,12 +168,12 @@ 
     }
 
     // Load Settings
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 }
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
@@ -218,9 +218,9 @@ 
 }
 
 // Validate file name (for our purposes we'll just remove invalid characters)
-$file_name = preg_replace('[^' . $valid_chars_regex . ']', '', strtolower(basename($_FILES['file']['name'])));
+$file_name = preg_replace('[^'.$valid_chars_regex.']', '', strtolower(basename($_FILES['file']['name'])));
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-    handleAttachmentError('Invalid file name: ' . $file_name . '.', 114);
+    handleAttachmentError('Invalid file name: '.$file_name.'.', 114);
 }
 
 // Validate file extension
@@ -230,8 +230,8 @@ 
         $ext,
         explode(
             ',',
-            $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-                ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+            $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+                ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
         )
     ) === false
 ) {
@@ -243,24 +243,24 @@ 
 
 // Clean the fileName for security reasons
 $fileInfo = pathinfo($fileName);
-$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension'];
+$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension'];
 $fileFullSize = 0;
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     $ext = strrpos($fileName, '.');
     $fileNameA = substr($fileName, 0, $ext);
     $fileNameB = substr($fileName, $ext);
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (file_exists($targetDir) === false) {
@@ -274,7 +274,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($file = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -396,8 +396,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 . '")
+            FROM ' . prefixTable('users').'
+            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'")
             AND public_key != ""'
         );
         foreach ($users as $user) {
@@ -435,14 +435,14 @@ 
                 'date' => time(),
                 'id_user' => $_SESSION['user_id'],
                 'action' => 'at_modification',
-                'raison' => 'at_add_file : ' . $fileName . ':' . $newID,
+                'raison' => 'at_add_file : '.$fileName.':'.$newID,
             )
         );
     }
 }
 
 // Return JSON-RPC response
-die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}');
+die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}');
 
 /**
  * Undocumented function.
@@ -452,5 +452,5 @@ 
  */
 function handleAttachmentError($message, $code)
 {
-    echo '{"jsonrpc" : "2.0", "error" : {"code": ' . htmlentities($code, ENT_QUOTES) . ', "message": "' . htmlentities($message, ENT_QUOTES) . '"}, "id" : "id"}';
+    echo '{"jsonrpc" : "2.0", "error" : {"code": '.htmlentities($code, ENT_QUOTES).', "message": "'.htmlentities($message, ENT_QUOTES).'"}, "id" : "id"}';
 }

sources/checks.php

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
     throw new Exception('Error file "/includes/config/tp.config.php" not exists', 1);
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
 /*
 Handle CASES
@@ -51,7 +51,7 @@ 
             $csrfp_array = include '../includes/libraries/csrfp/libs/csrfp.config.php';
 
             // Send back CSRFP info
-            echo $csrfp_array['CSRFP_TOKEN'] . ';' . filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING);
+            echo $csrfp_array['CSRFP_TOKEN'].';'.filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING);
         }
 
         break;
@@ -65,7 +65,7 @@ 
 function curPage($SETTINGS)
 {
     // Load libraries
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Parse the url
@@ -125,11 +125,11 @@ 
     $pageVisited = array($pageVisited);
 
     // Load
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
     // Load libraries
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Securize language
@@ -140,12 +140,12 @@ 
         $superGlobal->put('user_language', 'english', 'SESSION');
     }
 
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $superGlobal->get('user_language', 'SESSION') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$superGlobal->get('user_language', 'SESSION').'.php';
     include_once 'SplClassLoader.php';
     include_once 'main.functions.php';
 
     // Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -158,7 +158,7 @@ 
 
     // load user's data
     $data = DB::queryfirstrow(
-        'SELECT login, key_tempo, admin, gestionnaire, can_manage_all_users FROM ' . prefixTable('users') . ' WHERE id = %i',
+        'SELECT login, key_tempo, admin, gestionnaire, can_manage_all_users FROM '.prefixTable('users').' WHERE id = %i',
         $userId
     );
 

sources/items.queries.php

Indentation +21 added lines, -21 removed lines

@@ -951,7 +951,7 @@ 
                 );
 
                 // Does the user has the sharekey
-				//db::debugmode(true);
+                //db::debugmode(true);
                 DB::query(
                     'SELECT *
                     FROM ' . prefixTable('sharekeys_items') . '
@@ -1090,7 +1090,7 @@ 
                     $postArrayTags = explode(' ', $post_tags);
                     foreach ($postArrayTags as $tag) {
                         if (empty($tag) === false) {
-                           // save in DB
+                            // save in DB
                             DB::insert(
                                 prefixTable('tags'),
                                 array(
@@ -2601,7 +2601,7 @@ 
                         foreach ($rows_tmp as $row) {
                             // Uncrypt data
                             // Get the object key for the user
-							//db::debugmode(true);
+                            //db::debugmode(true);
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
                                 FROM ' . prefixTable('sharekeys_fields') . '
@@ -4295,20 +4295,20 @@ 
                 }
             }
 			
-			// Get access level for this folder
-			$accessLevel = 20;
-			if ($folder_is_personal === 0) {
-				$arrTmp = [];
-				foreach ($_SESSION['user_roles'] as $role) {
-					//db::debugmode(true);
-					$access = DB::queryFirstRow(
-						'SELECT type
+            // Get access level for this folder
+            $accessLevel = 20;
+            if ($folder_is_personal === 0) {
+                $arrTmp = [];
+                foreach ($_SESSION['user_roles'] as $role) {
+                    //db::debugmode(true);
+                    $access = DB::queryFirstRow(
+                        'SELECT type
 						FROM ' . prefixTable('roles_values') . '
 						WHERE role_id = %i AND folder_id = %i',
-						$role,
-						$post_groupe
-					);
-					//db::debugmode(false);
+                        $role,
+                        $post_groupe
+                    );
+                    //db::debugmode(false);
                     if (DB::count()>0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
@@ -4329,12 +4329,12 @@ 
                             }
                         }
                     }
-				}
-				// 3.0.0.0 - changed  MIN to MAX
-				$accessLevel = count($arrTmp) > 0 ? max($arrTmp) : $accessLevel;
-			} elseif ($folder_is_personal === 1) {
-				$accessLevel = 30;
-			}
+                }
+                // 3.0.0.0 - changed  MIN to MAX
+                $accessLevel = count($arrTmp) > 0 ? max($arrTmp) : $accessLevel;
+            } elseif ($folder_is_personal === 1) {
+                $accessLevel = 30;
+            }
 
             $returnValues = array(
                 'folderId' => (int) $post_groupe,

Braces +3 added lines, -1 removed lines

@@ -1770,7 +1770,9 @@
                         $post_item_id
                     );
                     foreach ($rows as $record) {
-                        if ($record['raison'] === NULL) continue;
+                        if ($record['raison'] === NULL) {
+                            continue;
+                        }
                         $reason = explode(':', $record['raison']);
                         if (count($reason) > 0) {
                             $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '

Spacing +315 added lines, -315 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -55,8 +55,8 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
@@ -78,7 +78,7 @@ 
 }
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -90,7 +90,7 @@ 
 DB::$encoding = DB_ENCODING;
 
 // Class loader
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Load Tree
 $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries');
@@ -98,7 +98,7 @@ 
 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
 // Superglobal library
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
 // Prepare POST variables
@@ -316,7 +316,7 @@ 
                 // About special settings
                 $dataFolderSettings = DB::queryFirstRow(
                     'SELECT bloquer_creation, bloquer_modification, personal_folder
-                    FROM ' . prefixTable('nested_tree') . ' 
+                    FROM ' . prefixTable('nested_tree').' 
                     WHERE id = %i',
                     $post_folder_id
                 );
@@ -333,7 +333,7 @@ 
                 // Get folder complexity
                 $folderComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_folder_id
@@ -359,7 +359,7 @@ 
                 $itemExists = 0;
                 $newID = '';
                 $data = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE label = %s AND inactif = %i',
                     $post_label,
                     0
@@ -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_data[0]
                                 );
@@ -541,7 +541,7 @@ 
                     ) {
                         DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('templates') . '
+                            FROM ' . prefixTable('templates').'
                             WHERE item_id = %i',
                             $newID
                         );
@@ -610,11 +610,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'];
                                 }
                             }
                         }
@@ -628,11 +628,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'];
                                     }
                                 }
                             }
@@ -695,7 +695,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
                         );
@@ -735,14 +735,14 @@ 
                                     langHdl('email_subject'),
                                     str_replace(
                                         array('#label', '#link'),
-                                        array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']),
+                                        array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']),
                                         langHdl('new_item_email_body')
                                     ),
                                     $emailAddress,
                                     $SETTINGS,
                                     str_replace(
                                         array('#label', '#link'),
-                                        array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']),
+                                        array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']),
                                         langHdl('new_item_email_body')
                                     )
                                 );
@@ -792,7 +792,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$arrData, 'encode');
+    $SETTINGS['cpassman_dir'], $arrData, 'encode');
             break;
 
             /*
@@ -913,7 +913,7 @@ 
                 // About special settings
                 $dataFolderSettings = DB::queryFirstRow(
                     'SELECT bloquer_creation, bloquer_modification, personal_folder
-                    FROM ' . prefixTable('nested_tree') . ' 
+                    FROM ' . prefixTable('nested_tree').' 
                     WHERE id = %i',
                     $post_folder_id
                 );
@@ -929,7 +929,7 @@ 
                 // Get folder complexity
                 $folderComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_folder_id
@@ -970,8 +970,8 @@ 
                 // Get all informations for this item
                 $dataItem = DB::queryfirstrow(
                     'SELECT *
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                     WHERE i.id=%i AND l.action = %s',
                     $post_item_id,
                     'at_creation'
@@ -981,7 +981,7 @@ 
 				//db::debugmode(true);
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %s',
                     $post_item_id,
                     $_SESSION['user_id']
@@ -1030,9 +1030,9 @@ 
                         'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
                         i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
                         u.login as user_login, u.email as user_email
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
-                        INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
+                        INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
                         WHERE i.id=%i',
                         $post_item_id
                     );
@@ -1040,7 +1040,7 @@ 
                     // Should we log a password change?
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $post_item_id
@@ -1099,7 +1099,7 @@ 
                     // Get list of tags
                     $itemTags = DB::queryFirstColumn(
                         'SELECT tag
-                        FROM ' . prefixTable('tags') . '
+                        FROM ' . prefixTable('tags').'
                         WHERE item_id = %i',
                         $post_item_id
                     );
@@ -1142,7 +1142,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                            'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                         );
                     }
 
@@ -1179,8 +1179,8 @@ 
                                     'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
                                     i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
                                     c.masked AS masked, i.id AS field_item_id
-                                    FROM ' . prefixTable('categories_items') . ' AS i
-                                    INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                                    FROM ' . prefixTable('categories_items').' AS i
+                                    INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                                     WHERE i.field_id = %i AND i.item_id = %i',
                                     $field['id'],
                                     $post_item_id
@@ -1194,7 +1194,7 @@ 
                                     // Perform new query
                                     $dataTmpCat = DB::queryFirstRow(
                                         'SELECT id, title, encrypted_data, masked
-                                        FROM ' . prefixTable('categories') . '
+                                        FROM ' . prefixTable('categories').'
                                         WHERE id = %i',
                                         $field['id']
                                     );
@@ -1266,7 +1266,7 @@ 
                                         $_SESSION['user_id'],
                                         'at_modification',
                                         $_SESSION['login'],
-                                        'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
+                                        'at_field : '.$dataTmpCat['title'].' : '.$field['value']
                                     );
                                 } else {
                                     // compare the old and new value
@@ -1274,7 +1274,7 @@ 
                                         // Get user sharekey for this field
                                         $userKey = DB::queryFirstRow(
                                             'SELECT share_key
-                                            FROM ' . prefixTable('sharekeys_fields') . '
+                                            FROM ' . prefixTable('sharekeys_fields').'
                                             WHERE user_id = %i AND object_id = %i',
                                             $_SESSION['user_id'],
                                             $dataTmpCat['field_item_id']
@@ -1344,7 +1344,7 @@ 
                                             $_SESSION['user_id'],
                                             'at_modification',
                                             $_SESSION['login'],
-                                            'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                            'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                         );
                                     }
                                 }
@@ -1369,7 +1369,7 @@ 
                     ) {
                         DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('templates') . '
+                            FROM ' . prefixTable('templates').'
                             WHERE item_id = %i',
                             $post_item_id
                         );
@@ -1412,7 +1412,7 @@ 
                         // check if elem exists in Table. If not add it or update it.
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('automatic_del') . '
+                            FROM ' . prefixTable('automatic_del').'
                             WHERE item_id = %i',
                             $post_item_id
                         );
@@ -1439,7 +1439,7 @@ 
                                 // Store updates performed
                                 array_push(
                                     $arrayOfChanges,
-                                    langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled')
+                                    langHdl('automatic_deletion_engaged').': '.langHdl('enabled')
                                 );
 
                                 // update LOG
@@ -1482,7 +1482,7 @@ 
                                 // Store updates performed
                                 array_push(
                                     $arrayOfChanges,
-                                    langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled')
+                                    langHdl('automatic_deletion_engaged').': '.langHdl('disabled')
                                 );
 
                                 // update LOG
@@ -1515,7 +1515,7 @@ 
                             if (empty($userId) === false) {
                                 $dataTmp = DB::queryfirstrow(
                                     'SELECT id, name, lastname
-                                    FROM ' . prefixTable('users') . '
+                                    FROM ' . prefixTable('users').'
                                     WHERE id= %i',
                                     $userId
                                 );
@@ -1523,7 +1523,7 @@ 
                                 // Add to array
                                 array_push(
                                     $arrayOfUsersRestriction,
-                                    $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                                    $dataTmp['name'].' '.$dataTmp['lastname']
                                 );
                                 array_push(
                                     $arrayOfUsersIdRestriction,
@@ -1554,8 +1554,8 @@ 
                         // get values before deleting them
                         $rows = DB::query(
                             'SELECT t.title, t.id AS id
-                            FROM ' . prefixTable('roles_title') . ' as t
-                            INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
+                            FROM ' . prefixTable('roles_title').' as t
+                            INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
                             WHERE r.item_id = %i
                             ORDER BY t.title ASC',
                             $post_item_id
@@ -1589,7 +1589,7 @@ 
                                 );
                                 $dataTmp = DB::queryfirstrow(
                                     'SELECT title
-                                    FROM ' . prefixTable('roles_title') . '
+                                    FROM ' . prefixTable('roles_title').'
                                     WHERE id = %i',
                                     $role
                                 );
@@ -1630,8 +1630,8 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
-                                implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
+                            'at_restriction : '.(count($diffUsersRestiction) > 0 ?
+                                implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
                         );
                     }
 
@@ -1651,7 +1651,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_label : ' . $data['label'] . ' => ' . $post_label
+                            'at_label : '.$data['label'].' => '.$post_label
                         );
                     }
                     // LOGIN
@@ -1670,7 +1670,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_login : ' . $data['login'] . ' => ' . $post_login
+                            'at_login : '.$data['login'].' => '.$post_login
                         );
                     }
                     // EMAIL
@@ -1689,7 +1689,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_email : ' . $data['email'] . ' => ' . $post_email
+                            'at_email : '.$data['email'].' => '.$post_email
                         );
                     }
                     // URL
@@ -1708,7 +1708,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_url : ' . $data['url'] . ' => ' . $post_url
+                            'at_url : '.$data['url'].' => '.$post_url
                         );
                     }
                     // DESCRIPTION
@@ -1733,7 +1733,7 @@ 
                     // FOLDER
                     if ((int) $data['id_tree'] !== (int) $post_folder_id) {
                         // Get name of folders
-                        $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $post_folder_id));
+                        $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $post_folder_id));
 
                         // Store updates performed
                         array_push(
@@ -1749,7 +1749,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
+                            'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
                         );
                     }
                     // ANYONE_CAN_MODIFY
@@ -1757,7 +1757,7 @@ 
                         // Store updates performed
                         array_push(
                             $arrayOfChanges,
-                            langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled'))
+                            langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled'))
                         );
 
                         // Log
@@ -1768,15 +1768,15 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
+                            'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
                         );
                     }
 
                     // Reload new values
                     $dataItem = DB::queryfirstrow(
                         'SELECT *
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                         WHERE i.id = %i AND l.action = %s',
                         $post_item_id,
                         'at_creation'
@@ -1785,8 +1785,8 @@ 
                     $history = '';
                     $rows = DB::query(
                         'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
-                        FROM ' . prefixTable('log_items') . ' as l
-                        LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                        FROM ' . prefixTable('log_items').' as l
+                        LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                         WHERE l.action <> %s AND id_item=%s',
                         'at_shown',
                         $post_item_id
@@ -1795,14 +1795,14 @@ 
                         if ($record['raison'] === NULL) continue;
                         $reason = explode(':', $record['raison']);
                         if (count($reason) > 0) {
-                            $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
-                                . $record['login'] . ' - ' . langHdl($record['action']) . ' - '
-                                . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1]
+                            $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
+                                . $record['login'].' - '.langHdl($record['action']).' - '
+                                . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1]
                                     : langHdl(trim($reason[0]))) : '');
                             if (empty($history)) {
                                 $history = $sentence;
                             } else {
-                                $history .= '<br />' . $sentence;
+                                $history .= '<br />'.$sentence;
                             }
                         }
                     }
@@ -1857,7 +1857,7 @@ 
             }
             // return data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$arrData, 'encode');
+    $SETTINGS['cpassman_dir'], $arrData, 'encode');
             break;
 
             /*
@@ -1930,7 +1930,7 @@ 
             ) {
                 // load the original record into an array
                 $originalRecord = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE id = %i',
                     $post_item_id
                 );
@@ -1950,7 +1950,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
                 );
@@ -1958,7 +1958,7 @@ 
                 // Get the ITEM object key for the user
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE user_id = %i AND object_id = %i',
                     $_SESSION['user_id'],
                     $post_item_id
@@ -2031,7 +2031,7 @@ 
                 // Manage Custom Fields
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
@@ -2079,15 +2079,15 @@ 
                 $rows = DB::query(
                     'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
                     f.size AS size, f.type AS type, s.share_key AS share_key
-                    FROM ' . prefixTable('files') . ' AS f
-                    INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                    FROM ' . prefixTable('files').' AS f
+                    INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                     WHERE s.user_id = %i AND f.id_item = %i',
                     $_SESSION['user_id'],
                     $post_item_id
                 );
                 foreach ($rows as $record) {
                     // Check if file still exists
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
+                    if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
                         // Step1 - decrypt the file
                         $fileContent = decryptFile(
                             $record['file'],
@@ -2096,8 +2096,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(
     $SETTINGS['cpassman_dir'],
@@ -2148,7 +2148,7 @@ 
 
                 // -------------------------
                 // Add specific restrictions
-                $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $post_item_id);
+                $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $post_item_id);
                 foreach ($rows as $record) {
                     DB::insert(
                         prefixTable('restriction_to_roles'),
@@ -2160,7 +2160,7 @@ 
                 }
 
                 // Add Tags
-                $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $post_item_id);
+                $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $post_item_id);
                 foreach ($rows as $record) {
                     DB::insert(
                         prefixTable('tags'),
@@ -2190,7 +2190,7 @@ 
                     $_SESSION['login']
                 );
                 // reload cache table
-                include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+                include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
                 updateCacheTable('reload', $SETTINGS, null);
 
                 echo (string) prepareExchangedData(
@@ -2238,7 +2238,7 @@ 
 
             // Decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Init post variables
             $post_id = filter_var(($dataReceived['id']), FILTER_SANITIZE_NUMBER_INT);
@@ -2262,7 +2262,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',
@@ -2273,7 +2273,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',
@@ -2298,8 +2298,8 @@ 
             // Get all informations for this item
             $dataItem = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                 WHERE i.id = %i AND l.action = %s',
                 $post_id,
                 'at_creation'
@@ -2308,7 +2308,7 @@ 
             // Notification
             DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('notification') . '
+                FROM ' . prefixTable('notification').'
                 WHERE item_id = %i AND user_id = %i',
                 $post_id,
                 $_SESSION['user_id']
@@ -2355,13 +2355,13 @@ 
                     && (int) $SETTINGS['enable_email_notification_on_item_shown'] === 1
                     && (int) $user['admin'] === 1
                 ) {
-                    $_SESSION['listNotificationEmails'] .= $user['email'] . ',';
+                    $_SESSION['listNotificationEmails'] .= $user['email'].',';
                 }
             }
 
             // manage case of API user
             if ($dataItem['id_user'] === API_USER_ID) {
-                $arrData['author'] = 'API [' . $dataItem['description'] . ']';
+                $arrData['author'] = 'API ['.$dataItem['description'].']';
                 $arrData['id_user'] = API_USER_ID;
                 $arrData['author_email'] = '';
                 $arrData['notification_status'] = false;
@@ -2371,7 +2371,7 @@ 
             $tags = array();
             $rows = DB::query(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i',
                 $post_id
             );
@@ -2396,7 +2396,7 @@ 
             // Check if user has a role that is accepted
             $rows_tmp = DB::query(
                 'SELECT role_id
-                FROM ' . prefixTable('restriction_to_roles') . '
+                FROM ' . prefixTable('restriction_to_roles').'
                 WHERE item_id=%i',
                 $post_id
             );
@@ -2410,7 +2410,7 @@ 
             // Get the object key for the user
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -2493,8 +2493,8 @@ 
                     // Add restriction if item is restricted to roles
                     $rows = DB::query(
                         'SELECT t.title, t.id
-                        FROM ' . prefixTable('roles_title') . ' AS t
-                        INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
+                        FROM ' . prefixTable('roles_title').' AS t
+                        INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
                         WHERE r.item_id = %i
                         ORDER BY t.title ASC',
                         $post_id
@@ -2510,8 +2510,8 @@ 
                     $tmp = array();
                     $rows = DB::query(
                         'SELECT k.label, k.id
-                        FROM ' . prefixTable('kb_items') . ' as i
-                        INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
+                        FROM ' . prefixTable('kb_items').' as i
+                        INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
                         WHERE i.item_id = %i
                         ORDER BY k.label ASC',
                         $post_id
@@ -2591,7 +2591,7 @@ 
                     $arrCatList = array();
                     $rows_tmp = DB::query(
                         'SELECT id_category
-                        FROM ' . prefixTable('categories_folders') . '
+                        FROM ' . prefixTable('categories_folders').'
                         WHERE id_folder=%i',
                         $post_folder_id
                     );
@@ -2606,8 +2606,8 @@ 
                             'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
                             i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id,
                             c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
-                            FROM ' . prefixTable('categories_items') . ' AS i
-                            INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                            FROM ' . prefixTable('categories_items').' AS i
+                            INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                             WHERE i.item_id=%i AND c.parent_id IN %ls',
                             $post_id,
                             $arrCatList
@@ -2618,11 +2618,11 @@ 
 							//db::debugmode(true);
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_fields') . '
+                                FROM ' . prefixTable('sharekeys_fields').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $row['id']
-                            );//db::debugmode(false);
+                            ); //db::debugmode(false);
                             $fieldText = [];
                             if (DB::count() === 0) {
                                 // Not encrypted
@@ -2664,7 +2664,7 @@ 
                 if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
                     $rows_tmp = DB::queryfirstrow(
                         'SELECT category_id
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $post_id
                     );
@@ -2689,7 +2689,7 @@ 
                     // Is the Item to be deleted?
                     $dataDelete = DB::queryfirstrow(
                         'SELECT * 
-                        FROM ' . prefixTable('automatic_del') . '
+                        FROM ' . prefixTable('automatic_del').'
                         WHERE item_id = %i',
                         $post_id
                     );
@@ -2771,11 +2771,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'];
                             }
                         }
                     }
@@ -2796,7 +2796,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$arrData, 'encode');
+    $SETTINGS['cpassman_dir'], $arrData, 'encode');
             break;
 
             /*
@@ -2835,8 +2835,8 @@ 
             // Load item data
             $dataItem = DB::queryFirstRow(
                 'SELECT i.*, n.title AS folder_title
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
                 WHERE i.id = %i',
                 $post_id
             );
@@ -2858,7 +2858,7 @@ 
             // Check if user has a role that is accepted
             $rows_tmp = DB::query(
                 'SELECT role_id
-                FROM ' . prefixTable('restriction_to_roles') . '
+                FROM ' . prefixTable('restriction_to_roles').'
                 WHERE item_id=%i',
                 $post_id
             );
@@ -2905,7 +2905,7 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT id, name, file, extension, size
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i AND confirmed = 1',
                     $post_id
                 );
@@ -2914,7 +2914,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,
@@ -2940,7 +2940,7 @@ 
                         array(
                             'latest_items' => implode(';', $_SESSION['latest_items']),
                         ),
-                        'id=' . $_SESSION['user_id']
+                        'id='.$_SESSION['user_id']
                     );
                 }
 
@@ -2949,8 +2949,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']
                 );
@@ -2964,9 +2964,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) {
@@ -2979,7 +2979,7 @@ 
                                     array(
                                         'id' => (int) $record2['id'],
                                         'login' => $record2['login'],
-                                        'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                        'name' => $record2['name'].' '.$record2['lastname'],
                                         'email' => $record2['email'],
                                     )
                                 );
@@ -2998,16 +2998,16 @@ 
                     $path = '';
                     foreach ($arbo as $elem) {
                         if (empty($path) === true) {
-                            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+                            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
                         } else {
-                            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                         }
                     }
                     // Build text to show user
                     if (empty($path) === true) {
                         $path = addslashes($dataItem['label']);
                     } else {
-                        $path = addslashes($dataItem['label']) . ' (' . $path . ')';
+                        $path = addslashes($dataItem['label']).' ('.$path.')';
                     }
 
                     // send back infos
@@ -3021,7 +3021,7 @@ 
                                 array(
                                     addslashes($_SESSION['login']),
                                     $path,
-                                    $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
+                                    $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
                                 ),
                                 langHdl('email_on_open_notification_mail')
                             ),
@@ -3032,7 +3032,7 @@ 
                 }
 
                 // has this item a change proposal
-                DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id);
+                DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id);
                 $returnArray['has_change_proposal'] = DB::count();
 
                 // Setting
@@ -3130,7 +3130,7 @@ 
             // Load item data
             $data = DB::queryFirstRow(
                 'SELECT id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_item_id
             );
@@ -3196,7 +3196,7 @@ 
             }
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $title = filter_var(htmlspecialchars_decode($dataReceived['title'], ENT_QUOTES), FILTER_SANITIZE_STRING);
@@ -3204,13 +3204,13 @@ 
 
             // Check if user is allowed to access this folder
             if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) {
-                echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 break;
             }
 
             // Check if title doesn't contains html codes
             if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
-                echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]';
+                echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]';
                 break;
             }
             // check that title is not numeric
@@ -3221,9 +3221,9 @@ 
 
             // Check if duplicate folders name are allowed
             if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
-                $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
+                $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
                 if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) {
-                    echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]';
+                    echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]';
                     break;
                 }
             }
@@ -3231,7 +3231,7 @@ 
             // query on folder
             $data = DB::queryfirstrow(
                 'SELECT parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -3241,20 +3241,20 @@ 
             if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE intitule = %i AND type = %s',
                     $data['parent_id'],
                     'complex'
                 );
                 if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
-                    echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
+                    echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
                     break;
                 }
             }
 
             // update Folders table
             $tmp = DB::queryFirstRow(
-                'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
                 $dataReceived['folder']
             );
             if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) {
@@ -3313,7 +3313,7 @@ 
             }
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             $post_source_folder_id = filter_var(htmlspecialchars_decode($dataReceived['source_folder_id']), FILTER_SANITIZE_NUMBER_INT);
             $post_target_folder_id = filter_var(htmlspecialchars_decode($dataReceived['target_folder_id']), FILTER_SANITIZE_NUMBER_INT);
 
@@ -3322,42 +3322,42 @@ 
                     in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' &&
                     isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1)
             ) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             $tmp_source = DB::queryFirstRow(
                 'SELECT title, parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_source_folder_id
             );
 
             $tmp_target = DB::queryFirstRow(
                 'SELECT title, parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_target_folder_id
             );
 
             // check if target is not a child of source
             if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             // check if source or target folder is PF. If Yes, then cancel operation
             if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             // check if source or target folder is PF. If Yes, then cancel operation
             if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
@@ -3494,7 +3494,7 @@ 
                 foreach ($_SESSION['user_roles'] as $role) {
                     $roleQ = DB::queryfirstrow(
                         'SELECT allow_pw_change
-                        FROM ' . prefixTable('roles_title') . '
+                        FROM ' . prefixTable('roles_title').'
                         WHERE id = %i',
                         $role
                     );
@@ -3519,11 +3519,11 @@ 
                     
                     foreach ($_SESSION['user_roles'] as $role) {
                         $access = DB::queryFirstRow(
-                            'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                            'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                             $role,
                             $post_id
                         );
-                        if (DB::count()>0) {
+                        if (DB::count() > 0) {
                             if ($access['type'] === 'R') {
                                 array_push($arrTmp, 10);
                             } elseif ($access['type'] === 'W') {
@@ -3588,7 +3588,7 @@ 
                 } else {
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE inactif = %i',
                         0
                     );
@@ -3598,7 +3598,7 @@ 
 
                 // Get folder complexity
                 $folderComplexity = DB::queryFirstRow(
-                    'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
+                    'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_id
                 );
@@ -3610,7 +3610,7 @@ 
                 if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
                     $folderRow = DB::query(
                         'SELECT id_category
-                        FROM ' . prefixTable('categories_folders') . '
+                        FROM ' . prefixTable('categories_folders').'
                         WHERE id_folder = %i',
                         $post_id
                     );
@@ -3724,13 +3724,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(
@@ -3741,9 +3741,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,
@@ -3762,9 +3762,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',
@@ -3794,7 +3794,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']
                         );
@@ -3806,7 +3806,7 @@ 
                         $user_is_included_in_role = false;
                         DB::query(
                             'SELECT role_id
-                            FROM ' . prefixTable('restriction_to_roles') . '
+                            FROM ' . prefixTable('restriction_to_roles').'
                             WHERE item_id = %i AND role_id IN %ls',
                             $record['id'],
                             $_SESSION['user_roles']
@@ -4010,9 +4010,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
@@ -4054,7 +4054,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
 
             break;
 
@@ -4078,8 +4078,8 @@ 
             // Run query
             $dataItem = DB::queryfirstrow(
                 'SELECT i.pw AS pw, s.share_key AS share_key
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                 WHERE user_id = %i AND i.id = %i',
                 $_SESSION['user_id'],
                 $post_item_id
@@ -4107,7 +4107,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
             break;
 
             /*
@@ -4123,7 +4123,7 @@ 
             if (null !== $post_item_id && empty($post_item_id) === false) {
                 $dataItem = DB::queryfirstrow(
                     'SELECT perso, anyone_can_modify
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $post_item_id
                 );
@@ -4162,7 +4162,7 @@ 
                 */
 
                 // Lock Item (if already locked), go back and warn
-                $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id);
+                $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id);
 
                 // If token is taken for this Item and delay is passed then delete it.
                 if (
@@ -4173,7 +4173,7 @@ 
                     DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id);
                     //reload the previous data
                     $dataTmp = DB::queryFirstRow(
-                        'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i',
+                        'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i',
                         $post_item_id
                     );
                 }
@@ -4206,7 +4206,7 @@ 
                         'message' => langHdl('error_no_edition_possible_locked'),
                     );
                     echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
                     break;
                 }
             }
@@ -4214,7 +4214,7 @@ 
             // do query on this folder
             $data_this_folder = DB::queryFirstRow(
                 'SELECT id, personal_folder, title
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %s',
                 $post_groupe
             );
@@ -4242,7 +4242,7 @@ 
                             'message' => langHdl('error_not_allowed_to'),
                         );
                         echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
                         break;
                     }
                 }
@@ -4252,8 +4252,8 @@ 
             $visibilite = '';
             $data = DB::queryFirstRow(
                 'SELECT m.valeur, n.personal_folder
-                FROM ' . prefixTable('misc') . ' AS m
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
+                FROM ' . prefixTable('misc').' AS m
+                INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
                 WHERE type=%s AND intitule = %s',
                 'complex',
                 $post_groupe
@@ -4266,8 +4266,8 @@ 
                 // Prepare Item actual visibility (what Users/Roles can see it)
                 $rows = DB::query(
                     'SELECT t.title
-                    FROM ' . prefixTable('roles_values') . ' as v
-                    INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' as v
+                    INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                     WHERE v.folder_id = %i
                     GROUP BY title',
                     $post_groupe
@@ -4276,7 +4276,7 @@ 
                     if (empty($visibilite)) {
                         $visibilite = $record['title'];
                     } else {
-                        $visibilite .= ' - ' . $record['title'];
+                        $visibilite .= ' - '.$record['title'];
                     }
                 }
             } else {
@@ -4286,14 +4286,14 @@ 
                 // do new query to know if current folder is pf
                 $data_pf = DB::queryFirstRow(
                     'SELECT personal_folder
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE id = %s',
                     $post_groupe
                 );
                 
                 $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
                 
-                $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')';
+                $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')';
             }
 
             recupDroitCreationSansComplexite($post_groupe);
@@ -4303,8 +4303,8 @@ 
             $listOptionsForRoles = array();
             $rows = DB::query(
                 'SELECT r.role_id AS role_id, t.title AS title
-                FROM ' . prefixTable('roles_values') . ' AS r
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' AS r
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                 WHERE r.folder_id = %i',
                 $post_groupe
             );
@@ -4318,7 +4318,7 @@ 
                 );
                 $rows2 = DB::query(
                     'SELECT id, login, fonction_id, email, name, lastname
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 0'
                 );
                 foreach ($rows2 as $record2) {
@@ -4332,7 +4332,7 @@ 
                                 array(
                                     'id' => $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -4349,13 +4349,13 @@ 
 					//db::debugmode(true);
 					$access = DB::queryFirstRow(
 						'SELECT type
-						FROM ' . prefixTable('roles_values') . '
+						FROM ' . prefixTable('roles_values').'
 						WHERE role_id = %i AND folder_id = %i',
 						$role,
 						$post_groupe
 					);
 					//db::debugmode(false);
-                    if (DB::count()>0) {
+                    if (DB::count() > 0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
                         } elseif ($access['type'] === 'W') {
@@ -4396,7 +4396,7 @@ 
                 'itemAccessRight' => isset($accessLevel) === true ? $accessLevel : '',
             );
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
             break;
 
             /*
@@ -4428,7 +4428,7 @@ 
             // Get some info before deleting
             $data = DB::queryFirstRow(
                 'SELECT name, id_item, file
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id = %i',
                 $fileId
             );
@@ -4436,7 +4436,7 @@ 
             // Load item data
             $data_item = DB::queryFirstRow(
                 'SELECT id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $data['id_item']
             );
@@ -4444,7 +4444,7 @@ 
             // Check that user can access this folder
             if (in_array($data_item['id_tree'], $_SESSION['groupes_visibles']) === false) {
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'ERR_FOLDER_NOT_ALLOWED'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'ERR_FOLDER_NOT_ALLOWED'), 'encode');
                 break;
             }
 
@@ -4464,7 +4464,7 @@ 
                     $_SESSION['user_id'],
                     'at_modification',
                     $_SESSION['login'],
-                    'at_del_file : ' . $data['name']
+                    'at_del_file : '.$data['name']
                 );
 
                 // DElete sharekeys
@@ -4475,7 +4475,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(
@@ -4495,7 +4495,7 @@ 
         case 'clear_html_tags':
             // Get information for this item
             $dataItem = DB::queryfirstrow(
-                'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i',
+                'SELECT description FROM '.prefixTable('items').' WHERE id=%i',
                 filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT)
             );
             // Clean up the string
@@ -4533,12 +4533,12 @@ 
                 // Update SESSION with this new favourite
                 $data = DB::queryfirstrow(
                     'SELECT label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id = ' . mysqli_real_escape_string($link, $post_item_id)
                 );
                 $_SESSION['favourites_tab'][$post_item_id] = array(
                     'label' => $data['label'],
-                    'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $post_item_id,
+                    'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$post_item_id,
                 );
             } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) {
                 // delete from session
@@ -4610,8 +4610,8 @@ 
             // get data about item
             $dataSource = DB::queryfirstrow(
                 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                 WHERE i.id=%i',
                 $post_item_id
             );
@@ -4619,7 +4619,7 @@ 
             // get data about new folder
             $dataDestination = DB::queryfirstrow(
                 'SELECT personal_folder, title
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -4672,7 +4672,7 @@ 
                 // Get fields for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
@@ -4689,7 +4689,7 @@ 
                 // Get FILES for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $post_item_id
                 );
@@ -4734,7 +4734,7 @@ 
                 // Get the ITEM object key for the user
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE user_id = %i AND object_id = %i',
                     $_SESSION['user_id'],
                     $post_item_id
@@ -4745,8 +4745,8 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
-                        WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                        FROM ' . prefixTable('users').'
+                        WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                         AND public_key != ""'
                     );
                     foreach ($users as $user) {
@@ -4766,14 +4766,14 @@ 
                 // Get fields for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
                 foreach ($rows as $field) {
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_fields') . '
+                        FROM ' . prefixTable('sharekeys_fields').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $field['id']
@@ -4784,8 +4784,8 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
-                            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                            FROM ' . prefixTable('users').'
+                            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                             AND public_key != ""'
                         );
                         foreach ($users as $user) {
@@ -4806,14 +4806,14 @@ 
                 // Get FILES for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $post_item_id
                 );
                 foreach ($rows as $attachment) {
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_files') . '
+                        FROM ' . prefixTable('sharekeys_files').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $attachment['id']
@@ -4824,8 +4824,8 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
-                            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                            FROM ' . prefixTable('users').'
+                            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                             AND public_key != ""'
                         );
                         foreach ($users as $user) {
@@ -4862,7 +4862,7 @@ 
                 $_SESSION['user_id'],
                 'at_modification',
                 $_SESSION['login'],
-                'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
             );
 
             $returnValues = array(
@@ -4872,7 +4872,7 @@ 
                 'to_folder' => $post_folder_id,
             );
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
             break;
 
             /*
@@ -4919,8 +4919,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
                     );
@@ -4943,7 +4943,7 @@ 
 
                     // get data about new folder
                     $dataDestination = DB::queryfirstrow(
-                        'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                        'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                         $post_folder_id
                     );
 
@@ -4984,7 +4984,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
                         );
@@ -5001,7 +5001,7 @@ 
                         // Get FILES for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $item_id
                         );
@@ -5054,7 +5054,7 @@ 
                         // Get the ITEM object key for the user
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_items') . '
+                            FROM ' . prefixTable('sharekeys_items').'
                             WHERE user_id = %i AND object_id = %i',
                             $_SESSION['user_id'],
                             $item_id
@@ -5065,8 +5065,8 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
-                                WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                FROM ' . prefixTable('users').'
+                                WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                 AND public_key != ""'
                             );
                             foreach ($users as $user) {
@@ -5086,14 +5086,14 @@ 
                         // Get fields for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $item_id
                         );
                         foreach ($rows as $field) {
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_fields') . '
+                                FROM ' . prefixTable('sharekeys_fields').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $field['id']
@@ -5104,8 +5104,8 @@ 
                                 // This is a public object
                                 $users = DB::query(
                                     'SELECT id, public_key
-                                    FROM ' . prefixTable('users') . '
-                                    WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                    FROM ' . prefixTable('users').'
+                                    WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                     AND public_key != ""'
                                 );
                                 foreach ($users as $user) {
@@ -5126,14 +5126,14 @@ 
                         // Get FILES for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $item_id
                         );
                         foreach ($rows as $attachment) {
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_files') . '
+                                FROM ' . prefixTable('sharekeys_files').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $attachment['id']
@@ -5144,8 +5144,8 @@ 
                                 // This is a public object
                                 $users = DB::query(
                                     'SELECT id, public_key
-                                    FROM ' . prefixTable('users') . '
-                                    WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                    FROM ' . prefixTable('users').'
+                                    WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                     AND public_key != ""'
                                 );
                                 foreach ($users as $user) {
@@ -5181,13 +5181,13 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                        'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
                     );
                 }
             }
 
             // reload cache table
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', $SETTINGS, null);
 
             echo (string) prepareExchangedData(
@@ -5256,7 +5256,7 @@ 
                     // get info
                     $dataSource = DB::queryfirstrow(
                         'SELECT label, id_tree
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id=%i',
                         $item_id
                     );
@@ -5344,7 +5344,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
@@ -5361,8 +5361,8 @@ 
                     $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING));
                 }
                 // Variables
-                $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]);
-                $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]);
+                $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]);
+                $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]);
 
                 // Get path
                 $path = geItemReadablePath(
@@ -5376,7 +5376,7 @@ 
                         langHdl('email_request_access_subject'),
                         str_replace(
                             array('#tp_item_author#', '#tp_user#', '#tp_item#'),
-                            array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path),
+                            array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path),
                             langHdl('email_request_access_mail')
                         ),
                         $dataAuthor['email'],
@@ -5387,7 +5387,7 @@ 
             } elseif ($post_cat === 'share_this_item') {
                 $dataItem = DB::queryfirstrow(
                     'SELECT label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id= %i',
                     $post_id
                 );
@@ -5411,7 +5411,7 @@ 
                             ),
                             array(
                                 empty($SETTINGS['email_server_url']) === false ?
-                                    $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id,
+                                    $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id,
                                 addslashes($_SESSION['login']),
                                 addslashes($path),
                             ),
@@ -5447,7 +5447,7 @@ 
             if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') {
                 // Check if values already exist
                 $data = DB::queryfirstrow(
-                    'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i',
+                    'SELECT notification FROM '.prefixTable('items').' WHERE id = %i',
                     $post_item_id
                 );
                 $notifiedUsers = explode(';', $data['notification']);
@@ -5458,8 +5458,8 @@ 
                         prefixTable('items'),
                         array(
                             'notification' => empty($data['notification']) ?
-                                filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';'
-                                : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
+                                filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';'
+                                : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
                         ),
                         'id=%i',
                         $post_item_id
@@ -5475,7 +5475,7 @@ 
                         array(
                             'notification' => empty($data['notification']) ?
                                 filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT)
-                                : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
+                                : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
                         ),
                         'id=%i',
                         $post_item_id
@@ -5492,18 +5492,18 @@ 
             if ($post_key !== $_SESSION['key']) {
                 $data = array('error' => 'key_is_wrong');
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
                 break;
             }
 
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             // Get all informations for this item
             $dataItem = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                 WHERE i.id=%i AND l.action = %s',
                 $dataReceived['item_id'],
                 'at_creation'
@@ -5534,21 +5534,21 @@ 
                 );
                 // Prepare new line
                 $data = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
+                    'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
                     $dataReceived['item_id']
                 );
-                $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison'];
+                $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison'];
                 // send back
                 $data = array(
                     'error' => '',
-                    'new_line' => '<br>' . addslashes($historic),
+                    'new_line' => '<br>'.addslashes($historic),
                 );
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
             } else {
                 $data = array('error' => 'something_wrong');
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
                 break;
             }
             break;
@@ -5577,7 +5577,7 @@ 
         */
         case 'is_item_changed':
             $data = DB::queryFirstRow(
-                'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC',
+                'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC',
                 'at_modification',
                 $post_item_id
             );
@@ -5601,7 +5601,7 @@ 
             }
 
             // delete all existing old otv codes
-            $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400));
+            $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400));
             foreach ($rows as $record) {
                 DB::delete(prefixTable('otv'), 'id=%i', $record['id']);
             }
@@ -5623,8 +5623,8 @@ 
             // Should we log a password change?
             $itemQ = DB::queryFirstRow(
                 'SELECT s.share_key, i.pw
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
                 WHERE s.user_id = %i AND s.object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -5674,7 +5674,7 @@ 
             if (isset($SETTINGS['otv_expiration_period']) === false) {
                 $SETTINGS['otv_expiration_period'] = 7;
             }
-            $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session);
+            $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session);
             //$exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400));
 
             echo json_encode(
@@ -5713,8 +5713,8 @@ 
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
                 f.extension AS extension, f.type AS type,
                 s.share_key AS share_key
-                FROM ' . prefixTable('files') . ' AS f
-                INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                FROM ' . prefixTable('files').' AS f
+                INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                 WHERE s.user_id = %i AND s.object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -5736,7 +5736,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'];
@@ -5754,7 +5754,7 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => false,
-                    'filename' => $post_title . '.' . $file_info['extension'],
+                    'filename' => $post_title.'.'.$file_info['extension'],
                     'file_type' => $file_info['type'],
                     'file_content' => $fileContent,
                 ),
@@ -5775,11 +5775,11 @@ 
 
             // get file info
             $result = DB::queryfirstrow(
-                'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i',
+                'SELECT file FROM '.prefixTable('files').' WHERE id=%i',
                 intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1))
             );
 
-            fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS);
+            fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS);
 
             break;
 
@@ -5797,22 +5797,22 @@ 
 
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             // Prepare variables
             $label = htmlspecialchars_decode($dataReceived['label']);
             $idFolder = $dataReceived['idFolder'];
 
             // don't check if Personal Folder
-            $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder);
+            $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder);
             if ($data['title'] === $_SESSION['user_id']) {
                 // send data
-                echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]';
+                echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]';
             } else {
                 if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') {
                     // case unique folder
                     DB::query(
                         'SELECT label
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i AND label = %s',
                         $idFolder,
                         $label
@@ -5824,7 +5824,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) {
@@ -5839,12 +5839,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
                     );
@@ -5856,7 +5856,7 @@ 
                 }
 
                 // send data
-                echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]';
+                echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]';
             }
             break;
 
@@ -5912,7 +5912,7 @@ 
             }
 
             //Build tree
-            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $tree->register();
             $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
             $tree->rebuild();
@@ -5963,7 +5963,7 @@ 
                             if (empty($arr_data['folders'][$inc]['path']) === true) {
                                 $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                             } else {
-                                $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                                $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                             }
                         }
 
@@ -5996,7 +5996,7 @@ 
             );
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6031,8 +6031,8 @@ 
                     $rows_tmp = DB::query(
                         'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
                         f.id_category AS category_id
-                        FROM ' . prefixTable('categories_folders') . ' AS f
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
+                        FROM ' . prefixTable('categories_folders').' AS f
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
                         WHERE id_folder=%i',
                         $folder
                     );
@@ -6059,7 +6059,7 @@ 
                 $valTemp = '';
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule=%i',
                     'complex',
                     $folder
@@ -6076,14 +6076,14 @@ 
                 $valTemp = '';
                 $rows_tmp = DB::query(
                     'SELECT t.title
-                    FROM ' . prefixTable('roles_values') . ' as v
-                    INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' as v
+                    INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                     WHERE v.folder_id = %i
                     GROUP BY title',
                     $folder
                 );
                 foreach ($rows_tmp as $record) {
-                    $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
+                    $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
                 }
                 $arr_data[$folder]['visibilityRoles'] = $valTemp;
             }
@@ -6094,7 +6094,7 @@ 
             );
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6106,14 +6106,14 @@ 
             // Check KEY
             if ($post_key !== $_SESSION['key']) {
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'ERR_KEY_NOT_CORRECT'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'ERR_KEY_NOT_CORRECT'), 'encode');
                 break;
             }
 
             // get item info
             $dataItem = DB::queryFirstRow(
                 'SELECT *
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id=%i',
                 $post_item_id
             );
@@ -6123,8 +6123,8 @@ 
             $rows = DB::query(
                 '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
-                FROM ' . prefixTable('log_items') . ' as l
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                FROM ' . prefixTable('log_items').' as l
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                 WHERE id_item=%i AND action <> %s
                 ORDER BY date DESC',
                 $post_item_id,
@@ -6139,7 +6139,7 @@ 
                 
                 // imported via API
                 if (empty($record['login'])) {
-                    $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']';
+                    $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']';
                 }
 
                 if (
@@ -6150,13 +6150,13 @@ 
                 ) {
                     // Prepare avatar
                     if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) {
-                        if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
-                            $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
+                        if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
+                            $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb'];
                         } else {
-                            $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                            $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
                         }
                     } else {
-                        $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                        $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
                     }
 
                     // Prepare action
@@ -6173,19 +6173,19 @@ 
                         $action = langHdl($reason[0]);
                         if ($reason[0] === 'at_moved') {
                             $tmp = explode(' -> ', $reason[1]);
-                            $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
+                            $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
                         } elseif ($reason[0] === 'at_field') {
                             $tmp = explode(' => ', $reason[1]);
                             if (count($tmp) > 1) {
-                                $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') .
-                                    ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
+                                $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value').
+                                    ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
                             } else {
                                 $detail = trim($reason[1]);
                             }
                         } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
                             $tmp = explode(' => ', $reason[1]);
                             $detail = empty(trim($tmp[0])) === true ?
-                                langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
+                                langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
                         } elseif ($reason[0] === 'at_automatic_del') {
                             $detail = langHdl($reason[1]);
                         } elseif ($reason[0] === 'at_anyoneconmodify') {
@@ -6194,7 +6194,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) {
@@ -6213,8 +6213,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,
                         )
@@ -6229,7 +6229,7 @@ 
             
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6248,7 +6248,7 @@ 
             }
             // decrypt and retrieve data in JSON format
             $data_received = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $label = htmlspecialchars_decode($data_received['label'], ENT_QUOTES);
@@ -6298,18 +6298,18 @@ 
 
             // get some info to add to the notification email
             $resp_user = DB::queryfirstrow(
-                'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
+                'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
                 $_SESSION['user_id']
             );
             $resp_folder = DB::queryfirstrow(
-                'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                 $folder
             );
 
             // notify Managers
             $rows = DB::query(
                 'SELECT email
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
                 1
             );
@@ -6341,14 +6341,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(
@@ -6358,7 +6358,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
             break;
 
         case 'send_request_access':
@@ -6376,7 +6376,7 @@ 
             }
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             //$post_email_body = filter_var($dataReceived['email'], FILTER_SANITIZE_STRING);
@@ -6385,7 +6385,7 @@ 
             // Send email
             $dataItem = DB::queryfirstrow(
                 'SELECT label, id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_item_id
             );
@@ -6474,7 +6474,7 @@ 
             }
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_notification_status = (int) filter_var($dataReceived['notification_status'], FILTER_SANITIZE_NUMBER_INT);
@@ -6482,7 +6482,7 @@ 
 
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('notification') . '
+                FROM ' . prefixTable('notification').'
                 WHERE item_id = %i AND user_id = %i',
                 $post_item_id,
                 $_SESSION['user_id']
@@ -6519,7 +6519,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6542,7 +6542,7 @@ 
             }
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_item_id = (int) filter_var($dataReceived['item_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -6551,7 +6551,7 @@ 
             // And related logs
             $rows = DB::query(
                 'SELECT id, file AS filename
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = %i',
                 $post_item_id,
                 0
@@ -6565,12 +6565,12 @@ 
                 );
 
                 // Delete file on server
-                unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
+                unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
 
                 // Delete related logs
                 $logFile = DB::query(
                     'SELECT increment_id, raison
-                    FROM ' . prefixTable('log_items') . '
+                    FROM ' . prefixTable('log_items').'
                     WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
                     $post_item_id,
                     $_SESSION['user_id'],
@@ -6595,7 +6595,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6618,7 +6618,7 @@ 
             }
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_item_id = (int) filter_var($dataReceived['item_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -6626,7 +6626,7 @@ 
             // Confirm attachments
             $rows = DB::query(
                 'SELECT id, file AS filename
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = %i',
                 $post_item_id,
                 0
@@ -6649,7 +6649,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
     }
@@ -6664,15 +6664,15 @@ 
         case 'autocomplete_tags':
             // Get a list off all existing TAGS
             $listOfTags = '';
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $get['term']);
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $get['term']);
             foreach ($rows as $record) {
                 if (empty($listOfTags)) {
-                    $listOfTags = '"' . $record['tag'] . '"';
+                    $listOfTags = '"'.$record['tag'].'"';
                 } else {
-                    $listOfTags .= ', "' . $record['tag'] . '"';
+                    $listOfTags .= ', "'.$record['tag'].'"';
                 }
             }
-            echo '[' . $listOfTags . ']';
+            echo '['.$listOfTags.']';
             break;
     }
 }
@@ -6688,7 +6688,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.

includes/core/otv.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 } else {
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
 }
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 ?>
 <body class="hold-transition otv-page">

includes/core/login.php

Spacing +31 added lines, -31 removed lines

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