Passed
Push — master ( bd06e7...965d80 )
by Nils
06:52
created
sources/items.queries.php 1 patch
Spacing   +282 added lines, -283 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 ) {
80 80
     // Not allowed page
81 81
     $session->set('system-error_code', ERR_NOT_ALLOWED);
82
-    include $SETTINGS['cpassman_dir'] . '/error.php';
82
+    include $SETTINGS['cpassman_dir'].'/error.php';
83 83
     exit;
84 84
 }
85 85
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     date_default_timezone_set('UTC');
105 105
 }
106 106
 
107
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
107
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
108 108
 header('Content-type: text/html; charset=utf-8');
109 109
 header('Cache-Control: no-cache, must-revalidate');
110 110
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
             // About special settings
367 367
             $dataFolderSettings = DB::queryFirstRow(
368 368
                 'SELECT bloquer_creation, bloquer_modification, personal_folder
369
-                FROM ' . prefixTable('nested_tree') . ' 
369
+                FROM ' . prefixTable('nested_tree').' 
370 370
                 WHERE id = %i',
371 371
                 $inputData['folderId']
372 372
             );
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
             // Get folder complexity
384 384
             $folderComplexity = DB::queryFirstRow(
385 385
                 'SELECT valeur
386
-                FROM ' . prefixTable('misc') . '
386
+                FROM ' . prefixTable('misc').'
387 387
                 WHERE type = %s AND intitule = %i',
388 388
                 'complex',
389 389
                 $inputData['folderId']
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
             $itemExists = 0;
409 409
             $newID = '';
410 410
             $data = DB::queryFirstRow(
411
-                'SELECT * FROM ' . prefixTable('items') . '
411
+                'SELECT * FROM '.prefixTable('items').'
412 412
                 WHERE label = %s AND inactif = %i',
413 413
                 $inputData['label'],
414 414
                 0
@@ -489,8 +489,8 @@  discard block
 block discarded – undo
489 489
                     (int) $post_folder_is_personal,
490 490
                     (int) $newID,
491 491
                     $cryptedStuff['objectKey'],
492
-                    true,   // only for the item creator
493
-                    false,  // no delete all
492
+                    true, // only for the item creator
493
+                    false, // no delete all
494 494
                 );
495 495
 
496 496
                 // update fields
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
                             // should we encrypt the data
504 504
                             $dataTmp = DB::queryFirstRow(
505 505
                                 'SELECT encrypted_data
506
-                                FROM ' . prefixTable('categories') . '
506
+                                FROM ' . prefixTable('categories').'
507 507
                                 WHERE id = %i',
508 508
                                 $field['id']
509 509
                             );
@@ -532,8 +532,8 @@  discard block
 block discarded – undo
532 532
                                     (int) $post_folder_is_personal,
533 533
                                     (int) $newObjectId,
534 534
                                     $cryptedStuff['objectKey'],
535
-                                    true,   // only for the item creator
536
-                                    false,  // delete all
535
+                                    true, // only for the item creator
536
+                                    false, // delete all
537 537
                                 );
538 538
 
539 539
                                 array_push(
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
                 ) {
570 570
                     DB::queryFirstRow(
571 571
                         'SELECT *
572
-                        FROM ' . prefixTable('templates') . '
572
+                        FROM ' . prefixTable('templates').'
573 573
                         WHERE item_id = %i',
574 574
                         $newID
575 575
                     );
@@ -638,11 +638,11 @@  discard block
 block discarded – undo
638 638
                 ) {
639 639
                     foreach ($post_restricted_to as $userRest) {
640 640
                         if (empty($userRest) === false) {
641
-                            $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest);
641
+                            $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest);
642 642
                             if (empty($listOfRestricted)) {
643 643
                                 $listOfRestricted = $dataTmp['login'];
644 644
                             } else {
645
-                                $listOfRestricted .= ';' . $dataTmp['login'];
645
+                                $listOfRestricted .= ';'.$dataTmp['login'];
646 646
                             }
647 647
                         }
648 648
                     }
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
                             if (empty($userRest) === false) {
659 659
                                 $dataTmp = DB::queryFirstRow(
660 660
                                     'SELECT login
661
-                                    FROM ' . prefixTable('users') . '
661
+                                    FROM ' . prefixTable('users').'
662 662
                                     WHERE id= %i',
663 663
                                     $userRest
664 664
                                 );
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
                                 if (empty($oldRestrictionList) === true) {
667 667
                                     $oldRestrictionList = $dataTmp['login'];
668 668
                                 } else {
669
-                                    $oldRestrictionList .= ';' . $dataTmp['login'];
669
+                                    $oldRestrictionList .= ';'.$dataTmp['login'];
670 670
                                 }
671 671
                             }
672 672
                         }
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
                 if (empty($post_uploaded_file_id) === false) {
730 730
                     $rows = DB::query(
731 731
                         'SELECT id
732
-                        FROM ' . prefixTable('files') . '
732
+                        FROM ' . prefixTable('files').'
733 733
                         WHERE id_item = %s',
734 734
                         $post_uploaded_file_id
735 735
                     );
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
                                     $lang->get('email_subject_item_updated'),
786 786
                                     str_replace(
787 787
                                         array('#label', '#link'),
788
-                                            array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']),
788
+                                            array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']),
789 789
                                             $lang->get('new_item_email_body')
790 790
                                     ),
791 791
                                     $emailAddress,
@@ -889,11 +889,11 @@  discard block
 block discarded – undo
889 889
         // Prepare variables
890 890
         $itemInfos = array();
891 891
         $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
892
-        $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
892
+        $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
893 893
         $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : '';
894 894
         $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
895
-        $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : '';
896
-        $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
895
+        $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : '';
896
+        $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
897 897
         $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT);
898 898
         $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
899 899
         $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT);
@@ -924,8 +924,7 @@  discard block
 block discarded – undo
924 924
         $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var(
925 925
                 $dataReceived['to_be_deleted_after_date'],
926 926
                 FILTER_SANITIZE_FULL_SPECIAL_CHARS
927
-            ) :
928
-            '';
927
+            ) : '';
929 928
         $post_fields = (filter_var_array(
930 929
             $dataReceived['fields'],
931 930
             FILTER_SANITIZE_FULL_SPECIAL_CHARS
@@ -985,7 +984,7 @@  discard block
 block discarded – undo
985 984
         // About special settings
986 985
         $dataFolderSettings = DB::queryFirstRow(
987 986
             'SELECT bloquer_creation, bloquer_modification, personal_folder, title
988
-            FROM ' . prefixTable('nested_tree') . ' 
987
+            FROM ' . prefixTable('nested_tree').' 
989 988
             WHERE id = %i',
990 989
             $inputData['folderId']
991 990
         );
@@ -1001,7 +1000,7 @@  discard block
 block discarded – undo
1001 1000
         // Get folder complexity
1002 1001
         $folderComplexity = DB::queryFirstRow(
1003 1002
             'SELECT valeur
1004
-            FROM ' . prefixTable('misc') . '
1003
+            FROM ' . prefixTable('misc').'
1005 1004
             WHERE type = %s AND intitule = %i',
1006 1005
             'complex',
1007 1006
             $inputData['folderId']
@@ -1046,8 +1045,8 @@  discard block
 block discarded – undo
1046 1045
         // Get all informations for this item
1047 1046
         $dataItem = DB::queryFirstRow(
1048 1047
             'SELECT *
1049
-            FROM ' . prefixTable('items') . ' as i
1050
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
1048
+            FROM ' . prefixTable('items').' as i
1049
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
1051 1050
             WHERE i.id=%i AND l.action = %s',
1052 1051
             $inputData['itemId'],
1053 1052
             'at_creation'
@@ -1089,7 +1088,7 @@  discard block
 block discarded – undo
1089 1088
         // Does the user has the sharekey for this item?
1090 1089
         DB::query(
1091 1090
             'SELECT *
1092
-            FROM ' . prefixTable('sharekeys_items') . '
1091
+            FROM ' . prefixTable('sharekeys_items').'
1093 1092
             WHERE object_id = %i AND user_id = %s',
1094 1093
             $inputData['itemId'],
1095 1094
             $session->get('user-id')
@@ -1150,9 +1149,9 @@  discard block
 block discarded – undo
1150 1149
                 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
1151 1150
                 i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
1152 1151
                 u.login as user_login, u.email as user_email
1153
-                FROM ' . prefixTable('items') . ' as i
1154
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
1155
-                INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
1152
+                FROM ' . prefixTable('items').' as i
1153
+                INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
1154
+                INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
1156 1155
                 WHERE i.id=%i',
1157 1156
                 $inputData['itemId']
1158 1157
             );
@@ -1160,7 +1159,7 @@  discard block
 block discarded – undo
1160 1159
             // Should we log a password change?
1161 1160
             $userKey = DB::queryFirstRow(
1162 1161
                 'SELECT share_key
1163
-                FROM ' . prefixTable('sharekeys_items') . '
1162
+                FROM ' . prefixTable('sharekeys_items').'
1164 1163
                 WHERE user_id = %i AND object_id = %i',
1165 1164
                 $session->get('user-id'),
1166 1165
                 $inputData['itemId']
@@ -1224,12 +1223,12 @@  discard block
 block discarded – undo
1224 1223
                     (int) $post_folder_is_personal,
1225 1224
                     (int) $inputData['itemId'],
1226 1225
                     $encrypted_password_key,
1227
-                    true,   // only for the item creator
1228
-                    true,   // delete all
1226
+                    true, // only for the item creator
1227
+                    true, // delete all
1229 1228
                 );
1230 1229
 
1231 1230
                 // Create a task to create sharekeys for users
1232
-                if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw);
1231
+                if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw);
1233 1232
                 $tasksToBePerformed = ['item_password'];
1234 1233
                 $encryptionTaskIsRequested = true;
1235 1234
             } else {
@@ -1240,7 +1239,7 @@  discard block
 block discarded – undo
1240 1239
             // Get list of tags
1241 1240
             $itemTags = DB::queryFirstColumn(
1242 1241
                 'SELECT tag
1243
-                FROM ' . prefixTable('tags') . '
1242
+                FROM ' . prefixTable('tags').'
1244 1243
                 WHERE item_id = %i',
1245 1244
                 $inputData['itemId']
1246 1245
             );
@@ -1286,7 +1285,7 @@  discard block
 block discarded – undo
1286 1285
                     $session->get('user-id'),
1287 1286
                     'at_modification',
1288 1287
                     $session->get('user-login'),
1289
-                    'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
1288
+                    'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
1290 1289
                 );
1291 1290
             }
1292 1291
 
@@ -1331,8 +1330,8 @@  discard block
 block discarded – undo
1331 1330
                             'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
1332 1331
                             i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
1333 1332
                             c.masked AS masked, i.id AS field_item_id
1334
-                            FROM ' . prefixTable('categories_items') . ' AS i
1335
-                            INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
1333
+                            FROM ' . prefixTable('categories_items').' AS i
1334
+                            INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
1336 1335
                             WHERE i.field_id = %i AND i.item_id = %i',
1337 1336
                             $field['id'],
1338 1337
                             $inputData['itemId']
@@ -1348,7 +1347,7 @@  discard block
 block discarded – undo
1348 1347
                             // Perform new query
1349 1348
                             $dataTmpCat = DB::queryFirstRow(
1350 1349
                                 'SELECT id, title, encrypted_data, masked
1351
-                                FROM ' . prefixTable('categories') . '
1350
+                                FROM ' . prefixTable('categories').'
1352 1351
                                 WHERE id = %i',
1353 1352
                                 $field['id']
1354 1353
                             );
@@ -1378,8 +1377,8 @@  discard block
 block discarded – undo
1378 1377
                                     (int) $post_folder_is_personal,
1379 1378
                                     (int) $newId,
1380 1379
                                     $cryptedStuff['objectKey'],
1381
-                                    true,   // only for the item creator
1382
-                                    true,   // delete all
1380
+                                    true, // only for the item creator
1381
+                                    true, // delete all
1383 1382
                                 );
1384 1383
 
1385 1384
                                 // update value
@@ -1429,7 +1428,7 @@  discard block
 block discarded – undo
1429 1428
                                 $session->get('user-id'),
1430 1429
                                 'at_modification',
1431 1430
                                 $session->get('user-login'),
1432
-                                'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
1431
+                                'at_field : '.$dataTmpCat['title'].' : '.$field['value']
1433 1432
                             );
1434 1433
                         } else {
1435 1434
                             // Case where the field already exists
@@ -1438,7 +1437,7 @@  discard block
 block discarded – undo
1438 1437
                                 // Get user sharekey for this field
1439 1438
                                 $userKey = DB::queryFirstRow(
1440 1439
                                     'SELECT share_key
1441
-                                    FROM ' . prefixTable('sharekeys_fields') . '
1440
+                                    FROM ' . prefixTable('sharekeys_fields').'
1442 1441
                                     WHERE user_id = %i AND object_id = %i',
1443 1442
                                     $session->get('user-id'),
1444 1443
                                     $dataTmpCat['field_item_id']
@@ -1477,8 +1476,8 @@  discard block
 block discarded – undo
1477 1476
                                         (int) $post_folder_is_personal,
1478 1477
                                         (int) $dataTmpCat['field_item_id'],
1479 1478
                                         $cryptedStuff['objectKey'],
1480
-                                        true,   // only for the item creator
1481
-                                        true,   // delete all
1479
+                                        true, // only for the item creator
1480
+                                        true, // delete all
1482 1481
                                     );
1483 1482
 
1484 1483
                                     if ($encryptedFieldIsChanged === false) {
@@ -1520,7 +1519,7 @@  discard block
 block discarded – undo
1520 1519
                                     $session->get('user-id'),
1521 1520
                                     'at_modification',
1522 1521
                                     $session->get('user-login'),
1523
-                                    'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
1522
+                                    'at_field : '.$dataTmpCat['title'].' => '.$oldVal
1524 1523
                                 );
1525 1524
                             }
1526 1525
                         }
@@ -1574,7 +1573,7 @@  discard block
 block discarded – undo
1574 1573
             ) {
1575 1574
                 DB::queryFirstRow(
1576 1575
                     'SELECT *
1577
-                    FROM ' . prefixTable('templates') . '
1576
+                    FROM ' . prefixTable('templates').'
1578 1577
                     WHERE item_id = %i',
1579 1578
                     $inputData['itemId']
1580 1579
                 );
@@ -1617,7 +1616,7 @@  discard block
 block discarded – undo
1617 1616
                 // check if elem exists in Table. If not add it or update it.
1618 1617
                 DB::query(
1619 1618
                     'SELECT *
1620
-                    FROM ' . prefixTable('automatic_del') . '
1619
+                    FROM ' . prefixTable('automatic_del').'
1621 1620
                     WHERE item_id = %i',
1622 1621
                     $inputData['itemId']
1623 1622
                 );
@@ -1644,7 +1643,7 @@  discard block
 block discarded – undo
1644 1643
                         // Store updates performed
1645 1644
                         array_push(
1646 1645
                             $arrayOfChanges,
1647
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled')
1646
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled')
1648 1647
                         );
1649 1648
 
1650 1649
                         // update LOG
@@ -1687,7 +1686,7 @@  discard block
 block discarded – undo
1687 1686
                         // Store updates performed
1688 1687
                         array_push(
1689 1688
                             $arrayOfChanges,
1690
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled')
1689
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled')
1691 1690
                         );
1692 1691
 
1693 1692
                         // update LOG
@@ -1715,7 +1714,7 @@  discard block
 block discarded – undo
1715 1714
                     if (empty($userId) === false) {
1716 1715
                         $dataTmp = DB::queryFirstRow(
1717 1716
                             'SELECT id, name, lastname
1718
-                            FROM ' . prefixTable('users') . '
1717
+                            FROM ' . prefixTable('users').'
1719 1718
                             WHERE id= %i',
1720 1719
                             $userId
1721 1720
                         );
@@ -1723,7 +1722,7 @@  discard block
 block discarded – undo
1723 1722
                         // Add to array
1724 1723
                         array_push(
1725 1724
                             $arrayOfUsersRestriction,
1726
-                            $dataTmp['name'] . ' ' . $dataTmp['lastname']
1725
+                            $dataTmp['name'].' '.$dataTmp['lastname']
1727 1726
                         );
1728 1727
                         array_push(
1729 1728
                             $arrayOfUsersIdRestriction,
@@ -1754,8 +1753,8 @@  discard block
 block discarded – undo
1754 1753
                 // get values before deleting them
1755 1754
                 $rows = DB::query(
1756 1755
                     'SELECT t.title, t.id AS id
1757
-                    FROM ' . prefixTable('roles_title') . ' as t
1758
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
1756
+                    FROM ' . prefixTable('roles_title').' as t
1757
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
1759 1758
                     WHERE r.item_id = %i
1760 1759
                     ORDER BY t.title ASC',
1761 1760
                     $inputData['itemId']
@@ -1789,7 +1788,7 @@  discard block
 block discarded – undo
1789 1788
                         );
1790 1789
                         $dataTmp = DB::queryFirstRow(
1791 1790
                             'SELECT title
1792
-                            FROM ' . prefixTable('roles_title') . '
1791
+                            FROM ' . prefixTable('roles_title').'
1793 1792
                             WHERE id = %i',
1794 1793
                             $role
1795 1794
                         );
@@ -1817,7 +1816,7 @@  discard block
 block discarded – undo
1817 1816
             // Get current status
1818 1817
             $otpStatus = DB::queryFirstRow(
1819 1818
                 'SELECT enabled as otp_is_enabled, phone_number, secret
1820
-                FROM ' . prefixTable('items_otp') . '
1819
+                FROM ' . prefixTable('items_otp').'
1821 1820
                 WHERE item_id = %i',
1822 1821
                 $inputData['itemId']
1823 1822
             );
@@ -1831,7 +1830,7 @@  discard block
 block discarded – undo
1831 1830
                     'decrypt'
1832 1831
                 )['string'];
1833 1832
             } else {
1834
-                $currentsecret='';
1833
+                $currentsecret = '';
1835 1834
             }
1836 1835
 
1837 1836
             // If OTP secret provided then encrypt it
@@ -1881,7 +1880,7 @@  discard block
 block discarded – undo
1881 1880
                         $session->get('user-id'),
1882 1881
                         'at_modification',
1883 1882
                         $session->get('user-login'),
1884
-                        'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
1883
+                        'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
1885 1884
                     );
1886 1885
                 }
1887 1886
                 if ($otpStatus['phone_number'] !== $post_otp_phone_number) {
@@ -1892,7 +1891,7 @@  discard block
 block discarded – undo
1892 1891
                         $session->get('user-id'),
1893 1892
                         'at_modification',
1894 1893
                         $session->get('user-login'),
1895
-                        'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number
1894
+                        'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number
1896 1895
                     );
1897 1896
                 }
1898 1897
                 if ($currentsecret !== $post_otp_secret) {
@@ -1941,8 +1940,8 @@  discard block
 block discarded – undo
1941 1940
                     $session->get('user-id'),
1942 1941
                     'at_modification',
1943 1942
                     $session->get('user-login'),
1944
-                    'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
1945
-                        implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
1943
+                    'at_restriction : '.(count($diffUsersRestiction) > 0 ?
1944
+                        implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
1946 1945
                 );
1947 1946
             }
1948 1947
 
@@ -1962,7 +1961,7 @@  discard block
 block discarded – undo
1962 1961
                     $session->get('user-id'),
1963 1962
                     'at_modification',
1964 1963
                     $session->get('user-login'),
1965
-                    'at_label : ' . $data['label'] . ' => ' . $inputData['label']
1964
+                    'at_label : '.$data['label'].' => '.$inputData['label']
1966 1965
                 );
1967 1966
             }
1968 1967
             // LOGIN
@@ -1981,7 +1980,7 @@  discard block
 block discarded – undo
1981 1980
                     $session->get('user-id'),
1982 1981
                     'at_modification',
1983 1982
                     $session->get('user-login'),
1984
-                    'at_login : ' . $data['login'] . ' => ' . $post_login
1983
+                    'at_login : '.$data['login'].' => '.$post_login
1985 1984
                 );
1986 1985
             }
1987 1986
             // EMAIL
@@ -2000,7 +1999,7 @@  discard block
 block discarded – undo
2000 1999
                     $session->get('user-id'),
2001 2000
                     'at_modification',
2002 2001
                     $session->get('user-login'),
2003
-                    'at_email : ' . $data['email'] . ' => ' . $post_email
2002
+                    'at_email : '.$data['email'].' => '.$post_email
2004 2003
                 );
2005 2004
             }
2006 2005
             // URL
@@ -2019,7 +2018,7 @@  discard block
 block discarded – undo
2019 2018
                     $session->get('user-id'),
2020 2019
                     'at_modification',
2021 2020
                     $session->get('user-login'),
2022
-                    'at_url : ' . $data['url'] . ' => ' . $post_url
2021
+                    'at_url : '.$data['url'].' => '.$post_url
2023 2022
                 );
2024 2023
             }
2025 2024
             // DESCRIPTION
@@ -2045,7 +2044,7 @@  discard block
 block discarded – undo
2045 2044
             // FOLDER
2046 2045
             if ((int) $data['id_tree'] !== (int) $inputData['folderId']) {
2047 2046
                 // Get name of folders
2048
-                $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
2047
+                $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
2049 2048
 
2050 2049
                 // Store updates performed
2051 2050
                 array_push(
@@ -2061,7 +2060,7 @@  discard block
 block discarded – undo
2061 2060
                     $session->get('user-id'),
2062 2061
                     'at_modification',
2063 2062
                     $session->get('user-login'),
2064
-                    'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
2063
+                    'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
2065 2064
                 );
2066 2065
             }
2067 2066
             // ANYONE_CAN_MODIFY
@@ -2069,7 +2068,7 @@  discard block
 block discarded – undo
2069 2068
                 // Store updates performed
2070 2069
                 array_push(
2071 2070
                     $arrayOfChanges,
2072
-                    $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
2071
+                    $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
2073 2072
                 );
2074 2073
 
2075 2074
                 // Log
@@ -2080,15 +2079,15 @@  discard block
 block discarded – undo
2080 2079
                     $session->get('user-id'),
2081 2080
                     'at_modification',
2082 2081
                     $session->get('user-login'),
2083
-                    'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
2082
+                    'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
2084 2083
                 );
2085 2084
             }
2086 2085
 
2087 2086
             // Reload new values
2088 2087
             $dataItem = DB::queryFirstRow(
2089 2088
                 'SELECT *
2090
-                FROM ' . prefixTable('items') . ' as i
2091
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
2089
+                FROM ' . prefixTable('items').' as i
2090
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
2092 2091
                 WHERE i.id = %i AND l.action = %s',
2093 2092
                 $inputData['itemId'],
2094 2093
                 'at_creation'
@@ -2097,8 +2096,8 @@  discard block
 block discarded – undo
2097 2096
             $history = '';
2098 2097
             $rows = DB::query(
2099 2098
                 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
2100
-                FROM ' . prefixTable('log_items') . ' as l
2101
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
2099
+                FROM ' . prefixTable('log_items').' as l
2100
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
2102 2101
                 WHERE l.action <> %s AND id_item=%s',
2103 2102
                 'at_shown',
2104 2103
                 $inputData['itemId']
@@ -2107,14 +2106,14 @@  discard block
 block discarded – undo
2107 2106
                 if ($record['raison'] === NULL) continue;
2108 2107
                 $reason = explode(':', $record['raison']);
2109 2108
                 if (count($reason) > 0) {
2110
-                    $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
2111
-                        . $record['login'] . ' - ' . $lang->get($record['action']) . ' - '
2112
-                        . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1]
2109
+                    $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
2110
+                        . $record['login'].' - '.$lang->get($record['action']).' - '
2111
+                        . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1]
2113 2112
                             : $lang->get(trim($reason[0]))) : '');
2114 2113
                     if (empty($history)) {
2115 2114
                         $history = $sentence;
2116 2115
                     } else {
2117
-                        $history .= '<br />' . $sentence;
2116
+                        $history .= '<br />'.$sentence;
2118 2117
                     }
2119 2118
                 }
2120 2119
             }
@@ -2252,7 +2251,7 @@  discard block
 block discarded – undo
2252 2251
         ) {
2253 2252
             // load the original record into an array
2254 2253
             $originalRecord = DB::queryFirstRow(
2255
-                'SELECT * FROM ' . prefixTable('items') . '
2254
+                'SELECT * FROM '.prefixTable('items').'
2256 2255
                 WHERE id = %i',
2257 2256
                 $inputData['itemId']
2258 2257
             );
@@ -2271,7 +2270,7 @@  discard block
 block discarded – undo
2271 2270
 
2272 2271
             // Load the destination folder record into an array
2273 2272
             $dataDestination = DB::queryFirstRow(
2274
-                'SELECT personal_folder FROM ' . prefixTable('nested_tree') . '
2273
+                'SELECT personal_folder FROM '.prefixTable('nested_tree').'
2275 2274
                 WHERE id = %i',
2276 2275
                 $post_dest_id
2277 2276
             );
@@ -2279,7 +2278,7 @@  discard block
 block discarded – undo
2279 2278
             // Get the ITEM object key for the user
2280 2279
             $userKey = DB::queryFirstRow(
2281 2280
                 'SELECT share_key
2282
-                FROM ' . prefixTable('sharekeys_items') . '
2281
+                FROM ' . prefixTable('sharekeys_items').'
2283 2282
                 WHERE user_id = %i AND object_id = %i',
2284 2283
                 $session->get('user-id'),
2285 2284
                 $inputData['itemId']
@@ -2356,8 +2355,8 @@  discard block
 block discarded – undo
2356 2355
             // Manage Custom Fields
2357 2356
             $rows = DB::query(
2358 2357
                 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data
2359
-                FROM ' . prefixTable('categories_items') . ' AS ci
2360
-                INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id)
2358
+                FROM ' . prefixTable('categories_items').' AS ci
2359
+                INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id)
2361 2360
                 WHERE ci.item_id = %i',
2362 2361
                 $inputData['itemId']
2363 2362
             );
@@ -2369,7 +2368,7 @@  discard block
 block discarded – undo
2369 2368
                     // Get user key
2370 2369
                     $userKey = DB::queryFirstRow(
2371 2370
                         'SELECT share_key
2372
-                        FROM ' . prefixTable('sharekeys_fields') . '
2371
+                        FROM ' . prefixTable('sharekeys_fields').'
2373 2372
                         WHERE user_id = %i AND object_id = %i',
2374 2373
                         $session->get('user-id'),
2375 2374
                         $field['id']
@@ -2436,15 +2435,15 @@  discard block
 block discarded – undo
2436 2435
             $rows = DB::query(
2437 2436
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
2438 2437
                 f.size AS size, f.type AS type, s.share_key AS share_key
2439
-                FROM ' . prefixTable('files') . ' AS f
2440
-                INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
2438
+                FROM ' . prefixTable('files').' AS f
2439
+                INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
2441 2440
                 WHERE s.user_id = %i AND f.id_item = %i',
2442 2441
                 $session->get('user-id'),
2443 2442
                 $inputData['itemId']
2444 2443
             );
2445 2444
             foreach ($rows as $record) {
2446 2445
                 // Check if file still exists
2447
-                if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
2446
+                if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
2448 2447
                     // Step1 - decrypt the file
2449 2448
                     // deepcode ignore PT: path is sanitized inside decryptFile()
2450 2449
                     $fileContent = decryptFile(
@@ -2455,8 +2454,8 @@  discard block
 block discarded – undo
2455 2454
 
2456 2455
                     // Step2 - create file
2457 2456
                     // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database
2458
-                    $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension'];
2459
-                    $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
2457
+                    $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension'];
2458
+                    $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
2460 2459
                     if ($outstream === false) {
2461 2460
                         echo prepareExchangedData(
2462 2461
                             array(
@@ -2529,7 +2528,7 @@  discard block
 block discarded – undo
2529 2528
 
2530 2529
             // -------------------------
2531 2530
             // Add specific restrictions
2532
-            $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']);
2531
+            $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']);
2533 2532
             foreach ($rows as $record) {
2534 2533
                 DB::insert(
2535 2534
                     prefixTable('restriction_to_roles'),
@@ -2541,7 +2540,7 @@  discard block
 block discarded – undo
2541 2540
             }
2542 2541
 
2543 2542
             // Add Tags
2544
-            $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']);
2543
+            $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']);
2545 2544
             foreach ($rows as $record) {
2546 2545
                 DB::insert(
2547 2546
                     prefixTable('tags'),
@@ -2643,7 +2642,7 @@  discard block
 block discarded – undo
2643 2642
         // then we can show it
2644 2643
         $item_deleted = DB::queryFirstRow(
2645 2644
             'SELECT *
2646
-            FROM ' . prefixTable('log_items') . '
2645
+            FROM ' . prefixTable('log_items').'
2647 2646
             WHERE id_item = %i AND action = %s
2648 2647
             ORDER BY date DESC
2649 2648
             LIMIT 0, 1',
@@ -2654,7 +2653,7 @@  discard block
 block discarded – undo
2654 2653
 
2655 2654
         $item_restored = DB::queryFirstRow(
2656 2655
             'SELECT *
2657
-            FROM ' . prefixTable('log_items') . '
2656
+            FROM ' . prefixTable('log_items').'
2658 2657
             WHERE id_item = %i AND action = %s
2659 2658
             ORDER BY date DESC
2660 2659
             LIMIT 0, 1',
@@ -2678,8 +2677,8 @@  discard block
 block discarded – undo
2678 2677
         // Get all informations for this item
2679 2678
         $dataItem = DB::queryFirstRow(
2680 2679
             'SELECT *
2681
-            FROM ' . prefixTable('items') . ' as i
2682
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
2680
+            FROM ' . prefixTable('items').' as i
2681
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
2683 2682
             WHERE i.id = %i AND l.action = %s',
2684 2683
             $inputData['id'],
2685 2684
             'at_creation'
@@ -2688,7 +2687,7 @@  discard block
 block discarded – undo
2688 2687
         // Notification
2689 2688
         DB::queryFirstRow(
2690 2689
             'SELECT *
2691
-            FROM ' . prefixTable('notification') . '
2690
+            FROM ' . prefixTable('notification').'
2692 2691
             WHERE item_id = %i AND user_id = %i',
2693 2692
             $inputData['id'],
2694 2693
             $session->get('user-id')
@@ -2707,7 +2706,7 @@  discard block
 block discarded – undo
2707 2706
 
2708 2707
         // manage case of API user
2709 2708
         if ($dataItem['id_user'] === API_USER_ID) {
2710
-            $arrData['author'] = 'API [' . $dataItem['description'] . ']';
2709
+            $arrData['author'] = 'API ['.$dataItem['description'].']';
2711 2710
             $arrData['id_user'] = API_USER_ID;
2712 2711
             $arrData['author_email'] = '';
2713 2712
             $arrData['notification_status'] = false;
@@ -2717,7 +2716,7 @@  discard block
 block discarded – undo
2717 2716
         $tags = array();
2718 2717
         $rows = DB::query(
2719 2718
             'SELECT tag
2720
-            FROM ' . prefixTable('tags') . '
2719
+            FROM ' . prefixTable('tags').'
2721 2720
             WHERE item_id = %i',
2722 2721
             $inputData['id']
2723 2722
         );
@@ -2741,7 +2740,7 @@  discard block
 block discarded – undo
2741 2740
         // Check if user has a role that is accepted
2742 2741
         $rows_tmp = DB::query(
2743 2742
             'SELECT role_id
2744
-            FROM ' . prefixTable('restriction_to_roles') . '
2743
+            FROM ' . prefixTable('restriction_to_roles').'
2745 2744
             WHERE item_id=%i',
2746 2745
             $inputData['id']
2747 2746
         );
@@ -2755,7 +2754,7 @@  discard block
 block discarded – undo
2755 2754
         // Get the object key for the user
2756 2755
         $userKeys = DB::query(
2757 2756
             'SELECT share_key
2758
-            FROM ' . prefixTable('sharekeys_items') . '
2757
+            FROM ' . prefixTable('sharekeys_items').'
2759 2758
             WHERE user_id = %i AND object_id = %i',
2760 2759
             $session->get('user-id'),
2761 2760
             $inputData['id']
@@ -2868,8 +2867,8 @@  discard block
 block discarded – undo
2868 2867
                 // Add restriction if item is restricted to roles
2869 2868
                 $rows = DB::query(
2870 2869
                     'SELECT t.title, t.id
2871
-                    FROM ' . prefixTable('roles_title') . ' AS t
2872
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
2870
+                    FROM ' . prefixTable('roles_title').' AS t
2871
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
2873 2872
                     WHERE r.item_id = %i
2874 2873
                     ORDER BY t.title ASC',
2875 2874
                     $inputData['id']
@@ -2885,8 +2884,8 @@  discard block
 block discarded – undo
2885 2884
                 $tmp = array();
2886 2885
                 $rows = DB::query(
2887 2886
                     'SELECT k.label, k.id
2888
-                    FROM ' . prefixTable('kb_items') . ' as i
2889
-                    INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
2887
+                    FROM ' . prefixTable('kb_items').' as i
2888
+                    INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
2890 2889
                     WHERE i.item_id = %i
2891 2890
                     ORDER BY k.label ASC',
2892 2891
                     $inputData['id']
@@ -2969,7 +2968,7 @@  discard block
 block discarded – undo
2969 2968
                 $arrCatList = array();
2970 2969
                 $rows_tmp = DB::query(
2971 2970
                     'SELECT id_category
2972
-                    FROM ' . prefixTable('categories_folders') . '
2971
+                    FROM ' . prefixTable('categories_folders').'
2973 2972
                     WHERE id_folder=%i',
2974 2973
                     $inputData['folderId']
2975 2974
                 );
@@ -2984,8 +2983,8 @@  discard block
 block discarded – undo
2984 2983
                         'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
2985 2984
                         i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id,
2986 2985
                         c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
2987
-                        FROM ' . prefixTable('categories_items') . ' AS i
2988
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
2986
+                        FROM ' . prefixTable('categories_items').' AS i
2987
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
2989 2988
                         WHERE i.item_id=%i AND c.parent_id IN %ls',
2990 2989
                         $inputData['id'],
2991 2990
                         $arrCatList
@@ -2996,7 +2995,7 @@  discard block
 block discarded – undo
2996 2995
                         //db::debugmode(true);
2997 2996
                         $userKey = DB::queryFirstRow(
2998 2997
                             'SELECT share_key
2999
-                            FROM ' . prefixTable('sharekeys_fields') . '
2998
+                            FROM ' . prefixTable('sharekeys_fields').'
3000 2999
                             WHERE user_id = %i AND object_id = %i',
3001 3000
                             $session->get('user-id'),
3002 3001
                             $row['id']
@@ -3014,7 +3013,7 @@  discard block
 block discarded – undo
3014 3013
                         } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) {
3015 3014
                             // Data is not encrypted in DB
3016 3015
                             $fieldText = [
3017
-                                'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
3016
+                                'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
3018 3017
                                 'encrypted' => false,
3019 3018
                                 'error' => false,
3020 3019
                             ];
@@ -3059,7 +3058,7 @@  discard block
 block discarded – undo
3059 3058
             if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
3060 3059
                 $rows_tmp = DB::queryFirstRow(
3061 3060
                     'SELECT category_id
3062
-                    FROM ' . prefixTable('templates') . '
3061
+                    FROM ' . prefixTable('templates').'
3063 3062
                     WHERE item_id = %i',
3064 3063
                     $inputData['id']
3065 3064
                 );
@@ -3076,7 +3075,7 @@  discard block
 block discarded – undo
3076 3075
             // Evaluate if item is ready for all users
3077 3076
             $rows_tmp = DB::queryFirstRow(
3078 3077
                 'SELECT finished_at
3079
-                FROM ' . prefixTable('background_tasks') . '
3078
+                FROM ' . prefixTable('background_tasks').'
3080 3079
                 WHERE item_id = %i',
3081 3080
                 $inputData['id']
3082 3081
             );
@@ -3093,7 +3092,7 @@  discard block
 block discarded – undo
3093 3092
                 // Is the Item to be deleted?
3094 3093
                 $dataDelete = DB::queryFirstRow(
3095 3094
                     'SELECT * 
3096
-                    FROM ' . prefixTable('automatic_del') . '
3095
+                    FROM ' . prefixTable('automatic_del').'
3097 3096
                     WHERE item_id = %i',
3098 3097
                     $inputData['id']
3099 3098
                 );
@@ -3174,14 +3173,14 @@  discard block
 block discarded – undo
3174 3173
                     if (empty($userRest) === false) {
3175 3174
                         $dataTmp = DB::queryFirstRow(
3176 3175
                             'SELECT login
3177
-                            FROM ' . prefixTable('users') . '
3176
+                            FROM ' . prefixTable('users').'
3178 3177
                             WHERE id= %i',
3179 3178
                             $userRest
3180 3179
                         );
3181 3180
                         if (empty($listOfRestricted)) {
3182 3181
                             $listOfRestricted = $dataTmp['login'];
3183 3182
                         } else {
3184
-                            $listOfRestricted .= ';' . $dataTmp['login'];
3183
+                            $listOfRestricted .= ';'.$dataTmp['login'];
3185 3184
                         }
3186 3185
                     }
3187 3186
                 }
@@ -3255,9 +3254,9 @@  discard block
 block discarded – undo
3255 3254
         // Load item data
3256 3255
         $dataItem = DB::queryFirstRow(
3257 3256
             'SELECT i.*, n.title AS folder_title, o.enabled AS otp_for_item_enabled, o.phone_number AS otp_phone_number, o.secret AS otp_secret
3258
-            FROM ' . prefixTable('items') . ' AS i
3259
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
3260
-            LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id)
3257
+            FROM ' . prefixTable('items').' AS i
3258
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
3259
+            LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id)
3261 3260
             WHERE i.id = %i',
3262 3261
             $inputData['id']
3263 3262
         );
@@ -3279,7 +3278,7 @@  discard block
 block discarded – undo
3279 3278
         // Check if user has a role that is accepted
3280 3279
         $rows_tmp = DB::query(
3281 3280
             'SELECT role_id
3282
-            FROM ' . prefixTable('restriction_to_roles') . '
3281
+            FROM ' . prefixTable('restriction_to_roles').'
3283 3282
             WHERE item_id=%i',
3284 3283
             $inputData['id']
3285 3284
         );
@@ -3311,12 +3310,12 @@  discard block
 block discarded – undo
3311 3310
             // launch query
3312 3311
             $rows = DB::query(
3313 3312
                 'SELECT id, name, file, extension, size
3314
-                FROM ' . prefixTable('files') . '
3313
+                FROM ' . prefixTable('files').'
3315 3314
                 WHERE id_item = %i AND confirmed = 1',
3316 3315
                 $inputData['id']
3317 3316
             );
3318 3317
             foreach ($rows as $record) {
3319
-                $filename = basename($record['name'], '.' . $record['extension']);
3318
+                $filename = basename($record['name'], '.'.$record['extension']);
3320 3319
                 $filename = isBase64($filename) === true ? base64_decode($filename) : $filename;
3321 3320
 
3322 3321
                 array_push(
@@ -3329,7 +3328,7 @@  discard block
 block discarded – undo
3329 3328
                         'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0,
3330 3329
                         'id' => $record['id'],
3331 3330
                         'key' => $session->get('user-key_tmp'),
3332
-                        'internalFilename' => basename($record['name'], '.' . $record['extension']),
3331
+                        'internalFilename' => basename($record['name'], '.'.$record['extension']),
3333 3332
                     )
3334 3333
                 );
3335 3334
             }
@@ -3371,8 +3370,8 @@  discard block
 block discarded – undo
3371 3370
             $listOptionsForRoles = array();
3372 3371
             $rows = DB::query(
3373 3372
                 'SELECT r.role_id AS role_id, t.title AS title
3374
-                FROM ' . prefixTable('roles_values') . ' AS r
3375
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
3373
+                FROM ' . prefixTable('roles_values').' AS r
3374
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
3376 3375
                 WHERE r.folder_id = %i',
3377 3376
                 $dataItem['id_tree']
3378 3377
             );
@@ -3386,8 +3385,8 @@  discard block
 block discarded – undo
3386 3385
                 );
3387 3386
                 $rows2 = DB::query(
3388 3387
                     'SELECT DISTINCT u.id, u.login, u.email, u.name, u.lastname, ur.role_id AS fonction_id
3389
-                    FROM ' . prefixTable('users') . ' AS u
3390
-                    INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
3388
+                    FROM ' . prefixTable('users').' AS u
3389
+                    INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
3391 3390
                     WHERE ur.role_id = %i AND ur.source = %s',
3392 3391
                     $record['role_id'],
3393 3392
                     'manual'
@@ -3404,7 +3403,7 @@  discard block
 block discarded – undo
3404 3403
                                 array(
3405 3404
                                     'id' => (int) $record2['id'],
3406 3405
                                     'login' => $record2['login'],
3407
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
3406
+                                    'name' => $record2['name'].' '.$record2['lastname'],
3408 3407
                                     'email' => $record2['email'],
3409 3408
                                 )
3410 3409
                             );
@@ -3423,16 +3422,16 @@  discard block
 block discarded – undo
3423 3422
                 $path = '';
3424 3423
                 foreach ($arbo as $elem) {
3425 3424
                     if (empty($path) === true) {
3426
-                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
3425
+                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
3427 3426
                     } else {
3428
-                        $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
3427
+                        $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
3429 3428
                     }
3430 3429
                 }
3431 3430
                 // Build text to show user
3432 3431
                 if (empty($path) === true) {
3433 3432
                     $path = addslashes($dataItem['label']);
3434 3433
                 } else {
3435
-                    $path = addslashes($dataItem['label']) . ' (' . $path . ')';
3434
+                    $path = addslashes($dataItem['label']).' ('.$path.')';
3436 3435
                 }
3437 3436
 
3438 3437
                 // Add Admins to notification list if expected
@@ -3455,7 +3454,7 @@  discard block
 block discarded – undo
3455 3454
                         array(
3456 3455
                             addslashes($session->get('user-login')),
3457 3456
                             $path,
3458
-                            $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
3457
+                            $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
3459 3458
                         ),
3460 3459
                         $lang->get('email_on_open_notification_mail')
3461 3460
                     ),
@@ -3465,7 +3464,7 @@  discard block
 block discarded – undo
3465 3464
             }
3466 3465
 
3467 3466
             // has this item a change proposal
3468
-            DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']);
3467
+            DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']);
3469 3468
             $returnArray['has_change_proposal'] = DB::count();
3470 3469
 
3471 3470
             // Setting
@@ -3476,7 +3475,7 @@  discard block
 block discarded – undo
3476 3475
             if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) {
3477 3476
                 DB::query(
3478 3477
                     'SELECT *
3479
-                    FROM ' . prefixTable('otv') . '
3478
+                    FROM ' . prefixTable('otv').'
3480 3479
                     WHERE item_id = %i
3481 3480
                     AND time_limit > %i',
3482 3481
                     $inputData['id'],
@@ -3575,7 +3574,7 @@  discard block
 block discarded – undo
3575 3574
         // Load item data
3576 3575
         $data = DB::queryFirstRow(
3577 3576
             'SELECT id_tree, id, label
3578
-            FROM ' . prefixTable('items') . '
3577
+            FROM ' . prefixTable('items').'
3579 3578
             WHERE id = %i OR item_key = %s',
3580 3579
             $inputData['itemId'],
3581 3580
             $inputData['itemKey']
@@ -3666,7 +3665,7 @@  discard block
 block discarded – undo
3666 3665
         // Load item data
3667 3666
         $dataItem = DB::queryFirstRow(
3668 3667
             'SELECT secret, enabled
3669
-            FROM ' . prefixTable('items_otp') . '
3668
+            FROM ' . prefixTable('items_otp').'
3670 3669
             WHERE item_id = %i',
3671 3670
             $inputData['id']
3672 3671
         );
@@ -3748,13 +3747,13 @@  discard block
 block discarded – undo
3748 3747
 
3749 3748
         // Check if user is allowed to access this folder
3750 3749
         if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) {
3751
-            echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
3750
+            echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
3752 3751
             break;
3753 3752
         }
3754 3753
 
3755 3754
         // Check if title doesn't contains html codes
3756 3755
         if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
3757
-            echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]';
3756
+            echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]';
3758 3757
             break;
3759 3758
         }
3760 3759
         // check that title is not numeric
@@ -3765,9 +3764,9 @@  discard block
 block discarded – undo
3765 3764
 
3766 3765
         // Check if duplicate folders name are allowed
3767 3766
         if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
3768
-            $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
3767
+            $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
3769 3768
             if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) {
3770
-                echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]';
3769
+                echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]';
3771 3770
                 break;
3772 3771
             }
3773 3772
         }
@@ -3775,7 +3774,7 @@  discard block
 block discarded – undo
3775 3774
         // query on folder
3776 3775
         $data = DB::queryFirstRow(
3777 3776
             'SELECT parent_id, personal_folder
3778
-            FROM ' . prefixTable('nested_tree') . '
3777
+            FROM ' . prefixTable('nested_tree').'
3779 3778
             WHERE id = %i',
3780 3779
             $inputData['folderId']
3781 3780
         );
@@ -3785,20 +3784,20 @@  discard block
 block discarded – undo
3785 3784
         if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') {
3786 3785
             $data = DB::queryFirstRow(
3787 3786
                 'SELECT valeur
3788
-                FROM ' . prefixTable('misc') . '
3787
+                FROM ' . prefixTable('misc').'
3789 3788
                 WHERE intitule = %i AND type = %s',
3790 3789
                 $data['parent_id'],
3791 3790
                 'complex'
3792 3791
             );
3793 3792
             if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
3794
-                echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
3793
+                echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
3795 3794
                 break;
3796 3795
             }
3797 3796
         }
3798 3797
 
3799 3798
         // update Folders table
3800 3799
         $tmp = DB::queryFirstRow(
3801
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
3800
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
3802 3801
             $dataReceived['folder']
3803 3802
         );
3804 3803
         if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) {
@@ -3912,7 +3911,7 @@  discard block
 block discarded – undo
3912 3911
             $uniqueLoadData['path'] = $arr_arbo;
3913 3912
 
3914 3913
             // store last folder accessed in cookie
3915
-            $arr_cookie_options = array (
3914
+            $arr_cookie_options = array(
3916 3915
                 'expires' => time() + TP_ONE_DAY_SECONDS * 5,
3917 3916
                 'path' => '/', 
3918 3917
                 'secure' => true,
@@ -3927,7 +3926,7 @@  discard block
 block discarded – undo
3927 3926
             foreach ($session->get('user-roles_array') as $role) {
3928 3927
                 $roleQ = DB::queryFirstRow(
3929 3928
                     'SELECT allow_pw_change
3930
-                    FROM ' . prefixTable('roles_title') . '
3929
+                    FROM ' . prefixTable('roles_title').'
3931 3930
                     WHERE id = %i',
3932 3931
                     $role
3933 3932
                 );
@@ -3958,11 +3957,11 @@  discard block
 block discarded – undo
3958 3957
                 
3959 3958
                 foreach ($session->get('user-roles_array') as $role) {
3960 3959
                     $access = DB::queryFirstRow(
3961
-                        'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
3960
+                        'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
3962 3961
                         $role,
3963 3962
                         $inputData['id']
3964 3963
                     );
3965
-                    if (DB::count()>0) {
3964
+                    if (DB::count() > 0) {
3966 3965
                         if ($access['type'] === 'R') {
3967 3966
                             array_push($arrTmp, 10);
3968 3967
                         } elseif ($access['type'] === 'W') {
@@ -4027,7 +4026,7 @@  discard block
 block discarded – undo
4027 4026
             } else {
4028 4027
                 DB::query(
4029 4028
                     'SELECT *
4030
-                    FROM ' . prefixTable('items') . '
4029
+                    FROM ' . prefixTable('items').'
4031 4030
                     WHERE inactif = %i',
4032 4031
                     0
4033 4032
                 );
@@ -4037,7 +4036,7 @@  discard block
 block discarded – undo
4037 4036
 
4038 4037
             // Get folder complexity
4039 4038
             $folderComplexity = DB::queryFirstRow(
4040
-                'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
4039
+                'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
4041 4040
                 'complex',
4042 4041
                 $inputData['id']
4043 4042
             );
@@ -4049,7 +4048,7 @@  discard block
 block discarded – undo
4049 4048
             if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
4050 4049
                 $folderRow = DB::query(
4051 4050
                     'SELECT id_category
4052
-                    FROM ' . prefixTable('categories_folders') . '
4051
+                    FROM ' . prefixTable('categories_folders').'
4053 4052
                     WHERE id_folder = %i',
4054 4053
                     $inputData['id']
4055 4054
                 );
@@ -4105,8 +4104,8 @@  discard block
 block discarded – undo
4105 4104
                 $where->add('i.inactif=%i', 0);
4106 4105
                 $where->add('i.deleted_at IS NULL');
4107 4106
 
4108
-                $query_limit = ' LIMIT ' .
4109
-                    $start . ',' .
4107
+                $query_limit = ' LIMIT '.
4108
+                    $start.','.
4110 4109
                     $post_nb_items_to_display_once;
4111 4110
                     
4112 4111
                 $rows = DB::query(
@@ -4114,8 +4113,8 @@  discard block
 block discarded – undo
4114 4113
                     i.label, i.description, i.pw, i.login,
4115 4114
                     i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon,
4116 4115
                     n.renewal_period, i.url AS link, i.email
4117
-                    FROM ' . prefixTable('items') . ' AS i
4118
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
4116
+                    FROM ' . prefixTable('items').' AS i
4117
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
4119 4118
                     WHERE %l
4120 4119
                     ORDER BY i.label ASC' . $query_limit,
4121 4120
                     $where
@@ -4129,8 +4128,8 @@  discard block
 block discarded – undo
4129 4128
                     i.label, i.description, i.pw, i.login,
4130 4129
                     i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon,
4131 4130
                     n.renewal_period, i.url AS link, i.email
4132
-                    FROM ' . prefixTable('items') . ' AS i
4133
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
4131
+                    FROM ' . prefixTable('items').' AS i
4132
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
4134 4133
                     WHERE %l
4135 4134
                     ORDER BY i.label ASC',
4136 4135
                     $where
@@ -4160,7 +4159,7 @@  discard block
 block discarded – undo
4160 4159
                     $item_is_restricted_to_role = false;
4161 4160
                     DB::queryFirstRow(
4162 4161
                         'SELECT role_id
4163
-                        FROM ' . prefixTable('restriction_to_roles') . '
4162
+                        FROM ' . prefixTable('restriction_to_roles').'
4164 4163
                         WHERE item_id = %i',
4165 4164
                         $record['id']
4166 4165
                     );
@@ -4172,7 +4171,7 @@  discard block
 block discarded – undo
4172 4171
                     $user_is_included_in_role = false;
4173 4172
                     DB::query(
4174 4173
                         'SELECT role_id
4175
-                        FROM ' . prefixTable('restriction_to_roles') . '
4174
+                        FROM ' . prefixTable('restriction_to_roles').'
4176 4175
                         WHERE item_id = %i AND role_id IN %ls',
4177 4176
                         $record['id'],
4178 4177
                         $session->get('user-roles_array')
@@ -4197,11 +4196,11 @@  discard block
 block discarded – undo
4197 4196
                     }
4198 4197
 
4199 4198
                     // Get Expiration date
4200
-                    $sql = 'SELECT date FROM ' . prefixTable('log_items') 
4201
-                        . " WHERE action = 'at_creation' AND id_item=" . $record['id']
4202
-                        . ' union all SELECT date FROM '. prefixTable('log_items') 
4199
+                    $sql = 'SELECT date FROM '.prefixTable('log_items') 
4200
+                        . " WHERE action = 'at_creation' AND id_item=".$record['id']
4201
+                        . ' union all SELECT date FROM '.prefixTable('log_items') 
4203 4202
                         . " WHERE action = 'at_modification' AND raison = 'at_pw'
4204
-                        AND id_item=" . $record['id'] . " ORDER BY date DESC LIMIT 1";
4203
+                        AND id_item=" . $record['id']." ORDER BY date DESC LIMIT 1";
4205 4204
                     $record['date'] = DB::queryFirstRow($sql)['date'];
4206 4205
 
4207 4206
                     // Check if item is expired
@@ -4390,8 +4389,8 @@  discard block
 block discarded – undo
4390 4389
         if ((int) $start === 0) {
4391 4390
             DB::query(
4392 4391
                 'SELECT i.id
4393
-                FROM ' . prefixTable('items') . ' as i
4394
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
4392
+                FROM ' . prefixTable('items').' as i
4393
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
4395 4394
                 WHERE %l',
4396 4395
                 $where
4397 4396
             );
@@ -4451,8 +4450,8 @@  discard block
 block discarded – undo
4451 4450
         $dataItem = DB::queryFirstRow(
4452 4451
             'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id,
4453 4452
                     i.label AS label, i.id_tree AS id_tree
4454
-            FROM ' . prefixTable('items') . ' AS i
4455
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
4453
+            FROM ' . prefixTable('items').' AS i
4454
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
4456 4455
             WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)',
4457 4456
             $session->get('user-id'),
4458 4457
             $inputData['itemKey'] ?? '',
@@ -4564,7 +4563,7 @@  discard block
 block discarded – undo
4564 4563
         // do query on this folder
4565 4564
         $data_this_folder = DB::queryFirstRow(
4566 4565
             'SELECT id, personal_folder, title
4567
-            FROM ' . prefixTable('nested_tree') . '
4566
+            FROM ' . prefixTable('nested_tree').'
4568 4567
             WHERE id = %s',
4569 4568
             $inputData['folderId']
4570 4569
         );
@@ -4604,8 +4603,8 @@  discard block
 block discarded – undo
4604 4603
         $visibilite = '';
4605 4604
         $data = DB::queryFirstRow(
4606 4605
             'SELECT m.valeur, n.personal_folder
4607
-            FROM ' . prefixTable('misc') . ' AS m
4608
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
4606
+            FROM ' . prefixTable('misc').' AS m
4607
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
4609 4608
             WHERE type=%s AND intitule = %s',
4610 4609
             'complex',
4611 4610
             $inputData['folderId']
@@ -4618,8 +4617,8 @@  discard block
 block discarded – undo
4618 4617
             // Prepare Item actual visibility (what Users/Roles can see it)
4619 4618
             $rows = DB::query(
4620 4619
                 'SELECT t.title
4621
-                FROM ' . prefixTable('roles_values') . ' as v
4622
-                INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
4620
+                FROM ' . prefixTable('roles_values').' as v
4621
+                INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
4623 4622
                 WHERE v.folder_id = %i
4624 4623
                 GROUP BY title',
4625 4624
                 $inputData['folderId']
@@ -4628,7 +4627,7 @@  discard block
 block discarded – undo
4628 4627
                 if (empty($visibilite)) {
4629 4628
                     $visibilite = $record['title'];
4630 4629
                 } else {
4631
-                    $visibilite .= ' - ' . $record['title'];
4630
+                    $visibilite .= ' - '.$record['title'];
4632 4631
                 }
4633 4632
             }
4634 4633
         } else {
@@ -4638,14 +4637,14 @@  discard block
 block discarded – undo
4638 4637
             // do new query to know if current folder is pf
4639 4638
             $data_pf = DB::queryFirstRow(
4640 4639
                 'SELECT personal_folder
4641
-                FROM ' . prefixTable('nested_tree') . '
4640
+                FROM ' . prefixTable('nested_tree').'
4642 4641
                 WHERE id = %s',
4643 4642
                 $inputData['folderId']
4644 4643
             );
4645 4644
             
4646 4645
             $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
4647 4646
             
4648
-            $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')';
4647
+            $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')';
4649 4648
         }
4650 4649
 
4651 4650
         recupDroitCreationSansComplexite($inputData['folderId']);
@@ -4655,8 +4654,8 @@  discard block
 block discarded – undo
4655 4654
         $listOptionsForRoles = array();
4656 4655
         $rows = DB::query(
4657 4656
             'SELECT r.role_id AS role_id, t.title AS title
4658
-            FROM ' . prefixTable('roles_values') . ' AS r
4659
-            INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
4657
+            FROM ' . prefixTable('roles_values').' AS r
4658
+            INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
4660 4659
             WHERE r.folder_id = %i',
4661 4660
             $inputData['folderId']
4662 4661
         );
@@ -4671,8 +4670,8 @@  discard block
 block discarded – undo
4671 4670
             $rows2 = DB::query(
4672 4671
                 'SELECT u.id, u.login, u.email, u.name, u.lastname,
4673 4672
                 GROUP_CONCAT(DISTINCT ur.role_id ORDER BY ur.role_id SEPARATOR ";") AS fonction_id
4674
-                FROM ' . prefixTable('users') . ' AS u
4675
-                INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
4673
+                FROM ' . prefixTable('users').' AS u
4674
+                INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
4676 4675
                 WHERE u.admin = 0 AND ur.source = %s
4677 4676
                 GROUP BY u.id',
4678 4677
                 'manual'
@@ -4688,7 +4687,7 @@  discard block
 block discarded – undo
4688 4687
                             array(
4689 4688
                                 'id' => $record2['id'],
4690 4689
                                 'login' => $record2['login'],
4691
-                                'name' => $record2['name'] . ' ' . $record2['lastname'],
4690
+                                'name' => $record2['name'].' '.$record2['lastname'],
4692 4691
                                 'email' => $record2['email'],
4693 4692
                             )
4694 4693
                         );
@@ -4705,12 +4704,12 @@  discard block
 block discarded – undo
4705 4704
             foreach ($session->get('user-roles_array') as $role) {
4706 4705
                 $access = DB::queryFirstRow(
4707 4706
                     'SELECT type
4708
-                    FROM ' . prefixTable('roles_values') . '
4707
+                    FROM ' . prefixTable('roles_values').'
4709 4708
                     WHERE role_id = %i AND folder_id = %i',
4710 4709
                     $role,
4711 4710
                     $inputData['folderId']
4712 4711
                 );
4713
-                if (DB::count()>0) {
4712
+                if (DB::count() > 0) {
4714 4713
                     if ($access['type'] === 'R') {
4715 4714
                         array_push($arrTmp, 10);
4716 4715
                     } elseif ($access['type'] === 'W') {
@@ -4738,7 +4737,7 @@  discard block
 block discarded – undo
4738 4737
             // Check if personal folder is owned by user
4739 4738
             $folder = DB::queryFirstRow(
4740 4739
                 'SELECT id
4741
-                FROM ' . prefixTable('nested_tree') . '
4740
+                FROM ' . prefixTable('nested_tree').'
4742 4741
                 WHERE title = %s',
4743 4742
                 $session->get('user-id'),
4744 4743
             );
@@ -4843,7 +4842,7 @@  discard block
 block discarded – undo
4843 4842
         // Get some info before deleting
4844 4843
         $data = DB::queryFirstRow(
4845 4844
             'SELECT name, id_item, file
4846
-            FROM ' . prefixTable('files') . '
4845
+            FROM ' . prefixTable('files').'
4847 4846
             WHERE id = %i',
4848 4847
             $fileId
4849 4848
         );
@@ -4851,7 +4850,7 @@  discard block
 block discarded – undo
4851 4850
         // Load item data
4852 4851
         $data_item = DB::queryFirstRow(
4853 4852
             'SELECT id_tree
4854
-            FROM ' . prefixTable('items') . '
4853
+            FROM ' . prefixTable('items').'
4855 4854
             WHERE id = %i',
4856 4855
             $data['id_item']
4857 4856
         );
@@ -4881,7 +4880,7 @@  discard block
 block discarded – undo
4881 4880
                 $session->get('user-id'),
4882 4881
                 'at_modification',
4883 4882
                 $session->get('user-login'),
4884
-                'at_del_file : ' . $data['name']
4883
+                'at_del_file : '.$data['name']
4885 4884
             );
4886 4885
 
4887 4886
             // DElete sharekeys
@@ -4892,7 +4891,7 @@  discard block
 block discarded – undo
4892 4891
             );
4893 4892
 
4894 4893
             // Delete file from server
4895
-            $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']);
4894
+            $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']);
4896 4895
             $fileToDelete = realpath($fileToDelete);
4897 4896
             if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) {
4898 4897
                 fileDelete($fileToDelete, $SETTINGS);
@@ -4946,7 +4945,7 @@  discard block
 block discarded – undo
4946 4945
             // Update SESSION with this new favourite
4947 4946
             $data = DB::queryFirstRow(
4948 4947
                 'SELECT label,id_tree
4949
-                FROM ' . prefixTable('items') . '
4948
+                FROM ' . prefixTable('items').'
4950 4949
                 WHERE id = %i',
4951 4950
                 $inputData['itemId']
4952 4951
             );
@@ -4955,7 +4954,7 @@  discard block
 block discarded – undo
4955 4954
                 [
4956 4955
                     $inputData['itemId'] => [
4957 4956
                         'label' => $data['label'],
4958
-                        'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $inputData['itemId'],
4957
+                        'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$inputData['itemId'],
4959 4958
                     ],
4960 4959
                 ],
4961 4960
                 'add'
@@ -5024,8 +5023,8 @@  discard block
 block discarded – undo
5024 5023
         // get data about item
5025 5024
         $dataSource = DB::queryFirstRow(
5026 5025
             'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
5027
-            FROM ' . prefixTable('items') . ' as i
5028
-            INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
5026
+            FROM ' . prefixTable('items').' as i
5027
+            INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
5029 5028
             WHERE i.id=%i',
5030 5029
             $inputData['itemId']
5031 5030
         );
@@ -5069,7 +5068,7 @@  discard block
 block discarded – undo
5069 5068
         // get data about new folder
5070 5069
         $dataDestination = DB::queryFirstRow(
5071 5070
             'SELECT personal_folder, title
5072
-            FROM ' . prefixTable('nested_tree') . '
5071
+            FROM ' . prefixTable('nested_tree').'
5073 5072
             WHERE id = %i',
5074 5073
             $inputData['folderId']
5075 5074
         );
@@ -5122,7 +5121,7 @@  discard block
 block discarded – undo
5122 5121
             // Get fields for this Item
5123 5122
             $rows = DB::query(
5124 5123
                 'SELECT id
5125
-                FROM ' . prefixTable('categories_items') . '
5124
+                FROM ' . prefixTable('categories_items').'
5126 5125
                 WHERE item_id = %i',
5127 5126
                 $inputData['itemId']
5128 5127
             );
@@ -5139,7 +5138,7 @@  discard block
 block discarded – undo
5139 5138
             // Get FILES for this Item
5140 5139
             $rows = DB::query(
5141 5140
                 'SELECT id
5142
-                FROM ' . prefixTable('files') . '
5141
+                FROM ' . prefixTable('files').'
5143 5142
                 WHERE id_item = %i',
5144 5143
                 $inputData['itemId']
5145 5144
             );
@@ -5186,7 +5185,7 @@  discard block
 block discarded – undo
5186 5185
             // Get the ITEM object key for the user
5187 5186
             $userKey = DB::queryFirstRow(
5188 5187
                 'SELECT share_key
5189
-                FROM ' . prefixTable('sharekeys_items') . '
5188
+                FROM ' . prefixTable('sharekeys_items').'
5190 5189
                 WHERE user_id = %i AND object_id = %i',
5191 5190
                 $session->get('user-id'),
5192 5191
                 $inputData['itemId']
@@ -5197,7 +5196,7 @@  discard block
 block discarded – undo
5197 5196
                 // This is a public object
5198 5197
                 $users = DB::query(
5199 5198
                     'SELECT id, public_key
5200
-                    FROM ' . prefixTable('users') . '
5199
+                    FROM ' . prefixTable('users').'
5201 5200
                     WHERE id NOT IN %li
5202 5201
                     AND public_key != ""',
5203 5202
                     $tpUsersIDs
@@ -5217,14 +5216,14 @@  discard block
 block discarded – undo
5217 5216
             // Get fields for this Item
5218 5217
             $rows = DB::query(
5219 5218
                 'SELECT id
5220
-                FROM ' . prefixTable('categories_items') . '
5219
+                FROM ' . prefixTable('categories_items').'
5221 5220
                 WHERE item_id = %i',
5222 5221
                 $inputData['itemId']
5223 5222
             );
5224 5223
             foreach ($rows as $field) {
5225 5224
                 $userKey = DB::queryFirstRow(
5226 5225
                     'SELECT share_key
5227
-                    FROM ' . prefixTable('sharekeys_fields') . '
5226
+                    FROM ' . prefixTable('sharekeys_fields').'
5228 5227
                     WHERE user_id = %i AND object_id = %i',
5229 5228
                     $session->get('user-id'),
5230 5229
                     $field['id']
@@ -5235,7 +5234,7 @@  discard block
 block discarded – undo
5235 5234
                     // This is a public object
5236 5235
                     $users = DB::query(
5237 5236
                         'SELECT id, public_key
5238
-                        FROM ' . prefixTable('users') . '
5237
+                        FROM ' . prefixTable('users').'
5239 5238
                         WHERE id NOT IN %li
5240 5239
                         AND public_key != ""',
5241 5240
                         $tpUsersIDs
@@ -5256,14 +5255,14 @@  discard block
 block discarded – undo
5256 5255
             // Get FILES for this Item
5257 5256
             $rows = DB::query(
5258 5257
                 'SELECT id
5259
-                FROM ' . prefixTable('files') . '
5258
+                FROM ' . prefixTable('files').'
5260 5259
                 WHERE id_item = %i',
5261 5260
                 $inputData['itemId']
5262 5261
             );
5263 5262
             foreach ($rows as $attachment) {
5264 5263
                 $userKey = DB::queryFirstRow(
5265 5264
                     'SELECT share_key
5266
-                    FROM ' . prefixTable('sharekeys_files') . '
5265
+                    FROM ' . prefixTable('sharekeys_files').'
5267 5266
                     WHERE user_id = %i AND object_id = %i',
5268 5267
                     $session->get('user-id'),
5269 5268
                     $attachment['id']
@@ -5274,7 +5273,7 @@  discard block
 block discarded – undo
5274 5273
                     // This is a public object
5275 5274
                     $users = DB::query(
5276 5275
                         'SELECT id, public_key
5277
-                        FROM ' . prefixTable('users') . '
5276
+                        FROM ' . prefixTable('users').'
5278 5277
                         WHERE id NOT IN %li
5279 5278
                         AND public_key != ""',
5280 5279
                         $tpUsersIDs
@@ -5313,7 +5312,7 @@  discard block
 block discarded – undo
5313 5312
             $session->get('user-id'),
5314 5313
             'at_modification',
5315 5314
             $session->get('user-login'),
5316
-            'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
5315
+            'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
5317 5316
         );
5318 5317
 
5319 5318
         // Update cache table
@@ -5372,8 +5371,8 @@  discard block
 block discarded – undo
5372 5371
                 // get data about item
5373 5372
                 $dataSource = DB::queryFirstRow(
5374 5373
                     'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
5375
-                    FROM ' . prefixTable('items') . ' as i
5376
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
5374
+                    FROM ' . prefixTable('items').' as i
5375
+                    INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
5377 5376
                     WHERE i.id=%i',
5378 5377
                     $item_id
5379 5378
                 );
@@ -5395,7 +5394,7 @@  discard block
 block discarded – undo
5395 5394
 
5396 5395
                 // get data about new folder
5397 5396
                 $dataDestination = DB::queryFirstRow(
5398
-                    'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
5397
+                    'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
5399 5398
                     $inputData['folderId']
5400 5399
                 );
5401 5400
 
@@ -5429,14 +5428,14 @@  discard block
 block discarded – undo
5429 5428
                         prefixTable('sharekeys_items'),
5430 5429
                         'object_id = %i AND user_id NOT IN %ls',
5431 5430
                         $item_id,
5432
-                        [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
5431
+                        [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
5433 5432
                     );
5434 5433
 
5435 5434
                     // Remove all item sharekeys fields
5436 5435
                     // Get fields for this Item
5437 5436
                     $rows = DB::query(
5438 5437
                         'SELECT id
5439
-                        FROM ' . prefixTable('categories_items') . '
5438
+                        FROM ' . prefixTable('categories_items').'
5440 5439
                         WHERE item_id = %i',
5441 5440
                         $item_id
5442 5441
                     );
@@ -5453,7 +5452,7 @@  discard block
 block discarded – undo
5453 5452
                     // Get FILES for this Item
5454 5453
                     $rows = DB::query(
5455 5454
                         'SELECT id
5456
-                        FROM ' . prefixTable('files') . '
5455
+                        FROM ' . prefixTable('files').'
5457 5456
                         WHERE id_item = %i',
5458 5457
                         $item_id
5459 5458
                     );
@@ -5508,7 +5507,7 @@  discard block
 block discarded – undo
5508 5507
                     // Get the ITEM object key for the user
5509 5508
                     $userKey = DB::queryFirstRow(
5510 5509
                         'SELECT share_key
5511
-                        FROM ' . prefixTable('sharekeys_items') . '
5510
+                        FROM ' . prefixTable('sharekeys_items').'
5512 5511
                         WHERE user_id = %i AND object_id = %i',
5513 5512
                         $session->get('user-id'),
5514 5513
                         $item_id
@@ -5519,7 +5518,7 @@  discard block
 block discarded – undo
5519 5518
                         // This is a public object
5520 5519
                         $users = DB::query(
5521 5520
                             'SELECT id, public_key
5522
-                            FROM ' . prefixTable('users') . '
5521
+                            FROM ' . prefixTable('users').'
5523 5522
                             WHERE id NOT IN %li
5524 5523
                             AND public_key != ""',
5525 5524
                             $tpUsersIDs
@@ -5540,14 +5539,14 @@  discard block
 block discarded – undo
5540 5539
                     // Get fields for this Item
5541 5540
                     $rows = DB::query(
5542 5541
                         'SELECT id
5543
-                        FROM ' . prefixTable('categories_items') . '
5542
+                        FROM ' . prefixTable('categories_items').'
5544 5543
                         WHERE item_id = %i',
5545 5544
                         $item_id
5546 5545
                     );
5547 5546
                     foreach ($rows as $field) {
5548 5547
                         $userKey = DB::queryFirstRow(
5549 5548
                             'SELECT share_key
5550
-                            FROM ' . prefixTable('sharekeys_fields') . '
5549
+                            FROM ' . prefixTable('sharekeys_fields').'
5551 5550
                             WHERE user_id = %i AND object_id = %i',
5552 5551
                             $session->get('user-id'),
5553 5552
                             $field['id']
@@ -5558,7 +5557,7 @@  discard block
 block discarded – undo
5558 5557
                             // This is a public object
5559 5558
                             $users = DB::query(
5560 5559
                                 'SELECT id, public_key
5561
-                                FROM ' . prefixTable('users') . '
5560
+                                FROM ' . prefixTable('users').'
5562 5561
                                 WHERE id NOT IN %li
5563 5562
                                 AND public_key != ""',
5564 5563
                                 $tpUsersIDs
@@ -5580,14 +5579,14 @@  discard block
 block discarded – undo
5580 5579
                     // Get FILES for this Item
5581 5580
                     $rows = DB::query(
5582 5581
                         'SELECT id
5583
-                        FROM ' . prefixTable('files') . '
5582
+                        FROM ' . prefixTable('files').'
5584 5583
                         WHERE id_item = %i',
5585 5584
                         $item_id
5586 5585
                     );
5587 5586
                     foreach ($rows as $attachment) {
5588 5587
                         $userKey = DB::queryFirstRow(
5589 5588
                             'SELECT share_key
5590
-                            FROM ' . prefixTable('sharekeys_files') . '
5589
+                            FROM ' . prefixTable('sharekeys_files').'
5591 5590
                             WHERE user_id = %i AND object_id = %i',
5592 5591
                             $session->get('user-id'),
5593 5592
                             $attachment['id']
@@ -5598,7 +5597,7 @@  discard block
 block discarded – undo
5598 5597
                             // This is a public object
5599 5598
                             $users = DB::query(
5600 5599
                                 'SELECT id, public_key
5601
-                                FROM ' . prefixTable('users') . '
5600
+                                FROM ' . prefixTable('users').'
5602 5601
                                 WHERE id NOT IN %li
5603 5602
                                 AND public_key != ""',
5604 5603
                                 $tpUsersIDs
@@ -5636,13 +5635,13 @@  discard block
 block discarded – undo
5636 5635
                     $session->get('user-id'),
5637 5636
                     'at_modification',
5638 5637
                     $session->get('user-login'),
5639
-                    'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
5638
+                    'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
5640 5639
                 );
5641 5640
             }
5642 5641
         }
5643 5642
 
5644 5643
         // reload cache table
5645
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
5644
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
5646 5645
         updateCacheTable('reload', null);
5647 5646
 
5648 5647
         echo (string) prepareExchangedData(
@@ -5706,7 +5705,7 @@  discard block
 block discarded – undo
5706 5705
                 // get info
5707 5706
                 $dataSource = DB::queryFirstRow(
5708 5707
                     'SELECT label, id_tree
5709
-                    FROM ' . prefixTable('items') . '
5708
+                    FROM ' . prefixTable('items').'
5710 5709
                     WHERE id=%i',
5711 5710
                     $item_id
5712 5711
                 );
@@ -5807,14 +5806,14 @@  discard block
 block discarded – undo
5807 5806
             // Variables
5808 5807
             $dataAuthor = DB::queryFirstRow(
5809 5808
                 'SELECT email,login
5810
-                FROM ' . prefixTable('users') . '
5809
+                FROM ' . prefixTable('users').'
5811 5810
                 WHERE id = %i',
5812 5811
                 $post_content[1]
5813 5812
             );
5814 5813
 
5815 5814
             $dataItem = DB::queryFirstRow(
5816 5815
                 'SELECT label, id_tree
5817
-                FROM ' . prefixTable('items') . '
5816
+                FROM ' . prefixTable('items').'
5818 5817
                 WHERE id = %i',
5819 5818
                 $post_content[0]
5820 5819
             );
@@ -5831,7 +5830,7 @@  discard block
 block discarded – undo
5831 5830
                 $lang->get('email_request_access_subject'),
5832 5831
                 str_replace(
5833 5832
                     array('#tp_item_author#', '#tp_user#', '#tp_item#'),
5834
-                    array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
5833
+                    array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
5835 5834
                     $lang->get('email_request_access_mail')
5836 5835
                 ),
5837 5836
                 $dataAuthor['email'],
@@ -5840,7 +5839,7 @@  discard block
 block discarded – undo
5840 5839
         } elseif ($inputData['cat'] === 'share_this_item') {
5841 5840
             $dataItem = DB::queryFirstRow(
5842 5841
                 'SELECT label,id_tree
5843
-                FROM ' . prefixTable('items') . '
5842
+                FROM ' . prefixTable('items').'
5844 5843
                 WHERE id= %i',
5845 5844
                 $inputData['id']
5846 5845
             );
@@ -5863,7 +5862,7 @@  discard block
 block discarded – undo
5863 5862
                     ),
5864 5863
                     array(
5865 5864
                         empty($SETTINGS['email_server_url']) === false ?
5866
-                            $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'],
5865
+                            $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'],
5867 5866
                         addslashes($session->get('user-login')),
5868 5867
                         addslashes($path),
5869 5868
                     ),
@@ -5912,8 +5911,8 @@  discard block
 block discarded – undo
5912 5911
         // Get all informations for this item
5913 5912
         $dataItem = DB::queryFirstRow(
5914 5913
             'SELECT *
5915
-            FROM ' . prefixTable('items') . ' as i
5916
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
5914
+            FROM ' . prefixTable('items').' as i
5915
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
5917 5916
             WHERE i.id=%i AND l.action = %s',
5918 5917
             $item_id,
5919 5918
             'at_creation'
@@ -5942,18 +5941,18 @@  discard block
 block discarded – undo
5942 5941
                 $session->get('user-login'),
5943 5942
                 htmlspecialchars_decode($label, ENT_QUOTES),
5944 5943
                 null,
5945
-                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'])
5944
+                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format'])
5946 5945
             );
5947 5946
             // Prepare new line
5948 5947
             $data = DB::queryFirstRow(
5949
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
5948
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
5950 5949
                 $item_id
5951 5950
             );
5952
-            $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison'];
5951
+            $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison'];
5953 5952
             // send back
5954 5953
             $data = array(
5955 5954
                 'error' => '',
5956
-                'new_line' => '<br>' . addslashes($historic),
5955
+                'new_line' => '<br>'.addslashes($historic),
5957 5956
             );
5958 5957
             echo (string) prepareExchangedData(
5959 5958
                 $data,
@@ -6028,8 +6027,8 @@  discard block
 block discarded – undo
6028 6027
         // Should we log a password change?
6029 6028
         $itemQ = DB::queryFirstRow(
6030 6029
             'SELECT s.share_key, i.pw
6031
-            FROM ' . prefixTable('items') . ' AS i
6032
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
6030
+            FROM ' . prefixTable('items').' AS i
6031
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
6033 6032
             WHERE s.user_id = %i AND s.object_id = %i',
6034 6033
             $session->get('user-id'),
6035 6034
             $dataReceived['id']
@@ -6084,7 +6083,7 @@  discard block
 block discarded – undo
6084 6083
         if (isset($SETTINGS['otv_expiration_period']) === false) {
6085 6084
             $SETTINGS['otv_expiration_period'] = 7;
6086 6085
         }
6087
-        $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session);
6086
+        $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
6088 6087
 
6089 6088
         echo json_encode(
6090 6089
             array(
@@ -6115,7 +6114,7 @@  discard block
 block discarded – undo
6115 6114
         // get parameters from original link
6116 6115
         $url = $dataReceived['original_link'];
6117 6116
         $parts = parse_url($url);
6118
-        if(isset($parts['query'])){
6117
+        if (isset($parts['query'])) {
6119 6118
             parse_str($parts['query'], $orignal_link_parameters);
6120 6119
         } else {
6121 6120
             $orignal_link_parameters = array();
@@ -6146,13 +6145,13 @@  discard block
 block discarded – undo
6146 6145
             $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME);
6147 6146
             $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST);
6148 6147
             if (str_contains($domain_host, 'www.') === true) {
6149
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4);
6148
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4);
6150 6149
             } else {
6151
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host;
6150
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host;
6152 6151
             }
6153
-            $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session);
6152
+            $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session);
6154 6153
         } else {
6155
-            $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session);
6154
+            $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
6156 6155
         }
6157 6156
 
6158 6157
         echo (string) prepareExchangedData(
@@ -6187,8 +6186,8 @@  discard block
 block discarded – undo
6187 6186
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
6188 6187
             f.extension AS extension, f.type AS type,
6189 6188
             s.share_key AS share_key
6190
-            FROM ' . prefixTable('files') . ' AS f
6191
-            INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
6189
+            FROM ' . prefixTable('files').' AS f
6190
+            INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
6192 6191
             WHERE s.user_id = %i AND s.object_id = %i',
6193 6192
             $session->get('user-id'),
6194 6193
             $inputData['id']
@@ -6209,7 +6208,7 @@  discard block
 block discarded – undo
6209 6208
         //$fileName = basename($file_info['name'], '.'.$file_info['extension']);
6210 6209
 
6211 6210
         // prepare image info
6212
-        $post_title = basename($file_info['name'], '.' . $file_info['extension']);
6211
+        $post_title = basename($file_info['name'], '.'.$file_info['extension']);
6213 6212
         $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title;
6214 6213
         
6215 6214
         // Get image content
@@ -6236,7 +6235,7 @@  discard block
 block discarded – undo
6236 6235
         echo (string) prepareExchangedData(
6237 6236
             array(
6238 6237
                 'error' => false,
6239
-                'filename' => $post_title . '.' . $file_info['extension'],
6238
+                'filename' => $post_title.'.'.$file_info['extension'],
6240 6239
                 'file_type' => $file_info['type'],
6241 6240
                 'file_content' => $fileContent,
6242 6241
             ),
@@ -6348,7 +6347,7 @@  discard block
 block discarded – undo
6348 6347
                     $arbo = $tree->getPath($folder->id, false);
6349 6348
                     $path = '';
6350 6349
                     foreach ($arbo as $elem) {
6351
-                        $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
6350
+                        $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
6352 6351
                     }
6353 6352
 
6354 6353
                     // Build array
@@ -6415,7 +6414,7 @@  discard block
 block discarded – undo
6415 6414
         if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') {
6416 6415
             $rows = DB::query(
6417 6416
                 'SELECT id, categories
6418
-                FROM ' . prefixTable('nested_tree') . '
6417
+                FROM ' . prefixTable('nested_tree').'
6419 6418
                 WHERE id IN (%l)',
6420 6419
                 implode(',', $foldersArray)
6421 6420
             );
@@ -6433,7 +6432,7 @@  discard block
 block discarded – undo
6433 6432
             if (count($ids) > 0) {
6434 6433
                 $subfolders = DB::queryFirstColumn(
6435 6434
                     'SELECT title
6436
-                    FROM ' . prefixTable('nested_tree') . '
6435
+                    FROM ' . prefixTable('nested_tree').'
6437 6436
                     WHERE id IN %li',
6438 6437
                     $ids
6439 6438
                 );
@@ -6469,7 +6468,7 @@  discard block
 block discarded – undo
6469 6468
         // get item info
6470 6469
         $dataItem = DB::queryFirstRow(
6471 6470
             'SELECT *
6472
-            FROM ' . prefixTable('items') . '
6471
+            FROM ' . prefixTable('items').'
6473 6472
             WHERE id=%i',
6474 6473
             $inputData['itemId']
6475 6474
         );
@@ -6481,8 +6480,8 @@  discard block
 block discarded – undo
6481 6480
             'SELECT l.date as date, l.action as action, l.raison as raison,
6482 6481
                 u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname,
6483 6482
                 l.old_value as old_value
6484
-            FROM ' . prefixTable('log_items') . ' as l
6485
-            INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
6483
+            FROM ' . prefixTable('log_items').' as l
6484
+            INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
6486 6485
             WHERE id_item=%i AND l.action NOT IN (%l)
6487 6486
             ORDER BY date DESC',
6488 6487
             $inputData['itemId'],
@@ -6497,18 +6496,18 @@  discard block
 block discarded – undo
6497 6496
             
6498 6497
             // imported via API
6499 6498
             if (empty($record['login']) === true) {
6500
-                $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']';
6499
+                $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']';
6501 6500
             }
6502 6501
             
6503 6502
             // Prepare avatar
6504 6503
             if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) {
6505
-                if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
6506
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
6504
+                if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
6505
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb'];
6507 6506
                 } else {
6508
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
6507
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
6509 6508
                 }
6510 6509
             } else {
6511
-                $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
6510
+                $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
6512 6511
             }
6513 6512
 
6514 6513
             // Prepare action
@@ -6528,7 +6527,7 @@  discard block
 block discarded – undo
6528 6527
                         $previous_passwords, 
6529 6528
                         [
6530 6529
                             'password' => htmlentities($previous_pwd['string']),
6531
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
6530
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
6532 6531
                         ]
6533 6532
                     );
6534 6533
                 }
@@ -6541,19 +6540,19 @@  discard block
 block discarded – undo
6541 6540
                 $action = $lang->get($reason[0]);
6542 6541
                 if ($reason[0] === 'at_moved') {
6543 6542
                     $tmp = explode(' -> ', $reason[1]);
6544
-                    $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
6543
+                    $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
6545 6544
                 } elseif ($reason[0] === 'at_field') {
6546 6545
                     $tmp = explode(' => ', $reason[1]);
6547 6546
                     if (count($tmp) > 1) {
6548
-                        $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') .
6549
-                            ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
6547
+                        $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value').
6548
+                            ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
6550 6549
                     } else {
6551 6550
                         $detail = trim($reason[1]);
6552 6551
                     }
6553 6552
                 } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
6554 6553
                     $tmp = explode(' => ', $reason[1]);
6555 6554
                     $detail = empty(trim($tmp[0])) === true ?
6556
-                        $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
6555
+                        $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
6557 6556
                 } elseif ($reason[0] === 'at_automatic_del') {
6558 6557
                     $detail = $lang->get($reason[1]);
6559 6558
                 } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') {
@@ -6562,7 +6561,7 @@  discard block
 block discarded – undo
6562 6561
                     $tmp = explode(':', $reason[1]);
6563 6562
                     $tmp = explode('.', $tmp[0]);
6564 6563
                     $detail = isBase64($tmp[0]) === true ?
6565
-                        base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0];
6564
+                        base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0];
6566 6565
                 } elseif ($reason[0] === 'at_import') {
6567 6566
                     $detail = '';
6568 6567
                 } elseif (in_array($reason[0], array('csv', 'pdf')) === true) {
@@ -6581,8 +6580,8 @@  discard block
 block discarded – undo
6581 6580
                 array(
6582 6581
                     'avatar' => $avatar,
6583 6582
                     'login' => $record['login'],
6584
-                    'name' => $record['name'] . ' ' . $record['lastname'],
6585
-                    'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
6583
+                    'name' => $record['name'].' '.$record['lastname'],
6584
+                    'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
6586 6585
                     'action' => $action,
6587 6586
                     'detail' => $detail,
6588 6587
                 )
@@ -6670,11 +6669,11 @@  discard block
 block discarded – undo
6670 6669
 
6671 6670
         // get some info to add to the notification email
6672 6671
         $resp_user = DB::queryFirstRow(
6673
-            'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
6672
+            'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
6674 6673
             $session->get('user-id')
6675 6674
         );
6676 6675
         $resp_folder = DB::queryFirstRow(
6677
-            'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
6676
+            'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
6678 6677
             $folder
6679 6678
         );
6680 6679
 
@@ -6683,7 +6682,7 @@  discard block
 block discarded – undo
6683 6682
         $emailService = new EmailService();
6684 6683
         $rows = DB::query(
6685 6684
             'SELECT email
6686
-            FROM ' . prefixTable('users') . '
6685
+            FROM ' . prefixTable('users').'
6687 6686
             WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
6688 6687
             1
6689 6688
         );
@@ -6729,7 +6728,7 @@  discard block
 block discarded – undo
6729 6728
         // Send email
6730 6729
         $dataItem = DB::queryFirstRow(
6731 6730
             'SELECT label, id_tree
6732
-            FROM ' . prefixTable('items') . '
6731
+            FROM ' . prefixTable('items').'
6733 6732
             WHERE id = %i',
6734 6733
             $inputData['itemId']
6735 6734
         );
@@ -6783,7 +6782,7 @@  discard block
 block discarded – undo
6783 6782
 
6784 6783
         DB::query(
6785 6784
             'SELECT *
6786
-            FROM ' . prefixTable('notification') . '
6785
+            FROM ' . prefixTable('notification').'
6787 6786
             WHERE item_id = %i AND user_id = %i',
6788 6787
             $inputData['itemId'],
6789 6788
             $session->get('user-id')
@@ -6855,7 +6854,7 @@  discard block
 block discarded – undo
6855 6854
         // And related logs
6856 6855
         $rows = DB::query(
6857 6856
             'SELECT id, file AS filename
6858
-            FROM ' . prefixTable('files') . '
6857
+            FROM ' . prefixTable('files').'
6859 6858
             WHERE id_item = %i AND confirmed = %i',
6860 6859
             $inputData['itemId'],
6861 6860
             0
@@ -6869,12 +6868,12 @@  discard block
 block discarded – undo
6869 6868
             );
6870 6869
 
6871 6870
             // Delete file on server
6872
-            unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
6871
+            unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
6873 6872
 
6874 6873
             // Delete related logs
6875 6874
             $logFile = DB::query(
6876 6875
                 'SELECT increment_id, raison
6877
-                FROM ' . prefixTable('log_items') . '
6876
+                FROM ' . prefixTable('log_items').'
6878 6877
                 WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
6879 6878
                 $inputData['itemId'],
6880 6879
                 $session->get('user-id'),
@@ -6933,7 +6932,7 @@  discard block
 block discarded – undo
6933 6932
         // Confirm attachments
6934 6933
         $rows = DB::query(
6935 6934
             'SELECT id, file AS filename
6936
-            FROM ' . prefixTable('files') . '
6935
+            FROM ' . prefixTable('files').'
6937 6936
             WHERE id_item = %i AND confirmed = %i',
6938 6937
             $inputData['itemId'],
6939 6938
             0
@@ -7049,7 +7048,7 @@  discard block
 block discarded – undo
7049 7048
             $successfulDeletions = array();
7050 7049
             $failedDeletions = array();
7051 7050
 
7052
-            foreach( $selectedItemIds as $itemId) {
7051
+            foreach ($selectedItemIds as $itemId) {
7053 7052
                 // Check that user can access this item
7054 7053
                 $granted = accessToItemIsGranted((int) $itemId, $SETTINGS);
7055 7054
                 if ($granted !== true) {
@@ -7060,7 +7059,7 @@  discard block
 block discarded – undo
7060 7059
                 // Load item data
7061 7060
                 $data = DB::queryFirstRow(
7062 7061
                     'SELECT id_tree, id, label
7063
-                    FROM ' . prefixTable('items') . '
7062
+                    FROM ' . prefixTable('items').'
7064 7063
                     WHERE id = %i',
7065 7064
                     $itemId
7066 7065
                 );
@@ -7143,15 +7142,15 @@  discard block
 block discarded – undo
7143 7142
         case 'autocomplete_tags':
7144 7143
             // Get a list off all existing TAGS
7145 7144
             $listOfTags = '';
7146
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
7145
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
7147 7146
             foreach ($rows as $record) {
7148 7147
                 if (empty($listOfTags)) {
7149
-                    $listOfTags = '"' . $record['tag'] . '"';
7148
+                    $listOfTags = '"'.$record['tag'].'"';
7150 7149
                 } else {
7151
-                    $listOfTags .= ', "' . $record['tag'] . '"';
7150
+                    $listOfTags .= ', "'.$record['tag'].'"';
7152 7151
                 }
7153 7152
             }
7154
-            echo '[' . $listOfTags . ']';
7153
+            echo '['.$listOfTags.']';
7155 7154
             break;
7156 7155
     }
7157 7156
 }
@@ -7167,7 +7166,7 @@  discard block
 block discarded – undo
7167 7166
 {
7168 7167
     $data = DB::queryFirstRow(
7169 7168
         'SELECT bloquer_creation, bloquer_modification, personal_folder
7170
-        FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
7169
+        FROM ' . prefixTable('nested_tree').' WHERE id = %i',
7171 7170
         $groupe
7172 7171
     );
7173 7172
     // Check if it's in a personal folder. If yes, then force complexity overhead.
@@ -7287,7 +7286,7 @@  discard block
 block discarded – undo
7287 7286
     // Get item date
7288 7287
     $itemRestrictedUsersList = DB::queryFirstRow(
7289 7288
         'SELECT restricted_to
7290
-         FROM ' . prefixTable('items') . '
7289
+         FROM ' . prefixTable('items').'
7291 7290
          WHERE id = %i',
7292 7291
         $itemId
7293 7292
     );
@@ -7320,7 +7319,7 @@  discard block
 block discarded – undo
7320 7319
     $now = time();
7321 7320
     $editionLocks = DB::query(
7322 7321
         'SELECT timestamp, user_id, increment_id
7323
-         FROM ' . prefixTable('items_edition') . '
7322
+         FROM ' . prefixTable('items_edition').'
7324 7323
          WHERE item_id = %i 
7325 7324
          ORDER BY increment_id DESC',
7326 7325
         $itemId
@@ -7366,7 +7365,7 @@  discard block
 block discarded – undo
7366 7365
 
7367 7366
         // Delete related background tasks if any
7368 7367
         $task = DB::queryFirstRow(
7369
-            'SELECT increment_id FROM ' . prefixTable('background_tasks') . '
7368
+            'SELECT increment_id FROM '.prefixTable('background_tasks').'
7370 7369
              WHERE item_id = %i AND finished_at = ""',
7371 7370
             $itemId
7372 7371
         );
@@ -7379,7 +7378,7 @@  discard block
 block discarded – undo
7379 7378
         // Check if encryption process is still running
7380 7379
         DB::queryFirstRow(
7381 7380
             'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id
7382
-             FROM ' . prefixTable('background_tasks') . '
7381
+             FROM ' . prefixTable('background_tasks').'
7383 7382
              WHERE item_id = %i AND finished_at = ""
7384 7383
              ORDER BY increment_id DESC',
7385 7384
             $itemId
@@ -7400,7 +7399,7 @@  discard block
 block discarded – undo
7400 7399
         }
7401 7400
 
7402 7401
         return [
7403
-            'status' => true,   // Encryption in progress
7402
+            'status' => true, // Encryption in progress
7404 7403
             'delay' => $delay - $elapsed, // Time remaining before the lock expires
7405 7404
         ];
7406 7405
     }
@@ -7445,7 +7444,7 @@  discard block
 block discarded – undo
7445 7444
 {
7446 7445
     // Check if there's an ongoing background encryption process for the item
7447 7446
     $ongoingProcess = DB::queryFirstRow(
7448
-        'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
7447
+        'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
7449 7448
         $itemId
7450 7449
     );
7451 7450
 
@@ -7463,7 +7462,7 @@  discard block
 block discarded – undo
7463 7462
 function getUserVisibleFolders(int $userId): array
7464 7463
 {
7465 7464
     // Query to retrieve visible folders for the user
7466
-    $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId);
7465
+    $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId);
7467 7466
     
7468 7467
     // Decode JSON data into an array; return an empty array if the data is invalid
7469 7468
     return json_decode($data['visible_folders'], true) ?? [];
@@ -7487,7 +7486,7 @@  discard block
 block discarded – undo
7487 7486
 
7488 7487
     // Query the access rights for the given roles and folder
7489 7488
     $accessTypes = DB::queryFirstColumn(
7490
-        'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', 
7489
+        'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', 
7491 7490
         $roles, 
7492 7491
         $treeId
7493 7492
     );
Please login to merge, or discard this patch.
sources/identify.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
     $sessionPwdAttempts = $session->get('pwd_attempts');
147 147
     $sessionUrl = $session->get('user-initial_url');
148 148
     $server = [];
149
-    $server['PHP_AUTH_USER'] =  $request->getUser();
149
+    $server['PHP_AUTH_USER'] = $request->getUser();
150 150
     $server['PHP_AUTH_PW'] = $request->getPassword();
151 151
     
152 152
     // decrypt and retreive data in JSON format
@@ -166,18 +166,18 @@  discard block
 block discarded – undo
166 166
     }
167 167
     
168 168
     // Check if Duo auth is in progress and pass the pw and login back to the standard login process
169
-    if(
169
+    if (
170 170
         isKeyExistingAndEqual('duo', 1, $SETTINGS) === true
171 171
         && $dataReceived['user_2fa_selection'] === 'duo'
172 172
         && $session->get('user-duo_status') === 'IN_PROGRESS'
173 173
         && !empty($dataReceived['duo_state'])
174
-    ){
174
+    ) {
175 175
         $key = hash('sha256', $dataReceived['duo_state']);
176 176
         $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16);
177 177
         $duo_data_dec = openssl_decrypt(base64_decode($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv);
178 178
         // Clear the data from the Duo process to continue clean with the standard login process
179
-        $session->set('user-duo_data','');
180
-        if($duo_data_dec === false) {
179
+        $session->set('user-duo_data', '');
180
+        if ($duo_data_dec === false) {
181 181
             // Add failed authentication log
182 182
             addFailedAuthentication(filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS), getClientIpServer());
183 183
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
         $dataReceived['login'] = $duo_data['duo_login'];
196 196
     }
197 197
 
198
-    if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
198
+    if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
199 199
         echo json_encode([
200 200
             'data' => prepareExchangedData(
201 201
                 [
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
                 0,
499 499
                 (string) $return,
500 500
                 (array) $userInfo ?? [],
501
-                false,  // not success
501
+                false, // not success
502 502
                 'user_is_locked',
503 503
                 $lang->get('account_is_locked')
504 504
             ),
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
             (int) $sessionPwdAttempts,
515 515
             (string) $return,
516 516
             (array) $userInfo ?? [],
517
-            false,  // not success
517
+            false, // not success
518 518
             true,
519 519
             $lang->get('error_not_allowed_to_authenticate')
520 520
         ),
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
     // Get cache tree info
792 792
     $cacheTreeData = DB::queryFirstRow(
793 793
         'SELECT visible_folders
794
-        FROM ' . prefixTable('cache_tree') . '
794
+        FROM ' . prefixTable('cache_tree').'
795 795
         WHERE user_id=%i',
796 796
         (int) $session->get('user-id')
797 797
     );
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
     $lang = new Language($session->get('user-language') ?? 'english');
820 820
     if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) {
821 821
         // get all Admin users
822
-        $val = DB::queryFirstRow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
822
+        $val = DB::queryFirstRow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
823 823
         if (DB::count() > 0) {
824 824
             // Add email to table
825 825
             prepareSendingEmail(
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
                         '#tp_time#',
832 832
                     ],
833 833
                     [
834
-                        ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')',
834
+                        ' '.$session->get('user-login').' (IP: '.getClientIpServer().')',
835 835
                         date($SETTINGS['date_format'], (int) time()),
836 836
                         date($SETTINGS['time_format'], (int) time()),
837 837
                     ],
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
938 938
     if (is_null($userInfo['roles_from_ad_groups']) === false) {
939 939
         $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true 
940 940
             ? $userInfo['roles_from_ad_groups'] 
941
-            : $userInfo['fonction_id'] . ';' . $userInfo['roles_from_ad_groups'];
941
+            : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
942 942
     }
943 943
     
944 944
     // Store roles in session
@@ -955,7 +955,7 @@  discard block
 block discarded – undo
955 955
         // Get roles from database
956 956
         $rolesList = DB::query(
957 957
             'SELECT id, title, complexity
958
-            FROM ' . prefixTable('roles_title') . '
958
+            FROM ' . prefixTable('roles_title').'
959 959
             WHERE id IN %li',
960 960
             $session->get('user-roles_array')
961 961
         );
@@ -1044,7 +1044,7 @@  discard block
 block discarded – undo
1044 1044
 {
1045 1045
     $rows = DB::query(
1046 1046
         'SELECT date
1047
-        FROM ' . prefixTable('log_system') . "
1047
+        FROM ' . prefixTable('log_system')."
1048 1048
         WHERE field_1 = %s
1049 1049
         AND type = 'failed_auth'
1050 1050
         AND label = 'password_is_not_correct'
@@ -1058,7 +1058,7 @@  discard block
 block discarded – undo
1058 1058
         foreach ($rows as $record) {
1059 1059
             array_push(
1060 1060
                 $arrAttempts,
1061
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
1061
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
1062 1062
             );
1063 1063
         }
1064 1064
     }
@@ -1093,7 +1093,7 @@  discard block
 block discarded – undo
1093 1093
     $ldapConnection
1094 1094
 ) : bool
1095 1095
 {
1096
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
1096
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
1097 1097
 
1098 1098
     if ((int) $userInfoDisabled === 1) {
1099 1099
         return false;
@@ -1181,7 +1181,7 @@  discard block
 block discarded – undo
1181 1181
         // If user has seed but no backup, create it on first successful login
1182 1182
         if (!empty($userInfo['user_derivation_seed']) && empty($userInfo['private_key_backup'])) {
1183 1183
             if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
1184
-                error_log('TEAMPASS Transparent Recovery - Creating backup for user ' . ($userInfo['login'] ?? 'unknown'));
1184
+                error_log('TEAMPASS Transparent Recovery - Creating backup for user '.($userInfo['login'] ?? 'unknown'));
1185 1185
             }
1186 1186
 
1187 1187
             $derivedKey = deriveBackupKey($userInfo['user_derivation_seed'], $userInfo['public_key'], $SETTINGS);
@@ -1351,7 +1351,7 @@  discard block
 block discarded – undo
1351 1351
     } catch (Exception $e) {
1352 1352
         return [
1353 1353
             'error' => true,
1354
-            'message' => "Error: " . $e->getMessage(),
1354
+            'message' => "Error: ".$e->getMessage(),
1355 1355
         ];
1356 1356
     }
1357 1357
 }
@@ -1382,7 +1382,7 @@  discard block
 block discarded – undo
1382 1382
                 'type' => 'OpenLDAP'
1383 1383
             ];
1384 1384
         default:
1385
-            throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
1385
+            throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
1386 1386
     }
1387 1387
 }
1388 1388
 
@@ -1519,7 +1519,7 @@  discard block
 block discarded – undo
1519 1519
         );
1520 1520
     }
1521 1521
     
1522
-    throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']);
1522
+    throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']);
1523 1523
 }
1524 1524
 
1525 1525
 /**
@@ -1536,11 +1536,11 @@  discard block
 block discarded – undo
1536 1536
     if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
1537 1537
         // Get user groups from AD
1538 1538
         $user_ad_groups = [];
1539
-        foreach($groups as $group) {
1539
+        foreach ($groups as $group) {
1540 1540
             // get relation role id for AD group
1541 1541
             $role = DB::queryFirstRow(
1542 1542
                 'SELECT lgr.role_id
1543
-                FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
1543
+                FROM ' . prefixTable('ldap_groups_roles').' AS lgr
1544 1544
                 WHERE lgr.ldap_group_id = %s',
1545 1545
                 $group
1546 1546
             );
@@ -1586,7 +1586,7 @@  discard block
 block discarded – undo
1586 1586
     $passwordManager = new PasswordManager();
1587 1587
     
1588 1588
     // Migrate password if needed
1589
-    $result  = $passwordManager->migratePassword(
1589
+    $result = $passwordManager->migratePassword(
1590 1590
         $userInfo['pw'],
1591 1591
         $passwordClear,
1592 1592
         (int) $userInfo['id']
@@ -1663,7 +1663,7 @@  discard block
 block discarded – undo
1663 1663
             // Check if exists in DB
1664 1664
             $groupData = DB::queryFirstRow(
1665 1665
                 'SELECT id
1666
-                FROM ' . prefixTable('roles_title') . '
1666
+                FROM ' . prefixTable('roles_title').'
1667 1667
                 WHERE title = %s',
1668 1668
                 $group["displayName"]
1669 1669
             );
@@ -1812,7 +1812,7 @@  discard block
 block discarded – undo
1812 1812
             
1813 1813
             // generate new QR
1814 1814
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
1815
-                'Teampass - ' . $username,
1815
+                'Teampass - '.$username,
1816 1816
                 $userInfo['ga']
1817 1817
             );
1818 1818
             // clear temporary code from DB
@@ -1825,7 +1825,7 @@  discard block
 block discarded – undo
1825 1825
                 $userInfo['id']
1826 1826
             );
1827 1827
             $firstTime = [
1828
-                'value' => '<img src="' . $new_2fa_qr . '">',
1828
+                'value' => '<img src="'.$new_2fa_qr.'">',
1829 1829
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
1830 1830
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
1831 1831
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1981,7 +1981,7 @@  discard block
 block discarded – undo
1981 1981
         }*/
1982 1982
         return [
1983 1983
             'error' => true,
1984
-            'message' => $duo_error . $lang->get('duo_error_check_config'),
1984
+            'message' => $duo_error.$lang->get('duo_error_check_config'),
1985 1985
             'pwd_attempts' => (int) $sessionPwdAttempts,
1986 1986
             'debug_message' => $e->getMessage(),
1987 1987
             'proceedIdentification' => false,
@@ -1997,7 +1997,7 @@  discard block
 block discarded – undo
1997 1997
         } catch (DuoException $e) {
1998 1998
             return [
1999 1999
                 'error' => true,
2000
-                'message' => $duo_error . $lang->get('duo_error_url'),
2000
+                'message' => $duo_error.$lang->get('duo_error_url'),
2001 2001
                 'pwd_attempts' => (int) $sessionPwdAttempts,
2002 2002
                 'debug_message' => $e->getMessage(),
2003 2003
                 'proceedIdentification' => false,
@@ -2005,7 +2005,7 @@  discard block
 block discarded – undo
2005 2005
         }
2006 2006
         
2007 2007
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
2008
-        if (!empty($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
2008
+        if (!empty($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) {
2009 2009
             // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt
2010 2010
             $key = hash('sha256', $duo_state);
2011 2011
             $iv = substr(hash('sha256', $duo_state), 0, 16);
@@ -2033,7 +2033,7 @@  discard block
 block discarded – undo
2033 2033
         } else {
2034 2034
             return [
2035 2035
                 'error' => true,
2036
-                'message' => $duo_error . $lang->get('duo_error_url'),
2036
+                'message' => $duo_error.$lang->get('duo_error_url'),
2037 2037
                 'pwd_attempts' => (int) $sessionPwdAttempts,
2038 2038
                 'proceedIdentification' => false,
2039 2039
             ];
@@ -2054,8 +2054,8 @@  discard block
 block discarded – undo
2054 2054
         // return the response (which should be the user name)
2055 2055
         if ($decoded_token['preferred_username'] === $username) {
2056 2056
             $session->set('user-duo_status', 'COMPLET');
2057
-            $session->set('user-duo_state','');
2058
-            $session->set('user-duo_data','');
2057
+            $session->set('user-duo_state', '');
2058
+            $session->set('user-duo_data', '');
2059 2059
             $session->set('user-login', $username);
2060 2060
 
2061 2061
             return [
@@ -2066,9 +2066,9 @@  discard block
 block discarded – undo
2066 2066
             ];
2067 2067
         } else {
2068 2068
             // Something wrong, username from the original Duo request is different than the one received now
2069
-            $session->set('user-duo_status','');
2070
-            $session->set('user-duo_state','');
2071
-            $session->set('user-duo_data','');
2069
+            $session->set('user-duo_status', '');
2070
+            $session->set('user-duo_state', '');
2071
+            $session->set('user-duo_data', '');
2072 2072
 
2073 2073
             return [
2074 2074
                 'error' => true,
@@ -2079,9 +2079,9 @@  discard block
 block discarded – undo
2079 2079
         }
2080 2080
     }
2081 2081
     // If we are here something wrong
2082
-    $session->set('user-duo_status','');
2083
-    $session->set('user-duo_state','');
2084
-    $session->set('user-duo_data','');
2082
+    $session->set('user-duo_status', '');
2083
+    $session->set('user-duo_state', '');
2084
+    $session->set('user-duo_data', '');
2085 2085
     return [
2086 2086
         'error' => true,
2087 2087
         'message' => $lang->get('duo_login_mismatch'),
@@ -2147,7 +2147,7 @@  discard block
 block discarded – undo
2147 2147
                 prefixTable('users'),
2148 2148
                 [
2149 2149
                     'pw' => $newHash,
2150
-                    'needs_password_migration' => 0,  // 0 = migration completed
2150
+                    'needs_password_migration' => 0, // 0 = migration completed
2151 2151
                     'private_key' => $newUserPrivateKey,
2152 2152
                 ],
2153 2153
                 'id = %i',
@@ -2256,7 +2256,7 @@  discard block
 block discarded – undo
2256 2256
         // Check for existing lock
2257 2257
         $unlock_at = DB::queryFirstField(
2258 2258
             'SELECT MAX(unlock_at)
2259
-             FROM ' . prefixTable('auth_failures') . '
2259
+             FROM ' . prefixTable('auth_failures').'
2260 2260
              WHERE unlock_at > %s
2261 2261
              AND ((source = %s AND value = %s) OR (source = %s AND value = %s))',
2262 2262
             date('Y-m-d H:i:s', time()),
@@ -2293,9 +2293,9 @@  discard block
 block discarded – undo
2293 2293
         // Check if similar login deleted exists
2294 2294
         DB::queryFirstRow(
2295 2295
             'SELECT id, login
2296
-            FROM ' . prefixTable('users') . '
2296
+            FROM ' . prefixTable('users').'
2297 2297
             WHERE login LIKE %s AND deleted_at IS NOT NULL',
2298
-            $login . '_deleted_%'
2298
+            $login.'_deleted_%'
2299 2299
         );
2300 2300
 
2301 2301
         if (DB::count() > 0) {
@@ -2405,7 +2405,7 @@  discard block
 block discarded – undo
2405 2405
             'array' => [
2406 2406
                 'value' => 'bruteforce_wait',
2407 2407
                 'error' => true,
2408
-                'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(),
2408
+                'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(),
2409 2409
             ]
2410 2410
         ];
2411 2411
     }
@@ -2510,7 +2510,7 @@  discard block
 block discarded – undo
2510 2510
     // Clean previous failed attempts
2511 2511
     $failedTasks = DB::query(
2512 2512
         'SELECT increment_id
2513
-        FROM ' . prefixTable('background_tasks') . '
2513
+        FROM ' . prefixTable('background_tasks').'
2514 2514
         WHERE process_type = %s
2515 2515
         AND JSON_EXTRACT(arguments, "$.new_user_id") = %i
2516 2516
         AND status = %s',
@@ -2627,7 +2627,7 @@  discard block
 block discarded – undo
2627 2627
                         $userKeys['public_key']
2628 2628
                     );
2629 2629
                 }*/
2630
-                    error_log('Switch user ' . $username . ' auth_type to oauth2');
2630
+                    error_log('Switch user '.$username.' auth_type to oauth2');
2631 2631
                 // Update user in database:
2632 2632
                 DB::update(
2633 2633
                     prefixTable('users'),
@@ -2851,12 +2851,12 @@  discard block
 block discarded – undo
2851 2851
 {
2852 2852
     // Find the latest "create_user_keys" task for the given user_id
2853 2853
     $latestTask = DB::queryFirstRow(
2854
-        'SELECT arguments, status FROM ' . prefixTable('background_tasks') . '
2854
+        'SELECT arguments, status FROM '.prefixTable('background_tasks').'
2855 2855
         WHERE process_type = %s
2856 2856
         AND arguments LIKE %s
2857 2857
         ORDER BY increment_id DESC
2858 2858
         LIMIT 1',
2859
-        'create_user_keys', '%"new_user_id":' . $userId . '%'
2859
+        'create_user_keys', '%"new_user_id":'.$userId.'%'
2860 2860
     );
2861 2861
 
2862 2862
     // If a failed task is found, return an error message
@@ -3068,15 +3068,15 @@  discard block
 block discarded – undo
3068 3068
 
3069 3069
             if ($ret['error'] !== false) {
3070 3070
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
3071
-                $session->set('user-duo_status','');
3072
-                $session->set('user-duo_state','');
3073
-                $session->set('user-duo_data','');
3071
+                $session->set('user-duo_status', '');
3072
+                $session->set('user-duo_state', '');
3073
+                $session->set('user-duo_data', '');
3074 3074
                 return [
3075 3075
                     'error' => true,
3076 3076
                     'mfaData' => $ret,
3077 3077
                     'mfaQRCodeInfos' => false,
3078 3078
                 ];
3079
-            } else if ($ret['duo_url_ready'] === true){
3079
+            } else if ($ret['duo_url_ready'] === true) {
3080 3080
                 return [
3081 3081
                     'error' => false,
3082 3082
                     'mfaData' => $ret,
@@ -3140,7 +3140,7 @@  discard block
 block discarded – undo
3140 3140
     // Count failed attempts from this source
3141 3141
     $count = DB::queryFirstField(
3142 3142
         'SELECT COUNT(*)
3143
-        FROM ' . prefixTable('auth_failures') . '
3143
+        FROM ' . prefixTable('auth_failures').'
3144 3144
         WHERE source = %s AND value = %s',
3145 3145
         $source,
3146 3146
         $value
Please login to merge, or discard this patch.