nilsteampassnet / TeamPass

api/Controller/Api/FolderController.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
                     $arrFolders = $folderModel->getFoldersInfo(explode(",", $userData['folders_list']));
                     $responseData = json_encode($arrFolders);
                 } catch (Error $e) {
-                    $strErrorDesc = $e->getMessage() . ' Something went wrong! Please contact support.3';
+                    $strErrorDesc = $e->getMessage().' Something went wrong! Please contact support.3';
                     $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
                 }
             }
@@ -121,7 +121,7 @@ 
                         
                         $responseData = json_encode($arrFolder);
                     } catch (Error $e) {
-                        $strErrorDesc = $e->getMessage() . ' Something went wrong! Please contact support.1';
+                        $strErrorDesc = $e->getMessage().' Something went wrong! Please contact support.1';
                         $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
                     }
                 }

scripts/background_tasks___do_calculation.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
     // get count of Items in this folder
     $get = DB::queryfirstrow(
         'SELECT count(*) as num_results
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE inactif = %i AND id_tree = %i',
         0,
         $child->id
@@ -83,14 +83,14 @@ 
     $ret[$child->id]['id'] = $child->id;
 
     // get number of subfolders
-    $nodeDescendants =$tree->getDescendants($child->id, false, false, true);
+    $nodeDescendants = $tree->getDescendants($child->id, false, false, true);
     $ret[$child->id]['subfoldersCount'] = count($nodeDescendants);
 
     // get items number in subfolders
     if (count($nodeDescendants) > 0) {
         $get = DB::queryfirstrow(
             'SELECT count(*) as num_results
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE inactif = %i AND id_tree IN (%l)',
             0,
             implode(',', $nodeDescendants)
@@ -138,7 +138,7 @@ 
     // Get item key
     $itemKey = DB::queryFirstRow(
         'SELECT share_key
-        FROM ' . prefixTable('sharekeys_items') . '
+        FROM ' . prefixTable('sharekeys_items').'
         WHERE user_id = %i AND object_id = %i',
         TP_USER_ID,
         $item['itemId']

pages/api.php

Spacing +25 added lines, -25 removed lines

@@ -71,7 +71,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('api') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -158,7 +158,7 @@ 
                                     <?php
                                     $rowsKeys = DB::query(
                                         'SELECT *
-                                        FROM ' . prefixTable('api') . '
+                                        FROM ' . prefixTable('api').'
                                         WHERE type = %s
                                         ORDER BY timestamp ASC',
                                         'key'
@@ -181,15 +181,15 @@ 
                                             <?php
                                             foreach ($rowsKeys as $key) {
                                                 echo '
-                                                    <tr data-id="' . $key['increment_id'] . '">
-                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-key" title="' . $lang->get('del_button') . '"></i></td>
-                                                    <td><span class="edit-api-key pointer">' . $key['label'] . '</span></td>
-                                                    <td>' . $key['value']. '</td>   
-                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="' . $key['increment_id'] . '"></i></td>                   
+                                                    <tr data-id="' . $key['increment_id'].'">
+                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-key" title="' . $lang->get('del_button').'"></i></td>
+                                                    <td><span class="edit-api-key pointer">' . $key['label'].'</span></td>
+                                                    <td>' . $key['value'].'</td>   
+                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="'.$key['increment_id'].'"></i></td>                   
                                                 </tr>';
                                             } ?>
                                         </tbody>
@@ -224,7 +224,7 @@ 
                                 <div class="col-12 mt-4" id="table-api-ip">
                                     <?php
                                     $rowsIps = DB::query(
-                                                'SELECT increment_id, label, timestamp value FROM ' . prefixTable('api') . '
+                                                'SELECT increment_id, label, timestamp value FROM '.prefixTable('api').'
                                                 WHERE type = %s
                                                 ORDER BY timestamp ASC',
                                                 'ip'
@@ -242,10 +242,10 @@ 
                                             <?php
                                             foreach ($rowsIps as $ip) {
                                                 echo '
-                                                <tr data-id="' . $ip['increment_id'] . '">
-                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-ip" title="' . $lang->get('del_button') . '"></i></td>
-                                                    <td><span class="edit-api-ip pointer" data-field="label">' . $ip['label'] . '</span></td>
-                                                    <td><span class="edit-api-ip pointer" data-field="value">' . $ip['value'] . '</span></td>
+                                                <tr data-id="' . $ip['increment_id'].'">
+                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-ip" title="' . $lang->get('del_button').'"></i></td>
+                                                    <td><span class="edit-api-ip pointer" data-field="label">' . $ip['label'].'</span></td>
+                                                    <td><span class="edit-api-ip pointer" data-field="value">' . $ip['value'].'</span></td>
                                                 </tr>';
                                             } ?>
                                         </tbody>
@@ -281,8 +281,8 @@ 
                                     <?php
                                     $rowsKeys = DB::query(
                                         'SELECT a.*, u.name, u.lastname, u.login
-                                        FROM ' . prefixTable('api') . ' AS a
-                                        INNER JOIN ' . prefixTable('users') . ' AS u ON a.user_id = u.id
+                                        FROM ' . prefixTable('api').' AS a
+                                        INNER JOIN ' . prefixTable('users').' AS u ON a.user_id = u.id
                                         WHERE a.type = %s
                                         ORDER BY u.login ASC',
                                         'user'
@@ -303,13 +303,13 @@ 
                                             <?php
                                             foreach ($rowsKeys as $key) {
                                                 echo '
-                                                    <tr data-id="' . $key['increment_id'] . '">
-                                                    <td>' . $key['name'] . ' ' . $key['lastname'] . ' (<i>'.$key['login'].'</i>)</td>
-                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="' . $key['increment_id'] . '"></i></td>
+                                                    <tr data-id="' . $key['increment_id'].'">
+                                                    <td>' . $key['name'].' '.$key['lastname'].' (<i>'.$key['login'].'</i>)</td>
+                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="'.$key['increment_id'].'"></i></td>
                                                 </tr>';
                                             } ?>
                                         </tbody>

pages/tools.js.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>

pages/tools.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -130,7 +130,7 @@ 
                             </div>
 <?php                            
 // Check if table  exists
-$tableExists = DB::queryFirstField('SHOW TABLES LIKE %s', 'teampass_items_v2');;
+$tableExists = DB::queryFirstField('SHOW TABLES LIKE %s', 'teampass_items_v2'); ;
 if (is_null($tableExists) === true) {
     echo '
                             <div class="alert alert-warning" role="warning"><i class="fas fa-lightbulb mr-2"></i>'.$lang->get('table_not_exists').'</div>';

sources/find.queries.php

Spacing +44 added lines, -44 removed lines

@@ -73,7 +73,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -92,12 +92,12 @@ 
 if (null === $session->get('user-accessible_folders')
     || empty($session->get('user-accessible_folders')) === true
 ) {
-    echo '{"sEcho": ' . $request->query->filter('sEcho', FILTER_SANITIZE_NUMBER_INT) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
+    echo '{"sEcho": '.$request->query->filter('sEcho', FILTER_SANITIZE_NUMBER_INT).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
     exit;
 }
 
 //Columns name
-$aColumns = ['c.id', 'c.label', 'c.login', 'c.description', 'c.tags', 'c.id_tree', 'c.folder', 'c.login', 'c.url', 'ci.data'];//
+$aColumns = ['c.id', 'c.label', 'c.login', 'c.description', 'c.tags', 'c.id_tree', 'c.folder', 'c.login', 'c.url', 'ci.data']; //
 $aSortTypes = ['ASC', 'DESC'];
 //init SQL variables
 $sOrder = $sLimit = $sWhere = '';
@@ -117,7 +117,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->get('user-id'))
 );
 //get list of personal folders
@@ -126,20 +126,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->get('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'];
             }
         }
     }
@@ -149,7 +149,7 @@ 
 //Paging
 $sLimit = '';
 if (null !== $request->query->get('start') && $request->query->get('length') !== '-1') {
-    $sLimit = 'LIMIT ' . $request->query->filter('start', null, FILTER_SANITIZE_NUMBER_INT) . ', ' . $request->query->filter('length', null, FILTER_SANITIZE_NUMBER_INT) . '';
+    $sLimit = 'LIMIT '.$request->query->filter('start', null, FILTER_SANITIZE_NUMBER_INT).', '.$request->query->filter('length', null, FILTER_SANITIZE_NUMBER_INT).'';
 }
 
 //Ordering
@@ -163,8 +163,8 @@ 
     }
     $sOrder = 'ORDER BY  ';
     if ($orderParam[0]['column'] >= 0) {
-        $sOrder .= '' . $aColumns[filter_var($orderParam[0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
-                . filter_var($orderParam[0]['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) . ', ';
+        $sOrder .= ''.$aColumns[filter_var($orderParam[0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
+                . filter_var($orderParam[0]['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS).', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -172,7 +172,7 @@ 
         $sOrder = '';
     }
 } else {
-    $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC';
+    $sOrder = 'ORDER BY '.$aColumns[1].' ASC';
 }
 
 // Define criteria
@@ -196,9 +196,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,
@@ -238,16 +238,16 @@ 
     if (empty($sWhere) === false) {
         $sWhere .= ' AND ';
     }
-    $sWhere = 'WHERE ' . $sWhere . 'c.id_tree NOT IN %ls_pf ';
+    $sWhere = 'WHERE '.$sWhere.'c.id_tree NOT IN %ls_pf ';
 } else {
-    $sWhere = 'WHERE ' . $sWhere;
+    $sWhere = 'WHERE '.$sWhere;
 }
 
 // Do queries
 DB::query(
     "SELECT c.id
-    FROM " . prefixTable('cache') . " AS c
-    LEFT JOIN " . prefixTable('categories_items') . " AS ci ON (ci.item_id = c.id)
+    FROM " . prefixTable('cache')." AS c
+    LEFT JOIN " . prefixTable('categories_items')." AS ci ON (ci.item_id = c.id)
     {$sWhere}
     {$sOrder}",
     $crit
@@ -255,9 +255,9 @@ 
 $iTotal = DB::count();
 $rows = DB::query(
     "SELECT c.*, ci.data, i.item_key
-    FROM " . prefixTable('cache') . " AS c
-    LEFT JOIN " . prefixTable('categories_items') . " AS ci ON (ci.item_id = c.id)
-    INNER JOIN " . prefixTable('items') . " AS i ON (i.id = c.id)
+    FROM " . prefixTable('cache')." AS c
+    LEFT JOIN " . prefixTable('categories_items')." AS ci ON (ci.item_id = c.id)
+    INNER JOIN " . prefixTable('items')." AS i ON (i.id = c.id)
     {$sWhere}
     {$sOrder}
     {$sLimit}",
@@ -282,7 +282,7 @@ 
 if (null === $request->query->get('type')) {
     $sOutput = '{';
     if (null !== $request->query->get('draw')) {
-        $sOutput .= '"draw": ' . $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+        $sOutput .= '"draw": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     }
     $sOutput .= '"data": [';
     $sOutputConst = '';
@@ -299,7 +299,7 @@ 
             foreach (explode(';', $session->get('user-roles')) as $role) {
                 //db::debugmode(true);
                 $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']
                 );
@@ -319,7 +319,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) {
@@ -359,22 +359,22 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $session->get('user-id');
             } else {
-                $restrictedTo .= ',' . $session->get('user-id');
+                $restrictedTo .= ','.$session->get('user-id');
             }
         }
         
         //col1
-        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . $lang->get('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=\"' . stripslashes($lang->get('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=\"'.$lang->get('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=\"'.stripslashes($lang->get('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 .= '"'.base64_encode('<span id=\"item_label-' . $record['id'] . '\">' . (str_replace("\\", "&#92;", (string) $record['label'])) . '</span>').'", ';   // replace backslash #3015
+        $sOutputItem .= '"'.base64_encode('<span id=\"item_label-'.$record['id'].'\">'.(str_replace("\\", "&#92;", (string) $record['label'])).'</span>').'", '; // replace backslash #3015
         //col3
-        $sOutputItem .= '"' . base64_encode(str_replace('&amp;', '&', htmlspecialchars(stripslashes((string) $record['login']), ENT_QUOTES))) . '", ';
+        $sOutputItem .= '"'.base64_encode(str_replace('&amp;', '&', htmlspecialchars(stripslashes((string) $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
@@ -392,14 +392,14 @@ 
         } else {
             $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description']));
             if (strlen($txt) > 50) {
-                $sOutputItem .= '"' . base64_encode(substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50)) . '", ';
+                $sOutputItem .= '"'.base64_encode(substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50)).'", ';
             } else {
-                $sOutputItem .= '"' . base64_encode(stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt))) . '", ';
+                $sOutputItem .= '"'.base64_encode(stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt))).'", ';
             }
         }
 
         //col5 - TAGS
-        $sOutputItem .= '"' . base64_encode(htmlspecialchars(stripslashes((string) $record['tags']), ENT_QUOTES)) . '", ';
+        $sOutputItem .= '"'.base64_encode(htmlspecialchars(stripslashes((string) $record['tags']), ENT_QUOTES)).'", ';
         // col6 - URL
         if ($record['url'] !== '0') {
             $sOutputItem .= '"'.htmlspecialchars(filter_var($record['url'], FILTER_SANITIZE_URL)).'", ';
@@ -408,7 +408,7 @@ 
         }
 
         //col7 - Prepare the Treegrid
-        $sOutputItem .= '"' . base64_encode(stripslashes((string) $record['folder'])) . '"';
+        $sOutputItem .= '"'.base64_encode(stripslashes((string) $record['folder'])).'"';
         //Finish the line
         //$sOutputItem .= '], ';
         if ($getItemInList === true) {
@@ -417,17 +417,17 @@ 
             --$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.' }';
     // file deepcode ignore XSS: data is secured
     echo ($sOutput);
 } elseif (null !== $request->query->get('type') && ($request->query->get('type') === 'search_for_items' || $request->query->get('type') === 'search_for_items_with_tags')) {
     include_once 'main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 
     $arr_data = [];
     foreach ($rows as $record) {
@@ -436,7 +436,7 @@ 
         $arr_data[$record['id']]['tree_id'] = (int) $record['id_tree'];
         $arr_data[$record['id']]['label'] = (string) $record['label'];
         $arr_data[$record['id']]['desc'] = (string) strip_tags(explode('<br>', $record['description'])[0]);
-        $arr_data[$record['id']]['folder'] = (string)$record['folder'];
+        $arr_data[$record['id']]['folder'] = (string) $record['folder'];
         $arr_data[$record['id']]['login'] = (string) strtr($record['login'], '"', '&quot;');
         $arr_data[$record['id']]['item_key'] = (string) $record['item_key'];
         $arr_data[$record['id']]['link'] = (string) $record['url'] !== '0' && empty($record['url']) === false ? filter_var($record['url'], FILTER_SANITIZE_URL) : '';
@@ -449,7 +449,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) {
@@ -480,7 +480,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) {
@@ -503,7 +503,7 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $session->get('user-id');
             } else {
-                $restrictedTo .= ',' . $session->get('user-id');
+                $restrictedTo .= ','.$session->get('user-id');
             }
         }
 
@@ -601,7 +601,7 @@ 
             $arrTmp = [];
             foreach (explode(';', $session->get('user-roles')) as $role) {
                 $access = DB::queryFirstRow(
-                    'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                    'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $record['id_tree']
                 );
@@ -652,8 +652,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->get('user-id')

pages/import.js.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -723,7 +723,7 @@ 
                                     // Isolate first item
                                     if (itemsList.length > 0) {
                                         $('#import-feedback-progress-text')
-                                            .html('<i class="fas fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress');?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i id="item-title"></i>');
+                                            .html('<i class="fas fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress'); ?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i id="item-title"></i>');
 
                                         // XSS Filtering :
                                         $('#import-feedback-progress-text').text(itemsList[0].Title);

pages/favourites.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
     || (int) $session_user_admin === 1) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -125,12 +125,12 @@ 
                             if (empty($fav) === false) {
                                 $data = DB::queryFirstRow(
                                     'SELECT i.label, i.description, i.id, i.id_tree, t.title
-                                    FROM ' . prefixTable('items') . ' as i
-                                    INNER JOIN ' . prefixTable('nested_tree') . ' as t ON (t.id = i.id_tree)
+                                    FROM ' . prefixTable('items').' as i
+                                    INNER JOIN ' . prefixTable('nested_tree').' as t ON (t.id = i.id_tree)
                                     WHERE i.id = %i',
                                     $fav
                                 );
-                                if (! empty($data['label'])) {
+                                if (!empty($data['label'])) {
                                     ?>
                                     <tr>
                                         <td>

pages/export.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }