Passed
Push — master ( ba5884...e5060c )
by Nils
06:02
created
pages/profile.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
69 69
     // Not allowed page
70 70
     $session->set('system-error_code', ERR_NOT_ALLOWED);
71
-    include $SETTINGS['cpassman_dir'] . '/error.php';
71
+    include $SETTINGS['cpassman_dir'].'/error.php';
72 72
     exit;
73 73
 }
74 74
 
@@ -101,49 +101,49 @@  discard block
 block discarded – undo
101 101
 $zones = timezone_list();
102 102
 // prepare list of languages
103 103
 $languages = DB::query(
104
-    'SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC'
104
+    'SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC'
105 105
 );
106 106
 
107 107
 // Do some stats
108 108
 $userItemsNumber = DB::queryFirstField(
109 109
     'SELECT COUNT(id_item) as count
110
-    FROM ' . prefixTable('log_items') . '
110
+    FROM ' . prefixTable('log_items').'
111 111
     WHERE action = "at_creation" AND  id_user = %i',
112 112
     $session->get('user-id')
113 113
 );
114 114
 
115 115
 $userModificationNumber = DB::queryFirstField(
116 116
     'SELECT COUNT(id_item) as count
117
-    FROM ' . prefixTable('log_items') . '
117
+    FROM ' . prefixTable('log_items').'
118 118
     WHERE action = "at_modification" AND  id_user = %i',
119 119
     $session->get('user-id')
120 120
 );
121 121
 
122 122
 $userSeenItemsNumber = DB::queryFirstField(
123 123
     'SELECT COUNT(id_item) as count
124
-    FROM ' . prefixTable('log_items') . '
124
+    FROM ' . prefixTable('log_items').'
125 125
     WHERE action = "at_shown" AND  id_user = %i',
126 126
     $session->get('user-id')
127 127
 );
128 128
 
129 129
 $userSeenPasswordsNumber = DB::queryFirstField(
130 130
     'SELECT COUNT(id_item)
131
-    FROM ' . prefixTable('log_items') . '
131
+    FROM ' . prefixTable('log_items').'
132 132
     WHERE action = "at_password_shown" AND  id_user = %i',
133 133
     $session->get('user-id')
134 134
 );
135 135
 
136 136
 $userInfo = DB::queryFirstRow(
137 137
     'SELECT avatar, last_pw_change
138
-    FROM ' . prefixTable('users') . ' 
138
+    FROM ' . prefixTable('users').' 
139 139
     WHERE id = %i',
140 140
     $session->get('user-id')
141 141
 );
142 142
 
143 143
 if (empty($userInfo['avatar']) === true) {
144
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
144
+    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
145 145
 } else {
146
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
146
+    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
147 147
 }
148 148
 
149 149
 // Get Groups name
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 foreach ($session->get('user-roles_array') as $role) {
152 152
     $tmp = DB::queryFirstRow(
153 153
         'SELECT title 
154
-        FROM ' . prefixTable('roles_title') . ' 
154
+        FROM ' . prefixTable('roles_title').' 
155 155
         WHERE id = %i',
156 156
         $role
157 157
     );
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                         <h3 id="profile-username" class="text-center">
198 198
                             <?php
199 199
                             if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) {
200
-                                echo $session->get('user-name') . ' ' . $session->get('user-lastname');
200
+                                echo $session->get('user-name').' '.$session->get('user-lastname');
201 201
                             } else {
202 202
                                 echo $session->get('user-login');
203 203
                             }
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
                                             } else {
266 266
                                                 echo date('d/m/Y', (int) $session->get('user-last_connection'));
267 267
                                             }
268
-                                            echo ' ' . $lang->get('at') . ' ';
268
+                                            echo ' '.$lang->get('at').' ';
269 269
                                             if (isset($SETTINGS['time_format']) === true) {
270 270
                                                 echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection'));
271 271
                                             } else {
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
                                         </a>
276 276
                                     </li>
277 277
                                     <?php
278
-                                    if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) {
278
+                                    if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) {
279 279
                                         // Handle last password change string
280 280
                                         if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) {
281 281
                                             if (isset($SETTINGS['date_format']) === true) {
@@ -295,12 +295,12 @@  discard block
 block discarded – undo
295 295
                                         ) {
296 296
                                             $numDaysBeforePwExpiration = '';
297 297
                                         } else {
298
-                                            $numDaysBeforePwExpiration = $lang['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $lang['days'] . '.';
298
+                                            $numDaysBeforePwExpiration = $lang['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$lang['days'].'.';
299 299
                                         }
300 300
                                         echo '
301 301
                                     <li class="list-group-item">
302
-                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b>
303
-                                        <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
302
+                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b>
303
+                                        <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
304 304
                                     </li>';
305 305
                                     }
306 306
                                     ?>
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
                                     if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
321 321
                                         echo '
322 322
                                     <li class="list-group-item">
323
-                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b>
323
+                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b>
324 324
                                         <button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy  pointer"></i></button>
325 325
                                         <a class="float-right mr-2" id="profile-user-api-token">',
326 326
                                             null !== $session->get('user-api_key') ? $session->get('user-api_key') : '',
@@ -338,12 +338,12 @@  discard block
 block discarded – undo
338 338
                                         <?php
339 339
                                         $rows = DB::query(
340 340
                                             'SELECT label AS labelAction, date, null
341
-                                                    FROM ' . prefixTable('log_system') . '
341
+                                                    FROM ' . prefixTable('log_system').'
342 342
                                                     WHERE qui = %i
343 343
                                                     UNION
344 344
                                                     SELECT l.action, l.date, i.label AS itemLabel
345
-                                                    FROM ' . prefixTable('log_items') . ' AS l
346
-                                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
345
+                                                    FROM ' . prefixTable('log_items').' AS l
346
+                                                    INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
347 347
                                                     WHERE l.id_user = %i AND l.action IN ("at_access")
348 348
                                                     ORDER BY date DESC
349 349
                                                     LIMIT 0, 40',
@@ -357,9 +357,9 @@  discard block
 block discarded – undo
357 357
                                                 $text = $lang->get($record['labelAction']);
358 358
                                             }
359 359
                                             if (empty($record['NULL']) === false) {
360
-                                                $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
360
+                                                $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
361 361
                                             }
362
-                                            echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>';
362
+                                            echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>';
363 363
                                         }
364 364
                                         ?>
365 365
                                     </ul>
@@ -393,13 +393,13 @@  discard block
 block discarded – undo
393 393
                                 <?php endif; /* disable_user_edit_profile */
394 394
                                 if (($SETTINGS['disable_user_edit_timezone'] ?? '0') === '0') : ?>
395 395
                                     <div class="form-group">
396
-                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label>
396
+                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label>
397 397
                                         <div class="col-sm-10">
398 398
                                             <select class="form-control" id="profile-user-timezone">
399 399
                                                 <?php foreach ($zones as $key => $zone): ?>
400 400
                                                     <option value="<?php echo $key; ?>"<?php 
401 401
                                                         if ($session->has('user-timezone'))
402
-                                                            if($session->get('user-timezone') === $key)
402
+                                                            if ($session->get('user-timezone') === $key)
403 403
                                                                 echo ' selected';
404 404
                                                             elseif ($session->get('user-timezone') === 'not_defined')
405 405
                                                                 if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
@@ -417,10 +417,10 @@  discard block
 block discarded – undo
417 417
                                             <select class="form-control" id="profile-user-language">
418 418
                                                 <?php
419 419
                                                     foreach ($languages as $language) {
420
-                                                        echo '<option value="' . $language['name'] . '"',
420
+                                                        echo '<option value="'.$language['name'].'"',
421 421
                                                         strtolower($session->get('user-language')) === strtolower($language['name']) ?
422 422
                                                         ' selected="selected"' : '',
423
-                                                    '>' . $language['label'] . '</option>';
423
+                                                    '>'.$language['label'].'</option>';
424 424
                                                     }
425 425
                                                 ?>
426 426
                                             </select>
@@ -433,11 +433,11 @@  discard block
 block discarded – undo
433 433
                                         <div class="col-sm-10">
434 434
                                             <select class="form-control" id="profile-user-treeloadstrategy">
435 435
                                                 
436
-                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>>
436
+                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : ''; ?>>
437 437
                                                     <?php echo $lang->get('sequential'); ?>
438 438
                                                 </option>
439 439
                                                 
440
-                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>>
440
+                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>>
441 441
                                                     <?php echo $lang->get('full'); ?>
442 442
                                                 </option>
443 443
                                             </select>
@@ -450,11 +450,11 @@  discard block
 block discarded – undo
450 450
                                         <div class="col-sm-10">
451 451
                                             <select class="form-control" id="profile-user-split_view_mode">
452 452
                                                 
453
-                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : '';?>>
453
+                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : ''; ?>>
454 454
                                                     <?php echo $lang->get('no'); ?>
455 455
                                                 </option>
456 456
                                                 
457
-                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : '';?>>
457
+                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : ''; ?>>
458 458
                                                     <?php echo $lang->get('yes'); ?>
459 459
                                                 </option>
460 460
                                             </select>
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
                                                 <?php 
473 473
                                                 }
474 474
                                                 if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
475
-                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>';
475
+                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>';
476 476
                                                 }
477 477
                                                 ?>
478 478
                                                 <div id="profile-avatar-file-container" class="hidden"></div>
Please login to merge, or discard this patch.
pages/favourites.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     || (isset($session_user_admin) && (int) $session_user_admin === 1)) {
73 73
     // Not allowed page
74 74
     $session->set('system-error_code', ERR_NOT_ALLOWED);
75
-    include $SETTINGS['cpassman_dir'] . '/error.php';
75
+    include $SETTINGS['cpassman_dir'].'/error.php';
76 76
     exit;
77 77
 }
78 78
 
@@ -125,12 +125,12 @@  discard block
 block discarded – undo
125 125
                             if (empty($fav) === false) {
126 126
                                 $data = DB::queryFirstRow(
127 127
                                     'SELECT i.label, i.description, i.id, i.id_tree, t.title
128
-                                    FROM ' . prefixTable('items') . ' as i
129
-                                    INNER JOIN ' . prefixTable('nested_tree') . ' as t ON (t.id = i.id_tree)
128
+                                    FROM ' . prefixTable('items').' as i
129
+                                    INNER JOIN ' . prefixTable('nested_tree').' as t ON (t.id = i.id_tree)
130 130
                                     WHERE i.id = %i',
131 131
                                     $fav
132 132
                                 );
133
-                                if (! empty($data['label'])) {
133
+                                if (!empty($data['label'])) {
134 134
                                     ?>
135 135
                                     <tr>
136 136
                                         <td>
Please login to merge, or discard this patch.
includes/core/login.oauth2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 use TeampassClasses\SessionManager\SessionManager;
34 34
 use TeampassClasses\ConfigManager\ConfigManager;
35 35
 
36
-require_once __DIR__. '/../../includes/config/include.php';
36
+require_once __DIR__.'/../../includes/config/include.php';
37 37
 require_once __DIR__.'/../../sources/main.functions.php';
38 38
 
39 39
 // init
Please login to merge, or discard this patch.
sources/roles.queries.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 ) {
77 77
     // Not allowed page
78 78
     $session->set('system-error_code', ERR_NOT_ALLOWED);
79
-    include $SETTINGS['cpassman_dir'] . '/error.php';
79
+    include $SETTINGS['cpassman_dir'].'/error.php';
80 80
     exit;
81 81
 }
82 82
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
                         );
462 462
 
463 463
                         // add new role to user
464
-                        $tmp = $data_tmp['fonction_id'] . (substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';' . $role_id);
464
+                        $tmp = $data_tmp['fonction_id'].(substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';'.$role_id);
465 465
                         $session->set('user-roles', str_replace(';;', ';', $tmp));
466 466
 
467 467
                         // store in DB
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
                         $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS);
650 650
                         break;
651 651
                     default:
652
-                        throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
652
+                        throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
653 653
                 }
654 654
             } catch (Exception $e) {
655 655
                 if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
             } else {
670 670
                 // Handle successful retrieval of groups
671 671
                 // exists in Teampass
672
-                foreach($groupsData['userGroups'] as $key => $group) {
672
+                foreach ($groupsData['userGroups'] as $key => $group) {
673 673
                     $role_detail = DB::queryFirstRow(
674 674
                         'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title
675 675
                         FROM '.prefixTable('ldap_groups_roles').' AS a
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
             
695 695
             // Get all groups in Teampass
696 696
             $teampassRoles = array();
697
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
697
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
698 698
             foreach ($rows as $record) {
699 699
                 array_push(
700 700
                     $teampassRoles,
Please login to merge, or discard this patch.
sources/tree.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 ) {
65 65
     // Not allowed page
66 66
     $session->set('system-error_code', ERR_NOT_ALLOWED);
67
-    include $SETTINGS['cpassman_dir'] . '/error.php';
67
+    include $SETTINGS['cpassman_dir'].'/error.php';
68 68
     exit;
69 69
 }
70 70
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 );
126 126
 
127 127
 $lastFolderChange = DB::queryFirstRow(
128
-    'SELECT valeur FROM ' . prefixTable('misc') . '
128
+    'SELECT valeur FROM '.prefixTable('misc').'
129 129
     WHERE type = %s AND intitule = %s',
130 130
     'timestamp',
131 131
     'last_folder_change'
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
         $nbItemsInSubfolders = (int) $node->nb_items_in_subfolders;
347 347
         $nbItemsInFolder = (int) $node->nb_items_in_folder;
348 348
         $nbSubfolders = (int) $node->nb_subfolders;
349
-        break;  // Get out as soon as we find a valid node.
349
+        break; // Get out as soon as we find a valid node.
350 350
     }
351 351
     
352 352
     if ($displayThisNode === true) {
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
         foreach ($currentNode->children as $child) {
459 459
             recursiveTree(
460 460
                 (int) $child,
461
-                $tree->getNode($child),// get node info for this child
461
+                $tree->getNode($child), // get node info for this child
462 462
                 /** @scrutinizer ignore-type */ $tree,
463 463
                 $listFoldersLimitedKeys,
464 464
                 $listRestrictedFoldersForItemsKeys,
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
     $lang = new Language($session->get('user-language') ?? 'english');
506 506
 
507 507
     // prepare json return for current node
508
-    $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id;
508
+    $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id;
509 509
 
510 510
     // handle displaying
511 511
     if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) {
@@ -522,17 +522,17 @@  discard block
 block discarded – undo
522 522
         array_push(
523 523
             $ret_json,
524 524
             array(
525
-                'id' => 'li_' . $nodeId,
525
+                'id' => 'li_'.$nodeId,
526 526
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
527 527
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
528 528
                 'li_attr' => array(
529 529
                     'class' => 'jstreeopen',
530
-                    'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'],
530
+                    'title' => 'ID ['.$nodeId.'] '.$nodeData['title'],
531 531
                 ),
532 532
                 'a_attr' => array(
533
-                    'id' => 'fld_' . $nodeId,
533
+                    'id' => 'fld_'.$nodeId,
534 534
                     'class' => $nodeData['folderClass'],
535
-                    'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)',
535
+                    'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)',
536 536
                     'data-title' => htmlspecialchars($currentNode->title),
537 537
                 ),
538 538
                 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0,
@@ -548,12 +548,12 @@  discard block
 block discarded – undo
548 548
         array_push(
549 549
             $ret_json,
550 550
             array(
551
-                'id' => 'li_' . $nodeId,
551
+                'id' => 'li_'.$nodeId,
552 552
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
553 553
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
554 554
                 'li_attr' => array(
555 555
                     'class' => '',
556
-                    'title' => 'ID [' . $nodeId . '] ' . $lang->get('no_access'),
556
+                    'title' => 'ID ['.$nodeId.'] '.$lang->get('no_access'),
557 557
                 ),
558 558
             )
559 559
         );
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
         if (in_array($nodeId, $session_read_only_folders) === true) {
614 614
             return [
615 615
                 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'.
616
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
616
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
617 617
                 'title' => $lang->get('read_only_account'),
618 618
                 'restricted' => 1,
619 619
                 'folderClass' => 'folder_not_droppable',
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
         ) {
629 629
             return [
630 630
                 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'.
631
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
631
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
632 632
                 'title' => $lang->get('read_only_account'),
633 633
                 'restricted' => 0,
634 634
                 'folderClass' => 'folder',
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
         }
640 640
         
641 641
         return [
642
-            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
642
+            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
643 643
             'title' => '',
644 644
             'restricted' => 0,
645 645
             'folderClass' => 'folder',
@@ -650,8 +650,8 @@  discard block
 block discarded – undo
650 650
 
651 651
     } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) {
652 652
         return [
653
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
654
-                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''),
653
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
654
+                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''),
655 655
             'title' => '',
656 656
             'restricted' => 1,
657 657
             'folderClass' => 'folder',
@@ -662,8 +662,8 @@  discard block
 block discarded – undo
662 662
 
663 663
     } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
664 664
         return [
665
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
666
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
665
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
666
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
667 667
             'title' => '',
668 668
             'restricted' => 1,
669 669
             'folderClass' => 'folder',
@@ -773,7 +773,7 @@  discard block
 block discarded – undo
773 773
     // Does this user has a tree cache
774 774
     $userCacheTree = DB::queryFirstRow(
775 775
         'SELECT data
776
-        FROM ' . prefixTable('cache_tree') . '
776
+        FROM ' . prefixTable('cache_tree').'
777 777
         WHERE user_id = %i',
778 778
         $userId
779 779
     );
Please login to merge, or discard this patch.
sources/core.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -58,16 +58,16 @@  discard block
 block discarded – undo
58 58
 {
59 59
     // Load AntiXSS
60 60
     $antiXss = new AntiXSS();
61
-    if (! headers_sent()) {    //If headers not sent yet... then do php redirect
62
-        header('Location: ' . $antiXss->xss_clean($url));
61
+    if (!headers_sent()) {    //If headers not sent yet... then do php redirect
62
+        header('Location: '.$antiXss->xss_clean($url));
63 63
     }
64 64
 
65 65
     //If headers are sent... do java redirect... if java disabled, do html redirect.
66 66
     echo '<script type="text/javascript">';
67
-    echo 'window.location.href="' . $antiXss->xss_clean($url) . '";';
67
+    echo 'window.location.href="'.$antiXss->xss_clean($url).'";';
68 68
     echo '</script>';
69 69
     echo '<noscript>';
70
-    echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />';
70
+    echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />';
71 71
     echo '</noscript>';
72 72
 }
73 73
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     && isset($SETTINGS['enable_sts']) === true
94 94
     && (int) $SETTINGS['enable_sts'] === 1
95 95
 ) {
96
-    teampassRedirect('https://' . $server['http_host'] . $server['request_uri']);
96
+    teampassRedirect('https://'.$server['http_host'].$server['request_uri']);
97 97
 }
98 98
 
99 99
 // Load pwComplexity
@@ -114,11 +114,11 @@  discard block
 block discarded – undo
114 114
 // LOAD CPASSMAN SETTINGS
115 115
 if (
116 116
     isset($SETTINGS['cpassman_dir']) === true
117
-    && is_dir($SETTINGS['cpassman_dir'] . '/install') === true
117
+    && is_dir($SETTINGS['cpassman_dir'].'/install') === true
118 118
 ) {
119 119
     // Should we delete folder INSTALL?
120 120
     $row = DB::queryFirstRow(
121
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s',
121
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s',
122 122
         'install',
123 123
         'clear_install_folder'
124 124
     );
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
136 136
             if ($directories !== false) {
137 137
                 $files = array_diff($directories, ['.', '..']);
138 138
                 foreach ($files as $file) {
139
-                    if (is_dir($dir . '/' . $file)) {
140
-                        delTree($dir . '/' . $file);
139
+                    if (is_dir($dir.'/'.$file)) {
140
+                        delTree($dir.'/'.$file);
141 141
                     } else {
142 142
                         try {
143
-                            unlink($dir . '/' . $file);
143
+                            unlink($dir.'/'.$file);
144 144
                         } catch (Exception $e) {
145 145
                             // do nothing... php will ignore and continue
146 146
                         }
@@ -154,13 +154,13 @@  discard block
 block discarded – undo
154 154
             return false;
155 155
         }
156 156
 
157
-        if (is_dir($SETTINGS['cpassman_dir'] . '/install')) {
157
+        if (is_dir($SETTINGS['cpassman_dir'].'/install')) {
158 158
             // Set the permissions on the install directory and delete
159 159
             // is server Windows or Linux?
160 160
             if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
161
-                recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440);
161
+                recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440);
162 162
             }
163
-            delTree($SETTINGS['cpassman_dir'] . '/install');
163
+            delTree($SETTINGS['cpassman_dir'].'/install');
164 164
         }
165 165
 
166 166
         // Delete temporary install table
@@ -178,10 +178,10 @@  discard block
 block discarded – undo
178 178
 // Load Languages stuff
179 179
 if (isset($languagesList) === false) {
180 180
     $languagesList = [];
181
-    $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC');
181
+    $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC');
182 182
     foreach ($rows as $record) {
183 183
         array_push($languagesList, $record['name']);
184
-        if ($session->get('user-language') === $record['name'] ) {
184
+        if ($session->get('user-language') === $record['name']) {
185 185
             $session->set('user-language_flag', $record['flag']);
186 186
             $session->set('user-language_code', $record['code']);
187 187
             //$session->set('user-language_label', $record['label']);
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 // CHECK IF SESSION EXISTS AND IF SESSION IS VALID
239 239
 if (empty($session->get('user-session_duration')) === false) {
240 240
     $dataSession = DB::queryFirstRow(
241
-        'SELECT key_tempo FROM ' . prefixTable('users') . ' WHERE id=%i',
241
+        'SELECT key_tempo FROM '.prefixTable('users').' WHERE id=%i',
242 242
         $session->get('user-id')
243 243
     );
244 244
 } else {
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
     && ($session->has('user-admin') && $session->get('user-admin') && null !== $session->get('user-admin') && $session->get('user-admin') === 1)
294 294
 ) {
295 295
     $row = DB::queryFirstRow(
296
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule',
296
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule',
297 297
         [
298 298
             'type' => 'admin',
299 299
             'intitule' => 'teampass_version',
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 
335 335
         syslog(
336 336
             LOG_WARNING,
337
-            'Unlog user: ' . date('Y/m/d H:i:s') . " {$server['remote_addr']} ({$server['http_user_agent']})"
337
+            'Unlog user: '.date('Y/m/d H:i:s')." {$server['remote_addr']} ({$server['http_user_agent']})"
338 338
         );
339 339
         // erase session table
340 340
         $session->invalidate();
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
 if ($session->has('user-timezone') && null !== $session->get('user-id') && empty($session->get('user-id')) === false) {
389 389
     // query on user
390 390
     $data = DB::queryFirstRow(
391
-        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups, auth_type, last_pw_change FROM ' . prefixTable('users') . ' WHERE id=%i',
391
+        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups, auth_type, last_pw_change FROM '.prefixTable('users').' WHERE id=%i',
392 392
         $session->get('user-id')
393 393
     );
394 394
     //Check if user has been deleted or unlogged
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
             $data['groupes_visibles'],
436 436
             $data['groupes_interdits'],
437 437
             $data['admin'],
438
-            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'] . ';' . $data['roles_from_ad_groups']),
438
+            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'].';'.$data['roles_from_ad_groups']),
439 439
             $SETTINGS
440 440
         );
441 441
         if ($session->has('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') && null !== $session->get('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') === 1) {
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
     $session->set('system-item_fields', []);
471 471
     $rows = DB::query(
472 472
         'SELECT *
473
-            FROM ' . prefixTable('categories') . '
473
+            FROM ' . prefixTable('categories').'
474 474
             WHERE level=%i',
475 475
         '0'
476 476
     );
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
         // get each field
480 480
         $rows2 = DB::query(
481 481
             'SELECT *
482
-            FROM ' . prefixTable('categories') . '
482
+            FROM ' . prefixTable('categories').'
483 483
             WHERE parent_id=%i
484 484
             ORDER BY `order` ASC',
485 485
             $record['id']
@@ -566,5 +566,5 @@  discard block
 block discarded – undo
566 566
 }
567 567
 
568 568
 /* CHECK NUMBER OF USER ONLINE */
569
-DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600);
569
+DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600);
570 570
 $session->set('system-nb_users_online', DB::count());
Please login to merge, or discard this patch.
scripts/task_maintenance_clean_orphan_objects.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -72,37 +72,37 @@
 block discarded – undo
72 72
 {
73 73
     // Delete all item keys for which no user exist
74 74
     DB::query(
75
-        'DELETE k.* FROM ' . prefixTable('sharekeys_items') . ' k
76
-        LEFT JOIN ' . prefixTable('users') . ' u ON k.user_id = u.id
75
+        'DELETE k.* FROM '.prefixTable('sharekeys_items').' k
76
+        LEFT JOIN ' . prefixTable('users').' u ON k.user_id = u.id
77 77
         WHERE u.id IS NULL OR u.deleted_at IS NOT NULL'
78 78
     );
79 79
 
80 80
     // Delete all files keys for which no item exist
81 81
     DB::query(
82
-        'DELETE k.* FROM ' . prefixTable('sharekeys_files') . ' k
83
-        LEFT JOIN ' . prefixTable('items') . ' i ON k.object_id = i.id
82
+        'DELETE k.* FROM '.prefixTable('sharekeys_files').' k
83
+        LEFT JOIN ' . prefixTable('items').' i ON k.object_id = i.id
84 84
         WHERE i.id IS NULL'
85 85
     );
86 86
 
87 87
     // Delete all fields keys for which no item exist
88 88
     DB::query(
89
-        'DELETE k.* FROM ' . prefixTable('sharekeys_fields') . ' k
90
-        LEFT JOIN ' . prefixTable('categories_items') . ' c ON k.object_id = c.id
91
-        LEFT JOIN ' . prefixTable('items') . ' i ON c.item_id = i.id
89
+        'DELETE k.* FROM '.prefixTable('sharekeys_fields').' k
90
+        LEFT JOIN ' . prefixTable('categories_items').' c ON k.object_id = c.id
91
+        LEFT JOIN ' . prefixTable('items').' i ON c.item_id = i.id
92 92
         WHERE c.id IS NULL OR i.id IS NULL'
93 93
     );
94 94
 
95 95
     // Delete all item logs for which no user exist
96 96
     DB::query(
97
-        'DELETE l.* FROM ' . prefixTable('log_items') . ' l
98
-        LEFT JOIN ' . prefixTable('items') . ' i ON l.id_item = i.id
97
+        'DELETE l.* FROM '.prefixTable('log_items').' l
98
+        LEFT JOIN ' . prefixTable('items').' i ON l.id_item = i.id
99 99
         WHERE i.id IS NULL'
100 100
     );
101 101
 
102 102
     // Delete all system logs for which no user exist
103 103
     DB::query(
104
-        'DELETE l.* FROM ' . prefixTable('log_system') . ' l
105
-        LEFT JOIN ' . prefixTable('users') . ' u ON l.qui = u.id
104
+        'DELETE l.* FROM '.prefixTable('log_system').' l
105
+        LEFT JOIN ' . prefixTable('users').' u ON l.qui = u.id
106 106
         WHERE u.id IS NULL OR u.deleted_at IS NOT NULL'
107 107
     );
108 108
 
Please login to merge, or discard this patch.
scripts/task_maintenance_purge_old_files.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 {
74 74
     global $SETTINGS;
75 75
     // Load expected files
76
-    require_once __DIR__. '/../sources/main.functions.php';
76
+    require_once __DIR__.'/../sources/main.functions.php';
77 77
     $SETTINGS = $SETTINGS ?? [];
78 78
 
79 79
     // $SETTINGS is set then read folder
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             //delete file FILES
84 84
             while (false !== ($f = readdir($dir))) {
85 85
                 if ($f !== '.' && $f !== '..' && $f !== '.htaccess') {
86
-                    $filePath = $SETTINGS['path_to_files_folder'] . '/' . $f;
86
+                    $filePath = $SETTINGS['path_to_files_folder'].'/'.$f;
87 87
                     if (file_exists($filePath) && ((time() - filectime($filePath)) > 604800)) {
88 88
                         fileDelete($filePath, $SETTINGS);
89 89
                     }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
             while (false !== ($f = readdir($dir))) {
105 105
                 if ($f !== '.' && $f !== '..') {
106 106
                     if (strpos($f, '_delete.') > 0) {
107
-                        fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS);
107
+                        fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS);
108 108
                     }
109 109
                 }
110 110
             }
Please login to merge, or discard this patch.
sources/folders.queries.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -137,14 +137,14 @@  discard block
 block discarded – undo
137 137
                     && $t->personal_folder == 0
138 138
                 ) {
139 139
                     // get $t->parent_id
140
-                    $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $t->parent_id);
140
+                    $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $t->parent_id);
141 141
                     if ($t->nlevel == 1) {
142 142
                         $data['title'] = $lang->get('root');
143 143
                     }
144 144
 
145 145
                     // get rights on this folder
146 146
                     $arrayRights = array();
147
-                    $rows = DB::query('SELECT fonction_id  FROM ' . prefixTable('rights') . ' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
147
+                    $rows = DB::query('SELECT fonction_id  FROM '.prefixTable('rights').' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
148 148
                     foreach ($rows as $record) {
149 149
                         array_push($arrayRights, $record['fonction_id']);
150 150
                     }
@@ -162,8 +162,8 @@  discard block
 block discarded – undo
162 162
                         'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period,
163 163
                         n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification,
164 164
                         n.fa_icon AS fa_icon, n.fa_icon_selected AS fa_icon_selected
165
-                        FROM ' . prefixTable('misc') . ' AS m,
166
-                        ' . prefixTable('nested_tree') . ' AS n
165
+                        FROM ' . prefixTable('misc').' AS m,
166
+                        ' . prefixTable('nested_tree').' AS n
167 167
                         WHERE m.type=%s AND m.intitule = n.id AND m.intitule = %i',
168 168
                         'complex',
169 169
                         $t->id
@@ -191,16 +191,16 @@  discard block
 block discarded – undo
191 191
                         $arrayColumns['folderComplexity'] = '';
192 192
                     }
193 193
 
194
-                    if (is_null($node_data)=== false) {
194
+                    if (is_null($node_data) === false) {
195 195
                         $arrayColumns['renewalPeriod'] = (int) $node_data['renewal_period'];
196 196
                     } else {
197
-                        $arrayColumns['renewalPeriod']=0;
197
+                        $arrayColumns['renewalPeriod'] = 0;
198 198
                     }
199 199
 
200 200
                     //col7
201 201
                     $data7 = DB::queryFirstRow(
202 202
                         'SELECT bloquer_creation,bloquer_modification
203
-                        FROM ' . prefixTable('nested_tree') . '
203
+                        FROM ' . prefixTable('nested_tree').'
204 204
                         WHERE id = %i',
205 205
                         intval($t->id)
206 206
                     );
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
             // Get info about this folder
359 359
             $dataFolder = DB::queryFirstRow(
360 360
                 'SELECT *
361
-                FROM ' . prefixTable('nested_tree') . '
361
+                FROM ' . prefixTable('nested_tree').'
362 362
                 WHERE id = %i',
363 363
                 $inputData['id']
364 364
             );
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
             //check if parent folder is personal
395 395
             $dataParent = DB::queryFirstRow(
396 396
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
397
-                FROM ' . prefixTable('nested_tree') . '
397
+                FROM ' . prefixTable('nested_tree').'
398 398
                 WHERE id = %i',
399 399
                 $inputData['parentId']
400 400
             );
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
                     // get complexity level for this folder
424 424
                     $data = DB::queryFirstRow(
425 425
                         'SELECT valeur
426
-                        FROM ' . prefixTable('misc') . '
426
+                        FROM ' . prefixTable('misc').'
427 427
                         WHERE intitule = %i AND type = %s',
428 428
                         $inputData['parentId'],
429 429
                         'complex'
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
                             array(
435 435
                                 'error' => true,
436 436
                                 'message' => $lang->get('error_folder_complexity_lower_than_top_folder')
437
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
437
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
438 438
                             ),
439 439
                             'encode'
440 440
                         );
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
             // Check if parent folder is personal
595 595
             $dataParent = DB::queryFirstRow(
596 596
                 'SELECT personal_folder
597
-                FROM ' . prefixTable('nested_tree') . '
597
+                FROM ' . prefixTable('nested_tree').'
598 598
                 WHERE id = %i',
599 599
                 $inputData['parentId']
600 600
             );
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
             echo prepareExchangedData(
635 635
                 array(
636 636
                     'error' => $creationStatus['error'],
637
-                    'message' => $creationStatus['error'] === true ? $lang->get('error_not_allowed_to') : $lang->get('folder_created') ,
637
+                    'message' => $creationStatus['error'] === true ? $lang->get('error_not_allowed_to') : $lang->get('folder_created'),
638 638
                     'newId' => $creationStatus['newId'],
639 639
                 ),
640 640
                 'encode'
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
                 echo prepareExchangedData(
683 683
                     array(
684 684
                         'error' => true,
685
-                        'message' => $lang->get('error_not_allowed_to'). " (You can't delete the root folder)",
685
+                        'message' => $lang->get('error_not_allowed_to')." (You can't delete the root folder)",
686 686
                     ),
687 687
                     'encode'
688 688
                 );
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
             // Ensure that user has access to all folders
693 693
             $foldersAccessible = DB::query(
694 694
                 'SELECT id
695
-                FROM ' . prefixTable('nested_tree') . '
695
+                FROM ' . prefixTable('nested_tree').'
696 696
                 WHERE id IN %li AND id IN %li',
697 697
                 $post_folders,
698 698
                 $session->get('user-accessible_folders')
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
                 echo prepareExchangedData(
707 707
                     array(
708 708
                         'error' => true,
709
-                        'message' => $lang->get('error_not_allowed_to') . ' (The following folders are not accessible or do not exist: ' . implode(', ', $missingFolders) . ')',
709
+                        'message' => $lang->get('error_not_allowed_to').' (The following folders are not accessible or do not exist: '.implode(', ', $missingFolders).')',
710 710
                     ),
711 711
                     'encode'
712 712
                 );
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
                 // Check if parent folder is personal
724 724
                 $dataParent = DB::queryFirstRow(
725 725
                     'SELECT personal_folder
726
-                    FROM ' . prefixTable('nested_tree') . '
726
+                    FROM ' . prefixTable('nested_tree').'
727 727
                     WHERE id = %i',
728 728
                     $folderId
729 729
                 );
@@ -769,10 +769,10 @@  discard block
 block discarded – undo
769 769
                                 prefixTable('misc'),
770 770
                                 array(
771 771
                                     'type' => 'folder_deleted',
772
-                                    'intitule' => 'f' . $thisSubFolders->id,
773
-                                    'valeur' => $thisSubFolders->id . ', ' . $thisSubFolders->parent_id . ', ' .
774
-                                        $thisSubFolders->title . ', ' . $thisSubFolders->nleft . ', ' . $thisSubFolders->nright . ', ' .
775
-                                        $thisSubFolders->nlevel . ', 0, 0, 0, 0',
772
+                                    'intitule' => 'f'.$thisSubFolders->id,
773
+                                    'valeur' => $thisSubFolders->id.', '.$thisSubFolders->parent_id.', '.
774
+                                        $thisSubFolders->title.', '.$thisSubFolders->nleft.', '.$thisSubFolders->nright.', '.
775
+                                        $thisSubFolders->nlevel.', 0, 0, 0, 0',
776 776
                                     'created_at' => time(),
777 777
                                 )
778 778
                             );
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 
782 782
                             //delete items & logs
783 783
                             $itemsInSubFolder = DB::query(
784
-                                'SELECT id FROM ' . prefixTable('items') . ' 
784
+                                'SELECT id FROM '.prefixTable('items').' 
785 785
                                 WHERE id_tree=%i', 
786 786
                                 $thisSubFolders->id
787 787
                             );
@@ -811,7 +811,7 @@  discard block
 block discarded – undo
811 811
                                 }
812 812
 
813 813
                                 //Update CACHE table
814
-                                updateCacheTable('delete_value',(int) $item['id']);
814
+                                updateCacheTable('delete_value', (int) $item['id']);
815 815
                             }
816 816
 
817 817
                             //Actualize the variable
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
921 921
             // Check if target parent folder is personal
922 922
             $dataParent = DB::queryFirstRow(
923 923
                 'SELECT personal_folder
924
-                FROM ' . prefixTable('nested_tree') . '
924
+                FROM ' . prefixTable('nested_tree').'
925 925
                 WHERE id = %i',
926 926
                 $post_target_folder_id
927 927
             );
@@ -975,7 +975,7 @@  discard block
 block discarded – undo
975 975
                 // get complexity of current node
976 976
                 $nodeComplexity = DB::queryFirstRow(
977 977
                     'SELECT valeur
978
-                    FROM ' . prefixTable('misc') . '
978
+                    FROM ' . prefixTable('misc').'
979 979
                     WHERE intitule = %i AND type= %s',
980 980
                     $nodeInfo->id,
981 981
                     'complex'
@@ -1052,7 +1052,7 @@  discard block
 block discarded – undo
1052 1052
                 // If it is a subfolder, then give access to it for all roles that allows the parent folder
1053 1053
                 $rows = DB::query(
1054 1054
                     'SELECT role_id, type
1055
-                    FROM ' . prefixTable('roles_values') . '
1055
+                    FROM ' . prefixTable('roles_values').'
1056 1056
                     WHERE folder_id = %i',
1057 1057
                     $parentId
1058 1058
                 );
@@ -1071,7 +1071,7 @@  discard block
 block discarded – undo
1071 1071
                 // if parent folder has Custom Fields Categories then add to this child one too
1072 1072
                 $rows = DB::query(
1073 1073
                     'SELECT id_category
1074
-                    FROM ' . prefixTable('categories_folders') . '
1074
+                    FROM ' . prefixTable('categories_folders').'
1075 1075
                     WHERE id_folder = %i',
1076 1076
                     $nodeInfo->id
1077 1077
                 );
@@ -1090,7 +1090,7 @@  discard block
 block discarded – undo
1090 1090
 
1091 1091
                 $rows = DB::query(
1092 1092
                     'SELECT *
1093
-                    FROM ' . prefixTable('items') . '
1093
+                    FROM ' . prefixTable('items').'
1094 1094
                     WHERE id_tree = %i',
1095 1095
                     $nodeInfo->id
1096 1096
                 );
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
                     // if it is then don't copy it
1100 1100
                     $item_deleted = DB::queryFirstRow(
1101 1101
                         'SELECT *
1102
-                        FROM ' . prefixTable('log_items') . '
1102
+                        FROM ' . prefixTable('log_items').'
1103 1103
                         WHERE id_item = %i AND action = %s
1104 1104
                         ORDER BY date DESC
1105 1105
                         LIMIT 0, 1',
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
1110 1110
 
1111 1111
                     $item_restored = DB::queryFirstRow(
1112 1112
                         'SELECT *
1113
-                        FROM ' . prefixTable('log_items') . '
1113
+                        FROM ' . prefixTable('log_items').'
1114 1114
                         WHERE id_item = %i AND action = %s
1115 1115
                         ORDER BY date DESC
1116 1116
                         LIMIT 0, 1',
@@ -1125,7 +1125,7 @@  discard block
 block discarded – undo
1125 1125
                         // Get the ITEM object key for the user
1126 1126
                         $userKey = DB::queryFirstRow(
1127 1127
                             'SELECT share_key
1128
-                            FROM ' . prefixTable('sharekeys_items') . '
1128
+                            FROM ' . prefixTable('sharekeys_items').'
1129 1129
                             WHERE user_id = %i AND object_id = %i',
1130 1130
                             $session->get('user-id'),
1131 1131
                             $record['id']
@@ -1287,7 +1287,7 @@  discard block
 block discarded – undo
1287 1287
                     // Get path
1288 1288
                     $text = '';
1289 1289
                     foreach ($tree->getPath($folder->id, false) as $fld) {
1290
-                        $text .= empty($text) === true ? '     [<i>' . $fld->title : ' > ' . $fld->title;
1290
+                        $text .= empty($text) === true ? '     [<i>'.$fld->title : ' > '.$fld->title;
1291 1291
                     }
1292 1292
 
1293 1293
                     // Save array
@@ -1297,7 +1297,7 @@  discard block
 block discarded – undo
1297 1297
                             'id' => (int) $folder->id,
1298 1298
                             'label' => $folder->title,
1299 1299
                             'level' => $folder->nlevel,
1300
-                            'path' => empty($text) === true ? '' : $text . '</i>]'
1300
+                            'path' => empty($text) === true ? '' : $text.'</i>]'
1301 1301
                         )
1302 1302
                     );
1303 1303
                 }
Please login to merge, or discard this patch.