Passed
Pull Request — master (#4585)
by Nils
05:48
created
pages/items.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('items') === false) {
70 70
     // Not allowed page
71 71
     $session->set('system-error_code', ERR_NOT_ALLOWED);
72
-    include $SETTINGS['cpassman_dir'] . '/error.php';
72
+    include $SETTINGS['cpassman_dir'].'/error.php';
73 73
     exit;
74 74
 }
75 75
 // Define Timezone
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
 // Get list of users
92 92
 $usersList = [];
93
-$rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
93
+$rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
94 94
 foreach ($rows as $record) {
95 95
     $usersList[$record['login']] = [
96 96
         'id' => $record['id'],
@@ -101,16 +101,16 @@  discard block
 block discarded – undo
101 101
 // Get list of roles
102 102
 $arrRoles = [];
103 103
 $listRoles = '';
104
-$rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
104
+$rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
105 105
 foreach ($rows as $reccord) {
106 106
     $arrRoles[$reccord['title']] = [
107 107
         'id' => $reccord['id'],
108 108
         'title' => $reccord['title'],
109 109
     ];
110 110
     if (empty($listRoles)) {
111
-        $listRoles = $reccord['id'] . '#' . $reccord['title'];
111
+        $listRoles = $reccord['id'].'#'.$reccord['title'];
112 112
     } else {
113
-        $listRoles .= ';' . $reccord['id'] . '#' . $reccord['title'];
113
+        $listRoles .= ';'.$reccord['id'].'#'.$reccord['title'];
114 114
     }
115 115
 }
116 116
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
                         <li class="nav-item"><a class="nav-link" href="#tab_3" data-toggle="tab"><i class="fa-solid fa-archive mr-2"></i><?php echo $lang->get('attachments'); ?></a></li>
186 186
                         <?php
187 187
                         echo isset($SETTINGS['item_extra_fields']) === true && (int) $SETTINGS['item_extra_fields'] === 1 ? '
188
-                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields') . '</a></li>' : '';
188
+                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields').'</a></li>' : '';
189 189
                         ?>
190 190
                     </ul>
191 191
                 </div><!-- /.card-header -->
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
                                                 <?php
255 255
                                                 for ($i = 4; $i <= $SETTINGS['pwd_maximum_length']; ++$i) {
256 256
                                                     echo '
257
-                                                <option>' . $i . '</option>';
257
+                                                <option>' . $i.'</option>';
258 258
                                                 }
259 259
                                                 ?>
260 260
                                             </select>
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
                                     <span class="ml-2 col-md-1 clear-me-html" id="form-item-icon-show"></span>
285 285
                                 </div>
286 286
                                 <small class='form-text text-muted'>
287
-                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
287
+                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
288 288
                                 </small>
289 289
                             </div>
290 290
 
@@ -472,39 +472,39 @@  discard block
 block discarded – undo
472 472
                             <div class="tab-pane" id="tab_4">
473 473
                                 <div id="form-item-field" class="hidden">
474 474
                                     <?php
475
-                                        $session_item_fields = $session->get('system-item_fields');//print_r($session_item_fields);
475
+                                        $session_item_fields = $session->get('system-item_fields'); //print_r($session_item_fields);
476 476
                                         if (isset($session_item_fields) === true) {
477 477
                                             foreach ($session_item_fields as $category) {
478 478
                                                 //print_r($category);
479 479
                                                 echo '
480
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
481
-                                                <h5>' . $category['title'] . '</h5>
480
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
481
+                                                <h5>' . $category['title'].'</h5>
482 482
                                                 <p>';
483 483
                                                 foreach ($category['fields'] as $field) {
484 484
                                                     if ($field['type'] === 'textarea') {
485 485
                                                         echo '
486
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
486
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
487 487
                                                         <label>' . $field['title'],
488 488
                                                             $field['is_mandatory'] === '1' ?
489
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
489
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
490 490
                                                             '</label>
491
-                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0"></textarea>
491
+                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0"></textarea>
492 492
                                                     </div>';
493 493
                                                     } else {
494 494
                                                         echo '
495
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
495
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
496 496
                                                         <div class="input-group-prepend">
497 497
                                                             <span class="input-group-text">' . $field['title'],
498 498
                                                             $field['is_mandatory'] === '1' ?
499
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
499
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
500 500
                                                             '</span>
501 501
                                                         </div>
502
-                                                        <input type="' . $field['type'] . '" class="form-control form-item-control form-item-field-custom" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0">
502
+                                                        <input type="' . $field['type'].'" class="form-control form-item-control form-item-field-custom" data-field-name="'.$field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0">
503 503
                                                     </div>';
504 504
                                                     }
505 505
                                                     if (!empty($field['regex'])) {
506 506
                                                         echo '
507
-                                                    <div>Regex: '. $field['regex'] .'</div>
507
+                                                    <div>Regex: '. $field['regex'].'</div>
508 508
                                                         ';
509 509
                                                     }
510 510
                                                 }
@@ -515,8 +515,8 @@  discard block
 block discarded – undo
515 515
                                                 ) {
516 516
                                                     echo '
517 517
                                                     <div class="form-check icheck-blue">
518
-                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'] . '" data-change-ongoing="0" data-field-name="template" id="template_' . $category['id'] . '">
519
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . $lang->get('main_template') . '</label>
518
+                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'].'" data-change-ongoing="0" data-field-name="template" id="template_'.$category['id'].'">
519
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.$lang->get('main_template').'</label>
520 520
                                                     </div>';
521 521
                                                 }
522 522
                                                 echo '
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
526 526
                                         } else {
527 527
                                             echo
528 528
                                             '<div class="alert alert-info">
529
-                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information') . '</h5>
530
-                                                ' . $lang->get('no_fields') . '
529
+                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information').'</h5>
530
+                                                ' . $lang->get('no_fields').'
531 531
                                             </div>';
532 532
                                         } ?>
533 533
                                 </div>
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
                         <p><?php
669 669
                             echo str_replace(
670 670
         ['##otv_expiration_period##', '. '],
671
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
671
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
672 672
         $lang->get('otv_message')
673 673
     );
674 674
                             ?></p>
@@ -686,9 +686,9 @@  discard block
 block discarded – undo
686 686
 
687 687
                     <div class="row">
688 688
                         <div class="form-group col-4">
689
-                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period'];?>)</label>
689
+                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period']; ?>)</label>
690 690
                             <div class="input-group mb-3">
691
-                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period'];?>" value="<?php echo $SETTINGS['otv_expiration_period'];?>">
691
+                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period']; ?>" value="<?php echo $SETTINGS['otv_expiration_period']; ?>">
692 692
                             </div>
693 693
                         </div>
694 694
 
@@ -776,7 +776,7 @@  discard block
 block discarded – undo
776 776
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
777 777
                                 <?php
778 778
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
779
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
779
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
780 780
                                 }
781 781
                                 ?>
782 782
                             </select>
@@ -794,14 +794,14 @@  discard block
 block discarded – undo
794 794
                             <label><?php echo $lang->get('icon'); ?></label>
795 795
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon">
796 796
                             <small class='form-text text-muted'>
797
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
797
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
798 798
                             </small>
799 799
                         </div>
800 800
                         <div class="form-group">
801 801
                             <label><?php echo $lang->get('icon_on_selection'); ?></label>
802 802
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon-selected">
803 803
                             <small class='form-text text-muted'>
804
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
804
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
805 805
                             </small>
806 806
                         </div>
807 807
                     </div>
@@ -1212,18 +1212,18 @@  discard block
 block discarded – undo
1212 1212
                                 <?php
1213 1213
                                     foreach ($session_item_fields as $elem) {
1214 1214
                                         echo '
1215
-                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
1216
-                                    <h5>' . $elem['title'] . '</h5>
1215
+                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
1216
+                                    <h5>' . $elem['title'].'</h5>
1217 1217
                                     <p>
1218 1218
                                         <ul class="list-group list-group-unbordered mb-3">';
1219 1219
                                         foreach ($elem['fields'] as $field) {
1220 1220
                                             echo '
1221
-                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
1222
-                                                <span id="card-item-field-title-' . $field['id'] . '"><b>' . $field['title'] . '</b></span>
1223
-                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'] . '">
1221
+                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
1222
+                                                <span id="card-item-field-title-' . $field['id'].'"><b>'.$field['title'].'</b></span>
1223
+                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'].'">
1224 1224
                                                     <i class="fa-solid fa-copy"></i>
1225 1225
                                                 </button>
1226
-                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
1226
+                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
1227 1227
                                             </li>';
1228 1228
                                         }
1229 1229
                                         echo '
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +180 added lines, -180 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 csrfProtector::init();
74 74
 
75 75
 // Load functions
76
-require_once __DIR__. '/includes/config/include.php';
76
+require_once __DIR__.'/includes/config/include.php';
77 77
 require_once __DIR__.'/sources/main.functions.php';
78 78
 
79 79
 // init
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 $SETTINGS = $antiXss->xss_clean($SETTINGS);
108 108
 
109 109
 // Load Core library
110
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
110
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
111 111
 // Prepare POST variables
112 112
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
113 113
 $session_user_language = $session->get('user-language');
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
146 146
     //get default language
147 147
     $dataLanguage = DB::queryFirstRow(
148 148
         'SELECT m.valeur AS valeur, l.flag AS flag
149
-        FROM ' . prefixTable('misc') . ' AS m
150
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
149
+        FROM ' . prefixTable('misc').' AS m
150
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
151 151
         WHERE m.type=%s_type AND m.intitule=%s_intitule',
152 152
         [
153 153
             'type' => 'admin',
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         $session_user_language = $SETTINGS['default_language'];
179 179
     }
180 180
 }
181
-$lang = new Language($session_user_language, __DIR__. '/includes/language/'); 
181
+$lang = new Language($session_user_language, __DIR__.'/includes/language/'); 
182 182
 
183 183
 if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') {
184 184
     $SETTINGS['cpassman_dir'] = __DIR__;
@@ -252,29 +252,29 @@  discard block
 block discarded – undo
252 252
     </script>
253 253
 
254 254
     <!-- IonIcons -->
255
-    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
255
+    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
256 256
     <!-- Theme style -->
257
-    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
258
-    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
259
-    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
260
-    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
257
+    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
258
+    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
259
+    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
260
+    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
261 261
     <!-- Theme style -->
262
-    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
262
+    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
263 263
     <!-- Google Font: Source Sans Pro -->
264
-    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
264
+    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
265 265
     <!-- Altertify -->
266
-    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
267
-    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
266
+    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
267
+    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
268 268
     <!-- Toastr -->
269
-    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
269
+    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
270 270
     <!-- favicon -->
271
-    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon;?>"/>
271
+    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/>
272 272
     <!-- manifest (PWA) -->
273
-    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
273
+    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
274 274
     <!-- Custom style -->
275 275
     <?php
276
-    if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?>
277
-        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
276
+    if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?>
277
+        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
278 278
     <?php
279 279
     } ?>
280 280
 </head>
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
                         <div class="dropdown show">
322 322
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
323 323
                                 <?php
324
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
324
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
325 325
                             </a>
326 326
 
327 327
                             <div class="dropdown-menu dropdown-menu-right">
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
                                     </a>
346 346
                                 <?php
347 347
                                     } ?>
348
-                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys">
348
+                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys">
349 349
                                     <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?>
350 350
                                 </a>
351 351
 
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
             <!-- Main Sidebar Container -->
380 380
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
381 381
                 <!-- Brand Logo -->
382
-                <a href="<?php echo $cpassman_url . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
382
+                <a href="<?php echo $cpassman_url.'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
383 383
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
384 384
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
385 385
                 </a>
@@ -397,20 +397,20 @@  discard block
 block discarded – undo
397 397
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
398 398
                         <i class="nav-icon fa-solid fa-key"></i>
399 399
                         <p>
400
-                            ' . $lang->get('pw') . '
400
+                            ' . $lang->get('pw').'
401 401
                         </p>
402 402
                         </a>
403 403
                     </li>';
404 404
                                 }
405 405
 
406 406
     // IMPORT menu
407
-    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1&& $session_user_admin === 0) {
407
+    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1 && $session_user_admin === 0) {
408 408
         echo '
409 409
                     <li class="nav-item">
410 410
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
411 411
                         <i class="nav-icon fa-solid fa-file-import"></i>
412 412
                         <p>
413
-                            ' . $lang->get('import') . '
413
+                            ' . $lang->get('import').'
414 414
                         </p>
415 415
                         </a>
416 416
                     </li>';
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
432 432
                         <i class="nav-icon fa-solid fa-file-export"></i>
433 433
                         <p>
434
-                            ' . $lang->get('export') . '
434
+                            ' . $lang->get('export').'
435 435
                         </p>
436 436
                         </a>
437 437
                     </li>';
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
459 459
                         <i class="nav-icon fa-solid fa-search"></i>
460 460
                         <p>
461
-                            ' . $lang->get('find') . '
461
+                            ' . $lang->get('find').'
462 462
                         </p>
463 463
                         </a>
464 464
                     </li>';
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'favourites' ? ' active' : '', '">
475 475
                         <i class="nav-icon fa-solid fa-star"></i>
476 476
                         <p>
477
-                            ' . $lang->get('favorites') . '
477
+                            ' . $lang->get('favorites').'
478 478
                         </p>
479 479
                         </a>
480 480
                     </li>';
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
505 505
                         <i class="nav-icon fa-solid fa-lightbulb"></i>
506 506
                         <p>
507
-                            ' . $lang->get('suggestion_menu') . '
507
+                            ' . $lang->get('suggestion_menu').'
508 508
                         </p>
509 509
                         </a>
510 510
                     </li>';
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
518 518
                         <i class="nav-icon fa-solid fa-info"></i>
519 519
                         <p>
520
-                            ' . $lang->get('admin_main') . '
520
+                            ' . $lang->get('admin_main').'
521 521
                         </p>
522 522
                         </a>
523 523
                     </li>
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
                         <a href="#" class="nav-link">
526 526
                             <i class="nav-icon fa-solid fa-wrench"></i>
527 527
                             <p>
528
-                                ' . $lang->get('admin_settings') . '
528
+                                ' . $lang->get('admin_settings').'
529 529
                                 <i class="fa-solid fa-angle-left right"></i>
530 530
                             </p>
531 531
                         </a>
@@ -533,63 +533,63 @@  discard block
 block discarded – undo
533 533
                             <li class="nav-item">
534 534
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
535 535
                                     <i class="fa-solid fa-check-double nav-icon"></i>
536
-                                    <p>' . $lang->get('options') . '</p>
536
+                                    <p>' . $lang->get('options').'</p>
537 537
                                 </a>
538 538
                             </li>
539 539
                             <li class="nav-item">
540 540
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
541 541
                                     <i class="fa-solid fa-qrcode nav-icon"></i>
542
-                                    <p>' . $lang->get('mfa_short') . '</p>
542
+                                    <p>' . $lang->get('mfa_short').'</p>
543 543
                                 </a>
544 544
                             </li>
545 545
                             <li class="nav-item">
546 546
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
547 547
                                     <i class="fa-solid fa-cubes nav-icon"></i>
548
-                                    <p>' . $lang->get('api') . '</p>
548
+                                    <p>' . $lang->get('api').'</p>
549 549
                                 </a>
550 550
                             </li>
551 551
                             <li class="nav-item">
552 552
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
553 553
                                     <i class="fa-solid fa-database nav-icon"></i>
554
-                                    <p>' . $lang->get('backups') . '</p>
554
+                                    <p>' . $lang->get('backups').'</p>
555 555
                                 </a>
556 556
                             </li>
557 557
                             <li class="nav-item">
558 558
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
559 559
                                     <i class="fa-solid fa-envelope nav-icon"></i>
560
-                                    <p>' . $lang->get('emails') . '</p>
560
+                                    <p>' . $lang->get('emails').'</p>
561 561
                                 </a>
562 562
                             </li>
563 563
                             <li class="nav-item">
564 564
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
565 565
                                     <i class="fa-solid fa-keyboard nav-icon"></i>
566
-                                    <p>' . $lang->get('fields') . '</p>
566
+                                    <p>' . $lang->get('fields').'</p>
567 567
                                 </a>
568 568
                             </li>
569 569
                             <li class="nav-item">
570 570
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
571 571
                                     <i class="fa-solid fa-id-card nav-icon"></i>
572
-                                    <p>' . $lang->get('ldap') . '</p>
572
+                                    <p>' . $lang->get('ldap').'</p>
573 573
                                 </a>
574 574
                             </li>
575 575
 
576 576
                             <li class="nav-item">
577 577
                                 <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '">
578 578
                                     <i class="fa-solid fa-plug nav-icon"></i>
579
-                                    <p>' . $lang->get('oauth') . '</p>
579
+                                    <p>' . $lang->get('oauth').'</p>
580 580
                                 </a>
581 581
                             </li>
582 582
                             
583 583
                             <li class="nav-item">
584 584
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
585 585
                                     <i class="fa-solid fa-file-upload nav-icon"></i>
586
-                                    <p>' . $lang->get('uploads') . '</p>
586
+                                    <p>' . $lang->get('uploads').'</p>
587 587
                                 </a>
588 588
                             </li>
589 589
                             <li class="nav-item">
590 590
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
591 591
                                     <i class="fa-solid fa-chart-bar nav-icon"></i>
592
-                                    <p>' . $lang->get('statistics') . '</p>
592
+                                    <p>' . $lang->get('statistics').'</p>
593 593
                                 </a>
594 594
                             </li>
595 595
                         </ul>
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
                     <li class="nav-item">
601 601
                         <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '">
602 602
                         <i class="fa-solid fa-tasks nav-icon"></i>
603
-                        <p>' . $lang->get('tasks') . '</p>
603
+                        <p>' . $lang->get('tasks').'</p>
604 604
                         </a>
605 605
                     </li>';
606 606
         }
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
                         <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '">
612 612
                         <i class="nav-icon fa-solid fa-screwdriver-wrench"></i>
613 613
                         <p>
614
-                            ' . $lang->get('tools') . '
614
+                            ' . $lang->get('tools').'
615 615
                         </p>
616 616
                         </a>
617 617
                     </li>';
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
629 629
                         <i class="nav-icon fa-solid fa-folder-open"></i>
630 630
                         <p>
631
-                            ' . $lang->get('folders') . '
631
+                            ' . $lang->get('folders').'
632 632
                         </p>
633 633
                         </a>
634 634
                     </li>
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
637 637
                         <i class="nav-icon fa-solid fa-graduation-cap"></i>
638 638
                         <p>
639
-                            ' . $lang->get('roles') . '
639
+                            ' . $lang->get('roles').'
640 640
                         </p>
641 641
                         </a>
642 642
                     </li>
@@ -644,38 +644,38 @@  discard block
 block discarded – undo
644 644
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
645 645
                         <i class="nav-icon fa-solid fa-users"></i>
646 646
                         <p>
647
-                            ' . $lang->get('users') . '
647
+                            ' . $lang->get('users').'
648 648
                         </p>
649 649
                         </a>
650 650
                     </li>
651 651
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
652 652
                         <a href="#" class="nav-link">
653 653
                         <i class="nav-icon fa-solid fa-cubes"></i>
654
-                        <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p>
654
+                        <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p>
655 655
                         </a>
656 656
                         <ul class="nav nav-treeview">
657 657
                             <li class="nav-item">
658 658
                                 <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
659 659
                                 <i class="far fa-calendar-alt nav-icon"></i>
660
-                                <p>' . $lang->get('renewal') . '</p>
660
+                                <p>' . $lang->get('renewal').'</p>
661 661
                                 </a>
662 662
                             </li>
663 663
                             <li class="nav-item">
664 664
                                 <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
665 665
                                 <i class="fa-solid fa-trash-alt nav-icon"></i>
666
-                                <p>' . $lang->get('deletion') . '</p>
666
+                                <p>' . $lang->get('deletion').'</p>
667 667
                                 </a>
668 668
                             </li>
669 669
                             <li class="nav-item">
670 670
                                 <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
671 671
                                 <i class="fa-solid fa-history nav-icon"></i>
672
-                                <p>' . $lang->get('logs') . '</p>
672
+                                <p>' . $lang->get('logs').'</p>
673 673
                                 </a>
674 674
                             </li>
675 675
                             <li class="nav-item">
676 676
                                 <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
677 677
                                 <i class="fa-solid fa-database nav-icon"></i>
678
-                                <p>' . $lang->get('database') . '</p>
678
+                                <p>' . $lang->get('database').'</p>
679 679
                                 </a>
680 680
                             </li>
681 681
                         </ul>
@@ -686,10 +686,10 @@  discard block
 block discarded – undo
686 686
                     <!-- /.sidebar-menu -->
687 687
                 <div class="menu-footer">
688 688
                     <div class="" id="sidebar-footer">
689
-                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time') . ' ' .
690
-                            date($date_format, (int) $server['request_time']) . ' - ' .
689
+                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time').' '.
690
+                            date($date_format, (int) $server['request_time']).' - '.
691 691
                             date($time_format, (int) $server['request_time']), ENT_QUOTES, 'UTF-8'); ?>"></i>
692
-                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i>
692
+                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i>
693 693
                         <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo $lang->get('documentation_canal'); ?>"></i></a>
694 694
                         <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo $lang->get('admin_help'); ?>"></i></a>
695 695
                         <?php if ($session_user_admin === 1) : ?><i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo $lang->get('bugs_page'); ?>" onclick="generateBugReport()"></i><?php endif; ?>
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
840 840
                                 </div>
841 841
                                 <div class="mt-3">                                    
842 842
                                     <label>
843
-                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password');?></span>
843
+                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password'); ?></span>
844 844
                                         <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer">
845 845
                                     </label>
846 846
                                 </div>
@@ -1007,34 +1007,34 @@  discard block
 block discarded – undo
1007 1007
                     if ($get['page'] === 'items') {
1008 1008
                         // SHow page with Items
1009 1009
                         if ((int) $session_user_admin !== 1) {
1010
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
1010
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
1011 1011
                         } elseif ((int) $session_user_admin === 1) {
1012
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
1012
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
1013 1013
                         } else {
1014 1014
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
1015 1015
                             //not allowed page
1016
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
1016
+                            include $SETTINGS['cpassman_dir'].'/error.php';
1017 1017
                         }
1018 1018
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
1019 1019
                         // Define if user is allowed to see management pages
1020 1020
                         if ($session_user_admin === 1) {
1021 1021
                             // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow
1022
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]);
1022
+                            include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]);
1023 1023
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
1024 1024
                             if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings'
1025 1025
                             ) {
1026 1026
                                 $session->set('system-error_code', ERR_NOT_ALLOWED);
1027 1027
                                 //not allowed page
1028
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
1028
+                                include $SETTINGS['cpassman_dir'].'/error.php';
1029 1029
                             }
1030 1030
                         } else {
1031 1031
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
1032 1032
                             //not allowed page
1033
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
1033
+                            include $SETTINGS['cpassman_dir'].'/error.php';
1034 1034
                         }
1035
-                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) {
1035
+                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) {
1036 1036
                         // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below
1037
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php');
1037
+                        include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php');
1038 1038
                     } else {
1039 1039
                         $session->set('system-array_roles', ERR_NOT_EXIST);
1040 1040
                         //page doesn't exist
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
             <footer class="main-footer">
1064 1064
                 <!-- To the right -->
1065 1065
                 <div class="float-right d-none d-sm-inline">
1066
-                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>
1066
+                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>
1067 1067
                 </div>
1068 1068
                 <!-- Default to the left -->
1069 1069
                 <strong>Copyright &copy; <?php echo TP_COPYRIGHT; ?> <a href="<?php echo TEAMPASS_URL; ?>"><?php echo TP_TOOL_NAME; ?></a>.</strong> All rights reserved.
@@ -1077,7 +1077,7 @@  discard block
 block discarded – undo
1077 1077
         echo '
1078 1078
 <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />';
1079 1079
 // display an item in the context of OTV link
1080
-} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
1080
+} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
1081 1081
     && empty($get['otv']) === false
1082 1082
 ) {
1083 1083
     // case where one-shot viewer
@@ -1096,7 +1096,7 @@  discard block
 block discarded – undo
1096 1096
                 FILTER_SANITIZE_URL
1097 1097
             )
1098 1098
         );
1099
-        include $SETTINGS['cpassman_dir'] . '/error.php';
1099
+        include $SETTINGS['cpassman_dir'].'/error.php';
1100 1100
     }
1101 1101
 } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) ||
1102 1102
         empty($session->get('user-id')) === true
@@ -1121,7 +1121,7 @@  discard block
 block discarded – undo
1121 1121
     }
1122 1122
     
1123 1123
     // LOGIN form  
1124
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
1124
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
1125 1125
     
1126 1126
 } else {
1127 1127
     // Clear session
@@ -1154,153 +1154,153 @@  discard block
 block discarded – undo
1154 1154
     <!-- REQUIRED SCRIPTS -->
1155 1155
 
1156 1156
     <!-- Font Awesome Icons -->
1157
-    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1158
-    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1159
-    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1160
-    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1161
-    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
1157
+    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1158
+    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1159
+    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1160
+    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1161
+    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
1162 1162
     <!-- jQuery -->
1163
-    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1164
-    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1163
+    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1164
+    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1165 1165
     <!-- jQuery UI -->
1166
-    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1167
-    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1166
+    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1167
+    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1168 1168
     <!-- Popper -->
1169
-    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1169
+    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1170 1170
     <!-- Bootstrap -->
1171
-    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1171
+    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1172 1172
     <!-- AdminLTE -->
1173
-    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1173
+    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1174 1174
     <!-- Altertify -->
1175 1175
     <!--<script type="text/javascript" src="plugins/alertifyjs/alertify.min.js"></script>-->
1176 1176
     <!-- Toastr -->
1177
-    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1177
+    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1178 1178
     <!-- STORE.JS -->
1179
-    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1179
+    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1180 1180
     <!-- cryptojs-aesphp -->
1181
-    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1182
-    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1181
+    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1182
+    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1183 1183
     <!-- pace -->
1184
-    <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1184
+    <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1185 1185
     <!-- select2 -->
1186
-    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1186
+    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1187 1187
     <!-- simplePassMeter -->
1188
-    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
1189
-    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1188
+    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
1189
+    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1190 1190
     <!-- platform -->
1191
-    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1191
+    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1192 1192
     <!-- radiobuttons -->
1193
-    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
1194
-    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1193
+    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
1194
+    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1195 1195
     <!-- ICHECK -->
1196 1196
     <!--<link rel="stylesheet" href="./plugins/icheck-material/icheck-material.min.css">-->
1197
-    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1198
-    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1197
+    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1198
+    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1199 1199
     <!-- bootstrap-add-clear -->
1200
-    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1200
+    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1201 1201
     <!-- DOMPurify -->
1202
-    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1202
+    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1203 1203
 
1204 1204
     <?php
1205 1205
     $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS);
1206 1206
     if ($menuAdmin === true) {
1207 1207
         ?>
1208
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1209
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1210
-        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1208
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1209
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1210
+        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1211 1211
         <!-- InputMask -->
1212
-        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1212
+        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1213 1213
         <!-- Sortable -->
1214 1214
         <!--<script src="./plugins/sortable/jquery.sortable.js"></script>-->
1215 1215
         <!-- PLUPLOAD -->
1216
-        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1216
+        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1217 1217
         <!-- DataTables -->
1218
-        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1219
-        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1220
-        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1221
-        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1222
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1223
-        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1224
-        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1225
-        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1226
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1227
-        <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1218
+        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1219
+        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1220
+        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1221
+        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1222
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1223
+        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1224
+        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1225
+        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1226
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1227
+        <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1228 1228
     <?php
1229 1229
     } elseif (isset($get['page']) === true) {
1230 1230
         if (in_array($get['page'], ['items', 'import']) === true) {
1231 1231
             ?>
1232
-            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1233
-            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1234
-            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1232
+            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1233
+            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1234
+            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1235 1235
             <!-- countdownTimer -->
1236
-            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1236
+            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1237 1237
             <!-- SUMMERNOTE -->
1238
-            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1239
-            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1238
+            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1239
+            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1240 1240
             <!-- date-picker -->
1241
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1242
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1241
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1242
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1243 1243
             <!-- time-picker -->
1244
-            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1245
-            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1244
+            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1245
+            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1246 1246
             <!-- PLUPLOAD -->
1247
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1247
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1248 1248
             <!-- VALIDATE -->
1249
-            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1249
+            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1250 1250
             <!-- PWSTRENGHT -->
1251
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1252
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1251
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1252
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1253 1253
             <!-- TOGGLE -->
1254
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1255
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1256
-            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1254
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1255
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1256
+            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1257 1257
         <?php
1258 1258
         } elseif (in_array($get['page'], ['search', 'folders', 'users', 'roles', 'utilities.deletion', 'utilities.logs', 'utilities.database', 'utilities.renewal', 'tasks']) === true) {
1259 1259
             ?>
1260 1260
             <!-- DataTables -->
1261
-            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1262
-            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1263
-            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1264
-            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1265
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1266
-            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1267
-            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1268
-            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1269
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1270
-            <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1261
+            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1262
+            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1263
+            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1264
+            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1265
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1266
+            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1267
+            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1268
+            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1269
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1270
+            <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1271 1271
             <!-- dater picker -->
1272
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1273
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1272
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1273
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1274 1274
             <!-- daterange picker -->
1275
-            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1276
-            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1277
-            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1275
+            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1276
+            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1277
+            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1278 1278
             <!-- SlimScroll -->
1279
-            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1279
+            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1280 1280
             <!-- FastClick -->
1281
-            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1281
+            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1282 1282
         <?php
1283 1283
         } elseif ($get['page'] === 'profile') {
1284 1284
             ?>
1285 1285
             <!-- FILESAVER -->
1286
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1286
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1287 1287
             <!-- PLUPLOAD -->
1288
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1288
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1289 1289
         <?php
1290 1290
         } elseif ($get['page'] === 'export') {
1291 1291
             ?>
1292 1292
             <!-- FILESAVER -->
1293
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1293
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1294 1294
             <!-- PWSTRENGHT -->
1295
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1296
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1295
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1296
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1297 1297
         <?php
1298 1298
         }
1299 1299
     }
1300 1300
     ?>
1301 1301
     <!-- functions -->
1302
-    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1303
-    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1302
+    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1303
+    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1304 1304
     <input type="hidden" id="encryptClientServerStatus" value="<?php echo $SETTINGS['encryptClientServer'] ?? 1; ?>" />
1305 1305
 
1306 1306
     </body>
@@ -1342,7 +1342,7 @@  discard block
 block discarded – undo
1342 1342
     };
1343 1343
 </script>
1344 1344
 
1345
-<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1345
+<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1346 1346
 
1347 1347
 <script>
1348 1348
     $(document).ready(function() {
@@ -1401,65 +1401,65 @@  discard block
 block discarded – undo
1401 1401
 
1402 1402
 // Load links, css and javascripts
1403 1403
 if (isset($SETTINGS['cpassman_dir']) === true) {
1404
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
1404
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
1405 1405
     if ($menuAdmin === true) {
1406
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
1406
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
1407 1407
         if ($get['page'] === '2fa') {
1408
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
1408
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
1409 1409
         } elseif ($get['page'] === 'api') {
1410
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
1410
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
1411 1411
         } elseif ($get['page'] === 'backups') {
1412
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
1412
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
1413 1413
         } elseif ($get['page'] === 'emails') {
1414
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
1414
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
1415 1415
         } elseif ($get['page'] === 'ldap') {
1416
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
1416
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
1417 1417
         } elseif ($get['page'] === 'uploads') {
1418
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
1418
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
1419 1419
         } elseif ($get['page'] === 'fields') {
1420
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
1420
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
1421 1421
         } elseif ($get['page'] === 'options') {
1422
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
1422
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
1423 1423
         } elseif ($get['page'] === 'statistics') {
1424
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
1424
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
1425 1425
         } elseif ($get['page'] === 'tasks') {
1426
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php';
1426
+            include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php';
1427 1427
         } elseif ($get['page'] === 'oauth' && WIP === true) {
1428
-            include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php';        
1428
+            include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php';        
1429 1429
         } elseif ($get['page'] === 'tools') {
1430
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php';
1430
+            include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php';
1431 1431
         }
1432 1432
     } elseif (isset($get['page']) === true && $get['page'] !== '') {
1433 1433
         if ($get['page'] === 'items') {
1434
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
1434
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
1435 1435
         } elseif ($get['page'] === 'import') {
1436
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
1436
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
1437 1437
         } elseif ($get['page'] === 'export') {
1438
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
1438
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
1439 1439
         } elseif ($get['page'] === 'offline') {
1440
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
1440
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
1441 1441
         } elseif ($get['page'] === 'search') {
1442
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
1442
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
1443 1443
         } elseif ($get['page'] === 'profile') {
1444
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
1444
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
1445 1445
         } elseif ($get['page'] === 'favourites') {
1446
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
1446
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
1447 1447
         } elseif ($get['page'] === 'folders') {
1448
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
1448
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
1449 1449
         } elseif ($get['page'] === 'users') {
1450
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
1450
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
1451 1451
         } elseif ($get['page'] === 'roles') {
1452
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
1452
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
1453 1453
         } elseif ($get['page'] === 'utilities.deletion') {
1454
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
1454
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
1455 1455
         } elseif ($get['page'] === 'utilities.logs') {
1456
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
1456
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
1457 1457
         } elseif ($get['page'] === 'utilities.database') {
1458
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
1458
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
1459 1459
         } elseif ($get['page'] === 'utilities.renewal') {
1460
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
1460
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
1461 1461
         }
1462 1462
     } else {
1463
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
1463
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
1464 1464
     }
1465 1465
 }
Please login to merge, or discard this patch.
scripts/background_tasks___userKeysCreation_subtaskHdl.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 DB::update(
123 123
     prefixTable('background_subtasks'),
124 124
     array(
125
-        'sub_task_in_progress' => 0,    // flag sub task is no more in prgoress
125
+        'sub_task_in_progress' => 0, // flag sub task is no more in prgoress
126 126
         'is_in_progress' => 0,
127 127
         'finished_at' => time(),
128 128
         'updated_at' => time(),
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
         // Check if user exists
159 159
         $userInfo = DB::queryFirstRow(
160 160
             'SELECT public_key, private_key
161
-            FROM ' . prefixTable('users') . '
161
+            FROM ' . prefixTable('users').'
162 162
             WHERE id = %i',
163 163
             $post_user_id
164 164
         );
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
271 271
 {
272 272
     $userInfo = DB::queryFirstRow(
273 273
         'SELECT pw, public_key, private_key, login, name
274
-        FROM ' . prefixTable('users') . '
274
+        FROM ' . prefixTable('users').'
275 275
         WHERE id = %i',
276 276
         $owner_id
277 277
     );
278 278
     
279 279
     // decrypt owner password
280
-    $pwd = cryption($owner_pwd, '','decrypt', $SETTINGS)['string'];
280
+    $pwd = cryption($owner_pwd, '', 'decrypt', $SETTINGS)['string'];
281 281
     // decrypt private key and send back
282 282
     return [
283 283
         'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']),
@@ -317,17 +317,17 @@  discard block
 block discarded – undo
317 317
     // Loop on items
318 318
     $rows = DB::query(
319 319
         'SELECT id, pw, perso
320
-        FROM ' . prefixTable('items') . '
320
+        FROM ' . prefixTable('items').'
321 321
         '.(isset($extra_arguments['only_personal_items']) === true && $extra_arguments['only_personal_items'] === 1 ? 'WHERE perso = 1' : 'WHERE perso = 0').'
322 322
         ORDER BY id ASC
323
-        LIMIT ' . $post_start . ', ' . $post_length
323
+        LIMIT ' . $post_start.', '.$post_length
324 324
     );
325 325
 
326 326
     foreach ($rows as $record) {
327 327
         // Get itemKey from current user
328 328
         $currentUserKey = DB::queryFirstRow(
329 329
             'SELECT share_key, increment_id
330
-            FROM ' . prefixTable('sharekeys_items') . '
330
+            FROM ' . prefixTable('sharekeys_items').'
331 331
             WHERE object_id = %i AND user_id = %i',
332 332
             $record['id'],
333 333
             (int) $record['perso'] === 0 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id']
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
         
355 355
         $currentUserKey = DB::queryFirstRow(
356 356
             'SELECT increment_id
357
-            FROM ' . prefixTable('sharekeys_items') . '
357
+            FROM ' . prefixTable('sharekeys_items').'
358 358
             WHERE object_id = %i AND user_id = %i',
359 359
             $record['id'],
360 360
             $post_user_id
@@ -428,15 +428,15 @@  discard block
 block discarded – undo
428 428
     // Loop on logs
429 429
     $rows = DB::query(
430 430
         'SELECT increment_id
431
-        FROM ' . prefixTable('log_items') . '
431
+        FROM ' . prefixTable('log_items').'
432 432
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
433
-        LIMIT ' . $post_start . ', ' . $post_length
433
+        LIMIT ' . $post_start.', '.$post_length
434 434
     );
435 435
     foreach ($rows as $record) {
436 436
         // Get itemKey from current user
437 437
         $currentUserKey = DB::queryFirstRow(
438 438
             'SELECT share_key
439
-            FROM ' . prefixTable('sharekeys_logs') . '
439
+            FROM ' . prefixTable('sharekeys_logs').'
440 440
             WHERE object_id = %i AND user_id = %i',
441 441
             $record['increment_id'],
442 442
             $extra_arguments['owner_id']
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
             if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
469 469
                 $currentUserKey = DB::queryFirstRow(
470 470
                     'SELECT increment_id
471
-                    FROM ' . prefixTable('sharekeys_items') . '
471
+                    FROM ' . prefixTable('sharekeys_items').'
472 472
                     WHERE object_id = %i AND user_id = %i',
473 473
                     $record['id'],
474 474
                     $post_user_id
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
     // SHould we change step?
491 491
     DB::query(
492 492
         'SELECT increment_id
493
-        FROM ' . prefixTable('log_items') . '
493
+        FROM ' . prefixTable('log_items').'
494 494
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
495 495
     );
496 496
 
@@ -530,15 +530,15 @@  discard block
 block discarded – undo
530 530
     // Loop on fields
531 531
     $rows = DB::query(
532 532
         'SELECT id
533
-        FROM ' . prefixTable('categories_items') . '
533
+        FROM ' . prefixTable('categories_items').'
534 534
         WHERE encryption_type = "teampass_aes"
535
-        LIMIT ' . $post_start . ', ' . $post_length
535
+        LIMIT ' . $post_start.', '.$post_length
536 536
     );
537 537
     foreach ($rows as $record) {
538 538
         // Get itemKey from current user
539 539
         $currentUserKey = DB::queryFirstRow(
540 540
             'SELECT share_key
541
-            FROM ' . prefixTable('sharekeys_fields') . '
541
+            FROM ' . prefixTable('sharekeys_fields').'
542 542
             WHERE object_id = %i AND user_id = %i',
543 543
             $record['id'],
544 544
             $extra_arguments['owner_id']
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
                 if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
567 567
                     $currentUserKey = DB::queryFirstRow(
568 568
                         'SELECT increment_id
569
-                        FROM ' . prefixTable('sharekeys_items') . '
569
+                        FROM ' . prefixTable('sharekeys_items').'
570 570
                         WHERE object_id = %i AND user_id = %i',
571 571
                         $record['id'],
572 572
                         $post_user_id
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
     // SHould we change step?
590 590
     DB::query(
591 591
         'SELECT *
592
-        FROM ' . prefixTable('categories_items') . '
592
+        FROM ' . prefixTable('categories_items').'
593 593
         WHERE encryption_type = "teampass_aes"'
594 594
     );
595 595
 
@@ -629,14 +629,14 @@  discard block
 block discarded – undo
629 629
     // Loop on suggestions
630 630
     $rows = DB::query(
631 631
         'SELECT id
632
-        FROM ' . prefixTable('suggestion') . '
633
-        LIMIT ' . $post_start . ', ' . $post_length
632
+        FROM ' . prefixTable('suggestion').'
633
+        LIMIT ' . $post_start.', '.$post_length
634 634
     );
635 635
     foreach ($rows as $record) {
636 636
         // Get itemKey from current user
637 637
         $currentUserKey = DB::queryFirstRow(
638 638
             'SELECT share_key
639
-            FROM ' . prefixTable('sharekeys_suggestions') . '
639
+            FROM ' . prefixTable('sharekeys_suggestions').'
640 640
             WHERE object_id = %i AND user_id = %i',
641 641
             $record['id'],
642 642
             $extra_arguments['owner_id']
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
             if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
669 669
                 $currentUserKey = DB::queryFirstRow(
670 670
                     'SELECT increment_id
671
-                    FROM ' . prefixTable('sharekeys_items') . '
671
+                    FROM ' . prefixTable('sharekeys_items').'
672 672
                     WHERE object_id = %i AND user_id = %i',
673 673
                     $record['id'],
674 674
                     $post_user_id
@@ -728,16 +728,16 @@  discard block
 block discarded – undo
728 728
     // Loop on files
729 729
     $rows = DB::query(
730 730
         'SELECT f.id AS id, i.perso AS perso
731
-        FROM ' . prefixTable('files') . ' AS f
732
-        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
733
-        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"
734
-        LIMIT ' . $post_start . ', ' . $post_length
731
+        FROM ' . prefixTable('files').' AS f
732
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
733
+        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"
734
+        LIMIT ' . $post_start.', '.$post_length
735 735
     ); //aes_encryption
736 736
     foreach ($rows as $record) {
737 737
         // Get itemKey from current user
738 738
         $currentUserKey = DB::queryFirstRow(
739 739
             'SELECT share_key, increment_id
740
-            FROM ' . prefixTable('sharekeys_files') . '
740
+            FROM ' . prefixTable('sharekeys_files').'
741 741
             WHERE object_id = %i AND user_id = %i',
742 742
             $record['id'],
743 743
             (int) $record['perso'] === 0 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id']
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
 
766 766
         $currentUserKey = DB::queryFirstRow(
767 767
             'SELECT increment_id
768
-            FROM ' . prefixTable('sharekeys_files') . '
768
+            FROM ' . prefixTable('sharekeys_files').'
769 769
             WHERE object_id = %i AND user_id = %i',
770 770
             $record['id'],
771 771
             $post_user_id
@@ -796,8 +796,8 @@  discard block
 block discarded – undo
796 796
     // SHould we change step? Finished ?
797 797
     DB::query(
798 798
         'SELECT *
799
-        FROM ' . prefixTable('files') . '
800
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
799
+        FROM ' . prefixTable('files').'
800
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
801 801
     );
802 802
     $counter = DB::count();
803 803
     $next_start = (int) $post_start + (int) $post_length;
@@ -863,7 +863,7 @@  discard block
 block discarded – undo
863 863
     // get user info
864 864
     $userInfo = DB::queryFirstRow(
865 865
         'SELECT email, login, auth_type, special, lastname, name
866
-        FROM ' . prefixTable('users') . '
866
+        FROM ' . prefixTable('users').'
867 867
         WHERE id = %i',
868 868
         $extra_arguments['new_user_id']
869 869
     );
@@ -878,10 +878,10 @@  discard block
 block discarded – undo
878 878
             filter_var($userInfo['email'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
879 879
             // @scrutinizer ignore-type
880 880
             empty($extra_arguments['email_body']) === false ? $extra_arguments['email_body'] : $lang->get('email_body_user_config_1'),
881
-            'TEAMPASS - ' . $lang->get('login_credentials'),
881
+            'TEAMPASS - '.$lang->get('login_credentials'),
882 882
             (array) filter_var_array(
883 883
                 [
884
-                    '#code#' => cryption($extra_arguments['new_user_code'], '','decrypt', $SETTINGS)['string'],
884
+                    '#code#' => cryption($extra_arguments['new_user_code'], '', 'decrypt', $SETTINGS)['string'],
885 885
                     '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '',
886 886
                     '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '',
887 887
                 ],
Please login to merge, or discard this patch.
scripts/background_tasks___userKeysCreation.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
 $processToPerform = DB::queryfirstrow(
69 69
     'SELECT *
70
-    FROM ' . prefixTable('background_tasks') . '
70
+    FROM ' . prefixTable('background_tasks').'
71 71
     WHERE (finished_at IS NULL OR finished_at = "") AND process_type = %s
72 72
     ORDER BY increment_id ASC',
73 73
     'create_user_keys'
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
     // Check if subtasks are still running
85 85
     // This in order to prevent the script from running multiple times on same objects
86 86
     while (DB::queryFirstField(
87
-        'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' 
87
+        'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' 
88 88
         WHERE is_in_progress = 1'
89 89
     ) > 0) {
90 90
         sleep(10); // Wait 10 seconds before continuing
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
             $subTaskParams = json_decode($subTask['task'], true);
118 118
 
119 119
             if (WIP === true) {
120
-                error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams,true));
120
+                error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams, true));
121 121
             }
122 122
             
123 123
             // Build all subtasks if first one
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
                     // Get total number of items
127 127
                     DB::query(
128 128
                         'SELECT *
129
-                        FROM ' . prefixTable('items') . '
129
+                        FROM ' . prefixTable('items').'
130 130
                         '.(isset($taskArgumentsArray['only_personal_items']) === true && $taskArgumentsArray['only_personal_items'] === 1 ? 'WHERE perso = 1' : '')
131 131
                     );
132 132
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
                     // Get total number of items
136 136
                     DB::query(
137 137
                         'SELECT *
138
-                        FROM ' . prefixTable('log_items') . '
138
+                        FROM ' . prefixTable('log_items').'
139 139
                         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
140 140
                     );
141 141
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
                     // Get total number of items
145 145
                     DB::query(
146 146
                         'SELECT *
147
-                        FROM ' . prefixTable('categories_items') . '
147
+                        FROM ' . prefixTable('categories_items').'
148 148
                         WHERE encryption_type = "teampass_aes"'
149 149
                     );
150 150
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
                     // Get total number of items
162 162
                     DB::query(
163 163
                         'SELECT *
164
-                        FROM ' . prefixTable('files') . ' AS f
165
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
166
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
164
+                        FROM ' . prefixTable('files').' AS f
165
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
166
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
167 167
                     );
168 168
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
169 169
                 }
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
     // Check if subtasks have to be created
191 191
     DB::query(
192 192
         'SELECT *
193
-        FROM ' . prefixTable('background_subtasks') . '
193
+        FROM ' . prefixTable('background_subtasks').'
194 194
         WHERE task_id = %i AND task LIKE %ss',
195 195
         $taskId,
196 196
         $action
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 function countActiveSymfonyProcesses() {
219 219
     // Count the number of active processes
220 220
     return DB::queryFirstField(
221
-        'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . 
221
+        'SELECT COUNT(*) FROM '.prefixTable('background_subtasks'). 
222 222
         ' WHERE process_id IS NOT NULL AND finished_at IS NULL'
223 223
     );
224 224
 }
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 function getSubTasks($taskId) {
230 230
     $task_to_perform = DB::query(
231 231
         'SELECT *
232
-        FROM ' . prefixTable('background_subtasks') . '
232
+        FROM ' . prefixTable('background_subtasks').'
233 233
         WHERE task_id = %i AND finished_at IS NULL
234 234
         ORDER BY increment_id ASC',
235 235
         $taskId
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 function reloadSubTask($subTaskId) {
279 279
     // Retrieve subtask information from the database
280 280
     $subTask = DB::queryFirstRow(
281
-        'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE increment_id = %i', 
281
+        'SELECT * FROM '.prefixTable('background_subtasks').' WHERE increment_id = %i', 
282 282
         $subTaskId
283 283
     );
284 284
 
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
     // Get all processes
324 324
     $subtasks = DB::query(
325 325
         'SELECT *
326
-        FROM ' . prefixTable('background_subtasks') . '
326
+        FROM ' . prefixTable('background_subtasks').'
327 327
         WHERE process_id IS NOT NULL AND finished_at IS NULL'
328 328
     );
329 329
 
Please login to merge, or discard this patch.
sources/tools.queries.php 2 patches
Switch Indentation   +171 added lines, -171 removed lines patch added patch discarded remove patch
@@ -91,215 +91,215 @@
 block discarded – undo
91 91
 switch ($post_type) {
92 92
 //##########################################################
93 93
 //CASE for creating a DB backup
94
-case 'perform_fix_pf_items-step1':
95
-    // Check KEY
96
-    if ($post_key !== $session->get('key')) {
97
-        echo prepareExchangedData(
98
-            array(
99
-                'error' => true,
100
-                'message' => $lang->get('key_is_not_correct'),
101
-            ),
102
-            'encode'
103
-        );
104
-        break;
105
-    }
106
-    // Is admin?
107
-    if ($session->get('user-admin') !== 1) {
108
-        echo prepareExchangedData(
109
-            array(
110
-                'error' => true,
111
-                'message' => $lang->get('error_not_allowed_to'),
112
-            ),
113
-            'encode'
114
-        );
115
-        break;
116
-    }
94
+    case 'perform_fix_pf_items-step1':
95
+        // Check KEY
96
+        if ($post_key !== $session->get('key')) {
97
+            echo prepareExchangedData(
98
+                array(
99
+                    'error' => true,
100
+                    'message' => $lang->get('key_is_not_correct'),
101
+                ),
102
+                'encode'
103
+            );
104
+            break;
105
+        }
106
+        // Is admin?
107
+        if ($session->get('user-admin') !== 1) {
108
+            echo prepareExchangedData(
109
+                array(
110
+                    'error' => true,
111
+                    'message' => $lang->get('error_not_allowed_to'),
112
+                ),
113
+                'encode'
114
+            );
115
+            break;
116
+        }
117 117
 
118
-    // decrypt and retrieve data in JSON format
119
-    $dataReceived = prepareExchangedData(
120
-        $post_data,
121
-        'decode'
122
-    );
118
+        // decrypt and retrieve data in JSON format
119
+        $dataReceived = prepareExchangedData(
120
+            $post_data,
121
+            'decode'
122
+        );
123 123
 
124
-    $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
124
+        $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
125 125
 
126
-    // Get user info
127
-    $userInfo = DB::queryFirstRow(
128
-        'SELECT private_key, public_key, psk, encrypted_psk
126
+        // Get user info
127
+        $userInfo = DB::queryFirstRow(
128
+            'SELECT private_key, public_key, psk, encrypted_psk
129 129
         FROM teampass_users
130 130
         WHERE id = %i',
131
-        $userId
132
-    );
131
+            $userId
132
+        );
133 133
 
134
-    // Get user's private folders
135
-    $userPFRoot = DB::queryFirstRow(
136
-        'SELECT id
134
+        // Get user's private folders
135
+        $userPFRoot = DB::queryFirstRow(
136
+            'SELECT id
137 137
         FROM teampass_nested_tree
138 138
         WHERE title = %i',
139
-        $userId
140
-    );
141
-    if (DB::count() === 0) {
142
-        echo prepareExchangedData(
143
-            array(
144
-                'error' => true,
145
-                'message' => 'User has no personal folders',
146
-            ),
147
-            'encode'
148
-        );
149
-        break;
150
-    }
151
-    $personalFolders = [];
152
-    $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
153
-    $tree->rebuild();
154
-    $folders = $tree->getDescendants($userPFRoot['id'], true);
155
-    foreach ($folders as $folder) {
156
-        array_push($personalFolders, $folder->id);
157
-    }
158
-
159
-    //Show done
160
-    echo prepareExchangedData(
161
-        array(
162
-            'error' => false,
163
-            'message' => 'Personal Folders found: ',
164
-            'personalFolders' => json_encode($personalFolders),
165
-        ),
166
-        'encode'
167
-    );
168
-    break;
169
-
170
-case 'perform_fix_pf_items-step2':
171
-    // Check KEY
172
-    if ($post_key !== $session->get('key')) {
173
-        echo prepareExchangedData(
174
-            array(
175
-                'error' => true,
176
-                'message' => $lang->get('key_is_not_correct'),
177
-            ),
178
-            'encode'
139
+            $userId
179 140
         );
180
-        break;
181
-    }
182
-    // Is admin?
183
-    if ($session->get('user-admin') !== 1) {
141
+        if (DB::count() === 0) {
142
+            echo prepareExchangedData(
143
+                array(
144
+                    'error' => true,
145
+                    'message' => 'User has no personal folders',
146
+                ),
147
+                'encode'
148
+            );
149
+            break;
150
+        }
151
+        $personalFolders = [];
152
+        $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
153
+        $tree->rebuild();
154
+        $folders = $tree->getDescendants($userPFRoot['id'], true);
155
+        foreach ($folders as $folder) {
156
+            array_push($personalFolders, $folder->id);
157
+        }
158
+
159
+        //Show done
184 160
         echo prepareExchangedData(
185 161
             array(
186
-                'error' => true,
187
-                'message' => $lang->get('error_not_allowed_to'),
162
+                'error' => false,
163
+                'message' => 'Personal Folders found: ',
164
+                'personalFolders' => json_encode($personalFolders),
188 165
             ),
189 166
             'encode'
190 167
         );
191 168
         break;
192
-    }
193 169
 
194
-    // decrypt and retrieve data in JSON format
195
-    $dataReceived = prepareExchangedData(
196
-        $post_data,
197
-        'decode'
198
-    );
170
+    case 'perform_fix_pf_items-step2':
171
+        // Check KEY
172
+        if ($post_key !== $session->get('key')) {
173
+            echo prepareExchangedData(
174
+                array(
175
+                    'error' => true,
176
+                    'message' => $lang->get('key_is_not_correct'),
177
+                ),
178
+                'encode'
179
+            );
180
+            break;
181
+        }
182
+        // Is admin?
183
+        if ($session->get('user-admin') !== 1) {
184
+            echo prepareExchangedData(
185
+                array(
186
+                    'error' => true,
187
+                    'message' => $lang->get('error_not_allowed_to'),
188
+                ),
189
+                'encode'
190
+            );
191
+            break;
192
+        }
199 193
 
200
-    $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
201
-    $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
194
+        // decrypt and retrieve data in JSON format
195
+        $dataReceived = prepareExchangedData(
196
+            $post_data,
197
+            'decode'
198
+        );
199
+
200
+        $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
201
+        $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
202 202
 
203
-    // Delete all private items with sharekeys
204
-    $pfiSharekeys = DB::queryFirstColumn(
205
-        'select s.increment_id
203
+        // Delete all private items with sharekeys
204
+        $pfiSharekeys = DB::queryFirstColumn(
205
+            'select s.increment_id
206 206
         from teampass_sharekeys_items as s
207 207
         INNER JOIN teampass_items AS i ON (i.id = s.object_id)
208 208
         WHERE s.user_id = %i AND i.perso = 1 AND i.id_tree IN %ls',
209
-        $userId,
210
-        $personalFolders
211
-    );
212
-    $pfiSharekeysCount = DB::count();
213
-    if ($pfiSharekeysCount > 0) {
214
-        DB::delete(
215
-            "teampass_sharekeys_items",
216
-            "increment_id IN %ls",
217
-            $pfiSharekeys
209
+            $userId,
210
+            $personalFolders
218 211
         );
219
-    }
212
+        $pfiSharekeysCount = DB::count();
213
+        if ($pfiSharekeysCount > 0) {
214
+            DB::delete(
215
+                "teampass_sharekeys_items",
216
+                "increment_id IN %ls",
217
+                $pfiSharekeys
218
+            );
219
+        }
220 220
 
221 221
     
222
-    //Show done
223
-    echo prepareExchangedData(
224
-        array(
225
-            'error' => false,
226
-            'message' => '<br>Number of Sharekeys for private items DELETED: ',
227
-            'nbDeleted' => $pfiSharekeysCount,
228
-            'personalFolders' => json_encode($personalFolders),
229
-        ),
230
-        'encode'
231
-    );
232
-    break;
233
-
234
-case 'perform_fix_pf_items-step3':
235
-    // Check KEY
236
-    if ($post_key !== $session->get('key')) {
237
-        echo prepareExchangedData(
238
-            array(
239
-                'error' => true,
240
-                'message' => $lang->get('key_is_not_correct'),
241
-            ),
242
-            'encode'
243
-        );
244
-        break;
245
-    }
246
-    // Is admin?
247
-    if ($session->get('user-admin') !== 1) {
222
+        //Show done
248 223
         echo prepareExchangedData(
249 224
             array(
250
-                'error' => true,
251
-                'message' => $lang->get('error_not_allowed_to'),
225
+                'error' => false,
226
+                'message' => '<br>Number of Sharekeys for private items DELETED: ',
227
+                'nbDeleted' => $pfiSharekeysCount,
228
+                'personalFolders' => json_encode($personalFolders),
252 229
             ),
253 230
             'encode'
254 231
         );
255 232
         break;
256
-    }
257 233
 
258
-    // decrypt and retrieve data in JSON format
259
-    $dataReceived = prepareExchangedData(
260
-        $post_data,
261
-        'decode'
262
-    );
234
+    case 'perform_fix_pf_items-step3':
235
+        // Check KEY
236
+        if ($post_key !== $session->get('key')) {
237
+            echo prepareExchangedData(
238
+                array(
239
+                    'error' => true,
240
+                    'message' => $lang->get('key_is_not_correct'),
241
+                ),
242
+                'encode'
243
+            );
244
+            break;
245
+        }
246
+        // Is admin?
247
+        if ($session->get('user-admin') !== 1) {
248
+            echo prepareExchangedData(
249
+                array(
250
+                    'error' => true,
251
+                    'message' => $lang->get('error_not_allowed_to'),
252
+                ),
253
+                'encode'
254
+            );
255
+            break;
256
+        }
257
+
258
+        // decrypt and retrieve data in JSON format
259
+        $dataReceived = prepareExchangedData(
260
+            $post_data,
261
+            'decode'
262
+        );
263 263
 
264
-    $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
265
-    $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
264
+        $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
265
+        $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
266 266
 
267
-    // Update from items_old to items all the private itemsitems that have been converted to teampass_aes
268
-    // Get all key back
269
-    $items = DB::query(
270
-        "SELECT id
267
+        // Update from items_old to items all the private itemsitems that have been converted to teampass_aes
268
+        // Get all key back
269
+        $items = DB::query(
270
+            "SELECT id
271 271
         FROM teampass_items
272 272
         WHERE id_tree IN %ls AND encryption_type = %s",
273
-        $personalFolders,
274
-        "teampass_aes"
275
-    );
276
-    //DB::debugMode(false);
277
-    $nbItems = DB::count();
278
-    foreach ($items as $item) {
279
-        $defusePwd = DB::queryFirstField("SELECT pw FROM teampass_items_old WHERE id = %i", $item['id']);
280
-        DB::update(
281
-            "teampass_items",
282
-            ['pw' => $defusePwd, "encryption_type" => "defuse"],
283
-            "id = %i",
284
-            $item['id']
273
+            $personalFolders,
274
+            "teampass_aes"
285 275
         );
286
-    }
276
+        //DB::debugMode(false);
277
+        $nbItems = DB::count();
278
+        foreach ($items as $item) {
279
+            $defusePwd = DB::queryFirstField("SELECT pw FROM teampass_items_old WHERE id = %i", $item['id']);
280
+            DB::update(
281
+                "teampass_items",
282
+                ['pw' => $defusePwd, "encryption_type" => "defuse"],
283
+                "id = %i",
284
+                $item['id']
285
+            );
286
+        }
287 287
 
288 288
     
289
-    //Show done
290
-    echo prepareExchangedData(
291
-        array(
292
-            'error' => false,
293
-            'message' => '<br>Number of items reseted to Defuse: ',
294
-            'nbItems' => $nbItems,
295
-            'personalFolders' => json_encode($personalFolders),
296
-        ),
297
-        'encode'
298
-    );
299
-    break;
300
-
301
-    /* TOOL #2 - Fixing items master keys */
302
-    /*
289
+        //Show done
290
+        echo prepareExchangedData(
291
+            array(
292
+                'error' => false,
293
+                'message' => '<br>Number of items reseted to Defuse: ',
294
+                'nbItems' => $nbItems,
295
+                'personalFolders' => json_encode($personalFolders),
296
+            ),
297
+            'encode'
298
+        );
299
+        break;
300
+
301
+        /* TOOL #2 - Fixing items master keys */
302
+        /*
303 303
     * STEP 1 - Check if we have the correct pwd for TP_USER
304 304
     */
305 305
     case 'perform_fix_items_master_keys-step1':
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === false) {
71 71
     // Not allowed page
72 72
     $session->set('system-error_code', ERR_NOT_ALLOWED);
73
-    include $SETTINGS['cpassman_dir'] . '/error.php';
73
+    include $SETTINGS['cpassman_dir'].'/error.php';
74 74
     exit;
75 75
 }
76 76
 
@@ -335,13 +335,13 @@  discard block
 block discarded – undo
335 335
         // Get PT_USER info
336 336
         $userInfo = DB::queryFirstRow(
337 337
             'SELECT pw, public_key, private_key, login, name
338
-            FROM ' . prefixTable('users') . '
338
+            FROM ' . prefixTable('users').'
339 339
             WHERE id = %i',
340 340
             TP_USER_ID
341 341
         );
342 342
 
343 343
         // decrypt owner password
344
-        $pwd = cryption($userInfo['pw'], '','decrypt', $SETTINGS)['string'];
344
+        $pwd = cryption($userInfo['pw'], '', 'decrypt', $SETTINGS)['string'];
345 345
 
346 346
         $privateKey = decryptPrivateKey($pwd, $userInfo['private_key']);
347 347
 
@@ -367,8 +367,8 @@  discard block
 block discarded – undo
367 367
         // Get one itemKey from current user
368 368
         $currentUserKey = DB::queryFirstRow(
369 369
             'SELECT ski.share_key, ski.increment_id AS increment_id, l.id_user
370
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
371
-            INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
370
+            FROM ' . prefixTable('sharekeys_items').' AS ski
371
+            INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
372 372
             WHERE ski.user_id = %i
373 373
             ORDER BY RAND()
374 374
             LIMIT 1',
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
                 echo  prepareExchangedData(
388 388
                     array(
389 389
                         'error' => true,
390
-                        'message' => 'No issue found, normal process should work. This process is now finished. (item id : ' . $currentUserKey['increment_id'] . ')',
390
+                        'message' => 'No issue found, normal process should work. This process is now finished. (item id : '.$currentUserKey['increment_id'].')',
391 391
                     ),
392 392
                     'encode'
393 393
                 );
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
         // Get user info
448 448
         $userInfo = DB::queryFirstRow(
449 449
             'SELECT public_key, private_key
450
-            FROM ' . prefixTable('users') . '
450
+            FROM ' . prefixTable('users').'
451 451
             WHERE id = %i',
452 452
             $userId
453 453
         );
@@ -470,8 +470,8 @@  discard block
 block discarded – undo
470 470
         // Get one itemKey from current user
471 471
         $currentUserKey = DB::queryFirstRow(
472 472
             'SELECT ski.share_key, ski.increment_id AS increment_id, l.id_user
473
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
474
-            INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
473
+            FROM ' . prefixTable('sharekeys_items').' AS ski
474
+            INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
475 475
             WHERE ski.user_id = %i
476 476
             ORDER BY RAND()
477 477
             LIMIT 1',
@@ -509,8 +509,8 @@  discard block
 block discarded – undo
509 509
                 // Get number of users to treat
510 510
                 DB::query(
511 511
                     'SELECT i.id 
512
-                    FROM ' . prefixTable('items') . ' AS i
513
-                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS si ON i.id = si.object_id
512
+                    FROM ' . prefixTable('items').' AS i
513
+                    INNER JOIN ' . prefixTable('sharekeys_items').' AS si ON i.id = si.object_id
514 514
                     WHERE i.perso = %i AND si.user_id = %i;',
515 515
                     0,
516 516
                     $userId
@@ -591,11 +591,11 @@  discard block
 block discarded – undo
591 591
         DB::debugMode(false);
592 592
         $rows = DB::query(
593 593
             'SELECT si.object_id AS object_id, si.share_key AS share_key, i.pw AS pw, si.increment_id as increment_id
594
-            FROM ' . prefixTable('sharekeys_items') . ' AS si
595
-            INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id)
594
+            FROM ' . prefixTable('sharekeys_items').' AS si
595
+            INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id)
596 596
             WHERE si.user_id = %i
597 597
             ORDER BY si.increment_id ASC
598
-            LIMIT ' . $startIndex . ', ' . $limit,
598
+            LIMIT ' . $startIndex.', '.$limit,
599 599
             $userId
600 600
         );        
601 601
         DB::debugMode(false);
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
             // It will be updated if already exists
622 622
             $currentTPUserKey = DB::queryFirstRow(
623 623
                 'SELECT increment_id, user_id, share_key
624
-                FROM ' . prefixTable('sharekeys_items') . '
624
+                FROM ' . prefixTable('sharekeys_items').'
625 625
                 WHERE object_id = %i AND user_id = %i',
626 626
                 $record['object_id'],
627 627
                 TP_USER_ID
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
             // Get PT_USER info
709 709
             DB::queryFirstRow(
710 710
                 'SELECT operation_code
711
-                FROM ' . prefixTable('sharekeys_backup') . '
711
+                FROM ' . prefixTable('sharekeys_backup').'
712 712
                 WHERE operation_code = %s',
713 713
                 $operationCode
714 714
             );
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
                 // using increment_id_value in order to update the correct record
719 719
                 $rows = DB::query(
720 720
                     'SELECT *
721
-                    FROM ' . prefixTable('sharekeys_backup') . '
721
+                    FROM ' . prefixTable('sharekeys_backup').'
722 722
                     WHERE operation_code = %s',
723 723
                     $operationCode
724 724
                 );
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
 
738 738
                 // Delete all sharekeys for this operation
739 739
                 DB::query(
740
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
740
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
741 741
                     WHERE operation_code = %i',
742 742
                     $operationCode
743 743
                 );
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
             // Get operation info
801 801
             DB::query(
802 802
                 'SELECT operation_code
803
-                FROM ' . prefixTable('sharekeys_backup') . '
803
+                FROM ' . prefixTable('sharekeys_backup').'
804 804
                 WHERE operation_code = %s',
805 805
                 $operationCode
806 806
             );
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
             if ($nbKeys > 0) {
810 810
                 // Delete all sharekeys for this operation
811 811
                 DB::query(
812
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
812
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
813 813
                     WHERE operation_code = %s',
814 814
                     $operationCode
815 815
                 );
Please login to merge, or discard this patch.