Passed
Pull Request — master (#4273)
by
unknown
06:31
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
 
@@ -473,39 +473,39 @@  discard block
 block discarded – undo
473 473
                             <div class="tab-pane" id="tab_4">
474 474
                                 <div id="form-item-field" class="hidden">
475 475
                                     <?php
476
-                                        $session_item_fields = $session->get('system-item_fields');//print_r($session_item_fields);
476
+                                        $session_item_fields = $session->get('system-item_fields'); //print_r($session_item_fields);
477 477
                                         if (isset($session_item_fields) === true) {
478 478
                                             foreach ($session_item_fields as $category) {
479 479
                                                 //print_r($category);
480 480
                                                 echo '
481
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
482
-                                                <h5>' . $category['title'] . '</h5>
481
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
482
+                                                <h5>' . $category['title'].'</h5>
483 483
                                                 <p>';
484 484
                                                 foreach ($category['fields'] as $field) {
485 485
                                                     if ($field['type'] === 'textarea') {
486 486
                                                         echo '
487
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
487
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
488 488
                                                         <label>' . $field['title'],
489 489
                                                             $field['is_mandatory'] === '1' ?
490
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
490
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
491 491
                                                             '</label>
492
-                                                        <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
+                                                        <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>
493 493
                                                     </div>';
494 494
                                                     } else {
495 495
                                                         echo '
496
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
496
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
497 497
                                                         <div class="input-group-prepend">
498 498
                                                             <span class="input-group-text">' . $field['title'],
499 499
                                                             $field['is_mandatory'] === '1' ?
500
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
500
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
501 501
                                                             '</span>
502 502
                                                         </div>
503
-                                                        <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
+                                                        <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">
504 504
                                                     </div>';
505 505
                                                     }
506 506
                                                     if (!empty($field['regex'])) {
507 507
                                                         echo '
508
-                                                    <div>Regex: '. $field['regex'] .'</div>
508
+                                                    <div>Regex: '. $field['regex'].'</div>
509 509
                                                         ';
510 510
                                                     }
511 511
                                                 }
@@ -516,8 +516,8 @@  discard block
 block discarded – undo
516 516
                                                 ) {
517 517
                                                     echo '
518 518
                                                     <div class="form-check icheck-blue">
519
-                                                        <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'] . '">
520
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . $lang->get('main_template') . '</label>
519
+                                                        <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'].'">
520
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.$lang->get('main_template').'</label>
521 521
                                                     </div>';
522 522
                                                 }
523 523
                                                 echo '
@@ -527,8 +527,8 @@  discard block
 block discarded – undo
527 527
                                         } else {
528 528
                                             echo
529 529
                                             '<div class="alert alert-info">
530
-                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information') . '</h5>
531
-                                                ' . $lang->get('no_fields') . '
530
+                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information').'</h5>
531
+                                                ' . $lang->get('no_fields').'
532 532
                                             </div>';
533 533
                                         } ?>
534 534
                                 </div>
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
                         <p><?php
670 670
                             echo str_replace(
671 671
         ['##otv_expiration_period##', '. '],
672
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
672
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
673 673
         $lang->get('otv_message')
674 674
     );
675 675
                             ?></p>
@@ -687,9 +687,9 @@  discard block
 block discarded – undo
687 687
 
688 688
                     <div class="row">
689 689
                         <div class="form-group col-4">
690
-                            <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
+                            <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>
691 691
                             <div class="input-group mb-3">
692
-                                <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
+                                <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']; ?>">
693 693
                             </div>
694 694
                         </div>
695 695
 
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
778 778
                                 <?php
779 779
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
780
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
780
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
781 781
                                 }
782 782
                                 ?>
783 783
                             </select>
@@ -795,14 +795,14 @@  discard block
 block discarded – undo
795 795
                             <label><?php echo $lang->get('icon'); ?></label>
796 796
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon">
797 797
                             <small class='form-text text-muted'>
798
-                                <?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
+                                <?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>
799 799
                             </small>
800 800
                         </div>
801 801
                         <div class="form-group">
802 802
                             <label><?php echo $lang->get('icon_on_selection'); ?></label>
803 803
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon-selected">
804 804
                             <small class='form-text text-muted'>
805
-                                <?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
+                                <?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>
806 806
                             </small>
807 807
                         </div>
808 808
                     </div>
@@ -1213,18 +1213,18 @@  discard block
 block discarded – undo
1213 1213
                                 <?php
1214 1214
                                     foreach ($session_item_fields as $elem) {
1215 1215
                                         echo '
1216
-                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
1217
-                                    <h5>' . $elem['title'] . '</h5>
1216
+                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
1217
+                                    <h5>' . $elem['title'].'</h5>
1218 1218
                                     <p>
1219 1219
                                         <ul class="list-group list-group-unbordered mb-3">';
1220 1220
                                         foreach ($elem['fields'] as $field) {
1221 1221
                                             echo '
1222
-                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
1223
-                                                <span id="card-item-field-title-' . $field['id'] . '"><b>' . $field['title'] . '</b></span>
1224
-                                                <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'] . '">
1222
+                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
1223
+                                                <span id="card-item-field-title-' . $field['id'].'"><b>'.$field['title'].'</b></span>
1224
+                                                <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'].'">
1225 1225
                                                     <i class="fa-solid fa-copy"></i>
1226 1226
                                                 </button>
1227
-                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
1227
+                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
1228 1228
                                             </li>';
1229 1229
                                         }
1230 1230
                                         echo '
Please login to merge, or discard this patch.
pages/admin.js.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
69 69
     // Not allowed page
70 70
     $session->set('system-error_code', ERR_NOT_ALLOWED);
71
-    include $SETTINGS['cpassman_dir'] . '/error.php';
71
+    include $SETTINGS['cpassman_dir'].'/error.php';
72 72
     exit;
73 73
 }
74 74
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
                     // error
150 150
                     toastr.remove();
151 151
                     toastr.error(
152
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
152
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
153 153
                         '', {
154 154
                             closeButton: true,
155 155
                             positionClass: 'toast-bottom-right'
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                     // error
224 224
                     toastr.remove();
225 225
                     toastr.error(
226
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
226
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
227 227
                         '', {
228 228
                             closeButton: true,
229 229
                             positionClass: 'toast-bottom-right'
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
                     // error
272 272
                     toastr.remove();
273 273
                     toastr.error(
274
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
274
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
275 275
                         '', {
276 276
                             closeButton: true,
277 277
                             positionClass: 'toast-bottom-right'
Please login to merge, or discard this patch.
pages/tasks.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === false) {
74 74
     // Not allowed page
75 75
     $session->set('system-error_code', ERR_NOT_ALLOWED);
76
-    include $SETTINGS['cpassman_dir'] . '/error.php';
76
+    include $SETTINGS['cpassman_dir'].'/error.php';
77 77
     exit;
78 78
 }
79 79
 ?>
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
                         // error
371 371
                         toastr.remove();
372 372
                         toastr.error(
373
-                            '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
373
+                            '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
374 374
                             '', {
375 375
                                 closeButton: true,
376 376
                                 positionClass: 'toast-bottom-right'
@@ -393,11 +393,11 @@  discard block
 block discarded – undo
393 393
                         $('#'+field+'_parameter_value').val(frequency === null ? '' : frequency + ';' +value,);
394 394
                         param = value.split(';');
395 395
                         if (param.length === 1) {
396
-                            txt = ' <?php echo $lang->get('at');?> ' + param[0];
396
+                            txt = ' <?php echo $lang->get('at'); ?> ' + param[0];
397 397
                         } else {
398
-                            txt = ' <?php echo $lang->get('day');?> ' + param[1] + ' <?php echo $lang->get('at');?> ' + param[0];
398
+                            txt = ' <?php echo $lang->get('day'); ?> ' + param[1] + ' <?php echo $lang->get('at'); ?> ' + param[0];
399 399
                         }
400
-                        $('#'+field+'_parameter').val(frequency === null ? '<?php echo $lang->get('not_defined');?>' : (data.message + txt));
400
+                        $('#'+field+'_parameter').val(frequency === null ? '<?php echo $lang->get('not_defined'); ?>' : (data.message + txt));
401 401
                         $("#task-define-modal").modal('hide');
402 402
                         $('#task-define-modal-type, #task-define-modal-parameter-hourly-value, #task-define-modal-parameter-daily-value, #task-define-modal-frequency').val('');
403 403
                     }
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
                         // error
504 504
                         toastr.remove();
505 505
                         toastr.error(
506
-                            '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
506
+                            '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
507 507
                             '', {
508 508
                                 closeButton: true,
509 509
                                 positionClass: 'toast-bottom-right'
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
                     // error
565 565
                     toastr.remove();
566 566
                     toastr.error(
567
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
567
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
568 568
                         '', {
569 569
                             closeButton: true,
570 570
                             positionClass: 'toast-bottom-right'
Please login to merge, or discard this patch.