nilsteampassnet / TeamPass

sources/folders.queries.php

Spacing +46 added lines, -46 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -55,14 +55,14 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -132,14 +132,14 @@ 
                     && $t->personal_folder == 0
                 ) {
                     // get $t->parent_id
-                    $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $t->parent_id);
+                    $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $t->parent_id);
                     if ($t->nlevel == 1) {
                         $data['title'] = langHdl('root');
                     }
 
                     // get rights on this folder
                     $arrayRights = array();
-                    $rows = DB::query('SELECT fonction_id  FROM ' . prefixTable('rights') . ' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
+                    $rows = DB::query('SELECT fonction_id  FROM '.prefixTable('rights').' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
                     foreach ($rows as $record) {
                         array_push($arrayRights, $record['fonction_id']);
                     }
@@ -156,8 +156,8 @@ 
                     $node_data = DB::queryFirstRow(
                         'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period,
                         n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification
-                        FROM ' . prefixTable('misc') . ' AS m,
-                        ' . prefixTable('nested_tree') . ' AS n
+                        FROM ' . prefixTable('misc').' AS m,
+                        ' . prefixTable('nested_tree').' AS n
                         WHERE m.type=%s AND m.intitule = n.id AND m.intitule = %i',
                         'complex',
                         $t->id
@@ -190,7 +190,7 @@ 
                     //col7
                     $data7 = DB::queryFirstRow(
                         'SELECT bloquer_creation,bloquer_modification
-                        FROM ' . prefixTable('nested_tree') . '
+                        FROM ' . prefixTable('nested_tree').'
                         WHERE id = %i',
                         intval($t->id)
                     );
@@ -325,7 +325,7 @@ 
             // Get info about this folder
             $dataFolder = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -361,7 +361,7 @@ 
             //check if parent folder is personal
             $dataParent = DB::queryfirstrow(
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_parent_id
             );
@@ -390,7 +390,7 @@ 
                     // get complexity level for this folder
                     $data = DB::queryfirstrow(
                         'SELECT valeur
-                        FROM ' . prefixTable('misc') . '
+                        FROM ' . prefixTable('misc').'
                         WHERE intitule = %i AND type = %s',
                         $post_parent_id,
                         'complex'
@@ -401,7 +401,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => langHdl('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -554,7 +554,7 @@ 
             ) {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE title = %s',
                     $post_title
                 );
@@ -574,7 +574,7 @@ 
             //check if parent folder is personal
             $data = DB::queryfirstrow(
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_parent_id
             );
@@ -603,7 +603,7 @@ 
                     // get complexity level for this folder
                     $data = DB::queryfirstrow(
                         'SELECT valeur
-                        FROM ' . prefixTable('misc') . '
+                        FROM ' . prefixTable('misc').'
                         WHERE intitule = %i AND type = %s',
                         $post_parent_id,
                         'complex'
@@ -613,7 +613,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => langHdl('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -687,7 +687,7 @@ 
                     && (int) $SETTINGS['subfolder_rights_as_parent'] === 1
                 ) {
                     //If it is a subfolder, then give access to it for all roles that allows the parent folder
-                    $rows = DB::query('SELECT role_id, type FROM ' . prefixTable('roles_values') . ' WHERE folder_id = %i', $post_parent_id);
+                    $rows = DB::query('SELECT role_id, type FROM '.prefixTable('roles_values').' WHERE folder_id = %i', $post_parent_id);
                     foreach ($rows as $record) {
                         //add access to this subfolder
                         DB::insert(
@@ -702,7 +702,7 @@ 
                 }
 
                 // if parent folder has Custom Fields Categories then add to this child one too
-                $rows = DB::query('SELECT id_category FROM ' . prefixTable('categories_folders') . ' WHERE id_folder = %i', $post_parent_id);
+                $rows = DB::query('SELECT id_category FROM '.prefixTable('categories_folders').' WHERE id_folder = %i', $post_parent_id);
                 foreach ($rows as $record) {
                     //add CF Category to this subfolder
                     DB::insert(
@@ -779,17 +779,17 @@ 
                                 prefixTable('misc'),
                                 array(
                                     'type' => 'folder_deleted',
-                                    'intitule' => 'f' . $folder->id,
-                                    'valeur' => $folder->id . ', ' . $folder->parent_id . ', ' .
-                                        $folder->title . ', ' . $folder->nleft . ', ' . $folder->nright . ', ' .
-                                        $folder->nlevel . ', 0, 0, 0, 0',
+                                    'intitule' => 'f'.$folder->id,
+                                    'valeur' => $folder->id.', '.$folder->parent_id.', '.
+                                        $folder->title.', '.$folder->nleft.', '.$folder->nright.', '.
+                                        $folder->nlevel.', 0, 0, 0, 0',
                                 )
                             );
                             //array for delete folder
                             $folderForDel[] = $folder->id;
 
                             //delete items & logs
-                            $items = DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE id_tree=%i', $folder->id);
+                            $items = DB::query('SELECT id FROM '.prefixTable('items').' WHERE id_tree=%i', $folder->id);
                             foreach ($items as $item) {
                                 DB::update(
                                     prefixTable('items'),
@@ -846,7 +846,7 @@ 
             $tree->rebuild();
 
             // reload cache table
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', $SETTINGS, null);
 
             echo prepareExchangedData(
@@ -932,7 +932,7 @@ 
                 // get complexity of current node
                 $nodeComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE intitule = %i AND type= %s',
                     $nodeInfo->id,
                     'complex'
@@ -1007,7 +1007,7 @@ 
                 // If it is a subfolder, then give access to it for all roles that allows the parent folder
                 $rows = DB::query(
                     'SELECT role_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE folder_id = %i',
                     $parentId
                 );
@@ -1015,7 +1015,7 @@ 
                     // Add access to this subfolder after checking that it is not already set
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('roles_values') . '
+                        FROM ' . prefixTable('roles_values').'
                         WHERE folder_id = %i AND role_id = %i',
                         $newFolderId,
                         $record['role_id']
@@ -1035,7 +1035,7 @@ 
                 // if parent folder has Custom Fields Categories then add to this child one too
                 $rows = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder = %i',
                     $nodeInfo->id
                 );
@@ -1054,7 +1054,7 @@ 
 
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree = %i',
                     $nodeInfo->id
                 );
@@ -1063,7 +1063,7 @@ 
                     // if it is then don't copy it
                     $item_deleted = DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('log_items') . '
+                        FROM ' . prefixTable('log_items').'
                         WHERE id_item = %i AND action = %s
                         ORDER BY date DESC
                         LIMIT 0, 1',
@@ -1074,7 +1074,7 @@ 
 
                     $item_restored = DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('log_items') . '
+                        FROM ' . prefixTable('log_items').'
                         WHERE id_item = %i AND action = %s
                         ORDER BY date DESC
                         LIMIT 0, 1',
@@ -1089,7 +1089,7 @@ 
                         // Get the ITEM object key for the user
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_items') . '
+                            FROM ' . prefixTable('sharekeys_items').'
                             WHERE user_id = %i AND object_id = %i',
                             $_SESSION['user_id'],
                             $record['id']
@@ -1163,7 +1163,7 @@ 
                         // Manage Custom Fields
                         $categories = DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $record['id']
                         );
@@ -1211,15 +1211,15 @@ 
                         $files = DB::query(
                             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
                             f.size AS size, f.type AS type, s.share_key AS share_key
-                            FROM ' . prefixTable('files') . ' AS f
-                            INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                            FROM ' . prefixTable('files').' AS f
+                            INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                             WHERE s.user_id = %i AND f.id_item = %i',
                             $_SESSION['user_id'],
                             $record['id']
                         );
                         foreach ($files as $file) {
                             // Check if file still exists
-                            if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($file['file'])) === true) {
+                            if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($file['file'])) === true) {
                                 // Step1 - decrypt the file
                                 $fileContent = decryptFile(
                                     $file['file'],
@@ -1228,9 +1228,9 @@ 
                                 );
 
                                 // Step2 - create file
-                                $newFileName = md5(time() . '_' . $file['id']) . '.' . $file['extension'];
+                                $newFileName = md5(time().'_'.$file['id']).'.'.$file['extension'];
 
-                                $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                                $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                                 if ($outstream === false) {
                                     echo prepareExchangedData(
                                         array(
@@ -1305,7 +1305,7 @@ 
             $tree->rebuild();
 
             // reload cache table
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', $SETTINGS, NULL);
 
             $data = array(
@@ -1367,7 +1367,7 @@ 
                     // Get path
                     $text = '';
                     foreach ($tree->getPath($folder->id, false) as $fld) {
-                        $text .= empty($text) === true ? '     [<i>' . $fld->title : ' > ' . $fld->title;
+                        $text .= empty($text) === true ? '     [<i>'.$fld->title : ' > '.$fld->title;
                     }
 
                     // Save array
@@ -1377,7 +1377,7 @@ 
                             'id' => (int) $folder->id,
                             'label' => $folder->title,
                             'level' => $folder->nlevel,
-                            'path' => empty($text) === true ? '' : $text . '</i>]'
+                            'path' => empty($text) === true ? '' : $text.'</i>]'
                         )
                     );
                 }

pages/users.js.php

Spacing +11 added lines, -11 removed lines

@@ -43,11 +43,11 @@ 
 }
 
 /* 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'], 'folders', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -275,8 +275,8 @@ 
         if (store.get('teampassApplication').formUserAction === "add_new_user") {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code');?>',
-                'body': '<?php echo langHdl('email_body_new_user');?>',
+                'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code'); ?>',
+                'body': '<?php echo langHdl('email_body_new_user'); ?>',
                 'pre_replace' : {
                     '#code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                     '#login#' : store.get('teampassUser').admin_new_user_login,
@@ -286,8 +286,8 @@ 
         } else {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code');?>',
-                'body': '<?php echo langHdl('email_body_temporary_encryption_code');?>',
+                'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code'); ?>',
+                'body': '<?php echo langHdl('email_body_temporary_encryption_code'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                 }
@@ -463,13 +463,13 @@ 
             }
             // Inform user
             $("#warningModalBody").html('<b><?php echo langHdl('encryption_keys'); ?> - ' +
-                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
+                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
                 '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
 
             var data = {
                 action: step,
                 start: start,
-                length: <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                length: <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                 user_id: userId,
             }
             //console.info("Envoi des données :")
@@ -1236,7 +1236,7 @@ 
                         } else {
                             // Show icon or not
                             if ($('#user-disabled').prop('checked') === true) {
-                                $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo langHdl('account_is_locked');?>" id="user-disable-'+userID+'"></i>');
+                                $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo langHdl('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>');
                             } else {
                                 $('#user-disable-'+userID).remove();
                             }
@@ -2081,12 +2081,12 @@ 
                         if (step !== 'finished') {
                             // Inform user
                             $("#warningModal-progress").html('<b><?php echo langHdl('encryption_keys'); ?> - ' +
-                                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']');
+                                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']');
 
                             var data = {
                                 'action': step,
                                 'start': start,
-                                'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                                'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                                 userId: userId,
                             }
                             // Do query

pages/emails.php

Spacing +4 added lines, -4 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'emails', $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';
 
 ?>
 <!-- Content Header (Page header) -->
@@ -199,7 +199,7 @@ 
                     <div class="card-body">
                         <div id="unsent-emails">
                             <?php
-                            DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', '');
+                            DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', '');
 echo str_replace('#nb_emails#', (string) DB::count(), langHdl('email_send_backlog'));
                             ?>
                         </div>

pages/items.php

Spacing +30 added lines, -30 removed lines

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

sources/find.queries.php

Spacing +46 added lines, -46 removed lines

@@ -28,7 +28,7 @@ 
 require_once 'SecureHandler.php';
 session_name('teampass_session');
 session_start();
-if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) {
+if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) {
     die('Hacking attempt...');
 }
 
@@ -42,17 +42,17 @@ 
 }
 
 // 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;
 }
 
-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';
@@ -60,12 +60,12 @@ 
 if (isset($_SESSION['groupes_visibles']) === false
     || empty($_SESSION['groupes_visibles']) === true
 ) {
-    echo '{"sEcho": ' . intval($_GET['sEcho']) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
+    echo '{"sEcho": '.intval($_GET['sEcho']).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
     exit;
 }
 
 //Connect to DB
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -89,7 +89,7 @@ 
     $folders = $_SESSION['groupes_visibles'];
 } else {
     // 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');
     $folders = $tree->getDescendants(filter_var($_GET['limited'], FILTER_SANITIZE_NUMBER_INT), true);
@@ -98,7 +98,7 @@ 
 
 //Get current user "personal folder" ID
 $row = DB::query(
-    'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %i',
+    'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %i',
     intval($_SESSION['user_id'])
 );
 //get list of personal folders
@@ -107,20 +107,20 @@ 
 $listPf = '';
 if (empty($row['id']) === false) {
     $rows = DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . '
+        'SELECT id FROM '.prefixTable('nested_tree').'
         WHERE personal_folder = 1 AND NOT parent_id = %i AND NOT title = %i',
         filter_var($row['id'], FILTER_SANITIZE_NUMBER_INT),
         filter_var($_SESSION['user_id'], FILTER_SANITIZE_NUMBER_INT)
     );
     foreach ($rows as $record) {
-        if (! in_array($record['id'], $arrayPf)) {
+        if (!in_array($record['id'], $arrayPf)) {
             //build an array of personal folders ids
             array_push($arrayPf, $record['id']);
             //build also a string with those ids
             if (empty($listPf)) {
                 $listPf = $record['id'];
             } else {
-                $listPf .= ', ' . $record['id'];
+                $listPf .= ', '.$record['id'];
             }
         }
     }
@@ -130,7 +130,7 @@ 
 //Paging
 $sLimit = '';
 if (isset($_GET['start']) === true && $_GET['length'] !== '-1') {
-    $sLimit = 'LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . '';
+    $sLimit = 'LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).'';
 }
 
 //Ordering
@@ -143,8 +143,8 @@ 
     }
     $sOrder = 'ORDER BY  ';
     if ($_GET['order'][0]['column'] >= 0) {
-        $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
-                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING) . ', ';
+        $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
+                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING).', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -152,7 +152,7 @@ 
         $sOrder = '';
     }
 } else {
-    $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC';
+    $sOrder = 'ORDER BY '.$aColumns[1].' ASC';
 }
 
 // Define criteria
@@ -174,9 +174,9 @@ 
 if (empty($search_criteria) === false) {
     $sWhere .= ' AND (';
     for ($i = 0; $i < count($aColumns); ++$i) {
-        $sWhere .= $aColumns[$i] . ' LIKE %ss_' . $i . ' OR ';
+        $sWhere .= $aColumns[$i].' LIKE %ss_'.$i.' OR ';
     }
-    $sWhere = substr_replace((string) $sWhere, '', -3) . ') ';
+    $sWhere = substr_replace((string) $sWhere, '', -3).') ';
     $crit = [
         'idtree' => array_unique($folders),
         '0' => $search_criteria,
@@ -214,13 +214,13 @@ 
     if (empty($sWhere) === false) {
         $sWhere .= ' AND ';
     }
-    $sWhere = 'WHERE ' . $sWhere . 'id_tree NOT IN %ls_pf ';
+    $sWhere = 'WHERE '.$sWhere.'id_tree NOT IN %ls_pf ';
 } else {
-    $sWhere = 'WHERE ' . $sWhere;
+    $sWhere = 'WHERE '.$sWhere;
 }
 
 DB::query(
-    'SELECT id FROM ' . prefixTable('cache') . "
+    'SELECT id FROM '.prefixTable('cache')."
     ${sWhere}
     ${sOrder}",
     $crit
@@ -228,7 +228,7 @@ 
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT id, label, description, tags, id_tree, perso, restricted_to, login, folder, author, renewal_period, url, timestamp
-    FROM ' . prefixTable('cache') . "
+    FROM ' . prefixTable('cache')."
     ${sWhere}
     ${sOrder}
     ${sLimit}",
@@ -241,7 +241,7 @@ 
 if (isset($_GET['type']) === false) {
     $sOutput = '{';
     if (isset($_GET['draw']) === true) {
-        $sOutput .= '"draw": ' . intval($_GET['draw']) . ', ';
+        $sOutput .= '"draw": '.intval($_GET['draw']).', ';
     }
     $sOutput .= '"data": [';
     $sOutputConst = '';
@@ -257,7 +257,7 @@ 
             $arrTmp = [];
             foreach (explode(';', $_SESSION['fonction_id']) 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,
                     $record['id_tree']
                 );
@@ -275,7 +275,7 @@ 
             }
             $accessLevel = count($arrTmp) > 0 ? min($arrTmp) : $accessLevel;
             if ($accessLevel === 0) {
-                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"' . $record['id'] . '\">';
+                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"'.$record['id'].'\">';
             }
 
             if ((int) $accessLevel === 0) {
@@ -315,22 +315,22 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $_SESSION['user_id'];
             } else {
-                $restrictedTo .= ',' . $_SESSION['user_id'];
+                $restrictedTo .= ','.$_SESSION['user_id'];
             }
         }
 
         //col1
-        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . langHdl('open_url_link') . '\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group=' . $record['id_tree'] . '&amp;id=' . $record['id'] . '&#039;\" style=\"cursor:pointer;\"></i>' .
-            '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"' . langHdl('see_item_title') . '\" data-id=\"' . $record['id'] . '\" data-perso=\"' . $record['perso'] . '\" data-tree-id=\"' . $record['id_tree'] . '\" data-expired=\"' . $expired . '\" data-restricted-to=\"' . $restrictedTo . '\" data-rights=\"' . $right . '\" style=\"cursor:pointer;\"></i>' . $checkbox . '", ';
+        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"'.langHdl('open_url_link').'\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group='.$record['id_tree'].'&amp;id='.$record['id'].'&#039;\" style=\"cursor:pointer;\"></i>'.
+            '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"'.langHdl('see_item_title').'\" data-id=\"'.$record['id'].'\" data-perso=\"'.$record['perso'].'\" data-tree-id=\"'.$record['id_tree'].'\" data-expired=\"'.$expired.'\" data-restricted-to=\"'.$restrictedTo.'\" data-rights=\"'.$right.'\" style=\"cursor:pointer;\"></i>'.$checkbox.'", ';
         //col2
-        $sOutputItem .= '"<span id=\"item_label-' . $record['id'] . '\">' . stripslashes($record['label']) . '</span>", ';
+        $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.stripslashes($record['label']).'</span>", ';
         //col3
-        $sOutputItem .= '"' . str_replace('&amp;', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)) . '", ';
+        $sOutputItem .= '"'.str_replace('&amp;', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)).'", ';
         //col4
         //get restriction from ROles
         $restrictedToRole = false;
         $rTmp = DB::queryFirstColumn(
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i',
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i',
             $record['id']
         );
         // We considere here that if user has at least one group similar to the object ones
@@ -348,14 +348,14 @@ 
         } else {
             $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description']));
             if (strlen($txt) > 50) {
-                $sOutputItem .= '"' . substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50) . '", ';
+                $sOutputItem .= '"'.substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50).'", ';
             } else {
-                $sOutputItem .= '"' . stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)) . '", ';
+                $sOutputItem .= '"'.stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)).'", ';
             }
         }
 
         //col5 - TAGS
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES) . '", ';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES).'", ';
         // col6 - URL
         if ($record['url'] !== '0') {
             $sOutputItem .= '"'.filter_var($record['url'], FILTER_SANITIZE_URL).'", ';
@@ -364,7 +364,7 @@ 
         }
 
         //col7 - Prepare the Treegrid
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES) . '"';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES).'"';
         //Finish the line
         $sOutputItem .= '], ';
         if ($getItemInList === true) {
@@ -373,16 +373,16 @@ 
             --$iTotal;
         }
     }
-    if (! empty($sOutputConst)) {
+    if (!empty($sOutputConst)) {
         $sOutput .= substr_replace($sOutputConst, '', -2);
     }
     $sOutput .= '], ';
-    $sOutput .= '"recordsTotal": ' . $iTotal . ', ';
-    $sOutput .= '"recordsFiltered": ' . $iTotal . ' }';
+    $sOutput .= '"recordsTotal": '.$iTotal.', ';
+    $sOutput .= '"recordsFiltered": '.$iTotal.' }';
     echo $sOutput;
 } elseif (isset($_GET['type']) && ($_GET['type'] === 'search_for_items' || $_GET['type'] === 'search_for_items_with_tags')) {
     include_once 'main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
     
     $arr_data = [];
     foreach ($rows as $record) {
@@ -402,7 +402,7 @@ 
 
         // Anyone can modify?
         $tmp = DB::queryfirstrow(
-            'SELECT anyone_can_modify FROM ' . prefixTable('items') . ' WHERE id = %i',
+            'SELECT anyone_can_modify FROM '.prefixTable('items').' WHERE id = %i',
             $record['id']
         );
         if (count($tmp) > 0) {
@@ -433,7 +433,7 @@ 
         // => récupérer un tableau contenant les roles associés à cet ID (a partir table restriction_to_roles)
         $user_is_included_in_role = 0;
         $roles = DB::query(
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id=%i',
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id=%i',
             $record['id']
         );
         if (count($roles) > 0) {
@@ -456,7 +456,7 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $_SESSION['user_id'];
             } else {
-                $restrictedTo .= ',' . $_SESSION['user_id'];
+                $restrictedTo .= ','.$_SESSION['user_id'];
             }
         }
 
@@ -554,7 +554,7 @@ 
             $arrTmp = [];
             foreach (explode(';', $_SESSION['fonction_id']) 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,
                     $record['id_tree']
                 );
@@ -603,8 +603,8 @@ 
         ) {
             $data_item = 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 i.id = %i AND s.user_id = %i',
                 $record['id'],
                 $_SESSION['user_id']

sources/main.queries.php

Braces +3 added lines, -1 removed lines

@@ -1834,7 +1834,9 @@
             $record['id'],
             $_SESSION['user_id']
         );
-        if ($currentUserKey === null || count($currentUserKey) === 0) continue;
+        if ($currentUserKey === null || count($currentUserKey) === 0) {
+            continue;
+        }
 
         // Decrypt itemkey with admin key
         $itemKey = decryptUserObjectKey($currentUserKey['share_key'], $_SESSION['user']['private_key']);

Spacing +109 added lines, -109 removed lines

@@ -45,8 +45,8 @@ 
 date_default_timezone_set(isset($SETTINGS['timezone']) === true ? $SETTINGS['timezone'] : 'UTC');
 
 // 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';
 $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING);
 if (
     isset($post_type) === true
@@ -62,7 +62,7 @@ 
     && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false
 ) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 } elseif ((isset($_SESSION['user_id']) === true
         && isset($_SESSION['key'])) === true
@@ -74,7 +74,7 @@ 
     mainQuery($SETTINGS);
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -89,13 +89,13 @@ 
 
 
     // Includes
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.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';
 
     DB::$host = DB_HOST;
     DB::$user = DB_USER;
@@ -105,7 +105,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
     // Prepare post variables
     $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING);
@@ -233,7 +233,7 @@ 
             $pwdlib = new PasswordLib\PasswordLib();
             // generate key
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
             break;
 
         /*
@@ -262,7 +262,7 @@ 
                 )
             );
 
-            echo '[{"token" : "' . $token . '"}]';
+            echo '[{"token" : "'.$token.'"}]';
             break;
 
 
@@ -535,7 +535,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -589,7 +589,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
+            FROM ' . prefixTable('users').' WHERE id = %i',
             $post_user_id
         );
 
@@ -610,8 +610,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -624,8 +624,8 @@ 
             return prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -726,14 +726,14 @@ 
         // Get data about user
         $data = DB::queryfirstrow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $data = DB::queryfirstrow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -743,7 +743,7 @@ 
     $counter = DB::count();
 
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
 
@@ -790,7 +790,7 @@ 
     }
     
     // generate new GA user code
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
     $gaSecretKey = $tfa->createSecret();
     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -832,7 +832,7 @@ 
                 'email' => $data['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
                     addslashes(langHdl('admin_email_result_ok'))
                 ),
             ),
@@ -848,7 +848,7 @@ 
             'email' => $data['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
+                '<b>'.obfuscateEmail($data['email']).'</b>',
                 addslashes(langHdl('admin_email_result_ok'))
             ),
         ),
@@ -864,7 +864,7 @@ 
         && (int) $SETTINGS['enable_send_email_on_user_login'] === 1
     ) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -872,7 +872,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
@@ -976,8 +976,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -1010,7 +1010,7 @@ 
         isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1046,13 +1046,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1126,8 +1126,8 @@ 
             if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
                 $url_found = substr($line, 19, strlen($line) - 22);
                 $tmp = parse_url($url_found);
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
-                $line = "'cpassman_url' => '" . $anonym_url . "\n";
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
+                $line = "'cpassman_url' => '".$anonym_url."\n";
             }
 
             // Anonymize all urls
@@ -1154,7 +1154,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1162,9 +1162,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1173,7 +1173,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $post_data['current_page'] . '
+' . $post_data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1188,39 +1188,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION_FULL . '
+**Teampass version:** ' . TP_VERSION_FULL.'
 
 **Teampass configuration file:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
 
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1248,7 +1248,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw, auth_type
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1256,7 +1256,7 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT object_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i',
                 $post_user_id
             );
@@ -1264,7 +1264,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['object_id'],
                 $post_user_id
@@ -1291,7 +1291,7 @@ 
             
             // Use the password check
             // load passwordLib library
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $pwdlib->register();
             $pwdlib = new PasswordLib\PasswordLib();
             
@@ -1335,7 +1335,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1362,7 +1362,7 @@ 
             );
 
             // Load superGlobals
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
             $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -1400,7 +1400,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1535,7 +1535,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1598,13 +1598,13 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
         if (DB::count() > 0) {
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // CLear old sharekeys
             if ($post_self_change === false) {
@@ -1656,13 +1656,13 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
         if (DB::count() > 0) {
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // WHAT STEP TO PERFORM?
             if ($post_action === 'step0') {
@@ -1822,15 +1822,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -1858,7 +1858,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1891,7 +1891,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -1915,15 +1915,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $_SESSION['user_id']
@@ -1950,7 +1950,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1972,7 +1972,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -1996,15 +1996,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2031,7 +2031,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2053,7 +2053,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2077,14 +2077,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2111,7 +2111,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2156,15 +2156,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2191,7 +2191,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2213,8 +2213,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2246,16 +2246,16 @@ 
     if (count($_SESSION['personal_folders']) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $_SESSION['personal_folders']
         );
         foreach ($rows as $record) {
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $_SESSION['user_id']
@@ -2282,7 +2282,7 @@ 
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -2305,7 +2305,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2329,7 +2329,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2354,9 +2354,9 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     $_SESSION['personal_folders']
                 );
                 $countUserPersonalItems = DB::count();
@@ -2399,7 +2399,7 @@ 
                         // Loop on files
                         $rows = DB::query(
                             'SELECT id, file
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE status != %s
                             AND id_item = %i',
                             TP_ENCRYPTION_NAME,
@@ -2410,14 +2410,14 @@ 
                             // Now decrypt the file
                             prepareFileWithDefuse(
                                 'decrypt',
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                                 $SETTINGS,
                                 $post_user_psk
                             );
 
                             // Encrypt the file
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                             DB::update(
                                 prefixTable('files'),
@@ -2440,7 +2440,7 @@ 
                             );
 
                             // Unlink original file
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                         }
                     }
                 }
@@ -2509,7 +2509,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT '.$post_fields.'
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2544,7 +2544,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2555,7 +2555,7 @@ 
             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
 
             // Load superGlobals
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -2588,7 +2588,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2626,7 +2626,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key, special
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2656,14 +2656,14 @@ 
                 );
 
                 // Load superGlobals
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                 $superGlobal = new protect\SuperGlobal\SuperGlobal();
                 $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2687,14 +2687,14 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT id, pw
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $post_user_id
@@ -2722,7 +2722,7 @@ 
                     );
                     
                     // Load superGlobals
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 
@@ -2776,7 +2776,7 @@ 
             $_SESSION['user_id']
         );
         // Return data
-        return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
+        return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
     }
     
     return '[{"new_value":"expired"}]';

sources/tree.php

Spacing +47 added lines, -51 removed lines

@@ -42,11 +42,11 @@ 
 }
 
 // includes
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // header
 header('Content-type: text/html; charset=utf-8');
@@ -60,7 +60,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));
 }
@@ -72,7 +72,7 @@ 
 DB::$encoding = DB_ENCODING;
 
 // Superglobal load
-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();
 $get = [];
 $get['user_tree_structure'] = $superGlobal->get('user_tree_structure', 'GET');
@@ -92,7 +92,7 @@ 
 $session['personal_visible_groups'] = $superGlobal->get('personal_visible_groups', 'SESSION');
 
 $lastFolderChange = DB::query(
-    'SELECT * FROM ' . prefixTable('misc') . '
+    'SELECT * FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -103,7 +103,7 @@ 
     || (isset($get['force_refresh']) === true && (int) $get['force_refresh'] === 1)
 ) {
     // 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');
 
@@ -213,7 +213,7 @@ 
     $SETTINGS
 ) {
     // Load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare superGlobal variables
@@ -267,7 +267,7 @@ 
                 // get count of Items in this folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node->id
@@ -277,7 +277,7 @@ 
                 // get info about current folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE parent_id = %i',
                     $node->id
                 );
@@ -285,11 +285,10 @@ 
 
                 // If personal Folder, convert id into user name
                 $node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ?
-                    $session_login :
-                    ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
+                    $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
 
                 // prepare json return for current node
-                $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id;
+                $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id;
 
                 // special case for READ-ONLY folder
                 $title = $session_user_read_only === true && in_array($node->id, $session_personal_folders) === false ? langHdl('read_only_account') : $title;
@@ -299,33 +298,30 @@ 
 
                 if (in_array($node->id, $session_groupes_visibles)) {
                     if (in_array($node->id, $session_read_only_folders)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                         $title = langHdl('read_only_account');
                         $restricted = 1;
                         $folderClass = 'folder_not_droppable';
                     } elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .=
-                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>'
+                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>'
                         .(isset($SETTINGS['tree_counters']) && (int) $SETTINGS['tree_counters'] === 1 ?
-                            '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  :
-                            '')
+                            '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
                         .'</span>';
                 } elseif (in_array($node->id, $listFoldersLimitedKeys)) {
                     $restricted = 1;
                     $text .= 
                         $session_user_read_only === true ?
-                            "<i class='far fa-eye fa-xs mr-1'></i>" :
-                            '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_folders_limited[$node->id]) . '</span>';
+                            "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_folders_limited[$node->id]).'</span>';
                 } elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) {
                     $restricted = 1;
                     if ($session_user_read_only === true) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .= $session_user_read_only === true ? 
-                        "<i class='far fa-eye fa-xs mr-1'></i>" :
-                        '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>';
+                        "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_restricted_folders_for_items[$node->id]).'</span>';
                 } else {
                     $restricted = 1;
                     $folderClass = 'folder_not_droppable';
@@ -351,18 +347,18 @@ 
                     array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' => $parent,
                             'text' => $text,
                             'children' => $childrenNb === 0 ? false : true,
                             'li_attr' => array(
                                 'class' => 'jstreeopen',
-                                'title' => 'ID [' . $node->id . '] ' . $title,
+                                'title' => 'ID ['.$node->id.'] '.$title,
                             ),
                             'a_attr' => array(
-                                'id' => 'fld_' . $node->id,
+                                'id' => 'fld_'.$node->id,
                                 'class' => $folderClass,
-                                'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)',
+                                'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)',
                                 'data-title' => $node->title,
                             ),
                         )
@@ -371,13 +367,13 @@ 
                     array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' =>  $parent,
                             'children' => $childrenNb === 0 ? false : true,
-                            'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
+                            'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
                             'li_attr' => array(
                                 'class' => '',
-                                'title' => 'ID [' . $node->id . '] ' . langHdl('no_access'),
+                                'title' => 'ID ['.$node->id.'] '.langHdl('no_access'),
                             ),
                         )
                     );
@@ -470,7 +466,7 @@ 
                 ) === true
             ) {
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node
@@ -557,7 +553,7 @@ 
 {
     // get info about current folder
     DB::query(
-        'SELECT * FROM ' . prefixTable('items') . '
+        'SELECT * FROM '.prefixTable('items').'
         WHERE inactif=%i AND id_tree = %i',
         0,
         $completTree[$nodeId]->id
@@ -658,7 +654,7 @@ 
     */
 
     // prepare json return for current node
-    $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id;
+    $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id;
 
     // handle displaying
     if (
@@ -678,17 +674,17 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $completTree[$nodeId]->id,
+                'id' => 'li_'.$completTree[$nodeId]->id,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => $text.$completTree[$nodeId]->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => 'jstreeopen',
-                    'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $nodeData['title'],
+                    'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$nodeData['title'],
                 ),
                 'a_attr' => array(
-                    'id' => 'fld_' . $completTree[$nodeId]->id,
+                    'id' => 'fld_'.$completTree[$nodeId]->id,
                     'class' => $nodeData['folderClass'],
-                    'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $nodeData['restricted'] . ', 0, 1)',
+                    'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$nodeData['restricted'].', 0, 1)',
                     'data-title' => $completTree[$nodeId]->title,
                 ),
             )
@@ -697,12 +693,12 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $completTree[$nodeId]->id,
+                'id' => 'li_'.$completTree[$nodeId]->id,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text.$completTree[$nodeId]->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => '',
-                    'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
+                    'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
                 ),
             )
         );
@@ -765,8 +761,8 @@ 
     if (in_array($nodeId, $session_groupes_visibles) === true) {
         if (in_array($nodeId, $session_read_only_folders) === true) {
             return [
-                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                    ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                    ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
                 'title' => langHdl('read_only_account'),
                 'restricted' => 1,
                 'folderClass' => 'folder_not_droppable',
@@ -780,8 +776,8 @@ 
             && in_array($nodeId, $session_personal_visible_groups) === false
         ) {
             return [
-                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                    ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                    ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
                 'title' => $title,
                 'restricted' => 0,
                 'folderClass' => 'folder',
@@ -791,8 +787,8 @@ 
         }
         
         return [
-            'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+            'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
             'title' => $title,
             'restricted' => 0,
             'folderClass' => 'folder',
@@ -803,8 +799,8 @@ 
     
     if (in_array($nodeId, $listFoldersLimitedKeys) === true) {
         return [
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>',
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>',
             'title' => $title,
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -815,8 +811,8 @@ 
     
     if (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
         return [
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
             'title' => $title,
             'restricted' => 1,
             'folderClass' => 'folder',

includes/core/load.js.php

Spacing +12 added lines, -12 removed lines

@@ -117,7 +117,7 @@ 
                                     console.log('User has to regenerate keys')
                                     // HIde
                                     $('.content-header, .content').addClass('hidden');
-                                    $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+                                    $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
                                     // Show passwords inputs and form
                                     $('#dialog-user-temporary-code').removeClass('hidden');
@@ -131,7 +131,7 @@ 
 
                                     // Show passwords inputs and form
                                     $('#dialog-user-change-password-info')
-                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info');?>')
+                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info'); ?>')
                                         .removeClass('hidden');
                                     $('#dialog-user-change-password').removeClass('hidden');
 
@@ -144,7 +144,7 @@ 
 
                                     // Show passwords inputs and form
                                     $('#dialog-ldap-user-change-password-info')
-                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                                         .removeClass('hidden');
                                     $('#dialog-ldap-user-change-password').removeClass('hidden');
                                     
@@ -218,7 +218,7 @@ 
         console.log('User has to regenerate keys')
         // HIde
         $('.content-header, .content').addClass('hidden');
-        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -296,7 +296,7 @@ 
             {
                 if (step === 'psk') {
                     // Inform user
-                    $("#user-current-defuse-psk-progress").html('<b><?php echo langHdl('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
+                    $("#user-current-defuse-psk-progress").html('<b><?php echo langHdl('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + '] ' +
                         '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
 
                     var data = {'userPsk' : $('#user-current-defuse-psk').val()};
@@ -305,7 +305,7 @@ 
                         "sources/main.queries.php", {
                             type: "user_psk_reencryption",
                             'start': start,
-                            'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                            'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                             userId: userId,
                             data: prepareExchangedData(JSON.stringify(data), "encode", "<?php echo $_SESSION['key']; ?>"),
                             key: '<?php echo $_SESSION['key']; ?>'
@@ -794,15 +794,15 @@ 
             // Prepare data
             var data = {
                 'receipt': $('#temp-user-email').val(),
-                'subject': '[Teampass] <?php echo langHdl('your_new_password');?>',
-                'body': '<?php echo langHdl('email_body_temporary_login_password');?>',
+                'subject': '[Teampass] <?php echo langHdl('your_new_password'); ?>',
+                'body': '<?php echo langHdl('email_body_temporary_login_password'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : $('#temp-user-pwd').val(),
                 }
             }
             console.log(data);
             // Prepare form
-            $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message');?>');
+            $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message'); ?>');
             toastr.remove();
             toastr.info(
                 '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
@@ -1270,7 +1270,7 @@ 
             '#warningModal',
             '<i class="fas fa-clock fa-lg warning mr-2"></i><?php echo langHdl('index_add_one_hour'); ?>',
             '<div class="form-group">' +
-            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration') . ' (' . langHdl('minutes') . ')'; ?>:</label>' +
+            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration').' ('.langHdl('minutes').')'; ?>:</label>' +
             '<input type="text" class="form-control" id="warningModal-input" value="<?php echo isset($_SESSION['user']['session_duration']) === true ? (int) $_SESSION['user']['session_duration'] / 60 : 60; ?>">' +
             '</div>',
             '<?php echo langHdl('confirm'); ?>',
@@ -1522,13 +1522,13 @@ 
         if (step !== 'finished') {
             // Inform user
             $("#"+divIdDialog+'-progress').html('<b><?php echo langHdl('encryption_keys'); ?> - ' +
-                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
+                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + '] ' +
                 '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
 
             var data = {
                 'action': step,
                 'start': start,
-                'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                 'user_id': userId,
             }
             // Do query

pages/search.js.php

Indentation +24 added lines, -24 removed lines

@@ -2,30 +2,30 @@
 
 declare(strict_types=1);
 
- /**
-  * Teampass - a collaborative passwords manager.
-  * ---
-  * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  * ---
-  *
-  * @project   Teampass
-  *
-  * @file      search.js.php
-  * ---
-  *
-  * @author    Nils Laumaillé (nils@teampass.net)
-  *
-  * @copyright 2009-2022 Teampass.net
-  *
-  * @license   https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
-  * ---
-  *
-  * @see       https://www.teampass.net
-  */
-
- $var = [];
+    /**
+     * Teampass - a collaborative passwords manager.
+     * ---
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     * ---
+     *
+     * @project   Teampass
+     *
+     * @file      search.js.php
+     * ---
+     *
+     * @author    Nils Laumaillé (nils@teampass.net)
+     *
+     * @copyright 2009-2022 Teampass.net
+     *
+     * @license   https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
+     * ---
+     *
+     * @see       https://www.teampass.net
+     */
+
+    $var = [];
 $var['hidden_asterisk'] = '<i class="fas fa-asterisk mr-2"></i><i class="fas fa-asterisk mr-2"></i><i class="fas fa-asterisk mr-2"></i><i class="fas fa-asterisk mr-2"></i><i class="fas fa-asterisk"></i>';
 
 ?>