@@ -79,7 +79,7 @@ discard block |
||
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 |
||
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 | |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | // About special settings |
366 | 366 | $dataFolderSettings = DB::queryFirstRow( |
367 | 367 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
368 | - FROM ' . prefixTable('nested_tree') . ' |
|
368 | + FROM ' . prefixTable('nested_tree').' |
|
369 | 369 | WHERE id = %i', |
370 | 370 | $inputData['folderId'] |
371 | 371 | ); |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | // Get folder complexity |
383 | 383 | $folderComplexity = DB::queryFirstRow( |
384 | 384 | 'SELECT valeur |
385 | - FROM ' . prefixTable('misc') . ' |
|
385 | + FROM ' . prefixTable('misc').' |
|
386 | 386 | WHERE type = %s AND intitule = %i', |
387 | 387 | 'complex', |
388 | 388 | $inputData['folderId'] |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | $itemExists = 0; |
408 | 408 | $newID = ''; |
409 | 409 | $data = DB::queryFirstRow( |
410 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
410 | + 'SELECT * FROM '.prefixTable('items').' |
|
411 | 411 | WHERE label = %s AND inactif = %i', |
412 | 412 | $inputData['label'], |
413 | 413 | 0 |
@@ -488,8 +488,8 @@ discard block |
||
488 | 488 | (int) $post_folder_is_personal, |
489 | 489 | (int) $newID, |
490 | 490 | $cryptedStuff['objectKey'], |
491 | - true, // only for the item creator |
|
492 | - false, // no delete all |
|
491 | + true, // only for the item creator |
|
492 | + false, // no delete all |
|
493 | 493 | ); |
494 | 494 | |
495 | 495 | // update fields |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | // should we encrypt the data |
503 | 503 | $dataTmp = DB::queryFirstRow( |
504 | 504 | 'SELECT encrypted_data |
505 | - FROM ' . prefixTable('categories') . ' |
|
505 | + FROM ' . prefixTable('categories').' |
|
506 | 506 | WHERE id = %i', |
507 | 507 | $field['id'] |
508 | 508 | ); |
@@ -531,8 +531,8 @@ discard block |
||
531 | 531 | (int) $post_folder_is_personal, |
532 | 532 | (int) $newObjectId, |
533 | 533 | $cryptedStuff['objectKey'], |
534 | - true, // only for the item creator |
|
535 | - false, // no delete all |
|
534 | + true, // only for the item creator |
|
535 | + false, // no delete all |
|
536 | 536 | ); |
537 | 537 | |
538 | 538 | array_push( |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | ) { |
569 | 569 | DB::queryFirstRow( |
570 | 570 | 'SELECT * |
571 | - FROM ' . prefixTable('templates') . ' |
|
571 | + FROM ' . prefixTable('templates').' |
|
572 | 572 | WHERE item_id = %i', |
573 | 573 | $newID |
574 | 574 | ); |
@@ -637,11 +637,11 @@ discard block |
||
637 | 637 | ) { |
638 | 638 | foreach ($post_restricted_to as $userRest) { |
639 | 639 | if (empty($userRest) === false) { |
640 | - $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
640 | + $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
641 | 641 | if (empty($listOfRestricted)) { |
642 | 642 | $listOfRestricted = $dataTmp['login']; |
643 | 643 | } else { |
644 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
644 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
645 | 645 | } |
646 | 646 | } |
647 | 647 | } |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | if (empty($userRest) === false) { |
658 | 658 | $dataTmp = DB::queryFirstRow( |
659 | 659 | 'SELECT login |
660 | - FROM ' . prefixTable('users') . ' |
|
660 | + FROM ' . prefixTable('users').' |
|
661 | 661 | WHERE id= %i', |
662 | 662 | $userRest |
663 | 663 | ); |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | if (empty($oldRestrictionList) === true) { |
666 | 666 | $oldRestrictionList = $dataTmp['login']; |
667 | 667 | } else { |
668 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
668 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
669 | 669 | } |
670 | 670 | } |
671 | 671 | } |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | if (empty($post_uploaded_file_id) === false) { |
729 | 729 | $rows = DB::query( |
730 | 730 | 'SELECT id |
731 | - FROM ' . prefixTable('files') . ' |
|
731 | + FROM ' . prefixTable('files').' |
|
732 | 732 | WHERE id_item = %s', |
733 | 733 | $post_uploaded_file_id |
734 | 734 | ); |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | $lang->get('email_subject_item_updated'), |
785 | 785 | str_replace( |
786 | 786 | array('#label', '#link'), |
787 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']), |
|
787 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']), |
|
788 | 788 | $lang->get('new_item_email_body') |
789 | 789 | ), |
790 | 790 | $emailAddress, |
@@ -888,11 +888,11 @@ discard block |
||
888 | 888 | // Prepare variables |
889 | 889 | $itemInfos = array(); |
890 | 890 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
891 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
891 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
892 | 892 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
893 | 893 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
894 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
895 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
894 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
895 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
896 | 896 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
897 | 897 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
898 | 898 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -923,8 +923,7 @@ discard block |
||
923 | 923 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
924 | 924 | $dataReceived['to_be_deleted_after_date'], |
925 | 925 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
926 | - ) : |
|
927 | - ''; |
|
926 | + ) : ''; |
|
928 | 927 | $post_fields = (filter_var_array( |
929 | 928 | $dataReceived['fields'], |
930 | 929 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -984,7 +983,7 @@ discard block |
||
984 | 983 | // About special settings |
985 | 984 | $dataFolderSettings = DB::queryFirstRow( |
986 | 985 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
987 | - FROM ' . prefixTable('nested_tree') . ' |
|
986 | + FROM ' . prefixTable('nested_tree').' |
|
988 | 987 | WHERE id = %i', |
989 | 988 | $inputData['folderId'] |
990 | 989 | ); |
@@ -1000,7 +999,7 @@ discard block |
||
1000 | 999 | // Get folder complexity |
1001 | 1000 | $folderComplexity = DB::queryFirstRow( |
1002 | 1001 | 'SELECT valeur |
1003 | - FROM ' . prefixTable('misc') . ' |
|
1002 | + FROM ' . prefixTable('misc').' |
|
1004 | 1003 | WHERE type = %s AND intitule = %i', |
1005 | 1004 | 'complex', |
1006 | 1005 | $inputData['folderId'] |
@@ -1045,8 +1044,8 @@ discard block |
||
1045 | 1044 | // Get all informations for this item |
1046 | 1045 | $dataItem = DB::queryFirstRow( |
1047 | 1046 | 'SELECT * |
1048 | - FROM ' . prefixTable('items') . ' as i |
|
1049 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
1047 | + FROM ' . prefixTable('items').' as i |
|
1048 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
1050 | 1049 | WHERE i.id=%i AND l.action = %s', |
1051 | 1050 | $inputData['itemId'], |
1052 | 1051 | 'at_creation' |
@@ -1089,7 +1088,7 @@ discard block |
||
1089 | 1088 | //db::debugmode(true); |
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') |
@@ -1149,9 +1148,9 @@ discard block |
||
1149 | 1148 | '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, |
1150 | 1149 | 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, |
1151 | 1150 | u.login as user_login, u.email as user_email |
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) |
|
1151 | + FROM ' . prefixTable('items').' as i |
|
1152 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
1153 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
1155 | 1154 | WHERE i.id=%i', |
1156 | 1155 | $inputData['itemId'] |
1157 | 1156 | ); |
@@ -1159,7 +1158,7 @@ discard block |
||
1159 | 1158 | // Should we log a password change? |
1160 | 1159 | $userKey = DB::queryFirstRow( |
1161 | 1160 | 'SELECT share_key |
1162 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1161 | + FROM ' . prefixTable('sharekeys_items').' |
|
1163 | 1162 | WHERE user_id = %i AND object_id = %i', |
1164 | 1163 | $session->get('user-id'), |
1165 | 1164 | $inputData['itemId'] |
@@ -1223,12 +1222,12 @@ discard block |
||
1223 | 1222 | (int) $post_folder_is_personal, |
1224 | 1223 | (int) $inputData['itemId'], |
1225 | 1224 | $encrypted_password_key, |
1226 | - true, // only for the item creator |
|
1227 | - true, // delete all |
|
1225 | + true, // only for the item creator |
|
1226 | + true, // delete all |
|
1228 | 1227 | ); |
1229 | 1228 | |
1230 | 1229 | // Create a task to create sharekeys for users |
1231 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
1230 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
1232 | 1231 | $tasksToBePerformed = ['item_password']; |
1233 | 1232 | $encryptionTaskIsRequested = true; |
1234 | 1233 | } else { |
@@ -1239,7 +1238,7 @@ discard block |
||
1239 | 1238 | // Get list of tags |
1240 | 1239 | $itemTags = DB::queryFirstColumn( |
1241 | 1240 | 'SELECT tag |
1242 | - FROM ' . prefixTable('tags') . ' |
|
1241 | + FROM ' . prefixTable('tags').' |
|
1243 | 1242 | WHERE item_id = %i', |
1244 | 1243 | $inputData['itemId'] |
1245 | 1244 | ); |
@@ -1285,7 +1284,7 @@ discard block |
||
1285 | 1284 | $session->get('user-id'), |
1286 | 1285 | 'at_modification', |
1287 | 1286 | $session->get('user-login'), |
1288 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
1287 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
1289 | 1288 | ); |
1290 | 1289 | } |
1291 | 1290 | |
@@ -1325,8 +1324,8 @@ discard block |
||
1325 | 1324 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
1326 | 1325 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
1327 | 1326 | c.masked AS masked, i.id AS field_item_id |
1328 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
1329 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
1327 | + FROM ' . prefixTable('categories_items').' AS i |
|
1328 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
1330 | 1329 | WHERE i.field_id = %i AND i.item_id = %i', |
1331 | 1330 | $field['id'], |
1332 | 1331 | $inputData['itemId'] |
@@ -1342,7 +1341,7 @@ discard block |
||
1342 | 1341 | // Perform new query |
1343 | 1342 | $dataTmpCat = DB::queryFirstRow( |
1344 | 1343 | 'SELECT id, title, encrypted_data, masked |
1345 | - FROM ' . prefixTable('categories') . ' |
|
1344 | + FROM ' . prefixTable('categories').' |
|
1346 | 1345 | WHERE id = %i', |
1347 | 1346 | $field['id'] |
1348 | 1347 | ); |
@@ -1372,8 +1371,8 @@ discard block |
||
1372 | 1371 | (int) $post_folder_is_personal, |
1373 | 1372 | (int) $newId, |
1374 | 1373 | $cryptedStuff['objectKey'], |
1375 | - true, // only for the item creator |
|
1376 | - true, // delete all |
|
1374 | + true, // only for the item creator |
|
1375 | + true, // delete all |
|
1377 | 1376 | ); |
1378 | 1377 | |
1379 | 1378 | // update value |
@@ -1423,7 +1422,7 @@ discard block |
||
1423 | 1422 | $session->get('user-id'), |
1424 | 1423 | 'at_modification', |
1425 | 1424 | $session->get('user-login'), |
1426 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
1425 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
1427 | 1426 | ); |
1428 | 1427 | } else { |
1429 | 1428 | // Case where the field already exists |
@@ -1432,7 +1431,7 @@ discard block |
||
1432 | 1431 | // Get user sharekey for this field |
1433 | 1432 | $userKey = DB::queryFirstRow( |
1434 | 1433 | 'SELECT share_key |
1435 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
1434 | + FROM ' . prefixTable('sharekeys_fields').' |
|
1436 | 1435 | WHERE user_id = %i AND object_id = %i', |
1437 | 1436 | $session->get('user-id'), |
1438 | 1437 | $dataTmpCat['field_item_id'] |
@@ -1471,8 +1470,8 @@ discard block |
||
1471 | 1470 | (int) $post_folder_is_personal, |
1472 | 1471 | (int) $dataTmpCat['field_item_id'], |
1473 | 1472 | $cryptedStuff['objectKey'], |
1474 | - true, // only for the item creator |
|
1475 | - true, // delete all |
|
1473 | + true, // only for the item creator |
|
1474 | + true, // delete all |
|
1476 | 1475 | ); |
1477 | 1476 | |
1478 | 1477 | if ($encryptedFieldIsChanged === false) { |
@@ -1514,7 +1513,7 @@ discard block |
||
1514 | 1513 | $session->get('user-id'), |
1515 | 1514 | 'at_modification', |
1516 | 1515 | $session->get('user-login'), |
1517 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
1516 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
1518 | 1517 | ); |
1519 | 1518 | } |
1520 | 1519 | } |
@@ -1568,7 +1567,7 @@ discard block |
||
1568 | 1567 | ) { |
1569 | 1568 | DB::queryFirstRow( |
1570 | 1569 | 'SELECT * |
1571 | - FROM ' . prefixTable('templates') . ' |
|
1570 | + FROM ' . prefixTable('templates').' |
|
1572 | 1571 | WHERE item_id = %i', |
1573 | 1572 | $inputData['itemId'] |
1574 | 1573 | ); |
@@ -1611,7 +1610,7 @@ discard block |
||
1611 | 1610 | // check if elem exists in Table. If not add it or update it. |
1612 | 1611 | DB::query( |
1613 | 1612 | 'SELECT * |
1614 | - FROM ' . prefixTable('automatic_del') . ' |
|
1613 | + FROM ' . prefixTable('automatic_del').' |
|
1615 | 1614 | WHERE item_id = %i', |
1616 | 1615 | $inputData['itemId'] |
1617 | 1616 | ); |
@@ -1638,7 +1637,7 @@ discard block |
||
1638 | 1637 | // Store updates performed |
1639 | 1638 | array_push( |
1640 | 1639 | $arrayOfChanges, |
1641 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
1640 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
1642 | 1641 | ); |
1643 | 1642 | |
1644 | 1643 | // update LOG |
@@ -1681,7 +1680,7 @@ discard block |
||
1681 | 1680 | // Store updates performed |
1682 | 1681 | array_push( |
1683 | 1682 | $arrayOfChanges, |
1684 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
1683 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
1685 | 1684 | ); |
1686 | 1685 | |
1687 | 1686 | // update LOG |
@@ -1709,7 +1708,7 @@ discard block |
||
1709 | 1708 | if (empty($userId) === false) { |
1710 | 1709 | $dataTmp = DB::queryFirstRow( |
1711 | 1710 | 'SELECT id, name, lastname |
1712 | - FROM ' . prefixTable('users') . ' |
|
1711 | + FROM ' . prefixTable('users').' |
|
1713 | 1712 | WHERE id= %i', |
1714 | 1713 | $userId |
1715 | 1714 | ); |
@@ -1717,7 +1716,7 @@ discard block |
||
1717 | 1716 | // Add to array |
1718 | 1717 | array_push( |
1719 | 1718 | $arrayOfUsersRestriction, |
1720 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
1719 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
1721 | 1720 | ); |
1722 | 1721 | array_push( |
1723 | 1722 | $arrayOfUsersIdRestriction, |
@@ -1748,8 +1747,8 @@ discard block |
||
1748 | 1747 | // get values before deleting them |
1749 | 1748 | $rows = DB::query( |
1750 | 1749 | 'SELECT t.title, t.id AS id |
1751 | - FROM ' . prefixTable('roles_title') . ' as t |
|
1752 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
1750 | + FROM ' . prefixTable('roles_title').' as t |
|
1751 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
1753 | 1752 | WHERE r.item_id = %i |
1754 | 1753 | ORDER BY t.title ASC', |
1755 | 1754 | $inputData['itemId'] |
@@ -1783,7 +1782,7 @@ discard block |
||
1783 | 1782 | ); |
1784 | 1783 | $dataTmp = DB::queryFirstRow( |
1785 | 1784 | 'SELECT title |
1786 | - FROM ' . prefixTable('roles_title') . ' |
|
1785 | + FROM ' . prefixTable('roles_title').' |
|
1787 | 1786 | WHERE id = %i', |
1788 | 1787 | $role |
1789 | 1788 | ); |
@@ -1811,7 +1810,7 @@ discard block |
||
1811 | 1810 | // Get current status |
1812 | 1811 | $otpStatus = DB::queryFirstRow( |
1813 | 1812 | 'SELECT enabled as otp_is_enabled |
1814 | - FROM ' . prefixTable('items_otp') . ' |
|
1813 | + FROM ' . prefixTable('items_otp').' |
|
1815 | 1814 | WHERE item_id = %i', |
1816 | 1815 | $inputData['itemId'] |
1817 | 1816 | ); |
@@ -1842,7 +1841,7 @@ discard block |
||
1842 | 1841 | $session->get('user-id'), |
1843 | 1842 | 'at_modification', |
1844 | 1843 | $session->get('user-login'), |
1845 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
1844 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
1846 | 1845 | ); |
1847 | 1846 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
1848 | 1847 | // Create the entry in items_otp table |
@@ -1886,8 +1885,8 @@ discard block |
||
1886 | 1885 | $session->get('user-id'), |
1887 | 1886 | 'at_modification', |
1888 | 1887 | $session->get('user-login'), |
1889 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
1890 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1888 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
1889 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1891 | 1890 | ); |
1892 | 1891 | } |
1893 | 1892 | |
@@ -1907,7 +1906,7 @@ discard block |
||
1907 | 1906 | $session->get('user-id'), |
1908 | 1907 | 'at_modification', |
1909 | 1908 | $session->get('user-login'), |
1910 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
1909 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
1911 | 1910 | ); |
1912 | 1911 | } |
1913 | 1912 | // LOGIN |
@@ -1926,7 +1925,7 @@ discard block |
||
1926 | 1925 | $session->get('user-id'), |
1927 | 1926 | 'at_modification', |
1928 | 1927 | $session->get('user-login'), |
1929 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
1928 | + 'at_login : '.$data['login'].' => '.$post_login |
|
1930 | 1929 | ); |
1931 | 1930 | } |
1932 | 1931 | |
@@ -1945,7 +1944,7 @@ discard block |
||
1945 | 1944 | $session->get('user-id'), |
1946 | 1945 | 'at_modification', |
1947 | 1946 | $session->get('user-login'), |
1948 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
1947 | + 'at_email : '.$data['email'].' => '.$post_email |
|
1949 | 1948 | ); |
1950 | 1949 | } |
1951 | 1950 | // URL |
@@ -1964,7 +1963,7 @@ discard block |
||
1964 | 1963 | $session->get('user-id'), |
1965 | 1964 | 'at_modification', |
1966 | 1965 | $session->get('user-login'), |
1967 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
1966 | + 'at_url : '.$data['url'].' => '.$post_url |
|
1968 | 1967 | ); |
1969 | 1968 | } |
1970 | 1969 | // DESCRIPTION |
@@ -1990,7 +1989,7 @@ discard block |
||
1990 | 1989 | // FOLDER |
1991 | 1990 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
1992 | 1991 | // Get name of folders |
1993 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
1992 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
1994 | 1993 | |
1995 | 1994 | // Store updates performed |
1996 | 1995 | array_push( |
@@ -2006,7 +2005,7 @@ discard block |
||
2006 | 2005 | $session->get('user-id'), |
2007 | 2006 | 'at_modification', |
2008 | 2007 | $session->get('user-login'), |
2009 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
2008 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
2010 | 2009 | ); |
2011 | 2010 | } |
2012 | 2011 | // ANYONE_CAN_MODIFY |
@@ -2014,7 +2013,7 @@ discard block |
||
2014 | 2013 | // Store updates performed |
2015 | 2014 | array_push( |
2016 | 2015 | $arrayOfChanges, |
2017 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
2016 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
2018 | 2017 | ); |
2019 | 2018 | |
2020 | 2019 | // Log |
@@ -2025,15 +2024,15 @@ discard block |
||
2025 | 2024 | $session->get('user-id'), |
2026 | 2025 | 'at_modification', |
2027 | 2026 | $session->get('user-login'), |
2028 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
2027 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
2029 | 2028 | ); |
2030 | 2029 | } |
2031 | 2030 | |
2032 | 2031 | // Reload new values |
2033 | 2032 | $dataItem = DB::queryFirstRow( |
2034 | 2033 | 'SELECT * |
2035 | - FROM ' . prefixTable('items') . ' as i |
|
2036 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2034 | + FROM ' . prefixTable('items').' as i |
|
2035 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2037 | 2036 | WHERE i.id = %i AND l.action = %s', |
2038 | 2037 | $inputData['itemId'], |
2039 | 2038 | 'at_creation' |
@@ -2042,8 +2041,8 @@ discard block |
||
2042 | 2041 | $history = ''; |
2043 | 2042 | $rows = DB::query( |
2044 | 2043 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
2045 | - FROM ' . prefixTable('log_items') . ' as l |
|
2046 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
2044 | + FROM ' . prefixTable('log_items').' as l |
|
2045 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
2047 | 2046 | WHERE l.action <> %s AND id_item=%s', |
2048 | 2047 | 'at_shown', |
2049 | 2048 | $inputData['itemId'] |
@@ -2052,14 +2051,14 @@ discard block |
||
2052 | 2051 | if ($record['raison'] === NULL) continue; |
2053 | 2052 | $reason = explode(':', $record['raison']); |
2054 | 2053 | if (count($reason) > 0) { |
2055 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
2056 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
2057 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
2054 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
2055 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
2056 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
2058 | 2057 | : $lang->get(trim($reason[0]))) : ''); |
2059 | 2058 | if (empty($history)) { |
2060 | 2059 | $history = $sentence; |
2061 | 2060 | } else { |
2062 | - $history .= '<br />' . $sentence; |
|
2061 | + $history .= '<br />'.$sentence; |
|
2063 | 2062 | } |
2064 | 2063 | } |
2065 | 2064 | } |
@@ -2197,7 +2196,7 @@ discard block |
||
2197 | 2196 | ) { |
2198 | 2197 | // load the original record into an array |
2199 | 2198 | $originalRecord = DB::queryFirstRow( |
2200 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
2199 | + 'SELECT * FROM '.prefixTable('items').' |
|
2201 | 2200 | WHERE id = %i', |
2202 | 2201 | $inputData['itemId'] |
2203 | 2202 | ); |
@@ -2216,7 +2215,7 @@ discard block |
||
2216 | 2215 | |
2217 | 2216 | // Load the destination folder record into an array |
2218 | 2217 | $dataDestination = DB::queryFirstRow( |
2219 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
2218 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
2220 | 2219 | WHERE id = %i', |
2221 | 2220 | $post_dest_id |
2222 | 2221 | ); |
@@ -2224,7 +2223,7 @@ discard block |
||
2224 | 2223 | // Get the ITEM object key for the user |
2225 | 2224 | $userKey = DB::queryFirstRow( |
2226 | 2225 | 'SELECT share_key |
2227 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2226 | + FROM ' . prefixTable('sharekeys_items').' |
|
2228 | 2227 | WHERE user_id = %i AND object_id = %i', |
2229 | 2228 | $session->get('user-id'), |
2230 | 2229 | $inputData['itemId'] |
@@ -2301,8 +2300,8 @@ discard block |
||
2301 | 2300 | // Manage Custom Fields |
2302 | 2301 | $rows = DB::query( |
2303 | 2302 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
2304 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
2305 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
2303 | + FROM ' . prefixTable('categories_items').' AS ci |
|
2304 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
2306 | 2305 | WHERE ci.item_id = %i', |
2307 | 2306 | $inputData['itemId'] |
2308 | 2307 | ); |
@@ -2314,7 +2313,7 @@ discard block |
||
2314 | 2313 | // Get user key |
2315 | 2314 | $userKey = DB::queryFirstRow( |
2316 | 2315 | 'SELECT share_key |
2317 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2316 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2318 | 2317 | WHERE user_id = %i AND object_id = %i', |
2319 | 2318 | $session->get('user-id'), |
2320 | 2319 | $field['id'] |
@@ -2381,15 +2380,15 @@ discard block |
||
2381 | 2380 | $rows = DB::query( |
2382 | 2381 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
2383 | 2382 | f.size AS size, f.type AS type, s.share_key AS share_key |
2384 | - FROM ' . prefixTable('files') . ' AS f |
|
2385 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
2383 | + FROM ' . prefixTable('files').' AS f |
|
2384 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
2386 | 2385 | WHERE s.user_id = %i AND f.id_item = %i', |
2387 | 2386 | $session->get('user-id'), |
2388 | 2387 | $inputData['itemId'] |
2389 | 2388 | ); |
2390 | 2389 | foreach ($rows as $record) { |
2391 | 2390 | // Check if file still exists |
2392 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
2391 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
2393 | 2392 | // Step1 - decrypt the file |
2394 | 2393 | // deepcode ignore PT: path is sanitized inside decryptFile() |
2395 | 2394 | $fileContent = decryptFile( |
@@ -2400,8 +2399,8 @@ discard block |
||
2400 | 2399 | |
2401 | 2400 | // Step2 - create file |
2402 | 2401 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
2403 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
2404 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
2402 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
2403 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
2405 | 2404 | if ($outstream === false) { |
2406 | 2405 | echo prepareExchangedData( |
2407 | 2406 | array( |
@@ -2474,7 +2473,7 @@ discard block |
||
2474 | 2473 | |
2475 | 2474 | // ------------------------- |
2476 | 2475 | // Add specific restrictions |
2477 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2476 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
2478 | 2477 | foreach ($rows as $record) { |
2479 | 2478 | DB::insert( |
2480 | 2479 | prefixTable('restriction_to_roles'), |
@@ -2486,7 +2485,7 @@ discard block |
||
2486 | 2485 | } |
2487 | 2486 | |
2488 | 2487 | // Add Tags |
2489 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2488 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
2490 | 2489 | foreach ($rows as $record) { |
2491 | 2490 | DB::insert( |
2492 | 2491 | prefixTable('tags'), |
@@ -2588,7 +2587,7 @@ discard block |
||
2588 | 2587 | // then we can show it |
2589 | 2588 | $item_deleted = DB::queryFirstRow( |
2590 | 2589 | 'SELECT * |
2591 | - FROM ' . prefixTable('log_items') . ' |
|
2590 | + FROM ' . prefixTable('log_items').' |
|
2592 | 2591 | WHERE id_item = %i AND action = %s |
2593 | 2592 | ORDER BY date DESC |
2594 | 2593 | LIMIT 0, 1', |
@@ -2599,7 +2598,7 @@ discard block |
||
2599 | 2598 | |
2600 | 2599 | $item_restored = DB::queryFirstRow( |
2601 | 2600 | 'SELECT * |
2602 | - FROM ' . prefixTable('log_items') . ' |
|
2601 | + FROM ' . prefixTable('log_items').' |
|
2603 | 2602 | WHERE id_item = %i AND action = %s |
2604 | 2603 | ORDER BY date DESC |
2605 | 2604 | LIMIT 0, 1', |
@@ -2623,8 +2622,8 @@ discard block |
||
2623 | 2622 | // Get all informations for this item |
2624 | 2623 | $dataItem = DB::queryFirstRow( |
2625 | 2624 | 'SELECT * |
2626 | - FROM ' . prefixTable('items') . ' as i |
|
2627 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2625 | + FROM ' . prefixTable('items').' as i |
|
2626 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2628 | 2627 | WHERE i.id = %i AND l.action = %s', |
2629 | 2628 | $inputData['id'], |
2630 | 2629 | 'at_creation' |
@@ -2633,7 +2632,7 @@ discard block |
||
2633 | 2632 | // Notification |
2634 | 2633 | DB::queryFirstRow( |
2635 | 2634 | 'SELECT * |
2636 | - FROM ' . prefixTable('notification') . ' |
|
2635 | + FROM ' . prefixTable('notification').' |
|
2637 | 2636 | WHERE item_id = %i AND user_id = %i', |
2638 | 2637 | $inputData['id'], |
2639 | 2638 | $session->get('user-id') |
@@ -2652,7 +2651,7 @@ discard block |
||
2652 | 2651 | |
2653 | 2652 | // manage case of API user |
2654 | 2653 | if ($dataItem['id_user'] === API_USER_ID) { |
2655 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
2654 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
2656 | 2655 | $arrData['id_user'] = API_USER_ID; |
2657 | 2656 | $arrData['author_email'] = ''; |
2658 | 2657 | $arrData['notification_status'] = false; |
@@ -2662,7 +2661,7 @@ discard block |
||
2662 | 2661 | $tags = array(); |
2663 | 2662 | $rows = DB::query( |
2664 | 2663 | 'SELECT tag |
2665 | - FROM ' . prefixTable('tags') . ' |
|
2664 | + FROM ' . prefixTable('tags').' |
|
2666 | 2665 | WHERE item_id = %i', |
2667 | 2666 | $inputData['id'] |
2668 | 2667 | ); |
@@ -2687,7 +2686,7 @@ discard block |
||
2687 | 2686 | // Check if user has a role that is accepted |
2688 | 2687 | $rows_tmp = DB::query( |
2689 | 2688 | 'SELECT role_id |
2690 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
2689 | + FROM ' . prefixTable('restriction_to_roles').' |
|
2691 | 2690 | WHERE item_id=%i', |
2692 | 2691 | $inputData['id'] |
2693 | 2692 | ); |
@@ -2701,7 +2700,7 @@ discard block |
||
2701 | 2700 | // Get the object key for the user |
2702 | 2701 | $userKey = DB::queryFirstRow( |
2703 | 2702 | 'SELECT share_key |
2704 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2703 | + FROM ' . prefixTable('sharekeys_items').' |
|
2705 | 2704 | WHERE user_id = %i AND object_id = %i', |
2706 | 2705 | $session->get('user-id'), |
2707 | 2706 | $inputData['id'] |
@@ -2798,8 +2797,8 @@ discard block |
||
2798 | 2797 | // Add restriction if item is restricted to roles |
2799 | 2798 | $rows = DB::query( |
2800 | 2799 | 'SELECT t.title, t.id |
2801 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
2802 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
2800 | + FROM ' . prefixTable('roles_title').' AS t |
|
2801 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
2803 | 2802 | WHERE r.item_id = %i |
2804 | 2803 | ORDER BY t.title ASC', |
2805 | 2804 | $inputData['id'] |
@@ -2815,8 +2814,8 @@ discard block |
||
2815 | 2814 | $tmp = array(); |
2816 | 2815 | $rows = DB::query( |
2817 | 2816 | 'SELECT k.label, k.id |
2818 | - FROM ' . prefixTable('kb_items') . ' as i |
|
2819 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
2817 | + FROM ' . prefixTable('kb_items').' as i |
|
2818 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
2820 | 2819 | WHERE i.item_id = %i |
2821 | 2820 | ORDER BY k.label ASC', |
2822 | 2821 | $inputData['id'] |
@@ -2899,7 +2898,7 @@ discard block |
||
2899 | 2898 | $arrCatList = array(); |
2900 | 2899 | $rows_tmp = DB::query( |
2901 | 2900 | 'SELECT id_category |
2902 | - FROM ' . prefixTable('categories_folders') . ' |
|
2901 | + FROM ' . prefixTable('categories_folders').' |
|
2903 | 2902 | WHERE id_folder=%i', |
2904 | 2903 | $inputData['folderId'] |
2905 | 2904 | ); |
@@ -2914,8 +2913,8 @@ discard block |
||
2914 | 2913 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
2915 | 2914 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
2916 | 2915 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
2917 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
2918 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
2916 | + FROM ' . prefixTable('categories_items').' AS i |
|
2917 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
2919 | 2918 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
2920 | 2919 | $inputData['id'], |
2921 | 2920 | $arrCatList |
@@ -2926,7 +2925,7 @@ discard block |
||
2926 | 2925 | //db::debugmode(true); |
2927 | 2926 | $userKey = DB::queryFirstRow( |
2928 | 2927 | 'SELECT share_key |
2929 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2928 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2930 | 2929 | WHERE user_id = %i AND object_id = %i', |
2931 | 2930 | $session->get('user-id'), |
2932 | 2931 | $row['id'] |
@@ -2944,7 +2943,7 @@ discard block |
||
2944 | 2943 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
2945 | 2944 | // Data is not encrypted in DB |
2946 | 2945 | $fieldText = [ |
2947 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
2946 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
2948 | 2947 | 'encrypted' => false, |
2949 | 2948 | 'error' => false, |
2950 | 2949 | ]; |
@@ -2989,7 +2988,7 @@ discard block |
||
2989 | 2988 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
2990 | 2989 | $rows_tmp = DB::queryFirstRow( |
2991 | 2990 | 'SELECT category_id |
2992 | - FROM ' . prefixTable('templates') . ' |
|
2991 | + FROM ' . prefixTable('templates').' |
|
2993 | 2992 | WHERE item_id = %i', |
2994 | 2993 | $inputData['id'] |
2995 | 2994 | ); |
@@ -3006,7 +3005,7 @@ discard block |
||
3006 | 3005 | // Evaluate if item is ready for all users |
3007 | 3006 | $rows_tmp = DB::queryFirstRow( |
3008 | 3007 | 'SELECT finished_at |
3009 | - FROM ' . prefixTable('background_tasks') . ' |
|
3008 | + FROM ' . prefixTable('background_tasks').' |
|
3010 | 3009 | WHERE item_id = %i', |
3011 | 3010 | $inputData['id'] |
3012 | 3011 | ); |
@@ -3023,7 +3022,7 @@ discard block |
||
3023 | 3022 | // Is the Item to be deleted? |
3024 | 3023 | $dataDelete = DB::queryFirstRow( |
3025 | 3024 | 'SELECT * |
3026 | - FROM ' . prefixTable('automatic_del') . ' |
|
3025 | + FROM ' . prefixTable('automatic_del').' |
|
3027 | 3026 | WHERE item_id = %i', |
3028 | 3027 | $inputData['id'] |
3029 | 3028 | ); |
@@ -3104,14 +3103,14 @@ discard block |
||
3104 | 3103 | if (empty($userRest) === false) { |
3105 | 3104 | $dataTmp = DB::queryFirstRow( |
3106 | 3105 | 'SELECT login |
3107 | - FROM ' . prefixTable('users') . ' |
|
3106 | + FROM ' . prefixTable('users').' |
|
3108 | 3107 | WHERE id= %i', |
3109 | 3108 | $userRest |
3110 | 3109 | ); |
3111 | 3110 | if (empty($listOfRestricted)) { |
3112 | 3111 | $listOfRestricted = $dataTmp['login']; |
3113 | 3112 | } else { |
3114 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
3113 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
3115 | 3114 | } |
3116 | 3115 | } |
3117 | 3116 | } |
@@ -3185,9 +3184,9 @@ discard block |
||
3185 | 3184 | // Load item data |
3186 | 3185 | $dataItem = DB::queryFirstRow( |
3187 | 3186 | '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 |
3188 | - FROM ' . prefixTable('items') . ' AS i |
|
3189 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
3190 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
3187 | + FROM ' . prefixTable('items').' AS i |
|
3188 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
3189 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
3191 | 3190 | WHERE i.id = %i', |
3192 | 3191 | $inputData['id'] |
3193 | 3192 | ); |
@@ -3209,7 +3208,7 @@ discard block |
||
3209 | 3208 | // Check if user has a role that is accepted |
3210 | 3209 | $rows_tmp = DB::query( |
3211 | 3210 | 'SELECT role_id |
3212 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3211 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3213 | 3212 | WHERE item_id=%i', |
3214 | 3213 | $inputData['id'] |
3215 | 3214 | ); |
@@ -3241,12 +3240,12 @@ discard block |
||
3241 | 3240 | // launch query |
3242 | 3241 | $rows = DB::query( |
3243 | 3242 | 'SELECT id, name, file, extension, size |
3244 | - FROM ' . prefixTable('files') . ' |
|
3243 | + FROM ' . prefixTable('files').' |
|
3245 | 3244 | WHERE id_item = %i AND confirmed = 1', |
3246 | 3245 | $inputData['id'] |
3247 | 3246 | ); |
3248 | 3247 | foreach ($rows as $record) { |
3249 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
3248 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
3250 | 3249 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
3251 | 3250 | |
3252 | 3251 | array_push( |
@@ -3259,7 +3258,7 @@ discard block |
||
3259 | 3258 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
3260 | 3259 | 'id' => $record['id'], |
3261 | 3260 | 'key' => $session->get('user-key_tmp'), |
3262 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
3261 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
3263 | 3262 | ) |
3264 | 3263 | ); |
3265 | 3264 | } |
@@ -3297,7 +3296,7 @@ discard block |
||
3297 | 3296 | array( |
3298 | 3297 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
3299 | 3298 | ), |
3300 | - 'id=' . $session->get('user-id') |
|
3299 | + 'id='.$session->get('user-id') |
|
3301 | 3300 | ); |
3302 | 3301 | } |
3303 | 3302 | |
@@ -3306,8 +3305,8 @@ discard block |
||
3306 | 3305 | $listOptionsForRoles = array(); |
3307 | 3306 | $rows = DB::query( |
3308 | 3307 | 'SELECT r.role_id AS role_id, t.title AS title |
3309 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
3310 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
3308 | + FROM ' . prefixTable('roles_values').' AS r |
|
3309 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
3311 | 3310 | WHERE r.folder_id = %i', |
3312 | 3311 | $dataItem['id_tree'] |
3313 | 3312 | ); |
@@ -3321,9 +3320,9 @@ discard block |
||
3321 | 3320 | ); |
3322 | 3321 | $rows2 = DB::query( |
3323 | 3322 | 'SELECT id, login, fonction_id, email, name, lastname |
3324 | - FROM ' . prefixTable('users') . ' |
|
3323 | + FROM ' . prefixTable('users').' |
|
3325 | 3324 | WHERE fonction_id LIKE %s', |
3326 | - '%' . $record['role_id'] . '%' |
|
3325 | + '%'.$record['role_id'].'%' |
|
3327 | 3326 | ); |
3328 | 3327 | foreach ($rows2 as $record2) { |
3329 | 3328 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3336,7 +3335,7 @@ discard block |
||
3336 | 3335 | array( |
3337 | 3336 | 'id' => (int) $record2['id'], |
3338 | 3337 | 'login' => $record2['login'], |
3339 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
3338 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
3340 | 3339 | 'email' => $record2['email'], |
3341 | 3340 | ) |
3342 | 3341 | ); |
@@ -3355,16 +3354,16 @@ discard block |
||
3355 | 3354 | $path = ''; |
3356 | 3355 | foreach ($arbo as $elem) { |
3357 | 3356 | if (empty($path) === true) { |
3358 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
3357 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
3359 | 3358 | } else { |
3360 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3359 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3361 | 3360 | } |
3362 | 3361 | } |
3363 | 3362 | // Build text to show user |
3364 | 3363 | if (empty($path) === true) { |
3365 | 3364 | $path = addslashes($dataItem['label']); |
3366 | 3365 | } else { |
3367 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
3366 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
3368 | 3367 | } |
3369 | 3368 | |
3370 | 3369 | // Add Admins to notification list if expected |
@@ -3387,7 +3386,7 @@ discard block |
||
3387 | 3386 | array( |
3388 | 3387 | addslashes($session->get('user-login')), |
3389 | 3388 | $path, |
3390 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
3389 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
3391 | 3390 | ), |
3392 | 3391 | $lang->get('email_on_open_notification_mail') |
3393 | 3392 | ), |
@@ -3397,7 +3396,7 @@ discard block |
||
3397 | 3396 | } |
3398 | 3397 | |
3399 | 3398 | // has this item a change proposal |
3400 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
3399 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
3401 | 3400 | $returnArray['has_change_proposal'] = DB::count(); |
3402 | 3401 | |
3403 | 3402 | // Setting |
@@ -3408,7 +3407,7 @@ discard block |
||
3408 | 3407 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
3409 | 3408 | DB::query( |
3410 | 3409 | 'SELECT * |
3411 | - FROM ' . prefixTable('otv') . ' |
|
3410 | + FROM ' . prefixTable('otv').' |
|
3412 | 3411 | WHERE item_id = %i |
3413 | 3412 | AND time_limit > %i', |
3414 | 3413 | $inputData['id'], |
@@ -3507,7 +3506,7 @@ discard block |
||
3507 | 3506 | // Load item data |
3508 | 3507 | $data = DB::queryFirstRow( |
3509 | 3508 | 'SELECT id_tree, id, label |
3510 | - FROM ' . prefixTable('items') . ' |
|
3509 | + FROM ' . prefixTable('items').' |
|
3511 | 3510 | WHERE id = %i OR item_key = %s', |
3512 | 3511 | $inputData['itemId'], |
3513 | 3512 | $inputData['itemKey'] |
@@ -3598,7 +3597,7 @@ discard block |
||
3598 | 3597 | // Load item data |
3599 | 3598 | $dataItem = DB::queryFirstRow( |
3600 | 3599 | 'SELECT secret, enabled |
3601 | - FROM ' . prefixTable('items_otp') . ' |
|
3600 | + FROM ' . prefixTable('items_otp').' |
|
3602 | 3601 | WHERE item_id = %i', |
3603 | 3602 | $inputData['id'] |
3604 | 3603 | ); |
@@ -3680,13 +3679,13 @@ discard block |
||
3680 | 3679 | |
3681 | 3680 | // Check if user is allowed to access this folder |
3682 | 3681 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
3683 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
3682 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
3684 | 3683 | break; |
3685 | 3684 | } |
3686 | 3685 | |
3687 | 3686 | // Check if title doesn't contains html codes |
3688 | 3687 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
3689 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
3688 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
3690 | 3689 | break; |
3691 | 3690 | } |
3692 | 3691 | // check that title is not numeric |
@@ -3697,9 +3696,9 @@ discard block |
||
3697 | 3696 | |
3698 | 3697 | // Check if duplicate folders name are allowed |
3699 | 3698 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
3700 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
3699 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
3701 | 3700 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
3702 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
3701 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
3703 | 3702 | break; |
3704 | 3703 | } |
3705 | 3704 | } |
@@ -3707,7 +3706,7 @@ discard block |
||
3707 | 3706 | // query on folder |
3708 | 3707 | $data = DB::queryFirstRow( |
3709 | 3708 | 'SELECT parent_id, personal_folder |
3710 | - FROM ' . prefixTable('nested_tree') . ' |
|
3709 | + FROM ' . prefixTable('nested_tree').' |
|
3711 | 3710 | WHERE id = %i', |
3712 | 3711 | $inputData['folderId'] |
3713 | 3712 | ); |
@@ -3717,20 +3716,20 @@ discard block |
||
3717 | 3716 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
3718 | 3717 | $data = DB::queryFirstRow( |
3719 | 3718 | 'SELECT valeur |
3720 | - FROM ' . prefixTable('misc') . ' |
|
3719 | + FROM ' . prefixTable('misc').' |
|
3721 | 3720 | WHERE intitule = %i AND type = %s', |
3722 | 3721 | $data['parent_id'], |
3723 | 3722 | 'complex' |
3724 | 3723 | ); |
3725 | 3724 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
3726 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
3725 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
3727 | 3726 | break; |
3728 | 3727 | } |
3729 | 3728 | } |
3730 | 3729 | |
3731 | 3730 | // update Folders table |
3732 | 3731 | $tmp = DB::queryFirstRow( |
3733 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
3732 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
3734 | 3733 | $dataReceived['folder'] |
3735 | 3734 | ); |
3736 | 3735 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3844,7 +3843,7 @@ discard block |
||
3844 | 3843 | $uniqueLoadData['path'] = $arr_arbo; |
3845 | 3844 | |
3846 | 3845 | // store last folder accessed in cookie |
3847 | - $arr_cookie_options = array ( |
|
3846 | + $arr_cookie_options = array( |
|
3848 | 3847 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
3849 | 3848 | 'path' => '/', |
3850 | 3849 | 'secure' => true, |
@@ -3859,7 +3858,7 @@ discard block |
||
3859 | 3858 | foreach ($session->get('user-roles_array') as $role) { |
3860 | 3859 | $roleQ = DB::queryFirstRow( |
3861 | 3860 | 'SELECT allow_pw_change |
3862 | - FROM ' . prefixTable('roles_title') . ' |
|
3861 | + FROM ' . prefixTable('roles_title').' |
|
3863 | 3862 | WHERE id = %i', |
3864 | 3863 | $role |
3865 | 3864 | ); |
@@ -3890,11 +3889,11 @@ discard block |
||
3890 | 3889 | |
3891 | 3890 | foreach ($session->get('user-roles_array') as $role) { |
3892 | 3891 | $access = DB::queryFirstRow( |
3893 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
3892 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
3894 | 3893 | $role, |
3895 | 3894 | $inputData['id'] |
3896 | 3895 | ); |
3897 | - if (DB::count()>0) { |
|
3896 | + if (DB::count() > 0) { |
|
3898 | 3897 | if ($access['type'] === 'R') { |
3899 | 3898 | array_push($arrTmp, 10); |
3900 | 3899 | } elseif ($access['type'] === 'W') { |
@@ -3959,7 +3958,7 @@ discard block |
||
3959 | 3958 | } else { |
3960 | 3959 | DB::query( |
3961 | 3960 | 'SELECT * |
3962 | - FROM ' . prefixTable('items') . ' |
|
3961 | + FROM ' . prefixTable('items').' |
|
3963 | 3962 | WHERE inactif = %i', |
3964 | 3963 | 0 |
3965 | 3964 | ); |
@@ -3969,7 +3968,7 @@ discard block |
||
3969 | 3968 | |
3970 | 3969 | // Get folder complexity |
3971 | 3970 | $folderComplexity = DB::queryFirstRow( |
3972 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
3971 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
3973 | 3972 | 'complex', |
3974 | 3973 | $inputData['id'] |
3975 | 3974 | ); |
@@ -3981,7 +3980,7 @@ discard block |
||
3981 | 3980 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
3982 | 3981 | $folderRow = DB::query( |
3983 | 3982 | 'SELECT id_category |
3984 | - FROM ' . prefixTable('categories_folders') . ' |
|
3983 | + FROM ' . prefixTable('categories_folders').' |
|
3985 | 3984 | WHERE id_folder = %i', |
3986 | 3985 | $inputData['id'] |
3987 | 3986 | ); |
@@ -4096,15 +4095,15 @@ discard block |
||
4096 | 4095 | // List all ITEMS |
4097 | 4096 | if ($folderIsPf === false) { |
4098 | 4097 | $where->add('i.inactif=%i', 0); |
4099 | - $sql_e='(SELECT date FROM ' . prefixTable('log_items') |
|
4098 | + $sql_e = '(SELECT date FROM '.prefixTable('log_items') |
|
4100 | 4099 | . " WHERE action = 'at_creation' AND id_item=i.id " |
4101 | - . 'union all SELECT date FROM '. prefixTable('log_items') |
|
4100 | + . 'union all SELECT date FROM '.prefixTable('log_items') |
|
4102 | 4101 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
4103 | 4102 | AND id_item=i.id ORDER BY date DESC LIMIT 1)"; |
4104 | 4103 | $where->add('l.date=%l', $sql_e); |
4105 | 4104 | |
4106 | - $query_limit = ' LIMIT ' . |
|
4107 | - $start . ',' . |
|
4105 | + $query_limit = ' LIMIT '. |
|
4106 | + $start.','. |
|
4108 | 4107 | $post_nb_items_to_display_once; |
4109 | 4108 | //db::debugmode(true); |
4110 | 4109 | $rows = DB::query( |
@@ -4116,9 +4115,9 @@ discard block |
||
4116 | 4115 | l.id_user AS log_user, |
4117 | 4116 | i.url AS link, |
4118 | 4117 | i.email AS email |
4119 | - FROM ' . prefixTable('items') . ' AS i |
|
4120 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
4121 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
4118 | + FROM ' . prefixTable('items').' AS i |
|
4119 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
4120 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
4122 | 4121 | WHERE %l |
4123 | 4122 | GROUP BY i.id, l.date, l.id_user, l.action |
4124 | 4123 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4138,9 +4137,9 @@ discard block |
||
4138 | 4137 | l.id_user AS log_user, |
4139 | 4138 | i.url AS link, |
4140 | 4139 | i.email AS email |
4141 | - FROM ' . prefixTable('items') . ' AS i |
|
4142 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
4143 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
4140 | + FROM ' . prefixTable('items').' AS i |
|
4141 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
4142 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
4144 | 4143 | WHERE %l |
4145 | 4144 | GROUP BY i.id, l.date, l.id_user, l.action |
4146 | 4145 | ORDER BY i.label ASC, l.date DESC', |
@@ -4171,7 +4170,7 @@ discard block |
||
4171 | 4170 | $item_is_restricted_to_role = false; |
4172 | 4171 | DB::queryFirstRow( |
4173 | 4172 | 'SELECT role_id |
4174 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
4173 | + FROM ' . prefixTable('restriction_to_roles').' |
|
4175 | 4174 | WHERE item_id = %i', |
4176 | 4175 | $record['id'] |
4177 | 4176 | ); |
@@ -4183,7 +4182,7 @@ discard block |
||
4183 | 4182 | $user_is_included_in_role = false; |
4184 | 4183 | DB::query( |
4185 | 4184 | 'SELECT role_id |
4186 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
4185 | + FROM ' . prefixTable('restriction_to_roles').' |
|
4187 | 4186 | WHERE item_id = %i AND role_id IN %ls', |
4188 | 4187 | $record['id'], |
4189 | 4188 | $session->get('user-roles_array') |
@@ -4393,9 +4392,9 @@ discard block |
||
4393 | 4392 | if ((int) $start === 0) { |
4394 | 4393 | DB::query( |
4395 | 4394 | 'SELECT i.id |
4396 | - FROM ' . prefixTable('items') . ' as i |
|
4397 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
4398 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
4395 | + FROM ' . prefixTable('items').' as i |
|
4396 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
4397 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
4399 | 4398 | WHERE %l |
4400 | 4399 | ORDER BY i.label ASC, l.date DESC', |
4401 | 4400 | $where |
@@ -4460,8 +4459,8 @@ discard block |
||
4460 | 4459 | $dataItem = DB::queryFirstRow( |
4461 | 4460 | 'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id, |
4462 | 4461 | i.label AS label, i.id_tree AS id_tree |
4463 | - FROM ' . prefixTable('items') . ' AS i |
|
4464 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
4462 | + FROM ' . prefixTable('items').' AS i |
|
4463 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
4465 | 4464 | WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)', |
4466 | 4465 | $session->get('user-id'), |
4467 | 4466 | $inputData['itemKey'] ?? '', |
@@ -4572,7 +4571,7 @@ discard block |
||
4572 | 4571 | // do query on this folder |
4573 | 4572 | $data_this_folder = DB::queryFirstRow( |
4574 | 4573 | 'SELECT id, personal_folder, title |
4575 | - FROM ' . prefixTable('nested_tree') . ' |
|
4574 | + FROM ' . prefixTable('nested_tree').' |
|
4576 | 4575 | WHERE id = %s', |
4577 | 4576 | $inputData['folderId'] |
4578 | 4577 | ); |
@@ -4612,8 +4611,8 @@ discard block |
||
4612 | 4611 | $visibilite = ''; |
4613 | 4612 | $data = DB::queryFirstRow( |
4614 | 4613 | 'SELECT m.valeur, n.personal_folder |
4615 | - FROM ' . prefixTable('misc') . ' AS m |
|
4616 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
4614 | + FROM ' . prefixTable('misc').' AS m |
|
4615 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
4617 | 4616 | WHERE type=%s AND intitule = %s', |
4618 | 4617 | 'complex', |
4619 | 4618 | $inputData['folderId'] |
@@ -4626,8 +4625,8 @@ discard block |
||
4626 | 4625 | // Prepare Item actual visibility (what Users/Roles can see it) |
4627 | 4626 | $rows = DB::query( |
4628 | 4627 | 'SELECT t.title |
4629 | - FROM ' . prefixTable('roles_values') . ' as v |
|
4630 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
4628 | + FROM ' . prefixTable('roles_values').' as v |
|
4629 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
4631 | 4630 | WHERE v.folder_id = %i |
4632 | 4631 | GROUP BY title', |
4633 | 4632 | $inputData['folderId'] |
@@ -4636,7 +4635,7 @@ discard block |
||
4636 | 4635 | if (empty($visibilite)) { |
4637 | 4636 | $visibilite = $record['title']; |
4638 | 4637 | } else { |
4639 | - $visibilite .= ' - ' . $record['title']; |
|
4638 | + $visibilite .= ' - '.$record['title']; |
|
4640 | 4639 | } |
4641 | 4640 | } |
4642 | 4641 | } else { |
@@ -4646,14 +4645,14 @@ discard block |
||
4646 | 4645 | // do new query to know if current folder is pf |
4647 | 4646 | $data_pf = DB::queryFirstRow( |
4648 | 4647 | 'SELECT personal_folder |
4649 | - FROM ' . prefixTable('nested_tree') . ' |
|
4648 | + FROM ' . prefixTable('nested_tree').' |
|
4650 | 4649 | WHERE id = %s', |
4651 | 4650 | $inputData['folderId'] |
4652 | 4651 | ); |
4653 | 4652 | |
4654 | 4653 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
4655 | 4654 | |
4656 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
4655 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
4657 | 4656 | } |
4658 | 4657 | |
4659 | 4658 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4663,8 +4662,8 @@ discard block |
||
4663 | 4662 | $listOptionsForRoles = array(); |
4664 | 4663 | $rows = DB::query( |
4665 | 4664 | 'SELECT r.role_id AS role_id, t.title AS title |
4666 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
4667 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
4665 | + FROM ' . prefixTable('roles_values').' AS r |
|
4666 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
4668 | 4667 | WHERE r.folder_id = %i', |
4669 | 4668 | $inputData['folderId'] |
4670 | 4669 | ); |
@@ -4678,7 +4677,7 @@ discard block |
||
4678 | 4677 | ); |
4679 | 4678 | $rows2 = DB::query( |
4680 | 4679 | 'SELECT id, login, fonction_id, email, name, lastname |
4681 | - FROM ' . prefixTable('users') . ' |
|
4680 | + FROM ' . prefixTable('users').' |
|
4682 | 4681 | WHERE admin = 0 AND fonction_id is not null' |
4683 | 4682 | ); |
4684 | 4683 | foreach ($rows2 as $record2) { |
@@ -4692,7 +4691,7 @@ discard block |
||
4692 | 4691 | array( |
4693 | 4692 | 'id' => $record2['id'], |
4694 | 4693 | 'login' => $record2['login'], |
4695 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
4694 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
4696 | 4695 | 'email' => $record2['email'], |
4697 | 4696 | ) |
4698 | 4697 | ); |
@@ -4709,12 +4708,12 @@ discard block |
||
4709 | 4708 | foreach ($session->get('user-roles_array') as $role) { |
4710 | 4709 | $access = DB::queryFirstRow( |
4711 | 4710 | 'SELECT type |
4712 | - FROM ' . prefixTable('roles_values') . ' |
|
4711 | + FROM ' . prefixTable('roles_values').' |
|
4713 | 4712 | WHERE role_id = %i AND folder_id = %i', |
4714 | 4713 | $role, |
4715 | 4714 | $inputData['folderId'] |
4716 | 4715 | ); |
4717 | - if (DB::count()>0) { |
|
4716 | + if (DB::count() > 0) { |
|
4718 | 4717 | if ($access['type'] === 'R') { |
4719 | 4718 | array_push($arrTmp, 10); |
4720 | 4719 | } elseif ($access['type'] === 'W') { |
@@ -4742,7 +4741,7 @@ discard block |
||
4742 | 4741 | // Check if personal folder is owned by user |
4743 | 4742 | $folder = DB::queryFirstRow( |
4744 | 4743 | 'SELECT id |
4745 | - FROM ' . prefixTable('nested_tree') . ' |
|
4744 | + FROM ' . prefixTable('nested_tree').' |
|
4746 | 4745 | WHERE title = %s', |
4747 | 4746 | $session->get('user-id'), |
4748 | 4747 | ); |
@@ -4847,7 +4846,7 @@ discard block |
||
4847 | 4846 | // Get some info before deleting |
4848 | 4847 | $data = DB::queryFirstRow( |
4849 | 4848 | 'SELECT name, id_item, file |
4850 | - FROM ' . prefixTable('files') . ' |
|
4849 | + FROM ' . prefixTable('files').' |
|
4851 | 4850 | WHERE id = %i', |
4852 | 4851 | $fileId |
4853 | 4852 | ); |
@@ -4855,7 +4854,7 @@ discard block |
||
4855 | 4854 | // Load item data |
4856 | 4855 | $data_item = DB::queryFirstRow( |
4857 | 4856 | 'SELECT id_tree |
4858 | - FROM ' . prefixTable('items') . ' |
|
4857 | + FROM ' . prefixTable('items').' |
|
4859 | 4858 | WHERE id = %i', |
4860 | 4859 | $data['id_item'] |
4861 | 4860 | ); |
@@ -4885,7 +4884,7 @@ discard block |
||
4885 | 4884 | $session->get('user-id'), |
4886 | 4885 | 'at_modification', |
4887 | 4886 | $session->get('user-login'), |
4888 | - 'at_del_file : ' . $data['name'] |
|
4887 | + 'at_del_file : '.$data['name'] |
|
4889 | 4888 | ); |
4890 | 4889 | |
4891 | 4890 | // DElete sharekeys |
@@ -4896,7 +4895,7 @@ discard block |
||
4896 | 4895 | ); |
4897 | 4896 | |
4898 | 4897 | // Delete file from server |
4899 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
4898 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
4900 | 4899 | $fileToDelete = realpath($fileToDelete); |
4901 | 4900 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
4902 | 4901 | fileDelete($fileToDelete, $SETTINGS); |
@@ -4950,7 +4949,7 @@ discard block |
||
4950 | 4949 | // Update SESSION with this new favourite |
4951 | 4950 | $data = DB::queryFirstRow( |
4952 | 4951 | 'SELECT label,id_tree |
4953 | - FROM ' . prefixTable('items') . ' |
|
4952 | + FROM ' . prefixTable('items').' |
|
4954 | 4953 | WHERE id = %i', |
4955 | 4954 | $inputData['itemId'] |
4956 | 4955 | ); |
@@ -4959,7 +4958,7 @@ discard block |
||
4959 | 4958 | [ |
4960 | 4959 | $inputData['itemId'] => [ |
4961 | 4960 | 'label' => $data['label'], |
4962 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
4961 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
4963 | 4962 | ], |
4964 | 4963 | ], |
4965 | 4964 | 'add' |
@@ -5028,8 +5027,8 @@ discard block |
||
5028 | 5027 | // get data about item |
5029 | 5028 | $dataSource = DB::queryFirstRow( |
5030 | 5029 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
5031 | - FROM ' . prefixTable('items') . ' as i |
|
5032 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
5030 | + FROM ' . prefixTable('items').' as i |
|
5031 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
5033 | 5032 | WHERE i.id=%i', |
5034 | 5033 | $inputData['itemId'] |
5035 | 5034 | ); |
@@ -5073,7 +5072,7 @@ discard block |
||
5073 | 5072 | // get data about new folder |
5074 | 5073 | $dataDestination = DB::queryFirstRow( |
5075 | 5074 | 'SELECT personal_folder, title |
5076 | - FROM ' . prefixTable('nested_tree') . ' |
|
5075 | + FROM ' . prefixTable('nested_tree').' |
|
5077 | 5076 | WHERE id = %i', |
5078 | 5077 | $inputData['folderId'] |
5079 | 5078 | ); |
@@ -5126,7 +5125,7 @@ discard block |
||
5126 | 5125 | // Get fields for this Item |
5127 | 5126 | $rows = DB::query( |
5128 | 5127 | 'SELECT id |
5129 | - FROM ' . prefixTable('categories_items') . ' |
|
5128 | + FROM ' . prefixTable('categories_items').' |
|
5130 | 5129 | WHERE item_id = %i', |
5131 | 5130 | $inputData['itemId'] |
5132 | 5131 | ); |
@@ -5143,7 +5142,7 @@ discard block |
||
5143 | 5142 | // Get FILES for this Item |
5144 | 5143 | $rows = DB::query( |
5145 | 5144 | 'SELECT id |
5146 | - FROM ' . prefixTable('files') . ' |
|
5145 | + FROM ' . prefixTable('files').' |
|
5147 | 5146 | WHERE id_item = %i', |
5148 | 5147 | $inputData['itemId'] |
5149 | 5148 | ); |
@@ -5190,7 +5189,7 @@ discard block |
||
5190 | 5189 | // Get the ITEM object key for the user |
5191 | 5190 | $userKey = DB::queryFirstRow( |
5192 | 5191 | 'SELECT share_key |
5193 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
5192 | + FROM ' . prefixTable('sharekeys_items').' |
|
5194 | 5193 | WHERE user_id = %i AND object_id = %i', |
5195 | 5194 | $session->get('user-id'), |
5196 | 5195 | $inputData['itemId'] |
@@ -5201,7 +5200,7 @@ discard block |
||
5201 | 5200 | // This is a public object |
5202 | 5201 | $users = DB::query( |
5203 | 5202 | 'SELECT id, public_key |
5204 | - FROM ' . prefixTable('users') . ' |
|
5203 | + FROM ' . prefixTable('users').' |
|
5205 | 5204 | WHERE id NOT IN %li |
5206 | 5205 | AND public_key != ""', |
5207 | 5206 | $tpUsersIDs |
@@ -5224,14 +5223,14 @@ discard block |
||
5224 | 5223 | // Get fields for this Item |
5225 | 5224 | $rows = DB::query( |
5226 | 5225 | 'SELECT id |
5227 | - FROM ' . prefixTable('categories_items') . ' |
|
5226 | + FROM ' . prefixTable('categories_items').' |
|
5228 | 5227 | WHERE item_id = %i', |
5229 | 5228 | $inputData['itemId'] |
5230 | 5229 | ); |
5231 | 5230 | foreach ($rows as $field) { |
5232 | 5231 | $userKey = DB::queryFirstRow( |
5233 | 5232 | 'SELECT share_key |
5234 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5233 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5235 | 5234 | WHERE user_id = %i AND object_id = %i', |
5236 | 5235 | $session->get('user-id'), |
5237 | 5236 | $field['id'] |
@@ -5242,7 +5241,7 @@ discard block |
||
5242 | 5241 | // This is a public object |
5243 | 5242 | $users = DB::query( |
5244 | 5243 | 'SELECT id, public_key |
5245 | - FROM ' . prefixTable('users') . ' |
|
5244 | + FROM ' . prefixTable('users').' |
|
5246 | 5245 | WHERE id NOT IN %li |
5247 | 5246 | AND public_key != ""', |
5248 | 5247 | $tpUsersIDs |
@@ -5265,14 +5264,14 @@ discard block |
||
5265 | 5264 | // Get FILES for this Item |
5266 | 5265 | $rows = DB::query( |
5267 | 5266 | 'SELECT id |
5268 | - FROM ' . prefixTable('files') . ' |
|
5267 | + FROM ' . prefixTable('files').' |
|
5269 | 5268 | WHERE id_item = %i', |
5270 | 5269 | $inputData['itemId'] |
5271 | 5270 | ); |
5272 | 5271 | foreach ($rows as $attachment) { |
5273 | 5272 | $userKey = DB::queryFirstRow( |
5274 | 5273 | 'SELECT share_key |
5275 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5274 | + FROM ' . prefixTable('sharekeys_files').' |
|
5276 | 5275 | WHERE user_id = %i AND object_id = %i', |
5277 | 5276 | $session->get('user-id'), |
5278 | 5277 | $attachment['id'] |
@@ -5283,7 +5282,7 @@ discard block |
||
5283 | 5282 | // This is a public object |
5284 | 5283 | $users = DB::query( |
5285 | 5284 | 'SELECT id, public_key |
5286 | - FROM ' . prefixTable('users') . ' |
|
5285 | + FROM ' . prefixTable('users').' |
|
5287 | 5286 | WHERE id NOT IN %li |
5288 | 5287 | AND public_key != ""', |
5289 | 5288 | $tpUsersIDs |
@@ -5324,7 +5323,7 @@ discard block |
||
5324 | 5323 | $session->get('user-id'), |
5325 | 5324 | 'at_modification', |
5326 | 5325 | $session->get('user-login'), |
5327 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5326 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5328 | 5327 | ); |
5329 | 5328 | |
5330 | 5329 | // Update cache table |
@@ -5383,8 +5382,8 @@ discard block |
||
5383 | 5382 | // get data about item |
5384 | 5383 | $dataSource = DB::queryFirstRow( |
5385 | 5384 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
5386 | - FROM ' . prefixTable('items') . ' as i |
|
5387 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
5385 | + FROM ' . prefixTable('items').' as i |
|
5386 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
5388 | 5387 | WHERE i.id=%i', |
5389 | 5388 | $item_id |
5390 | 5389 | ); |
@@ -5406,7 +5405,7 @@ discard block |
||
5406 | 5405 | |
5407 | 5406 | // get data about new folder |
5408 | 5407 | $dataDestination = DB::queryFirstRow( |
5409 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
5408 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
5410 | 5409 | $inputData['folderId'] |
5411 | 5410 | ); |
5412 | 5411 | |
@@ -5448,7 +5447,7 @@ discard block |
||
5448 | 5447 | // Get fields for this Item |
5449 | 5448 | $rows = DB::query( |
5450 | 5449 | 'SELECT id |
5451 | - FROM ' . prefixTable('categories_items') . ' |
|
5450 | + FROM ' . prefixTable('categories_items').' |
|
5452 | 5451 | WHERE item_id = %i', |
5453 | 5452 | $item_id |
5454 | 5453 | ); |
@@ -5465,7 +5464,7 @@ discard block |
||
5465 | 5464 | // Get FILES for this Item |
5466 | 5465 | $rows = DB::query( |
5467 | 5466 | 'SELECT id |
5468 | - FROM ' . prefixTable('files') . ' |
|
5467 | + FROM ' . prefixTable('files').' |
|
5469 | 5468 | WHERE id_item = %i', |
5470 | 5469 | $item_id |
5471 | 5470 | ); |
@@ -5520,7 +5519,7 @@ discard block |
||
5520 | 5519 | // Get the ITEM object key for the user |
5521 | 5520 | $userKey = DB::queryFirstRow( |
5522 | 5521 | 'SELECT share_key |
5523 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
5522 | + FROM ' . prefixTable('sharekeys_items').' |
|
5524 | 5523 | WHERE user_id = %i AND object_id = %i', |
5525 | 5524 | $session->get('user-id'), |
5526 | 5525 | $item_id |
@@ -5531,7 +5530,7 @@ discard block |
||
5531 | 5530 | // This is a public object |
5532 | 5531 | $users = DB::query( |
5533 | 5532 | 'SELECT id, public_key |
5534 | - FROM ' . prefixTable('users') . ' |
|
5533 | + FROM ' . prefixTable('users').' |
|
5535 | 5534 | WHERE id NOT IN %li |
5536 | 5535 | AND public_key != ""', |
5537 | 5536 | $tpUsersIDs |
@@ -5554,14 +5553,14 @@ discard block |
||
5554 | 5553 | // Get fields for this Item |
5555 | 5554 | $rows = DB::query( |
5556 | 5555 | 'SELECT id |
5557 | - FROM ' . prefixTable('categories_items') . ' |
|
5556 | + FROM ' . prefixTable('categories_items').' |
|
5558 | 5557 | WHERE item_id = %i', |
5559 | 5558 | $item_id |
5560 | 5559 | ); |
5561 | 5560 | foreach ($rows as $field) { |
5562 | 5561 | $userKey = DB::queryFirstRow( |
5563 | 5562 | 'SELECT share_key |
5564 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5563 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5565 | 5564 | WHERE user_id = %i AND object_id = %i', |
5566 | 5565 | $session->get('user-id'), |
5567 | 5566 | $field['id'] |
@@ -5572,7 +5571,7 @@ discard block |
||
5572 | 5571 | // This is a public object |
5573 | 5572 | $users = DB::query( |
5574 | 5573 | 'SELECT id, public_key |
5575 | - FROM ' . prefixTable('users') . ' |
|
5574 | + FROM ' . prefixTable('users').' |
|
5576 | 5575 | WHERE id NOT IN %li |
5577 | 5576 | AND public_key != ""', |
5578 | 5577 | $tpUsersIDs |
@@ -5596,14 +5595,14 @@ discard block |
||
5596 | 5595 | // Get FILES for this Item |
5597 | 5596 | $rows = DB::query( |
5598 | 5597 | 'SELECT id |
5599 | - FROM ' . prefixTable('files') . ' |
|
5598 | + FROM ' . prefixTable('files').' |
|
5600 | 5599 | WHERE id_item = %i', |
5601 | 5600 | $item_id |
5602 | 5601 | ); |
5603 | 5602 | foreach ($rows as $attachment) { |
5604 | 5603 | $userKey = DB::queryFirstRow( |
5605 | 5604 | 'SELECT share_key |
5606 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5605 | + FROM ' . prefixTable('sharekeys_files').' |
|
5607 | 5606 | WHERE user_id = %i AND object_id = %i', |
5608 | 5607 | $session->get('user-id'), |
5609 | 5608 | $attachment['id'] |
@@ -5614,7 +5613,7 @@ discard block |
||
5614 | 5613 | // This is a public object |
5615 | 5614 | $users = DB::query( |
5616 | 5615 | 'SELECT id, public_key |
5617 | - FROM ' . prefixTable('users') . ' |
|
5616 | + FROM ' . prefixTable('users').' |
|
5618 | 5617 | WHERE id NOT IN %li |
5619 | 5618 | AND public_key != ""', |
5620 | 5619 | $tpUsersIDs |
@@ -5654,13 +5653,13 @@ discard block |
||
5654 | 5653 | $session->get('user-id'), |
5655 | 5654 | 'at_modification', |
5656 | 5655 | $session->get('user-login'), |
5657 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5656 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5658 | 5657 | ); |
5659 | 5658 | } |
5660 | 5659 | } |
5661 | 5660 | |
5662 | 5661 | // reload cache table |
5663 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
5662 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
5664 | 5663 | updateCacheTable('reload', null); |
5665 | 5664 | |
5666 | 5665 | echo (string) prepareExchangedData( |
@@ -5724,7 +5723,7 @@ discard block |
||
5724 | 5723 | // get info |
5725 | 5724 | $dataSource = DB::queryFirstRow( |
5726 | 5725 | 'SELECT label, id_tree |
5727 | - FROM ' . prefixTable('items') . ' |
|
5726 | + FROM ' . prefixTable('items').' |
|
5728 | 5727 | WHERE id=%i', |
5729 | 5728 | $item_id |
5730 | 5729 | ); |
@@ -5825,14 +5824,14 @@ discard block |
||
5825 | 5824 | // Variables |
5826 | 5825 | $dataAuthor = DB::queryFirstRow( |
5827 | 5826 | 'SELECT email,login |
5828 | - FROM ' . prefixTable('users') . ' |
|
5827 | + FROM ' . prefixTable('users').' |
|
5829 | 5828 | WHERE id = %i', |
5830 | 5829 | $post_content[1] |
5831 | 5830 | ); |
5832 | 5831 | |
5833 | 5832 | $dataItem = DB::queryFirstRow( |
5834 | 5833 | 'SELECT label, id_tree |
5835 | - FROM ' . prefixTable('items') . ' |
|
5834 | + FROM ' . prefixTable('items').' |
|
5836 | 5835 | WHERE id = %i', |
5837 | 5836 | $post_content[0] |
5838 | 5837 | ); |
@@ -5849,7 +5848,7 @@ discard block |
||
5849 | 5848 | $lang->get('email_request_access_subject'), |
5850 | 5849 | str_replace( |
5851 | 5850 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
5852 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
5851 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
5853 | 5852 | $lang->get('email_request_access_mail') |
5854 | 5853 | ), |
5855 | 5854 | $dataAuthor['email'], |
@@ -5858,7 +5857,7 @@ discard block |
||
5858 | 5857 | } elseif ($inputData['cat'] === 'share_this_item') { |
5859 | 5858 | $dataItem = DB::queryFirstRow( |
5860 | 5859 | 'SELECT label,id_tree |
5861 | - FROM ' . prefixTable('items') . ' |
|
5860 | + FROM ' . prefixTable('items').' |
|
5862 | 5861 | WHERE id= %i', |
5863 | 5862 | $inputData['id'] |
5864 | 5863 | ); |
@@ -5881,7 +5880,7 @@ discard block |
||
5881 | 5880 | ), |
5882 | 5881 | array( |
5883 | 5882 | empty($SETTINGS['email_server_url']) === false ? |
5884 | - $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'], |
|
5883 | + $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'], |
|
5885 | 5884 | addslashes($session->get('user-login')), |
5886 | 5885 | addslashes($path), |
5887 | 5886 | ), |
@@ -5930,8 +5929,8 @@ discard block |
||
5930 | 5929 | // Get all informations for this item |
5931 | 5930 | $dataItem = DB::queryFirstRow( |
5932 | 5931 | 'SELECT * |
5933 | - FROM ' . prefixTable('items') . ' as i |
|
5934 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
5932 | + FROM ' . prefixTable('items').' as i |
|
5933 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
5935 | 5934 | WHERE i.id=%i AND l.action = %s', |
5936 | 5935 | $item_id, |
5937 | 5936 | 'at_creation' |
@@ -5960,18 +5959,18 @@ discard block |
||
5960 | 5959 | $session->get('user-login'), |
5961 | 5960 | htmlspecialchars_decode($label, ENT_QUOTES), |
5962 | 5961 | null, |
5963 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
5962 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
5964 | 5963 | ); |
5965 | 5964 | // Prepare new line |
5966 | 5965 | $data = DB::queryFirstRow( |
5967 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
5966 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
5968 | 5967 | $item_id |
5969 | 5968 | ); |
5970 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
5969 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
5971 | 5970 | // send back |
5972 | 5971 | $data = array( |
5973 | 5972 | 'error' => '', |
5974 | - 'new_line' => '<br>' . addslashes($historic), |
|
5973 | + 'new_line' => '<br>'.addslashes($historic), |
|
5975 | 5974 | ); |
5976 | 5975 | echo (string) prepareExchangedData( |
5977 | 5976 | $data, |
@@ -6046,8 +6045,8 @@ discard block |
||
6046 | 6045 | // Should we log a password change? |
6047 | 6046 | $itemQ = DB::queryFirstRow( |
6048 | 6047 | 'SELECT s.share_key, i.pw |
6049 | - FROM ' . prefixTable('items') . ' AS i |
|
6050 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
6048 | + FROM ' . prefixTable('items').' AS i |
|
6049 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
6051 | 6050 | WHERE s.user_id = %i AND s.object_id = %i', |
6052 | 6051 | $session->get('user-id'), |
6053 | 6052 | $dataReceived['id'] |
@@ -6102,7 +6101,7 @@ discard block |
||
6102 | 6101 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
6103 | 6102 | $SETTINGS['otv_expiration_period'] = 7; |
6104 | 6103 | } |
6105 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
6104 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
6106 | 6105 | |
6107 | 6106 | echo json_encode( |
6108 | 6107 | array( |
@@ -6133,7 +6132,7 @@ discard block |
||
6133 | 6132 | // get parameters from original link |
6134 | 6133 | $url = $dataReceived['original_link']; |
6135 | 6134 | $parts = parse_url($url); |
6136 | - if(isset($parts['query'])){ |
|
6135 | + if (isset($parts['query'])) { |
|
6137 | 6136 | parse_str($parts['query'], $orignal_link_parameters); |
6138 | 6137 | } else { |
6139 | 6138 | $orignal_link_parameters = array(); |
@@ -6164,13 +6163,13 @@ discard block |
||
6164 | 6163 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
6165 | 6164 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
6166 | 6165 | if (str_contains($domain_host, 'www.') === true) { |
6167 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
6166 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
6168 | 6167 | } else { |
6169 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
6168 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
6170 | 6169 | } |
6171 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
6170 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
6172 | 6171 | } else { |
6173 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
6172 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
6174 | 6173 | } |
6175 | 6174 | |
6176 | 6175 | echo (string) prepareExchangedData( |
@@ -6205,8 +6204,8 @@ discard block |
||
6205 | 6204 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
6206 | 6205 | f.extension AS extension, f.type AS type, |
6207 | 6206 | s.share_key AS share_key |
6208 | - FROM ' . prefixTable('files') . ' AS f |
|
6209 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
6207 | + FROM ' . prefixTable('files').' AS f |
|
6208 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
6210 | 6209 | WHERE s.user_id = %i AND s.object_id = %i', |
6211 | 6210 | $session->get('user-id'), |
6212 | 6211 | $inputData['id'] |
@@ -6227,7 +6226,7 @@ discard block |
||
6227 | 6226 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
6228 | 6227 | |
6229 | 6228 | // prepare image info |
6230 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
6229 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
6231 | 6230 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
6232 | 6231 | |
6233 | 6232 | // Get image content |
@@ -6254,7 +6253,7 @@ discard block |
||
6254 | 6253 | echo (string) prepareExchangedData( |
6255 | 6254 | array( |
6256 | 6255 | 'error' => false, |
6257 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
6256 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
6258 | 6257 | 'file_type' => $file_info['type'], |
6259 | 6258 | 'file_content' => $fileContent, |
6260 | 6259 | ), |
@@ -6368,7 +6367,7 @@ discard block |
||
6368 | 6367 | $arbo = $tree->getPath($folder->id, false); |
6369 | 6368 | $path = ''; |
6370 | 6369 | foreach ($arbo as $elem) { |
6371 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6370 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6372 | 6371 | } |
6373 | 6372 | |
6374 | 6373 | // Build array |
@@ -6437,7 +6436,7 @@ discard block |
||
6437 | 6436 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
6438 | 6437 | $rows = DB::query( |
6439 | 6438 | 'SELECT id, categories |
6440 | - FROM ' . prefixTable('nested_tree') . ' |
|
6439 | + FROM ' . prefixTable('nested_tree').' |
|
6441 | 6440 | WHERE id IN (%l)', |
6442 | 6441 | implode(',', $foldersArray) |
6443 | 6442 | ); |
@@ -6479,7 +6478,7 @@ discard block |
||
6479 | 6478 | // get item info |
6480 | 6479 | $dataItem = DB::queryFirstRow( |
6481 | 6480 | 'SELECT * |
6482 | - FROM ' . prefixTable('items') . ' |
|
6481 | + FROM ' . prefixTable('items').' |
|
6483 | 6482 | WHERE id=%i', |
6484 | 6483 | $inputData['itemId'] |
6485 | 6484 | ); |
@@ -6491,8 +6490,8 @@ discard block |
||
6491 | 6490 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
6492 | 6491 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
6493 | 6492 | l.old_value as old_value |
6494 | - FROM ' . prefixTable('log_items') . ' as l |
|
6495 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
6493 | + FROM ' . prefixTable('log_items').' as l |
|
6494 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
6496 | 6495 | WHERE id_item=%i AND l.action NOT IN (%l) |
6497 | 6496 | ORDER BY date DESC', |
6498 | 6497 | $inputData['itemId'], |
@@ -6507,18 +6506,18 @@ discard block |
||
6507 | 6506 | |
6508 | 6507 | // imported via API |
6509 | 6508 | if (empty($record['login']) === true) { |
6510 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
6509 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
6511 | 6510 | } |
6512 | 6511 | |
6513 | 6512 | // Prepare avatar |
6514 | 6513 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
6515 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
6516 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
6514 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
6515 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
6517 | 6516 | } else { |
6518 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6517 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6519 | 6518 | } |
6520 | 6519 | } else { |
6521 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6520 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6522 | 6521 | } |
6523 | 6522 | |
6524 | 6523 | // Prepare action |
@@ -6538,7 +6537,7 @@ discard block |
||
6538 | 6537 | $previous_passwords, |
6539 | 6538 | [ |
6540 | 6539 | 'password' => htmlentities($previous_pwd['string']), |
6541 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6540 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6542 | 6541 | ] |
6543 | 6542 | ); |
6544 | 6543 | } |
@@ -6551,19 +6550,19 @@ discard block |
||
6551 | 6550 | $action = $lang->get($reason[0]); |
6552 | 6551 | if ($reason[0] === 'at_moved') { |
6553 | 6552 | $tmp = explode(' -> ', $reason[1]); |
6554 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
6553 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
6555 | 6554 | } elseif ($reason[0] === 'at_field') { |
6556 | 6555 | $tmp = explode(' => ', $reason[1]); |
6557 | 6556 | if (count($tmp) > 1) { |
6558 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
6559 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
6557 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
6558 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
6560 | 6559 | } else { |
6561 | 6560 | $detail = trim($reason[1]); |
6562 | 6561 | } |
6563 | 6562 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
6564 | 6563 | $tmp = explode(' => ', $reason[1]); |
6565 | 6564 | $detail = empty(trim($tmp[0])) === true ? |
6566 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
6565 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
6567 | 6566 | } elseif ($reason[0] === 'at_automatic_del') { |
6568 | 6567 | $detail = $lang->get($reason[1]); |
6569 | 6568 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6572,7 +6571,7 @@ discard block |
||
6572 | 6571 | $tmp = explode(':', $reason[1]); |
6573 | 6572 | $tmp = explode('.', $tmp[0]); |
6574 | 6573 | $detail = isBase64($tmp[0]) === true ? |
6575 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
6574 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
6576 | 6575 | } elseif ($reason[0] === 'at_import') { |
6577 | 6576 | $detail = ''; |
6578 | 6577 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6591,8 +6590,8 @@ discard block |
||
6591 | 6590 | array( |
6592 | 6591 | 'avatar' => $avatar, |
6593 | 6592 | 'login' => $record['login'], |
6594 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
6595 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6593 | + 'name' => $record['name'].' '.$record['lastname'], |
|
6594 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6596 | 6595 | 'action' => $action, |
6597 | 6596 | 'detail' => $detail, |
6598 | 6597 | ) |
@@ -6680,11 +6679,11 @@ discard block |
||
6680 | 6679 | |
6681 | 6680 | // get some info to add to the notification email |
6682 | 6681 | $resp_user = DB::queryFirstRow( |
6683 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
6682 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
6684 | 6683 | $session->get('user-id') |
6685 | 6684 | ); |
6686 | 6685 | $resp_folder = DB::queryFirstRow( |
6687 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
6686 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
6688 | 6687 | $folder |
6689 | 6688 | ); |
6690 | 6689 | |
@@ -6693,7 +6692,7 @@ discard block |
||
6693 | 6692 | $emailService = new EmailService(); |
6694 | 6693 | $rows = DB::query( |
6695 | 6694 | 'SELECT email |
6696 | - FROM ' . prefixTable('users') . ' |
|
6695 | + FROM ' . prefixTable('users').' |
|
6697 | 6696 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
6698 | 6697 | 1 |
6699 | 6698 | ); |
@@ -6739,7 +6738,7 @@ discard block |
||
6739 | 6738 | // Send email |
6740 | 6739 | $dataItem = DB::queryFirstRow( |
6741 | 6740 | 'SELECT label, id_tree |
6742 | - FROM ' . prefixTable('items') . ' |
|
6741 | + FROM ' . prefixTable('items').' |
|
6743 | 6742 | WHERE id = %i', |
6744 | 6743 | $inputData['itemId'] |
6745 | 6744 | ); |
@@ -6793,7 +6792,7 @@ discard block |
||
6793 | 6792 | |
6794 | 6793 | DB::query( |
6795 | 6794 | 'SELECT * |
6796 | - FROM ' . prefixTable('notification') . ' |
|
6795 | + FROM ' . prefixTable('notification').' |
|
6797 | 6796 | WHERE item_id = %i AND user_id = %i', |
6798 | 6797 | $inputData['itemId'], |
6799 | 6798 | $session->get('user-id') |
@@ -6865,7 +6864,7 @@ discard block |
||
6865 | 6864 | // And related logs |
6866 | 6865 | $rows = DB::query( |
6867 | 6866 | 'SELECT id, file AS filename |
6868 | - FROM ' . prefixTable('files') . ' |
|
6867 | + FROM ' . prefixTable('files').' |
|
6869 | 6868 | WHERE id_item = %i AND confirmed = %i', |
6870 | 6869 | $inputData['itemId'], |
6871 | 6870 | 0 |
@@ -6879,12 +6878,12 @@ discard block |
||
6879 | 6878 | ); |
6880 | 6879 | |
6881 | 6880 | // Delete file on server |
6882 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
6881 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
6883 | 6882 | |
6884 | 6883 | // Delete related logs |
6885 | 6884 | $logFile = DB::query( |
6886 | 6885 | 'SELECT increment_id, raison |
6887 | - FROM ' . prefixTable('log_items') . ' |
|
6886 | + FROM ' . prefixTable('log_items').' |
|
6888 | 6887 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
6889 | 6888 | $inputData['itemId'], |
6890 | 6889 | $session->get('user-id'), |
@@ -6943,7 +6942,7 @@ discard block |
||
6943 | 6942 | // Confirm attachments |
6944 | 6943 | $rows = DB::query( |
6945 | 6944 | 'SELECT id, file AS filename |
6946 | - FROM ' . prefixTable('files') . ' |
|
6945 | + FROM ' . prefixTable('files').' |
|
6947 | 6946 | WHERE id_item = %i AND confirmed = %i', |
6948 | 6947 | $inputData['itemId'], |
6949 | 6948 | 0 |
@@ -7025,15 +7024,15 @@ discard block |
||
7025 | 7024 | case 'autocomplete_tags': |
7026 | 7025 | // Get a list off all existing TAGS |
7027 | 7026 | $listOfTags = ''; |
7028 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
7027 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
7029 | 7028 | foreach ($rows as $record) { |
7030 | 7029 | if (empty($listOfTags)) { |
7031 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
7030 | + $listOfTags = '"'.$record['tag'].'"'; |
|
7032 | 7031 | } else { |
7033 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
7032 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
7034 | 7033 | } |
7035 | 7034 | } |
7036 | - echo '[' . $listOfTags . ']'; |
|
7035 | + echo '['.$listOfTags.']'; |
|
7037 | 7036 | break; |
7038 | 7037 | } |
7039 | 7038 | } |
@@ -7049,7 +7048,7 @@ discard block |
||
7049 | 7048 | { |
7050 | 7049 | $data = DB::queryFirstRow( |
7051 | 7050 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
7052 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
7051 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
7053 | 7052 | $groupe |
7054 | 7053 | ); |
7055 | 7054 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7162,7 +7161,7 @@ discard block |
||
7162 | 7161 | $now = time(); |
7163 | 7162 | $editionLocks = DB::query( |
7164 | 7163 | 'SELECT timestamp, user_id, increment_id |
7165 | - FROM ' . prefixTable('items_edition') . ' |
|
7164 | + FROM ' . prefixTable('items_edition').' |
|
7166 | 7165 | WHERE item_id = %i |
7167 | 7166 | ORDER BY increment_id DESC', |
7168 | 7167 | $itemId |
@@ -7208,7 +7207,7 @@ discard block |
||
7208 | 7207 | |
7209 | 7208 | // Delete related background tasks if any |
7210 | 7209 | $task = DB::queryFirstRow( |
7211 | - 'SELECT increment_id FROM ' . prefixTable('background_tasks') . ' |
|
7210 | + 'SELECT increment_id FROM '.prefixTable('background_tasks').' |
|
7212 | 7211 | WHERE item_id = %i AND finished_at = ""', |
7213 | 7212 | $itemId |
7214 | 7213 | ); |
@@ -7221,7 +7220,7 @@ discard block |
||
7221 | 7220 | // Check if encryption process is still running |
7222 | 7221 | DB::queryFirstRow( |
7223 | 7222 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
7224 | - FROM ' . prefixTable('background_tasks') . ' |
|
7223 | + FROM ' . prefixTable('background_tasks').' |
|
7225 | 7224 | WHERE item_id = %i AND finished_at = "" |
7226 | 7225 | ORDER BY increment_id DESC', |
7227 | 7226 | $itemId |
@@ -7242,7 +7241,7 @@ discard block |
||
7242 | 7241 | } |
7243 | 7242 | |
7244 | 7243 | return [ |
7245 | - 'status' => true, // Encryption in progress |
|
7244 | + 'status' => true, // Encryption in progress |
|
7246 | 7245 | 'delay' => $delay - $elapsed, // Time remaining before the lock expires |
7247 | 7246 | ]; |
7248 | 7247 | } |
@@ -7287,7 +7286,7 @@ discard block |
||
7287 | 7286 | { |
7288 | 7287 | // Check if there's an ongoing background encryption process for the item |
7289 | 7288 | $ongoingProcess = DB::queryFirstRow( |
7290 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
7289 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
7291 | 7290 | $itemId |
7292 | 7291 | ); |
7293 | 7292 | |
@@ -7305,7 +7304,7 @@ discard block |
||
7305 | 7304 | function getUserVisibleFolders(int $userId): array |
7306 | 7305 | { |
7307 | 7306 | // Query to retrieve visible folders for the user |
7308 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
7307 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
7309 | 7308 | |
7310 | 7309 | // Decode JSON data into an array; return an empty array if the data is invalid |
7311 | 7310 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7329,7 +7328,7 @@ discard block |
||
7329 | 7328 | |
7330 | 7329 | // Query the access rights for the given roles and folder |
7331 | 7330 | $accessTypes = DB::queryFirstColumn( |
7332 | - 'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
7331 | + 'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
7333 | 7332 | $roles, |
7334 | 7333 | $treeId |
7335 | 7334 | ); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
75 | 75 | // Not allowed page |
76 | 76 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
77 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
77 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
78 | 78 | exit; |
79 | 79 | } |
80 | 80 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | // Get info about user to modify |
147 | 147 | $targetUserInfos = DB::queryFirstRow( |
148 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
148 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
149 | 149 | WHERE id = %i', |
150 | 150 | (int) $dataReceived['user_id'] |
151 | 151 | ); |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | // Check if user already exists |
278 | 278 | $data = DB::query( |
279 | 279 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
280 | - FROM ' . prefixTable('users') . ' |
|
280 | + FROM ' . prefixTable('users').' |
|
281 | 281 | WHERE login = %s |
282 | 282 | AND deleted_at IS NULL', |
283 | 283 | $login |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | |
497 | 497 | // Get info about user to delete |
498 | 498 | $data_user = DB::queryFirstRow( |
499 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
499 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
500 | 500 | WHERE id = %i', |
501 | 501 | $post_id |
502 | 502 | ); |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | ); |
531 | 531 | // delete personal folder and subfolders |
532 | 532 | $data = DB::queryFirstRow( |
533 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
533 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
534 | 534 | WHERE title = %s AND personal_folder = %i', |
535 | 535 | $post_id, |
536 | 536 | '1' |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
544 | 544 | // delete items & logs |
545 | 545 | $items = DB::query( |
546 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
546 | + 'SELECT id FROM '.prefixTable('items').' |
|
547 | 547 | WHERE id_tree=%i AND perso = %i', |
548 | 548 | $folder->id, |
549 | 549 | '1' |
@@ -567,7 +567,7 @@ discard block |
||
567 | 567 | // Delete any process related to user |
568 | 568 | $processes = DB::query( |
569 | 569 | 'SELECT increment_id |
570 | - FROM ' . prefixTable('background_tasks') . ' |
|
570 | + FROM ' . prefixTable('background_tasks').' |
|
571 | 571 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
572 | 572 | $post_id |
573 | 573 | ); |
@@ -620,7 +620,7 @@ discard block |
||
620 | 620 | $return = array(); |
621 | 621 | // Check if folder exists |
622 | 622 | $data = DB::query( |
623 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
623 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
624 | 624 | WHERE title = %s AND parent_id = %i', |
625 | 625 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
626 | 626 | '0' |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | } |
634 | 634 | // Check if role exists |
635 | 635 | $data = DB::query( |
636 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
636 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
637 | 637 | WHERE title = %s', |
638 | 638 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
639 | 639 | ); |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | // Get info about user to delete |
663 | 663 | $data_user = DB::queryFirstRow( |
664 | 664 | 'SELECT admin, isAdministratedByRole, gestionnaire |
665 | - FROM ' . prefixTable('users') . ' |
|
665 | + FROM ' . prefixTable('users').' |
|
666 | 666 | WHERE id = %i', |
667 | 667 | $post_user_id |
668 | 668 | ); |
@@ -718,7 +718,7 @@ discard block |
||
718 | 718 | // Get info about user |
719 | 719 | $rowUser = DB::queryFirstRow( |
720 | 720 | 'SELECT * |
721 | - FROM ' . prefixTable('users') . ' |
|
721 | + FROM ' . prefixTable('users').' |
|
722 | 722 | WHERE id = %i', |
723 | 723 | $post_id |
724 | 724 | ); |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | $session->set('user-roles_array', explode(';', $session->get('user-roles'))); |
747 | 747 | $rows = DB::query(' |
748 | 748 | SELECT id,title,creator_id |
749 | - FROM ' . prefixTable('roles_title') .' |
|
749 | + FROM ' . prefixTable('roles_title').' |
|
750 | 750 | WHERE id IN %li', |
751 | 751 | $session->get('user-roles_array') |
752 | 752 | ); |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | $rolesList = array(); |
785 | 785 | $managedBy = array(); |
786 | 786 | $selected = ''; |
787 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
787 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
788 | 788 | foreach ($rows as $reccord) { |
789 | 789 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
790 | 790 | } |
@@ -815,7 +815,7 @@ discard block |
||
815 | 815 | array_push( |
816 | 816 | $managedBy, |
817 | 817 | array( |
818 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
818 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
819 | 819 | 'id' => $fonction['id'], |
820 | 820 | 'selected' => $selected, |
821 | 821 | ) |
@@ -897,9 +897,9 @@ discard block |
||
897 | 897 | |
898 | 898 | // get USER STATUS |
899 | 899 | if ($rowUser['disabled'] == 1) { |
900 | - $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . $lang->get('user_info_unlock_question') . '</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . $lang->get('user_info_delete_question') . '</label>'; |
|
900 | + $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.$lang->get('user_info_unlock_question').'</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.$lang->get('user_info_delete_question').'</label>'; |
|
901 | 901 | } else { |
902 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
902 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
903 | 903 | } |
904 | 904 | |
905 | 905 | $arrData['error'] = false; |
@@ -986,7 +986,7 @@ discard block |
||
986 | 986 | |
987 | 987 | // Get info about user to modify |
988 | 988 | $data_user = DB::queryFirstRow( |
989 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
989 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
990 | 990 | WHERE id = %i', |
991 | 991 | $post_id |
992 | 992 | ); |
@@ -997,7 +997,7 @@ discard block |
||
997 | 997 | // count number of admins |
998 | 998 | $users = DB::query( |
999 | 999 | 'SELECT id |
1000 | - FROM ' . prefixTable('users') . ' |
|
1000 | + FROM ' . prefixTable('users').' |
|
1001 | 1001 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
1002 | 1002 | $post_id |
1003 | 1003 | ); |
@@ -1020,7 +1020,7 @@ discard block |
||
1020 | 1020 | // Exclude roles from AD - PR #3635 |
1021 | 1021 | $adRoles = DB::query( |
1022 | 1022 | 'SELECT roles_from_ad_groups |
1023 | - FROM ' . prefixTable('users') . ' |
|
1023 | + FROM ' . prefixTable('users').' |
|
1024 | 1024 | WHERE id = %i', |
1025 | 1025 | $post_id |
1026 | 1026 | )[0]['roles_from_ad_groups']; |
@@ -1124,7 +1124,7 @@ discard block |
||
1124 | 1124 | ); |
1125 | 1125 | // delete personal folder and subfolders |
1126 | 1126 | $data = DB::queryFirstRow( |
1127 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
1127 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
1128 | 1128 | WHERE title = %s AND personal_folder = %i', |
1129 | 1129 | $post_id, |
1130 | 1130 | '1' |
@@ -1137,7 +1137,7 @@ discard block |
||
1137 | 1137 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
1138 | 1138 | // delete items & logs |
1139 | 1139 | $items = DB::query( |
1140 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
1140 | + 'SELECT id FROM '.prefixTable('items').' |
|
1141 | 1141 | WHERE id_tree=%i AND perso = %i', |
1142 | 1142 | $folder->id, |
1143 | 1143 | '1' |
@@ -1158,7 +1158,7 @@ discard block |
||
1158 | 1158 | } else { |
1159 | 1159 | // Get old data about user |
1160 | 1160 | $oldData = DB::queryFirstRow( |
1161 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
1161 | + 'SELECT * FROM '.prefixTable('users').' |
|
1162 | 1162 | WHERE id = %i', |
1163 | 1163 | $post_id |
1164 | 1164 | ); |
@@ -1195,7 +1195,7 @@ discard block |
||
1195 | 1195 | |
1196 | 1196 | // update LOG |
1197 | 1197 | if ($oldData['email'] !== $post_email) { |
1198 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
1198 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
1199 | 1199 | } |
1200 | 1200 | } |
1201 | 1201 | echo prepareExchangedData( |
@@ -1243,7 +1243,7 @@ discard block |
||
1243 | 1243 | } |
1244 | 1244 | |
1245 | 1245 | DB::queryFirstRow( |
1246 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
1246 | + 'SELECT * FROM '.prefixTable('users').' |
|
1247 | 1247 | WHERE login = %s |
1248 | 1248 | AND deleted_at IS NULL', |
1249 | 1249 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1295,7 +1295,7 @@ discard block |
||
1295 | 1295 | // get User info |
1296 | 1296 | $rowUser = DB::queryFirstRow( |
1297 | 1297 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
1298 | - FROM ' . prefixTable('users') . ' |
|
1298 | + FROM ' . prefixTable('users').' |
|
1299 | 1299 | WHERE id = %i', |
1300 | 1300 | $post_id |
1301 | 1301 | ); |
@@ -1305,7 +1305,7 @@ discard block |
||
1305 | 1305 | $html = ''; |
1306 | 1306 | |
1307 | 1307 | if (isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) { |
1308 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
1308 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
1309 | 1309 | } |
1310 | 1310 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
1311 | 1311 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1316,7 +1316,7 @@ discard block |
||
1316 | 1316 | // refine folders based upon roles |
1317 | 1317 | $rows = DB::query( |
1318 | 1318 | 'SELECT folder_id, type |
1319 | - FROM ' . prefixTable('roles_values') . ' |
|
1319 | + FROM ' . prefixTable('roles_values').' |
|
1320 | 1320 | WHERE role_id IN %ls |
1321 | 1321 | ORDER BY folder_id ASC', |
1322 | 1322 | $arrData['functions'] |
@@ -1339,7 +1339,7 @@ discard block |
||
1339 | 1339 | } |
1340 | 1340 | |
1341 | 1341 | // add allowed folders |
1342 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
1342 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
1343 | 1343 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
1344 | 1344 | } |
1345 | 1345 | |
@@ -1350,7 +1350,7 @@ discard block |
||
1350 | 1350 | // get folder name |
1351 | 1351 | $row = DB::queryFirstRow( |
1352 | 1352 | 'SELECT title, nlevel, id |
1353 | - FROM ' . prefixTable('nested_tree') . ' |
|
1353 | + FROM ' . prefixTable('nested_tree').' |
|
1354 | 1354 | WHERE id = %i', |
1355 | 1355 | $fld['id'] |
1356 | 1356 | ); |
@@ -1363,38 +1363,38 @@ discard block |
||
1363 | 1363 | |
1364 | 1364 | // manage right icon |
1365 | 1365 | if ($fld['type'] == 'W') { |
1366 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1367 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
1368 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
1366 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
1367 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
1368 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
1369 | 1369 | } elseif ($fld['type'] == 'ND') { |
1370 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1371 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
1372 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
1370 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
1371 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
1372 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
1373 | 1373 | } elseif ($fld['type'] == 'NE') { |
1374 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1375 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
1376 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
1374 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
1375 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
1376 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
1377 | 1377 | } elseif ($fld['type'] == 'NDNE') { |
1378 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1379 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
1380 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
1378 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
1379 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
1380 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
1381 | 1381 | } elseif ($fld['type'] == '') { |
1382 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
1382 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
1383 | 1383 | } else { |
1384 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
1384 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
1385 | 1385 | } |
1386 | 1386 | |
1387 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
1388 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
1389 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
1390 | - '</td><td>' . $label . '</td></tr>'; |
|
1387 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
1388 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
1389 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
1390 | + '</td><td>'.$label.'</td></tr>'; |
|
1391 | 1391 | break; |
1392 | 1392 | } |
1393 | 1393 | } |
1394 | 1394 | } |
1395 | 1395 | |
1396 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
1397 | - $html . '</tbody></table>'; |
|
1396 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
1397 | + $html.'</tbody></table>'; |
|
1398 | 1398 | } else { |
1399 | 1399 | $html_full = ''; |
1400 | 1400 | } |
@@ -1440,7 +1440,7 @@ discard block |
||
1440 | 1440 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
1441 | 1441 | $rows = DB::query( |
1442 | 1442 | 'SELECT * |
1443 | - FROM ' . prefixTable('users') . ' |
|
1443 | + FROM ' . prefixTable('users').' |
|
1444 | 1444 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
1445 | 1445 | '0', |
1446 | 1446 | array_filter($session->get('user-roles_array')) |
@@ -1448,7 +1448,7 @@ discard block |
||
1448 | 1448 | } else { |
1449 | 1449 | $rows = DB::query( |
1450 | 1450 | 'SELECT * |
1451 | - FROM ' . prefixTable('users') . ' |
|
1451 | + FROM ' . prefixTable('users').' |
|
1452 | 1452 | WHERE admin = %i', |
1453 | 1453 | '0' |
1454 | 1454 | ); |
@@ -1460,7 +1460,7 @@ discard block |
||
1460 | 1460 | $groupIds = []; |
1461 | 1461 | foreach (explode(';', $record['fonction_id']) as $group) { |
1462 | 1462 | $tmp = DB::queryFirstRow( |
1463 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
1463 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
1464 | 1464 | WHERE id = %i', |
1465 | 1465 | $group |
1466 | 1466 | ); |
@@ -1472,7 +1472,7 @@ discard block |
||
1472 | 1472 | |
1473 | 1473 | // Get managed_by |
1474 | 1474 | $managedBy = DB::queryFirstRow( |
1475 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
1475 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
1476 | 1476 | WHERE id = %i', |
1477 | 1477 | $record['isAdministratedByRole'] |
1478 | 1478 | ); |
@@ -1482,7 +1482,7 @@ discard block |
||
1482 | 1482 | $foldersAllowedIds = []; |
1483 | 1483 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
1484 | 1484 | $tmp = DB::queryFirstRow( |
1485 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
1485 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
1486 | 1486 | WHERE id = %i', |
1487 | 1487 | $role |
1488 | 1488 | ); |
@@ -1495,7 +1495,7 @@ discard block |
||
1495 | 1495 | $foldersForbiddenIds = []; |
1496 | 1496 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
1497 | 1497 | $tmp = DB::queryFirstRow( |
1498 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
1498 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
1499 | 1499 | WHERE id = %i', |
1500 | 1500 | $role |
1501 | 1501 | ); |
@@ -1513,7 +1513,7 @@ discard block |
||
1513 | 1513 | 'login' => $record['login'], |
1514 | 1514 | 'groups' => implode(', ', $groups), |
1515 | 1515 | 'groupIds' => $groupIds, |
1516 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
1516 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
1517 | 1517 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
1518 | 1518 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
1519 | 1519 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -1614,7 +1614,7 @@ discard block |
||
1614 | 1614 | |
1615 | 1615 | // Get info about user |
1616 | 1616 | $data_user = DB::queryFirstRow( |
1617 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
1617 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
1618 | 1618 | WHERE id = %i', |
1619 | 1619 | $inputData['source_id'] |
1620 | 1620 | ); |
@@ -1841,14 +1841,14 @@ discard block |
||
1841 | 1841 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
1842 | 1842 | $data_user = DB::queryFirstRow( |
1843 | 1843 | 'SELECT fonction_id, public_key |
1844 | - FROM ' . prefixTable('users') . ' |
|
1844 | + FROM ' . prefixTable('users').' |
|
1845 | 1845 | WHERE id = %i', |
1846 | 1846 | $post_user_id |
1847 | 1847 | ); |
1848 | 1848 | |
1849 | 1849 | if ($data_user) { |
1850 | 1850 | // Ensure array is unique |
1851 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
1851 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
1852 | 1852 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
1853 | 1853 | } else { |
1854 | 1854 | // User not found |
@@ -1864,14 +1864,14 @@ discard block |
||
1864 | 1864 | } |
1865 | 1865 | |
1866 | 1866 | // Manage specific case of api key |
1867 | - if($post_field === 'user_api_key') { |
|
1867 | + if ($post_field === 'user_api_key') { |
|
1868 | 1868 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
1869 | 1869 | $session->set('user-api_key', $post_new_value); |
1870 | 1870 | |
1871 | 1871 | // test if user has an api key |
1872 | 1872 | $data_user = DB::queryFirstRow( |
1873 | 1873 | 'SELECT value |
1874 | - FROM ' . prefixTable('api') . ' |
|
1874 | + FROM ' . prefixTable('api').' |
|
1875 | 1875 | WHERE user_id = %i', |
1876 | 1876 | $post_user_id |
1877 | 1877 | ); |
@@ -1991,7 +1991,7 @@ discard block |
||
1991 | 1991 | } catch (\LdapRecord\Auth\BindException $e) { |
1992 | 1992 | $error = $e->getDetailedError(); |
1993 | 1993 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
1994 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
1994 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
1995 | 1995 | } |
1996 | 1996 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
1997 | 1997 | echo prepareExchangedData( |
@@ -2021,7 +2021,7 @@ discard block |
||
2021 | 2021 | } catch (\LdapRecord\Auth\BindException $e) { |
2022 | 2022 | $error = $e->getDetailedError(); |
2023 | 2023 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2024 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2024 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2025 | 2025 | } |
2026 | 2026 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
2027 | 2027 | echo prepareExchangedData( |
@@ -2038,7 +2038,7 @@ discard block |
||
2038 | 2038 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
2039 | 2039 | // Build the list of all groups in AD |
2040 | 2040 | if (isset($adUser['memberof']) === true) { |
2041 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
2041 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
2042 | 2042 | if (empty($adUserGroup) === false && $j !== "count") { |
2043 | 2043 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
2044 | 2044 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2054,7 +2054,7 @@ discard block |
||
2054 | 2054 | // Get his ID |
2055 | 2055 | $userInfo = DB::queryFirstRow( |
2056 | 2056 | 'SELECT id, login, fonction_id, auth_type |
2057 | - FROM ' . prefixTable('users') . ' |
|
2057 | + FROM ' . prefixTable('users').' |
|
2058 | 2058 | WHERE login = %s', |
2059 | 2059 | $userLogin |
2060 | 2060 | ); |
@@ -2090,7 +2090,7 @@ discard block |
||
2090 | 2090 | |
2091 | 2091 | // Get all groups in Teampass |
2092 | 2092 | $teampassRoles = array(); |
2093 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
2093 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
2094 | 2094 | foreach ($rows as $record) { |
2095 | 2095 | array_push( |
2096 | 2096 | $teampassRoles, |
@@ -2155,7 +2155,7 @@ discard block |
||
2155 | 2155 | // Check if user already exists |
2156 | 2156 | $data = DB::query( |
2157 | 2157 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
2158 | - FROM ' . prefixTable('users') . ' |
|
2158 | + FROM ' . prefixTable('users').' |
|
2159 | 2159 | WHERE login = %s', |
2160 | 2160 | $post_login |
2161 | 2161 | ); |
@@ -2332,7 +2332,7 @@ discard block |
||
2332 | 2332 | // Check if user already exists |
2333 | 2333 | DB::query( |
2334 | 2334 | 'SELECT id |
2335 | - FROM ' . prefixTable('users') . ' |
|
2335 | + FROM ' . prefixTable('users').' |
|
2336 | 2336 | WHERE id = %i', |
2337 | 2337 | $post_id |
2338 | 2338 | ); |
@@ -2394,7 +2394,7 @@ discard block |
||
2394 | 2394 | // Get all groups in Teampass |
2395 | 2395 | $teampassRoles = array(); |
2396 | 2396 | $titleToIdMap = []; |
2397 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
2397 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
2398 | 2398 | foreach ($rows as $record) { |
2399 | 2399 | array_push( |
2400 | 2400 | $teampassRoles, |
@@ -2440,7 +2440,7 @@ discard block |
||
2440 | 2440 | // Get his ID |
2441 | 2441 | $userInfo = DB::queryFirstRow( |
2442 | 2442 | 'SELECT id, login, fonction_id, auth_type |
2443 | - FROM ' . prefixTable('users') . ' |
|
2443 | + FROM ' . prefixTable('users').' |
|
2444 | 2444 | WHERE login = %s', |
2445 | 2445 | $userLogin |
2446 | 2446 | ); |
@@ -2547,7 +2547,7 @@ discard block |
||
2547 | 2547 | // Check if user already exists |
2548 | 2548 | DB::query( |
2549 | 2549 | 'SELECT id |
2550 | - FROM ' . prefixTable('users') . ' |
|
2550 | + FROM ' . prefixTable('users').' |
|
2551 | 2551 | WHERE id = %i', |
2552 | 2552 | $post_id |
2553 | 2553 | ); |
@@ -2614,7 +2614,7 @@ discard block |
||
2614 | 2614 | // Search TP_USER in db |
2615 | 2615 | $userTP = DB::queryFirstRow( |
2616 | 2616 | 'SELECT pw |
2617 | - FROM ' . prefixTable('users') . ' |
|
2617 | + FROM ' . prefixTable('users').' |
|
2618 | 2618 | WHERE id = %i', |
2619 | 2619 | TP_USER_ID |
2620 | 2620 | ); |
@@ -2636,8 +2636,8 @@ discard block |
||
2636 | 2636 | 'process_type' => 'create_user_keys', |
2637 | 2637 | 'arguments' => json_encode([ |
2638 | 2638 | 'new_user_id' => (int) $post_user_id, |
2639 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
2640 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
2639 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
2640 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
2641 | 2641 | 'owner_id' => (int) TP_USER_ID, |
2642 | 2642 | 'creator_pwd' => $userTP['pw'], |
2643 | 2643 | 'email_body' => $lang->get('email_body_user_config_5'), |
@@ -2726,8 +2726,8 @@ discard block |
||
2726 | 2726 | // get user info |
2727 | 2727 | $processesProgress = DB::query( |
2728 | 2728 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
2729 | - FROM ' . prefixTable('users') . ' AS u |
|
2730 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
2729 | + FROM ' . prefixTable('users').' AS u |
|
2730 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
2731 | 2731 | WHERE u.id = %i', |
2732 | 2732 | $user_id |
2733 | 2733 | ); |
@@ -2735,9 +2735,9 @@ discard block |
||
2735 | 2735 | //print_r($processesProgress); |
2736 | 2736 | $finished_steps = 0; |
2737 | 2737 | $nb_steps = count($processesProgress); |
2738 | - foreach($processesProgress as $process) { |
|
2738 | + foreach ($processesProgress as $process) { |
|
2739 | 2739 | if ((int) $process['is_in_progress'] === -1) { |
2740 | - $finished_steps ++; |
|
2740 | + $finished_steps++; |
|
2741 | 2741 | } |
2742 | 2742 | } |
2743 | 2743 | |
@@ -2746,7 +2746,7 @@ discard block |
||
2746 | 2746 | 'error' => false, |
2747 | 2747 | 'message' => '', |
2748 | 2748 | 'user_id' => $user_id, |
2749 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
2749 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
2750 | 2750 | 'debug' => $finished_steps.",".$nb_steps, |
2751 | 2751 | ), |
2752 | 2752 | 'encode' |
@@ -2836,7 +2836,7 @@ discard block |
||
2836 | 2836 | |
2837 | 2837 | // Get info about user |
2838 | 2838 | $data_user = DB::queryFirstRow( |
2839 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
2839 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
2840 | 2840 | WHERE id = %i', |
2841 | 2841 | $value[1] |
2842 | 2842 | ); |
@@ -2870,7 +2870,7 @@ discard block |
||
2870 | 2870 | logEvents( |
2871 | 2871 | $SETTINGS, |
2872 | 2872 | 'user_mngt', |
2873 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
2873 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
2874 | 2874 | (string) $session->get('user-id'), |
2875 | 2875 | $session->get('user-login'), |
2876 | 2876 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -2904,7 +2904,7 @@ discard block |
||
2904 | 2904 | |
2905 | 2905 | // Get info about user |
2906 | 2906 | $data_user = DB::queryFirstRow( |
2907 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
2907 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
2908 | 2908 | WHERE id = %i', |
2909 | 2909 | $id[1] |
2910 | 2910 | ); |