nilsteampassnet /
TeamPass
@@ -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 | |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | // About special settings |
| 367 | 367 | $dataFolderSettings = DB::queryFirstRow( |
| 368 | 368 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 369 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 369 | + FROM ' . prefixTable('nested_tree').' |
|
| 370 | 370 | WHERE id = %i', |
| 371 | 371 | $inputData['folderId'] |
| 372 | 372 | ); |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | // Get folder complexity |
| 384 | 384 | $folderComplexity = DB::queryFirstRow( |
| 385 | 385 | 'SELECT valeur |
| 386 | - FROM ' . prefixTable('misc') . ' |
|
| 386 | + FROM ' . prefixTable('misc').' |
|
| 387 | 387 | WHERE type = %s AND intitule = %i', |
| 388 | 388 | 'complex', |
| 389 | 389 | $inputData['folderId'] |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | $itemExists = 0; |
| 409 | 409 | $newID = ''; |
| 410 | 410 | $data = DB::queryFirstRow( |
| 411 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 411 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 412 | 412 | WHERE label = %s AND inactif = %i', |
| 413 | 413 | $inputData['label'], |
| 414 | 414 | 0 |
@@ -489,8 +489,8 @@ discard block |
||
| 489 | 489 | (int) $post_folder_is_personal, |
| 490 | 490 | (int) $newID, |
| 491 | 491 | $cryptedStuff['objectKey'], |
| 492 | - true, // only for the item creator |
|
| 493 | - false, // no delete all |
|
| 492 | + true, // only for the item creator |
|
| 493 | + false, // no delete all |
|
| 494 | 494 | ); |
| 495 | 495 | |
| 496 | 496 | // update fields |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | // should we encrypt the data |
| 504 | 504 | $dataTmp = DB::queryFirstRow( |
| 505 | 505 | 'SELECT encrypted_data |
| 506 | - FROM ' . prefixTable('categories') . ' |
|
| 506 | + FROM ' . prefixTable('categories').' |
|
| 507 | 507 | WHERE id = %i', |
| 508 | 508 | $field['id'] |
| 509 | 509 | ); |
@@ -532,8 +532,8 @@ discard block |
||
| 532 | 532 | (int) $post_folder_is_personal, |
| 533 | 533 | (int) $newObjectId, |
| 534 | 534 | $cryptedStuff['objectKey'], |
| 535 | - true, // only for the item creator |
|
| 536 | - false, // delete all |
|
| 535 | + true, // only for the item creator |
|
| 536 | + false, // delete all |
|
| 537 | 537 | ); |
| 538 | 538 | |
| 539 | 539 | array_push( |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | ) { |
| 570 | 570 | DB::queryFirstRow( |
| 571 | 571 | 'SELECT * |
| 572 | - FROM ' . prefixTable('templates') . ' |
|
| 572 | + FROM ' . prefixTable('templates').' |
|
| 573 | 573 | WHERE item_id = %i', |
| 574 | 574 | $newID |
| 575 | 575 | ); |
@@ -638,11 +638,11 @@ discard block |
||
| 638 | 638 | ) { |
| 639 | 639 | foreach ($post_restricted_to as $userRest) { |
| 640 | 640 | if (empty($userRest) === false) { |
| 641 | - $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 641 | + $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 642 | 642 | if (empty($listOfRestricted)) { |
| 643 | 643 | $listOfRestricted = $dataTmp['login']; |
| 644 | 644 | } else { |
| 645 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 645 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 646 | 646 | } |
| 647 | 647 | } |
| 648 | 648 | } |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | if (empty($userRest) === false) { |
| 659 | 659 | $dataTmp = DB::queryFirstRow( |
| 660 | 660 | 'SELECT login |
| 661 | - FROM ' . prefixTable('users') . ' |
|
| 661 | + FROM ' . prefixTable('users').' |
|
| 662 | 662 | WHERE id= %i', |
| 663 | 663 | $userRest |
| 664 | 664 | ); |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | if (empty($oldRestrictionList) === true) { |
| 667 | 667 | $oldRestrictionList = $dataTmp['login']; |
| 668 | 668 | } else { |
| 669 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 669 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | 672 | } |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | if (empty($post_uploaded_file_id) === false) { |
| 730 | 730 | $rows = DB::query( |
| 731 | 731 | 'SELECT id |
| 732 | - FROM ' . prefixTable('files') . ' |
|
| 732 | + FROM ' . prefixTable('files').' |
|
| 733 | 733 | WHERE id_item = %s', |
| 734 | 734 | $post_uploaded_file_id |
| 735 | 735 | ); |
@@ -785,7 +785,7 @@ discard block |
||
| 785 | 785 | $lang->get('email_subject_item_updated'), |
| 786 | 786 | str_replace( |
| 787 | 787 | array('#label', '#link'), |
| 788 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']), |
|
| 788 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']), |
|
| 789 | 789 | $lang->get('new_item_email_body') |
| 790 | 790 | ), |
| 791 | 791 | $emailAddress, |
@@ -889,11 +889,11 @@ discard block |
||
| 889 | 889 | // Prepare variables |
| 890 | 890 | $itemInfos = array(); |
| 891 | 891 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 892 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 892 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 893 | 893 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 894 | 894 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 895 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 896 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 895 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 896 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 897 | 897 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 898 | 898 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 899 | 899 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -924,8 +924,7 @@ discard block |
||
| 924 | 924 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 925 | 925 | $dataReceived['to_be_deleted_after_date'], |
| 926 | 926 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 927 | - ) : |
|
| 928 | - ''; |
|
| 927 | + ) : ''; |
|
| 929 | 928 | $post_fields = (filter_var_array( |
| 930 | 929 | $dataReceived['fields'], |
| 931 | 930 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -985,7 +984,7 @@ discard block |
||
| 985 | 984 | // About special settings |
| 986 | 985 | $dataFolderSettings = DB::queryFirstRow( |
| 987 | 986 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 988 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 987 | + FROM ' . prefixTable('nested_tree').' |
|
| 989 | 988 | WHERE id = %i', |
| 990 | 989 | $inputData['folderId'] |
| 991 | 990 | ); |
@@ -1001,7 +1000,7 @@ discard block |
||
| 1001 | 1000 | // Get folder complexity |
| 1002 | 1001 | $folderComplexity = DB::queryFirstRow( |
| 1003 | 1002 | 'SELECT valeur |
| 1004 | - FROM ' . prefixTable('misc') . ' |
|
| 1003 | + FROM ' . prefixTable('misc').' |
|
| 1005 | 1004 | WHERE type = %s AND intitule = %i', |
| 1006 | 1005 | 'complex', |
| 1007 | 1006 | $inputData['folderId'] |
@@ -1047,8 +1046,8 @@ discard block |
||
| 1047 | 1046 | $dataItem = DB::queryFirstRow( |
| 1048 | 1047 | 'SELECT i.*, |
| 1049 | 1048 | IFNULL(l.id_user, 0) AS id_user |
| 1050 | - FROM ' . prefixTable('items') . ' as i |
|
| 1051 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 1049 | + FROM ' . prefixTable('items').' as i |
|
| 1050 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 1052 | 1051 | WHERE i.id=%i', |
| 1053 | 1052 | 'at_creation', |
| 1054 | 1053 | $inputData['itemId'] |
@@ -1090,7 +1089,7 @@ discard block |
||
| 1090 | 1089 | // Does the user has the sharekey for this item? |
| 1091 | 1090 | DB::query( |
| 1092 | 1091 | 'SELECT * |
| 1093 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1092 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1094 | 1093 | WHERE object_id = %i AND user_id = %s', |
| 1095 | 1094 | $inputData['itemId'], |
| 1096 | 1095 | $session->get('user-id') |
@@ -1151,9 +1150,9 @@ discard block |
||
| 1151 | 1150 | '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, |
| 1152 | 1151 | 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, |
| 1153 | 1152 | u.login as user_login, u.email as user_email |
| 1154 | - FROM ' . prefixTable('items') . ' as i |
|
| 1155 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item AND l.action = %s) |
|
| 1156 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1153 | + FROM ' . prefixTable('items').' as i |
|
| 1154 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item AND l.action = %s) |
|
| 1155 | + LEFT JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1157 | 1156 | WHERE i.id=%i', |
| 1158 | 1157 | 'at_creation', |
| 1159 | 1158 | $inputData['itemId'] |
@@ -1162,7 +1161,7 @@ discard block |
||
| 1162 | 1161 | // Should we log a password change? |
| 1163 | 1162 | $userKey = DB::queryFirstRow( |
| 1164 | 1163 | 'SELECT share_key |
| 1165 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1164 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1166 | 1165 | WHERE user_id = %i AND object_id = %i', |
| 1167 | 1166 | $session->get('user-id'), |
| 1168 | 1167 | $inputData['itemId'] |
@@ -1226,12 +1225,12 @@ discard block |
||
| 1226 | 1225 | (int) $post_folder_is_personal, |
| 1227 | 1226 | (int) $inputData['itemId'], |
| 1228 | 1227 | $encrypted_password_key, |
| 1229 | - true, // only for the item creator |
|
| 1230 | - true, // delete all |
|
| 1228 | + true, // only for the item creator |
|
| 1229 | + true, // delete all |
|
| 1231 | 1230 | ); |
| 1232 | 1231 | |
| 1233 | 1232 | // Create a task to create sharekeys for users |
| 1234 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1233 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1235 | 1234 | $tasksToBePerformed = ['item_password']; |
| 1236 | 1235 | $encryptionTaskIsRequested = true; |
| 1237 | 1236 | } else { |
@@ -1242,7 +1241,7 @@ discard block |
||
| 1242 | 1241 | // Get list of tags |
| 1243 | 1242 | $itemTags = DB::queryFirstColumn( |
| 1244 | 1243 | 'SELECT tag |
| 1245 | - FROM ' . prefixTable('tags') . ' |
|
| 1244 | + FROM ' . prefixTable('tags').' |
|
| 1246 | 1245 | WHERE item_id = %i', |
| 1247 | 1246 | $inputData['itemId'] |
| 1248 | 1247 | ); |
@@ -1288,7 +1287,7 @@ discard block |
||
| 1288 | 1287 | $session->get('user-id'), |
| 1289 | 1288 | 'at_modification', |
| 1290 | 1289 | $session->get('user-login'), |
| 1291 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1290 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1292 | 1291 | ); |
| 1293 | 1292 | } |
| 1294 | 1293 | |
@@ -1333,8 +1332,8 @@ discard block |
||
| 1333 | 1332 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1334 | 1333 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1335 | 1334 | c.masked AS masked, i.id AS field_item_id |
| 1336 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1337 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1335 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1336 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1338 | 1337 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1339 | 1338 | $field['id'], |
| 1340 | 1339 | $inputData['itemId'] |
@@ -1350,7 +1349,7 @@ discard block |
||
| 1350 | 1349 | // Perform new query |
| 1351 | 1350 | $dataTmpCat = DB::queryFirstRow( |
| 1352 | 1351 | 'SELECT id, title, encrypted_data, masked |
| 1353 | - FROM ' . prefixTable('categories') . ' |
|
| 1352 | + FROM ' . prefixTable('categories').' |
|
| 1354 | 1353 | WHERE id = %i', |
| 1355 | 1354 | $field['id'] |
| 1356 | 1355 | ); |
@@ -1380,8 +1379,8 @@ discard block |
||
| 1380 | 1379 | (int) $post_folder_is_personal, |
| 1381 | 1380 | (int) $newId, |
| 1382 | 1381 | $cryptedStuff['objectKey'], |
| 1383 | - true, // only for the item creator |
|
| 1384 | - true, // delete all |
|
| 1382 | + true, // only for the item creator |
|
| 1383 | + true, // delete all |
|
| 1385 | 1384 | ); |
| 1386 | 1385 | |
| 1387 | 1386 | // update value |
@@ -1431,7 +1430,7 @@ discard block |
||
| 1431 | 1430 | $session->get('user-id'), |
| 1432 | 1431 | 'at_modification', |
| 1433 | 1432 | $session->get('user-login'), |
| 1434 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1433 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1435 | 1434 | ); |
| 1436 | 1435 | } else { |
| 1437 | 1436 | // Case where the field already exists |
@@ -1440,7 +1439,7 @@ discard block |
||
| 1440 | 1439 | // Get user sharekey for this field |
| 1441 | 1440 | $userKey = DB::queryFirstRow( |
| 1442 | 1441 | 'SELECT share_key |
| 1443 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1442 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1444 | 1443 | WHERE user_id = %i AND object_id = %i', |
| 1445 | 1444 | $session->get('user-id'), |
| 1446 | 1445 | $dataTmpCat['field_item_id'] |
@@ -1479,8 +1478,8 @@ discard block |
||
| 1479 | 1478 | (int) $post_folder_is_personal, |
| 1480 | 1479 | (int) $dataTmpCat['field_item_id'], |
| 1481 | 1480 | $cryptedStuff['objectKey'], |
| 1482 | - true, // only for the item creator |
|
| 1483 | - true, // delete all |
|
| 1481 | + true, // only for the item creator |
|
| 1482 | + true, // delete all |
|
| 1484 | 1483 | ); |
| 1485 | 1484 | |
| 1486 | 1485 | if ($encryptedFieldIsChanged === false) { |
@@ -1522,7 +1521,7 @@ discard block |
||
| 1522 | 1521 | $session->get('user-id'), |
| 1523 | 1522 | 'at_modification', |
| 1524 | 1523 | $session->get('user-login'), |
| 1525 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1524 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1526 | 1525 | ); |
| 1527 | 1526 | } |
| 1528 | 1527 | } |
@@ -1576,7 +1575,7 @@ discard block |
||
| 1576 | 1575 | ) { |
| 1577 | 1576 | DB::queryFirstRow( |
| 1578 | 1577 | 'SELECT * |
| 1579 | - FROM ' . prefixTable('templates') . ' |
|
| 1578 | + FROM ' . prefixTable('templates').' |
|
| 1580 | 1579 | WHERE item_id = %i', |
| 1581 | 1580 | $inputData['itemId'] |
| 1582 | 1581 | ); |
@@ -1619,7 +1618,7 @@ discard block |
||
| 1619 | 1618 | // check if elem exists in Table. If not add it or update it. |
| 1620 | 1619 | DB::query( |
| 1621 | 1620 | 'SELECT * |
| 1622 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1621 | + FROM ' . prefixTable('automatic_del').' |
|
| 1623 | 1622 | WHERE item_id = %i', |
| 1624 | 1623 | $inputData['itemId'] |
| 1625 | 1624 | ); |
@@ -1646,7 +1645,7 @@ discard block |
||
| 1646 | 1645 | // Store updates performed |
| 1647 | 1646 | array_push( |
| 1648 | 1647 | $arrayOfChanges, |
| 1649 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1648 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1650 | 1649 | ); |
| 1651 | 1650 | |
| 1652 | 1651 | // update LOG |
@@ -1689,7 +1688,7 @@ discard block |
||
| 1689 | 1688 | // Store updates performed |
| 1690 | 1689 | array_push( |
| 1691 | 1690 | $arrayOfChanges, |
| 1692 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1691 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1693 | 1692 | ); |
| 1694 | 1693 | |
| 1695 | 1694 | // update LOG |
@@ -1717,7 +1716,7 @@ discard block |
||
| 1717 | 1716 | if (empty($userId) === false) { |
| 1718 | 1717 | $dataTmp = DB::queryFirstRow( |
| 1719 | 1718 | 'SELECT id, name, lastname |
| 1720 | - FROM ' . prefixTable('users') . ' |
|
| 1719 | + FROM ' . prefixTable('users').' |
|
| 1721 | 1720 | WHERE id= %i', |
| 1722 | 1721 | $userId |
| 1723 | 1722 | ); |
@@ -1725,7 +1724,7 @@ discard block |
||
| 1725 | 1724 | // Add to array |
| 1726 | 1725 | array_push( |
| 1727 | 1726 | $arrayOfUsersRestriction, |
| 1728 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1727 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1729 | 1728 | ); |
| 1730 | 1729 | array_push( |
| 1731 | 1730 | $arrayOfUsersIdRestriction, |
@@ -1756,8 +1755,8 @@ discard block |
||
| 1756 | 1755 | // get values before deleting them |
| 1757 | 1756 | $rows = DB::query( |
| 1758 | 1757 | 'SELECT t.title, t.id AS id |
| 1759 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1760 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1758 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1759 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1761 | 1760 | WHERE r.item_id = %i |
| 1762 | 1761 | ORDER BY t.title ASC', |
| 1763 | 1762 | $inputData['itemId'] |
@@ -1791,7 +1790,7 @@ discard block |
||
| 1791 | 1790 | ); |
| 1792 | 1791 | $dataTmp = DB::queryFirstRow( |
| 1793 | 1792 | 'SELECT title |
| 1794 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1793 | + FROM ' . prefixTable('roles_title').' |
|
| 1795 | 1794 | WHERE id = %i', |
| 1796 | 1795 | $role |
| 1797 | 1796 | ); |
@@ -1819,7 +1818,7 @@ discard block |
||
| 1819 | 1818 | // Get current status |
| 1820 | 1819 | $otpStatus = DB::queryFirstRow( |
| 1821 | 1820 | 'SELECT enabled as otp_is_enabled, phone_number, secret |
| 1822 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1821 | + FROM ' . prefixTable('items_otp').' |
|
| 1823 | 1822 | WHERE item_id = %i', |
| 1824 | 1823 | $inputData['itemId'] |
| 1825 | 1824 | ); |
@@ -1833,7 +1832,7 @@ discard block |
||
| 1833 | 1832 | 'decrypt' |
| 1834 | 1833 | )['string']; |
| 1835 | 1834 | } else { |
| 1836 | - $currentsecret=''; |
|
| 1835 | + $currentsecret = ''; |
|
| 1837 | 1836 | } |
| 1838 | 1837 | |
| 1839 | 1838 | // If OTP secret provided then encrypt it |
@@ -1883,7 +1882,7 @@ discard block |
||
| 1883 | 1882 | $session->get('user-id'), |
| 1884 | 1883 | 'at_modification', |
| 1885 | 1884 | $session->get('user-login'), |
| 1886 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1885 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1887 | 1886 | ); |
| 1888 | 1887 | } |
| 1889 | 1888 | if ($otpStatus['phone_number'] !== $post_otp_phone_number) { |
@@ -1894,7 +1893,7 @@ discard block |
||
| 1894 | 1893 | $session->get('user-id'), |
| 1895 | 1894 | 'at_modification', |
| 1896 | 1895 | $session->get('user-login'), |
| 1897 | - 'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number |
|
| 1896 | + 'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number |
|
| 1898 | 1897 | ); |
| 1899 | 1898 | } |
| 1900 | 1899 | if ($currentsecret !== $post_otp_secret) { |
@@ -1943,8 +1942,8 @@ discard block |
||
| 1943 | 1942 | $session->get('user-id'), |
| 1944 | 1943 | 'at_modification', |
| 1945 | 1944 | $session->get('user-login'), |
| 1946 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1947 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1945 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1946 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1948 | 1947 | ); |
| 1949 | 1948 | } |
| 1950 | 1949 | |
@@ -1964,7 +1963,7 @@ discard block |
||
| 1964 | 1963 | $session->get('user-id'), |
| 1965 | 1964 | 'at_modification', |
| 1966 | 1965 | $session->get('user-login'), |
| 1967 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1966 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1968 | 1967 | ); |
| 1969 | 1968 | } |
| 1970 | 1969 | // LOGIN |
@@ -1983,7 +1982,7 @@ discard block |
||
| 1983 | 1982 | $session->get('user-id'), |
| 1984 | 1983 | 'at_modification', |
| 1985 | 1984 | $session->get('user-login'), |
| 1986 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1985 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1987 | 1986 | ); |
| 1988 | 1987 | } |
| 1989 | 1988 | |
@@ -2002,7 +2001,7 @@ discard block |
||
| 2002 | 2001 | $session->get('user-id'), |
| 2003 | 2002 | 'at_modification', |
| 2004 | 2003 | $session->get('user-login'), |
| 2005 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 2004 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 2006 | 2005 | ); |
| 2007 | 2006 | } |
| 2008 | 2007 | // URL |
@@ -2021,7 +2020,7 @@ discard block |
||
| 2021 | 2020 | $session->get('user-id'), |
| 2022 | 2021 | 'at_modification', |
| 2023 | 2022 | $session->get('user-login'), |
| 2024 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 2023 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 2025 | 2024 | ); |
| 2026 | 2025 | } |
| 2027 | 2026 | // DESCRIPTION |
@@ -2047,7 +2046,7 @@ discard block |
||
| 2047 | 2046 | // FOLDER |
| 2048 | 2047 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 2049 | 2048 | // Get name of folders |
| 2050 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2049 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2051 | 2050 | |
| 2052 | 2051 | // Store updates performed |
| 2053 | 2052 | array_push( |
@@ -2063,7 +2062,7 @@ discard block |
||
| 2063 | 2062 | $session->get('user-id'), |
| 2064 | 2063 | 'at_modification', |
| 2065 | 2064 | $session->get('user-login'), |
| 2066 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 2065 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 2067 | 2066 | ); |
| 2068 | 2067 | } |
| 2069 | 2068 | // ANYONE_CAN_MODIFY |
@@ -2071,7 +2070,7 @@ discard block |
||
| 2071 | 2070 | // Store updates performed |
| 2072 | 2071 | array_push( |
| 2073 | 2072 | $arrayOfChanges, |
| 2074 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2073 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2075 | 2074 | ); |
| 2076 | 2075 | |
| 2077 | 2076 | // Log |
@@ -2082,7 +2081,7 @@ discard block |
||
| 2082 | 2081 | $session->get('user-id'), |
| 2083 | 2082 | 'at_modification', |
| 2084 | 2083 | $session->get('user-login'), |
| 2085 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2084 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2086 | 2085 | ); |
| 2087 | 2086 | } |
| 2088 | 2087 | |
@@ -2090,8 +2089,8 @@ discard block |
||
| 2090 | 2089 | $dataItem = DB::queryFirstRow( |
| 2091 | 2090 | 'SELECT i.*, |
| 2092 | 2091 | IFNULL(l.id_user, 0) AS id_user |
| 2093 | - FROM ' . prefixTable('items') . ' as i |
|
| 2094 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 2092 | + FROM ' . prefixTable('items').' as i |
|
| 2093 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 2095 | 2094 | WHERE i.id=%i', |
| 2096 | 2095 | 'at_creation', |
| 2097 | 2096 | $inputData['itemId'] |
@@ -2100,8 +2099,8 @@ discard block |
||
| 2100 | 2099 | $history = ''; |
| 2101 | 2100 | $rows = DB::query( |
| 2102 | 2101 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2103 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2104 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2102 | + FROM ' . prefixTable('log_items').' as l |
|
| 2103 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2105 | 2104 | WHERE l.action <> %s AND id_item=%s', |
| 2106 | 2105 | 'at_shown', |
| 2107 | 2106 | $inputData['itemId'] |
@@ -2110,14 +2109,14 @@ discard block |
||
| 2110 | 2109 | if ($record['raison'] === NULL) continue; |
| 2111 | 2110 | $reason = explode(':', $record['raison']); |
| 2112 | 2111 | if (count($reason) > 0) { |
| 2113 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2114 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2115 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2112 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2113 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2114 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2116 | 2115 | : $lang->get(trim($reason[0]))) : ''); |
| 2117 | 2116 | if (empty($history)) { |
| 2118 | 2117 | $history = $sentence; |
| 2119 | 2118 | } else { |
| 2120 | - $history .= '<br />' . $sentence; |
|
| 2119 | + $history .= '<br />'.$sentence; |
|
| 2121 | 2120 | } |
| 2122 | 2121 | } |
| 2123 | 2122 | } |
@@ -2255,7 +2254,7 @@ discard block |
||
| 2255 | 2254 | ) { |
| 2256 | 2255 | // load the original record into an array |
| 2257 | 2256 | $originalRecord = DB::queryFirstRow( |
| 2258 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2257 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2259 | 2258 | WHERE id = %i', |
| 2260 | 2259 | $inputData['itemId'] |
| 2261 | 2260 | ); |
@@ -2274,7 +2273,7 @@ discard block |
||
| 2274 | 2273 | |
| 2275 | 2274 | // Load the destination folder record into an array |
| 2276 | 2275 | $dataDestination = DB::queryFirstRow( |
| 2277 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2276 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2278 | 2277 | WHERE id = %i', |
| 2279 | 2278 | $post_dest_id |
| 2280 | 2279 | ); |
@@ -2282,7 +2281,7 @@ discard block |
||
| 2282 | 2281 | // Get the ITEM object key for the user |
| 2283 | 2282 | $userKey = DB::queryFirstRow( |
| 2284 | 2283 | 'SELECT share_key |
| 2285 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2284 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2286 | 2285 | WHERE user_id = %i AND object_id = %i', |
| 2287 | 2286 | $session->get('user-id'), |
| 2288 | 2287 | $inputData['itemId'] |
@@ -2359,8 +2358,8 @@ discard block |
||
| 2359 | 2358 | // Manage Custom Fields |
| 2360 | 2359 | $rows = DB::query( |
| 2361 | 2360 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2362 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2363 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2361 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2362 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2364 | 2363 | WHERE ci.item_id = %i', |
| 2365 | 2364 | $inputData['itemId'] |
| 2366 | 2365 | ); |
@@ -2372,7 +2371,7 @@ discard block |
||
| 2372 | 2371 | // Get user key |
| 2373 | 2372 | $userKey = DB::queryFirstRow( |
| 2374 | 2373 | 'SELECT share_key |
| 2375 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2374 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2376 | 2375 | WHERE user_id = %i AND object_id = %i', |
| 2377 | 2376 | $session->get('user-id'), |
| 2378 | 2377 | $field['id'] |
@@ -2439,15 +2438,15 @@ discard block |
||
| 2439 | 2438 | $rows = DB::query( |
| 2440 | 2439 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2441 | 2440 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2442 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2443 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2441 | + FROM ' . prefixTable('files').' AS f |
|
| 2442 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2444 | 2443 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2445 | 2444 | $session->get('user-id'), |
| 2446 | 2445 | $inputData['itemId'] |
| 2447 | 2446 | ); |
| 2448 | 2447 | foreach ($rows as $record) { |
| 2449 | 2448 | // Check if file still exists |
| 2450 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2449 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2451 | 2450 | // Step1 - decrypt the file |
| 2452 | 2451 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2453 | 2452 | $fileContent = decryptFile( |
@@ -2458,8 +2457,8 @@ discard block |
||
| 2458 | 2457 | |
| 2459 | 2458 | // Step2 - create file |
| 2460 | 2459 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2461 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2462 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2460 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2461 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2463 | 2462 | if ($outstream === false) { |
| 2464 | 2463 | echo prepareExchangedData( |
| 2465 | 2464 | array( |
@@ -2532,7 +2531,7 @@ discard block |
||
| 2532 | 2531 | |
| 2533 | 2532 | // ------------------------- |
| 2534 | 2533 | // Add specific restrictions |
| 2535 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2534 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2536 | 2535 | foreach ($rows as $record) { |
| 2537 | 2536 | DB::insert( |
| 2538 | 2537 | prefixTable('restriction_to_roles'), |
@@ -2544,7 +2543,7 @@ discard block |
||
| 2544 | 2543 | } |
| 2545 | 2544 | |
| 2546 | 2545 | // Add Tags |
| 2547 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2546 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2548 | 2547 | foreach ($rows as $record) { |
| 2549 | 2548 | DB::insert( |
| 2550 | 2549 | prefixTable('tags'), |
@@ -2646,7 +2645,7 @@ discard block |
||
| 2646 | 2645 | // then we can show it |
| 2647 | 2646 | $item_deleted = DB::queryFirstRow( |
| 2648 | 2647 | 'SELECT * |
| 2649 | - FROM ' . prefixTable('log_items') . ' |
|
| 2648 | + FROM ' . prefixTable('log_items').' |
|
| 2650 | 2649 | WHERE id_item = %i AND action = %s |
| 2651 | 2650 | ORDER BY date DESC |
| 2652 | 2651 | LIMIT 0, 1', |
@@ -2657,7 +2656,7 @@ discard block |
||
| 2657 | 2656 | |
| 2658 | 2657 | $item_restored = DB::queryFirstRow( |
| 2659 | 2658 | 'SELECT * |
| 2660 | - FROM ' . prefixTable('log_items') . ' |
|
| 2659 | + FROM ' . prefixTable('log_items').' |
|
| 2661 | 2660 | WHERE id_item = %i AND action = %s |
| 2662 | 2661 | ORDER BY date DESC |
| 2663 | 2662 | LIMIT 0, 1', |
@@ -2682,8 +2681,8 @@ discard block |
||
| 2682 | 2681 | $dataItem = DB::queryFirstRow( |
| 2683 | 2682 | 'SELECT i.*, |
| 2684 | 2683 | IFNULL(l.id_user, 0) AS id_user |
| 2685 | - FROM ' . prefixTable('items') . ' as i |
|
| 2686 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 2684 | + FROM ' . prefixTable('items').' as i |
|
| 2685 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 2687 | 2686 | WHERE i.id=%i', |
| 2688 | 2687 | 'at_creation', |
| 2689 | 2688 | $inputData['id'] |
@@ -2692,7 +2691,7 @@ discard block |
||
| 2692 | 2691 | // Notification |
| 2693 | 2692 | DB::queryFirstRow( |
| 2694 | 2693 | 'SELECT * |
| 2695 | - FROM ' . prefixTable('notification') . ' |
|
| 2694 | + FROM ' . prefixTable('notification').' |
|
| 2696 | 2695 | WHERE item_id = %i AND user_id = %i', |
| 2697 | 2696 | $inputData['id'], |
| 2698 | 2697 | $session->get('user-id') |
@@ -2711,7 +2710,7 @@ discard block |
||
| 2711 | 2710 | |
| 2712 | 2711 | // manage case of API user |
| 2713 | 2712 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2714 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2713 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2715 | 2714 | $arrData['id_user'] = API_USER_ID; |
| 2716 | 2715 | $arrData['author_email'] = ''; |
| 2717 | 2716 | $arrData['notification_status'] = false; |
@@ -2721,7 +2720,7 @@ discard block |
||
| 2721 | 2720 | $tags = array(); |
| 2722 | 2721 | $rows = DB::query( |
| 2723 | 2722 | 'SELECT tag |
| 2724 | - FROM ' . prefixTable('tags') . ' |
|
| 2723 | + FROM ' . prefixTable('tags').' |
|
| 2725 | 2724 | WHERE item_id = %i', |
| 2726 | 2725 | $inputData['id'] |
| 2727 | 2726 | ); |
@@ -2745,7 +2744,7 @@ discard block |
||
| 2745 | 2744 | // Check if user has a role that is accepted |
| 2746 | 2745 | $rows_tmp = DB::query( |
| 2747 | 2746 | 'SELECT role_id |
| 2748 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2747 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2749 | 2748 | WHERE item_id=%i', |
| 2750 | 2749 | $inputData['id'] |
| 2751 | 2750 | ); |
@@ -2759,7 +2758,7 @@ discard block |
||
| 2759 | 2758 | // Get the object key for the user |
| 2760 | 2759 | $userKeys = DB::query( |
| 2761 | 2760 | 'SELECT share_key |
| 2762 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2761 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2763 | 2762 | WHERE user_id = %i AND object_id = %i', |
| 2764 | 2763 | $session->get('user-id'), |
| 2765 | 2764 | $inputData['id'] |
@@ -2872,8 +2871,8 @@ discard block |
||
| 2872 | 2871 | // Add restriction if item is restricted to roles |
| 2873 | 2872 | $rows = DB::query( |
| 2874 | 2873 | 'SELECT t.title, t.id |
| 2875 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2876 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2874 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2875 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2877 | 2876 | WHERE r.item_id = %i |
| 2878 | 2877 | ORDER BY t.title ASC', |
| 2879 | 2878 | $inputData['id'] |
@@ -2889,8 +2888,8 @@ discard block |
||
| 2889 | 2888 | $tmp = array(); |
| 2890 | 2889 | $rows = DB::query( |
| 2891 | 2890 | 'SELECT k.label, k.id |
| 2892 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2893 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2891 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2892 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2894 | 2893 | WHERE i.item_id = %i |
| 2895 | 2894 | ORDER BY k.label ASC', |
| 2896 | 2895 | $inputData['id'] |
@@ -2973,7 +2972,7 @@ discard block |
||
| 2973 | 2972 | $arrCatList = array(); |
| 2974 | 2973 | $rows_tmp = DB::query( |
| 2975 | 2974 | 'SELECT id_category |
| 2976 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2975 | + FROM ' . prefixTable('categories_folders').' |
|
| 2977 | 2976 | WHERE id_folder=%i', |
| 2978 | 2977 | $inputData['folderId'] |
| 2979 | 2978 | ); |
@@ -2988,8 +2987,8 @@ discard block |
||
| 2988 | 2987 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2989 | 2988 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2990 | 2989 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2991 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2992 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2990 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2991 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2993 | 2992 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2994 | 2993 | $inputData['id'], |
| 2995 | 2994 | $arrCatList |
@@ -3000,7 +2999,7 @@ discard block |
||
| 3000 | 2999 | //db::debugmode(true); |
| 3001 | 3000 | $userKey = DB::queryFirstRow( |
| 3002 | 3001 | 'SELECT share_key |
| 3003 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 3002 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 3004 | 3003 | WHERE user_id = %i AND object_id = %i', |
| 3005 | 3004 | $session->get('user-id'), |
| 3006 | 3005 | $row['id'] |
@@ -3018,7 +3017,7 @@ discard block |
||
| 3018 | 3017 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 3019 | 3018 | // Data is not encrypted in DB |
| 3020 | 3019 | $fieldText = [ |
| 3021 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 3020 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 3022 | 3021 | 'encrypted' => false, |
| 3023 | 3022 | 'error' => false, |
| 3024 | 3023 | ]; |
@@ -3063,7 +3062,7 @@ discard block |
||
| 3063 | 3062 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 3064 | 3063 | $rows_tmp = DB::queryFirstRow( |
| 3065 | 3064 | 'SELECT category_id |
| 3066 | - FROM ' . prefixTable('templates') . ' |
|
| 3065 | + FROM ' . prefixTable('templates').' |
|
| 3067 | 3066 | WHERE item_id = %i', |
| 3068 | 3067 | $inputData['id'] |
| 3069 | 3068 | ); |
@@ -3080,7 +3079,7 @@ discard block |
||
| 3080 | 3079 | // Evaluate if item is ready for all users |
| 3081 | 3080 | $rows_tmp = DB::queryFirstRow( |
| 3082 | 3081 | 'SELECT finished_at |
| 3083 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3082 | + FROM ' . prefixTable('background_tasks').' |
|
| 3084 | 3083 | WHERE item_id = %i', |
| 3085 | 3084 | $inputData['id'] |
| 3086 | 3085 | ); |
@@ -3097,7 +3096,7 @@ discard block |
||
| 3097 | 3096 | // Is the Item to be deleted? |
| 3098 | 3097 | $dataDelete = DB::queryFirstRow( |
| 3099 | 3098 | 'SELECT * |
| 3100 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3099 | + FROM ' . prefixTable('automatic_del').' |
|
| 3101 | 3100 | WHERE item_id = %i', |
| 3102 | 3101 | $inputData['id'] |
| 3103 | 3102 | ); |
@@ -3178,14 +3177,14 @@ discard block |
||
| 3178 | 3177 | if (empty($userRest) === false) { |
| 3179 | 3178 | $dataTmp = DB::queryFirstRow( |
| 3180 | 3179 | 'SELECT login |
| 3181 | - FROM ' . prefixTable('users') . ' |
|
| 3180 | + FROM ' . prefixTable('users').' |
|
| 3182 | 3181 | WHERE id= %i', |
| 3183 | 3182 | $userRest |
| 3184 | 3183 | ); |
| 3185 | 3184 | if (empty($listOfRestricted)) { |
| 3186 | 3185 | $listOfRestricted = $dataTmp['login']; |
| 3187 | 3186 | } else { |
| 3188 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3187 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3189 | 3188 | } |
| 3190 | 3189 | } |
| 3191 | 3190 | } |
@@ -3259,9 +3258,9 @@ discard block |
||
| 3259 | 3258 | // Load item data |
| 3260 | 3259 | $dataItem = DB::queryFirstRow( |
| 3261 | 3260 | '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 |
| 3262 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3263 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3264 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3261 | + FROM ' . prefixTable('items').' AS i |
|
| 3262 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3263 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3265 | 3264 | WHERE i.id = %i', |
| 3266 | 3265 | $inputData['id'] |
| 3267 | 3266 | ); |
@@ -3283,7 +3282,7 @@ discard block |
||
| 3283 | 3282 | // Check if user has a role that is accepted |
| 3284 | 3283 | $rows_tmp = DB::query( |
| 3285 | 3284 | 'SELECT role_id |
| 3286 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3285 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3287 | 3286 | WHERE item_id=%i', |
| 3288 | 3287 | $inputData['id'] |
| 3289 | 3288 | ); |
@@ -3315,12 +3314,12 @@ discard block |
||
| 3315 | 3314 | // launch query |
| 3316 | 3315 | $rows = DB::query( |
| 3317 | 3316 | 'SELECT id, name, file, extension, size |
| 3318 | - FROM ' . prefixTable('files') . ' |
|
| 3317 | + FROM ' . prefixTable('files').' |
|
| 3319 | 3318 | WHERE id_item = %i AND confirmed = 1', |
| 3320 | 3319 | $inputData['id'] |
| 3321 | 3320 | ); |
| 3322 | 3321 | foreach ($rows as $record) { |
| 3323 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3322 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3324 | 3323 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3325 | 3324 | |
| 3326 | 3325 | array_push( |
@@ -3333,7 +3332,7 @@ discard block |
||
| 3333 | 3332 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3334 | 3333 | 'id' => $record['id'], |
| 3335 | 3334 | 'key' => $session->get('user-key_tmp'), |
| 3336 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3335 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3337 | 3336 | ) |
| 3338 | 3337 | ); |
| 3339 | 3338 | } |
@@ -3375,8 +3374,8 @@ discard block |
||
| 3375 | 3374 | $listOptionsForRoles = array(); |
| 3376 | 3375 | $rows = DB::query( |
| 3377 | 3376 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3378 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3379 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3377 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3378 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3380 | 3379 | WHERE r.folder_id = %i', |
| 3381 | 3380 | $dataItem['id_tree'] |
| 3382 | 3381 | ); |
@@ -3390,8 +3389,8 @@ discard block |
||
| 3390 | 3389 | ); |
| 3391 | 3390 | $rows2 = DB::query( |
| 3392 | 3391 | 'SELECT DISTINCT u.id, u.login, u.email, u.name, u.lastname, ur.role_id AS fonction_id |
| 3393 | - FROM ' . prefixTable('users') . ' AS u |
|
| 3394 | - INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id) |
|
| 3392 | + FROM ' . prefixTable('users').' AS u |
|
| 3393 | + INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id) |
|
| 3395 | 3394 | WHERE ur.role_id = %i AND ur.source = %s', |
| 3396 | 3395 | $record['role_id'], |
| 3397 | 3396 | 'manual' |
@@ -3408,7 +3407,7 @@ discard block |
||
| 3408 | 3407 | array( |
| 3409 | 3408 | 'id' => (int) $record2['id'], |
| 3410 | 3409 | 'login' => $record2['login'], |
| 3411 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3410 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3412 | 3411 | 'email' => $record2['email'], |
| 3413 | 3412 | ) |
| 3414 | 3413 | ); |
@@ -3427,16 +3426,16 @@ discard block |
||
| 3427 | 3426 | $path = ''; |
| 3428 | 3427 | foreach ($arbo as $elem) { |
| 3429 | 3428 | if (empty($path) === true) { |
| 3430 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3429 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3431 | 3430 | } else { |
| 3432 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3431 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3433 | 3432 | } |
| 3434 | 3433 | } |
| 3435 | 3434 | // Build text to show user |
| 3436 | 3435 | if (empty($path) === true) { |
| 3437 | 3436 | $path = addslashes($dataItem['label']); |
| 3438 | 3437 | } else { |
| 3439 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3438 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3440 | 3439 | } |
| 3441 | 3440 | |
| 3442 | 3441 | // Add Admins to notification list if expected |
@@ -3459,7 +3458,7 @@ discard block |
||
| 3459 | 3458 | array( |
| 3460 | 3459 | addslashes($session->get('user-login')), |
| 3461 | 3460 | $path, |
| 3462 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3461 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3463 | 3462 | ), |
| 3464 | 3463 | $lang->get('email_on_open_notification_mail') |
| 3465 | 3464 | ), |
@@ -3469,7 +3468,7 @@ discard block |
||
| 3469 | 3468 | } |
| 3470 | 3469 | |
| 3471 | 3470 | // has this item a change proposal |
| 3472 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3471 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3473 | 3472 | $returnArray['has_change_proposal'] = DB::count(); |
| 3474 | 3473 | |
| 3475 | 3474 | // Setting |
@@ -3480,7 +3479,7 @@ discard block |
||
| 3480 | 3479 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3481 | 3480 | DB::query( |
| 3482 | 3481 | 'SELECT * |
| 3483 | - FROM ' . prefixTable('otv') . ' |
|
| 3482 | + FROM ' . prefixTable('otv').' |
|
| 3484 | 3483 | WHERE item_id = %i |
| 3485 | 3484 | AND time_limit > %i', |
| 3486 | 3485 | $inputData['id'], |
@@ -3579,7 +3578,7 @@ discard block |
||
| 3579 | 3578 | // Load item data |
| 3580 | 3579 | $data = DB::queryFirstRow( |
| 3581 | 3580 | 'SELECT id_tree, id, label |
| 3582 | - FROM ' . prefixTable('items') . ' |
|
| 3581 | + FROM ' . prefixTable('items').' |
|
| 3583 | 3582 | WHERE id = %i OR item_key = %s', |
| 3584 | 3583 | $inputData['itemId'], |
| 3585 | 3584 | $inputData['itemKey'] |
@@ -3670,7 +3669,7 @@ discard block |
||
| 3670 | 3669 | // Load item data |
| 3671 | 3670 | $dataItem = DB::queryFirstRow( |
| 3672 | 3671 | 'SELECT secret, enabled |
| 3673 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3672 | + FROM ' . prefixTable('items_otp').' |
|
| 3674 | 3673 | WHERE item_id = %i', |
| 3675 | 3674 | $inputData['id'] |
| 3676 | 3675 | ); |
@@ -3752,13 +3751,13 @@ discard block |
||
| 3752 | 3751 | |
| 3753 | 3752 | // Check if user is allowed to access this folder |
| 3754 | 3753 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3755 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3754 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3756 | 3755 | break; |
| 3757 | 3756 | } |
| 3758 | 3757 | |
| 3759 | 3758 | // Check if title doesn't contains html codes |
| 3760 | 3759 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3761 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3760 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3762 | 3761 | break; |
| 3763 | 3762 | } |
| 3764 | 3763 | // check that title is not numeric |
@@ -3769,9 +3768,9 @@ discard block |
||
| 3769 | 3768 | |
| 3770 | 3769 | // Check if duplicate folders name are allowed |
| 3771 | 3770 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3772 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3771 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3773 | 3772 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3774 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3773 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3775 | 3774 | break; |
| 3776 | 3775 | } |
| 3777 | 3776 | } |
@@ -3779,7 +3778,7 @@ discard block |
||
| 3779 | 3778 | // query on folder |
| 3780 | 3779 | $data = DB::queryFirstRow( |
| 3781 | 3780 | 'SELECT parent_id, personal_folder |
| 3782 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3781 | + FROM ' . prefixTable('nested_tree').' |
|
| 3783 | 3782 | WHERE id = %i', |
| 3784 | 3783 | $inputData['folderId'] |
| 3785 | 3784 | ); |
@@ -3789,20 +3788,20 @@ discard block |
||
| 3789 | 3788 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3790 | 3789 | $data = DB::queryFirstRow( |
| 3791 | 3790 | 'SELECT valeur |
| 3792 | - FROM ' . prefixTable('misc') . ' |
|
| 3791 | + FROM ' . prefixTable('misc').' |
|
| 3793 | 3792 | WHERE intitule = %i AND type = %s', |
| 3794 | 3793 | $data['parent_id'], |
| 3795 | 3794 | 'complex' |
| 3796 | 3795 | ); |
| 3797 | 3796 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3798 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3797 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3799 | 3798 | break; |
| 3800 | 3799 | } |
| 3801 | 3800 | } |
| 3802 | 3801 | |
| 3803 | 3802 | // update Folders table |
| 3804 | 3803 | $tmp = DB::queryFirstRow( |
| 3805 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3804 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3806 | 3805 | $dataReceived['folder'] |
| 3807 | 3806 | ); |
| 3808 | 3807 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3916,7 +3915,7 @@ discard block |
||
| 3916 | 3915 | $uniqueLoadData['path'] = $arr_arbo; |
| 3917 | 3916 | |
| 3918 | 3917 | // store last folder accessed in cookie |
| 3919 | - $arr_cookie_options = array ( |
|
| 3918 | + $arr_cookie_options = array( |
|
| 3920 | 3919 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3921 | 3920 | 'path' => '/', |
| 3922 | 3921 | 'secure' => true, |
@@ -3931,7 +3930,7 @@ discard block |
||
| 3931 | 3930 | foreach ($session->get('user-roles_array') as $role) { |
| 3932 | 3931 | $roleQ = DB::queryFirstRow( |
| 3933 | 3932 | 'SELECT allow_pw_change |
| 3934 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3933 | + FROM ' . prefixTable('roles_title').' |
|
| 3935 | 3934 | WHERE id = %i', |
| 3936 | 3935 | $role |
| 3937 | 3936 | ); |
@@ -3962,11 +3961,11 @@ discard block |
||
| 3962 | 3961 | |
| 3963 | 3962 | foreach ($session->get('user-roles_array') as $role) { |
| 3964 | 3963 | $access = DB::queryFirstRow( |
| 3965 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3964 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3966 | 3965 | $role, |
| 3967 | 3966 | $inputData['id'] |
| 3968 | 3967 | ); |
| 3969 | - if (DB::count()>0) { |
|
| 3968 | + if (DB::count() > 0) { |
|
| 3970 | 3969 | if ($access['type'] === 'R') { |
| 3971 | 3970 | array_push($arrTmp, 10); |
| 3972 | 3971 | } elseif ($access['type'] === 'W') { |
@@ -4031,7 +4030,7 @@ discard block |
||
| 4031 | 4030 | } else { |
| 4032 | 4031 | DB::query( |
| 4033 | 4032 | 'SELECT * |
| 4034 | - FROM ' . prefixTable('items') . ' |
|
| 4033 | + FROM ' . prefixTable('items').' |
|
| 4035 | 4034 | WHERE inactif = %i', |
| 4036 | 4035 | 0 |
| 4037 | 4036 | ); |
@@ -4041,7 +4040,7 @@ discard block |
||
| 4041 | 4040 | |
| 4042 | 4041 | // Get folder complexity |
| 4043 | 4042 | $folderComplexity = DB::queryFirstRow( |
| 4044 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4043 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4045 | 4044 | 'complex', |
| 4046 | 4045 | $inputData['id'] |
| 4047 | 4046 | ); |
@@ -4053,7 +4052,7 @@ discard block |
||
| 4053 | 4052 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4054 | 4053 | $folderRow = DB::query( |
| 4055 | 4054 | 'SELECT id_category |
| 4056 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4055 | + FROM ' . prefixTable('categories_folders').' |
|
| 4057 | 4056 | WHERE id_folder = %i', |
| 4058 | 4057 | $inputData['id'] |
| 4059 | 4058 | ); |
@@ -4109,8 +4108,8 @@ discard block |
||
| 4109 | 4108 | $where->add('i.inactif=%i', 0); |
| 4110 | 4109 | $where->add('i.deleted_at IS NULL'); |
| 4111 | 4110 | |
| 4112 | - $query_limit = ' LIMIT ' . |
|
| 4113 | - $start . ',' . |
|
| 4111 | + $query_limit = ' LIMIT '. |
|
| 4112 | + $start.','. |
|
| 4114 | 4113 | $post_nb_items_to_display_once; |
| 4115 | 4114 | |
| 4116 | 4115 | $rows = DB::query( |
@@ -4118,8 +4117,8 @@ discard block |
||
| 4118 | 4117 | i.label, i.description, i.pw, i.login, |
| 4119 | 4118 | i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon, |
| 4120 | 4119 | n.renewal_period, i.url AS link, i.email |
| 4121 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4122 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4120 | + FROM ' . prefixTable('items').' AS i |
|
| 4121 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4123 | 4122 | WHERE %l |
| 4124 | 4123 | ORDER BY i.label ASC' . $query_limit, |
| 4125 | 4124 | $where |
@@ -4133,8 +4132,8 @@ discard block |
||
| 4133 | 4132 | i.label, i.description, i.pw, i.login, |
| 4134 | 4133 | i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon, |
| 4135 | 4134 | n.renewal_period, i.url AS link, i.email |
| 4136 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4137 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4135 | + FROM ' . prefixTable('items').' AS i |
|
| 4136 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4138 | 4137 | WHERE %l |
| 4139 | 4138 | ORDER BY i.label ASC', |
| 4140 | 4139 | $where |
@@ -4164,7 +4163,7 @@ discard block |
||
| 4164 | 4163 | $item_is_restricted_to_role = false; |
| 4165 | 4164 | DB::queryFirstRow( |
| 4166 | 4165 | 'SELECT role_id |
| 4167 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4166 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4168 | 4167 | WHERE item_id = %i', |
| 4169 | 4168 | $record['id'] |
| 4170 | 4169 | ); |
@@ -4176,7 +4175,7 @@ discard block |
||
| 4176 | 4175 | $user_is_included_in_role = false; |
| 4177 | 4176 | DB::query( |
| 4178 | 4177 | 'SELECT role_id |
| 4179 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4178 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4180 | 4179 | WHERE item_id = %i AND role_id IN %ls', |
| 4181 | 4180 | $record['id'], |
| 4182 | 4181 | $session->get('user-roles_array') |
@@ -4201,11 +4200,11 @@ discard block |
||
| 4201 | 4200 | } |
| 4202 | 4201 | |
| 4203 | 4202 | // Get Expiration date |
| 4204 | - $sql = 'SELECT date FROM ' . prefixTable('log_items') |
|
| 4205 | - . " WHERE action = 'at_creation' AND id_item=" . $record['id'] |
|
| 4206 | - . ' union all SELECT date FROM '. prefixTable('log_items') |
|
| 4203 | + $sql = 'SELECT date FROM '.prefixTable('log_items') |
|
| 4204 | + . " WHERE action = 'at_creation' AND id_item=".$record['id'] |
|
| 4205 | + . ' union all SELECT date FROM '.prefixTable('log_items') |
|
| 4207 | 4206 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
| 4208 | - AND id_item=" . $record['id'] . " ORDER BY date DESC LIMIT 1"; |
|
| 4207 | + AND id_item=" . $record['id']." ORDER BY date DESC LIMIT 1"; |
|
| 4209 | 4208 | $record['date'] = DB::queryFirstRow($sql)['date']; |
| 4210 | 4209 | |
| 4211 | 4210 | // Check if item is expired |
@@ -4394,8 +4393,8 @@ discard block |
||
| 4394 | 4393 | if ((int) $start === 0) { |
| 4395 | 4394 | DB::query( |
| 4396 | 4395 | 'SELECT i.id |
| 4397 | - FROM ' . prefixTable('items') . ' as i |
|
| 4398 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4396 | + FROM ' . prefixTable('items').' as i |
|
| 4397 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4399 | 4398 | WHERE %l', |
| 4400 | 4399 | $where |
| 4401 | 4400 | ); |
@@ -4455,8 +4454,8 @@ discard block |
||
| 4455 | 4454 | $dataItem = DB::queryFirstRow( |
| 4456 | 4455 | 'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id, |
| 4457 | 4456 | i.label AS label, i.id_tree AS id_tree |
| 4458 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4459 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4457 | + FROM ' . prefixTable('items').' AS i |
|
| 4458 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4460 | 4459 | WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)', |
| 4461 | 4460 | $session->get('user-id'), |
| 4462 | 4461 | $inputData['itemKey'] ?? '', |
@@ -4568,7 +4567,7 @@ discard block |
||
| 4568 | 4567 | // do query on this folder |
| 4569 | 4568 | $data_this_folder = DB::queryFirstRow( |
| 4570 | 4569 | 'SELECT id, personal_folder, title |
| 4571 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4570 | + FROM ' . prefixTable('nested_tree').' |
|
| 4572 | 4571 | WHERE id = %s', |
| 4573 | 4572 | $inputData['folderId'] |
| 4574 | 4573 | ); |
@@ -4608,8 +4607,8 @@ discard block |
||
| 4608 | 4607 | $visibilite = ''; |
| 4609 | 4608 | $data = DB::queryFirstRow( |
| 4610 | 4609 | 'SELECT m.valeur, n.personal_folder |
| 4611 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4612 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4610 | + FROM ' . prefixTable('misc').' AS m |
|
| 4611 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4613 | 4612 | WHERE type=%s AND intitule = %s', |
| 4614 | 4613 | 'complex', |
| 4615 | 4614 | $inputData['folderId'] |
@@ -4622,8 +4621,8 @@ discard block |
||
| 4622 | 4621 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4623 | 4622 | $rows = DB::query( |
| 4624 | 4623 | 'SELECT t.title |
| 4625 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4626 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4624 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4625 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4627 | 4626 | WHERE v.folder_id = %i |
| 4628 | 4627 | GROUP BY title', |
| 4629 | 4628 | $inputData['folderId'] |
@@ -4632,7 +4631,7 @@ discard block |
||
| 4632 | 4631 | if (empty($visibilite)) { |
| 4633 | 4632 | $visibilite = $record['title']; |
| 4634 | 4633 | } else { |
| 4635 | - $visibilite .= ' - ' . $record['title']; |
|
| 4634 | + $visibilite .= ' - '.$record['title']; |
|
| 4636 | 4635 | } |
| 4637 | 4636 | } |
| 4638 | 4637 | } else { |
@@ -4642,14 +4641,14 @@ discard block |
||
| 4642 | 4641 | // do new query to know if current folder is pf |
| 4643 | 4642 | $data_pf = DB::queryFirstRow( |
| 4644 | 4643 | 'SELECT personal_folder |
| 4645 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4644 | + FROM ' . prefixTable('nested_tree').' |
|
| 4646 | 4645 | WHERE id = %s', |
| 4647 | 4646 | $inputData['folderId'] |
| 4648 | 4647 | ); |
| 4649 | 4648 | |
| 4650 | 4649 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4651 | 4650 | |
| 4652 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4651 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4653 | 4652 | } |
| 4654 | 4653 | |
| 4655 | 4654 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4659,8 +4658,8 @@ discard block |
||
| 4659 | 4658 | $listOptionsForRoles = array(); |
| 4660 | 4659 | $rows = DB::query( |
| 4661 | 4660 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4662 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4663 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4661 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4662 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4664 | 4663 | WHERE r.folder_id = %i', |
| 4665 | 4664 | $inputData['folderId'] |
| 4666 | 4665 | ); |
@@ -4675,8 +4674,8 @@ discard block |
||
| 4675 | 4674 | $rows2 = DB::query( |
| 4676 | 4675 | 'SELECT u.id, u.login, u.email, u.name, u.lastname, |
| 4677 | 4676 | GROUP_CONCAT(DISTINCT ur.role_id ORDER BY ur.role_id SEPARATOR ";") AS fonction_id |
| 4678 | - FROM ' . prefixTable('users') . ' AS u |
|
| 4679 | - INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id) |
|
| 4677 | + FROM ' . prefixTable('users').' AS u |
|
| 4678 | + INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id) |
|
| 4680 | 4679 | WHERE u.admin = 0 AND ur.source = %s |
| 4681 | 4680 | GROUP BY u.id', |
| 4682 | 4681 | 'manual' |
@@ -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); |
@@ -4999,8 +4998,8 @@ discard block |
||
| 4999 | 4998 | // get data about item |
| 5000 | 4999 | $dataSource = DB::queryFirstRow( |
| 5001 | 5000 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5002 | - FROM ' . prefixTable('items') . ' as i |
|
| 5003 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5001 | + FROM ' . prefixTable('items').' as i |
|
| 5002 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5004 | 5003 | WHERE i.id=%i', |
| 5005 | 5004 | $inputData['itemId'] |
| 5006 | 5005 | ); |
@@ -5044,7 +5043,7 @@ discard block |
||
| 5044 | 5043 | // get data about new folder |
| 5045 | 5044 | $dataDestination = DB::queryFirstRow( |
| 5046 | 5045 | 'SELECT personal_folder, title |
| 5047 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5046 | + FROM ' . prefixTable('nested_tree').' |
|
| 5048 | 5047 | WHERE id = %i', |
| 5049 | 5048 | $inputData['folderId'] |
| 5050 | 5049 | ); |
@@ -5097,7 +5096,7 @@ discard block |
||
| 5097 | 5096 | // Get fields for this Item |
| 5098 | 5097 | $rows = DB::query( |
| 5099 | 5098 | 'SELECT id |
| 5100 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5099 | + FROM ' . prefixTable('categories_items').' |
|
| 5101 | 5100 | WHERE item_id = %i', |
| 5102 | 5101 | $inputData['itemId'] |
| 5103 | 5102 | ); |
@@ -5114,7 +5113,7 @@ discard block |
||
| 5114 | 5113 | // Get FILES for this Item |
| 5115 | 5114 | $rows = DB::query( |
| 5116 | 5115 | 'SELECT id |
| 5117 | - FROM ' . prefixTable('files') . ' |
|
| 5116 | + FROM ' . prefixTable('files').' |
|
| 5118 | 5117 | WHERE id_item = %i', |
| 5119 | 5118 | $inputData['itemId'] |
| 5120 | 5119 | ); |
@@ -5161,7 +5160,7 @@ discard block |
||
| 5161 | 5160 | // Get the ITEM object key for the user |
| 5162 | 5161 | $userKey = DB::queryFirstRow( |
| 5163 | 5162 | 'SELECT share_key |
| 5164 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5163 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5165 | 5164 | WHERE user_id = %i AND object_id = %i', |
| 5166 | 5165 | $session->get('user-id'), |
| 5167 | 5166 | $inputData['itemId'] |
@@ -5172,7 +5171,7 @@ discard block |
||
| 5172 | 5171 | // This is a public object |
| 5173 | 5172 | $users = DB::query( |
| 5174 | 5173 | 'SELECT id, public_key |
| 5175 | - FROM ' . prefixTable('users') . ' |
|
| 5174 | + FROM ' . prefixTable('users').' |
|
| 5176 | 5175 | WHERE id NOT IN %li |
| 5177 | 5176 | AND public_key != ""', |
| 5178 | 5177 | $tpUsersIDs |
@@ -5192,14 +5191,14 @@ discard block |
||
| 5192 | 5191 | // Get fields for this Item |
| 5193 | 5192 | $rows = DB::query( |
| 5194 | 5193 | 'SELECT id |
| 5195 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5194 | + FROM ' . prefixTable('categories_items').' |
|
| 5196 | 5195 | WHERE item_id = %i', |
| 5197 | 5196 | $inputData['itemId'] |
| 5198 | 5197 | ); |
| 5199 | 5198 | foreach ($rows as $field) { |
| 5200 | 5199 | $userKey = DB::queryFirstRow( |
| 5201 | 5200 | 'SELECT share_key |
| 5202 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5201 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5203 | 5202 | WHERE user_id = %i AND object_id = %i', |
| 5204 | 5203 | $session->get('user-id'), |
| 5205 | 5204 | $field['id'] |
@@ -5210,7 +5209,7 @@ discard block |
||
| 5210 | 5209 | // This is a public object |
| 5211 | 5210 | $users = DB::query( |
| 5212 | 5211 | 'SELECT id, public_key |
| 5213 | - FROM ' . prefixTable('users') . ' |
|
| 5212 | + FROM ' . prefixTable('users').' |
|
| 5214 | 5213 | WHERE id NOT IN %li |
| 5215 | 5214 | AND public_key != ""', |
| 5216 | 5215 | $tpUsersIDs |
@@ -5231,14 +5230,14 @@ discard block |
||
| 5231 | 5230 | // Get FILES for this Item |
| 5232 | 5231 | $rows = DB::query( |
| 5233 | 5232 | 'SELECT id |
| 5234 | - FROM ' . prefixTable('files') . ' |
|
| 5233 | + FROM ' . prefixTable('files').' |
|
| 5235 | 5234 | WHERE id_item = %i', |
| 5236 | 5235 | $inputData['itemId'] |
| 5237 | 5236 | ); |
| 5238 | 5237 | foreach ($rows as $attachment) { |
| 5239 | 5238 | $userKey = DB::queryFirstRow( |
| 5240 | 5239 | 'SELECT share_key |
| 5241 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5240 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5242 | 5241 | WHERE user_id = %i AND object_id = %i', |
| 5243 | 5242 | $session->get('user-id'), |
| 5244 | 5243 | $attachment['id'] |
@@ -5249,7 +5248,7 @@ discard block |
||
| 5249 | 5248 | // This is a public object |
| 5250 | 5249 | $users = DB::query( |
| 5251 | 5250 | 'SELECT id, public_key |
| 5252 | - FROM ' . prefixTable('users') . ' |
|
| 5251 | + FROM ' . prefixTable('users').' |
|
| 5253 | 5252 | WHERE id NOT IN %li |
| 5254 | 5253 | AND public_key != ""', |
| 5255 | 5254 | $tpUsersIDs |
@@ -5288,7 +5287,7 @@ discard block |
||
| 5288 | 5287 | $session->get('user-id'), |
| 5289 | 5288 | 'at_modification', |
| 5290 | 5289 | $session->get('user-login'), |
| 5291 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5290 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5292 | 5291 | ); |
| 5293 | 5292 | |
| 5294 | 5293 | // Update cache table |
@@ -5347,8 +5346,8 @@ discard block |
||
| 5347 | 5346 | // get data about item |
| 5348 | 5347 | $dataSource = DB::queryFirstRow( |
| 5349 | 5348 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5350 | - FROM ' . prefixTable('items') . ' as i |
|
| 5351 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5349 | + FROM ' . prefixTable('items').' as i |
|
| 5350 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5352 | 5351 | WHERE i.id=%i', |
| 5353 | 5352 | $item_id |
| 5354 | 5353 | ); |
@@ -5370,7 +5369,7 @@ discard block |
||
| 5370 | 5369 | |
| 5371 | 5370 | // get data about new folder |
| 5372 | 5371 | $dataDestination = DB::queryFirstRow( |
| 5373 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5372 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5374 | 5373 | $inputData['folderId'] |
| 5375 | 5374 | ); |
| 5376 | 5375 | |
@@ -5404,14 +5403,14 @@ discard block |
||
| 5404 | 5403 | prefixTable('sharekeys_items'), |
| 5405 | 5404 | 'object_id = %i AND user_id NOT IN %ls', |
| 5406 | 5405 | $item_id, |
| 5407 | - [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 5406 | + [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 5408 | 5407 | ); |
| 5409 | 5408 | |
| 5410 | 5409 | // Remove all item sharekeys fields |
| 5411 | 5410 | // Get fields for this Item |
| 5412 | 5411 | $rows = DB::query( |
| 5413 | 5412 | 'SELECT id |
| 5414 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5413 | + FROM ' . prefixTable('categories_items').' |
|
| 5415 | 5414 | WHERE item_id = %i', |
| 5416 | 5415 | $item_id |
| 5417 | 5416 | ); |
@@ -5428,7 +5427,7 @@ discard block |
||
| 5428 | 5427 | // Get FILES for this Item |
| 5429 | 5428 | $rows = DB::query( |
| 5430 | 5429 | 'SELECT id |
| 5431 | - FROM ' . prefixTable('files') . ' |
|
| 5430 | + FROM ' . prefixTable('files').' |
|
| 5432 | 5431 | WHERE id_item = %i', |
| 5433 | 5432 | $item_id |
| 5434 | 5433 | ); |
@@ -5483,7 +5482,7 @@ discard block |
||
| 5483 | 5482 | // Get the ITEM object key for the user |
| 5484 | 5483 | $userKey = DB::queryFirstRow( |
| 5485 | 5484 | 'SELECT share_key |
| 5486 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5485 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5487 | 5486 | WHERE user_id = %i AND object_id = %i', |
| 5488 | 5487 | $session->get('user-id'), |
| 5489 | 5488 | $item_id |
@@ -5494,7 +5493,7 @@ discard block |
||
| 5494 | 5493 | // This is a public object |
| 5495 | 5494 | $users = DB::query( |
| 5496 | 5495 | 'SELECT id, public_key |
| 5497 | - FROM ' . prefixTable('users') . ' |
|
| 5496 | + FROM ' . prefixTable('users').' |
|
| 5498 | 5497 | WHERE id NOT IN %li |
| 5499 | 5498 | AND public_key != ""', |
| 5500 | 5499 | $tpUsersIDs |
@@ -5515,14 +5514,14 @@ discard block |
||
| 5515 | 5514 | // Get fields for this Item |
| 5516 | 5515 | $rows = DB::query( |
| 5517 | 5516 | 'SELECT id |
| 5518 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5517 | + FROM ' . prefixTable('categories_items').' |
|
| 5519 | 5518 | WHERE item_id = %i', |
| 5520 | 5519 | $item_id |
| 5521 | 5520 | ); |
| 5522 | 5521 | foreach ($rows as $field) { |
| 5523 | 5522 | $userKey = DB::queryFirstRow( |
| 5524 | 5523 | 'SELECT share_key |
| 5525 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5524 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5526 | 5525 | WHERE user_id = %i AND object_id = %i', |
| 5527 | 5526 | $session->get('user-id'), |
| 5528 | 5527 | $field['id'] |
@@ -5533,7 +5532,7 @@ discard block |
||
| 5533 | 5532 | // This is a public object |
| 5534 | 5533 | $users = DB::query( |
| 5535 | 5534 | 'SELECT id, public_key |
| 5536 | - FROM ' . prefixTable('users') . ' |
|
| 5535 | + FROM ' . prefixTable('users').' |
|
| 5537 | 5536 | WHERE id NOT IN %li |
| 5538 | 5537 | AND public_key != ""', |
| 5539 | 5538 | $tpUsersIDs |
@@ -5555,14 +5554,14 @@ discard block |
||
| 5555 | 5554 | // Get FILES for this Item |
| 5556 | 5555 | $rows = DB::query( |
| 5557 | 5556 | 'SELECT id |
| 5558 | - FROM ' . prefixTable('files') . ' |
|
| 5557 | + FROM ' . prefixTable('files').' |
|
| 5559 | 5558 | WHERE id_item = %i', |
| 5560 | 5559 | $item_id |
| 5561 | 5560 | ); |
| 5562 | 5561 | foreach ($rows as $attachment) { |
| 5563 | 5562 | $userKey = DB::queryFirstRow( |
| 5564 | 5563 | 'SELECT share_key |
| 5565 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5564 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5566 | 5565 | WHERE user_id = %i AND object_id = %i', |
| 5567 | 5566 | $session->get('user-id'), |
| 5568 | 5567 | $attachment['id'] |
@@ -5573,7 +5572,7 @@ discard block |
||
| 5573 | 5572 | // This is a public object |
| 5574 | 5573 | $users = DB::query( |
| 5575 | 5574 | 'SELECT id, public_key |
| 5576 | - FROM ' . prefixTable('users') . ' |
|
| 5575 | + FROM ' . prefixTable('users').' |
|
| 5577 | 5576 | WHERE id NOT IN %li |
| 5578 | 5577 | AND public_key != ""', |
| 5579 | 5578 | $tpUsersIDs |
@@ -5611,13 +5610,13 @@ discard block |
||
| 5611 | 5610 | $session->get('user-id'), |
| 5612 | 5611 | 'at_modification', |
| 5613 | 5612 | $session->get('user-login'), |
| 5614 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5613 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5615 | 5614 | ); |
| 5616 | 5615 | } |
| 5617 | 5616 | } |
| 5618 | 5617 | |
| 5619 | 5618 | // reload cache table |
| 5620 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5619 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5621 | 5620 | updateCacheTable('reload', null); |
| 5622 | 5621 | |
| 5623 | 5622 | echo (string) prepareExchangedData( |
@@ -5681,7 +5680,7 @@ discard block |
||
| 5681 | 5680 | // get info |
| 5682 | 5681 | $dataSource = DB::queryFirstRow( |
| 5683 | 5682 | 'SELECT label, id_tree |
| 5684 | - FROM ' . prefixTable('items') . ' |
|
| 5683 | + FROM ' . prefixTable('items').' |
|
| 5685 | 5684 | WHERE id=%i', |
| 5686 | 5685 | $item_id |
| 5687 | 5686 | ); |
@@ -5782,14 +5781,14 @@ discard block |
||
| 5782 | 5781 | // Variables |
| 5783 | 5782 | $dataAuthor = DB::queryFirstRow( |
| 5784 | 5783 | 'SELECT email,login |
| 5785 | - FROM ' . prefixTable('users') . ' |
|
| 5784 | + FROM ' . prefixTable('users').' |
|
| 5786 | 5785 | WHERE id = %i', |
| 5787 | 5786 | $post_content[1] |
| 5788 | 5787 | ); |
| 5789 | 5788 | |
| 5790 | 5789 | $dataItem = DB::queryFirstRow( |
| 5791 | 5790 | 'SELECT label, id_tree |
| 5792 | - FROM ' . prefixTable('items') . ' |
|
| 5791 | + FROM ' . prefixTable('items').' |
|
| 5793 | 5792 | WHERE id = %i', |
| 5794 | 5793 | $post_content[0] |
| 5795 | 5794 | ); |
@@ -5806,7 +5805,7 @@ discard block |
||
| 5806 | 5805 | $lang->get('email_request_access_subject'), |
| 5807 | 5806 | str_replace( |
| 5808 | 5807 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5809 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5808 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5810 | 5809 | $lang->get('email_request_access_mail') |
| 5811 | 5810 | ), |
| 5812 | 5811 | $dataAuthor['email'], |
@@ -5815,7 +5814,7 @@ discard block |
||
| 5815 | 5814 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5816 | 5815 | $dataItem = DB::queryFirstRow( |
| 5817 | 5816 | 'SELECT label,id_tree |
| 5818 | - FROM ' . prefixTable('items') . ' |
|
| 5817 | + FROM ' . prefixTable('items').' |
|
| 5819 | 5818 | WHERE id= %i', |
| 5820 | 5819 | $inputData['id'] |
| 5821 | 5820 | ); |
@@ -5838,7 +5837,7 @@ discard block |
||
| 5838 | 5837 | ), |
| 5839 | 5838 | array( |
| 5840 | 5839 | empty($SETTINGS['email_server_url']) === false ? |
| 5841 | - $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'], |
|
| 5840 | + $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'], |
|
| 5842 | 5841 | addslashes($session->get('user-login')), |
| 5843 | 5842 | addslashes($path), |
| 5844 | 5843 | ), |
@@ -5888,8 +5887,8 @@ discard block |
||
| 5888 | 5887 | $dataItem = DB::queryFirstRow( |
| 5889 | 5888 | 'SELECT i.*, |
| 5890 | 5889 | IFNULL(l.id_user, 0) AS id_user |
| 5891 | - FROM ' . prefixTable('items') . ' as i |
|
| 5892 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 5890 | + FROM ' . prefixTable('items').' as i |
|
| 5891 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id AND l.action = %s) |
|
| 5893 | 5892 | WHERE i.id=%i', |
| 5894 | 5893 | 'at_creation', |
| 5895 | 5894 | $item_id |
@@ -5918,18 +5917,18 @@ discard block |
||
| 5918 | 5917 | $session->get('user-login'), |
| 5919 | 5918 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 5920 | 5919 | null, |
| 5921 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 5920 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 5922 | 5921 | ); |
| 5923 | 5922 | // Prepare new line |
| 5924 | 5923 | $data = DB::queryFirstRow( |
| 5925 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5924 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5926 | 5925 | $item_id |
| 5927 | 5926 | ); |
| 5928 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 5927 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 5929 | 5928 | // send back |
| 5930 | 5929 | $data = array( |
| 5931 | 5930 | 'error' => '', |
| 5932 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5931 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5933 | 5932 | ); |
| 5934 | 5933 | echo (string) prepareExchangedData( |
| 5935 | 5934 | $data, |
@@ -6004,8 +6003,8 @@ discard block |
||
| 6004 | 6003 | // Should we log a password change? |
| 6005 | 6004 | $itemQ = DB::queryFirstRow( |
| 6006 | 6005 | 'SELECT s.share_key, i.pw |
| 6007 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6008 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6006 | + FROM ' . prefixTable('items').' AS i |
|
| 6007 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6009 | 6008 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6010 | 6009 | $session->get('user-id'), |
| 6011 | 6010 | $dataReceived['id'] |
@@ -6060,7 +6059,7 @@ discard block |
||
| 6060 | 6059 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6061 | 6060 | $SETTINGS['otv_expiration_period'] = 7; |
| 6062 | 6061 | } |
| 6063 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6062 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6064 | 6063 | |
| 6065 | 6064 | echo json_encode( |
| 6066 | 6065 | array( |
@@ -6091,7 +6090,7 @@ discard block |
||
| 6091 | 6090 | // get parameters from original link |
| 6092 | 6091 | $url = $dataReceived['original_link']; |
| 6093 | 6092 | $parts = parse_url($url); |
| 6094 | - if(isset($parts['query'])){ |
|
| 6093 | + if (isset($parts['query'])) { |
|
| 6095 | 6094 | parse_str($parts['query'], $orignal_link_parameters); |
| 6096 | 6095 | } else { |
| 6097 | 6096 | $orignal_link_parameters = array(); |
@@ -6122,13 +6121,13 @@ discard block |
||
| 6122 | 6121 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6123 | 6122 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6124 | 6123 | if (str_contains($domain_host, 'www.') === true) { |
| 6125 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6124 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6126 | 6125 | } else { |
| 6127 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6126 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6128 | 6127 | } |
| 6129 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6128 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6130 | 6129 | } else { |
| 6131 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6130 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6132 | 6131 | } |
| 6133 | 6132 | |
| 6134 | 6133 | echo (string) prepareExchangedData( |
@@ -6163,8 +6162,8 @@ discard block |
||
| 6163 | 6162 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6164 | 6163 | f.extension AS extension, f.type AS type, |
| 6165 | 6164 | s.share_key AS share_key |
| 6166 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6167 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6165 | + FROM ' . prefixTable('files').' AS f |
|
| 6166 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6168 | 6167 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6169 | 6168 | $session->get('user-id'), |
| 6170 | 6169 | $inputData['id'] |
@@ -6185,7 +6184,7 @@ discard block |
||
| 6185 | 6184 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6186 | 6185 | |
| 6187 | 6186 | // prepare image info |
| 6188 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6187 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6189 | 6188 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6190 | 6189 | |
| 6191 | 6190 | // Get image content |
@@ -6212,7 +6211,7 @@ discard block |
||
| 6212 | 6211 | echo (string) prepareExchangedData( |
| 6213 | 6212 | array( |
| 6214 | 6213 | 'error' => false, |
| 6215 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6214 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6216 | 6215 | 'file_type' => $file_info['type'], |
| 6217 | 6216 | 'file_content' => $fileContent, |
| 6218 | 6217 | ), |
@@ -6324,7 +6323,7 @@ discard block |
||
| 6324 | 6323 | $arbo = $tree->getPath($folder->id, false); |
| 6325 | 6324 | $path = ''; |
| 6326 | 6325 | foreach ($arbo as $elem) { |
| 6327 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6326 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6328 | 6327 | } |
| 6329 | 6328 | |
| 6330 | 6329 | // Build array |
@@ -6391,7 +6390,7 @@ discard block |
||
| 6391 | 6390 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6392 | 6391 | $rows = DB::query( |
| 6393 | 6392 | 'SELECT id, categories |
| 6394 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6393 | + FROM ' . prefixTable('nested_tree').' |
|
| 6395 | 6394 | WHERE id IN (%l)', |
| 6396 | 6395 | implode(',', $foldersArray) |
| 6397 | 6396 | ); |
@@ -6409,7 +6408,7 @@ discard block |
||
| 6409 | 6408 | if (count($ids) > 0) { |
| 6410 | 6409 | $subfolders = DB::queryFirstColumn( |
| 6411 | 6410 | 'SELECT title |
| 6412 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6411 | + FROM ' . prefixTable('nested_tree').' |
|
| 6413 | 6412 | WHERE id IN %li', |
| 6414 | 6413 | $ids |
| 6415 | 6414 | ); |
@@ -6445,7 +6444,7 @@ discard block |
||
| 6445 | 6444 | // get item info |
| 6446 | 6445 | $dataItem = DB::queryFirstRow( |
| 6447 | 6446 | 'SELECT * |
| 6448 | - FROM ' . prefixTable('items') . ' |
|
| 6447 | + FROM ' . prefixTable('items').' |
|
| 6449 | 6448 | WHERE id=%i', |
| 6450 | 6449 | $inputData['itemId'] |
| 6451 | 6450 | ); |
@@ -6457,8 +6456,8 @@ discard block |
||
| 6457 | 6456 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6458 | 6457 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6459 | 6458 | l.old_value as old_value |
| 6460 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6461 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6459 | + FROM ' . prefixTable('log_items').' as l |
|
| 6460 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6462 | 6461 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6463 | 6462 | ORDER BY date DESC', |
| 6464 | 6463 | $inputData['itemId'], |
@@ -6473,18 +6472,18 @@ discard block |
||
| 6473 | 6472 | |
| 6474 | 6473 | // imported via API |
| 6475 | 6474 | if (empty($record['login']) === true) { |
| 6476 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6475 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6477 | 6476 | } |
| 6478 | 6477 | |
| 6479 | 6478 | // Prepare avatar |
| 6480 | 6479 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6481 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6482 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6480 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6481 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6483 | 6482 | } else { |
| 6484 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6483 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6485 | 6484 | } |
| 6486 | 6485 | } else { |
| 6487 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6486 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6488 | 6487 | } |
| 6489 | 6488 | |
| 6490 | 6489 | // Prepare action |
@@ -6504,7 +6503,7 @@ discard block |
||
| 6504 | 6503 | $previous_passwords, |
| 6505 | 6504 | [ |
| 6506 | 6505 | 'password' => htmlentities($previous_pwd['string']), |
| 6507 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6506 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6508 | 6507 | ] |
| 6509 | 6508 | ); |
| 6510 | 6509 | } |
@@ -6517,19 +6516,19 @@ discard block |
||
| 6517 | 6516 | $action = $lang->get($reason[0]); |
| 6518 | 6517 | if ($reason[0] === 'at_moved') { |
| 6519 | 6518 | $tmp = explode(' -> ', $reason[1]); |
| 6520 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6519 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6521 | 6520 | } elseif ($reason[0] === 'at_field') { |
| 6522 | 6521 | $tmp = explode(' => ', $reason[1]); |
| 6523 | 6522 | if (count($tmp) > 1) { |
| 6524 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6525 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6523 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6524 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6526 | 6525 | } else { |
| 6527 | 6526 | $detail = trim($reason[1]); |
| 6528 | 6527 | } |
| 6529 | 6528 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6530 | 6529 | $tmp = explode(' => ', $reason[1]); |
| 6531 | 6530 | $detail = empty(trim($tmp[0])) === true ? |
| 6532 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6531 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6533 | 6532 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6534 | 6533 | $detail = $lang->get($reason[1]); |
| 6535 | 6534 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') { |
@@ -6538,7 +6537,7 @@ discard block |
||
| 6538 | 6537 | $tmp = explode(':', $reason[1]); |
| 6539 | 6538 | $tmp = explode('.', $tmp[0]); |
| 6540 | 6539 | $detail = isBase64($tmp[0]) === true ? |
| 6541 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6540 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6542 | 6541 | } elseif ($reason[0] === 'at_import') { |
| 6543 | 6542 | $detail = ''; |
| 6544 | 6543 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6557,8 +6556,8 @@ discard block |
||
| 6557 | 6556 | array( |
| 6558 | 6557 | 'avatar' => $avatar, |
| 6559 | 6558 | 'login' => $record['login'], |
| 6560 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6561 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6559 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6560 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6562 | 6561 | 'action' => $action, |
| 6563 | 6562 | 'detail' => $detail, |
| 6564 | 6563 | ) |
@@ -6646,11 +6645,11 @@ discard block |
||
| 6646 | 6645 | |
| 6647 | 6646 | // get some info to add to the notification email |
| 6648 | 6647 | $resp_user = DB::queryFirstRow( |
| 6649 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6648 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6650 | 6649 | $session->get('user-id') |
| 6651 | 6650 | ); |
| 6652 | 6651 | $resp_folder = DB::queryFirstRow( |
| 6653 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6652 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6654 | 6653 | $folder |
| 6655 | 6654 | ); |
| 6656 | 6655 | |
@@ -6659,7 +6658,7 @@ discard block |
||
| 6659 | 6658 | $emailService = new EmailService(); |
| 6660 | 6659 | $rows = DB::query( |
| 6661 | 6660 | 'SELECT email |
| 6662 | - FROM ' . prefixTable('users') . ' |
|
| 6661 | + FROM ' . prefixTable('users').' |
|
| 6663 | 6662 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6664 | 6663 | 1 |
| 6665 | 6664 | ); |
@@ -6705,7 +6704,7 @@ discard block |
||
| 6705 | 6704 | // Send email |
| 6706 | 6705 | $dataItem = DB::queryFirstRow( |
| 6707 | 6706 | 'SELECT label, id_tree |
| 6708 | - FROM ' . prefixTable('items') . ' |
|
| 6707 | + FROM ' . prefixTable('items').' |
|
| 6709 | 6708 | WHERE id = %i', |
| 6710 | 6709 | $inputData['itemId'] |
| 6711 | 6710 | ); |
@@ -6759,7 +6758,7 @@ discard block |
||
| 6759 | 6758 | |
| 6760 | 6759 | DB::query( |
| 6761 | 6760 | 'SELECT * |
| 6762 | - FROM ' . prefixTable('notification') . ' |
|
| 6761 | + FROM ' . prefixTable('notification').' |
|
| 6763 | 6762 | WHERE item_id = %i AND user_id = %i', |
| 6764 | 6763 | $inputData['itemId'], |
| 6765 | 6764 | $session->get('user-id') |
@@ -6831,7 +6830,7 @@ discard block |
||
| 6831 | 6830 | // And related logs |
| 6832 | 6831 | $rows = DB::query( |
| 6833 | 6832 | 'SELECT id, file AS filename |
| 6834 | - FROM ' . prefixTable('files') . ' |
|
| 6833 | + FROM ' . prefixTable('files').' |
|
| 6835 | 6834 | WHERE id_item = %i AND confirmed = %i', |
| 6836 | 6835 | $inputData['itemId'], |
| 6837 | 6836 | 0 |
@@ -6845,12 +6844,12 @@ discard block |
||
| 6845 | 6844 | ); |
| 6846 | 6845 | |
| 6847 | 6846 | // Delete file on server |
| 6848 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6847 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6849 | 6848 | |
| 6850 | 6849 | // Delete related logs |
| 6851 | 6850 | $logFile = DB::query( |
| 6852 | 6851 | 'SELECT increment_id, raison |
| 6853 | - FROM ' . prefixTable('log_items') . ' |
|
| 6852 | + FROM ' . prefixTable('log_items').' |
|
| 6854 | 6853 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6855 | 6854 | $inputData['itemId'], |
| 6856 | 6855 | $session->get('user-id'), |
@@ -6909,7 +6908,7 @@ discard block |
||
| 6909 | 6908 | // Confirm attachments |
| 6910 | 6909 | $rows = DB::query( |
| 6911 | 6910 | 'SELECT id, file AS filename |
| 6912 | - FROM ' . prefixTable('files') . ' |
|
| 6911 | + FROM ' . prefixTable('files').' |
|
| 6913 | 6912 | WHERE id_item = %i AND confirmed = %i', |
| 6914 | 6913 | $inputData['itemId'], |
| 6915 | 6914 | 0 |
@@ -7025,7 +7024,7 @@ discard block |
||
| 7025 | 7024 | $successfulDeletions = array(); |
| 7026 | 7025 | $failedDeletions = array(); |
| 7027 | 7026 | |
| 7028 | - foreach( $selectedItemIds as $itemId) { |
|
| 7027 | + foreach ($selectedItemIds as $itemId) { |
|
| 7029 | 7028 | // Check that user can access this item |
| 7030 | 7029 | $granted = accessToItemIsGranted((int) $itemId, $SETTINGS); |
| 7031 | 7030 | if ($granted !== true) { |
@@ -7036,7 +7035,7 @@ discard block |
||
| 7036 | 7035 | // Load item data |
| 7037 | 7036 | $data = DB::queryFirstRow( |
| 7038 | 7037 | 'SELECT id_tree, id, label |
| 7039 | - FROM ' . prefixTable('items') . ' |
|
| 7038 | + FROM ' . prefixTable('items').' |
|
| 7040 | 7039 | WHERE id = %i', |
| 7041 | 7040 | $itemId |
| 7042 | 7041 | ); |
@@ -7119,15 +7118,15 @@ discard block |
||
| 7119 | 7118 | case 'autocomplete_tags': |
| 7120 | 7119 | // Get a list off all existing TAGS |
| 7121 | 7120 | $listOfTags = ''; |
| 7122 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7121 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7123 | 7122 | foreach ($rows as $record) { |
| 7124 | 7123 | if (empty($listOfTags)) { |
| 7125 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7124 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7126 | 7125 | } else { |
| 7127 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7126 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7128 | 7127 | } |
| 7129 | 7128 | } |
| 7130 | - echo '[' . $listOfTags . ']'; |
|
| 7129 | + echo '['.$listOfTags.']'; |
|
| 7131 | 7130 | break; |
| 7132 | 7131 | } |
| 7133 | 7132 | } |
@@ -7143,7 +7142,7 @@ discard block |
||
| 7143 | 7142 | { |
| 7144 | 7143 | $data = DB::queryFirstRow( |
| 7145 | 7144 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7146 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7145 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7147 | 7146 | $groupe |
| 7148 | 7147 | ); |
| 7149 | 7148 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7263,7 +7262,7 @@ discard block |
||
| 7263 | 7262 | // Get item date |
| 7264 | 7263 | $itemRestrictedUsersList = DB::queryFirstRow( |
| 7265 | 7264 | 'SELECT restricted_to |
| 7266 | - FROM ' . prefixTable('items') . ' |
|
| 7265 | + FROM ' . prefixTable('items').' |
|
| 7267 | 7266 | WHERE id = %i', |
| 7268 | 7267 | $itemId |
| 7269 | 7268 | ); |
@@ -7296,7 +7295,7 @@ discard block |
||
| 7296 | 7295 | $now = time(); |
| 7297 | 7296 | $editionLocks = DB::query( |
| 7298 | 7297 | 'SELECT timestamp, user_id, increment_id |
| 7299 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7298 | + FROM ' . prefixTable('items_edition').' |
|
| 7300 | 7299 | WHERE item_id = %i |
| 7301 | 7300 | ORDER BY increment_id DESC', |
| 7302 | 7301 | $itemId |
@@ -7342,7 +7341,7 @@ discard block |
||
| 7342 | 7341 | |
| 7343 | 7342 | // Delete related background tasks if any |
| 7344 | 7343 | $task = DB::queryFirstRow( |
| 7345 | - 'SELECT increment_id FROM ' . prefixTable('background_tasks') . ' |
|
| 7344 | + 'SELECT increment_id FROM '.prefixTable('background_tasks').' |
|
| 7346 | 7345 | WHERE item_id = %i AND finished_at = ""', |
| 7347 | 7346 | $itemId |
| 7348 | 7347 | ); |
@@ -7355,7 +7354,7 @@ discard block |
||
| 7355 | 7354 | // Check if encryption process is still running |
| 7356 | 7355 | DB::queryFirstRow( |
| 7357 | 7356 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 7358 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 7357 | + FROM ' . prefixTable('background_tasks').' |
|
| 7359 | 7358 | WHERE item_id = %i AND finished_at = "" |
| 7360 | 7359 | ORDER BY increment_id DESC', |
| 7361 | 7360 | $itemId |
@@ -7376,7 +7375,7 @@ discard block |
||
| 7376 | 7375 | } |
| 7377 | 7376 | |
| 7378 | 7377 | return [ |
| 7379 | - 'status' => true, // Encryption in progress |
|
| 7378 | + 'status' => true, // Encryption in progress |
|
| 7380 | 7379 | 'delay' => $delay - $elapsed, // Time remaining before the lock expires |
| 7381 | 7380 | ]; |
| 7382 | 7381 | } |
@@ -7421,7 +7420,7 @@ discard block |
||
| 7421 | 7420 | { |
| 7422 | 7421 | // Check if there's an ongoing background encryption process for the item |
| 7423 | 7422 | $ongoingProcess = DB::queryFirstRow( |
| 7424 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7423 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7425 | 7424 | $itemId |
| 7426 | 7425 | ); |
| 7427 | 7426 | |
@@ -7439,7 +7438,7 @@ discard block |
||
| 7439 | 7438 | function getUserVisibleFolders(int $userId): array |
| 7440 | 7439 | { |
| 7441 | 7440 | // Query to retrieve visible folders for the user |
| 7442 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7441 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7443 | 7442 | |
| 7444 | 7443 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7445 | 7444 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7463,7 +7462,7 @@ discard block |
||
| 7463 | 7462 | |
| 7464 | 7463 | // Query the access rights for the given roles and folder |
| 7465 | 7464 | $accessTypes = DB::queryFirstColumn( |
| 7466 | - 'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7465 | + 'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7467 | 7466 | $roles, |
| 7468 | 7467 | $treeId |
| 7469 | 7468 | ); |
