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 | |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | // About special settings |
| 366 | 366 | $dataFolderSettings = DB::queryFirstRow( |
| 367 | 367 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 368 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 368 | + FROM ' . prefixTable('nested_tree').' |
|
| 369 | 369 | WHERE id = %i', |
| 370 | 370 | $inputData['folderId'] |
| 371 | 371 | ); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | // Get folder complexity |
| 383 | 383 | $folderComplexity = DB::queryFirstRow( |
| 384 | 384 | 'SELECT valeur |
| 385 | - FROM ' . prefixTable('misc') . ' |
|
| 385 | + FROM ' . prefixTable('misc').' |
|
| 386 | 386 | WHERE type = %s AND intitule = %i', |
| 387 | 387 | 'complex', |
| 388 | 388 | $inputData['folderId'] |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | $itemExists = 0; |
| 408 | 408 | $newID = ''; |
| 409 | 409 | $data = DB::queryFirstRow( |
| 410 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 410 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 411 | 411 | WHERE label = %s AND inactif = %i', |
| 412 | 412 | $inputData['label'], |
| 413 | 413 | 0 |
@@ -488,8 +488,8 @@ discard block |
||
| 488 | 488 | (int) $post_folder_is_personal, |
| 489 | 489 | (int) $newID, |
| 490 | 490 | $cryptedStuff['objectKey'], |
| 491 | - true, // only for the item creator |
|
| 492 | - false, // no delete all |
|
| 491 | + true, // only for the item creator |
|
| 492 | + false, // no delete all |
|
| 493 | 493 | ); |
| 494 | 494 | |
| 495 | 495 | // update fields |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | // should we encrypt the data |
| 503 | 503 | $dataTmp = DB::queryFirstRow( |
| 504 | 504 | 'SELECT encrypted_data |
| 505 | - FROM ' . prefixTable('categories') . ' |
|
| 505 | + FROM ' . prefixTable('categories').' |
|
| 506 | 506 | WHERE id = %i', |
| 507 | 507 | $field['id'] |
| 508 | 508 | ); |
@@ -531,8 +531,8 @@ discard block |
||
| 531 | 531 | (int) $post_folder_is_personal, |
| 532 | 532 | (int) $newObjectId, |
| 533 | 533 | $cryptedStuff['objectKey'], |
| 534 | - true, // only for the item creator |
|
| 535 | - false, // no delete all |
|
| 534 | + true, // only for the item creator |
|
| 535 | + false, // no delete all |
|
| 536 | 536 | ); |
| 537 | 537 | |
| 538 | 538 | array_push( |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | ) { |
| 569 | 569 | DB::queryFirstRow( |
| 570 | 570 | 'SELECT * |
| 571 | - FROM ' . prefixTable('templates') . ' |
|
| 571 | + FROM ' . prefixTable('templates').' |
|
| 572 | 572 | WHERE item_id = %i', |
| 573 | 573 | $newID |
| 574 | 574 | ); |
@@ -637,11 +637,11 @@ discard block |
||
| 637 | 637 | ) { |
| 638 | 638 | foreach ($post_restricted_to as $userRest) { |
| 639 | 639 | if (empty($userRest) === false) { |
| 640 | - $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 640 | + $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 641 | 641 | if (empty($listOfRestricted)) { |
| 642 | 642 | $listOfRestricted = $dataTmp['login']; |
| 643 | 643 | } else { |
| 644 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 644 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 645 | 645 | } |
| 646 | 646 | } |
| 647 | 647 | } |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | if (empty($userRest) === false) { |
| 658 | 658 | $dataTmp = DB::queryFirstRow( |
| 659 | 659 | 'SELECT login |
| 660 | - FROM ' . prefixTable('users') . ' |
|
| 660 | + FROM ' . prefixTable('users').' |
|
| 661 | 661 | WHERE id= %i', |
| 662 | 662 | $userRest |
| 663 | 663 | ); |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | if (empty($oldRestrictionList) === true) { |
| 666 | 666 | $oldRestrictionList = $dataTmp['login']; |
| 667 | 667 | } else { |
| 668 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 668 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | } |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | if (empty($post_uploaded_file_id) === false) { |
| 729 | 729 | $rows = DB::query( |
| 730 | 730 | 'SELECT id |
| 731 | - FROM ' . prefixTable('files') . ' |
|
| 731 | + FROM ' . prefixTable('files').' |
|
| 732 | 732 | WHERE id_item = %s', |
| 733 | 733 | $post_uploaded_file_id |
| 734 | 734 | ); |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | $lang->get('email_subject_item_updated'), |
| 785 | 785 | str_replace( |
| 786 | 786 | array('#label', '#link'), |
| 787 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']), |
|
| 787 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']), |
|
| 788 | 788 | $lang->get('new_item_email_body') |
| 789 | 789 | ), |
| 790 | 790 | $emailAddress, |
@@ -888,11 +888,11 @@ discard block |
||
| 888 | 888 | // Prepare variables |
| 889 | 889 | $itemInfos = array(); |
| 890 | 890 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 891 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 891 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 892 | 892 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 893 | 893 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 894 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 895 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 894 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 895 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 896 | 896 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 897 | 897 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 898 | 898 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -923,8 +923,7 @@ discard block |
||
| 923 | 923 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 924 | 924 | $dataReceived['to_be_deleted_after_date'], |
| 925 | 925 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 926 | - ) : |
|
| 927 | - ''; |
|
| 926 | + ) : ''; |
|
| 928 | 927 | $post_fields = (filter_var_array( |
| 929 | 928 | $dataReceived['fields'], |
| 930 | 929 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -984,7 +983,7 @@ discard block |
||
| 984 | 983 | // About special settings |
| 985 | 984 | $dataFolderSettings = DB::queryFirstRow( |
| 986 | 985 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 987 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 986 | + FROM ' . prefixTable('nested_tree').' |
|
| 988 | 987 | WHERE id = %i', |
| 989 | 988 | $inputData['folderId'] |
| 990 | 989 | ); |
@@ -1000,7 +999,7 @@ discard block |
||
| 1000 | 999 | // Get folder complexity |
| 1001 | 1000 | $folderComplexity = DB::queryFirstRow( |
| 1002 | 1001 | 'SELECT valeur |
| 1003 | - FROM ' . prefixTable('misc') . ' |
|
| 1002 | + FROM ' . prefixTable('misc').' |
|
| 1004 | 1003 | WHERE type = %s AND intitule = %i', |
| 1005 | 1004 | 'complex', |
| 1006 | 1005 | $inputData['folderId'] |
@@ -1045,8 +1044,8 @@ discard block |
||
| 1045 | 1044 | // Get all informations for this item |
| 1046 | 1045 | $dataItem = DB::queryFirstRow( |
| 1047 | 1046 | 'SELECT * |
| 1048 | - FROM ' . prefixTable('items') . ' as i |
|
| 1049 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1047 | + FROM ' . prefixTable('items').' as i |
|
| 1048 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1050 | 1049 | WHERE i.id=%i AND l.action = %s', |
| 1051 | 1050 | $inputData['itemId'], |
| 1052 | 1051 | 'at_creation' |
@@ -1095,7 +1094,7 @@ discard block |
||
| 1095 | 1094 | //db::debugmode(true); |
| 1096 | 1095 | DB::query( |
| 1097 | 1096 | 'SELECT * |
| 1098 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1097 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1099 | 1098 | WHERE object_id = %i AND user_id = %s', |
| 1100 | 1099 | $inputData['itemId'], |
| 1101 | 1100 | $session->get('user-id') |
@@ -1155,9 +1154,9 @@ discard block |
||
| 1155 | 1154 | '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, |
| 1156 | 1155 | 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, |
| 1157 | 1156 | u.login as user_login, u.email as user_email |
| 1158 | - FROM ' . prefixTable('items') . ' as i |
|
| 1159 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1160 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1157 | + FROM ' . prefixTable('items').' as i |
|
| 1158 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1159 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1161 | 1160 | WHERE i.id=%i', |
| 1162 | 1161 | $inputData['itemId'] |
| 1163 | 1162 | ); |
@@ -1165,7 +1164,7 @@ discard block |
||
| 1165 | 1164 | // Should we log a password change? |
| 1166 | 1165 | $userKey = DB::queryFirstRow( |
| 1167 | 1166 | 'SELECT share_key |
| 1168 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1167 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1169 | 1168 | WHERE user_id = %i AND object_id = %i', |
| 1170 | 1169 | $session->get('user-id'), |
| 1171 | 1170 | $inputData['itemId'] |
@@ -1229,12 +1228,12 @@ discard block |
||
| 1229 | 1228 | (int) $post_folder_is_personal, |
| 1230 | 1229 | (int) $inputData['itemId'], |
| 1231 | 1230 | $encrypted_password_key, |
| 1232 | - true, // only for the item creator |
|
| 1233 | - true, // delete all |
|
| 1231 | + true, // only for the item creator |
|
| 1232 | + true, // delete all |
|
| 1234 | 1233 | ); |
| 1235 | 1234 | |
| 1236 | 1235 | // Create a task to create sharekeys for users |
| 1237 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1236 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1238 | 1237 | $tasksToBePerformed = ['item_password']; |
| 1239 | 1238 | $encryptionTaskIsRequested = true; |
| 1240 | 1239 | } else { |
@@ -1245,7 +1244,7 @@ discard block |
||
| 1245 | 1244 | // Get list of tags |
| 1246 | 1245 | $itemTags = DB::queryFirstColumn( |
| 1247 | 1246 | 'SELECT tag |
| 1248 | - FROM ' . prefixTable('tags') . ' |
|
| 1247 | + FROM ' . prefixTable('tags').' |
|
| 1249 | 1248 | WHERE item_id = %i', |
| 1250 | 1249 | $inputData['itemId'] |
| 1251 | 1250 | ); |
@@ -1291,7 +1290,7 @@ discard block |
||
| 1291 | 1290 | $session->get('user-id'), |
| 1292 | 1291 | 'at_modification', |
| 1293 | 1292 | $session->get('user-login'), |
| 1294 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1293 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1295 | 1294 | ); |
| 1296 | 1295 | } |
| 1297 | 1296 | |
@@ -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 |
| 1820 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1819 | + FROM ' . prefixTable('items_otp').' |
|
| 1821 | 1820 | WHERE item_id = %i', |
| 1822 | 1821 | $inputData['itemId'] |
| 1823 | 1822 | ); |
@@ -1848,7 +1847,7 @@ discard block |
||
| 1848 | 1847 | $session->get('user-id'), |
| 1849 | 1848 | 'at_modification', |
| 1850 | 1849 | $session->get('user-login'), |
| 1851 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1850 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1852 | 1851 | ); |
| 1853 | 1852 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
| 1854 | 1853 | // Create the entry in items_otp table |
@@ -1892,8 +1891,8 @@ discard block |
||
| 1892 | 1891 | $session->get('user-id'), |
| 1893 | 1892 | 'at_modification', |
| 1894 | 1893 | $session->get('user-login'), |
| 1895 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1896 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1894 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1895 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1897 | 1896 | ); |
| 1898 | 1897 | } |
| 1899 | 1898 | |
@@ -1913,7 +1912,7 @@ discard block |
||
| 1913 | 1912 | $session->get('user-id'), |
| 1914 | 1913 | 'at_modification', |
| 1915 | 1914 | $session->get('user-login'), |
| 1916 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1915 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1917 | 1916 | ); |
| 1918 | 1917 | } |
| 1919 | 1918 | // LOGIN |
@@ -1932,7 +1931,7 @@ discard block |
||
| 1932 | 1931 | $session->get('user-id'), |
| 1933 | 1932 | 'at_modification', |
| 1934 | 1933 | $session->get('user-login'), |
| 1935 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1934 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1936 | 1935 | ); |
| 1937 | 1936 | } |
| 1938 | 1937 | |
@@ -1951,7 +1950,7 @@ discard block |
||
| 1951 | 1950 | $session->get('user-id'), |
| 1952 | 1951 | 'at_modification', |
| 1953 | 1952 | $session->get('user-login'), |
| 1954 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1953 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1955 | 1954 | ); |
| 1956 | 1955 | } |
| 1957 | 1956 | // URL |
@@ -1970,7 +1969,7 @@ discard block |
||
| 1970 | 1969 | $session->get('user-id'), |
| 1971 | 1970 | 'at_modification', |
| 1972 | 1971 | $session->get('user-login'), |
| 1973 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1972 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1974 | 1973 | ); |
| 1975 | 1974 | } |
| 1976 | 1975 | // DESCRIPTION |
@@ -1996,7 +1995,7 @@ discard block |
||
| 1996 | 1995 | // FOLDER |
| 1997 | 1996 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1998 | 1997 | // Get name of folders |
| 1999 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1998 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2000 | 1999 | |
| 2001 | 2000 | // Store updates performed |
| 2002 | 2001 | array_push( |
@@ -2012,7 +2011,7 @@ discard block |
||
| 2012 | 2011 | $session->get('user-id'), |
| 2013 | 2012 | 'at_modification', |
| 2014 | 2013 | $session->get('user-login'), |
| 2015 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 2014 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 2016 | 2015 | ); |
| 2017 | 2016 | } |
| 2018 | 2017 | // ANYONE_CAN_MODIFY |
@@ -2020,7 +2019,7 @@ discard block |
||
| 2020 | 2019 | // Store updates performed |
| 2021 | 2020 | array_push( |
| 2022 | 2021 | $arrayOfChanges, |
| 2023 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2022 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2024 | 2023 | ); |
| 2025 | 2024 | |
| 2026 | 2025 | // Log |
@@ -2031,15 +2030,15 @@ discard block |
||
| 2031 | 2030 | $session->get('user-id'), |
| 2032 | 2031 | 'at_modification', |
| 2033 | 2032 | $session->get('user-login'), |
| 2034 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2033 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2035 | 2034 | ); |
| 2036 | 2035 | } |
| 2037 | 2036 | |
| 2038 | 2037 | // Reload new values |
| 2039 | 2038 | $dataItem = DB::queryFirstRow( |
| 2040 | 2039 | 'SELECT * |
| 2041 | - FROM ' . prefixTable('items') . ' as i |
|
| 2042 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2040 | + FROM ' . prefixTable('items').' as i |
|
| 2041 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2043 | 2042 | WHERE i.id = %i AND l.action = %s', |
| 2044 | 2043 | $inputData['itemId'], |
| 2045 | 2044 | 'at_creation' |
@@ -2048,8 +2047,8 @@ discard block |
||
| 2048 | 2047 | $history = ''; |
| 2049 | 2048 | $rows = DB::query( |
| 2050 | 2049 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2051 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2052 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2050 | + FROM ' . prefixTable('log_items').' as l |
|
| 2051 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2053 | 2052 | WHERE l.action <> %s AND id_item=%s', |
| 2054 | 2053 | 'at_shown', |
| 2055 | 2054 | $inputData['itemId'] |
@@ -2058,14 +2057,14 @@ discard block |
||
| 2058 | 2057 | if ($record['raison'] === NULL) continue; |
| 2059 | 2058 | $reason = explode(':', $record['raison']); |
| 2060 | 2059 | if (count($reason) > 0) { |
| 2061 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2062 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2063 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2060 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2061 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2062 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2064 | 2063 | : $lang->get(trim($reason[0]))) : ''); |
| 2065 | 2064 | if (empty($history)) { |
| 2066 | 2065 | $history = $sentence; |
| 2067 | 2066 | } else { |
| 2068 | - $history .= '<br />' . $sentence; |
|
| 2067 | + $history .= '<br />'.$sentence; |
|
| 2069 | 2068 | } |
| 2070 | 2069 | } |
| 2071 | 2070 | } |
@@ -2203,7 +2202,7 @@ discard block |
||
| 2203 | 2202 | ) { |
| 2204 | 2203 | // load the original record into an array |
| 2205 | 2204 | $originalRecord = DB::queryFirstRow( |
| 2206 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2205 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2207 | 2206 | WHERE id = %i', |
| 2208 | 2207 | $inputData['itemId'] |
| 2209 | 2208 | ); |
@@ -2222,7 +2221,7 @@ discard block |
||
| 2222 | 2221 | |
| 2223 | 2222 | // Load the destination folder record into an array |
| 2224 | 2223 | $dataDestination = DB::queryFirstRow( |
| 2225 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2224 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2226 | 2225 | WHERE id = %i', |
| 2227 | 2226 | $post_dest_id |
| 2228 | 2227 | ); |
@@ -2230,7 +2229,7 @@ discard block |
||
| 2230 | 2229 | // Get the ITEM object key for the user |
| 2231 | 2230 | $userKey = DB::queryFirstRow( |
| 2232 | 2231 | 'SELECT share_key |
| 2233 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2232 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2234 | 2233 | WHERE user_id = %i AND object_id = %i', |
| 2235 | 2234 | $session->get('user-id'), |
| 2236 | 2235 | $inputData['itemId'] |
@@ -2307,8 +2306,8 @@ discard block |
||
| 2307 | 2306 | // Manage Custom Fields |
| 2308 | 2307 | $rows = DB::query( |
| 2309 | 2308 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2310 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2311 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2309 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2310 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2312 | 2311 | WHERE ci.item_id = %i', |
| 2313 | 2312 | $inputData['itemId'] |
| 2314 | 2313 | ); |
@@ -2320,7 +2319,7 @@ discard block |
||
| 2320 | 2319 | // Get user key |
| 2321 | 2320 | $userKey = DB::queryFirstRow( |
| 2322 | 2321 | 'SELECT share_key |
| 2323 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2322 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2324 | 2323 | WHERE user_id = %i AND object_id = %i', |
| 2325 | 2324 | $session->get('user-id'), |
| 2326 | 2325 | $field['id'] |
@@ -2387,15 +2386,15 @@ discard block |
||
| 2387 | 2386 | $rows = DB::query( |
| 2388 | 2387 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2389 | 2388 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2390 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2391 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2389 | + FROM ' . prefixTable('files').' AS f |
|
| 2390 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2392 | 2391 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2393 | 2392 | $session->get('user-id'), |
| 2394 | 2393 | $inputData['itemId'] |
| 2395 | 2394 | ); |
| 2396 | 2395 | foreach ($rows as $record) { |
| 2397 | 2396 | // Check if file still exists |
| 2398 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2397 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2399 | 2398 | // Step1 - decrypt the file |
| 2400 | 2399 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2401 | 2400 | $fileContent = decryptFile( |
@@ -2406,8 +2405,8 @@ discard block |
||
| 2406 | 2405 | |
| 2407 | 2406 | // Step2 - create file |
| 2408 | 2407 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2409 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2410 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2408 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2409 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2411 | 2410 | if ($outstream === false) { |
| 2412 | 2411 | echo prepareExchangedData( |
| 2413 | 2412 | array( |
@@ -2480,7 +2479,7 @@ discard block |
||
| 2480 | 2479 | |
| 2481 | 2480 | // ------------------------- |
| 2482 | 2481 | // Add specific restrictions |
| 2483 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2482 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2484 | 2483 | foreach ($rows as $record) { |
| 2485 | 2484 | DB::insert( |
| 2486 | 2485 | prefixTable('restriction_to_roles'), |
@@ -2492,7 +2491,7 @@ discard block |
||
| 2492 | 2491 | } |
| 2493 | 2492 | |
| 2494 | 2493 | // Add Tags |
| 2495 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2494 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2496 | 2495 | foreach ($rows as $record) { |
| 2497 | 2496 | DB::insert( |
| 2498 | 2497 | prefixTable('tags'), |
@@ -2594,7 +2593,7 @@ discard block |
||
| 2594 | 2593 | // then we can show it |
| 2595 | 2594 | $item_deleted = DB::queryFirstRow( |
| 2596 | 2595 | 'SELECT * |
| 2597 | - FROM ' . prefixTable('log_items') . ' |
|
| 2596 | + FROM ' . prefixTable('log_items').' |
|
| 2598 | 2597 | WHERE id_item = %i AND action = %s |
| 2599 | 2598 | ORDER BY date DESC |
| 2600 | 2599 | LIMIT 0, 1', |
@@ -2605,7 +2604,7 @@ discard block |
||
| 2605 | 2604 | |
| 2606 | 2605 | $item_restored = DB::queryFirstRow( |
| 2607 | 2606 | 'SELECT * |
| 2608 | - FROM ' . prefixTable('log_items') . ' |
|
| 2607 | + FROM ' . prefixTable('log_items').' |
|
| 2609 | 2608 | WHERE id_item = %i AND action = %s |
| 2610 | 2609 | ORDER BY date DESC |
| 2611 | 2610 | LIMIT 0, 1', |
@@ -2629,8 +2628,8 @@ discard block |
||
| 2629 | 2628 | // Get all informations for this item |
| 2630 | 2629 | $dataItem = DB::queryFirstRow( |
| 2631 | 2630 | 'SELECT * |
| 2632 | - FROM ' . prefixTable('items') . ' as i |
|
| 2633 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2631 | + FROM ' . prefixTable('items').' as i |
|
| 2632 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2634 | 2633 | WHERE i.id = %i AND l.action = %s', |
| 2635 | 2634 | $inputData['id'], |
| 2636 | 2635 | 'at_creation' |
@@ -2639,7 +2638,7 @@ discard block |
||
| 2639 | 2638 | // Notification |
| 2640 | 2639 | DB::queryFirstRow( |
| 2641 | 2640 | 'SELECT * |
| 2642 | - FROM ' . prefixTable('notification') . ' |
|
| 2641 | + FROM ' . prefixTable('notification').' |
|
| 2643 | 2642 | WHERE item_id = %i AND user_id = %i', |
| 2644 | 2643 | $inputData['id'], |
| 2645 | 2644 | $session->get('user-id') |
@@ -2658,7 +2657,7 @@ discard block |
||
| 2658 | 2657 | |
| 2659 | 2658 | // manage case of API user |
| 2660 | 2659 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2661 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2660 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2662 | 2661 | $arrData['id_user'] = API_USER_ID; |
| 2663 | 2662 | $arrData['author_email'] = ''; |
| 2664 | 2663 | $arrData['notification_status'] = false; |
@@ -2668,7 +2667,7 @@ discard block |
||
| 2668 | 2667 | $tags = array(); |
| 2669 | 2668 | $rows = DB::query( |
| 2670 | 2669 | 'SELECT tag |
| 2671 | - FROM ' . prefixTable('tags') . ' |
|
| 2670 | + FROM ' . prefixTable('tags').' |
|
| 2672 | 2671 | WHERE item_id = %i', |
| 2673 | 2672 | $inputData['id'] |
| 2674 | 2673 | ); |
@@ -2693,7 +2692,7 @@ discard block |
||
| 2693 | 2692 | // Check if user has a role that is accepted |
| 2694 | 2693 | $rows_tmp = DB::query( |
| 2695 | 2694 | 'SELECT role_id |
| 2696 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2695 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2697 | 2696 | WHERE item_id=%i', |
| 2698 | 2697 | $inputData['id'] |
| 2699 | 2698 | ); |
@@ -2707,7 +2706,7 @@ discard block |
||
| 2707 | 2706 | // Get the object key for the user |
| 2708 | 2707 | $userKey = DB::queryFirstRow( |
| 2709 | 2708 | 'SELECT share_key |
| 2710 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2709 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2711 | 2710 | WHERE user_id = %i AND object_id = %i', |
| 2712 | 2711 | $session->get('user-id'), |
| 2713 | 2712 | $inputData['id'] |
@@ -2804,8 +2803,8 @@ discard block |
||
| 2804 | 2803 | // Add restriction if item is restricted to roles |
| 2805 | 2804 | $rows = DB::query( |
| 2806 | 2805 | 'SELECT t.title, t.id |
| 2807 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2808 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2806 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2807 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2809 | 2808 | WHERE r.item_id = %i |
| 2810 | 2809 | ORDER BY t.title ASC', |
| 2811 | 2810 | $inputData['id'] |
@@ -2821,8 +2820,8 @@ discard block |
||
| 2821 | 2820 | $tmp = array(); |
| 2822 | 2821 | $rows = DB::query( |
| 2823 | 2822 | 'SELECT k.label, k.id |
| 2824 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2825 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2823 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2824 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2826 | 2825 | WHERE i.item_id = %i |
| 2827 | 2826 | ORDER BY k.label ASC', |
| 2828 | 2827 | $inputData['id'] |
@@ -2905,7 +2904,7 @@ discard block |
||
| 2905 | 2904 | $arrCatList = array(); |
| 2906 | 2905 | $rows_tmp = DB::query( |
| 2907 | 2906 | 'SELECT id_category |
| 2908 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2907 | + FROM ' . prefixTable('categories_folders').' |
|
| 2909 | 2908 | WHERE id_folder=%i', |
| 2910 | 2909 | $inputData['folderId'] |
| 2911 | 2910 | ); |
@@ -2920,8 +2919,8 @@ discard block |
||
| 2920 | 2919 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2921 | 2920 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2922 | 2921 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2923 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2924 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2922 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2923 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2925 | 2924 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2926 | 2925 | $inputData['id'], |
| 2927 | 2926 | $arrCatList |
@@ -2932,7 +2931,7 @@ discard block |
||
| 2932 | 2931 | //db::debugmode(true); |
| 2933 | 2932 | $userKey = DB::queryFirstRow( |
| 2934 | 2933 | 'SELECT share_key |
| 2935 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2934 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2936 | 2935 | WHERE user_id = %i AND object_id = %i', |
| 2937 | 2936 | $session->get('user-id'), |
| 2938 | 2937 | $row['id'] |
@@ -2950,7 +2949,7 @@ discard block |
||
| 2950 | 2949 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2951 | 2950 | // Data is not encrypted in DB |
| 2952 | 2951 | $fieldText = [ |
| 2953 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2952 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2954 | 2953 | 'encrypted' => false, |
| 2955 | 2954 | 'error' => false, |
| 2956 | 2955 | ]; |
@@ -2995,7 +2994,7 @@ discard block |
||
| 2995 | 2994 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2996 | 2995 | $rows_tmp = DB::queryFirstRow( |
| 2997 | 2996 | 'SELECT category_id |
| 2998 | - FROM ' . prefixTable('templates') . ' |
|
| 2997 | + FROM ' . prefixTable('templates').' |
|
| 2999 | 2998 | WHERE item_id = %i', |
| 3000 | 2999 | $inputData['id'] |
| 3001 | 3000 | ); |
@@ -3012,7 +3011,7 @@ discard block |
||
| 3012 | 3011 | // Evaluate if item is ready for all users |
| 3013 | 3012 | $rows_tmp = DB::queryFirstRow( |
| 3014 | 3013 | 'SELECT finished_at |
| 3015 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3014 | + FROM ' . prefixTable('background_tasks').' |
|
| 3016 | 3015 | WHERE item_id = %i', |
| 3017 | 3016 | $inputData['id'] |
| 3018 | 3017 | ); |
@@ -3029,7 +3028,7 @@ discard block |
||
| 3029 | 3028 | // Is the Item to be deleted? |
| 3030 | 3029 | $dataDelete = DB::queryFirstRow( |
| 3031 | 3030 | 'SELECT * |
| 3032 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3031 | + FROM ' . prefixTable('automatic_del').' |
|
| 3033 | 3032 | WHERE item_id = %i', |
| 3034 | 3033 | $inputData['id'] |
| 3035 | 3034 | ); |
@@ -3110,14 +3109,14 @@ discard block |
||
| 3110 | 3109 | if (empty($userRest) === false) { |
| 3111 | 3110 | $dataTmp = DB::queryFirstRow( |
| 3112 | 3111 | 'SELECT login |
| 3113 | - FROM ' . prefixTable('users') . ' |
|
| 3112 | + FROM ' . prefixTable('users').' |
|
| 3114 | 3113 | WHERE id= %i', |
| 3115 | 3114 | $userRest |
| 3116 | 3115 | ); |
| 3117 | 3116 | if (empty($listOfRestricted)) { |
| 3118 | 3117 | $listOfRestricted = $dataTmp['login']; |
| 3119 | 3118 | } else { |
| 3120 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3119 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3121 | 3120 | } |
| 3122 | 3121 | } |
| 3123 | 3122 | } |
@@ -3191,9 +3190,9 @@ discard block |
||
| 3191 | 3190 | // Load item data |
| 3192 | 3191 | $dataItem = DB::queryFirstRow( |
| 3193 | 3192 | '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 |
| 3194 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3195 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3196 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3193 | + FROM ' . prefixTable('items').' AS i |
|
| 3194 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3195 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3197 | 3196 | WHERE i.id = %i', |
| 3198 | 3197 | $inputData['id'] |
| 3199 | 3198 | ); |
@@ -3215,7 +3214,7 @@ discard block |
||
| 3215 | 3214 | // Check if user has a role that is accepted |
| 3216 | 3215 | $rows_tmp = DB::query( |
| 3217 | 3216 | 'SELECT role_id |
| 3218 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3217 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3219 | 3218 | WHERE item_id=%i', |
| 3220 | 3219 | $inputData['id'] |
| 3221 | 3220 | ); |
@@ -3247,12 +3246,12 @@ discard block |
||
| 3247 | 3246 | // launch query |
| 3248 | 3247 | $rows = DB::query( |
| 3249 | 3248 | 'SELECT id, name, file, extension, size |
| 3250 | - FROM ' . prefixTable('files') . ' |
|
| 3249 | + FROM ' . prefixTable('files').' |
|
| 3251 | 3250 | WHERE id_item = %i AND confirmed = 1', |
| 3252 | 3251 | $inputData['id'] |
| 3253 | 3252 | ); |
| 3254 | 3253 | foreach ($rows as $record) { |
| 3255 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3254 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3256 | 3255 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3257 | 3256 | |
| 3258 | 3257 | array_push( |
@@ -3265,7 +3264,7 @@ discard block |
||
| 3265 | 3264 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3266 | 3265 | 'id' => $record['id'], |
| 3267 | 3266 | 'key' => $session->get('user-key_tmp'), |
| 3268 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3267 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3269 | 3268 | ) |
| 3270 | 3269 | ); |
| 3271 | 3270 | } |
@@ -3303,7 +3302,7 @@ discard block |
||
| 3303 | 3302 | array( |
| 3304 | 3303 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3305 | 3304 | ), |
| 3306 | - 'id=' . $session->get('user-id') |
|
| 3305 | + 'id='.$session->get('user-id') |
|
| 3307 | 3306 | ); |
| 3308 | 3307 | } |
| 3309 | 3308 | |
@@ -3312,8 +3311,8 @@ discard block |
||
| 3312 | 3311 | $listOptionsForRoles = array(); |
| 3313 | 3312 | $rows = DB::query( |
| 3314 | 3313 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3315 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3316 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3314 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3315 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3317 | 3316 | WHERE r.folder_id = %i', |
| 3318 | 3317 | $dataItem['id_tree'] |
| 3319 | 3318 | ); |
@@ -3327,9 +3326,9 @@ discard block |
||
| 3327 | 3326 | ); |
| 3328 | 3327 | $rows2 = DB::query( |
| 3329 | 3328 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3330 | - FROM ' . prefixTable('users') . ' |
|
| 3329 | + FROM ' . prefixTable('users').' |
|
| 3331 | 3330 | WHERE fonction_id LIKE %s', |
| 3332 | - '%' . $record['role_id'] . '%' |
|
| 3331 | + '%'.$record['role_id'].'%' |
|
| 3333 | 3332 | ); |
| 3334 | 3333 | foreach ($rows2 as $record2) { |
| 3335 | 3334 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3342,7 +3341,7 @@ discard block |
||
| 3342 | 3341 | array( |
| 3343 | 3342 | 'id' => (int) $record2['id'], |
| 3344 | 3343 | 'login' => $record2['login'], |
| 3345 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3344 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3346 | 3345 | 'email' => $record2['email'], |
| 3347 | 3346 | ) |
| 3348 | 3347 | ); |
@@ -3361,16 +3360,16 @@ discard block |
||
| 3361 | 3360 | $path = ''; |
| 3362 | 3361 | foreach ($arbo as $elem) { |
| 3363 | 3362 | if (empty($path) === true) { |
| 3364 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3363 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3365 | 3364 | } else { |
| 3366 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3365 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3367 | 3366 | } |
| 3368 | 3367 | } |
| 3369 | 3368 | // Build text to show user |
| 3370 | 3369 | if (empty($path) === true) { |
| 3371 | 3370 | $path = addslashes($dataItem['label']); |
| 3372 | 3371 | } else { |
| 3373 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3372 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3374 | 3373 | } |
| 3375 | 3374 | |
| 3376 | 3375 | // Add Admins to notification list if expected |
@@ -3393,7 +3392,7 @@ discard block |
||
| 3393 | 3392 | array( |
| 3394 | 3393 | addslashes($session->get('user-login')), |
| 3395 | 3394 | $path, |
| 3396 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3395 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3397 | 3396 | ), |
| 3398 | 3397 | $lang->get('email_on_open_notification_mail') |
| 3399 | 3398 | ), |
@@ -3403,7 +3402,7 @@ discard block |
||
| 3403 | 3402 | } |
| 3404 | 3403 | |
| 3405 | 3404 | // has this item a change proposal |
| 3406 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3405 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3407 | 3406 | $returnArray['has_change_proposal'] = DB::count(); |
| 3408 | 3407 | |
| 3409 | 3408 | // Setting |
@@ -3414,7 +3413,7 @@ discard block |
||
| 3414 | 3413 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3415 | 3414 | DB::query( |
| 3416 | 3415 | 'SELECT * |
| 3417 | - FROM ' . prefixTable('otv') . ' |
|
| 3416 | + FROM ' . prefixTable('otv').' |
|
| 3418 | 3417 | WHERE item_id = %i |
| 3419 | 3418 | AND time_limit > %i', |
| 3420 | 3419 | $inputData['id'], |
@@ -3513,7 +3512,7 @@ discard block |
||
| 3513 | 3512 | // Load item data |
| 3514 | 3513 | $data = DB::queryFirstRow( |
| 3515 | 3514 | 'SELECT id_tree, id, label |
| 3516 | - FROM ' . prefixTable('items') . ' |
|
| 3515 | + FROM ' . prefixTable('items').' |
|
| 3517 | 3516 | WHERE id = %i OR item_key = %s', |
| 3518 | 3517 | $inputData['itemId'], |
| 3519 | 3518 | $inputData['itemKey'] |
@@ -3604,7 +3603,7 @@ discard block |
||
| 3604 | 3603 | // Load item data |
| 3605 | 3604 | $dataItem = DB::queryFirstRow( |
| 3606 | 3605 | 'SELECT secret, enabled |
| 3607 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3606 | + FROM ' . prefixTable('items_otp').' |
|
| 3608 | 3607 | WHERE item_id = %i', |
| 3609 | 3608 | $inputData['id'] |
| 3610 | 3609 | ); |
@@ -3686,13 +3685,13 @@ discard block |
||
| 3686 | 3685 | |
| 3687 | 3686 | // Check if user is allowed to access this folder |
| 3688 | 3687 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3689 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3688 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3690 | 3689 | break; |
| 3691 | 3690 | } |
| 3692 | 3691 | |
| 3693 | 3692 | // Check if title doesn't contains html codes |
| 3694 | 3693 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3695 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3694 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3696 | 3695 | break; |
| 3697 | 3696 | } |
| 3698 | 3697 | // check that title is not numeric |
@@ -3703,9 +3702,9 @@ discard block |
||
| 3703 | 3702 | |
| 3704 | 3703 | // Check if duplicate folders name are allowed |
| 3705 | 3704 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3706 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3705 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3707 | 3706 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3708 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3707 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3709 | 3708 | break; |
| 3710 | 3709 | } |
| 3711 | 3710 | } |
@@ -3713,7 +3712,7 @@ discard block |
||
| 3713 | 3712 | // query on folder |
| 3714 | 3713 | $data = DB::queryFirstRow( |
| 3715 | 3714 | 'SELECT parent_id, personal_folder |
| 3716 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3715 | + FROM ' . prefixTable('nested_tree').' |
|
| 3717 | 3716 | WHERE id = %i', |
| 3718 | 3717 | $inputData['folderId'] |
| 3719 | 3718 | ); |
@@ -3723,20 +3722,20 @@ discard block |
||
| 3723 | 3722 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3724 | 3723 | $data = DB::queryFirstRow( |
| 3725 | 3724 | 'SELECT valeur |
| 3726 | - FROM ' . prefixTable('misc') . ' |
|
| 3725 | + FROM ' . prefixTable('misc').' |
|
| 3727 | 3726 | WHERE intitule = %i AND type = %s', |
| 3728 | 3727 | $data['parent_id'], |
| 3729 | 3728 | 'complex' |
| 3730 | 3729 | ); |
| 3731 | 3730 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3732 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3731 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3733 | 3732 | break; |
| 3734 | 3733 | } |
| 3735 | 3734 | } |
| 3736 | 3735 | |
| 3737 | 3736 | // update Folders table |
| 3738 | 3737 | $tmp = DB::queryFirstRow( |
| 3739 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3738 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3740 | 3739 | $dataReceived['folder'] |
| 3741 | 3740 | ); |
| 3742 | 3741 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3850,7 +3849,7 @@ discard block |
||
| 3850 | 3849 | $uniqueLoadData['path'] = $arr_arbo; |
| 3851 | 3850 | |
| 3852 | 3851 | // store last folder accessed in cookie |
| 3853 | - $arr_cookie_options = array ( |
|
| 3852 | + $arr_cookie_options = array( |
|
| 3854 | 3853 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3855 | 3854 | 'path' => '/', |
| 3856 | 3855 | 'secure' => true, |
@@ -3865,7 +3864,7 @@ discard block |
||
| 3865 | 3864 | foreach ($session->get('user-roles_array') as $role) { |
| 3866 | 3865 | $roleQ = DB::queryFirstRow( |
| 3867 | 3866 | 'SELECT allow_pw_change |
| 3868 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3867 | + FROM ' . prefixTable('roles_title').' |
|
| 3869 | 3868 | WHERE id = %i', |
| 3870 | 3869 | $role |
| 3871 | 3870 | ); |
@@ -3896,11 +3895,11 @@ discard block |
||
| 3896 | 3895 | |
| 3897 | 3896 | foreach ($session->get('user-roles_array') as $role) { |
| 3898 | 3897 | $access = DB::queryFirstRow( |
| 3899 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3898 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3900 | 3899 | $role, |
| 3901 | 3900 | $inputData['id'] |
| 3902 | 3901 | ); |
| 3903 | - if (DB::count()>0) { |
|
| 3902 | + if (DB::count() > 0) { |
|
| 3904 | 3903 | if ($access['type'] === 'R') { |
| 3905 | 3904 | array_push($arrTmp, 10); |
| 3906 | 3905 | } elseif ($access['type'] === 'W') { |
@@ -3965,7 +3964,7 @@ discard block |
||
| 3965 | 3964 | } else { |
| 3966 | 3965 | DB::query( |
| 3967 | 3966 | 'SELECT * |
| 3968 | - FROM ' . prefixTable('items') . ' |
|
| 3967 | + FROM ' . prefixTable('items').' |
|
| 3969 | 3968 | WHERE inactif = %i', |
| 3970 | 3969 | 0 |
| 3971 | 3970 | ); |
@@ -3975,7 +3974,7 @@ discard block |
||
| 3975 | 3974 | |
| 3976 | 3975 | // Get folder complexity |
| 3977 | 3976 | $folderComplexity = DB::queryFirstRow( |
| 3978 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3977 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3979 | 3978 | 'complex', |
| 3980 | 3979 | $inputData['id'] |
| 3981 | 3980 | ); |
@@ -3987,7 +3986,7 @@ discard block |
||
| 3987 | 3986 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 3988 | 3987 | $folderRow = DB::query( |
| 3989 | 3988 | 'SELECT id_category |
| 3990 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3989 | + FROM ' . prefixTable('categories_folders').' |
|
| 3991 | 3990 | WHERE id_folder = %i', |
| 3992 | 3991 | $inputData['id'] |
| 3993 | 3992 | ); |
@@ -4102,15 +4101,15 @@ discard block |
||
| 4102 | 4101 | // List all ITEMS |
| 4103 | 4102 | if ($folderIsPf === false) { |
| 4104 | 4103 | $where->add('i.inactif=%i', 0); |
| 4105 | - $sql_e='(SELECT date FROM ' . prefixTable('log_items') |
|
| 4104 | + $sql_e = '(SELECT date FROM '.prefixTable('log_items') |
|
| 4106 | 4105 | . " WHERE action = 'at_creation' AND id_item=i.id " |
| 4107 | - . 'union all SELECT date FROM '. prefixTable('log_items') |
|
| 4106 | + . 'union all SELECT date FROM '.prefixTable('log_items') |
|
| 4108 | 4107 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
| 4109 | 4108 | AND id_item=i.id ORDER BY date DESC LIMIT 1)"; |
| 4110 | 4109 | $where->add('l.date=%l', $sql_e); |
| 4111 | 4110 | |
| 4112 | - $query_limit = ' LIMIT ' . |
|
| 4113 | - $start . ',' . |
|
| 4111 | + $query_limit = ' LIMIT '. |
|
| 4112 | + $start.','. |
|
| 4114 | 4113 | $post_nb_items_to_display_once; |
| 4115 | 4114 | //db::debugmode(true); |
| 4116 | 4115 | $rows = DB::query( |
@@ -4122,9 +4121,9 @@ discard block |
||
| 4122 | 4121 | l.id_user AS log_user, |
| 4123 | 4122 | i.url AS link, |
| 4124 | 4123 | i.email AS email |
| 4125 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4126 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4127 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4124 | + FROM ' . prefixTable('items').' AS i |
|
| 4125 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4126 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4128 | 4127 | WHERE %l |
| 4129 | 4128 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4130 | 4129 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4144,9 +4143,9 @@ discard block |
||
| 4144 | 4143 | l.id_user AS log_user, |
| 4145 | 4144 | i.url AS link, |
| 4146 | 4145 | i.email AS email |
| 4147 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4148 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4149 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4146 | + FROM ' . prefixTable('items').' AS i |
|
| 4147 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4148 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4150 | 4149 | WHERE %l |
| 4151 | 4150 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4152 | 4151 | ORDER BY i.label ASC, l.date DESC', |
@@ -4177,7 +4176,7 @@ discard block |
||
| 4177 | 4176 | $item_is_restricted_to_role = false; |
| 4178 | 4177 | DB::queryFirstRow( |
| 4179 | 4178 | 'SELECT role_id |
| 4180 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4179 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4181 | 4180 | WHERE item_id = %i', |
| 4182 | 4181 | $record['id'] |
| 4183 | 4182 | ); |
@@ -4189,7 +4188,7 @@ discard block |
||
| 4189 | 4188 | $user_is_included_in_role = false; |
| 4190 | 4189 | DB::query( |
| 4191 | 4190 | 'SELECT role_id |
| 4192 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4191 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4193 | 4192 | WHERE item_id = %i AND role_id IN %ls', |
| 4194 | 4193 | $record['id'], |
| 4195 | 4194 | $session->get('user-roles_array') |
@@ -4399,9 +4398,9 @@ discard block |
||
| 4399 | 4398 | if ((int) $start === 0) { |
| 4400 | 4399 | DB::query( |
| 4401 | 4400 | 'SELECT i.id |
| 4402 | - FROM ' . prefixTable('items') . ' as i |
|
| 4403 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4404 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4401 | + FROM ' . prefixTable('items').' as i |
|
| 4402 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4403 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4405 | 4404 | WHERE %l |
| 4406 | 4405 | ORDER BY i.label ASC, l.date DESC', |
| 4407 | 4406 | $where |
@@ -4466,8 +4465,8 @@ discard block |
||
| 4466 | 4465 | $dataItem = DB::queryFirstRow( |
| 4467 | 4466 | 'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id, |
| 4468 | 4467 | i.label AS label, i.id_tree AS id_tree |
| 4469 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4470 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4468 | + FROM ' . prefixTable('items').' AS i |
|
| 4469 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4471 | 4470 | WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)', |
| 4472 | 4471 | $session->get('user-id'), |
| 4473 | 4472 | $inputData['itemKey'] ?? '', |
@@ -4576,7 +4575,7 @@ discard block |
||
| 4576 | 4575 | // do query on this folder |
| 4577 | 4576 | $data_this_folder = DB::queryFirstRow( |
| 4578 | 4577 | 'SELECT id, personal_folder, title |
| 4579 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4578 | + FROM ' . prefixTable('nested_tree').' |
|
| 4580 | 4579 | WHERE id = %s', |
| 4581 | 4580 | $inputData['folderId'] |
| 4582 | 4581 | ); |
@@ -4616,8 +4615,8 @@ discard block |
||
| 4616 | 4615 | $visibilite = ''; |
| 4617 | 4616 | $data = DB::queryFirstRow( |
| 4618 | 4617 | 'SELECT m.valeur, n.personal_folder |
| 4619 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4620 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4618 | + FROM ' . prefixTable('misc').' AS m |
|
| 4619 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4621 | 4620 | WHERE type=%s AND intitule = %s', |
| 4622 | 4621 | 'complex', |
| 4623 | 4622 | $inputData['folderId'] |
@@ -4630,8 +4629,8 @@ discard block |
||
| 4630 | 4629 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4631 | 4630 | $rows = DB::query( |
| 4632 | 4631 | 'SELECT t.title |
| 4633 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4634 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4632 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4633 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4635 | 4634 | WHERE v.folder_id = %i |
| 4636 | 4635 | GROUP BY title', |
| 4637 | 4636 | $inputData['folderId'] |
@@ -4640,7 +4639,7 @@ discard block |
||
| 4640 | 4639 | if (empty($visibilite)) { |
| 4641 | 4640 | $visibilite = $record['title']; |
| 4642 | 4641 | } else { |
| 4643 | - $visibilite .= ' - ' . $record['title']; |
|
| 4642 | + $visibilite .= ' - '.$record['title']; |
|
| 4644 | 4643 | } |
| 4645 | 4644 | } |
| 4646 | 4645 | } else { |
@@ -4650,14 +4649,14 @@ discard block |
||
| 4650 | 4649 | // do new query to know if current folder is pf |
| 4651 | 4650 | $data_pf = DB::queryFirstRow( |
| 4652 | 4651 | 'SELECT personal_folder |
| 4653 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4652 | + FROM ' . prefixTable('nested_tree').' |
|
| 4654 | 4653 | WHERE id = %s', |
| 4655 | 4654 | $inputData['folderId'] |
| 4656 | 4655 | ); |
| 4657 | 4656 | |
| 4658 | 4657 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4659 | 4658 | |
| 4660 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4659 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4661 | 4660 | } |
| 4662 | 4661 | |
| 4663 | 4662 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4667,8 +4666,8 @@ discard block |
||
| 4667 | 4666 | $listOptionsForRoles = array(); |
| 4668 | 4667 | $rows = DB::query( |
| 4669 | 4668 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4670 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4671 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4669 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4670 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4672 | 4671 | WHERE r.folder_id = %i', |
| 4673 | 4672 | $inputData['folderId'] |
| 4674 | 4673 | ); |
@@ -4682,7 +4681,7 @@ discard block |
||
| 4682 | 4681 | ); |
| 4683 | 4682 | $rows2 = DB::query( |
| 4684 | 4683 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4685 | - FROM ' . prefixTable('users') . ' |
|
| 4684 | + FROM ' . prefixTable('users').' |
|
| 4686 | 4685 | WHERE admin = 0 AND fonction_id is not null' |
| 4687 | 4686 | ); |
| 4688 | 4687 | foreach ($rows2 as $record2) { |
@@ -4696,7 +4695,7 @@ discard block |
||
| 4696 | 4695 | array( |
| 4697 | 4696 | 'id' => $record2['id'], |
| 4698 | 4697 | 'login' => $record2['login'], |
| 4699 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4698 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4700 | 4699 | 'email' => $record2['email'], |
| 4701 | 4700 | ) |
| 4702 | 4701 | ); |
@@ -4713,13 +4712,13 @@ discard block |
||
| 4713 | 4712 | //db::debugmode(true); |
| 4714 | 4713 | $access = DB::queryFirstRow( |
| 4715 | 4714 | 'SELECT type |
| 4716 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4715 | + FROM ' . prefixTable('roles_values').' |
|
| 4717 | 4716 | WHERE role_id = %i AND folder_id = %i', |
| 4718 | 4717 | $role, |
| 4719 | 4718 | $inputData['folderId'] |
| 4720 | 4719 | ); |
| 4721 | 4720 | //db::debugmode(false); |
| 4722 | - if (DB::count()>0) { |
|
| 4721 | + if (DB::count() > 0) { |
|
| 4723 | 4722 | if ($access['type'] === 'R') { |
| 4724 | 4723 | array_push($arrTmp, 10); |
| 4725 | 4724 | } elseif ($access['type'] === 'W') { |
@@ -4747,7 +4746,7 @@ discard block |
||
| 4747 | 4746 | // Check if personal folder is owned by user |
| 4748 | 4747 | $folder = DB::queryFirstRow( |
| 4749 | 4748 | 'SELECT id |
| 4750 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4749 | + FROM ' . prefixTable('nested_tree').' |
|
| 4751 | 4750 | WHERE title = %s', |
| 4752 | 4751 | $session->get('user-id'), |
| 4753 | 4752 | ); |
@@ -4852,7 +4851,7 @@ discard block |
||
| 4852 | 4851 | // Get some info before deleting |
| 4853 | 4852 | $data = DB::queryFirstRow( |
| 4854 | 4853 | 'SELECT name, id_item, file |
| 4855 | - FROM ' . prefixTable('files') . ' |
|
| 4854 | + FROM ' . prefixTable('files').' |
|
| 4856 | 4855 | WHERE id = %i', |
| 4857 | 4856 | $fileId |
| 4858 | 4857 | ); |
@@ -4860,7 +4859,7 @@ discard block |
||
| 4860 | 4859 | // Load item data |
| 4861 | 4860 | $data_item = DB::queryFirstRow( |
| 4862 | 4861 | 'SELECT id_tree |
| 4863 | - FROM ' . prefixTable('items') . ' |
|
| 4862 | + FROM ' . prefixTable('items').' |
|
| 4864 | 4863 | WHERE id = %i', |
| 4865 | 4864 | $data['id_item'] |
| 4866 | 4865 | ); |
@@ -4890,7 +4889,7 @@ discard block |
||
| 4890 | 4889 | $session->get('user-id'), |
| 4891 | 4890 | 'at_modification', |
| 4892 | 4891 | $session->get('user-login'), |
| 4893 | - 'at_del_file : ' . $data['name'] |
|
| 4892 | + 'at_del_file : '.$data['name'] |
|
| 4894 | 4893 | ); |
| 4895 | 4894 | |
| 4896 | 4895 | // DElete sharekeys |
@@ -4901,7 +4900,7 @@ discard block |
||
| 4901 | 4900 | ); |
| 4902 | 4901 | |
| 4903 | 4902 | // Delete file from server |
| 4904 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 4903 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 4905 | 4904 | $fileToDelete = realpath($fileToDelete); |
| 4906 | 4905 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 4907 | 4906 | fileDelete($fileToDelete, $SETTINGS); |
@@ -4955,7 +4954,7 @@ discard block |
||
| 4955 | 4954 | // Update SESSION with this new favourite |
| 4956 | 4955 | $data = DB::queryFirstRow( |
| 4957 | 4956 | 'SELECT label,id_tree |
| 4958 | - FROM ' . prefixTable('items') . ' |
|
| 4957 | + FROM ' . prefixTable('items').' |
|
| 4959 | 4958 | WHERE id = %i', |
| 4960 | 4959 | $inputData['itemId'] |
| 4961 | 4960 | ); |
@@ -4964,7 +4963,7 @@ discard block |
||
| 4964 | 4963 | [ |
| 4965 | 4964 | $inputData['itemId'] => [ |
| 4966 | 4965 | 'label' => $data['label'], |
| 4967 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 4966 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 4968 | 4967 | ], |
| 4969 | 4968 | ], |
| 4970 | 4969 | 'add' |
@@ -5033,8 +5032,8 @@ discard block |
||
| 5033 | 5032 | // get data about item |
| 5034 | 5033 | $dataSource = DB::queryFirstRow( |
| 5035 | 5034 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5036 | - FROM ' . prefixTable('items') . ' as i |
|
| 5037 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5035 | + FROM ' . prefixTable('items').' as i |
|
| 5036 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5038 | 5037 | WHERE i.id=%i', |
| 5039 | 5038 | $inputData['itemId'] |
| 5040 | 5039 | ); |
@@ -5078,7 +5077,7 @@ discard block |
||
| 5078 | 5077 | // get data about new folder |
| 5079 | 5078 | $dataDestination = DB::queryFirstRow( |
| 5080 | 5079 | 'SELECT personal_folder, title |
| 5081 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5080 | + FROM ' . prefixTable('nested_tree').' |
|
| 5082 | 5081 | WHERE id = %i', |
| 5083 | 5082 | $inputData['folderId'] |
| 5084 | 5083 | ); |
@@ -5131,7 +5130,7 @@ discard block |
||
| 5131 | 5130 | // Get fields for this Item |
| 5132 | 5131 | $rows = DB::query( |
| 5133 | 5132 | 'SELECT id |
| 5134 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5133 | + FROM ' . prefixTable('categories_items').' |
|
| 5135 | 5134 | WHERE item_id = %i', |
| 5136 | 5135 | $inputData['itemId'] |
| 5137 | 5136 | ); |
@@ -5148,7 +5147,7 @@ discard block |
||
| 5148 | 5147 | // Get FILES for this Item |
| 5149 | 5148 | $rows = DB::query( |
| 5150 | 5149 | 'SELECT id |
| 5151 | - FROM ' . prefixTable('files') . ' |
|
| 5150 | + FROM ' . prefixTable('files').' |
|
| 5152 | 5151 | WHERE id_item = %i', |
| 5153 | 5152 | $inputData['itemId'] |
| 5154 | 5153 | ); |
@@ -5195,7 +5194,7 @@ discard block |
||
| 5195 | 5194 | // Get the ITEM object key for the user |
| 5196 | 5195 | $userKey = DB::queryFirstRow( |
| 5197 | 5196 | 'SELECT share_key |
| 5198 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5197 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5199 | 5198 | WHERE user_id = %i AND object_id = %i', |
| 5200 | 5199 | $session->get('user-id'), |
| 5201 | 5200 | $inputData['itemId'] |
@@ -5206,7 +5205,7 @@ discard block |
||
| 5206 | 5205 | // This is a public object |
| 5207 | 5206 | $users = DB::query( |
| 5208 | 5207 | 'SELECT id, public_key |
| 5209 | - FROM ' . prefixTable('users') . ' |
|
| 5208 | + FROM ' . prefixTable('users').' |
|
| 5210 | 5209 | WHERE id NOT IN %li |
| 5211 | 5210 | AND public_key != ""', |
| 5212 | 5211 | $tpUsersIDs |
@@ -5229,14 +5228,14 @@ discard block |
||
| 5229 | 5228 | // Get fields for this Item |
| 5230 | 5229 | $rows = DB::query( |
| 5231 | 5230 | 'SELECT id |
| 5232 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5231 | + FROM ' . prefixTable('categories_items').' |
|
| 5233 | 5232 | WHERE item_id = %i', |
| 5234 | 5233 | $inputData['itemId'] |
| 5235 | 5234 | ); |
| 5236 | 5235 | foreach ($rows as $field) { |
| 5237 | 5236 | $userKey = DB::queryFirstRow( |
| 5238 | 5237 | 'SELECT share_key |
| 5239 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5238 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5240 | 5239 | WHERE user_id = %i AND object_id = %i', |
| 5241 | 5240 | $session->get('user-id'), |
| 5242 | 5241 | $field['id'] |
@@ -5247,7 +5246,7 @@ discard block |
||
| 5247 | 5246 | // This is a public object |
| 5248 | 5247 | $users = DB::query( |
| 5249 | 5248 | 'SELECT id, public_key |
| 5250 | - FROM ' . prefixTable('users') . ' |
|
| 5249 | + FROM ' . prefixTable('users').' |
|
| 5251 | 5250 | WHERE id NOT IN %li |
| 5252 | 5251 | AND public_key != ""', |
| 5253 | 5252 | $tpUsersIDs |
@@ -5270,14 +5269,14 @@ discard block |
||
| 5270 | 5269 | // Get FILES for this Item |
| 5271 | 5270 | $rows = DB::query( |
| 5272 | 5271 | 'SELECT id |
| 5273 | - FROM ' . prefixTable('files') . ' |
|
| 5272 | + FROM ' . prefixTable('files').' |
|
| 5274 | 5273 | WHERE id_item = %i', |
| 5275 | 5274 | $inputData['itemId'] |
| 5276 | 5275 | ); |
| 5277 | 5276 | foreach ($rows as $attachment) { |
| 5278 | 5277 | $userKey = DB::queryFirstRow( |
| 5279 | 5278 | 'SELECT share_key |
| 5280 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5279 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5281 | 5280 | WHERE user_id = %i AND object_id = %i', |
| 5282 | 5281 | $session->get('user-id'), |
| 5283 | 5282 | $attachment['id'] |
@@ -5288,7 +5287,7 @@ discard block |
||
| 5288 | 5287 | // This is a public object |
| 5289 | 5288 | $users = DB::query( |
| 5290 | 5289 | 'SELECT id, public_key |
| 5291 | - FROM ' . prefixTable('users') . ' |
|
| 5290 | + FROM ' . prefixTable('users').' |
|
| 5292 | 5291 | WHERE id NOT IN %li |
| 5293 | 5292 | AND public_key != ""', |
| 5294 | 5293 | $tpUsersIDs |
@@ -5329,7 +5328,7 @@ discard block |
||
| 5329 | 5328 | $session->get('user-id'), |
| 5330 | 5329 | 'at_modification', |
| 5331 | 5330 | $session->get('user-login'), |
| 5332 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5331 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5333 | 5332 | ); |
| 5334 | 5333 | |
| 5335 | 5334 | // Update cache table |
@@ -5388,8 +5387,8 @@ discard block |
||
| 5388 | 5387 | // get data about item |
| 5389 | 5388 | $dataSource = DB::queryFirstRow( |
| 5390 | 5389 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5391 | - FROM ' . prefixTable('items') . ' as i |
|
| 5392 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5390 | + FROM ' . prefixTable('items').' as i |
|
| 5391 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5393 | 5392 | WHERE i.id=%i', |
| 5394 | 5393 | $item_id |
| 5395 | 5394 | ); |
@@ -5411,7 +5410,7 @@ discard block |
||
| 5411 | 5410 | |
| 5412 | 5411 | // get data about new folder |
| 5413 | 5412 | $dataDestination = DB::queryFirstRow( |
| 5414 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5413 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5415 | 5414 | $inputData['folderId'] |
| 5416 | 5415 | ); |
| 5417 | 5416 | |
@@ -5453,7 +5452,7 @@ discard block |
||
| 5453 | 5452 | // Get fields for this Item |
| 5454 | 5453 | $rows = DB::query( |
| 5455 | 5454 | 'SELECT id |
| 5456 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5455 | + FROM ' . prefixTable('categories_items').' |
|
| 5457 | 5456 | WHERE item_id = %i', |
| 5458 | 5457 | $item_id |
| 5459 | 5458 | ); |
@@ -5470,7 +5469,7 @@ discard block |
||
| 5470 | 5469 | // Get FILES for this Item |
| 5471 | 5470 | $rows = DB::query( |
| 5472 | 5471 | 'SELECT id |
| 5473 | - FROM ' . prefixTable('files') . ' |
|
| 5472 | + FROM ' . prefixTable('files').' |
|
| 5474 | 5473 | WHERE id_item = %i', |
| 5475 | 5474 | $item_id |
| 5476 | 5475 | ); |
@@ -5525,7 +5524,7 @@ discard block |
||
| 5525 | 5524 | // Get the ITEM object key for the user |
| 5526 | 5525 | $userKey = DB::queryFirstRow( |
| 5527 | 5526 | 'SELECT share_key |
| 5528 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5527 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5529 | 5528 | WHERE user_id = %i AND object_id = %i', |
| 5530 | 5529 | $session->get('user-id'), |
| 5531 | 5530 | $item_id |
@@ -5536,7 +5535,7 @@ discard block |
||
| 5536 | 5535 | // This is a public object |
| 5537 | 5536 | $users = DB::query( |
| 5538 | 5537 | 'SELECT id, public_key |
| 5539 | - FROM ' . prefixTable('users') . ' |
|
| 5538 | + FROM ' . prefixTable('users').' |
|
| 5540 | 5539 | WHERE id NOT IN %li |
| 5541 | 5540 | AND public_key != ""', |
| 5542 | 5541 | $tpUsersIDs |
@@ -5559,14 +5558,14 @@ discard block |
||
| 5559 | 5558 | // Get fields for this Item |
| 5560 | 5559 | $rows = DB::query( |
| 5561 | 5560 | 'SELECT id |
| 5562 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5561 | + FROM ' . prefixTable('categories_items').' |
|
| 5563 | 5562 | WHERE item_id = %i', |
| 5564 | 5563 | $item_id |
| 5565 | 5564 | ); |
| 5566 | 5565 | foreach ($rows as $field) { |
| 5567 | 5566 | $userKey = DB::queryFirstRow( |
| 5568 | 5567 | 'SELECT share_key |
| 5569 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5568 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5570 | 5569 | WHERE user_id = %i AND object_id = %i', |
| 5571 | 5570 | $session->get('user-id'), |
| 5572 | 5571 | $field['id'] |
@@ -5577,7 +5576,7 @@ discard block |
||
| 5577 | 5576 | // This is a public object |
| 5578 | 5577 | $users = DB::query( |
| 5579 | 5578 | 'SELECT id, public_key |
| 5580 | - FROM ' . prefixTable('users') . ' |
|
| 5579 | + FROM ' . prefixTable('users').' |
|
| 5581 | 5580 | WHERE id NOT IN %li |
| 5582 | 5581 | AND public_key != ""', |
| 5583 | 5582 | $tpUsersIDs |
@@ -5601,14 +5600,14 @@ discard block |
||
| 5601 | 5600 | // Get FILES for this Item |
| 5602 | 5601 | $rows = DB::query( |
| 5603 | 5602 | 'SELECT id |
| 5604 | - FROM ' . prefixTable('files') . ' |
|
| 5603 | + FROM ' . prefixTable('files').' |
|
| 5605 | 5604 | WHERE id_item = %i', |
| 5606 | 5605 | $item_id |
| 5607 | 5606 | ); |
| 5608 | 5607 | foreach ($rows as $attachment) { |
| 5609 | 5608 | $userKey = DB::queryFirstRow( |
| 5610 | 5609 | 'SELECT share_key |
| 5611 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5610 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5612 | 5611 | WHERE user_id = %i AND object_id = %i', |
| 5613 | 5612 | $session->get('user-id'), |
| 5614 | 5613 | $attachment['id'] |
@@ -5619,7 +5618,7 @@ discard block |
||
| 5619 | 5618 | // This is a public object |
| 5620 | 5619 | $users = DB::query( |
| 5621 | 5620 | 'SELECT id, public_key |
| 5622 | - FROM ' . prefixTable('users') . ' |
|
| 5621 | + FROM ' . prefixTable('users').' |
|
| 5623 | 5622 | WHERE id NOT IN %li |
| 5624 | 5623 | AND public_key != ""', |
| 5625 | 5624 | $tpUsersIDs |
@@ -5659,13 +5658,13 @@ discard block |
||
| 5659 | 5658 | $session->get('user-id'), |
| 5660 | 5659 | 'at_modification', |
| 5661 | 5660 | $session->get('user-login'), |
| 5662 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5661 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5663 | 5662 | ); |
| 5664 | 5663 | } |
| 5665 | 5664 | } |
| 5666 | 5665 | |
| 5667 | 5666 | // reload cache table |
| 5668 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5667 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5669 | 5668 | updateCacheTable('reload', null); |
| 5670 | 5669 | |
| 5671 | 5670 | echo (string) prepareExchangedData( |
@@ -5729,7 +5728,7 @@ discard block |
||
| 5729 | 5728 | // get info |
| 5730 | 5729 | $dataSource = DB::queryFirstRow( |
| 5731 | 5730 | 'SELECT label, id_tree |
| 5732 | - FROM ' . prefixTable('items') . ' |
|
| 5731 | + FROM ' . prefixTable('items').' |
|
| 5733 | 5732 | WHERE id=%i', |
| 5734 | 5733 | $item_id |
| 5735 | 5734 | ); |
@@ -5830,14 +5829,14 @@ discard block |
||
| 5830 | 5829 | // Variables |
| 5831 | 5830 | $dataAuthor = DB::queryFirstRow( |
| 5832 | 5831 | 'SELECT email,login |
| 5833 | - FROM ' . prefixTable('users') . ' |
|
| 5832 | + FROM ' . prefixTable('users').' |
|
| 5834 | 5833 | WHERE id = %i', |
| 5835 | 5834 | $post_content[1] |
| 5836 | 5835 | ); |
| 5837 | 5836 | |
| 5838 | 5837 | $dataItem = DB::queryFirstRow( |
| 5839 | 5838 | 'SELECT label, id_tree |
| 5840 | - FROM ' . prefixTable('items') . ' |
|
| 5839 | + FROM ' . prefixTable('items').' |
|
| 5841 | 5840 | WHERE id = %i', |
| 5842 | 5841 | $post_content[0] |
| 5843 | 5842 | ); |
@@ -5854,7 +5853,7 @@ discard block |
||
| 5854 | 5853 | $lang->get('email_request_access_subject'), |
| 5855 | 5854 | str_replace( |
| 5856 | 5855 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5857 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5856 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5858 | 5857 | $lang->get('email_request_access_mail') |
| 5859 | 5858 | ), |
| 5860 | 5859 | $dataAuthor['email'], |
@@ -5863,7 +5862,7 @@ discard block |
||
| 5863 | 5862 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5864 | 5863 | $dataItem = DB::queryFirstRow( |
| 5865 | 5864 | 'SELECT label,id_tree |
| 5866 | - FROM ' . prefixTable('items') . ' |
|
| 5865 | + FROM ' . prefixTable('items').' |
|
| 5867 | 5866 | WHERE id= %i', |
| 5868 | 5867 | $inputData['id'] |
| 5869 | 5868 | ); |
@@ -5886,7 +5885,7 @@ discard block |
||
| 5886 | 5885 | ), |
| 5887 | 5886 | array( |
| 5888 | 5887 | empty($SETTINGS['email_server_url']) === false ? |
| 5889 | - $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'], |
|
| 5888 | + $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'], |
|
| 5890 | 5889 | addslashes($session->get('user-login')), |
| 5891 | 5890 | addslashes($path), |
| 5892 | 5891 | ), |
@@ -5935,8 +5934,8 @@ discard block |
||
| 5935 | 5934 | // Get all informations for this item |
| 5936 | 5935 | $dataItem = DB::queryFirstRow( |
| 5937 | 5936 | 'SELECT * |
| 5938 | - FROM ' . prefixTable('items') . ' as i |
|
| 5939 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5937 | + FROM ' . prefixTable('items').' as i |
|
| 5938 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5940 | 5939 | WHERE i.id=%i AND l.action = %s', |
| 5941 | 5940 | $item_id, |
| 5942 | 5941 | 'at_creation' |
@@ -5965,18 +5964,18 @@ discard block |
||
| 5965 | 5964 | $session->get('user-login'), |
| 5966 | 5965 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 5967 | 5966 | null, |
| 5968 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 5967 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 5969 | 5968 | ); |
| 5970 | 5969 | // Prepare new line |
| 5971 | 5970 | $data = DB::queryFirstRow( |
| 5972 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5971 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5973 | 5972 | $item_id |
| 5974 | 5973 | ); |
| 5975 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 5974 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 5976 | 5975 | // send back |
| 5977 | 5976 | $data = array( |
| 5978 | 5977 | 'error' => '', |
| 5979 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5978 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5980 | 5979 | ); |
| 5981 | 5980 | echo (string) prepareExchangedData( |
| 5982 | 5981 | $data, |
@@ -6051,8 +6050,8 @@ discard block |
||
| 6051 | 6050 | // Should we log a password change? |
| 6052 | 6051 | $itemQ = DB::queryFirstRow( |
| 6053 | 6052 | 'SELECT s.share_key, i.pw |
| 6054 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6055 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6053 | + FROM ' . prefixTable('items').' AS i |
|
| 6054 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6056 | 6055 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6057 | 6056 | $session->get('user-id'), |
| 6058 | 6057 | $dataReceived['id'] |
@@ -6107,7 +6106,7 @@ discard block |
||
| 6107 | 6106 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6108 | 6107 | $SETTINGS['otv_expiration_period'] = 7; |
| 6109 | 6108 | } |
| 6110 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6109 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6111 | 6110 | |
| 6112 | 6111 | echo json_encode( |
| 6113 | 6112 | array( |
@@ -6138,7 +6137,7 @@ discard block |
||
| 6138 | 6137 | // get parameters from original link |
| 6139 | 6138 | $url = $dataReceived['original_link']; |
| 6140 | 6139 | $parts = parse_url($url); |
| 6141 | - if(isset($parts['query'])){ |
|
| 6140 | + if (isset($parts['query'])) { |
|
| 6142 | 6141 | parse_str($parts['query'], $orignal_link_parameters); |
| 6143 | 6142 | } else { |
| 6144 | 6143 | $orignal_link_parameters = array(); |
@@ -6169,13 +6168,13 @@ discard block |
||
| 6169 | 6168 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6170 | 6169 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6171 | 6170 | if (str_contains($domain_host, 'www.') === true) { |
| 6172 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6171 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6173 | 6172 | } else { |
| 6174 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6173 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6175 | 6174 | } |
| 6176 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6175 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6177 | 6176 | } else { |
| 6178 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6177 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6179 | 6178 | } |
| 6180 | 6179 | |
| 6181 | 6180 | echo (string) prepareExchangedData( |
@@ -6210,8 +6209,8 @@ discard block |
||
| 6210 | 6209 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6211 | 6210 | f.extension AS extension, f.type AS type, |
| 6212 | 6211 | s.share_key AS share_key |
| 6213 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6214 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6212 | + FROM ' . prefixTable('files').' AS f |
|
| 6213 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6215 | 6214 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6216 | 6215 | $session->get('user-id'), |
| 6217 | 6216 | $inputData['id'] |
@@ -6232,7 +6231,7 @@ discard block |
||
| 6232 | 6231 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6233 | 6232 | |
| 6234 | 6233 | // prepare image info |
| 6235 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6234 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6236 | 6235 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6237 | 6236 | |
| 6238 | 6237 | // Get image content |
@@ -6259,7 +6258,7 @@ discard block |
||
| 6259 | 6258 | echo (string) prepareExchangedData( |
| 6260 | 6259 | array( |
| 6261 | 6260 | 'error' => false, |
| 6262 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6261 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6263 | 6262 | 'file_type' => $file_info['type'], |
| 6264 | 6263 | 'file_content' => $fileContent, |
| 6265 | 6264 | ), |
@@ -6373,7 +6372,7 @@ discard block |
||
| 6373 | 6372 | $arbo = $tree->getPath($folder->id, false); |
| 6374 | 6373 | $path = ''; |
| 6375 | 6374 | foreach ($arbo as $elem) { |
| 6376 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6375 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6377 | 6376 | } |
| 6378 | 6377 | |
| 6379 | 6378 | // Build array |
@@ -6442,7 +6441,7 @@ discard block |
||
| 6442 | 6441 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6443 | 6442 | $rows = DB::query( |
| 6444 | 6443 | 'SELECT id, categories |
| 6445 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6444 | + FROM ' . prefixTable('nested_tree').' |
|
| 6446 | 6445 | WHERE id IN (%l)', |
| 6447 | 6446 | implode(',', $foldersArray) |
| 6448 | 6447 | ); |
@@ -6484,7 +6483,7 @@ discard block |
||
| 6484 | 6483 | // get item info |
| 6485 | 6484 | $dataItem = DB::queryFirstRow( |
| 6486 | 6485 | 'SELECT * |
| 6487 | - FROM ' . prefixTable('items') . ' |
|
| 6486 | + FROM ' . prefixTable('items').' |
|
| 6488 | 6487 | WHERE id=%i', |
| 6489 | 6488 | $inputData['itemId'] |
| 6490 | 6489 | ); |
@@ -6496,8 +6495,8 @@ discard block |
||
| 6496 | 6495 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6497 | 6496 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6498 | 6497 | l.old_value as old_value |
| 6499 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6500 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6498 | + FROM ' . prefixTable('log_items').' as l |
|
| 6499 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6501 | 6500 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6502 | 6501 | ORDER BY date DESC', |
| 6503 | 6502 | $inputData['itemId'], |
@@ -6512,18 +6511,18 @@ discard block |
||
| 6512 | 6511 | |
| 6513 | 6512 | // imported via API |
| 6514 | 6513 | if (empty($record['login']) === true) { |
| 6515 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6514 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6516 | 6515 | } |
| 6517 | 6516 | |
| 6518 | 6517 | // Prepare avatar |
| 6519 | 6518 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6520 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6521 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6519 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6520 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6522 | 6521 | } else { |
| 6523 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6522 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6524 | 6523 | } |
| 6525 | 6524 | } else { |
| 6526 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6525 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6527 | 6526 | } |
| 6528 | 6527 | |
| 6529 | 6528 | // Prepare action |
@@ -6543,7 +6542,7 @@ discard block |
||
| 6543 | 6542 | $previous_passwords, |
| 6544 | 6543 | [ |
| 6545 | 6544 | 'password' => htmlentities($previous_pwd['string']), |
| 6546 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6545 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6547 | 6546 | ] |
| 6548 | 6547 | ); |
| 6549 | 6548 | } |
@@ -6556,19 +6555,19 @@ discard block |
||
| 6556 | 6555 | $action = $lang->get($reason[0]); |
| 6557 | 6556 | if ($reason[0] === 'at_moved') { |
| 6558 | 6557 | $tmp = explode(' -> ', $reason[1]); |
| 6559 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6558 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6560 | 6559 | } elseif ($reason[0] === 'at_field') { |
| 6561 | 6560 | $tmp = explode(' => ', $reason[1]); |
| 6562 | 6561 | if (count($tmp) > 1) { |
| 6563 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6564 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6562 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6563 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6565 | 6564 | } else { |
| 6566 | 6565 | $detail = trim($reason[1]); |
| 6567 | 6566 | } |
| 6568 | 6567 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6569 | 6568 | $tmp = explode(' => ', $reason[1]); |
| 6570 | 6569 | $detail = empty(trim($tmp[0])) === true ? |
| 6571 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6570 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6572 | 6571 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6573 | 6572 | $detail = $lang->get($reason[1]); |
| 6574 | 6573 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6577,7 +6576,7 @@ discard block |
||
| 6577 | 6576 | $tmp = explode(':', $reason[1]); |
| 6578 | 6577 | $tmp = explode('.', $tmp[0]); |
| 6579 | 6578 | $detail = isBase64($tmp[0]) === true ? |
| 6580 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6579 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6581 | 6580 | } elseif ($reason[0] === 'at_import') { |
| 6582 | 6581 | $detail = ''; |
| 6583 | 6582 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6596,8 +6595,8 @@ discard block |
||
| 6596 | 6595 | array( |
| 6597 | 6596 | 'avatar' => $avatar, |
| 6598 | 6597 | 'login' => $record['login'], |
| 6599 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6600 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6598 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6599 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6601 | 6600 | 'action' => $action, |
| 6602 | 6601 | 'detail' => $detail, |
| 6603 | 6602 | ) |
@@ -6685,11 +6684,11 @@ discard block |
||
| 6685 | 6684 | |
| 6686 | 6685 | // get some info to add to the notification email |
| 6687 | 6686 | $resp_user = DB::queryFirstRow( |
| 6688 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6687 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6689 | 6688 | $session->get('user-id') |
| 6690 | 6689 | ); |
| 6691 | 6690 | $resp_folder = DB::queryFirstRow( |
| 6692 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6691 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6693 | 6692 | $folder |
| 6694 | 6693 | ); |
| 6695 | 6694 | |
@@ -6698,7 +6697,7 @@ discard block |
||
| 6698 | 6697 | $emailService = new EmailService(); |
| 6699 | 6698 | $rows = DB::query( |
| 6700 | 6699 | 'SELECT email |
| 6701 | - FROM ' . prefixTable('users') . ' |
|
| 6700 | + FROM ' . prefixTable('users').' |
|
| 6702 | 6701 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6703 | 6702 | 1 |
| 6704 | 6703 | ); |
@@ -6744,7 +6743,7 @@ discard block |
||
| 6744 | 6743 | // Send email |
| 6745 | 6744 | $dataItem = DB::queryFirstRow( |
| 6746 | 6745 | 'SELECT label, id_tree |
| 6747 | - FROM ' . prefixTable('items') . ' |
|
| 6746 | + FROM ' . prefixTable('items').' |
|
| 6748 | 6747 | WHERE id = %i', |
| 6749 | 6748 | $inputData['itemId'] |
| 6750 | 6749 | ); |
@@ -6798,7 +6797,7 @@ discard block |
||
| 6798 | 6797 | |
| 6799 | 6798 | DB::query( |
| 6800 | 6799 | 'SELECT * |
| 6801 | - FROM ' . prefixTable('notification') . ' |
|
| 6800 | + FROM ' . prefixTable('notification').' |
|
| 6802 | 6801 | WHERE item_id = %i AND user_id = %i', |
| 6803 | 6802 | $inputData['itemId'], |
| 6804 | 6803 | $session->get('user-id') |
@@ -6870,7 +6869,7 @@ discard block |
||
| 6870 | 6869 | // And related logs |
| 6871 | 6870 | $rows = DB::query( |
| 6872 | 6871 | 'SELECT id, file AS filename |
| 6873 | - FROM ' . prefixTable('files') . ' |
|
| 6872 | + FROM ' . prefixTable('files').' |
|
| 6874 | 6873 | WHERE id_item = %i AND confirmed = %i', |
| 6875 | 6874 | $inputData['itemId'], |
| 6876 | 6875 | 0 |
@@ -6884,12 +6883,12 @@ discard block |
||
| 6884 | 6883 | ); |
| 6885 | 6884 | |
| 6886 | 6885 | // Delete file on server |
| 6887 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6886 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6888 | 6887 | |
| 6889 | 6888 | // Delete related logs |
| 6890 | 6889 | $logFile = DB::query( |
| 6891 | 6890 | 'SELECT increment_id, raison |
| 6892 | - FROM ' . prefixTable('log_items') . ' |
|
| 6891 | + FROM ' . prefixTable('log_items').' |
|
| 6893 | 6892 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6894 | 6893 | $inputData['itemId'], |
| 6895 | 6894 | $session->get('user-id'), |
@@ -6948,7 +6947,7 @@ discard block |
||
| 6948 | 6947 | // Confirm attachments |
| 6949 | 6948 | $rows = DB::query( |
| 6950 | 6949 | 'SELECT id, file AS filename |
| 6951 | - FROM ' . prefixTable('files') . ' |
|
| 6950 | + FROM ' . prefixTable('files').' |
|
| 6952 | 6951 | WHERE id_item = %i AND confirmed = %i', |
| 6953 | 6952 | $inputData['itemId'], |
| 6954 | 6953 | 0 |
@@ -7034,15 +7033,15 @@ discard block |
||
| 7034 | 7033 | case 'autocomplete_tags': |
| 7035 | 7034 | // Get a list off all existing TAGS |
| 7036 | 7035 | $listOfTags = ''; |
| 7037 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7036 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7038 | 7037 | foreach ($rows as $record) { |
| 7039 | 7038 | if (empty($listOfTags)) { |
| 7040 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7039 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7041 | 7040 | } else { |
| 7042 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7041 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7043 | 7042 | } |
| 7044 | 7043 | } |
| 7045 | - echo '[' . $listOfTags . ']'; |
|
| 7044 | + echo '['.$listOfTags.']'; |
|
| 7046 | 7045 | break; |
| 7047 | 7046 | } |
| 7048 | 7047 | } |
@@ -7058,7 +7057,7 @@ discard block |
||
| 7058 | 7057 | { |
| 7059 | 7058 | $data = DB::queryFirstRow( |
| 7060 | 7059 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7061 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7060 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7062 | 7061 | $groupe |
| 7063 | 7062 | ); |
| 7064 | 7063 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7169,7 +7168,7 @@ discard block |
||
| 7169 | 7168 | $now = time(); |
| 7170 | 7169 | $editionLocks = DB::query( |
| 7171 | 7170 | 'SELECT timestamp, user_id, increment_id |
| 7172 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7171 | + FROM ' . prefixTable('items_edition').' |
|
| 7173 | 7172 | WHERE item_id = %i |
| 7174 | 7173 | ORDER BY increment_id DESC', |
| 7175 | 7174 | $itemId |
@@ -7211,7 +7210,7 @@ discard block |
||
| 7211 | 7210 | |
| 7212 | 7211 | // Delete related background tasks if any |
| 7213 | 7212 | $task = DB::queryFirstRow( |
| 7214 | - 'SELECT increment_id FROM ' . prefixTable('background_tasks') . ' |
|
| 7213 | + 'SELECT increment_id FROM '.prefixTable('background_tasks').' |
|
| 7215 | 7214 | WHERE item_id = %i AND finished_at = ""', |
| 7216 | 7215 | $itemId |
| 7217 | 7216 | ); |
@@ -7224,7 +7223,7 @@ discard block |
||
| 7224 | 7223 | // Check if encryption process is still running |
| 7225 | 7224 | DB::queryFirstRow( |
| 7226 | 7225 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 7227 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 7226 | + FROM ' . prefixTable('background_tasks').' |
|
| 7228 | 7227 | WHERE item_id = %i AND finished_at = "" |
| 7229 | 7228 | ORDER BY increment_id DESC', |
| 7230 | 7229 | $itemId |
@@ -7282,7 +7281,7 @@ discard block |
||
| 7282 | 7281 | { |
| 7283 | 7282 | // Check if there's an ongoing background encryption process for the item |
| 7284 | 7283 | $ongoingProcess = DB::queryFirstRow( |
| 7285 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7284 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7286 | 7285 | $itemId |
| 7287 | 7286 | ); |
| 7288 | 7287 | |
@@ -7300,7 +7299,7 @@ discard block |
||
| 7300 | 7299 | function getUserVisibleFolders(int $userId): array |
| 7301 | 7300 | { |
| 7302 | 7301 | // Query to retrieve visible folders for the user |
| 7303 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7302 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7304 | 7303 | |
| 7305 | 7304 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7306 | 7305 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7324,7 +7323,7 @@ discard block |
||
| 7324 | 7323 | |
| 7325 | 7324 | // Query the access rights for the given roles and folder |
| 7326 | 7325 | $accessTypes = DB::queryFirstColumn( |
| 7327 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7326 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7328 | 7327 | $roles, |
| 7329 | 7328 | $treeId |
| 7330 | 7329 | ); |
@@ -1234,7 +1234,9 @@ discard block |
||
| 1234 | 1234 | ); |
| 1235 | 1235 | |
| 1236 | 1236 | // Create a task to create sharekeys for users |
| 1237 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1237 | + if (WIP=== true) { |
|
| 1238 | + error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1239 | + } |
|
| 1238 | 1240 | $tasksToBePerformed = ['item_password']; |
| 1239 | 1241 | $encryptionTaskIsRequested = true; |
| 1240 | 1242 | } else { |
@@ -1554,7 +1556,9 @@ discard block |
||
| 1554 | 1556 | |
| 1555 | 1557 | // create a task for all fields updated |
| 1556 | 1558 | if ($encryptionTaskIsRequested === true) { |
| 1557 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1559 | + if (WIP === true) { |
|
| 1560 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1561 | + } |
|
| 1558 | 1562 | createTaskForItem( |
| 1559 | 1563 | 'item_update_create_keys', |
| 1560 | 1564 | array_unique($tasksToBePerformed), |
@@ -2055,7 +2059,9 @@ discard block |
||
| 2055 | 2059 | $inputData['itemId'] |
| 2056 | 2060 | ); |
| 2057 | 2061 | foreach ($rows as $record) { |
| 2058 | - if ($record['raison'] === NULL) continue; |
|
| 2062 | + if ($record['raison'] === NULL) { |
|
| 2063 | + continue; |
|
| 2064 | + } |
|
| 2059 | 2065 | $reason = explode(':', $record['raison']); |
| 2060 | 2066 | if (count($reason) > 0) { |
| 2061 | 2067 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4757,8 +4763,9 @@ discard block |
||
| 4757 | 4763 | $ids = $tree->getDescendants($folder['id'], true, false, true); |
| 4758 | 4764 | |
| 4759 | 4765 | // This folder is owned by user |
| 4760 | - if (in_array($inputData['folderId'], $ids)) |
|
| 4761 | - $accessLevel = 30; |
|
| 4766 | + if (in_array($inputData['folderId'], $ids)) { |
|
| 4767 | + $accessLevel = 30; |
|
| 4768 | + } |
|
| 4762 | 4769 | } |
| 4763 | 4770 | } |
| 4764 | 4771 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | ) { |
| 78 | 78 | // Not allowed page |
| 79 | 79 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 80 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 80 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 81 | 81 | exit; |
| 82 | 82 | } |
| 83 | 83 | |
@@ -138,14 +138,14 @@ discard block |
||
| 138 | 138 | // Prepare variables |
| 139 | 139 | $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 140 | 140 | |
| 141 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 141 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 142 | 142 | |
| 143 | 143 | // get a token |
| 144 | 144 | $token = GenerateCryptKey(20, false, true, true, false, true); |
| 145 | 145 | |
| 146 | 146 | //save file |
| 147 | - $filename = time() . '-' . $token . '.sql'; |
|
| 148 | - $filepath = $SETTINGS['path_to_files_folder'] . '/' . $filename; |
|
| 147 | + $filename = time().'-'.$token.'.sql'; |
|
| 148 | + $filepath = $SETTINGS['path_to_files_folder'].'/'.$filename; |
|
| 149 | 149 | $handle = fopen($filepath, 'w+'); |
| 150 | 150 | |
| 151 | 151 | if ($handle === false) { |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $tables = array(); |
| 164 | 164 | $result = DB::query('SHOW TABLES'); |
| 165 | 165 | foreach ($result as $row) { |
| 166 | - $tables[] = $row['Tables_in_' . DB_NAME]; |
|
| 166 | + $tables[] = $row['Tables_in_'.DB_NAME]; |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | $backupSuccess = true; |
@@ -173,9 +173,9 @@ discard block |
||
| 173 | 173 | if (empty($pre) || substr_count($table, $pre) > 0) { |
| 174 | 174 | $table = safeString($table); |
| 175 | 175 | // Write table drop and creation |
| 176 | - fwrite($handle, 'DROP TABLE IF EXISTS ' . $table . ";\n"); |
|
| 177 | - $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table); |
|
| 178 | - fwrite($handle, safeString($row2['Create Table']) . ";\n\n"); |
|
| 176 | + fwrite($handle, 'DROP TABLE IF EXISTS '.$table.";\n"); |
|
| 177 | + $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table); |
|
| 178 | + fwrite($handle, safeString($row2['Create Table']).";\n\n"); |
|
| 179 | 179 | |
| 180 | 180 | // Get field information |
| 181 | 181 | DB::query( |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | foreach ($rows as $record) { |
| 203 | - $insertQuery = 'INSERT INTO ' . $table . ' VALUES('; |
|
| 203 | + $insertQuery = 'INSERT INTO '.$table.' VALUES('; |
|
| 204 | 204 | $values = array(); |
| 205 | 205 | |
| 206 | 206 | foreach ($record as $value) { |
@@ -208,11 +208,11 @@ discard block |
||
| 208 | 208 | if ($value === null) { |
| 209 | 209 | $values[] = 'NULL'; |
| 210 | 210 | } else { |
| 211 | - $values[] = '"' . addslashes(preg_replace("/\n/", '\\n', $value)) . '"'; |
|
| 211 | + $values[] = '"'.addslashes(preg_replace("/\n/", '\\n', $value)).'"'; |
|
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - $insertQuery .= implode(',', $values) . ");\n"; |
|
| 215 | + $insertQuery .= implode(',', $values).");\n"; |
|
| 216 | 216 | fwrite($handle, $insertQuery); |
| 217 | 217 | |
| 218 | 218 | // Flush buffer periodically to free memory |
@@ -242,14 +242,14 @@ discard block |
||
| 242 | 242 | prepareFileWithDefuse( |
| 243 | 243 | 'encrypt', |
| 244 | 244 | $filepath, |
| 245 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 245 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 246 | 246 | $post_key |
| 247 | 247 | ); |
| 248 | 248 | |
| 249 | 249 | // Do clean |
| 250 | 250 | unlink($filepath); |
| 251 | 251 | rename( |
| 252 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 252 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 253 | 253 | $filepath |
| 254 | 254 | ); |
| 255 | 255 | } |
@@ -270,9 +270,9 @@ discard block |
||
| 270 | 270 | array( |
| 271 | 271 | 'error' => false, |
| 272 | 272 | 'message' => '', |
| 273 | - 'download' => 'sources/downloadFile.php?name=' . urlencode($filename) . |
|
| 274 | - '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . |
|
| 275 | - $session->get('user-key_tmp') . '&pathIsFiles=1', |
|
| 273 | + 'download' => 'sources/downloadFile.php?name='.urlencode($filename). |
|
| 274 | + '&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='. |
|
| 275 | + $session->get('user-key_tmp').'&pathIsFiles=1', |
|
| 276 | 276 | ), |
| 277 | 277 | 'encode' |
| 278 | 278 | ); |
@@ -333,13 +333,13 @@ discard block |
||
| 333 | 333 | error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key); |
| 334 | 334 | } |
| 335 | 335 | |
| 336 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 336 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 337 | 337 | |
| 338 | 338 | if (empty($post_clearFilename) === true) { |
| 339 | 339 | // Get filename from database |
| 340 | 340 | $data = DB::queryFirstRow( |
| 341 | 341 | 'SELECT valeur |
| 342 | - FROM ' . prefixTable('misc') . ' |
|
| 342 | + FROM ' . prefixTable('misc').' |
|
| 343 | 343 | WHERE increment_id = %i', |
| 344 | 344 | $post_backupFile |
| 345 | 345 | ); |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $post_backupFile = safeString($data['valeur']); |
| 367 | 367 | |
| 368 | 368 | // Verify file exists |
| 369 | - if (!file_exists($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile)) { |
|
| 369 | + if (!file_exists($SETTINGS['path_to_files_folder'].'/'.$post_backupFile)) { |
|
| 370 | 370 | echo prepareExchangedData( |
| 371 | 371 | array( |
| 372 | 372 | 'error' => true, |
@@ -383,8 +383,8 @@ discard block |
||
| 383 | 383 | // Decrypt the file |
| 384 | 384 | $ret = prepareFileWithDefuse( |
| 385 | 385 | 'decrypt', |
| 386 | - $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, |
|
| 387 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile, |
|
| 386 | + $SETTINGS['path_to_files_folder'].'/'.$post_backupFile, |
|
| 387 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile, |
|
| 388 | 388 | $post_key |
| 389 | 389 | ); |
| 390 | 390 | |
@@ -401,8 +401,8 @@ discard block |
||
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | // Do clean |
| 404 | - fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS); |
|
| 405 | - $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile; |
|
| 404 | + fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS); |
|
| 405 | + $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile; |
|
| 406 | 406 | } else { |
| 407 | 407 | echo prepareExchangedData( |
| 408 | 408 | array( |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | DB::query($query); |
| 485 | 485 | $executedQueries++; |
| 486 | 486 | } catch (Exception $e) { |
| 487 | - $errors[] = "Error executing query: " . $e->getMessage() . " - Query: " . substr($query, 0, 100) . "..."; |
|
| 487 | + $errors[] = "Error executing query: ".$e->getMessage()." - Query: ".substr($query, 0, 100)."..."; |
|
| 488 | 488 | } |
| 489 | 489 | $query = ''; |
| 490 | 490 | } |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | } catch (Exception $e) { |
| 501 | 501 | // Rollback transaction on any exception |
| 502 | 502 | DB::rollback(); |
| 503 | - $errors[] = "Transaction failed: " . $e->getMessage(); |
|
| 503 | + $errors[] = "Transaction failed: ".$e->getMessage(); |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | // Calculate the new offset |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | echo prepareExchangedData( |
| 516 | 516 | array( |
| 517 | 517 | 'error' => true, |
| 518 | - 'message' => 'Errors occurred during import: ' . implode('; ', $errors), |
|
| 518 | + 'message' => 'Errors occurred during import: '.implode('; ', $errors), |
|
| 519 | 519 | 'newOffset' => $newOffset, |
| 520 | 520 | 'totalSize' => $post_totalSize, |
| 521 | 521 | 'clearFilename' => $post_backupFile, |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
| 73 | 73 | // Not allowed page |
| 74 | 74 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 75 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 75 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 76 | 76 | exit; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -133,14 +133,14 @@ discard block |
||
| 133 | 133 | break; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 136 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 137 | 137 | $return = ''; |
| 138 | 138 | |
| 139 | 139 | //Get all tables |
| 140 | 140 | $tables = array(); |
| 141 | 141 | $result = DB::query('SHOW TABLES'); |
| 142 | 142 | foreach ($result as $row) { |
| 143 | - $tables[] = $row['Tables_in_' . DB_NAME]; |
|
| 143 | + $tables[] = $row['Tables_in_'.DB_NAME]; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | //cycle through |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) { |
| 149 | 149 | $table = (is_string($table) ? $table : strval($table)); |
| 150 | 150 | // Do query |
| 151 | - $result = DB::query('SELECT * FROM ' . $table); |
|
| 151 | + $result = DB::query('SELECT * FROM '.$table); |
|
| 152 | 152 | DB::query( |
| 153 | 153 | 'SELECT * |
| 154 | 154 | FROM INFORMATION_SCHEMA.COLUMNS |
@@ -160,20 +160,20 @@ discard block |
||
| 160 | 160 | $numFields = DB::count(); |
| 161 | 161 | |
| 162 | 162 | // prepare a drop table |
| 163 | - $return .= 'DROP TABLE ' . $table . ';'; |
|
| 164 | - $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table); |
|
| 165 | - $return .= "\n\n" . strval($row2['Create Table']) . ";\n\n"; |
|
| 163 | + $return .= 'DROP TABLE '.$table.';'; |
|
| 164 | + $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table); |
|
| 165 | + $return .= "\n\n".strval($row2['Create Table']).";\n\n"; |
|
| 166 | 166 | |
| 167 | 167 | //prepare all fields and datas |
| 168 | 168 | for ($i = 0; $i < $numFields; ++$i) { |
| 169 | 169 | if (is_object($result)) { |
| 170 | 170 | while ($row = $result->fetch_row()) { |
| 171 | - $return .= 'INSERT INTO ' . $table . ' VALUES('; |
|
| 171 | + $return .= 'INSERT INTO '.$table.' VALUES('; |
|
| 172 | 172 | for ($j = 0; $j < $numFields; ++$j) { |
| 173 | 173 | $row[$j] = addslashes($row[$j]); |
| 174 | 174 | $row[$j] = preg_replace("/\n/", '\\n', $row[$j]); |
| 175 | 175 | if (isset($row[$j])) { |
| 176 | - $return .= '"' . $row[$j] . '"'; |
|
| 176 | + $return .= '"'.$row[$j].'"'; |
|
| 177 | 177 | } else { |
| 178 | 178 | $return .= 'NULL'; |
| 179 | 179 | } |
@@ -194,8 +194,8 @@ discard block |
||
| 194 | 194 | $token = GenerateCryptKey(20, false, true, true, false, true); |
| 195 | 195 | |
| 196 | 196 | //save file |
| 197 | - $filename = time() . '-' . $token . '.sql'; |
|
| 198 | - $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+'); |
|
| 197 | + $filename = time().'-'.$token.'.sql'; |
|
| 198 | + $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+'); |
|
| 199 | 199 | if ($handle !== false) { |
| 200 | 200 | //write file |
| 201 | 201 | fwrite($handle, $return); |
@@ -207,16 +207,16 @@ discard block |
||
| 207 | 207 | // Encrypt the file |
| 208 | 208 | prepareFileWithDefuse( |
| 209 | 209 | 'encrypt', |
| 210 | - $SETTINGS['path_to_files_folder'] . '/' . $filename, |
|
| 211 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 210 | + $SETTINGS['path_to_files_folder'].'/'.$filename, |
|
| 211 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 212 | 212 | $post_option |
| 213 | 213 | ); |
| 214 | 214 | |
| 215 | 215 | // Do clean |
| 216 | - unlink($SETTINGS['path_to_files_folder'] . '/' . $filename); |
|
| 216 | + unlink($SETTINGS['path_to_files_folder'].'/'.$filename); |
|
| 217 | 217 | rename( |
| 218 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 219 | - $SETTINGS['path_to_files_folder'] . '/' . $filename |
|
| 218 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 219 | + $SETTINGS['path_to_files_folder'].'/'.$filename |
|
| 220 | 220 | ); |
| 221 | 221 | } |
| 222 | 222 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | //update LOG |
| 227 | 227 | logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $session->get('user-id'), $session->get('user-login')); |
| 228 | 228 | |
| 229 | - echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . $session->get('user-key_tmp') . '&pathIsFiles=1"}]'; |
|
| 229 | + echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.$session->get('user-key_tmp').'&pathIsFiles=1"}]'; |
|
| 230 | 230 | } |
| 231 | 231 | break; |
| 232 | 232 | |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | ); |
| 256 | 256 | break; |
| 257 | 257 | } |
| 258 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 258 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 259 | 259 | |
| 260 | 260 | $dataPost = explode('&', $post_option); |
| 261 | 261 | $file = htmlspecialchars($dataPost[0]); |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // Get filename from database |
| 265 | 265 | $data = DB::queryFirstRow( |
| 266 | 266 | 'SELECT valeur |
| 267 | - FROM ' . prefixTable('misc') . ' |
|
| 267 | + FROM ' . prefixTable('misc').' |
|
| 268 | 268 | WHERE increment_id = %i', |
| 269 | 269 | $file |
| 270 | 270 | ); |
@@ -283,8 +283,8 @@ discard block |
||
| 283 | 283 | // Decrypt the file |
| 284 | 284 | $ret = prepareFileWithDefuse( |
| 285 | 285 | 'decrypt', |
| 286 | - $SETTINGS['path_to_files_folder'] . '/' . $file, |
|
| 287 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file, |
|
| 286 | + $SETTINGS['path_to_files_folder'].'/'.$file, |
|
| 287 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file, |
|
| 288 | 288 | $key |
| 289 | 289 | ); |
| 290 | 290 | |
@@ -295,10 +295,10 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | // Do clean |
| 298 | - fileDelete($SETTINGS['path_to_files_folder'] . '/' . $file, $SETTINGS); |
|
| 299 | - $file = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file; |
|
| 298 | + fileDelete($SETTINGS['path_to_files_folder'].'/'.$file, $SETTINGS); |
|
| 299 | + $file = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file; |
|
| 300 | 300 | } else { |
| 301 | - $file = $SETTINGS['path_to_files_folder'] . '/' . $file; |
|
| 301 | + $file = $SETTINGS['path_to_files_folder'].'/'.$file; |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | //read sql file |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | fclose($handle); |
| 316 | 316 | |
| 317 | 317 | //delete file |
| 318 | - unlink($SETTINGS['path_to_files_folder'] . '/' . $file); |
|
| 318 | + unlink($SETTINGS['path_to_files_folder'].'/'.$file); |
|
| 319 | 319 | |
| 320 | 320 | //Show done |
| 321 | 321 | echo '[{"result":"db_restore" , "message":""}]'; |
@@ -354,8 +354,8 @@ discard block |
||
| 354 | 354 | $tablename = (is_string($tablename) ? $tablename : strval($tablename)); |
| 355 | 355 | if (substr_count($tablename, DB_PREFIX) > 0) { |
| 356 | 356 | // launch optimization quieries |
| 357 | - DB::query('ANALYZE TABLE `' . $tablename . '`'); |
|
| 358 | - DB::query('OPTIMIZE TABLE `' . $tablename . '`'); |
|
| 357 | + DB::query('ANALYZE TABLE `'.$tablename.'`'); |
|
| 358 | + DB::query('OPTIMIZE TABLE `'.$tablename.'`'); |
|
| 359 | 359 | } |
| 360 | 360 | } |
| 361 | 361 | } |
@@ -363,12 +363,12 @@ discard block |
||
| 363 | 363 | //Clean up LOG_ITEMS table |
| 364 | 364 | $rows = DB::query( |
| 365 | 365 | 'SELECT id |
| 366 | - FROM ' . prefixTable('items') . ' |
|
| 366 | + FROM ' . prefixTable('items').' |
|
| 367 | 367 | ORDER BY id ASC' |
| 368 | 368 | ); |
| 369 | 369 | foreach ($rows as $item) { |
| 370 | 370 | DB::query( |
| 371 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s', |
|
| 371 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s', |
|
| 372 | 372 | $item['id'], |
| 373 | 373 | 'at_creation' |
| 374 | 374 | ); |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | if ($counter === 0) { |
| 377 | 377 | //Create new at_creation entry |
| 378 | 378 | $rowTmp = DB::queryFirstRow( |
| 379 | - 'SELECT date, id_user FROM ' . prefixTable('log_items') . ' WHERE id_item=%i ORDER BY date ASC', |
|
| 379 | + 'SELECT date, id_user FROM '.prefixTable('log_items').' WHERE id_item=%i ORDER BY date ASC', |
|
| 380 | 380 | $item['id'] |
| 381 | 381 | ); |
| 382 | 382 | DB::insert( |
@@ -406,8 +406,8 @@ discard block |
||
| 406 | 406 | echo prepareExchangedData( |
| 407 | 407 | array( |
| 408 | 408 | 'error' => false, |
| 409 | - 'message' => $lang->get('last_execution') . ' ' . |
|
| 410 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
| 409 | + 'message' => $lang->get('last_execution').' '. |
|
| 410 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
| 411 | 411 | '<i class="fas fa-check text-success ml-2"></i>', |
| 412 | 412 | ), |
| 413 | 413 | 'encode' |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | break; |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 446 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 447 | 447 | updateCacheTable('reload', NULL); |
| 448 | 448 | |
| 449 | 449 | // Log |
@@ -459,8 +459,8 @@ discard block |
||
| 459 | 459 | echo prepareExchangedData( |
| 460 | 460 | [ |
| 461 | 461 | 'error' => false, |
| 462 | - 'message' => $lang->get('last_execution') . ' ' . |
|
| 463 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
| 462 | + 'message' => $lang->get('last_execution').' '. |
|
| 463 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
| 464 | 464 | '<i class="fas fa-check text-success mr-2"></i>', |
| 465 | 465 | ], |
| 466 | 466 | 'encode' |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | $session->set('user-reencrypt_old_salt', file_get_contents(SECUREPATH.'/'.SECUREFILE)); |
| 503 | 503 | |
| 504 | 504 | // generate new saltkey |
| 505 | - $old_sk_filename = SECUREPATH.'/'.SECUREFILE . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time(); |
|
| 505 | + $old_sk_filename = SECUREPATH.'/'.SECUREFILE.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time(); |
|
| 506 | 506 | copy( |
| 507 | 507 | SECUREPATH.'/'.SECUREFILE, |
| 508 | 508 | $old_sk_filename |
@@ -531,13 +531,13 @@ discard block |
||
| 531 | 531 | logEvents($SETTINGS, 'system', 'change_salt_key', (string) $session->get('user-id'), $session->get('user-login')); |
| 532 | 532 | |
| 533 | 533 | // get number of items to change |
| 534 | - DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', 0); |
|
| 534 | + DB::query('SELECT id FROM '.prefixTable('items').' WHERE perso = %i', 0); |
|
| 535 | 535 | $nb_of_items = DB::count(); |
| 536 | 536 | |
| 537 | 537 | // create backup table |
| 538 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
| 538 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
| 539 | 539 | DB::query( |
| 540 | - 'CREATE TABLE `' . prefixTable('sk_reencrypt_backup') . '` ( |
|
| 540 | + 'CREATE TABLE `'.prefixTable('sk_reencrypt_backup').'` ( |
|
| 541 | 541 | `id` int(12) NOT null AUTO_INCREMENT, |
| 542 | 542 | `current_table` varchar(100) NOT NULL, |
| 543 | 543 | `current_field` varchar(500) NOT NULL, |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | ); |
| 566 | 566 | |
| 567 | 567 | // delete previous backup files |
| 568 | - $files = glob($SETTINGS['path_to_upload_folder'] . '/*'); // get all file names |
|
| 568 | + $files = glob($SETTINGS['path_to_upload_folder'].'/*'); // get all file names |
|
| 569 | 569 | foreach ($files as $file) { // iterate files |
| 570 | 570 | if (is_file($file)) { |
| 571 | 571 | $file_parts = pathinfo($file); |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | echo prepareExchangedData( |
| 653 | 653 | array( |
| 654 | 654 | 'error' => true, |
| 655 | - 'message' => 'Input `' . $objects[0] . '` is not allowed', |
|
| 655 | + 'message' => 'Input `'.$objects[0].'` is not allowed', |
|
| 656 | 656 | 'nbOfItems' => '', |
| 657 | 657 | 'nextAction' => '', |
| 658 | 658 | ), |
@@ -665,9 +665,9 @@ discard block |
||
| 665 | 665 | //change all encrypted data in Items (passwords) |
| 666 | 666 | $rows = DB::query( |
| 667 | 667 | 'SELECT id, pw, pw_iv |
| 668 | - FROM ' . prefixTable('items') . ' |
|
| 668 | + FROM ' . prefixTable('items').' |
|
| 669 | 669 | WHERE perso = %s |
| 670 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
| 670 | + LIMIT ' . $post_start.', '.$post_length, |
|
| 671 | 671 | '0' |
| 672 | 672 | ); |
| 673 | 673 | foreach ($rows as $record) { |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | 'current_field' => 'pw', |
| 680 | 680 | 'value_id' => $record['id'], |
| 681 | 681 | 'value' => $record['pw'], |
| 682 | - 'current_sql' => 'UPDATE ' . prefixTable('items') . " SET pw = '" . $record['pw'] . "' WHERE id = '" . $record['id'] . "';", |
|
| 682 | + 'current_sql' => 'UPDATE '.prefixTable('items')." SET pw = '".$record['pw']."' WHERE id = '".$record['id']."';", |
|
| 683 | 683 | 'value2' => 'none', |
| 684 | 684 | 'result' => 'none', |
| 685 | 685 | ) |
@@ -728,9 +728,9 @@ discard block |
||
| 728 | 728 | //change all encrypted data in Logs (passwords) |
| 729 | 729 | $rows = DB::query( |
| 730 | 730 | 'SELECT raison, increment_id |
| 731 | - FROM ' . prefixTable('log_items') . " |
|
| 731 | + FROM ' . prefixTable('log_items')." |
|
| 732 | 732 | WHERE action = %s AND raison LIKE 'at_pw :%' |
| 733 | - LIMIT " . $post_start . ', ' . $post_length, |
|
| 733 | + LIMIT " . $post_start.', '.$post_length, |
|
| 734 | 734 | 'at_modification' |
| 735 | 735 | ); |
| 736 | 736 | foreach ($rows as $record) { |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | 'current_field' => 'raison', |
| 743 | 743 | 'value_id' => $record['increment_id'], |
| 744 | 744 | 'value' => $record['raison'], |
| 745 | - 'current_sql' => 'UPDATE ' . prefixTable('log_items') . " SET raison = '" . $record['raison'] . "' WHERE increment_id = '" . $record['increment_id'] . "';", |
|
| 745 | + 'current_sql' => 'UPDATE '.prefixTable('log_items')." SET raison = '".$record['raison']."' WHERE increment_id = '".$record['increment_id']."';", |
|
| 746 | 746 | 'value2' => 'none', |
| 747 | 747 | 'result' => 'none', |
| 748 | 748 | ) |
@@ -770,7 +770,7 @@ discard block |
||
| 770 | 770 | DB::update( |
| 771 | 771 | prefixTable('log_items'), |
| 772 | 772 | array( |
| 773 | - 'raison' => 'at_pw :' . $encrypt['string'], |
|
| 773 | + 'raison' => 'at_pw :'.$encrypt['string'], |
|
| 774 | 774 | 'encryption_type' => 'defuse', |
| 775 | 775 | ), |
| 776 | 776 | 'increment_id = %i', |
@@ -795,8 +795,8 @@ discard block |
||
| 795 | 795 | //change all encrypted data in CATEGORIES (passwords) |
| 796 | 796 | $rows = DB::query( |
| 797 | 797 | 'SELECT id, data |
| 798 | - FROM ' . prefixTable('categories_items') . ' |
|
| 799 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 798 | + FROM ' . prefixTable('categories_items').' |
|
| 799 | + LIMIT ' . $post_start.', '.$post_length |
|
| 800 | 800 | ); |
| 801 | 801 | foreach ($rows as $record) { |
| 802 | 802 | // backup data |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | 'current_field' => 'data', |
| 808 | 808 | 'value_id' => $record['id'], |
| 809 | 809 | 'value' => $record['data'], |
| 810 | - 'current_sql' => 'UPDATE ' . prefixTable('categories_items') . " SET data = '" . $record['data'] . "' WHERE id = '" . $record['id'] . "';", |
|
| 810 | + 'current_sql' => 'UPDATE '.prefixTable('categories_items')." SET data = '".$record['data']."' WHERE id = '".$record['id']."';", |
|
| 811 | 811 | 'value2' => 'none', |
| 812 | 812 | 'result' => 'none', |
| 813 | 813 | ) |
@@ -855,9 +855,9 @@ discard block |
||
| 855 | 855 | // Change all encrypted data in FILES (passwords) |
| 856 | 856 | $rows = DB::query( |
| 857 | 857 | 'SELECT id, file, status |
| 858 | - FROM ' . prefixTable('files') . " |
|
| 858 | + FROM ' . prefixTable('files')." |
|
| 859 | 859 | WHERE status = 'encrypted' |
| 860 | - LIMIT " . $post_start . ', ' . $post_length |
|
| 860 | + LIMIT " . $post_start.', '.$post_length |
|
| 861 | 861 | ); |
| 862 | 862 | foreach ($rows as $record) { |
| 863 | 863 | // backup data |
@@ -875,20 +875,20 @@ discard block |
||
| 875 | 875 | ); |
| 876 | 876 | $newID = DB::insertId(); |
| 877 | 877 | |
| 878 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) { |
|
| 878 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) { |
|
| 879 | 879 | // make a copy of file |
| 880 | 880 | if (!copy( |
| 881 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
| 882 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '.copy' |
|
| 881 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
| 882 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'.copy' |
|
| 883 | 883 | )) { |
| 884 | 884 | $error = 'Copy not possible'; |
| 885 | 885 | exit; |
| 886 | 886 | } else { |
| 887 | 887 | // prepare a bck of file (that will not be deleted) |
| 888 | - $backup_filename = $record['file'] . '.bck-change-sk.' . time(); |
|
| 888 | + $backup_filename = $record['file'].'.bck-change-sk.'.time(); |
|
| 889 | 889 | copy( |
| 890 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
| 891 | - $SETTINGS['path_to_upload_folder'] . '/' . $backup_filename |
|
| 890 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
| 891 | + $SETTINGS['path_to_upload_folder'].'/'.$backup_filename |
|
| 892 | 892 | ); |
| 893 | 893 | } |
| 894 | 894 | |
@@ -896,22 +896,22 @@ discard block |
||
| 896 | 896 | // STEP1 - Do decryption |
| 897 | 897 | prepareFileWithDefuse( |
| 898 | 898 | 'decrypt', |
| 899 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
| 900 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted' |
|
| 899 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
| 900 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted' |
|
| 901 | 901 | ); |
| 902 | 902 | |
| 903 | 903 | // Do cleanup of files |
| 904 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file']); |
|
| 904 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file']); |
|
| 905 | 905 | |
| 906 | 906 | // STEP2 - Do encryption |
| 907 | 907 | prepareFileWithDefuse( |
| 908 | 908 | 'encryp', |
| 909 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted', |
|
| 910 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] |
|
| 909 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted', |
|
| 910 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'] |
|
| 911 | 911 | ); |
| 912 | 912 | |
| 913 | 913 | // Do cleanup of files |
| 914 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted'); |
|
| 914 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted'); |
|
| 915 | 915 | |
| 916 | 916 | // Update backup table |
| 917 | 917 | DB::update( |
@@ -937,13 +937,13 @@ discard block |
||
| 937 | 937 | // do some things for new object |
| 938 | 938 | if (isset($objects[0])) { |
| 939 | 939 | if ($objects[0] === 'logs') { |
| 940 | - DB::query('SELECT increment_id FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 940 | + DB::query('SELECT increment_id FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 941 | 941 | } elseif ($objects[0] === 'files') { |
| 942 | - DB::query('SELECT id FROM ' . prefixTable('files')); |
|
| 942 | + DB::query('SELECT id FROM '.prefixTable('files')); |
|
| 943 | 943 | } elseif ($objects[0] === 'categories') { |
| 944 | - DB::query('SELECT id FROM ' . prefixTable('categories_items')); |
|
| 944 | + DB::query('SELECT id FROM '.prefixTable('categories_items')); |
|
| 945 | 945 | } elseif ($objects[0] === 'custfields') { |
| 946 | - DB::query('SELECT raison FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 946 | + DB::query('SELECT raison FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 947 | 947 | } |
| 948 | 948 | $nb_of_items = DB::count(); |
| 949 | 949 | } else { |
@@ -1063,12 +1063,12 @@ discard block |
||
| 1063 | 1063 | ); |
| 1064 | 1064 | } elseif ($record['current_table'] === 'files') { |
| 1065 | 1065 | // restore backup file |
| 1066 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value'])) { |
|
| 1067 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value']); |
|
| 1068 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) { |
|
| 1066 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value'])) { |
|
| 1067 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value']); |
|
| 1068 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) { |
|
| 1069 | 1069 | rename( |
| 1070 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['value2'], |
|
| 1071 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['value'] |
|
| 1070 | + $SETTINGS['path_to_upload_folder'].'/'.$record['value2'], |
|
| 1071 | + $SETTINGS['path_to_upload_folder'].'/'.$record['value'] |
|
| 1072 | 1072 | ); |
| 1073 | 1073 | } |
| 1074 | 1074 | } |
@@ -1087,7 +1087,7 @@ discard block |
||
| 1087 | 1087 | } |
| 1088 | 1088 | |
| 1089 | 1089 | // drop table |
| 1090 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
| 1090 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
| 1091 | 1091 | |
| 1092 | 1092 | // Send back |
| 1093 | 1093 | echo prepareExchangedData( |
@@ -1130,17 +1130,17 @@ discard block |
||
| 1130 | 1130 | // delete files |
| 1131 | 1131 | $rows = DB::query( |
| 1132 | 1132 | 'SELECT value, value2 |
| 1133 | - FROM ' . prefixTable('sk_reencrypt_backup') . " |
|
| 1133 | + FROM ' . prefixTable('sk_reencrypt_backup')." |
|
| 1134 | 1134 | WHERE current_table = 'files'" |
| 1135 | 1135 | ); |
| 1136 | 1136 | foreach ($rows as $record) { |
| 1137 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) { |
|
| 1138 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value2']); |
|
| 1137 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) { |
|
| 1138 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value2']); |
|
| 1139 | 1139 | } |
| 1140 | 1140 | } |
| 1141 | 1141 | |
| 1142 | 1142 | // drop table |
| 1143 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
| 1143 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
| 1144 | 1144 | |
| 1145 | 1145 | echo '[{"status":"done"}]'; |
| 1146 | 1146 | break; |
@@ -1171,7 +1171,7 @@ discard block |
||
| 1171 | 1171 | 'encode' |
| 1172 | 1172 | ); |
| 1173 | 1173 | } else { |
| 1174 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1174 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1175 | 1175 | |
| 1176 | 1176 | //send email |
| 1177 | 1177 | $emailSettings = new EmailSettings($SETTINGS); |
@@ -1209,13 +1209,13 @@ discard block |
||
| 1209 | 1209 | break; |
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1212 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1213 | 1213 | $emailSettings = new EmailSettings($SETTINGS); |
| 1214 | 1214 | $emailService = new EmailService(); |
| 1215 | 1215 | |
| 1216 | 1216 | $rows = DB::query( |
| 1217 | 1217 | 'SELECT * |
| 1218 | - FROM ' . prefixTable('emails') . ' |
|
| 1218 | + FROM ' . prefixTable('emails').' |
|
| 1219 | 1219 | WHERE status = %s OR status = %s', |
| 1220 | 1220 | 'not_sent', |
| 1221 | 1221 | '' |
@@ -1301,13 +1301,13 @@ discard block |
||
| 1301 | 1301 | break; |
| 1302 | 1302 | } |
| 1303 | 1303 | |
| 1304 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1304 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1305 | 1305 | |
| 1306 | 1306 | // Instatiate email settings and service |
| 1307 | 1307 | $emailSettings = new EmailSettings($SETTINGS); |
| 1308 | 1308 | $emailService = new EmailService(); |
| 1309 | 1309 | |
| 1310 | - $rows = DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', ''); |
|
| 1310 | + $rows = DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', ''); |
|
| 1311 | 1311 | foreach ($rows as $record) { |
| 1312 | 1312 | //send email |
| 1313 | 1313 | $email = $emailService->sendMail( |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | break; |
| 1377 | 1377 | } |
| 1378 | 1378 | |
| 1379 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1379 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1380 | 1380 | |
| 1381 | 1381 | // init |
| 1382 | 1382 | $filesList = array(); |
@@ -1389,7 +1389,7 @@ discard block |
||
| 1389 | 1389 | FROM ' . prefixTable('files') |
| 1390 | 1390 | ); |
| 1391 | 1391 | foreach ($rows as $record) { |
| 1392 | - if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) { |
|
| 1392 | + if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) { |
|
| 1393 | 1393 | $addFile = false; |
| 1394 | 1394 | if (($post_option === 'attachments-decrypt' && $record['status'] === 'encrypted') |
| 1395 | 1395 | || ($post_option === 'attachments-encrypt' && $record['status'] === 'clear') |
@@ -1454,8 +1454,8 @@ discard block |
||
| 1454 | 1454 | $post_list = filter_var_array($post_list, FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 1455 | 1455 | $post_counter = filter_var($post_counter, FILTER_SANITIZE_NUMBER_INT); |
| 1456 | 1456 | |
| 1457 | - include $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 1458 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1457 | + include $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 1458 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1459 | 1459 | |
| 1460 | 1460 | $cpt = 0; |
| 1461 | 1461 | $continu = true; |
@@ -1468,33 +1468,33 @@ discard block |
||
| 1468 | 1468 | // Get file name |
| 1469 | 1469 | $file_info = DB::queryFirstRow( |
| 1470 | 1470 | 'SELECT file |
| 1471 | - FROM ' . prefixTable('files') . ' |
|
| 1471 | + FROM ' . prefixTable('files').' |
|
| 1472 | 1472 | WHERE id = %i', |
| 1473 | 1473 | $file |
| 1474 | 1474 | ); |
| 1475 | 1475 | |
| 1476 | 1476 | // skip file is Coherancey not respected |
| 1477 | - if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'])) { |
|
| 1477 | + if (is_file($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'])) { |
|
| 1478 | 1478 | // Case where we want to decrypt |
| 1479 | 1479 | if ($post_option === 'decrypt') { |
| 1480 | 1480 | prepareFileWithDefuse( |
| 1481 | 1481 | 'decrypt', |
| 1482 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], |
|
| 1483 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
| 1482 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], |
|
| 1483 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
| 1484 | 1484 | ); |
| 1485 | 1485 | // Case where we want to encrypt |
| 1486 | 1486 | } elseif ($post_option === 'encrypt') { |
| 1487 | 1487 | prepareFileWithDefuse( |
| 1488 | 1488 | 'encrypt', |
| 1489 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], |
|
| 1490 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
| 1489 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], |
|
| 1490 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
| 1491 | 1491 | ); |
| 1492 | 1492 | } |
| 1493 | 1493 | // Do file cleanup |
| 1494 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], $SETTINGS); |
|
| 1494 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], $SETTINGS); |
|
| 1495 | 1495 | rename( |
| 1496 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
| 1497 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'] |
|
| 1496 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
| 1497 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'] |
|
| 1498 | 1498 | ); |
| 1499 | 1499 | |
| 1500 | 1500 | // store in DB |
@@ -1529,8 +1529,8 @@ discard block |
||
| 1529 | 1529 | $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted' |
| 1530 | 1530 | ); |
| 1531 | 1531 | |
| 1532 | - $message = $lang->get('last_execution') . ' ' . |
|
| 1533 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
| 1532 | + $message = $lang->get('last_execution').' '. |
|
| 1533 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
| 1534 | 1534 | '<i class="fas fa-check text-success ml-2 mr-3"></i>'; |
| 1535 | 1535 | } |
| 1536 | 1536 | |
@@ -1624,7 +1624,7 @@ discard block |
||
| 1624 | 1624 | $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 1625 | 1625 | |
| 1626 | 1626 | DB::query( |
| 1627 | - 'DELETE FROM ' . prefixTable('api') . ' WHERE increment_id = %i', |
|
| 1627 | + 'DELETE FROM '.prefixTable('api').' WHERE increment_id = %i', |
|
| 1628 | 1628 | $post_id |
| 1629 | 1629 | ); |
| 1630 | 1630 | } |
@@ -1719,7 +1719,7 @@ discard block |
||
| 1719 | 1719 | // Delete existing key |
| 1720 | 1720 | } elseif (null !== $post_action && $post_action === 'delete') { |
| 1721 | 1721 | $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 1722 | - DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE increment_id=%i', $post_id); |
|
| 1722 | + DB::query('DELETE FROM '.prefixTable('api').' WHERE increment_id=%i', $post_id); |
|
| 1723 | 1723 | } |
| 1724 | 1724 | |
| 1725 | 1725 | echo prepareExchangedData( |
@@ -1734,7 +1734,7 @@ discard block |
||
| 1734 | 1734 | |
| 1735 | 1735 | case 'save_api_status': |
| 1736 | 1736 | // Do query |
| 1737 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'api'); |
|
| 1737 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'api'); |
|
| 1738 | 1738 | $counter = DB::count(); |
| 1739 | 1739 | if ($counter === 0) { |
| 1740 | 1740 | DB::insert( |
@@ -1763,7 +1763,7 @@ discard block |
||
| 1763 | 1763 | |
| 1764 | 1764 | case 'run_duo_config_check': |
| 1765 | 1765 | //Libraries call |
| 1766 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1766 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1767 | 1767 | // Check KEY |
| 1768 | 1768 | if ($post_key !== $session->get('key')) { |
| 1769 | 1769 | echo prepareExchangedData( |
@@ -1869,7 +1869,7 @@ discard block |
||
| 1869 | 1869 | } else { |
| 1870 | 1870 | $tmp = 1; |
| 1871 | 1871 | } |
| 1872 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication'); |
|
| 1872 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication'); |
|
| 1873 | 1873 | $counter = DB::count(); |
| 1874 | 1874 | if ($counter === 0) { |
| 1875 | 1875 | DB::insert( |
@@ -1897,7 +1897,7 @@ discard block |
||
| 1897 | 1897 | |
| 1898 | 1898 | // ga_website_name |
| 1899 | 1899 | if (is_null($dataReceived['ga_website_name']) === false) { |
| 1900 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name'); |
|
| 1900 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name'); |
|
| 1901 | 1901 | $counter = DB::count(); |
| 1902 | 1902 | if ($counter === 0) { |
| 1903 | 1903 | DB::insert( |
@@ -1927,7 +1927,7 @@ discard block |
||
| 1927 | 1927 | } |
| 1928 | 1928 | |
| 1929 | 1929 | // send data |
| 1930 | - echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]'; |
|
| 1930 | + echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]'; |
|
| 1931 | 1931 | break; |
| 1932 | 1932 | |
| 1933 | 1933 | case 'save_agses_options': |
@@ -1950,7 +1950,7 @@ discard block |
||
| 1950 | 1950 | |
| 1951 | 1951 | // agses_hosted_url |
| 1952 | 1952 | if (!is_null($dataReceived['agses_hosted_url'])) { |
| 1953 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url'); |
|
| 1953 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url'); |
|
| 1954 | 1954 | $counter = DB::count(); |
| 1955 | 1955 | if ($counter === 0) { |
| 1956 | 1956 | DB::insert( |
@@ -1981,7 +1981,7 @@ discard block |
||
| 1981 | 1981 | |
| 1982 | 1982 | // agses_hosted_id |
| 1983 | 1983 | if (!is_null($dataReceived['agses_hosted_id'])) { |
| 1984 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id'); |
|
| 1984 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id'); |
|
| 1985 | 1985 | $counter = DB::count(); |
| 1986 | 1986 | if ($counter === 0) { |
| 1987 | 1987 | DB::insert( |
@@ -2012,7 +2012,7 @@ discard block |
||
| 2012 | 2012 | |
| 2013 | 2013 | // agses_hosted_apikey |
| 2014 | 2014 | if (!is_null($dataReceived['agses_hosted_apikey'])) { |
| 2015 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey'); |
|
| 2015 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey'); |
|
| 2016 | 2016 | $counter = DB::count(); |
| 2017 | 2017 | if ($counter === 0) { |
| 2018 | 2018 | DB::insert( |
@@ -2042,7 +2042,7 @@ discard block |
||
| 2042 | 2042 | } |
| 2043 | 2043 | |
| 2044 | 2044 | // send data |
| 2045 | - echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]'; |
|
| 2045 | + echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]'; |
|
| 2046 | 2046 | break; |
| 2047 | 2047 | |
| 2048 | 2048 | case 'save_option_change': |
@@ -2082,7 +2082,7 @@ discard block |
||
| 2082 | 2082 | |
| 2083 | 2083 | // Check if setting is already in DB. If NO then insert, if YES then update. |
| 2084 | 2084 | $data = DB::query( |
| 2085 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
| 2085 | + 'SELECT * FROM '.prefixTable('misc').' |
|
| 2086 | 2086 | WHERE type = %s AND intitule = %s', |
| 2087 | 2087 | 'admin', |
| 2088 | 2088 | $post_field |
@@ -2105,7 +2105,7 @@ discard block |
||
| 2105 | 2105 | array( |
| 2106 | 2106 | 'valeur' => time(), |
| 2107 | 2107 | 'type' => 'admin', |
| 2108 | - 'intitule' => $post_field . '_time', |
|
| 2108 | + 'intitule' => $post_field.'_time', |
|
| 2109 | 2109 | 'updated_at' => time(), |
| 2110 | 2110 | ) |
| 2111 | 2111 | ); |
@@ -2127,10 +2127,10 @@ discard block |
||
| 2127 | 2127 | if ($post_field === 'send_stats') { |
| 2128 | 2128 | // Check if previous time exists, if not them insert this value in DB |
| 2129 | 2129 | DB::query( |
| 2130 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
| 2130 | + 'SELECT * FROM '.prefixTable('misc').' |
|
| 2131 | 2131 | WHERE type = %s AND intitule = %s', |
| 2132 | 2132 | 'admin', |
| 2133 | - $post_field . '_time' |
|
| 2133 | + $post_field.'_time' |
|
| 2134 | 2134 | ); |
| 2135 | 2135 | $counter = DB::count(); |
| 2136 | 2136 | if ($counter === 0) { |
@@ -2139,7 +2139,7 @@ discard block |
||
| 2139 | 2139 | array( |
| 2140 | 2140 | 'valeur' => 0, |
| 2141 | 2141 | 'type' => 'admin', |
| 2142 | - 'intitule' => $post_field . '_time', |
|
| 2142 | + 'intitule' => $post_field.'_time', |
|
| 2143 | 2143 | 'created_at' => time(), |
| 2144 | 2144 | ) |
| 2145 | 2145 | ); |
@@ -2161,13 +2161,13 @@ discard block |
||
| 2161 | 2161 | // special Cases |
| 2162 | 2162 | if ($post_field === 'cpassman_url') { |
| 2163 | 2163 | // update also jsUrl for CSFP protection |
| 2164 | - $jsUrl = $post_value . '/includes/libraries/csrfp/js/csrfprotector.js'; |
|
| 2164 | + $jsUrl = $post_value.'/includes/libraries/csrfp/js/csrfprotector.js'; |
|
| 2165 | 2165 | $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php'; |
| 2166 | 2166 | $data = file_get_contents($csrfp_file); |
| 2167 | 2167 | $posJsUrl = strpos($data, '"jsUrl" => "'); |
| 2168 | 2168 | $posEndLine = strpos($data, '",', $posJsUrl); |
| 2169 | 2169 | $line = substr($data, $posJsUrl, ($posEndLine - $posJsUrl + 2)); |
| 2170 | - $newdata = str_replace($line, '"jsUrl" => "' . filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . '",', $data); |
|
| 2170 | + $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS).'",', $data); |
|
| 2171 | 2171 | file_put_contents($csrfp_file, $newdata); |
| 2172 | 2172 | } elseif ($post_field === 'restricted_to_input' && (int) $post_value === 0) { |
| 2173 | 2173 | DB::update( |
@@ -2192,7 +2192,7 @@ discard block |
||
| 2192 | 2192 | echo prepareExchangedData( |
| 2193 | 2193 | array( |
| 2194 | 2194 | 'error' => false, |
| 2195 | - 'misc' => $counter . ' ; ' . $SETTINGS[$post_field], |
|
| 2195 | + 'misc' => $counter.' ; '.$SETTINGS[$post_field], |
|
| 2196 | 2196 | 'message' => empty($post_translate) === false ? $lang->get($post_translate) : '', |
| 2197 | 2197 | ), |
| 2198 | 2198 | 'encode' |
@@ -2235,7 +2235,7 @@ discard block |
||
| 2235 | 2235 | |
| 2236 | 2236 | // send statistics |
| 2237 | 2237 | if (null !== $post_status) { |
| 2238 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_stats'); |
|
| 2238 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_stats'); |
|
| 2239 | 2239 | $counter = DB::count(); |
| 2240 | 2240 | if ($counter === 0) { |
| 2241 | 2241 | DB::insert( |
@@ -2266,7 +2266,7 @@ discard block |
||
| 2266 | 2266 | |
| 2267 | 2267 | // send statistics items |
| 2268 | 2268 | if (null !== $post_list) { |
| 2269 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items'); |
|
| 2269 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items'); |
|
| 2270 | 2270 | $counter = DB::count(); |
| 2271 | 2271 | if ($counter === 0) { |
| 2272 | 2272 | DB::insert( |
@@ -2312,7 +2312,7 @@ discard block |
||
| 2312 | 2312 | break; |
| 2313 | 2313 | } |
| 2314 | 2314 | |
| 2315 | - if (DB::query("SHOW TABLES LIKE '" . prefixTable('sk_reencrypt_backup') . "'")) { |
|
| 2315 | + if (DB::query("SHOW TABLES LIKE '".prefixTable('sk_reencrypt_backup')."'")) { |
|
| 2316 | 2316 | if (DB::count() === 1) { |
| 2317 | 2317 | echo 1; |
| 2318 | 2318 | } else { |
@@ -2350,7 +2350,7 @@ discard block |
||
| 2350 | 2350 | |
| 2351 | 2351 | $rows = DB::query( |
| 2352 | 2352 | 'SELECT id, title |
| 2353 | - FROM ' . prefixTable('roles_title') . ' |
|
| 2353 | + FROM ' . prefixTable('roles_title').' |
|
| 2354 | 2354 | ORDER BY title ASC' |
| 2355 | 2355 | ); |
| 2356 | 2356 | foreach ($rows as $record) { |
@@ -2466,7 +2466,7 @@ discard block |
||
| 2466 | 2466 | function tablesIntegrityCheck(): array |
| 2467 | 2467 | { |
| 2468 | 2468 | // Get integrity tables file |
| 2469 | - $integrityTablesFile = TEAMPASS_ROOT_PATH . '/includes/tables_integrity.json'; |
|
| 2469 | + $integrityTablesFile = TEAMPASS_ROOT_PATH.'/includes/tables_integrity.json'; |
|
| 2470 | 2470 | if (file_exists($integrityTablesFile) === false) { |
| 2471 | 2471 | return [ |
| 2472 | 2472 | 'error' => true, |
@@ -2484,7 +2484,7 @@ discard block |
||
| 2484 | 2484 | // Get all tables |
| 2485 | 2485 | $tables = []; |
| 2486 | 2486 | foreach (DB::queryFirstColumn("SHOW TABLES") as $table) { |
| 2487 | - $tables[] = str_replace(DB_PREFIX, "", $table);; |
|
| 2487 | + $tables[] = str_replace(DB_PREFIX, "", $table); ; |
|
| 2488 | 2488 | } |
| 2489 | 2489 | // Prepare the integrity check |
| 2490 | 2490 | $tablesInError = []; |
@@ -137,14 +137,14 @@ discard block |
||
| 137 | 137 | && $t->personal_folder == 0 |
| 138 | 138 | ) { |
| 139 | 139 | // get $t->parent_id |
| 140 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $t->parent_id); |
|
| 140 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $t->parent_id); |
|
| 141 | 141 | if ($t->nlevel == 1) { |
| 142 | 142 | $data['title'] = $lang->get('root'); |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // get rights on this folder |
| 146 | 146 | $arrayRights = array(); |
| 147 | - $rows = DB::query('SELECT fonction_id FROM ' . prefixTable('rights') . ' WHERE authorized=%i AND tree_id = %i', 1, $t->id); |
|
| 147 | + $rows = DB::query('SELECT fonction_id FROM '.prefixTable('rights').' WHERE authorized=%i AND tree_id = %i', 1, $t->id); |
|
| 148 | 148 | foreach ($rows as $record) { |
| 149 | 149 | array_push($arrayRights, $record['fonction_id']); |
| 150 | 150 | } |
@@ -162,8 +162,8 @@ discard block |
||
| 162 | 162 | 'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period, |
| 163 | 163 | n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification, |
| 164 | 164 | n.fa_icon AS fa_icon, n.fa_icon_selected AS fa_icon_selected |
| 165 | - FROM ' . prefixTable('misc') . ' AS m, |
|
| 166 | - ' . prefixTable('nested_tree') . ' AS n |
|
| 165 | + FROM ' . prefixTable('misc').' AS m, |
|
| 166 | + ' . prefixTable('nested_tree').' AS n |
|
| 167 | 167 | WHERE m.type=%s AND m.intitule = n.id AND m.intitule = %i', |
| 168 | 168 | 'complex', |
| 169 | 169 | $t->id |
@@ -191,16 +191,16 @@ discard block |
||
| 191 | 191 | $arrayColumns['folderComplexity'] = ''; |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - if (is_null($node_data)=== false) { |
|
| 194 | + if (is_null($node_data) === false) { |
|
| 195 | 195 | $arrayColumns['renewalPeriod'] = (int) $node_data['renewal_period']; |
| 196 | 196 | } else { |
| 197 | - $arrayColumns['renewalPeriod']=0; |
|
| 197 | + $arrayColumns['renewalPeriod'] = 0; |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | //col7 |
| 201 | 201 | $data7 = DB::queryFirstRow( |
| 202 | 202 | 'SELECT bloquer_creation,bloquer_modification |
| 203 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 203 | + FROM ' . prefixTable('nested_tree').' |
|
| 204 | 204 | WHERE id = %i', |
| 205 | 205 | intval($t->id) |
| 206 | 206 | ); |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | // Get info about this folder |
| 359 | 359 | $dataFolder = DB::queryFirstRow( |
| 360 | 360 | 'SELECT * |
| 361 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 361 | + FROM ' . prefixTable('nested_tree').' |
|
| 362 | 362 | WHERE id = %i', |
| 363 | 363 | $inputData['id'] |
| 364 | 364 | ); |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | //check if parent folder is personal |
| 395 | 395 | $dataParent = DB::queryFirstRow( |
| 396 | 396 | 'SELECT personal_folder, bloquer_creation, bloquer_modification |
| 397 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 397 | + FROM ' . prefixTable('nested_tree').' |
|
| 398 | 398 | WHERE id = %i', |
| 399 | 399 | $inputData['parentId'] |
| 400 | 400 | ); |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | // get complexity level for this folder |
| 424 | 424 | $data = DB::queryFirstRow( |
| 425 | 425 | 'SELECT valeur |
| 426 | - FROM ' . prefixTable('misc') . ' |
|
| 426 | + FROM ' . prefixTable('misc').' |
|
| 427 | 427 | WHERE intitule = %i AND type = %s', |
| 428 | 428 | $inputData['parentId'], |
| 429 | 429 | 'complex' |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | array( |
| 435 | 435 | 'error' => true, |
| 436 | 436 | 'message' => $lang->get('error_folder_complexity_lower_than_top_folder') |
| 437 | - . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]', |
|
| 437 | + . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]', |
|
| 438 | 438 | ), |
| 439 | 439 | 'encode' |
| 440 | 440 | ); |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | // Check if parent folder is personal |
| 595 | 595 | $dataParent = DB::queryFirstRow( |
| 596 | 596 | 'SELECT personal_folder |
| 597 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 597 | + FROM ' . prefixTable('nested_tree').' |
|
| 598 | 598 | WHERE id = %i', |
| 599 | 599 | $inputData['parentId'] |
| 600 | 600 | ); |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | echo prepareExchangedData( |
| 635 | 635 | array( |
| 636 | 636 | 'error' => $creationStatus['error'], |
| 637 | - 'message' => $creationStatus['error'] === true ? $lang->get('error_not_allowed_to') : $lang->get('folder_created') , |
|
| 637 | + 'message' => $creationStatus['error'] === true ? $lang->get('error_not_allowed_to') : $lang->get('folder_created'), |
|
| 638 | 638 | 'newId' => $creationStatus['newId'], |
| 639 | 639 | ), |
| 640 | 640 | 'encode' |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | echo prepareExchangedData( |
| 683 | 683 | array( |
| 684 | 684 | 'error' => true, |
| 685 | - 'message' => $lang->get('error_not_allowed_to'). " (You can't delete the root folder)", |
|
| 685 | + 'message' => $lang->get('error_not_allowed_to')." (You can't delete the root folder)", |
|
| 686 | 686 | ), |
| 687 | 687 | 'encode' |
| 688 | 688 | ); |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | // Ensure that user has access to all folders |
| 693 | 693 | $foldersAccessible = DB::query( |
| 694 | 694 | 'SELECT id |
| 695 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 695 | + FROM ' . prefixTable('nested_tree').' |
|
| 696 | 696 | WHERE id IN %li AND id IN %li', |
| 697 | 697 | $post_folders, |
| 698 | 698 | $session->get('user-accessible_folders') |
@@ -706,7 +706,7 @@ discard block |
||
| 706 | 706 | echo prepareExchangedData( |
| 707 | 707 | array( |
| 708 | 708 | 'error' => true, |
| 709 | - 'message' => $lang->get('error_not_allowed_to') . ' (The following folders are not accessible or do not exist: ' . implode(', ', $missingFolders) . ')', |
|
| 709 | + 'message' => $lang->get('error_not_allowed_to').' (The following folders are not accessible or do not exist: '.implode(', ', $missingFolders).')', |
|
| 710 | 710 | ), |
| 711 | 711 | 'encode' |
| 712 | 712 | ); |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | // Check if parent folder is personal |
| 724 | 724 | $dataParent = DB::queryFirstRow( |
| 725 | 725 | 'SELECT personal_folder |
| 726 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 726 | + FROM ' . prefixTable('nested_tree').' |
|
| 727 | 727 | WHERE id = %i', |
| 728 | 728 | $folderId |
| 729 | 729 | ); |
@@ -769,10 +769,10 @@ discard block |
||
| 769 | 769 | prefixTable('misc'), |
| 770 | 770 | array( |
| 771 | 771 | 'type' => 'folder_deleted', |
| 772 | - 'intitule' => 'f' . $thisSubFolders->id, |
|
| 773 | - 'valeur' => $thisSubFolders->id . ', ' . $thisSubFolders->parent_id . ', ' . |
|
| 774 | - $thisSubFolders->title . ', ' . $thisSubFolders->nleft . ', ' . $thisSubFolders->nright . ', ' . |
|
| 775 | - $thisSubFolders->nlevel . ', 0, 0, 0, 0', |
|
| 772 | + 'intitule' => 'f'.$thisSubFolders->id, |
|
| 773 | + 'valeur' => $thisSubFolders->id.', '.$thisSubFolders->parent_id.', '. |
|
| 774 | + $thisSubFolders->title.', '.$thisSubFolders->nleft.', '.$thisSubFolders->nright.', '. |
|
| 775 | + $thisSubFolders->nlevel.', 0, 0, 0, 0', |
|
| 776 | 776 | 'created_at' => time(), |
| 777 | 777 | ) |
| 778 | 778 | ); |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | |
| 782 | 782 | //delete items & logs |
| 783 | 783 | $itemsInSubFolder = DB::query( |
| 784 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 784 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 785 | 785 | WHERE id_tree=%i', |
| 786 | 786 | $thisSubFolders->id |
| 787 | 787 | ); |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | } |
| 812 | 812 | |
| 813 | 813 | //Update CACHE table |
| 814 | - updateCacheTable('delete_value',(int) $item['id']); |
|
| 814 | + updateCacheTable('delete_value', (int) $item['id']); |
|
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | //Actualize the variable |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | // Check if target parent folder is personal |
| 922 | 922 | $dataParent = DB::queryFirstRow( |
| 923 | 923 | 'SELECT personal_folder |
| 924 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 924 | + FROM ' . prefixTable('nested_tree').' |
|
| 925 | 925 | WHERE id = %i', |
| 926 | 926 | $post_target_folder_id |
| 927 | 927 | ); |
@@ -975,7 +975,7 @@ discard block |
||
| 975 | 975 | // get complexity of current node |
| 976 | 976 | $nodeComplexity = DB::queryFirstRow( |
| 977 | 977 | 'SELECT valeur |
| 978 | - FROM ' . prefixTable('misc') . ' |
|
| 978 | + FROM ' . prefixTable('misc').' |
|
| 979 | 979 | WHERE intitule = %i AND type= %s', |
| 980 | 980 | $nodeInfo->id, |
| 981 | 981 | 'complex' |
@@ -1052,7 +1052,7 @@ discard block |
||
| 1052 | 1052 | // If it is a subfolder, then give access to it for all roles that allows the parent folder |
| 1053 | 1053 | $rows = DB::query( |
| 1054 | 1054 | 'SELECT role_id, type |
| 1055 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1055 | + FROM ' . prefixTable('roles_values').' |
|
| 1056 | 1056 | WHERE folder_id = %i', |
| 1057 | 1057 | $parentId |
| 1058 | 1058 | ); |
@@ -1071,7 +1071,7 @@ discard block |
||
| 1071 | 1071 | // if parent folder has Custom Fields Categories then add to this child one too |
| 1072 | 1072 | $rows = DB::query( |
| 1073 | 1073 | 'SELECT id_category |
| 1074 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1074 | + FROM ' . prefixTable('categories_folders').' |
|
| 1075 | 1075 | WHERE id_folder = %i', |
| 1076 | 1076 | $nodeInfo->id |
| 1077 | 1077 | ); |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | |
| 1091 | 1091 | $rows = DB::query( |
| 1092 | 1092 | 'SELECT * |
| 1093 | - FROM ' . prefixTable('items') . ' |
|
| 1093 | + FROM ' . prefixTable('items').' |
|
| 1094 | 1094 | WHERE id_tree = %i', |
| 1095 | 1095 | $nodeInfo->id |
| 1096 | 1096 | ); |
@@ -1099,7 +1099,7 @@ discard block |
||
| 1099 | 1099 | // if it is then don't copy it |
| 1100 | 1100 | $item_deleted = DB::queryFirstRow( |
| 1101 | 1101 | 'SELECT * |
| 1102 | - FROM ' . prefixTable('log_items') . ' |
|
| 1102 | + FROM ' . prefixTable('log_items').' |
|
| 1103 | 1103 | WHERE id_item = %i AND action = %s |
| 1104 | 1104 | ORDER BY date DESC |
| 1105 | 1105 | LIMIT 0, 1', |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | |
| 1111 | 1111 | $item_restored = DB::queryFirstRow( |
| 1112 | 1112 | 'SELECT * |
| 1113 | - FROM ' . prefixTable('log_items') . ' |
|
| 1113 | + FROM ' . prefixTable('log_items').' |
|
| 1114 | 1114 | WHERE id_item = %i AND action = %s |
| 1115 | 1115 | ORDER BY date DESC |
| 1116 | 1116 | LIMIT 0, 1', |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | // Get the ITEM object key for the user |
| 1126 | 1126 | $userKey = DB::queryFirstRow( |
| 1127 | 1127 | 'SELECT share_key |
| 1128 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1128 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1129 | 1129 | WHERE user_id = %i AND object_id = %i', |
| 1130 | 1130 | $session->get('user-id'), |
| 1131 | 1131 | $record['id'] |
@@ -1287,7 +1287,7 @@ discard block |
||
| 1287 | 1287 | // Get path |
| 1288 | 1288 | $text = ''; |
| 1289 | 1289 | foreach ($tree->getPath($folder->id, false) as $fld) { |
| 1290 | - $text .= empty($text) === true ? ' [<i>' . $fld->title : ' > ' . $fld->title; |
|
| 1290 | + $text .= empty($text) === true ? ' [<i>'.$fld->title : ' > '.$fld->title; |
|
| 1291 | 1291 | } |
| 1292 | 1292 | |
| 1293 | 1293 | // Save array |
@@ -1297,7 +1297,7 @@ discard block |
||
| 1297 | 1297 | 'id' => (int) $folder->id, |
| 1298 | 1298 | 'label' => $folder->title, |
| 1299 | 1299 | 'level' => $folder->nlevel, |
| 1300 | - 'path' => empty($text) === true ? '' : $text . '</i>]' |
|
| 1300 | + 'path' => empty($text) === true ? '' : $text.'</i>]' |
|
| 1301 | 1301 | ) |
| 1302 | 1302 | ); |
| 1303 | 1303 | } |
