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'] |
@@ -1046,8 +1045,8 @@ discard block |
||
| 1046 | 1045 | // Get all informations for this item |
| 1047 | 1046 | $dataItem = DB::queryFirstRow( |
| 1048 | 1047 | 'SELECT * |
| 1049 | - FROM ' . prefixTable('items') . ' as i |
|
| 1050 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1048 | + FROM ' . prefixTable('items').' as i |
|
| 1049 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1051 | 1050 | WHERE i.id=%i AND l.action = %s', |
| 1052 | 1051 | $inputData['itemId'], |
| 1053 | 1052 | 'at_creation' |
@@ -1089,7 +1088,7 @@ discard block |
||
| 1089 | 1088 | // Does the user has the sharekey for this item? |
| 1090 | 1089 | DB::query( |
| 1091 | 1090 | 'SELECT * |
| 1092 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1091 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1093 | 1092 | WHERE object_id = %i AND user_id = %s', |
| 1094 | 1093 | $inputData['itemId'], |
| 1095 | 1094 | $session->get('user-id') |
@@ -1150,9 +1149,9 @@ discard block |
||
| 1150 | 1149 | 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, |
| 1151 | 1150 | i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification, |
| 1152 | 1151 | u.login as user_login, u.email as user_email |
| 1153 | - FROM ' . prefixTable('items') . ' as i |
|
| 1154 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1155 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1152 | + FROM ' . prefixTable('items').' as i |
|
| 1153 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1154 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1156 | 1155 | WHERE i.id=%i', |
| 1157 | 1156 | $inputData['itemId'] |
| 1158 | 1157 | ); |
@@ -1160,7 +1159,7 @@ discard block |
||
| 1160 | 1159 | // Should we log a password change? |
| 1161 | 1160 | $userKey = DB::queryFirstRow( |
| 1162 | 1161 | 'SELECT share_key |
| 1163 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1162 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1164 | 1163 | WHERE user_id = %i AND object_id = %i', |
| 1165 | 1164 | $session->get('user-id'), |
| 1166 | 1165 | $inputData['itemId'] |
@@ -1224,12 +1223,12 @@ discard block |
||
| 1224 | 1223 | (int) $post_folder_is_personal, |
| 1225 | 1224 | (int) $inputData['itemId'], |
| 1226 | 1225 | $encrypted_password_key, |
| 1227 | - true, // only for the item creator |
|
| 1228 | - true, // delete all |
|
| 1226 | + true, // only for the item creator |
|
| 1227 | + true, // delete all |
|
| 1229 | 1228 | ); |
| 1230 | 1229 | |
| 1231 | 1230 | // Create a task to create sharekeys for users |
| 1232 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1231 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1233 | 1232 | $tasksToBePerformed = ['item_password']; |
| 1234 | 1233 | $encryptionTaskIsRequested = true; |
| 1235 | 1234 | } else { |
@@ -1240,7 +1239,7 @@ discard block |
||
| 1240 | 1239 | // Get list of tags |
| 1241 | 1240 | $itemTags = DB::queryFirstColumn( |
| 1242 | 1241 | 'SELECT tag |
| 1243 | - FROM ' . prefixTable('tags') . ' |
|
| 1242 | + FROM ' . prefixTable('tags').' |
|
| 1244 | 1243 | WHERE item_id = %i', |
| 1245 | 1244 | $inputData['itemId'] |
| 1246 | 1245 | ); |
@@ -1286,7 +1285,7 @@ discard block |
||
| 1286 | 1285 | $session->get('user-id'), |
| 1287 | 1286 | 'at_modification', |
| 1288 | 1287 | $session->get('user-login'), |
| 1289 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1288 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1290 | 1289 | ); |
| 1291 | 1290 | } |
| 1292 | 1291 | |
@@ -1331,8 +1330,8 @@ discard block |
||
| 1331 | 1330 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1332 | 1331 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1333 | 1332 | c.masked AS masked, i.id AS field_item_id |
| 1334 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1335 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1333 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1334 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1336 | 1335 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1337 | 1336 | $field['id'], |
| 1338 | 1337 | $inputData['itemId'] |
@@ -1348,7 +1347,7 @@ discard block |
||
| 1348 | 1347 | // Perform new query |
| 1349 | 1348 | $dataTmpCat = DB::queryFirstRow( |
| 1350 | 1349 | 'SELECT id, title, encrypted_data, masked |
| 1351 | - FROM ' . prefixTable('categories') . ' |
|
| 1350 | + FROM ' . prefixTable('categories').' |
|
| 1352 | 1351 | WHERE id = %i', |
| 1353 | 1352 | $field['id'] |
| 1354 | 1353 | ); |
@@ -1378,8 +1377,8 @@ discard block |
||
| 1378 | 1377 | (int) $post_folder_is_personal, |
| 1379 | 1378 | (int) $newId, |
| 1380 | 1379 | $cryptedStuff['objectKey'], |
| 1381 | - true, // only for the item creator |
|
| 1382 | - true, // delete all |
|
| 1380 | + true, // only for the item creator |
|
| 1381 | + true, // delete all |
|
| 1383 | 1382 | ); |
| 1384 | 1383 | |
| 1385 | 1384 | // update value |
@@ -1429,7 +1428,7 @@ discard block |
||
| 1429 | 1428 | $session->get('user-id'), |
| 1430 | 1429 | 'at_modification', |
| 1431 | 1430 | $session->get('user-login'), |
| 1432 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1431 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1433 | 1432 | ); |
| 1434 | 1433 | } else { |
| 1435 | 1434 | // Case where the field already exists |
@@ -1438,7 +1437,7 @@ discard block |
||
| 1438 | 1437 | // Get user sharekey for this field |
| 1439 | 1438 | $userKey = DB::queryFirstRow( |
| 1440 | 1439 | 'SELECT share_key |
| 1441 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1440 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1442 | 1441 | WHERE user_id = %i AND object_id = %i', |
| 1443 | 1442 | $session->get('user-id'), |
| 1444 | 1443 | $dataTmpCat['field_item_id'] |
@@ -1477,8 +1476,8 @@ discard block |
||
| 1477 | 1476 | (int) $post_folder_is_personal, |
| 1478 | 1477 | (int) $dataTmpCat['field_item_id'], |
| 1479 | 1478 | $cryptedStuff['objectKey'], |
| 1480 | - true, // only for the item creator |
|
| 1481 | - true, // delete all |
|
| 1479 | + true, // only for the item creator |
|
| 1480 | + true, // delete all |
|
| 1482 | 1481 | ); |
| 1483 | 1482 | |
| 1484 | 1483 | if ($encryptedFieldIsChanged === false) { |
@@ -1520,7 +1519,7 @@ discard block |
||
| 1520 | 1519 | $session->get('user-id'), |
| 1521 | 1520 | 'at_modification', |
| 1522 | 1521 | $session->get('user-login'), |
| 1523 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1522 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1524 | 1523 | ); |
| 1525 | 1524 | } |
| 1526 | 1525 | } |
@@ -1574,7 +1573,7 @@ discard block |
||
| 1574 | 1573 | ) { |
| 1575 | 1574 | DB::queryFirstRow( |
| 1576 | 1575 | 'SELECT * |
| 1577 | - FROM ' . prefixTable('templates') . ' |
|
| 1576 | + FROM ' . prefixTable('templates').' |
|
| 1578 | 1577 | WHERE item_id = %i', |
| 1579 | 1578 | $inputData['itemId'] |
| 1580 | 1579 | ); |
@@ -1617,7 +1616,7 @@ discard block |
||
| 1617 | 1616 | // check if elem exists in Table. If not add it or update it. |
| 1618 | 1617 | DB::query( |
| 1619 | 1618 | 'SELECT * |
| 1620 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1619 | + FROM ' . prefixTable('automatic_del').' |
|
| 1621 | 1620 | WHERE item_id = %i', |
| 1622 | 1621 | $inputData['itemId'] |
| 1623 | 1622 | ); |
@@ -1644,7 +1643,7 @@ discard block |
||
| 1644 | 1643 | // Store updates performed |
| 1645 | 1644 | array_push( |
| 1646 | 1645 | $arrayOfChanges, |
| 1647 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1646 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1648 | 1647 | ); |
| 1649 | 1648 | |
| 1650 | 1649 | // update LOG |
@@ -1687,7 +1686,7 @@ discard block |
||
| 1687 | 1686 | // Store updates performed |
| 1688 | 1687 | array_push( |
| 1689 | 1688 | $arrayOfChanges, |
| 1690 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1689 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1691 | 1690 | ); |
| 1692 | 1691 | |
| 1693 | 1692 | // update LOG |
@@ -1715,7 +1714,7 @@ discard block |
||
| 1715 | 1714 | if (empty($userId) === false) { |
| 1716 | 1715 | $dataTmp = DB::queryFirstRow( |
| 1717 | 1716 | 'SELECT id, name, lastname |
| 1718 | - FROM ' . prefixTable('users') . ' |
|
| 1717 | + FROM ' . prefixTable('users').' |
|
| 1719 | 1718 | WHERE id= %i', |
| 1720 | 1719 | $userId |
| 1721 | 1720 | ); |
@@ -1723,7 +1722,7 @@ discard block |
||
| 1723 | 1722 | // Add to array |
| 1724 | 1723 | array_push( |
| 1725 | 1724 | $arrayOfUsersRestriction, |
| 1726 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1725 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1727 | 1726 | ); |
| 1728 | 1727 | array_push( |
| 1729 | 1728 | $arrayOfUsersIdRestriction, |
@@ -1754,8 +1753,8 @@ discard block |
||
| 1754 | 1753 | // get values before deleting them |
| 1755 | 1754 | $rows = DB::query( |
| 1756 | 1755 | 'SELECT t.title, t.id AS id |
| 1757 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1758 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1756 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1757 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1759 | 1758 | WHERE r.item_id = %i |
| 1760 | 1759 | ORDER BY t.title ASC', |
| 1761 | 1760 | $inputData['itemId'] |
@@ -1789,7 +1788,7 @@ discard block |
||
| 1789 | 1788 | ); |
| 1790 | 1789 | $dataTmp = DB::queryFirstRow( |
| 1791 | 1790 | 'SELECT title |
| 1792 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1791 | + FROM ' . prefixTable('roles_title').' |
|
| 1793 | 1792 | WHERE id = %i', |
| 1794 | 1793 | $role |
| 1795 | 1794 | ); |
@@ -1817,7 +1816,7 @@ discard block |
||
| 1817 | 1816 | // Get current status |
| 1818 | 1817 | $otpStatus = DB::queryFirstRow( |
| 1819 | 1818 | 'SELECT enabled as otp_is_enabled, phone_number, secret |
| 1820 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1819 | + FROM ' . prefixTable('items_otp').' |
|
| 1821 | 1820 | WHERE item_id = %i', |
| 1822 | 1821 | $inputData['itemId'] |
| 1823 | 1822 | ); |
@@ -1831,7 +1830,7 @@ discard block |
||
| 1831 | 1830 | 'decrypt' |
| 1832 | 1831 | )['string']; |
| 1833 | 1832 | } else { |
| 1834 | - $currentsecret=''; |
|
| 1833 | + $currentsecret = ''; |
|
| 1835 | 1834 | } |
| 1836 | 1835 | |
| 1837 | 1836 | // If OTP secret provided then encrypt it |
@@ -1881,7 +1880,7 @@ discard block |
||
| 1881 | 1880 | $session->get('user-id'), |
| 1882 | 1881 | 'at_modification', |
| 1883 | 1882 | $session->get('user-login'), |
| 1884 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1883 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1885 | 1884 | ); |
| 1886 | 1885 | } |
| 1887 | 1886 | if ($otpStatus['phone_number'] !== $post_otp_phone_number) { |
@@ -1892,7 +1891,7 @@ discard block |
||
| 1892 | 1891 | $session->get('user-id'), |
| 1893 | 1892 | 'at_modification', |
| 1894 | 1893 | $session->get('user-login'), |
| 1895 | - 'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number |
|
| 1894 | + 'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number |
|
| 1896 | 1895 | ); |
| 1897 | 1896 | } |
| 1898 | 1897 | if ($currentsecret !== $post_otp_secret) { |
@@ -1941,8 +1940,8 @@ discard block |
||
| 1941 | 1940 | $session->get('user-id'), |
| 1942 | 1941 | 'at_modification', |
| 1943 | 1942 | $session->get('user-login'), |
| 1944 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1945 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1943 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1944 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1946 | 1945 | ); |
| 1947 | 1946 | } |
| 1948 | 1947 | |
@@ -1962,7 +1961,7 @@ discard block |
||
| 1962 | 1961 | $session->get('user-id'), |
| 1963 | 1962 | 'at_modification', |
| 1964 | 1963 | $session->get('user-login'), |
| 1965 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1964 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1966 | 1965 | ); |
| 1967 | 1966 | } |
| 1968 | 1967 | // LOGIN |
@@ -1981,7 +1980,7 @@ discard block |
||
| 1981 | 1980 | $session->get('user-id'), |
| 1982 | 1981 | 'at_modification', |
| 1983 | 1982 | $session->get('user-login'), |
| 1984 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1983 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1985 | 1984 | ); |
| 1986 | 1985 | } |
| 1987 | 1986 | |
@@ -2000,7 +1999,7 @@ discard block |
||
| 2000 | 1999 | $session->get('user-id'), |
| 2001 | 2000 | 'at_modification', |
| 2002 | 2001 | $session->get('user-login'), |
| 2003 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 2002 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 2004 | 2003 | ); |
| 2005 | 2004 | } |
| 2006 | 2005 | // URL |
@@ -2019,7 +2018,7 @@ discard block |
||
| 2019 | 2018 | $session->get('user-id'), |
| 2020 | 2019 | 'at_modification', |
| 2021 | 2020 | $session->get('user-login'), |
| 2022 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 2021 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 2023 | 2022 | ); |
| 2024 | 2023 | } |
| 2025 | 2024 | // DESCRIPTION |
@@ -2045,7 +2044,7 @@ discard block |
||
| 2045 | 2044 | // FOLDER |
| 2046 | 2045 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 2047 | 2046 | // Get name of folders |
| 2048 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2047 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2049 | 2048 | |
| 2050 | 2049 | // Store updates performed |
| 2051 | 2050 | array_push( |
@@ -2061,7 +2060,7 @@ discard block |
||
| 2061 | 2060 | $session->get('user-id'), |
| 2062 | 2061 | 'at_modification', |
| 2063 | 2062 | $session->get('user-login'), |
| 2064 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 2063 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 2065 | 2064 | ); |
| 2066 | 2065 | } |
| 2067 | 2066 | // ANYONE_CAN_MODIFY |
@@ -2069,7 +2068,7 @@ discard block |
||
| 2069 | 2068 | // Store updates performed |
| 2070 | 2069 | array_push( |
| 2071 | 2070 | $arrayOfChanges, |
| 2072 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2071 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2073 | 2072 | ); |
| 2074 | 2073 | |
| 2075 | 2074 | // Log |
@@ -2080,15 +2079,15 @@ discard block |
||
| 2080 | 2079 | $session->get('user-id'), |
| 2081 | 2080 | 'at_modification', |
| 2082 | 2081 | $session->get('user-login'), |
| 2083 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2082 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2084 | 2083 | ); |
| 2085 | 2084 | } |
| 2086 | 2085 | |
| 2087 | 2086 | // Reload new values |
| 2088 | 2087 | $dataItem = DB::queryFirstRow( |
| 2089 | 2088 | 'SELECT * |
| 2090 | - FROM ' . prefixTable('items') . ' as i |
|
| 2091 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2089 | + FROM ' . prefixTable('items').' as i |
|
| 2090 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2092 | 2091 | WHERE i.id = %i AND l.action = %s', |
| 2093 | 2092 | $inputData['itemId'], |
| 2094 | 2093 | 'at_creation' |
@@ -2097,8 +2096,8 @@ discard block |
||
| 2097 | 2096 | $history = ''; |
| 2098 | 2097 | $rows = DB::query( |
| 2099 | 2098 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2100 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2101 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2099 | + FROM ' . prefixTable('log_items').' as l |
|
| 2100 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2102 | 2101 | WHERE l.action <> %s AND id_item=%s', |
| 2103 | 2102 | 'at_shown', |
| 2104 | 2103 | $inputData['itemId'] |
@@ -2107,14 +2106,14 @@ discard block |
||
| 2107 | 2106 | if ($record['raison'] === NULL) continue; |
| 2108 | 2107 | $reason = explode(':', $record['raison']); |
| 2109 | 2108 | if (count($reason) > 0) { |
| 2110 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2111 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2112 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2109 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2110 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2111 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2113 | 2112 | : $lang->get(trim($reason[0]))) : ''); |
| 2114 | 2113 | if (empty($history)) { |
| 2115 | 2114 | $history = $sentence; |
| 2116 | 2115 | } else { |
| 2117 | - $history .= '<br />' . $sentence; |
|
| 2116 | + $history .= '<br />'.$sentence; |
|
| 2118 | 2117 | } |
| 2119 | 2118 | } |
| 2120 | 2119 | } |
@@ -2252,7 +2251,7 @@ discard block |
||
| 2252 | 2251 | ) { |
| 2253 | 2252 | // load the original record into an array |
| 2254 | 2253 | $originalRecord = DB::queryFirstRow( |
| 2255 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2254 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2256 | 2255 | WHERE id = %i', |
| 2257 | 2256 | $inputData['itemId'] |
| 2258 | 2257 | ); |
@@ -2271,7 +2270,7 @@ discard block |
||
| 2271 | 2270 | |
| 2272 | 2271 | // Load the destination folder record into an array |
| 2273 | 2272 | $dataDestination = DB::queryFirstRow( |
| 2274 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2273 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2275 | 2274 | WHERE id = %i', |
| 2276 | 2275 | $post_dest_id |
| 2277 | 2276 | ); |
@@ -2279,7 +2278,7 @@ discard block |
||
| 2279 | 2278 | // Get the ITEM object key for the user |
| 2280 | 2279 | $userKey = DB::queryFirstRow( |
| 2281 | 2280 | 'SELECT share_key |
| 2282 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2281 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2283 | 2282 | WHERE user_id = %i AND object_id = %i', |
| 2284 | 2283 | $session->get('user-id'), |
| 2285 | 2284 | $inputData['itemId'] |
@@ -2356,8 +2355,8 @@ discard block |
||
| 2356 | 2355 | // Manage Custom Fields |
| 2357 | 2356 | $rows = DB::query( |
| 2358 | 2357 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2359 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2360 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2358 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2359 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2361 | 2360 | WHERE ci.item_id = %i', |
| 2362 | 2361 | $inputData['itemId'] |
| 2363 | 2362 | ); |
@@ -2369,7 +2368,7 @@ discard block |
||
| 2369 | 2368 | // Get user key |
| 2370 | 2369 | $userKey = DB::queryFirstRow( |
| 2371 | 2370 | 'SELECT share_key |
| 2372 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2371 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2373 | 2372 | WHERE user_id = %i AND object_id = %i', |
| 2374 | 2373 | $session->get('user-id'), |
| 2375 | 2374 | $field['id'] |
@@ -2436,15 +2435,15 @@ discard block |
||
| 2436 | 2435 | $rows = DB::query( |
| 2437 | 2436 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2438 | 2437 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2439 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2440 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2438 | + FROM ' . prefixTable('files').' AS f |
|
| 2439 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2441 | 2440 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2442 | 2441 | $session->get('user-id'), |
| 2443 | 2442 | $inputData['itemId'] |
| 2444 | 2443 | ); |
| 2445 | 2444 | foreach ($rows as $record) { |
| 2446 | 2445 | // Check if file still exists |
| 2447 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2446 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2448 | 2447 | // Step1 - decrypt the file |
| 2449 | 2448 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2450 | 2449 | $fileContent = decryptFile( |
@@ -2455,8 +2454,8 @@ discard block |
||
| 2455 | 2454 | |
| 2456 | 2455 | // Step2 - create file |
| 2457 | 2456 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2458 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2459 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2457 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2458 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2460 | 2459 | if ($outstream === false) { |
| 2461 | 2460 | echo prepareExchangedData( |
| 2462 | 2461 | array( |
@@ -2529,7 +2528,7 @@ discard block |
||
| 2529 | 2528 | |
| 2530 | 2529 | // ------------------------- |
| 2531 | 2530 | // Add specific restrictions |
| 2532 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2531 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2533 | 2532 | foreach ($rows as $record) { |
| 2534 | 2533 | DB::insert( |
| 2535 | 2534 | prefixTable('restriction_to_roles'), |
@@ -2541,7 +2540,7 @@ discard block |
||
| 2541 | 2540 | } |
| 2542 | 2541 | |
| 2543 | 2542 | // Add Tags |
| 2544 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2543 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2545 | 2544 | foreach ($rows as $record) { |
| 2546 | 2545 | DB::insert( |
| 2547 | 2546 | prefixTable('tags'), |
@@ -2643,7 +2642,7 @@ discard block |
||
| 2643 | 2642 | // then we can show it |
| 2644 | 2643 | $item_deleted = DB::queryFirstRow( |
| 2645 | 2644 | 'SELECT * |
| 2646 | - FROM ' . prefixTable('log_items') . ' |
|
| 2645 | + FROM ' . prefixTable('log_items').' |
|
| 2647 | 2646 | WHERE id_item = %i AND action = %s |
| 2648 | 2647 | ORDER BY date DESC |
| 2649 | 2648 | LIMIT 0, 1', |
@@ -2654,7 +2653,7 @@ discard block |
||
| 2654 | 2653 | |
| 2655 | 2654 | $item_restored = DB::queryFirstRow( |
| 2656 | 2655 | 'SELECT * |
| 2657 | - FROM ' . prefixTable('log_items') . ' |
|
| 2656 | + FROM ' . prefixTable('log_items').' |
|
| 2658 | 2657 | WHERE id_item = %i AND action = %s |
| 2659 | 2658 | ORDER BY date DESC |
| 2660 | 2659 | LIMIT 0, 1', |
@@ -2678,8 +2677,8 @@ discard block |
||
| 2678 | 2677 | // Get all informations for this item |
| 2679 | 2678 | $dataItem = DB::queryFirstRow( |
| 2680 | 2679 | 'SELECT * |
| 2681 | - FROM ' . prefixTable('items') . ' as i |
|
| 2682 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2680 | + FROM ' . prefixTable('items').' as i |
|
| 2681 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2683 | 2682 | WHERE i.id = %i AND l.action = %s', |
| 2684 | 2683 | $inputData['id'], |
| 2685 | 2684 | 'at_creation' |
@@ -2688,7 +2687,7 @@ discard block |
||
| 2688 | 2687 | // Notification |
| 2689 | 2688 | DB::queryFirstRow( |
| 2690 | 2689 | 'SELECT * |
| 2691 | - FROM ' . prefixTable('notification') . ' |
|
| 2690 | + FROM ' . prefixTable('notification').' |
|
| 2692 | 2691 | WHERE item_id = %i AND user_id = %i', |
| 2693 | 2692 | $inputData['id'], |
| 2694 | 2693 | $session->get('user-id') |
@@ -2707,7 +2706,7 @@ discard block |
||
| 2707 | 2706 | |
| 2708 | 2707 | // manage case of API user |
| 2709 | 2708 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2710 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2709 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2711 | 2710 | $arrData['id_user'] = API_USER_ID; |
| 2712 | 2711 | $arrData['author_email'] = ''; |
| 2713 | 2712 | $arrData['notification_status'] = false; |
@@ -2717,7 +2716,7 @@ discard block |
||
| 2717 | 2716 | $tags = array(); |
| 2718 | 2717 | $rows = DB::query( |
| 2719 | 2718 | 'SELECT tag |
| 2720 | - FROM ' . prefixTable('tags') . ' |
|
| 2719 | + FROM ' . prefixTable('tags').' |
|
| 2721 | 2720 | WHERE item_id = %i', |
| 2722 | 2721 | $inputData['id'] |
| 2723 | 2722 | ); |
@@ -2741,7 +2740,7 @@ discard block |
||
| 2741 | 2740 | // Check if user has a role that is accepted |
| 2742 | 2741 | $rows_tmp = DB::query( |
| 2743 | 2742 | 'SELECT role_id |
| 2744 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2743 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2745 | 2744 | WHERE item_id=%i', |
| 2746 | 2745 | $inputData['id'] |
| 2747 | 2746 | ); |
@@ -2755,7 +2754,7 @@ discard block |
||
| 2755 | 2754 | // Get the object key for the user |
| 2756 | 2755 | $userKeys = DB::query( |
| 2757 | 2756 | 'SELECT share_key |
| 2758 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2757 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2759 | 2758 | WHERE user_id = %i AND object_id = %i', |
| 2760 | 2759 | $session->get('user-id'), |
| 2761 | 2760 | $inputData['id'] |
@@ -2868,8 +2867,8 @@ discard block |
||
| 2868 | 2867 | // Add restriction if item is restricted to roles |
| 2869 | 2868 | $rows = DB::query( |
| 2870 | 2869 | 'SELECT t.title, t.id |
| 2871 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2872 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2870 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2871 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2873 | 2872 | WHERE r.item_id = %i |
| 2874 | 2873 | ORDER BY t.title ASC', |
| 2875 | 2874 | $inputData['id'] |
@@ -2885,8 +2884,8 @@ discard block |
||
| 2885 | 2884 | $tmp = array(); |
| 2886 | 2885 | $rows = DB::query( |
| 2887 | 2886 | 'SELECT k.label, k.id |
| 2888 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2889 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2887 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2888 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2890 | 2889 | WHERE i.item_id = %i |
| 2891 | 2890 | ORDER BY k.label ASC', |
| 2892 | 2891 | $inputData['id'] |
@@ -2969,7 +2968,7 @@ discard block |
||
| 2969 | 2968 | $arrCatList = array(); |
| 2970 | 2969 | $rows_tmp = DB::query( |
| 2971 | 2970 | 'SELECT id_category |
| 2972 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2971 | + FROM ' . prefixTable('categories_folders').' |
|
| 2973 | 2972 | WHERE id_folder=%i', |
| 2974 | 2973 | $inputData['folderId'] |
| 2975 | 2974 | ); |
@@ -2984,8 +2983,8 @@ discard block |
||
| 2984 | 2983 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2985 | 2984 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2986 | 2985 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2987 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2988 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2986 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2987 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2989 | 2988 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2990 | 2989 | $inputData['id'], |
| 2991 | 2990 | $arrCatList |
@@ -2996,7 +2995,7 @@ discard block |
||
| 2996 | 2995 | //db::debugmode(true); |
| 2997 | 2996 | $userKey = DB::queryFirstRow( |
| 2998 | 2997 | 'SELECT share_key |
| 2999 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2998 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 3000 | 2999 | WHERE user_id = %i AND object_id = %i', |
| 3001 | 3000 | $session->get('user-id'), |
| 3002 | 3001 | $row['id'] |
@@ -3014,7 +3013,7 @@ discard block |
||
| 3014 | 3013 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 3015 | 3014 | // Data is not encrypted in DB |
| 3016 | 3015 | $fieldText = [ |
| 3017 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 3016 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 3018 | 3017 | 'encrypted' => false, |
| 3019 | 3018 | 'error' => false, |
| 3020 | 3019 | ]; |
@@ -3059,7 +3058,7 @@ discard block |
||
| 3059 | 3058 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 3060 | 3059 | $rows_tmp = DB::queryFirstRow( |
| 3061 | 3060 | 'SELECT category_id |
| 3062 | - FROM ' . prefixTable('templates') . ' |
|
| 3061 | + FROM ' . prefixTable('templates').' |
|
| 3063 | 3062 | WHERE item_id = %i', |
| 3064 | 3063 | $inputData['id'] |
| 3065 | 3064 | ); |
@@ -3076,7 +3075,7 @@ discard block |
||
| 3076 | 3075 | // Evaluate if item is ready for all users |
| 3077 | 3076 | $rows_tmp = DB::queryFirstRow( |
| 3078 | 3077 | 'SELECT finished_at |
| 3079 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3078 | + FROM ' . prefixTable('background_tasks').' |
|
| 3080 | 3079 | WHERE item_id = %i', |
| 3081 | 3080 | $inputData['id'] |
| 3082 | 3081 | ); |
@@ -3093,7 +3092,7 @@ discard block |
||
| 3093 | 3092 | // Is the Item to be deleted? |
| 3094 | 3093 | $dataDelete = DB::queryFirstRow( |
| 3095 | 3094 | 'SELECT * |
| 3096 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3095 | + FROM ' . prefixTable('automatic_del').' |
|
| 3097 | 3096 | WHERE item_id = %i', |
| 3098 | 3097 | $inputData['id'] |
| 3099 | 3098 | ); |
@@ -3174,14 +3173,14 @@ discard block |
||
| 3174 | 3173 | if (empty($userRest) === false) { |
| 3175 | 3174 | $dataTmp = DB::queryFirstRow( |
| 3176 | 3175 | 'SELECT login |
| 3177 | - FROM ' . prefixTable('users') . ' |
|
| 3176 | + FROM ' . prefixTable('users').' |
|
| 3178 | 3177 | WHERE id= %i', |
| 3179 | 3178 | $userRest |
| 3180 | 3179 | ); |
| 3181 | 3180 | if (empty($listOfRestricted)) { |
| 3182 | 3181 | $listOfRestricted = $dataTmp['login']; |
| 3183 | 3182 | } else { |
| 3184 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3183 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3185 | 3184 | } |
| 3186 | 3185 | } |
| 3187 | 3186 | } |
@@ -3255,9 +3254,9 @@ discard block |
||
| 3255 | 3254 | // Load item data |
| 3256 | 3255 | $dataItem = DB::queryFirstRow( |
| 3257 | 3256 | 'SELECT i.*, n.title AS folder_title, o.enabled AS otp_for_item_enabled, o.phone_number AS otp_phone_number, o.secret AS otp_secret |
| 3258 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3259 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3260 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3257 | + FROM ' . prefixTable('items').' AS i |
|
| 3258 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3259 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3261 | 3260 | WHERE i.id = %i', |
| 3262 | 3261 | $inputData['id'] |
| 3263 | 3262 | ); |
@@ -3279,7 +3278,7 @@ discard block |
||
| 3279 | 3278 | // Check if user has a role that is accepted |
| 3280 | 3279 | $rows_tmp = DB::query( |
| 3281 | 3280 | 'SELECT role_id |
| 3282 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3281 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3283 | 3282 | WHERE item_id=%i', |
| 3284 | 3283 | $inputData['id'] |
| 3285 | 3284 | ); |
@@ -3311,12 +3310,12 @@ discard block |
||
| 3311 | 3310 | // launch query |
| 3312 | 3311 | $rows = DB::query( |
| 3313 | 3312 | 'SELECT id, name, file, extension, size |
| 3314 | - FROM ' . prefixTable('files') . ' |
|
| 3313 | + FROM ' . prefixTable('files').' |
|
| 3315 | 3314 | WHERE id_item = %i AND confirmed = 1', |
| 3316 | 3315 | $inputData['id'] |
| 3317 | 3316 | ); |
| 3318 | 3317 | foreach ($rows as $record) { |
| 3319 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3318 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3320 | 3319 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3321 | 3320 | |
| 3322 | 3321 | array_push( |
@@ -3329,7 +3328,7 @@ discard block |
||
| 3329 | 3328 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3330 | 3329 | 'id' => $record['id'], |
| 3331 | 3330 | 'key' => $session->get('user-key_tmp'), |
| 3332 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3331 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3333 | 3332 | ) |
| 3334 | 3333 | ); |
| 3335 | 3334 | } |
@@ -3371,8 +3370,8 @@ discard block |
||
| 3371 | 3370 | $listOptionsForRoles = array(); |
| 3372 | 3371 | $rows = DB::query( |
| 3373 | 3372 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3374 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3375 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3373 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3374 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3376 | 3375 | WHERE r.folder_id = %i', |
| 3377 | 3376 | $dataItem['id_tree'] |
| 3378 | 3377 | ); |
@@ -3386,8 +3385,8 @@ discard block |
||
| 3386 | 3385 | ); |
| 3387 | 3386 | $rows2 = DB::query( |
| 3388 | 3387 | 'SELECT DISTINCT u.id, u.login, u.email, u.name, u.lastname, ur.role_id AS fonction_id |
| 3389 | - FROM ' . prefixTable('users') . ' AS u |
|
| 3390 | - INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id) |
|
| 3388 | + FROM ' . prefixTable('users').' AS u |
|
| 3389 | + INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id) |
|
| 3391 | 3390 | WHERE ur.role_id = %i AND ur.source = %s', |
| 3392 | 3391 | $record['role_id'], |
| 3393 | 3392 | 'manual' |
@@ -3404,7 +3403,7 @@ discard block |
||
| 3404 | 3403 | array( |
| 3405 | 3404 | 'id' => (int) $record2['id'], |
| 3406 | 3405 | 'login' => $record2['login'], |
| 3407 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3406 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3408 | 3407 | 'email' => $record2['email'], |
| 3409 | 3408 | ) |
| 3410 | 3409 | ); |
@@ -3423,16 +3422,16 @@ discard block |
||
| 3423 | 3422 | $path = ''; |
| 3424 | 3423 | foreach ($arbo as $elem) { |
| 3425 | 3424 | if (empty($path) === true) { |
| 3426 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3425 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3427 | 3426 | } else { |
| 3428 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3427 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3429 | 3428 | } |
| 3430 | 3429 | } |
| 3431 | 3430 | // Build text to show user |
| 3432 | 3431 | if (empty($path) === true) { |
| 3433 | 3432 | $path = addslashes($dataItem['label']); |
| 3434 | 3433 | } else { |
| 3435 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3434 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3436 | 3435 | } |
| 3437 | 3436 | |
| 3438 | 3437 | // Add Admins to notification list if expected |
@@ -3455,7 +3454,7 @@ discard block |
||
| 3455 | 3454 | array( |
| 3456 | 3455 | addslashes($session->get('user-login')), |
| 3457 | 3456 | $path, |
| 3458 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3457 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3459 | 3458 | ), |
| 3460 | 3459 | $lang->get('email_on_open_notification_mail') |
| 3461 | 3460 | ), |
@@ -3465,7 +3464,7 @@ discard block |
||
| 3465 | 3464 | } |
| 3466 | 3465 | |
| 3467 | 3466 | // has this item a change proposal |
| 3468 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3467 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3469 | 3468 | $returnArray['has_change_proposal'] = DB::count(); |
| 3470 | 3469 | |
| 3471 | 3470 | // Setting |
@@ -3476,7 +3475,7 @@ discard block |
||
| 3476 | 3475 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3477 | 3476 | DB::query( |
| 3478 | 3477 | 'SELECT * |
| 3479 | - FROM ' . prefixTable('otv') . ' |
|
| 3478 | + FROM ' . prefixTable('otv').' |
|
| 3480 | 3479 | WHERE item_id = %i |
| 3481 | 3480 | AND time_limit > %i', |
| 3482 | 3481 | $inputData['id'], |
@@ -3575,7 +3574,7 @@ discard block |
||
| 3575 | 3574 | // Load item data |
| 3576 | 3575 | $data = DB::queryFirstRow( |
| 3577 | 3576 | 'SELECT id_tree, id, label |
| 3578 | - FROM ' . prefixTable('items') . ' |
|
| 3577 | + FROM ' . prefixTable('items').' |
|
| 3579 | 3578 | WHERE id = %i OR item_key = %s', |
| 3580 | 3579 | $inputData['itemId'], |
| 3581 | 3580 | $inputData['itemKey'] |
@@ -3666,7 +3665,7 @@ discard block |
||
| 3666 | 3665 | // Load item data |
| 3667 | 3666 | $dataItem = DB::queryFirstRow( |
| 3668 | 3667 | 'SELECT secret, enabled |
| 3669 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3668 | + FROM ' . prefixTable('items_otp').' |
|
| 3670 | 3669 | WHERE item_id = %i', |
| 3671 | 3670 | $inputData['id'] |
| 3672 | 3671 | ); |
@@ -3748,13 +3747,13 @@ discard block |
||
| 3748 | 3747 | |
| 3749 | 3748 | // Check if user is allowed to access this folder |
| 3750 | 3749 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3751 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3750 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3752 | 3751 | break; |
| 3753 | 3752 | } |
| 3754 | 3753 | |
| 3755 | 3754 | // Check if title doesn't contains html codes |
| 3756 | 3755 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3757 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3756 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3758 | 3757 | break; |
| 3759 | 3758 | } |
| 3760 | 3759 | // check that title is not numeric |
@@ -3765,9 +3764,9 @@ discard block |
||
| 3765 | 3764 | |
| 3766 | 3765 | // Check if duplicate folders name are allowed |
| 3767 | 3766 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3768 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3767 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3769 | 3768 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3770 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3769 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3771 | 3770 | break; |
| 3772 | 3771 | } |
| 3773 | 3772 | } |
@@ -3775,7 +3774,7 @@ discard block |
||
| 3775 | 3774 | // query on folder |
| 3776 | 3775 | $data = DB::queryFirstRow( |
| 3777 | 3776 | 'SELECT parent_id, personal_folder |
| 3778 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3777 | + FROM ' . prefixTable('nested_tree').' |
|
| 3779 | 3778 | WHERE id = %i', |
| 3780 | 3779 | $inputData['folderId'] |
| 3781 | 3780 | ); |
@@ -3785,20 +3784,20 @@ discard block |
||
| 3785 | 3784 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3786 | 3785 | $data = DB::queryFirstRow( |
| 3787 | 3786 | 'SELECT valeur |
| 3788 | - FROM ' . prefixTable('misc') . ' |
|
| 3787 | + FROM ' . prefixTable('misc').' |
|
| 3789 | 3788 | WHERE intitule = %i AND type = %s', |
| 3790 | 3789 | $data['parent_id'], |
| 3791 | 3790 | 'complex' |
| 3792 | 3791 | ); |
| 3793 | 3792 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3794 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3793 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3795 | 3794 | break; |
| 3796 | 3795 | } |
| 3797 | 3796 | } |
| 3798 | 3797 | |
| 3799 | 3798 | // update Folders table |
| 3800 | 3799 | $tmp = DB::queryFirstRow( |
| 3801 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3800 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3802 | 3801 | $dataReceived['folder'] |
| 3803 | 3802 | ); |
| 3804 | 3803 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3912,7 +3911,7 @@ discard block |
||
| 3912 | 3911 | $uniqueLoadData['path'] = $arr_arbo; |
| 3913 | 3912 | |
| 3914 | 3913 | // store last folder accessed in cookie |
| 3915 | - $arr_cookie_options = array ( |
|
| 3914 | + $arr_cookie_options = array( |
|
| 3916 | 3915 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3917 | 3916 | 'path' => '/', |
| 3918 | 3917 | 'secure' => true, |
@@ -3927,7 +3926,7 @@ discard block |
||
| 3927 | 3926 | foreach ($session->get('user-roles_array') as $role) { |
| 3928 | 3927 | $roleQ = DB::queryFirstRow( |
| 3929 | 3928 | 'SELECT allow_pw_change |
| 3930 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3929 | + FROM ' . prefixTable('roles_title').' |
|
| 3931 | 3930 | WHERE id = %i', |
| 3932 | 3931 | $role |
| 3933 | 3932 | ); |
@@ -3958,11 +3957,11 @@ discard block |
||
| 3958 | 3957 | |
| 3959 | 3958 | foreach ($session->get('user-roles_array') as $role) { |
| 3960 | 3959 | $access = DB::queryFirstRow( |
| 3961 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3960 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3962 | 3961 | $role, |
| 3963 | 3962 | $inputData['id'] |
| 3964 | 3963 | ); |
| 3965 | - if (DB::count()>0) { |
|
| 3964 | + if (DB::count() > 0) { |
|
| 3966 | 3965 | if ($access['type'] === 'R') { |
| 3967 | 3966 | array_push($arrTmp, 10); |
| 3968 | 3967 | } elseif ($access['type'] === 'W') { |
@@ -4027,7 +4026,7 @@ discard block |
||
| 4027 | 4026 | } else { |
| 4028 | 4027 | DB::query( |
| 4029 | 4028 | 'SELECT * |
| 4030 | - FROM ' . prefixTable('items') . ' |
|
| 4029 | + FROM ' . prefixTable('items').' |
|
| 4031 | 4030 | WHERE inactif = %i', |
| 4032 | 4031 | 0 |
| 4033 | 4032 | ); |
@@ -4037,7 +4036,7 @@ discard block |
||
| 4037 | 4036 | |
| 4038 | 4037 | // Get folder complexity |
| 4039 | 4038 | $folderComplexity = DB::queryFirstRow( |
| 4040 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4039 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4041 | 4040 | 'complex', |
| 4042 | 4041 | $inputData['id'] |
| 4043 | 4042 | ); |
@@ -4049,7 +4048,7 @@ discard block |
||
| 4049 | 4048 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4050 | 4049 | $folderRow = DB::query( |
| 4051 | 4050 | 'SELECT id_category |
| 4052 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4051 | + FROM ' . prefixTable('categories_folders').' |
|
| 4053 | 4052 | WHERE id_folder = %i', |
| 4054 | 4053 | $inputData['id'] |
| 4055 | 4054 | ); |
@@ -4105,8 +4104,8 @@ discard block |
||
| 4105 | 4104 | $where->add('i.inactif=%i', 0); |
| 4106 | 4105 | $where->add('i.deleted_at IS NULL'); |
| 4107 | 4106 | |
| 4108 | - $query_limit = ' LIMIT ' . |
|
| 4109 | - $start . ',' . |
|
| 4107 | + $query_limit = ' LIMIT '. |
|
| 4108 | + $start.','. |
|
| 4110 | 4109 | $post_nb_items_to_display_once; |
| 4111 | 4110 | |
| 4112 | 4111 | $rows = DB::query( |
@@ -4114,8 +4113,8 @@ discard block |
||
| 4114 | 4113 | i.label, i.description, i.pw, i.login, |
| 4115 | 4114 | i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon, |
| 4116 | 4115 | n.renewal_period, i.url AS link, i.email |
| 4117 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4118 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4116 | + FROM ' . prefixTable('items').' AS i |
|
| 4117 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4119 | 4118 | WHERE %l |
| 4120 | 4119 | ORDER BY i.label ASC' . $query_limit, |
| 4121 | 4120 | $where |
@@ -4129,8 +4128,8 @@ discard block |
||
| 4129 | 4128 | i.label, i.description, i.pw, i.login, |
| 4130 | 4129 | i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon, |
| 4131 | 4130 | n.renewal_period, i.url AS link, i.email |
| 4132 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4133 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4131 | + FROM ' . prefixTable('items').' AS i |
|
| 4132 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4134 | 4133 | WHERE %l |
| 4135 | 4134 | ORDER BY i.label ASC', |
| 4136 | 4135 | $where |
@@ -4160,7 +4159,7 @@ discard block |
||
| 4160 | 4159 | $item_is_restricted_to_role = false; |
| 4161 | 4160 | DB::queryFirstRow( |
| 4162 | 4161 | 'SELECT role_id |
| 4163 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4162 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4164 | 4163 | WHERE item_id = %i', |
| 4165 | 4164 | $record['id'] |
| 4166 | 4165 | ); |
@@ -4172,7 +4171,7 @@ discard block |
||
| 4172 | 4171 | $user_is_included_in_role = false; |
| 4173 | 4172 | DB::query( |
| 4174 | 4173 | 'SELECT role_id |
| 4175 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4174 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4176 | 4175 | WHERE item_id = %i AND role_id IN %ls', |
| 4177 | 4176 | $record['id'], |
| 4178 | 4177 | $session->get('user-roles_array') |
@@ -4197,12 +4196,12 @@ discard block |
||
| 4197 | 4196 | } |
| 4198 | 4197 | |
| 4199 | 4198 | // Get Expiration date |
| 4200 | - $sql='SELECT date FROM ' . prefixTable('log_items') |
|
| 4201 | - . " WHERE action = 'at_creation' AND id_item=" . $record['id'] |
|
| 4202 | - . ' union all SELECT date FROM '. prefixTable('log_items') |
|
| 4199 | + $sql = 'SELECT date FROM '.prefixTable('log_items') |
|
| 4200 | + . " WHERE action = 'at_creation' AND id_item=".$record['id'] |
|
| 4201 | + . ' union all SELECT date FROM '.prefixTable('log_items') |
|
| 4203 | 4202 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
| 4204 | - AND id_item=" . $record['id'] . " ORDER BY date DESC LIMIT 1"; |
|
| 4205 | - $record['date']=DB::queryFirstRow($sql)['date']; |
|
| 4203 | + AND id_item=" . $record['id']." ORDER BY date DESC LIMIT 1"; |
|
| 4204 | + $record['date'] = DB::queryFirstRow($sql)['date']; |
|
| 4206 | 4205 | $expired_item = 0; |
| 4207 | 4206 | if ( |
| 4208 | 4207 | (int) $SETTINGS['activate_expiration'] === 1 |
@@ -4388,8 +4387,8 @@ discard block |
||
| 4388 | 4387 | if ((int) $start === 0) { |
| 4389 | 4388 | DB::query( |
| 4390 | 4389 | 'SELECT i.id |
| 4391 | - FROM ' . prefixTable('items') . ' as i |
|
| 4392 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4390 | + FROM ' . prefixTable('items').' as i |
|
| 4391 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4393 | 4392 | WHERE %l', |
| 4394 | 4393 | $where |
| 4395 | 4394 | ); |
@@ -4449,8 +4448,8 @@ discard block |
||
| 4449 | 4448 | $dataItem = DB::queryFirstRow( |
| 4450 | 4449 | 'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id, |
| 4451 | 4450 | i.label AS label, i.id_tree AS id_tree |
| 4452 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4453 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4451 | + FROM ' . prefixTable('items').' AS i |
|
| 4452 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4454 | 4453 | WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)', |
| 4455 | 4454 | $session->get('user-id'), |
| 4456 | 4455 | $inputData['itemKey'] ?? '', |
@@ -4562,7 +4561,7 @@ discard block |
||
| 4562 | 4561 | // do query on this folder |
| 4563 | 4562 | $data_this_folder = DB::queryFirstRow( |
| 4564 | 4563 | 'SELECT id, personal_folder, title |
| 4565 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4564 | + FROM ' . prefixTable('nested_tree').' |
|
| 4566 | 4565 | WHERE id = %s', |
| 4567 | 4566 | $inputData['folderId'] |
| 4568 | 4567 | ); |
@@ -4602,8 +4601,8 @@ discard block |
||
| 4602 | 4601 | $visibilite = ''; |
| 4603 | 4602 | $data = DB::queryFirstRow( |
| 4604 | 4603 | 'SELECT m.valeur, n.personal_folder |
| 4605 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4606 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4604 | + FROM ' . prefixTable('misc').' AS m |
|
| 4605 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4607 | 4606 | WHERE type=%s AND intitule = %s', |
| 4608 | 4607 | 'complex', |
| 4609 | 4608 | $inputData['folderId'] |
@@ -4616,8 +4615,8 @@ discard block |
||
| 4616 | 4615 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4617 | 4616 | $rows = DB::query( |
| 4618 | 4617 | 'SELECT t.title |
| 4619 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4620 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4618 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4619 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4621 | 4620 | WHERE v.folder_id = %i |
| 4622 | 4621 | GROUP BY title', |
| 4623 | 4622 | $inputData['folderId'] |
@@ -4626,7 +4625,7 @@ discard block |
||
| 4626 | 4625 | if (empty($visibilite)) { |
| 4627 | 4626 | $visibilite = $record['title']; |
| 4628 | 4627 | } else { |
| 4629 | - $visibilite .= ' - ' . $record['title']; |
|
| 4628 | + $visibilite .= ' - '.$record['title']; |
|
| 4630 | 4629 | } |
| 4631 | 4630 | } |
| 4632 | 4631 | } else { |
@@ -4636,14 +4635,14 @@ discard block |
||
| 4636 | 4635 | // do new query to know if current folder is pf |
| 4637 | 4636 | $data_pf = DB::queryFirstRow( |
| 4638 | 4637 | 'SELECT personal_folder |
| 4639 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4638 | + FROM ' . prefixTable('nested_tree').' |
|
| 4640 | 4639 | WHERE id = %s', |
| 4641 | 4640 | $inputData['folderId'] |
| 4642 | 4641 | ); |
| 4643 | 4642 | |
| 4644 | 4643 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4645 | 4644 | |
| 4646 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4645 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4647 | 4646 | } |
| 4648 | 4647 | |
| 4649 | 4648 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4653,8 +4652,8 @@ discard block |
||
| 4653 | 4652 | $listOptionsForRoles = array(); |
| 4654 | 4653 | $rows = DB::query( |
| 4655 | 4654 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4656 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4657 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4655 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4656 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4658 | 4657 | WHERE r.folder_id = %i', |
| 4659 | 4658 | $inputData['folderId'] |
| 4660 | 4659 | ); |
@@ -4669,8 +4668,8 @@ discard block |
||
| 4669 | 4668 | $rows2 = DB::query( |
| 4670 | 4669 | 'SELECT u.id, u.login, u.email, u.name, u.lastname, |
| 4671 | 4670 | GROUP_CONCAT(DISTINCT ur.role_id ORDER BY ur.role_id SEPARATOR ";") AS fonction_id |
| 4672 | - FROM ' . prefixTable('users') . ' AS u |
|
| 4673 | - INNER JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id) |
|
| 4671 | + FROM ' . prefixTable('users').' AS u |
|
| 4672 | + INNER JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id) |
|
| 4674 | 4673 | WHERE u.admin = 0 AND ur.source = %s |
| 4675 | 4674 | GROUP BY u.id', |
| 4676 | 4675 | 'manual' |
@@ -4686,7 +4685,7 @@ discard block |
||
| 4686 | 4685 | array( |
| 4687 | 4686 | 'id' => $record2['id'], |
| 4688 | 4687 | 'login' => $record2['login'], |
| 4689 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4688 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4690 | 4689 | 'email' => $record2['email'], |
| 4691 | 4690 | ) |
| 4692 | 4691 | ); |
@@ -4703,12 +4702,12 @@ discard block |
||
| 4703 | 4702 | foreach ($session->get('user-roles_array') as $role) { |
| 4704 | 4703 | $access = DB::queryFirstRow( |
| 4705 | 4704 | 'SELECT type |
| 4706 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4705 | + FROM ' . prefixTable('roles_values').' |
|
| 4707 | 4706 | WHERE role_id = %i AND folder_id = %i', |
| 4708 | 4707 | $role, |
| 4709 | 4708 | $inputData['folderId'] |
| 4710 | 4709 | ); |
| 4711 | - if (DB::count()>0) { |
|
| 4710 | + if (DB::count() > 0) { |
|
| 4712 | 4711 | if ($access['type'] === 'R') { |
| 4713 | 4712 | array_push($arrTmp, 10); |
| 4714 | 4713 | } elseif ($access['type'] === 'W') { |
@@ -4736,7 +4735,7 @@ discard block |
||
| 4736 | 4735 | // Check if personal folder is owned by user |
| 4737 | 4736 | $folder = DB::queryFirstRow( |
| 4738 | 4737 | 'SELECT id |
| 4739 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4738 | + FROM ' . prefixTable('nested_tree').' |
|
| 4740 | 4739 | WHERE title = %s', |
| 4741 | 4740 | $session->get('user-id'), |
| 4742 | 4741 | ); |
@@ -4841,7 +4840,7 @@ discard block |
||
| 4841 | 4840 | // Get some info before deleting |
| 4842 | 4841 | $data = DB::queryFirstRow( |
| 4843 | 4842 | 'SELECT name, id_item, file |
| 4844 | - FROM ' . prefixTable('files') . ' |
|
| 4843 | + FROM ' . prefixTable('files').' |
|
| 4845 | 4844 | WHERE id = %i', |
| 4846 | 4845 | $fileId |
| 4847 | 4846 | ); |
@@ -4849,7 +4848,7 @@ discard block |
||
| 4849 | 4848 | // Load item data |
| 4850 | 4849 | $data_item = DB::queryFirstRow( |
| 4851 | 4850 | 'SELECT id_tree |
| 4852 | - FROM ' . prefixTable('items') . ' |
|
| 4851 | + FROM ' . prefixTable('items').' |
|
| 4853 | 4852 | WHERE id = %i', |
| 4854 | 4853 | $data['id_item'] |
| 4855 | 4854 | ); |
@@ -4879,7 +4878,7 @@ discard block |
||
| 4879 | 4878 | $session->get('user-id'), |
| 4880 | 4879 | 'at_modification', |
| 4881 | 4880 | $session->get('user-login'), |
| 4882 | - 'at_del_file : ' . $data['name'] |
|
| 4881 | + 'at_del_file : '.$data['name'] |
|
| 4883 | 4882 | ); |
| 4884 | 4883 | |
| 4885 | 4884 | // DElete sharekeys |
@@ -4890,7 +4889,7 @@ discard block |
||
| 4890 | 4889 | ); |
| 4891 | 4890 | |
| 4892 | 4891 | // Delete file from server |
| 4893 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 4892 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 4894 | 4893 | $fileToDelete = realpath($fileToDelete); |
| 4895 | 4894 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 4896 | 4895 | fileDelete($fileToDelete, $SETTINGS); |
@@ -4944,7 +4943,7 @@ discard block |
||
| 4944 | 4943 | // Update SESSION with this new favourite |
| 4945 | 4944 | $data = DB::queryFirstRow( |
| 4946 | 4945 | 'SELECT label,id_tree |
| 4947 | - FROM ' . prefixTable('items') . ' |
|
| 4946 | + FROM ' . prefixTable('items').' |
|
| 4948 | 4947 | WHERE id = %i', |
| 4949 | 4948 | $inputData['itemId'] |
| 4950 | 4949 | ); |
@@ -4953,7 +4952,7 @@ discard block |
||
| 4953 | 4952 | [ |
| 4954 | 4953 | $inputData['itemId'] => [ |
| 4955 | 4954 | 'label' => $data['label'], |
| 4956 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 4955 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 4957 | 4956 | ], |
| 4958 | 4957 | ], |
| 4959 | 4958 | 'add' |
@@ -5022,8 +5021,8 @@ discard block |
||
| 5022 | 5021 | // get data about item |
| 5023 | 5022 | $dataSource = DB::queryFirstRow( |
| 5024 | 5023 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5025 | - FROM ' . prefixTable('items') . ' as i |
|
| 5026 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5024 | + FROM ' . prefixTable('items').' as i |
|
| 5025 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5027 | 5026 | WHERE i.id=%i', |
| 5028 | 5027 | $inputData['itemId'] |
| 5029 | 5028 | ); |
@@ -5067,7 +5066,7 @@ discard block |
||
| 5067 | 5066 | // get data about new folder |
| 5068 | 5067 | $dataDestination = DB::queryFirstRow( |
| 5069 | 5068 | 'SELECT personal_folder, title |
| 5070 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5069 | + FROM ' . prefixTable('nested_tree').' |
|
| 5071 | 5070 | WHERE id = %i', |
| 5072 | 5071 | $inputData['folderId'] |
| 5073 | 5072 | ); |
@@ -5120,7 +5119,7 @@ discard block |
||
| 5120 | 5119 | // Get fields for this Item |
| 5121 | 5120 | $rows = DB::query( |
| 5122 | 5121 | 'SELECT id |
| 5123 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5122 | + FROM ' . prefixTable('categories_items').' |
|
| 5124 | 5123 | WHERE item_id = %i', |
| 5125 | 5124 | $inputData['itemId'] |
| 5126 | 5125 | ); |
@@ -5137,7 +5136,7 @@ discard block |
||
| 5137 | 5136 | // Get FILES for this Item |
| 5138 | 5137 | $rows = DB::query( |
| 5139 | 5138 | 'SELECT id |
| 5140 | - FROM ' . prefixTable('files') . ' |
|
| 5139 | + FROM ' . prefixTable('files').' |
|
| 5141 | 5140 | WHERE id_item = %i', |
| 5142 | 5141 | $inputData['itemId'] |
| 5143 | 5142 | ); |
@@ -5184,7 +5183,7 @@ discard block |
||
| 5184 | 5183 | // Get the ITEM object key for the user |
| 5185 | 5184 | $userKey = DB::queryFirstRow( |
| 5186 | 5185 | 'SELECT share_key |
| 5187 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5186 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5188 | 5187 | WHERE user_id = %i AND object_id = %i', |
| 5189 | 5188 | $session->get('user-id'), |
| 5190 | 5189 | $inputData['itemId'] |
@@ -5195,7 +5194,7 @@ discard block |
||
| 5195 | 5194 | // This is a public object |
| 5196 | 5195 | $users = DB::query( |
| 5197 | 5196 | 'SELECT id, public_key |
| 5198 | - FROM ' . prefixTable('users') . ' |
|
| 5197 | + FROM ' . prefixTable('users').' |
|
| 5199 | 5198 | WHERE id NOT IN %li |
| 5200 | 5199 | AND public_key != ""', |
| 5201 | 5200 | $tpUsersIDs |
@@ -5215,14 +5214,14 @@ discard block |
||
| 5215 | 5214 | // Get fields for this Item |
| 5216 | 5215 | $rows = DB::query( |
| 5217 | 5216 | 'SELECT id |
| 5218 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5217 | + FROM ' . prefixTable('categories_items').' |
|
| 5219 | 5218 | WHERE item_id = %i', |
| 5220 | 5219 | $inputData['itemId'] |
| 5221 | 5220 | ); |
| 5222 | 5221 | foreach ($rows as $field) { |
| 5223 | 5222 | $userKey = DB::queryFirstRow( |
| 5224 | 5223 | 'SELECT share_key |
| 5225 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5224 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5226 | 5225 | WHERE user_id = %i AND object_id = %i', |
| 5227 | 5226 | $session->get('user-id'), |
| 5228 | 5227 | $field['id'] |
@@ -5233,7 +5232,7 @@ discard block |
||
| 5233 | 5232 | // This is a public object |
| 5234 | 5233 | $users = DB::query( |
| 5235 | 5234 | 'SELECT id, public_key |
| 5236 | - FROM ' . prefixTable('users') . ' |
|
| 5235 | + FROM ' . prefixTable('users').' |
|
| 5237 | 5236 | WHERE id NOT IN %li |
| 5238 | 5237 | AND public_key != ""', |
| 5239 | 5238 | $tpUsersIDs |
@@ -5254,14 +5253,14 @@ discard block |
||
| 5254 | 5253 | // Get FILES for this Item |
| 5255 | 5254 | $rows = DB::query( |
| 5256 | 5255 | 'SELECT id |
| 5257 | - FROM ' . prefixTable('files') . ' |
|
| 5256 | + FROM ' . prefixTable('files').' |
|
| 5258 | 5257 | WHERE id_item = %i', |
| 5259 | 5258 | $inputData['itemId'] |
| 5260 | 5259 | ); |
| 5261 | 5260 | foreach ($rows as $attachment) { |
| 5262 | 5261 | $userKey = DB::queryFirstRow( |
| 5263 | 5262 | 'SELECT share_key |
| 5264 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5263 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5265 | 5264 | WHERE user_id = %i AND object_id = %i', |
| 5266 | 5265 | $session->get('user-id'), |
| 5267 | 5266 | $attachment['id'] |
@@ -5272,7 +5271,7 @@ discard block |
||
| 5272 | 5271 | // This is a public object |
| 5273 | 5272 | $users = DB::query( |
| 5274 | 5273 | 'SELECT id, public_key |
| 5275 | - FROM ' . prefixTable('users') . ' |
|
| 5274 | + FROM ' . prefixTable('users').' |
|
| 5276 | 5275 | WHERE id NOT IN %li |
| 5277 | 5276 | AND public_key != ""', |
| 5278 | 5277 | $tpUsersIDs |
@@ -5311,7 +5310,7 @@ discard block |
||
| 5311 | 5310 | $session->get('user-id'), |
| 5312 | 5311 | 'at_modification', |
| 5313 | 5312 | $session->get('user-login'), |
| 5314 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5313 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5315 | 5314 | ); |
| 5316 | 5315 | |
| 5317 | 5316 | // Update cache table |
@@ -5370,8 +5369,8 @@ discard block |
||
| 5370 | 5369 | // get data about item |
| 5371 | 5370 | $dataSource = DB::queryFirstRow( |
| 5372 | 5371 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5373 | - FROM ' . prefixTable('items') . ' as i |
|
| 5374 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5372 | + FROM ' . prefixTable('items').' as i |
|
| 5373 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5375 | 5374 | WHERE i.id=%i', |
| 5376 | 5375 | $item_id |
| 5377 | 5376 | ); |
@@ -5393,7 +5392,7 @@ discard block |
||
| 5393 | 5392 | |
| 5394 | 5393 | // get data about new folder |
| 5395 | 5394 | $dataDestination = DB::queryFirstRow( |
| 5396 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5395 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5397 | 5396 | $inputData['folderId'] |
| 5398 | 5397 | ); |
| 5399 | 5398 | |
@@ -5427,14 +5426,14 @@ discard block |
||
| 5427 | 5426 | prefixTable('sharekeys_items'), |
| 5428 | 5427 | 'object_id = %i AND user_id NOT IN %ls', |
| 5429 | 5428 | $item_id, |
| 5430 | - [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 5429 | + [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 5431 | 5430 | ); |
| 5432 | 5431 | |
| 5433 | 5432 | // Remove all item sharekeys fields |
| 5434 | 5433 | // Get fields for this Item |
| 5435 | 5434 | $rows = DB::query( |
| 5436 | 5435 | 'SELECT id |
| 5437 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5436 | + FROM ' . prefixTable('categories_items').' |
|
| 5438 | 5437 | WHERE item_id = %i', |
| 5439 | 5438 | $item_id |
| 5440 | 5439 | ); |
@@ -5451,7 +5450,7 @@ discard block |
||
| 5451 | 5450 | // Get FILES for this Item |
| 5452 | 5451 | $rows = DB::query( |
| 5453 | 5452 | 'SELECT id |
| 5454 | - FROM ' . prefixTable('files') . ' |
|
| 5453 | + FROM ' . prefixTable('files').' |
|
| 5455 | 5454 | WHERE id_item = %i', |
| 5456 | 5455 | $item_id |
| 5457 | 5456 | ); |
@@ -5506,7 +5505,7 @@ discard block |
||
| 5506 | 5505 | // Get the ITEM object key for the user |
| 5507 | 5506 | $userKey = DB::queryFirstRow( |
| 5508 | 5507 | 'SELECT share_key |
| 5509 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5508 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5510 | 5509 | WHERE user_id = %i AND object_id = %i', |
| 5511 | 5510 | $session->get('user-id'), |
| 5512 | 5511 | $item_id |
@@ -5517,7 +5516,7 @@ discard block |
||
| 5517 | 5516 | // This is a public object |
| 5518 | 5517 | $users = DB::query( |
| 5519 | 5518 | 'SELECT id, public_key |
| 5520 | - FROM ' . prefixTable('users') . ' |
|
| 5519 | + FROM ' . prefixTable('users').' |
|
| 5521 | 5520 | WHERE id NOT IN %li |
| 5522 | 5521 | AND public_key != ""', |
| 5523 | 5522 | $tpUsersIDs |
@@ -5538,14 +5537,14 @@ discard block |
||
| 5538 | 5537 | // Get fields for this Item |
| 5539 | 5538 | $rows = DB::query( |
| 5540 | 5539 | 'SELECT id |
| 5541 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5540 | + FROM ' . prefixTable('categories_items').' |
|
| 5542 | 5541 | WHERE item_id = %i', |
| 5543 | 5542 | $item_id |
| 5544 | 5543 | ); |
| 5545 | 5544 | foreach ($rows as $field) { |
| 5546 | 5545 | $userKey = DB::queryFirstRow( |
| 5547 | 5546 | 'SELECT share_key |
| 5548 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5547 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5549 | 5548 | WHERE user_id = %i AND object_id = %i', |
| 5550 | 5549 | $session->get('user-id'), |
| 5551 | 5550 | $field['id'] |
@@ -5556,7 +5555,7 @@ discard block |
||
| 5556 | 5555 | // This is a public object |
| 5557 | 5556 | $users = DB::query( |
| 5558 | 5557 | 'SELECT id, public_key |
| 5559 | - FROM ' . prefixTable('users') . ' |
|
| 5558 | + FROM ' . prefixTable('users').' |
|
| 5560 | 5559 | WHERE id NOT IN %li |
| 5561 | 5560 | AND public_key != ""', |
| 5562 | 5561 | $tpUsersIDs |
@@ -5578,14 +5577,14 @@ discard block |
||
| 5578 | 5577 | // Get FILES for this Item |
| 5579 | 5578 | $rows = DB::query( |
| 5580 | 5579 | 'SELECT id |
| 5581 | - FROM ' . prefixTable('files') . ' |
|
| 5580 | + FROM ' . prefixTable('files').' |
|
| 5582 | 5581 | WHERE id_item = %i', |
| 5583 | 5582 | $item_id |
| 5584 | 5583 | ); |
| 5585 | 5584 | foreach ($rows as $attachment) { |
| 5586 | 5585 | $userKey = DB::queryFirstRow( |
| 5587 | 5586 | 'SELECT share_key |
| 5588 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5587 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5589 | 5588 | WHERE user_id = %i AND object_id = %i', |
| 5590 | 5589 | $session->get('user-id'), |
| 5591 | 5590 | $attachment['id'] |
@@ -5596,7 +5595,7 @@ discard block |
||
| 5596 | 5595 | // This is a public object |
| 5597 | 5596 | $users = DB::query( |
| 5598 | 5597 | 'SELECT id, public_key |
| 5599 | - FROM ' . prefixTable('users') . ' |
|
| 5598 | + FROM ' . prefixTable('users').' |
|
| 5600 | 5599 | WHERE id NOT IN %li |
| 5601 | 5600 | AND public_key != ""', |
| 5602 | 5601 | $tpUsersIDs |
@@ -5634,13 +5633,13 @@ discard block |
||
| 5634 | 5633 | $session->get('user-id'), |
| 5635 | 5634 | 'at_modification', |
| 5636 | 5635 | $session->get('user-login'), |
| 5637 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5636 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5638 | 5637 | ); |
| 5639 | 5638 | } |
| 5640 | 5639 | } |
| 5641 | 5640 | |
| 5642 | 5641 | // reload cache table |
| 5643 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5642 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5644 | 5643 | updateCacheTable('reload', null); |
| 5645 | 5644 | |
| 5646 | 5645 | echo (string) prepareExchangedData( |
@@ -5704,7 +5703,7 @@ discard block |
||
| 5704 | 5703 | // get info |
| 5705 | 5704 | $dataSource = DB::queryFirstRow( |
| 5706 | 5705 | 'SELECT label, id_tree |
| 5707 | - FROM ' . prefixTable('items') . ' |
|
| 5706 | + FROM ' . prefixTable('items').' |
|
| 5708 | 5707 | WHERE id=%i', |
| 5709 | 5708 | $item_id |
| 5710 | 5709 | ); |
@@ -5805,14 +5804,14 @@ discard block |
||
| 5805 | 5804 | // Variables |
| 5806 | 5805 | $dataAuthor = DB::queryFirstRow( |
| 5807 | 5806 | 'SELECT email,login |
| 5808 | - FROM ' . prefixTable('users') . ' |
|
| 5807 | + FROM ' . prefixTable('users').' |
|
| 5809 | 5808 | WHERE id = %i', |
| 5810 | 5809 | $post_content[1] |
| 5811 | 5810 | ); |
| 5812 | 5811 | |
| 5813 | 5812 | $dataItem = DB::queryFirstRow( |
| 5814 | 5813 | 'SELECT label, id_tree |
| 5815 | - FROM ' . prefixTable('items') . ' |
|
| 5814 | + FROM ' . prefixTable('items').' |
|
| 5816 | 5815 | WHERE id = %i', |
| 5817 | 5816 | $post_content[0] |
| 5818 | 5817 | ); |
@@ -5829,7 +5828,7 @@ discard block |
||
| 5829 | 5828 | $lang->get('email_request_access_subject'), |
| 5830 | 5829 | str_replace( |
| 5831 | 5830 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5832 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5831 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5833 | 5832 | $lang->get('email_request_access_mail') |
| 5834 | 5833 | ), |
| 5835 | 5834 | $dataAuthor['email'], |
@@ -5838,7 +5837,7 @@ discard block |
||
| 5838 | 5837 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5839 | 5838 | $dataItem = DB::queryFirstRow( |
| 5840 | 5839 | 'SELECT label,id_tree |
| 5841 | - FROM ' . prefixTable('items') . ' |
|
| 5840 | + FROM ' . prefixTable('items').' |
|
| 5842 | 5841 | WHERE id= %i', |
| 5843 | 5842 | $inputData['id'] |
| 5844 | 5843 | ); |
@@ -5861,7 +5860,7 @@ discard block |
||
| 5861 | 5860 | ), |
| 5862 | 5861 | array( |
| 5863 | 5862 | empty($SETTINGS['email_server_url']) === false ? |
| 5864 | - $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'], |
|
| 5863 | + $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'], |
|
| 5865 | 5864 | addslashes($session->get('user-login')), |
| 5866 | 5865 | addslashes($path), |
| 5867 | 5866 | ), |
@@ -5910,8 +5909,8 @@ discard block |
||
| 5910 | 5909 | // Get all informations for this item |
| 5911 | 5910 | $dataItem = DB::queryFirstRow( |
| 5912 | 5911 | 'SELECT * |
| 5913 | - FROM ' . prefixTable('items') . ' as i |
|
| 5914 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5912 | + FROM ' . prefixTable('items').' as i |
|
| 5913 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5915 | 5914 | WHERE i.id=%i AND l.action = %s', |
| 5916 | 5915 | $item_id, |
| 5917 | 5916 | 'at_creation' |
@@ -5940,18 +5939,18 @@ discard block |
||
| 5940 | 5939 | $session->get('user-login'), |
| 5941 | 5940 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 5942 | 5941 | null, |
| 5943 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 5942 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 5944 | 5943 | ); |
| 5945 | 5944 | // Prepare new line |
| 5946 | 5945 | $data = DB::queryFirstRow( |
| 5947 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5946 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5948 | 5947 | $item_id |
| 5949 | 5948 | ); |
| 5950 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 5949 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 5951 | 5950 | // send back |
| 5952 | 5951 | $data = array( |
| 5953 | 5952 | 'error' => '', |
| 5954 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5953 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5955 | 5954 | ); |
| 5956 | 5955 | echo (string) prepareExchangedData( |
| 5957 | 5956 | $data, |
@@ -6026,8 +6025,8 @@ discard block |
||
| 6026 | 6025 | // Should we log a password change? |
| 6027 | 6026 | $itemQ = DB::queryFirstRow( |
| 6028 | 6027 | 'SELECT s.share_key, i.pw |
| 6029 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6030 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6028 | + FROM ' . prefixTable('items').' AS i |
|
| 6029 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6031 | 6030 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6032 | 6031 | $session->get('user-id'), |
| 6033 | 6032 | $dataReceived['id'] |
@@ -6082,7 +6081,7 @@ discard block |
||
| 6082 | 6081 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6083 | 6082 | $SETTINGS['otv_expiration_period'] = 7; |
| 6084 | 6083 | } |
| 6085 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6084 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6086 | 6085 | |
| 6087 | 6086 | echo json_encode( |
| 6088 | 6087 | array( |
@@ -6113,7 +6112,7 @@ discard block |
||
| 6113 | 6112 | // get parameters from original link |
| 6114 | 6113 | $url = $dataReceived['original_link']; |
| 6115 | 6114 | $parts = parse_url($url); |
| 6116 | - if(isset($parts['query'])){ |
|
| 6115 | + if (isset($parts['query'])) { |
|
| 6117 | 6116 | parse_str($parts['query'], $orignal_link_parameters); |
| 6118 | 6117 | } else { |
| 6119 | 6118 | $orignal_link_parameters = array(); |
@@ -6144,13 +6143,13 @@ discard block |
||
| 6144 | 6143 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6145 | 6144 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6146 | 6145 | if (str_contains($domain_host, 'www.') === true) { |
| 6147 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6146 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6148 | 6147 | } else { |
| 6149 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6148 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6150 | 6149 | } |
| 6151 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6150 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6152 | 6151 | } else { |
| 6153 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6152 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6154 | 6153 | } |
| 6155 | 6154 | |
| 6156 | 6155 | echo (string) prepareExchangedData( |
@@ -6185,8 +6184,8 @@ discard block |
||
| 6185 | 6184 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6186 | 6185 | f.extension AS extension, f.type AS type, |
| 6187 | 6186 | s.share_key AS share_key |
| 6188 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6189 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6187 | + FROM ' . prefixTable('files').' AS f |
|
| 6188 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6190 | 6189 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6191 | 6190 | $session->get('user-id'), |
| 6192 | 6191 | $inputData['id'] |
@@ -6207,7 +6206,7 @@ discard block |
||
| 6207 | 6206 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6208 | 6207 | |
| 6209 | 6208 | // prepare image info |
| 6210 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6209 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6211 | 6210 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6212 | 6211 | |
| 6213 | 6212 | // Get image content |
@@ -6234,7 +6233,7 @@ discard block |
||
| 6234 | 6233 | echo (string) prepareExchangedData( |
| 6235 | 6234 | array( |
| 6236 | 6235 | 'error' => false, |
| 6237 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6236 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6238 | 6237 | 'file_type' => $file_info['type'], |
| 6239 | 6238 | 'file_content' => $fileContent, |
| 6240 | 6239 | ), |
@@ -6346,7 +6345,7 @@ discard block |
||
| 6346 | 6345 | $arbo = $tree->getPath($folder->id, false); |
| 6347 | 6346 | $path = ''; |
| 6348 | 6347 | foreach ($arbo as $elem) { |
| 6349 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6348 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6350 | 6349 | } |
| 6351 | 6350 | |
| 6352 | 6351 | // Build array |
@@ -6413,7 +6412,7 @@ discard block |
||
| 6413 | 6412 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6414 | 6413 | $rows = DB::query( |
| 6415 | 6414 | 'SELECT id, categories |
| 6416 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6415 | + FROM ' . prefixTable('nested_tree').' |
|
| 6417 | 6416 | WHERE id IN (%l)', |
| 6418 | 6417 | implode(',', $foldersArray) |
| 6419 | 6418 | ); |
@@ -6431,7 +6430,7 @@ discard block |
||
| 6431 | 6430 | if (count($ids) > 0) { |
| 6432 | 6431 | $subfolders = DB::queryFirstColumn( |
| 6433 | 6432 | 'SELECT title |
| 6434 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6433 | + FROM ' . prefixTable('nested_tree').' |
|
| 6435 | 6434 | WHERE id IN %li', |
| 6436 | 6435 | $ids |
| 6437 | 6436 | ); |
@@ -6467,7 +6466,7 @@ discard block |
||
| 6467 | 6466 | // get item info |
| 6468 | 6467 | $dataItem = DB::queryFirstRow( |
| 6469 | 6468 | 'SELECT * |
| 6470 | - FROM ' . prefixTable('items') . ' |
|
| 6469 | + FROM ' . prefixTable('items').' |
|
| 6471 | 6470 | WHERE id=%i', |
| 6472 | 6471 | $inputData['itemId'] |
| 6473 | 6472 | ); |
@@ -6479,8 +6478,8 @@ discard block |
||
| 6479 | 6478 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6480 | 6479 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6481 | 6480 | l.old_value as old_value |
| 6482 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6483 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6481 | + FROM ' . prefixTable('log_items').' as l |
|
| 6482 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6484 | 6483 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6485 | 6484 | ORDER BY date DESC', |
| 6486 | 6485 | $inputData['itemId'], |
@@ -6495,18 +6494,18 @@ discard block |
||
| 6495 | 6494 | |
| 6496 | 6495 | // imported via API |
| 6497 | 6496 | if (empty($record['login']) === true) { |
| 6498 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6497 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6499 | 6498 | } |
| 6500 | 6499 | |
| 6501 | 6500 | // Prepare avatar |
| 6502 | 6501 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6503 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6504 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6502 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6503 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6505 | 6504 | } else { |
| 6506 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6505 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6507 | 6506 | } |
| 6508 | 6507 | } else { |
| 6509 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6508 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6510 | 6509 | } |
| 6511 | 6510 | |
| 6512 | 6511 | // Prepare action |
@@ -6526,7 +6525,7 @@ discard block |
||
| 6526 | 6525 | $previous_passwords, |
| 6527 | 6526 | [ |
| 6528 | 6527 | 'password' => htmlentities($previous_pwd['string']), |
| 6529 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6528 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6530 | 6529 | ] |
| 6531 | 6530 | ); |
| 6532 | 6531 | } |
@@ -6539,19 +6538,19 @@ discard block |
||
| 6539 | 6538 | $action = $lang->get($reason[0]); |
| 6540 | 6539 | if ($reason[0] === 'at_moved') { |
| 6541 | 6540 | $tmp = explode(' -> ', $reason[1]); |
| 6542 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6541 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6543 | 6542 | } elseif ($reason[0] === 'at_field') { |
| 6544 | 6543 | $tmp = explode(' => ', $reason[1]); |
| 6545 | 6544 | if (count($tmp) > 1) { |
| 6546 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6547 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6545 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6546 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6548 | 6547 | } else { |
| 6549 | 6548 | $detail = trim($reason[1]); |
| 6550 | 6549 | } |
| 6551 | 6550 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6552 | 6551 | $tmp = explode(' => ', $reason[1]); |
| 6553 | 6552 | $detail = empty(trim($tmp[0])) === true ? |
| 6554 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6553 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6555 | 6554 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6556 | 6555 | $detail = $lang->get($reason[1]); |
| 6557 | 6556 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') { |
@@ -6560,7 +6559,7 @@ discard block |
||
| 6560 | 6559 | $tmp = explode(':', $reason[1]); |
| 6561 | 6560 | $tmp = explode('.', $tmp[0]); |
| 6562 | 6561 | $detail = isBase64($tmp[0]) === true ? |
| 6563 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6562 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6564 | 6563 | } elseif ($reason[0] === 'at_import') { |
| 6565 | 6564 | $detail = ''; |
| 6566 | 6565 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6579,8 +6578,8 @@ discard block |
||
| 6579 | 6578 | array( |
| 6580 | 6579 | 'avatar' => $avatar, |
| 6581 | 6580 | 'login' => $record['login'], |
| 6582 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6583 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6581 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6582 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6584 | 6583 | 'action' => $action, |
| 6585 | 6584 | 'detail' => $detail, |
| 6586 | 6585 | ) |
@@ -6668,11 +6667,11 @@ discard block |
||
| 6668 | 6667 | |
| 6669 | 6668 | // get some info to add to the notification email |
| 6670 | 6669 | $resp_user = DB::queryFirstRow( |
| 6671 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6670 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6672 | 6671 | $session->get('user-id') |
| 6673 | 6672 | ); |
| 6674 | 6673 | $resp_folder = DB::queryFirstRow( |
| 6675 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6674 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6676 | 6675 | $folder |
| 6677 | 6676 | ); |
| 6678 | 6677 | |
@@ -6681,7 +6680,7 @@ discard block |
||
| 6681 | 6680 | $emailService = new EmailService(); |
| 6682 | 6681 | $rows = DB::query( |
| 6683 | 6682 | 'SELECT email |
| 6684 | - FROM ' . prefixTable('users') . ' |
|
| 6683 | + FROM ' . prefixTable('users').' |
|
| 6685 | 6684 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6686 | 6685 | 1 |
| 6687 | 6686 | ); |
@@ -6727,7 +6726,7 @@ discard block |
||
| 6727 | 6726 | // Send email |
| 6728 | 6727 | $dataItem = DB::queryFirstRow( |
| 6729 | 6728 | 'SELECT label, id_tree |
| 6730 | - FROM ' . prefixTable('items') . ' |
|
| 6729 | + FROM ' . prefixTable('items').' |
|
| 6731 | 6730 | WHERE id = %i', |
| 6732 | 6731 | $inputData['itemId'] |
| 6733 | 6732 | ); |
@@ -6781,7 +6780,7 @@ discard block |
||
| 6781 | 6780 | |
| 6782 | 6781 | DB::query( |
| 6783 | 6782 | 'SELECT * |
| 6784 | - FROM ' . prefixTable('notification') . ' |
|
| 6783 | + FROM ' . prefixTable('notification').' |
|
| 6785 | 6784 | WHERE item_id = %i AND user_id = %i', |
| 6786 | 6785 | $inputData['itemId'], |
| 6787 | 6786 | $session->get('user-id') |
@@ -6853,7 +6852,7 @@ discard block |
||
| 6853 | 6852 | // And related logs |
| 6854 | 6853 | $rows = DB::query( |
| 6855 | 6854 | 'SELECT id, file AS filename |
| 6856 | - FROM ' . prefixTable('files') . ' |
|
| 6855 | + FROM ' . prefixTable('files').' |
|
| 6857 | 6856 | WHERE id_item = %i AND confirmed = %i', |
| 6858 | 6857 | $inputData['itemId'], |
| 6859 | 6858 | 0 |
@@ -6867,12 +6866,12 @@ discard block |
||
| 6867 | 6866 | ); |
| 6868 | 6867 | |
| 6869 | 6868 | // Delete file on server |
| 6870 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6869 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6871 | 6870 | |
| 6872 | 6871 | // Delete related logs |
| 6873 | 6872 | $logFile = DB::query( |
| 6874 | 6873 | 'SELECT increment_id, raison |
| 6875 | - FROM ' . prefixTable('log_items') . ' |
|
| 6874 | + FROM ' . prefixTable('log_items').' |
|
| 6876 | 6875 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6877 | 6876 | $inputData['itemId'], |
| 6878 | 6877 | $session->get('user-id'), |
@@ -6931,7 +6930,7 @@ discard block |
||
| 6931 | 6930 | // Confirm attachments |
| 6932 | 6931 | $rows = DB::query( |
| 6933 | 6932 | 'SELECT id, file AS filename |
| 6934 | - FROM ' . prefixTable('files') . ' |
|
| 6933 | + FROM ' . prefixTable('files').' |
|
| 6935 | 6934 | WHERE id_item = %i AND confirmed = %i', |
| 6936 | 6935 | $inputData['itemId'], |
| 6937 | 6936 | 0 |
@@ -7047,7 +7046,7 @@ discard block |
||
| 7047 | 7046 | $successfulDeletions = array(); |
| 7048 | 7047 | $failedDeletions = array(); |
| 7049 | 7048 | |
| 7050 | - foreach( $selectedItemIds as $itemId) { |
|
| 7049 | + foreach ($selectedItemIds as $itemId) { |
|
| 7051 | 7050 | // Check that user can access this item |
| 7052 | 7051 | $granted = accessToItemIsGranted((int) $itemId, $SETTINGS); |
| 7053 | 7052 | if ($granted !== true) { |
@@ -7058,7 +7057,7 @@ discard block |
||
| 7058 | 7057 | // Load item data |
| 7059 | 7058 | $data = DB::queryFirstRow( |
| 7060 | 7059 | 'SELECT id_tree, id, label |
| 7061 | - FROM ' . prefixTable('items') . ' |
|
| 7060 | + FROM ' . prefixTable('items').' |
|
| 7062 | 7061 | WHERE id = %i', |
| 7063 | 7062 | $itemId |
| 7064 | 7063 | ); |
@@ -7141,15 +7140,15 @@ discard block |
||
| 7141 | 7140 | case 'autocomplete_tags': |
| 7142 | 7141 | // Get a list off all existing TAGS |
| 7143 | 7142 | $listOfTags = ''; |
| 7144 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7143 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7145 | 7144 | foreach ($rows as $record) { |
| 7146 | 7145 | if (empty($listOfTags)) { |
| 7147 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7146 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7148 | 7147 | } else { |
| 7149 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7148 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7150 | 7149 | } |
| 7151 | 7150 | } |
| 7152 | - echo '[' . $listOfTags . ']'; |
|
| 7151 | + echo '['.$listOfTags.']'; |
|
| 7153 | 7152 | break; |
| 7154 | 7153 | } |
| 7155 | 7154 | } |
@@ -7165,7 +7164,7 @@ discard block |
||
| 7165 | 7164 | { |
| 7166 | 7165 | $data = DB::queryFirstRow( |
| 7167 | 7166 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7168 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7167 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7169 | 7168 | $groupe |
| 7170 | 7169 | ); |
| 7171 | 7170 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7285,7 +7284,7 @@ discard block |
||
| 7285 | 7284 | // Get item date |
| 7286 | 7285 | $itemRestrictedUsersList = DB::queryFirstRow( |
| 7287 | 7286 | 'SELECT restricted_to |
| 7288 | - FROM ' . prefixTable('items') . ' |
|
| 7287 | + FROM ' . prefixTable('items').' |
|
| 7289 | 7288 | WHERE id = %i', |
| 7290 | 7289 | $itemId |
| 7291 | 7290 | ); |
@@ -7318,7 +7317,7 @@ discard block |
||
| 7318 | 7317 | $now = time(); |
| 7319 | 7318 | $editionLocks = DB::query( |
| 7320 | 7319 | 'SELECT timestamp, user_id, increment_id |
| 7321 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7320 | + FROM ' . prefixTable('items_edition').' |
|
| 7322 | 7321 | WHERE item_id = %i |
| 7323 | 7322 | ORDER BY increment_id DESC', |
| 7324 | 7323 | $itemId |
@@ -7364,7 +7363,7 @@ discard block |
||
| 7364 | 7363 | |
| 7365 | 7364 | // Delete related background tasks if any |
| 7366 | 7365 | $task = DB::queryFirstRow( |
| 7367 | - 'SELECT increment_id FROM ' . prefixTable('background_tasks') . ' |
|
| 7366 | + 'SELECT increment_id FROM '.prefixTable('background_tasks').' |
|
| 7368 | 7367 | WHERE item_id = %i AND finished_at = ""', |
| 7369 | 7368 | $itemId |
| 7370 | 7369 | ); |
@@ -7377,7 +7376,7 @@ discard block |
||
| 7377 | 7376 | // Check if encryption process is still running |
| 7378 | 7377 | DB::queryFirstRow( |
| 7379 | 7378 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 7380 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 7379 | + FROM ' . prefixTable('background_tasks').' |
|
| 7381 | 7380 | WHERE item_id = %i AND finished_at = "" |
| 7382 | 7381 | ORDER BY increment_id DESC', |
| 7383 | 7382 | $itemId |
@@ -7398,7 +7397,7 @@ discard block |
||
| 7398 | 7397 | } |
| 7399 | 7398 | |
| 7400 | 7399 | return [ |
| 7401 | - 'status' => true, // Encryption in progress |
|
| 7400 | + 'status' => true, // Encryption in progress |
|
| 7402 | 7401 | 'delay' => $delay - $elapsed, // Time remaining before the lock expires |
| 7403 | 7402 | ]; |
| 7404 | 7403 | } |
@@ -7443,7 +7442,7 @@ discard block |
||
| 7443 | 7442 | { |
| 7444 | 7443 | // Check if there's an ongoing background encryption process for the item |
| 7445 | 7444 | $ongoingProcess = DB::queryFirstRow( |
| 7446 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7445 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7447 | 7446 | $itemId |
| 7448 | 7447 | ); |
| 7449 | 7448 | |
@@ -7461,7 +7460,7 @@ discard block |
||
| 7461 | 7460 | function getUserVisibleFolders(int $userId): array |
| 7462 | 7461 | { |
| 7463 | 7462 | // Query to retrieve visible folders for the user |
| 7464 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7463 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7465 | 7464 | |
| 7466 | 7465 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7467 | 7466 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7485,7 +7484,7 @@ discard block |
||
| 7485 | 7484 | |
| 7486 | 7485 | // Query the access rights for the given roles and folder |
| 7487 | 7486 | $accessTypes = DB::queryFirstColumn( |
| 7488 | - 'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7487 | + 'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7489 | 7488 | $roles, |
| 7490 | 7489 | $treeId |
| 7491 | 7490 | ); |
