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 | |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | // About special settings |
| 355 | 355 | $dataFolderSettings = DB::queryFirstRow( |
| 356 | 356 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 357 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 357 | + FROM ' . prefixTable('nested_tree').' |
|
| 358 | 358 | WHERE id = %i', |
| 359 | 359 | $inputData['folderId'] |
| 360 | 360 | ); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | // Get folder complexity |
| 372 | 372 | $folderComplexity = DB::queryfirstrow( |
| 373 | 373 | 'SELECT valeur |
| 374 | - FROM ' . prefixTable('misc') . ' |
|
| 374 | + FROM ' . prefixTable('misc').' |
|
| 375 | 375 | WHERE type = %s AND intitule = %i', |
| 376 | 376 | 'complex', |
| 377 | 377 | $inputData['folderId'] |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | $itemExists = 0; |
| 397 | 397 | $newID = ''; |
| 398 | 398 | $data = DB::queryfirstrow( |
| 399 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 399 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 400 | 400 | WHERE label = %s AND inactif = %i', |
| 401 | 401 | $inputData['label'], |
| 402 | 402 | 0 |
@@ -480,8 +480,8 @@ discard block |
||
| 480 | 480 | (int) $inputData['folderId'], |
| 481 | 481 | (int) $newID, |
| 482 | 482 | $cryptedStuff['objectKey'], |
| 483 | - true, // only for the item creator |
|
| 484 | - false, // no delete all |
|
| 483 | + true, // only for the item creator |
|
| 484 | + false, // no delete all |
|
| 485 | 485 | ); |
| 486 | 486 | |
| 487 | 487 | // update fields |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | // should we encrypt the data |
| 495 | 495 | $dataTmp = DB::queryFirstRow( |
| 496 | 496 | 'SELECT encrypted_data |
| 497 | - FROM ' . prefixTable('categories') . ' |
|
| 497 | + FROM ' . prefixTable('categories').' |
|
| 498 | 498 | WHERE id = %i', |
| 499 | 499 | $field['id'] |
| 500 | 500 | ); |
@@ -524,8 +524,8 @@ discard block |
||
| 524 | 524 | (int) $inputData['folderId'], |
| 525 | 525 | (int) $newObjectId, |
| 526 | 526 | $cryptedStuff['objectKey'], |
| 527 | - true, // only for the item creator |
|
| 528 | - false, // no delete all |
|
| 527 | + true, // only for the item creator |
|
| 528 | + false, // no delete all |
|
| 529 | 529 | ); |
| 530 | 530 | |
| 531 | 531 | array_push( |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | ) { |
| 563 | 563 | DB::queryFirstRow( |
| 564 | 564 | 'SELECT * |
| 565 | - FROM ' . prefixTable('templates') . ' |
|
| 565 | + FROM ' . prefixTable('templates').' |
|
| 566 | 566 | WHERE item_id = %i', |
| 567 | 567 | $newID |
| 568 | 568 | ); |
@@ -631,11 +631,11 @@ discard block |
||
| 631 | 631 | ) { |
| 632 | 632 | foreach ($post_restricted_to as $userRest) { |
| 633 | 633 | if (empty($userRest) === false) { |
| 634 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 634 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 635 | 635 | if (empty($listOfRestricted)) { |
| 636 | 636 | $listOfRestricted = $dataTmp['login']; |
| 637 | 637 | } else { |
| 638 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 638 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 639 | 639 | } |
| 640 | 640 | } |
| 641 | 641 | } |
@@ -651,7 +651,7 @@ discard block |
||
| 651 | 651 | if (empty($userRest) === false) { |
| 652 | 652 | $dataTmp = DB::queryfirstrow( |
| 653 | 653 | 'SELECT login |
| 654 | - FROM ' . prefixTable('users') . ' |
|
| 654 | + FROM ' . prefixTable('users').' |
|
| 655 | 655 | WHERE id= %i', |
| 656 | 656 | $userRest |
| 657 | 657 | ); |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | if (empty($oldRestrictionList) === true) { |
| 660 | 660 | $oldRestrictionList = $dataTmp['login']; |
| 661 | 661 | } else { |
| 662 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 662 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 663 | 663 | } |
| 664 | 664 | } |
| 665 | 665 | } |
@@ -722,7 +722,7 @@ discard block |
||
| 722 | 722 | if (empty($post_uploaded_file_id) === false) { |
| 723 | 723 | $rows = DB::query( |
| 724 | 724 | 'SELECT id |
| 725 | - FROM ' . prefixTable('files') . ' |
|
| 725 | + FROM ' . prefixTable('files').' |
|
| 726 | 726 | WHERE id_item = %s', |
| 727 | 727 | $post_uploaded_file_id |
| 728 | 728 | ); |
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | $lang->get('email_subject_item_updated'), |
| 779 | 779 | str_replace( |
| 780 | 780 | array('#label', '#link'), |
| 781 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
| 781 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
| 782 | 782 | $lang->get('new_item_email_body') |
| 783 | 783 | ), |
| 784 | 784 | $emailAddress, |
@@ -882,11 +882,11 @@ discard block |
||
| 882 | 882 | // Prepare variables |
| 883 | 883 | $itemInfos = array(); |
| 884 | 884 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 885 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 885 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 886 | 886 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 887 | 887 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 888 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 889 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 888 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 889 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 890 | 890 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 891 | 891 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 892 | 892 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -917,8 +917,7 @@ discard block |
||
| 917 | 917 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 918 | 918 | $dataReceived['to_be_deleted_after_date'], |
| 919 | 919 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 920 | - ) : |
|
| 921 | - ''; |
|
| 920 | + ) : ''; |
|
| 922 | 921 | $post_fields = (filter_var_array( |
| 923 | 922 | $dataReceived['fields'], |
| 924 | 923 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -978,7 +977,7 @@ discard block |
||
| 978 | 977 | // About special settings |
| 979 | 978 | $dataFolderSettings = DB::queryFirstRow( |
| 980 | 979 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 981 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 980 | + FROM ' . prefixTable('nested_tree').' |
|
| 982 | 981 | WHERE id = %i', |
| 983 | 982 | $inputData['folderId'] |
| 984 | 983 | ); |
@@ -994,7 +993,7 @@ discard block |
||
| 994 | 993 | // Get folder complexity |
| 995 | 994 | $folderComplexity = DB::queryfirstrow( |
| 996 | 995 | 'SELECT valeur |
| 997 | - FROM ' . prefixTable('misc') . ' |
|
| 996 | + FROM ' . prefixTable('misc').' |
|
| 998 | 997 | WHERE type = %s AND intitule = %i', |
| 999 | 998 | 'complex', |
| 1000 | 999 | $inputData['folderId'] |
@@ -1039,8 +1038,8 @@ discard block |
||
| 1039 | 1038 | // Get all informations for this item |
| 1040 | 1039 | $dataItem = DB::queryfirstrow( |
| 1041 | 1040 | 'SELECT * |
| 1042 | - FROM ' . prefixTable('items') . ' as i |
|
| 1043 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1041 | + FROM ' . prefixTable('items').' as i |
|
| 1042 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1044 | 1043 | WHERE i.id=%i AND l.action = %s', |
| 1045 | 1044 | $inputData['itemId'], |
| 1046 | 1045 | 'at_creation' |
@@ -1089,7 +1088,7 @@ discard block |
||
| 1089 | 1088 | //db::debugmode(true); |
| 1090 | 1089 | DB::query( |
| 1091 | 1090 | 'SELECT * |
| 1092 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1091 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1093 | 1092 | WHERE object_id = %i AND user_id = %s', |
| 1094 | 1093 | $inputData['itemId'], |
| 1095 | 1094 | $session->get('user-id') |
@@ -1141,9 +1140,9 @@ discard block |
||
| 1141 | 1140 | '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, |
| 1142 | 1141 | 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, |
| 1143 | 1142 | u.login as user_login, u.email as user_email |
| 1144 | - FROM ' . prefixTable('items') . ' as i |
|
| 1145 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1146 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1143 | + FROM ' . prefixTable('items').' as i |
|
| 1144 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1145 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1147 | 1146 | WHERE i.id=%i', |
| 1148 | 1147 | $inputData['itemId'] |
| 1149 | 1148 | ); |
@@ -1151,7 +1150,7 @@ discard block |
||
| 1151 | 1150 | // Should we log a password change? |
| 1152 | 1151 | $userKey = DB::queryFirstRow( |
| 1153 | 1152 | 'SELECT share_key |
| 1154 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1153 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1155 | 1154 | WHERE user_id = %i AND object_id = %i', |
| 1156 | 1155 | $session->get('user-id'), |
| 1157 | 1156 | $inputData['itemId'] |
@@ -1211,12 +1210,12 @@ discard block |
||
| 1211 | 1210 | (int) $inputData['folderId'], |
| 1212 | 1211 | (int) $inputData['itemId'], |
| 1213 | 1212 | $encrypted_password_key, |
| 1214 | - true, // only for the item creator |
|
| 1215 | - true, // delete all |
|
| 1213 | + true, // only for the item creator |
|
| 1214 | + true, // delete all |
|
| 1216 | 1215 | ); |
| 1217 | 1216 | |
| 1218 | 1217 | // Create a task to create sharekeys for users |
| 1219 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1218 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1220 | 1219 | $tasksToBePerformed = ['item_password']; |
| 1221 | 1220 | $encryptionTaskIsRequested = true; |
| 1222 | 1221 | } else { |
@@ -1227,7 +1226,7 @@ discard block |
||
| 1227 | 1226 | // Get list of tags |
| 1228 | 1227 | $itemTags = DB::queryFirstColumn( |
| 1229 | 1228 | 'SELECT tag |
| 1230 | - FROM ' . prefixTable('tags') . ' |
|
| 1229 | + FROM ' . prefixTable('tags').' |
|
| 1231 | 1230 | WHERE item_id = %i', |
| 1232 | 1231 | $inputData['itemId'] |
| 1233 | 1232 | ); |
@@ -1273,7 +1272,7 @@ discard block |
||
| 1273 | 1272 | $session->get('user-id'), |
| 1274 | 1273 | 'at_modification', |
| 1275 | 1274 | $session->get('user-login'), |
| 1276 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1275 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1277 | 1276 | ); |
| 1278 | 1277 | } |
| 1279 | 1278 | |
@@ -1313,8 +1312,8 @@ discard block |
||
| 1313 | 1312 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1314 | 1313 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1315 | 1314 | c.masked AS masked, i.id AS field_item_id |
| 1316 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1317 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1315 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1316 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1318 | 1317 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1319 | 1318 | $field['id'], |
| 1320 | 1319 | $inputData['itemId'] |
@@ -1330,7 +1329,7 @@ discard block |
||
| 1330 | 1329 | // Perform new query |
| 1331 | 1330 | $dataTmpCat = DB::queryFirstRow( |
| 1332 | 1331 | 'SELECT id, title, encrypted_data, masked |
| 1333 | - FROM ' . prefixTable('categories') . ' |
|
| 1332 | + FROM ' . prefixTable('categories').' |
|
| 1334 | 1333 | WHERE id = %i', |
| 1335 | 1334 | $field['id'] |
| 1336 | 1335 | ); |
@@ -1361,8 +1360,8 @@ discard block |
||
| 1361 | 1360 | (int) $inputData['folderId'], |
| 1362 | 1361 | (int) $newId, |
| 1363 | 1362 | $cryptedStuff['objectKey'], |
| 1364 | - true, // only for the item creator |
|
| 1365 | - true, // delete all |
|
| 1363 | + true, // only for the item creator |
|
| 1364 | + true, // delete all |
|
| 1366 | 1365 | ); |
| 1367 | 1366 | |
| 1368 | 1367 | // update value |
@@ -1410,7 +1409,7 @@ discard block |
||
| 1410 | 1409 | $session->get('user-id'), |
| 1411 | 1410 | 'at_modification', |
| 1412 | 1411 | $session->get('user-login'), |
| 1413 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1412 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1414 | 1413 | ); |
| 1415 | 1414 | } else { |
| 1416 | 1415 | // Case where the field already exists |
@@ -1419,7 +1418,7 @@ discard block |
||
| 1419 | 1418 | // Get user sharekey for this field |
| 1420 | 1419 | $userKey = DB::queryFirstRow( |
| 1421 | 1420 | 'SELECT share_key |
| 1422 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1421 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1423 | 1422 | WHERE user_id = %i AND object_id = %i', |
| 1424 | 1423 | $session->get('user-id'), |
| 1425 | 1424 | $dataTmpCat['field_item_id'] |
@@ -1459,8 +1458,8 @@ discard block |
||
| 1459 | 1458 | (int) $inputData['folderId'], |
| 1460 | 1459 | (int) $dataTmpCat['field_item_id'], |
| 1461 | 1460 | $cryptedStuff['objectKey'], |
| 1462 | - true, // only for the item creator |
|
| 1463 | - true, // delete all |
|
| 1461 | + true, // only for the item creator |
|
| 1462 | + true, // delete all |
|
| 1464 | 1463 | ); |
| 1465 | 1464 | |
| 1466 | 1465 | array_push( |
@@ -1500,7 +1499,7 @@ discard block |
||
| 1500 | 1499 | $session->get('user-id'), |
| 1501 | 1500 | 'at_modification', |
| 1502 | 1501 | $session->get('user-login'), |
| 1503 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1502 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1504 | 1503 | ); |
| 1505 | 1504 | } |
| 1506 | 1505 | } |
@@ -1555,7 +1554,7 @@ discard block |
||
| 1555 | 1554 | ) { |
| 1556 | 1555 | DB::queryFirstRow( |
| 1557 | 1556 | 'SELECT * |
| 1558 | - FROM ' . prefixTable('templates') . ' |
|
| 1557 | + FROM ' . prefixTable('templates').' |
|
| 1559 | 1558 | WHERE item_id = %i', |
| 1560 | 1559 | $inputData['itemId'] |
| 1561 | 1560 | ); |
@@ -1598,7 +1597,7 @@ discard block |
||
| 1598 | 1597 | // check if elem exists in Table. If not add it or update it. |
| 1599 | 1598 | DB::query( |
| 1600 | 1599 | 'SELECT * |
| 1601 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1600 | + FROM ' . prefixTable('automatic_del').' |
|
| 1602 | 1601 | WHERE item_id = %i', |
| 1603 | 1602 | $inputData['itemId'] |
| 1604 | 1603 | ); |
@@ -1625,7 +1624,7 @@ discard block |
||
| 1625 | 1624 | // Store updates performed |
| 1626 | 1625 | array_push( |
| 1627 | 1626 | $arrayOfChanges, |
| 1628 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1627 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1629 | 1628 | ); |
| 1630 | 1629 | |
| 1631 | 1630 | // update LOG |
@@ -1668,7 +1667,7 @@ discard block |
||
| 1668 | 1667 | // Store updates performed |
| 1669 | 1668 | array_push( |
| 1670 | 1669 | $arrayOfChanges, |
| 1671 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1670 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1672 | 1671 | ); |
| 1673 | 1672 | |
| 1674 | 1673 | // update LOG |
@@ -1701,7 +1700,7 @@ discard block |
||
| 1701 | 1700 | if (empty($userId) === false) { |
| 1702 | 1701 | $dataTmp = DB::queryfirstrow( |
| 1703 | 1702 | 'SELECT id, name, lastname |
| 1704 | - FROM ' . prefixTable('users') . ' |
|
| 1703 | + FROM ' . prefixTable('users').' |
|
| 1705 | 1704 | WHERE id= %i', |
| 1706 | 1705 | $userId |
| 1707 | 1706 | ); |
@@ -1709,7 +1708,7 @@ discard block |
||
| 1709 | 1708 | // Add to array |
| 1710 | 1709 | array_push( |
| 1711 | 1710 | $arrayOfUsersRestriction, |
| 1712 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1711 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1713 | 1712 | ); |
| 1714 | 1713 | array_push( |
| 1715 | 1714 | $arrayOfUsersIdRestriction, |
@@ -1740,8 +1739,8 @@ discard block |
||
| 1740 | 1739 | // get values before deleting them |
| 1741 | 1740 | $rows = DB::query( |
| 1742 | 1741 | 'SELECT t.title, t.id AS id |
| 1743 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1744 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1742 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1743 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1745 | 1744 | WHERE r.item_id = %i |
| 1746 | 1745 | ORDER BY t.title ASC', |
| 1747 | 1746 | $inputData['itemId'] |
@@ -1775,7 +1774,7 @@ discard block |
||
| 1775 | 1774 | ); |
| 1776 | 1775 | $dataTmp = DB::queryfirstrow( |
| 1777 | 1776 | 'SELECT title |
| 1778 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1777 | + FROM ' . prefixTable('roles_title').' |
|
| 1779 | 1778 | WHERE id = %i', |
| 1780 | 1779 | $role |
| 1781 | 1780 | ); |
@@ -1803,7 +1802,7 @@ discard block |
||
| 1803 | 1802 | // Get current status |
| 1804 | 1803 | $otpStatus = DB::queryFirstRow( |
| 1805 | 1804 | 'SELECT enabled as otp_is_enabled |
| 1806 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1805 | + FROM ' . prefixTable('items_otp').' |
|
| 1807 | 1806 | WHERE item_id = %i', |
| 1808 | 1807 | $inputData['itemId'] |
| 1809 | 1808 | ); |
@@ -1834,7 +1833,7 @@ discard block |
||
| 1834 | 1833 | $session->get('user-id'), |
| 1835 | 1834 | 'at_modification', |
| 1836 | 1835 | $session->get('user-login'), |
| 1837 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1836 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1838 | 1837 | ); |
| 1839 | 1838 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
| 1840 | 1839 | // Create the entry in items_otp table |
@@ -1878,8 +1877,8 @@ discard block |
||
| 1878 | 1877 | $session->get('user-id'), |
| 1879 | 1878 | 'at_modification', |
| 1880 | 1879 | $session->get('user-login'), |
| 1881 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1882 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1880 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1881 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1883 | 1882 | ); |
| 1884 | 1883 | } |
| 1885 | 1884 | |
@@ -1899,7 +1898,7 @@ discard block |
||
| 1899 | 1898 | $session->get('user-id'), |
| 1900 | 1899 | 'at_modification', |
| 1901 | 1900 | $session->get('user-login'), |
| 1902 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1901 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1903 | 1902 | ); |
| 1904 | 1903 | } |
| 1905 | 1904 | // LOGIN |
@@ -1918,7 +1917,7 @@ discard block |
||
| 1918 | 1917 | $session->get('user-id'), |
| 1919 | 1918 | 'at_modification', |
| 1920 | 1919 | $session->get('user-login'), |
| 1921 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1920 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1922 | 1921 | ); |
| 1923 | 1922 | } |
| 1924 | 1923 | |
@@ -1937,7 +1936,7 @@ discard block |
||
| 1937 | 1936 | $session->get('user-id'), |
| 1938 | 1937 | 'at_modification', |
| 1939 | 1938 | $session->get('user-login'), |
| 1940 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1939 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1941 | 1940 | ); |
| 1942 | 1941 | } |
| 1943 | 1942 | // URL |
@@ -1956,7 +1955,7 @@ discard block |
||
| 1956 | 1955 | $session->get('user-id'), |
| 1957 | 1956 | 'at_modification', |
| 1958 | 1957 | $session->get('user-login'), |
| 1959 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1958 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1960 | 1959 | ); |
| 1961 | 1960 | } |
| 1962 | 1961 | // DESCRIPTION |
@@ -1982,7 +1981,7 @@ discard block |
||
| 1982 | 1981 | // FOLDER |
| 1983 | 1982 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1984 | 1983 | // Get name of folders |
| 1985 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1984 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1986 | 1985 | |
| 1987 | 1986 | // Store updates performed |
| 1988 | 1987 | array_push( |
@@ -1998,7 +1997,7 @@ discard block |
||
| 1998 | 1997 | $session->get('user-id'), |
| 1999 | 1998 | 'at_modification', |
| 2000 | 1999 | $session->get('user-login'), |
| 2001 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 2000 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 2002 | 2001 | ); |
| 2003 | 2002 | } |
| 2004 | 2003 | // ANYONE_CAN_MODIFY |
@@ -2006,7 +2005,7 @@ discard block |
||
| 2006 | 2005 | // Store updates performed |
| 2007 | 2006 | array_push( |
| 2008 | 2007 | $arrayOfChanges, |
| 2009 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2008 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2010 | 2009 | ); |
| 2011 | 2010 | |
| 2012 | 2011 | // Log |
@@ -2017,15 +2016,15 @@ discard block |
||
| 2017 | 2016 | $session->get('user-id'), |
| 2018 | 2017 | 'at_modification', |
| 2019 | 2018 | $session->get('user-login'), |
| 2020 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2019 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2021 | 2020 | ); |
| 2022 | 2021 | } |
| 2023 | 2022 | |
| 2024 | 2023 | // Reload new values |
| 2025 | 2024 | $dataItem = DB::queryfirstrow( |
| 2026 | 2025 | 'SELECT * |
| 2027 | - FROM ' . prefixTable('items') . ' as i |
|
| 2028 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2026 | + FROM ' . prefixTable('items').' as i |
|
| 2027 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2029 | 2028 | WHERE i.id = %i AND l.action = %s', |
| 2030 | 2029 | $inputData['itemId'], |
| 2031 | 2030 | 'at_creation' |
@@ -2034,8 +2033,8 @@ discard block |
||
| 2034 | 2033 | $history = ''; |
| 2035 | 2034 | $rows = DB::query( |
| 2036 | 2035 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2037 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2038 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2036 | + FROM ' . prefixTable('log_items').' as l |
|
| 2037 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2039 | 2038 | WHERE l.action <> %s AND id_item=%s', |
| 2040 | 2039 | 'at_shown', |
| 2041 | 2040 | $inputData['itemId'] |
@@ -2044,14 +2043,14 @@ discard block |
||
| 2044 | 2043 | if ($record['raison'] === NULL) continue; |
| 2045 | 2044 | $reason = explode(':', $record['raison']); |
| 2046 | 2045 | if (count($reason) > 0) { |
| 2047 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2048 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2049 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2046 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2047 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2048 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2050 | 2049 | : $lang->get(trim($reason[0]))) : ''); |
| 2051 | 2050 | if (empty($history)) { |
| 2052 | 2051 | $history = $sentence; |
| 2053 | 2052 | } else { |
| 2054 | - $history .= '<br />' . $sentence; |
|
| 2053 | + $history .= '<br />'.$sentence; |
|
| 2055 | 2054 | } |
| 2056 | 2055 | } |
| 2057 | 2056 | } |
@@ -2189,7 +2188,7 @@ discard block |
||
| 2189 | 2188 | ) { |
| 2190 | 2189 | // load the original record into an array |
| 2191 | 2190 | $originalRecord = DB::queryfirstrow( |
| 2192 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2191 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2193 | 2192 | WHERE id = %i', |
| 2194 | 2193 | $inputData['itemId'] |
| 2195 | 2194 | ); |
@@ -2208,7 +2207,7 @@ discard block |
||
| 2208 | 2207 | |
| 2209 | 2208 | // Load the destination folder record into an array |
| 2210 | 2209 | $dataDestination = DB::queryfirstrow( |
| 2211 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2210 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2212 | 2211 | WHERE id = %i', |
| 2213 | 2212 | $post_dest_id |
| 2214 | 2213 | ); |
@@ -2216,7 +2215,7 @@ discard block |
||
| 2216 | 2215 | // Get the ITEM object key for the user |
| 2217 | 2216 | $userKey = DB::queryFirstRow( |
| 2218 | 2217 | 'SELECT share_key |
| 2219 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2218 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2220 | 2219 | WHERE user_id = %i AND object_id = %i', |
| 2221 | 2220 | $session->get('user-id'), |
| 2222 | 2221 | $inputData['itemId'] |
@@ -2294,8 +2293,8 @@ discard block |
||
| 2294 | 2293 | // Manage Custom Fields |
| 2295 | 2294 | $rows = DB::query( |
| 2296 | 2295 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2297 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2298 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2296 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2297 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2299 | 2298 | WHERE ci.item_id = %i', |
| 2300 | 2299 | $inputData['itemId'] |
| 2301 | 2300 | ); |
@@ -2307,7 +2306,7 @@ discard block |
||
| 2307 | 2306 | // Get user key |
| 2308 | 2307 | $userKey = DB::queryFirstRow( |
| 2309 | 2308 | 'SELECT share_key |
| 2310 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2309 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2311 | 2310 | WHERE user_id = %i AND object_id = %i', |
| 2312 | 2311 | $session->get('user-id'), |
| 2313 | 2312 | $field['id'] |
@@ -2375,15 +2374,15 @@ discard block |
||
| 2375 | 2374 | $rows = DB::query( |
| 2376 | 2375 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2377 | 2376 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2378 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2379 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2377 | + FROM ' . prefixTable('files').' AS f |
|
| 2378 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2380 | 2379 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2381 | 2380 | $session->get('user-id'), |
| 2382 | 2381 | $inputData['itemId'] |
| 2383 | 2382 | ); |
| 2384 | 2383 | foreach ($rows as $record) { |
| 2385 | 2384 | // Check if file still exists |
| 2386 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2385 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2387 | 2386 | // Step1 - decrypt the file |
| 2388 | 2387 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2389 | 2388 | $fileContent = decryptFile( |
@@ -2394,8 +2393,8 @@ discard block |
||
| 2394 | 2393 | |
| 2395 | 2394 | // Step2 - create file |
| 2396 | 2395 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2397 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2398 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2396 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2397 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2399 | 2398 | if ($outstream === false) { |
| 2400 | 2399 | echo prepareExchangedData( |
| 2401 | 2400 | array( |
@@ -2469,7 +2468,7 @@ discard block |
||
| 2469 | 2468 | |
| 2470 | 2469 | // ------------------------- |
| 2471 | 2470 | // Add specific restrictions |
| 2472 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2471 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2473 | 2472 | foreach ($rows as $record) { |
| 2474 | 2473 | DB::insert( |
| 2475 | 2474 | prefixTable('restriction_to_roles'), |
@@ -2481,7 +2480,7 @@ discard block |
||
| 2481 | 2480 | } |
| 2482 | 2481 | |
| 2483 | 2482 | // Add Tags |
| 2484 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2483 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2485 | 2484 | foreach ($rows as $record) { |
| 2486 | 2485 | DB::insert( |
| 2487 | 2486 | prefixTable('tags'), |
@@ -2582,7 +2581,7 @@ discard block |
||
| 2582 | 2581 | // then we can show it |
| 2583 | 2582 | $item_deleted = DB::queryFirstRow( |
| 2584 | 2583 | 'SELECT * |
| 2585 | - FROM ' . prefixTable('log_items') . ' |
|
| 2584 | + FROM ' . prefixTable('log_items').' |
|
| 2586 | 2585 | WHERE id_item = %i AND action = %s |
| 2587 | 2586 | ORDER BY date DESC |
| 2588 | 2587 | LIMIT 0, 1', |
@@ -2593,7 +2592,7 @@ discard block |
||
| 2593 | 2592 | |
| 2594 | 2593 | $item_restored = DB::queryFirstRow( |
| 2595 | 2594 | 'SELECT * |
| 2596 | - FROM ' . prefixTable('log_items') . ' |
|
| 2595 | + FROM ' . prefixTable('log_items').' |
|
| 2597 | 2596 | WHERE id_item = %i AND action = %s |
| 2598 | 2597 | ORDER BY date DESC |
| 2599 | 2598 | LIMIT 0, 1', |
@@ -2617,8 +2616,8 @@ discard block |
||
| 2617 | 2616 | // Get all informations for this item |
| 2618 | 2617 | $dataItem = DB::queryfirstrow( |
| 2619 | 2618 | 'SELECT * |
| 2620 | - FROM ' . prefixTable('items') . ' as i |
|
| 2621 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2619 | + FROM ' . prefixTable('items').' as i |
|
| 2620 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2622 | 2621 | WHERE i.id = %i AND l.action = %s', |
| 2623 | 2622 | $inputData['id'], |
| 2624 | 2623 | 'at_creation' |
@@ -2627,7 +2626,7 @@ discard block |
||
| 2627 | 2626 | // Notification |
| 2628 | 2627 | DB::queryfirstrow( |
| 2629 | 2628 | 'SELECT * |
| 2630 | - FROM ' . prefixTable('notification') . ' |
|
| 2629 | + FROM ' . prefixTable('notification').' |
|
| 2631 | 2630 | WHERE item_id = %i AND user_id = %i', |
| 2632 | 2631 | $inputData['id'], |
| 2633 | 2632 | $session->get('user-id') |
@@ -2646,7 +2645,7 @@ discard block |
||
| 2646 | 2645 | |
| 2647 | 2646 | // manage case of API user |
| 2648 | 2647 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2649 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2648 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2650 | 2649 | $arrData['id_user'] = API_USER_ID; |
| 2651 | 2650 | $arrData['author_email'] = ''; |
| 2652 | 2651 | $arrData['notification_status'] = false; |
@@ -2656,7 +2655,7 @@ discard block |
||
| 2656 | 2655 | $tags = array(); |
| 2657 | 2656 | $rows = DB::query( |
| 2658 | 2657 | 'SELECT tag |
| 2659 | - FROM ' . prefixTable('tags') . ' |
|
| 2658 | + FROM ' . prefixTable('tags').' |
|
| 2660 | 2659 | WHERE item_id = %i', |
| 2661 | 2660 | $inputData['id'] |
| 2662 | 2661 | ); |
@@ -2681,7 +2680,7 @@ discard block |
||
| 2681 | 2680 | // Check if user has a role that is accepted |
| 2682 | 2681 | $rows_tmp = DB::query( |
| 2683 | 2682 | 'SELECT role_id |
| 2684 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2683 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2685 | 2684 | WHERE item_id=%i', |
| 2686 | 2685 | $inputData['id'] |
| 2687 | 2686 | ); |
@@ -2695,7 +2694,7 @@ discard block |
||
| 2695 | 2694 | // Get the object key for the user |
| 2696 | 2695 | $userKey = DB::queryFirstRow( |
| 2697 | 2696 | 'SELECT share_key |
| 2698 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2697 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2699 | 2698 | WHERE user_id = %i AND object_id = %i', |
| 2700 | 2699 | $session->get('user-id'), |
| 2701 | 2700 | $inputData['id'] |
@@ -2792,8 +2791,8 @@ discard block |
||
| 2792 | 2791 | // Add restriction if item is restricted to roles |
| 2793 | 2792 | $rows = DB::query( |
| 2794 | 2793 | 'SELECT t.title, t.id |
| 2795 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2796 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2794 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2795 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2797 | 2796 | WHERE r.item_id = %i |
| 2798 | 2797 | ORDER BY t.title ASC', |
| 2799 | 2798 | $inputData['id'] |
@@ -2809,8 +2808,8 @@ discard block |
||
| 2809 | 2808 | $tmp = array(); |
| 2810 | 2809 | $rows = DB::query( |
| 2811 | 2810 | 'SELECT k.label, k.id |
| 2812 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2813 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2811 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2812 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2814 | 2813 | WHERE i.item_id = %i |
| 2815 | 2814 | ORDER BY k.label ASC', |
| 2816 | 2815 | $inputData['id'] |
@@ -2893,7 +2892,7 @@ discard block |
||
| 2893 | 2892 | $arrCatList = array(); |
| 2894 | 2893 | $rows_tmp = DB::query( |
| 2895 | 2894 | 'SELECT id_category |
| 2896 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2895 | + FROM ' . prefixTable('categories_folders').' |
|
| 2897 | 2896 | WHERE id_folder=%i', |
| 2898 | 2897 | $inputData['folderId'] |
| 2899 | 2898 | ); |
@@ -2908,8 +2907,8 @@ discard block |
||
| 2908 | 2907 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2909 | 2908 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2910 | 2909 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2911 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2912 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2910 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2911 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2913 | 2912 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2914 | 2913 | $inputData['id'], |
| 2915 | 2914 | $arrCatList |
@@ -2920,7 +2919,7 @@ discard block |
||
| 2920 | 2919 | //db::debugmode(true); |
| 2921 | 2920 | $userKey = DB::queryFirstRow( |
| 2922 | 2921 | 'SELECT share_key |
| 2923 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2922 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2924 | 2923 | WHERE user_id = %i AND object_id = %i', |
| 2925 | 2924 | $session->get('user-id'), |
| 2926 | 2925 | $row['id'] |
@@ -2938,7 +2937,7 @@ discard block |
||
| 2938 | 2937 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2939 | 2938 | // Data is not encrypted in DB |
| 2940 | 2939 | $fieldText = [ |
| 2941 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2940 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2942 | 2941 | 'encrypted' => false, |
| 2943 | 2942 | 'error' => false, |
| 2944 | 2943 | ]; |
@@ -2983,7 +2982,7 @@ discard block |
||
| 2983 | 2982 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2984 | 2983 | $rows_tmp = DB::queryfirstrow( |
| 2985 | 2984 | 'SELECT category_id |
| 2986 | - FROM ' . prefixTable('templates') . ' |
|
| 2985 | + FROM ' . prefixTable('templates').' |
|
| 2987 | 2986 | WHERE item_id = %i', |
| 2988 | 2987 | $inputData['id'] |
| 2989 | 2988 | ); |
@@ -3000,7 +2999,7 @@ discard block |
||
| 3000 | 2999 | // Evaluate if item is ready for all users |
| 3001 | 3000 | $rows_tmp = DB::queryfirstrow( |
| 3002 | 3001 | 'SELECT finished_at |
| 3003 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3002 | + FROM ' . prefixTable('background_tasks').' |
|
| 3004 | 3003 | WHERE item_id = %i', |
| 3005 | 3004 | $inputData['id'] |
| 3006 | 3005 | ); |
@@ -3017,7 +3016,7 @@ discard block |
||
| 3017 | 3016 | // Is the Item to be deleted? |
| 3018 | 3017 | $dataDelete = DB::queryfirstrow( |
| 3019 | 3018 | 'SELECT * |
| 3020 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3019 | + FROM ' . prefixTable('automatic_del').' |
|
| 3021 | 3020 | WHERE item_id = %i', |
| 3022 | 3021 | $inputData['id'] |
| 3023 | 3022 | ); |
@@ -3098,14 +3097,14 @@ discard block |
||
| 3098 | 3097 | if (empty($userRest) === false) { |
| 3099 | 3098 | $dataTmp = DB::queryfirstrow( |
| 3100 | 3099 | 'SELECT login |
| 3101 | - FROM ' . prefixTable('users') . ' |
|
| 3100 | + FROM ' . prefixTable('users').' |
|
| 3102 | 3101 | WHERE id= %i', |
| 3103 | 3102 | $userRest |
| 3104 | 3103 | ); |
| 3105 | 3104 | if (empty($listOfRestricted)) { |
| 3106 | 3105 | $listOfRestricted = $dataTmp['login']; |
| 3107 | 3106 | } else { |
| 3108 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3107 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3109 | 3108 | } |
| 3110 | 3109 | } |
| 3111 | 3110 | } |
@@ -3179,9 +3178,9 @@ discard block |
||
| 3179 | 3178 | // Load item data |
| 3180 | 3179 | $dataItem = DB::queryFirstRow( |
| 3181 | 3180 | '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 |
| 3182 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3183 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3184 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3181 | + FROM ' . prefixTable('items').' AS i |
|
| 3182 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3183 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3185 | 3184 | WHERE i.id = %i', |
| 3186 | 3185 | $inputData['id'] |
| 3187 | 3186 | ); |
@@ -3203,7 +3202,7 @@ discard block |
||
| 3203 | 3202 | // Check if user has a role that is accepted |
| 3204 | 3203 | $rows_tmp = DB::query( |
| 3205 | 3204 | 'SELECT role_id |
| 3206 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3205 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3207 | 3206 | WHERE item_id=%i', |
| 3208 | 3207 | $inputData['id'] |
| 3209 | 3208 | ); |
@@ -3235,12 +3234,12 @@ discard block |
||
| 3235 | 3234 | // launch query |
| 3236 | 3235 | $rows = DB::query( |
| 3237 | 3236 | 'SELECT id, name, file, extension, size |
| 3238 | - FROM ' . prefixTable('files') . ' |
|
| 3237 | + FROM ' . prefixTable('files').' |
|
| 3239 | 3238 | WHERE id_item = %i AND confirmed = 1', |
| 3240 | 3239 | $inputData['id'] |
| 3241 | 3240 | ); |
| 3242 | 3241 | foreach ($rows as $record) { |
| 3243 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3242 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3244 | 3243 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3245 | 3244 | |
| 3246 | 3245 | array_push( |
@@ -3253,7 +3252,7 @@ discard block |
||
| 3253 | 3252 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3254 | 3253 | 'id' => $record['id'], |
| 3255 | 3254 | 'key' => $session->get('user-key_tmp'), |
| 3256 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3255 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3257 | 3256 | ) |
| 3258 | 3257 | ); |
| 3259 | 3258 | } |
@@ -3291,7 +3290,7 @@ discard block |
||
| 3291 | 3290 | array( |
| 3292 | 3291 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3293 | 3292 | ), |
| 3294 | - 'id=' . $session->get('user-id') |
|
| 3293 | + 'id='.$session->get('user-id') |
|
| 3295 | 3294 | ); |
| 3296 | 3295 | } |
| 3297 | 3296 | |
@@ -3300,8 +3299,8 @@ discard block |
||
| 3300 | 3299 | $listOptionsForRoles = array(); |
| 3301 | 3300 | $rows = DB::query( |
| 3302 | 3301 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3303 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3304 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3302 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3303 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3305 | 3304 | WHERE r.folder_id = %i', |
| 3306 | 3305 | $dataItem['id_tree'] |
| 3307 | 3306 | ); |
@@ -3315,9 +3314,9 @@ discard block |
||
| 3315 | 3314 | ); |
| 3316 | 3315 | $rows2 = DB::query( |
| 3317 | 3316 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3318 | - FROM ' . prefixTable('users') . ' |
|
| 3317 | + FROM ' . prefixTable('users').' |
|
| 3319 | 3318 | WHERE fonction_id LIKE %s', |
| 3320 | - '%' . $record['role_id'] . '%' |
|
| 3319 | + '%'.$record['role_id'].'%' |
|
| 3321 | 3320 | ); |
| 3322 | 3321 | foreach ($rows2 as $record2) { |
| 3323 | 3322 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3330,7 +3329,7 @@ discard block |
||
| 3330 | 3329 | array( |
| 3331 | 3330 | 'id' => (int) $record2['id'], |
| 3332 | 3331 | 'login' => $record2['login'], |
| 3333 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3332 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3334 | 3333 | 'email' => $record2['email'], |
| 3335 | 3334 | ) |
| 3336 | 3335 | ); |
@@ -3349,16 +3348,16 @@ discard block |
||
| 3349 | 3348 | $path = ''; |
| 3350 | 3349 | foreach ($arbo as $elem) { |
| 3351 | 3350 | if (empty($path) === true) { |
| 3352 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3351 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3353 | 3352 | } else { |
| 3354 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3353 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3355 | 3354 | } |
| 3356 | 3355 | } |
| 3357 | 3356 | // Build text to show user |
| 3358 | 3357 | if (empty($path) === true) { |
| 3359 | 3358 | $path = addslashes($dataItem['label']); |
| 3360 | 3359 | } else { |
| 3361 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3360 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3362 | 3361 | } |
| 3363 | 3362 | |
| 3364 | 3363 | // Add Admins to notification list if expected |
@@ -3381,7 +3380,7 @@ discard block |
||
| 3381 | 3380 | array( |
| 3382 | 3381 | addslashes($session->get('user-login')), |
| 3383 | 3382 | $path, |
| 3384 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3383 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3385 | 3384 | ), |
| 3386 | 3385 | $lang->get('email_on_open_notification_mail') |
| 3387 | 3386 | ), |
@@ -3391,7 +3390,7 @@ discard block |
||
| 3391 | 3390 | } |
| 3392 | 3391 | |
| 3393 | 3392 | // has this item a change proposal |
| 3394 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3393 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3395 | 3394 | $returnArray['has_change_proposal'] = DB::count(); |
| 3396 | 3395 | |
| 3397 | 3396 | // Setting |
@@ -3402,7 +3401,7 @@ discard block |
||
| 3402 | 3401 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3403 | 3402 | DB::query( |
| 3404 | 3403 | 'SELECT * |
| 3405 | - FROM ' . prefixTable('otv') . ' |
|
| 3404 | + FROM ' . prefixTable('otv').' |
|
| 3406 | 3405 | WHERE item_id = %i |
| 3407 | 3406 | AND time_limit > %i', |
| 3408 | 3407 | $inputData['id'], |
@@ -3502,7 +3501,7 @@ discard block |
||
| 3502 | 3501 | // Load item data |
| 3503 | 3502 | $data = DB::queryFirstRow( |
| 3504 | 3503 | 'SELECT id_tree, id, label |
| 3505 | - FROM ' . prefixTable('items') . ' |
|
| 3504 | + FROM ' . prefixTable('items').' |
|
| 3506 | 3505 | WHERE id = %i OR item_key = %s', |
| 3507 | 3506 | $inputData['itemId'], |
| 3508 | 3507 | $inputData['itemKey'] |
@@ -3593,7 +3592,7 @@ discard block |
||
| 3593 | 3592 | // Load item data |
| 3594 | 3593 | $dataItem = DB::queryFirstRow( |
| 3595 | 3594 | 'SELECT secret, enabled |
| 3596 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3595 | + FROM ' . prefixTable('items_otp').' |
|
| 3597 | 3596 | WHERE item_id = %i', |
| 3598 | 3597 | $inputData['id'] |
| 3599 | 3598 | ); |
@@ -3675,13 +3674,13 @@ discard block |
||
| 3675 | 3674 | |
| 3676 | 3675 | // Check if user is allowed to access this folder |
| 3677 | 3676 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3678 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3677 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3679 | 3678 | break; |
| 3680 | 3679 | } |
| 3681 | 3680 | |
| 3682 | 3681 | // Check if title doesn't contains html codes |
| 3683 | 3682 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3684 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3683 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3685 | 3684 | break; |
| 3686 | 3685 | } |
| 3687 | 3686 | // check that title is not numeric |
@@ -3692,9 +3691,9 @@ discard block |
||
| 3692 | 3691 | |
| 3693 | 3692 | // Check if duplicate folders name are allowed |
| 3694 | 3693 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3695 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3694 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3696 | 3695 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3697 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3696 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3698 | 3697 | break; |
| 3699 | 3698 | } |
| 3700 | 3699 | } |
@@ -3702,7 +3701,7 @@ discard block |
||
| 3702 | 3701 | // query on folder |
| 3703 | 3702 | $data = DB::queryfirstrow( |
| 3704 | 3703 | 'SELECT parent_id, personal_folder |
| 3705 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3704 | + FROM ' . prefixTable('nested_tree').' |
|
| 3706 | 3705 | WHERE id = %i', |
| 3707 | 3706 | $inputData['folderId'] |
| 3708 | 3707 | ); |
@@ -3712,20 +3711,20 @@ discard block |
||
| 3712 | 3711 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3713 | 3712 | $data = DB::queryfirstrow( |
| 3714 | 3713 | 'SELECT valeur |
| 3715 | - FROM ' . prefixTable('misc') . ' |
|
| 3714 | + FROM ' . prefixTable('misc').' |
|
| 3716 | 3715 | WHERE intitule = %i AND type = %s', |
| 3717 | 3716 | $data['parent_id'], |
| 3718 | 3717 | 'complex' |
| 3719 | 3718 | ); |
| 3720 | 3719 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3721 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3720 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3722 | 3721 | break; |
| 3723 | 3722 | } |
| 3724 | 3723 | } |
| 3725 | 3724 | |
| 3726 | 3725 | // update Folders table |
| 3727 | 3726 | $tmp = DB::queryFirstRow( |
| 3728 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3727 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3729 | 3728 | $dataReceived['folder'] |
| 3730 | 3729 | ); |
| 3731 | 3730 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3794,42 +3793,42 @@ discard block |
||
| 3794 | 3793 | in_array($post_target_folder_id, $session->get('user-accessible_folders')) === false) && ($post_target_folder_id === '0' && |
| 3795 | 3794 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3796 | 3795 | ) { |
| 3797 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3796 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3798 | 3797 | echo $returnValues; |
| 3799 | 3798 | break; |
| 3800 | 3799 | } |
| 3801 | 3800 | |
| 3802 | 3801 | $tmp_source = DB::queryFirstRow( |
| 3803 | 3802 | 'SELECT title, parent_id, personal_folder |
| 3804 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3803 | + FROM ' . prefixTable('nested_tree').' |
|
| 3805 | 3804 | WHERE id = %i', |
| 3806 | 3805 | $post_source_folder_id |
| 3807 | 3806 | ); |
| 3808 | 3807 | |
| 3809 | 3808 | $tmp_target = DB::queryFirstRow( |
| 3810 | 3809 | 'SELECT title, parent_id, personal_folder |
| 3811 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3810 | + FROM ' . prefixTable('nested_tree').' |
|
| 3812 | 3811 | WHERE id = %i', |
| 3813 | 3812 | $post_target_folder_id |
| 3814 | 3813 | ); |
| 3815 | 3814 | |
| 3816 | 3815 | // check if target is not a child of source |
| 3817 | 3816 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3818 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3817 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3819 | 3818 | echo $returnValues; |
| 3820 | 3819 | break; |
| 3821 | 3820 | } |
| 3822 | 3821 | |
| 3823 | 3822 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3824 | 3823 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3825 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3824 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3826 | 3825 | echo $returnValues; |
| 3827 | 3826 | break; |
| 3828 | 3827 | } |
| 3829 | 3828 | |
| 3830 | 3829 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3831 | 3830 | if ($tmp_source['title'] === $session->get('user-id') || $tmp_target['title'] === $session->get('user-id')) { |
| 3832 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3831 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3833 | 3832 | echo $returnValues; |
| 3834 | 3833 | break; |
| 3835 | 3834 | } |
@@ -3950,7 +3949,7 @@ discard block |
||
| 3950 | 3949 | $uniqueLoadData['path'] = $arr_arbo; |
| 3951 | 3950 | |
| 3952 | 3951 | // store last folder accessed in cookie |
| 3953 | - $arr_cookie_options = array ( |
|
| 3952 | + $arr_cookie_options = array( |
|
| 3954 | 3953 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3955 | 3954 | 'path' => '/', |
| 3956 | 3955 | 'secure' => true, |
@@ -3965,7 +3964,7 @@ discard block |
||
| 3965 | 3964 | foreach ($session->get('user-roles_array') as $role) { |
| 3966 | 3965 | $roleQ = DB::queryfirstrow( |
| 3967 | 3966 | 'SELECT allow_pw_change |
| 3968 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3967 | + FROM ' . prefixTable('roles_title').' |
|
| 3969 | 3968 | WHERE id = %i', |
| 3970 | 3969 | $role |
| 3971 | 3970 | ); |
@@ -3996,11 +3995,11 @@ discard block |
||
| 3996 | 3995 | |
| 3997 | 3996 | foreach ($session->get('user-roles_array') as $role) { |
| 3998 | 3997 | $access = DB::queryFirstRow( |
| 3999 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3998 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 4000 | 3999 | $role, |
| 4001 | 4000 | $inputData['id'] |
| 4002 | 4001 | ); |
| 4003 | - if (DB::count()>0) { |
|
| 4002 | + if (DB::count() > 0) { |
|
| 4004 | 4003 | if ($access['type'] === 'R') { |
| 4005 | 4004 | array_push($arrTmp, 10); |
| 4006 | 4005 | } elseif ($access['type'] === 'W') { |
@@ -4065,7 +4064,7 @@ discard block |
||
| 4065 | 4064 | } else { |
| 4066 | 4065 | DB::query( |
| 4067 | 4066 | 'SELECT * |
| 4068 | - FROM ' . prefixTable('items') . ' |
|
| 4067 | + FROM ' . prefixTable('items').' |
|
| 4069 | 4068 | WHERE inactif = %i', |
| 4070 | 4069 | 0 |
| 4071 | 4070 | ); |
@@ -4075,7 +4074,7 @@ discard block |
||
| 4075 | 4074 | |
| 4076 | 4075 | // Get folder complexity |
| 4077 | 4076 | $folderComplexity = DB::queryFirstRow( |
| 4078 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4077 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4079 | 4078 | 'complex', |
| 4080 | 4079 | $inputData['id'] |
| 4081 | 4080 | ); |
@@ -4087,7 +4086,7 @@ discard block |
||
| 4087 | 4086 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4088 | 4087 | $folderRow = DB::query( |
| 4089 | 4088 | 'SELECT id_category |
| 4090 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4089 | + FROM ' . prefixTable('categories_folders').' |
|
| 4091 | 4090 | WHERE id_folder = %i', |
| 4092 | 4091 | $inputData['id'] |
| 4093 | 4092 | ); |
@@ -4202,9 +4201,9 @@ discard block |
||
| 4202 | 4201 | // List all ITEMS |
| 4203 | 4202 | if ($folderIsPf === false) { |
| 4204 | 4203 | $where->add('i.inactif=%i', 0); |
| 4205 | - $sql_e='(SELECT date FROM ' . prefixTable('log_items') |
|
| 4204 | + $sql_e = '(SELECT date FROM '.prefixTable('log_items') |
|
| 4206 | 4205 | . " WHERE action = 'at_creation' AND id_item=i.id " |
| 4207 | - . 'union all SELECT date FROM '. prefixTable('log_items') |
|
| 4206 | + . 'union all SELECT date FROM '.prefixTable('log_items') |
|
| 4208 | 4207 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
| 4209 | 4208 | AND id_item=i.id ORDER BY date DESC LIMIT 1)"; |
| 4210 | 4209 | $where->add('l.date=%l', $sql_e); |
@@ -4212,8 +4211,8 @@ discard block |
||
| 4212 | 4211 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 4213 | 4212 | } |
| 4214 | 4213 | |
| 4215 | - $query_limit = ' LIMIT ' . |
|
| 4216 | - $start . ',' . |
|
| 4214 | + $query_limit = ' LIMIT '. |
|
| 4215 | + $start.','. |
|
| 4217 | 4216 | $post_nb_items_to_display_once; |
| 4218 | 4217 | //db::debugmode(true); |
| 4219 | 4218 | $rows = DB::query( |
@@ -4225,9 +4224,9 @@ discard block |
||
| 4225 | 4224 | l.id_user AS log_user, |
| 4226 | 4225 | i.url AS link, |
| 4227 | 4226 | i.email AS email |
| 4228 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4229 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4230 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4227 | + FROM ' . prefixTable('items').' AS i |
|
| 4228 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4229 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4231 | 4230 | WHERE %l |
| 4232 | 4231 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4233 | 4232 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4247,9 +4246,9 @@ discard block |
||
| 4247 | 4246 | l.id_user AS log_user, |
| 4248 | 4247 | i.url AS link, |
| 4249 | 4248 | i.email AS email |
| 4250 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4251 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4252 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4249 | + FROM ' . prefixTable('items').' AS i |
|
| 4250 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4251 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4253 | 4252 | WHERE %l |
| 4254 | 4253 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4255 | 4254 | ORDER BY i.label ASC, l.date DESC', |
@@ -4280,7 +4279,7 @@ discard block |
||
| 4280 | 4279 | $item_is_restricted_to_role = false; |
| 4281 | 4280 | DB::queryfirstrow( |
| 4282 | 4281 | 'SELECT role_id |
| 4283 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4282 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4284 | 4283 | WHERE item_id = %i', |
| 4285 | 4284 | $record['id'] |
| 4286 | 4285 | ); |
@@ -4292,7 +4291,7 @@ discard block |
||
| 4292 | 4291 | $user_is_included_in_role = false; |
| 4293 | 4292 | DB::query( |
| 4294 | 4293 | 'SELECT role_id |
| 4295 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4294 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4296 | 4295 | WHERE item_id = %i AND role_id IN %ls', |
| 4297 | 4296 | $record['id'], |
| 4298 | 4297 | $session->get('user-roles_array') |
@@ -4499,9 +4498,9 @@ discard block |
||
| 4499 | 4498 | if ((int) $start === 0) { |
| 4500 | 4499 | DB::query( |
| 4501 | 4500 | 'SELECT i.id |
| 4502 | - FROM ' . prefixTable('items') . ' as i |
|
| 4503 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4504 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4501 | + FROM ' . prefixTable('items').' as i |
|
| 4502 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4503 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4505 | 4504 | WHERE %l |
| 4506 | 4505 | ORDER BY i.label ASC, l.date DESC', |
| 4507 | 4506 | $where |
@@ -4565,8 +4564,8 @@ discard block |
||
| 4565 | 4564 | // Run query |
| 4566 | 4565 | $dataItem = DB::queryfirstrow( |
| 4567 | 4566 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4568 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4569 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4567 | + FROM ' . prefixTable('items').' AS i |
|
| 4568 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4570 | 4569 | WHERE user_id = %i AND i.item_key = %s', |
| 4571 | 4570 | $session->get('user-id'), |
| 4572 | 4571 | $inputData['itemKey'] |
@@ -4617,7 +4616,7 @@ discard block |
||
| 4617 | 4616 | // get if existing edition lock |
| 4618 | 4617 | $dataItemEditionLocks = DB::query( |
| 4619 | 4618 | 'SELECT timestamp, user_id |
| 4620 | - FROM ' . prefixTable('items_edition') . ' |
|
| 4619 | + FROM ' . prefixTable('items_edition').' |
|
| 4621 | 4620 | WHERE item_id = %i |
| 4622 | 4621 | ORDER BY increment_id DESC', |
| 4623 | 4622 | $inputData['itemId'] |
@@ -4626,7 +4625,7 @@ discard block |
||
| 4626 | 4625 | if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
| 4627 | 4626 | |
| 4628 | 4627 | // Check if item has no edition lock |
| 4629 | - if ((int) DB::count() > 0 ) { |
|
| 4628 | + if ((int) DB::count() > 0) { |
|
| 4630 | 4629 | // get last edition lock |
| 4631 | 4630 | $dataLastItemEditionLock = $dataItemEditionLocks[0]; |
| 4632 | 4631 | |
@@ -4636,10 +4635,10 @@ discard block |
||
| 4636 | 4635 | } else { |
| 4637 | 4636 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4638 | 4637 | } |
| 4639 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4638 | + if (WIP === true) error_log('delay: '.$delay); |
|
| 4640 | 4639 | |
| 4641 | 4640 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4642 | - if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
|
| 4641 | + if (round(abs(time() - $dataTmp['timestamp']), 0) > $delay) { |
|
| 4643 | 4642 | // Case where time is expired |
| 4644 | 4643 | // In this case, delete edition lock and possible ongoing processes |
| 4645 | 4644 | // and continue editing this time |
@@ -4656,7 +4655,7 @@ discard block |
||
| 4656 | 4655 | // Get process Id |
| 4657 | 4656 | $processDetail = DB::queryFirstRow( |
| 4658 | 4657 | 'SELECT increment_id |
| 4659 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4658 | + FROM ' . prefixTable('background_tasks').' |
|
| 4660 | 4659 | WHERE item_id = %i AND finished_at = ""', |
| 4661 | 4660 | $inputData['itemId'] |
| 4662 | 4661 | ); |
@@ -4674,7 +4673,7 @@ discard block |
||
| 4674 | 4673 | // get if existing process ongoing for this item |
| 4675 | 4674 | $dataItemProcessOngoing = DB::queryFirstRow( |
| 4676 | 4675 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 4677 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4676 | + FROM ' . prefixTable('background_tasks').' |
|
| 4678 | 4677 | WHERE item_id = %i AND finished_at = "" |
| 4679 | 4678 | ORDER BY increment_id DESC', |
| 4680 | 4679 | $inputData['itemId'] |
@@ -4701,7 +4700,7 @@ discard block |
||
| 4701 | 4700 | ); |
| 4702 | 4701 | break; |
| 4703 | 4702 | } |
| 4704 | - } elseif (round(abs(time() - $dataTmp['timestamp']),0) <= $delay) { |
|
| 4703 | + } elseif (round(abs(time() - $dataTmp['timestamp']), 0) <= $delay) { |
|
| 4705 | 4704 | // Case where edition lock is already taken by another user |
| 4706 | 4705 | // Then no edition is possible |
| 4707 | 4706 | $returnValues = array( |
@@ -4730,7 +4729,7 @@ discard block |
||
| 4730 | 4729 | // do query on this folder |
| 4731 | 4730 | $data_this_folder = DB::queryFirstRow( |
| 4732 | 4731 | 'SELECT id, personal_folder, title |
| 4733 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4732 | + FROM ' . prefixTable('nested_tree').' |
|
| 4734 | 4733 | WHERE id = %s', |
| 4735 | 4734 | $inputData['folderId'] |
| 4736 | 4735 | ); |
@@ -4770,8 +4769,8 @@ discard block |
||
| 4770 | 4769 | $visibilite = ''; |
| 4771 | 4770 | $data = DB::queryFirstRow( |
| 4772 | 4771 | 'SELECT m.valeur, n.personal_folder |
| 4773 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4774 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4772 | + FROM ' . prefixTable('misc').' AS m |
|
| 4773 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4775 | 4774 | WHERE type=%s AND intitule = %s', |
| 4776 | 4775 | 'complex', |
| 4777 | 4776 | $inputData['folderId'] |
@@ -4784,8 +4783,8 @@ discard block |
||
| 4784 | 4783 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4785 | 4784 | $rows = DB::query( |
| 4786 | 4785 | 'SELECT t.title |
| 4787 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4788 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4786 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4787 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4789 | 4788 | WHERE v.folder_id = %i |
| 4790 | 4789 | GROUP BY title', |
| 4791 | 4790 | $inputData['folderId'] |
@@ -4794,7 +4793,7 @@ discard block |
||
| 4794 | 4793 | if (empty($visibilite)) { |
| 4795 | 4794 | $visibilite = $record['title']; |
| 4796 | 4795 | } else { |
| 4797 | - $visibilite .= ' - ' . $record['title']; |
|
| 4796 | + $visibilite .= ' - '.$record['title']; |
|
| 4798 | 4797 | } |
| 4799 | 4798 | } |
| 4800 | 4799 | } else { |
@@ -4804,14 +4803,14 @@ discard block |
||
| 4804 | 4803 | // do new query to know if current folder is pf |
| 4805 | 4804 | $data_pf = DB::queryFirstRow( |
| 4806 | 4805 | 'SELECT personal_folder |
| 4807 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4806 | + FROM ' . prefixTable('nested_tree').' |
|
| 4808 | 4807 | WHERE id = %s', |
| 4809 | 4808 | $inputData['folderId'] |
| 4810 | 4809 | ); |
| 4811 | 4810 | |
| 4812 | 4811 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4813 | 4812 | |
| 4814 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4813 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4815 | 4814 | } |
| 4816 | 4815 | |
| 4817 | 4816 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4821,8 +4820,8 @@ discard block |
||
| 4821 | 4820 | $listOptionsForRoles = array(); |
| 4822 | 4821 | $rows = DB::query( |
| 4823 | 4822 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4824 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4825 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4823 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4824 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4826 | 4825 | WHERE r.folder_id = %i', |
| 4827 | 4826 | $inputData['folderId'] |
| 4828 | 4827 | ); |
@@ -4836,7 +4835,7 @@ discard block |
||
| 4836 | 4835 | ); |
| 4837 | 4836 | $rows2 = DB::query( |
| 4838 | 4837 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4839 | - FROM ' . prefixTable('users') . ' |
|
| 4838 | + FROM ' . prefixTable('users').' |
|
| 4840 | 4839 | WHERE admin = 0 AND fonction_id is not null' |
| 4841 | 4840 | ); |
| 4842 | 4841 | foreach ($rows2 as $record2) { |
@@ -4850,7 +4849,7 @@ discard block |
||
| 4850 | 4849 | array( |
| 4851 | 4850 | 'id' => $record2['id'], |
| 4852 | 4851 | 'login' => $record2['login'], |
| 4853 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4852 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4854 | 4853 | 'email' => $record2['email'], |
| 4855 | 4854 | ) |
| 4856 | 4855 | ); |
@@ -4867,13 +4866,13 @@ discard block |
||
| 4867 | 4866 | //db::debugmode(true); |
| 4868 | 4867 | $access = DB::queryFirstRow( |
| 4869 | 4868 | 'SELECT type |
| 4870 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4869 | + FROM ' . prefixTable('roles_values').' |
|
| 4871 | 4870 | WHERE role_id = %i AND folder_id = %i', |
| 4872 | 4871 | $role, |
| 4873 | 4872 | $inputData['folderId'] |
| 4874 | 4873 | ); |
| 4875 | 4874 | //db::debugmode(false); |
| 4876 | - if (DB::count()>0) { |
|
| 4875 | + if (DB::count() > 0) { |
|
| 4877 | 4876 | if ($access['type'] === 'R') { |
| 4878 | 4877 | array_push($arrTmp, 10); |
| 4879 | 4878 | } elseif ($access['type'] === 'W') { |
@@ -4901,7 +4900,7 @@ discard block |
||
| 4901 | 4900 | // Check if personal folder is owned by user |
| 4902 | 4901 | $folder_title = DB::queryFirstRow( |
| 4903 | 4902 | 'SELECT title |
| 4904 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4903 | + FROM ' . prefixTable('nested_tree').' |
|
| 4905 | 4904 | WHERE id = %s AND title = %s', |
| 4906 | 4905 | $inputData['folderId'], |
| 4907 | 4906 | $session->get('user-id'), |
@@ -5000,7 +4999,7 @@ discard block |
||
| 5000 | 4999 | // Get some info before deleting |
| 5001 | 5000 | $data = DB::queryFirstRow( |
| 5002 | 5001 | 'SELECT name, id_item, file |
| 5003 | - FROM ' . prefixTable('files') . ' |
|
| 5002 | + FROM ' . prefixTable('files').' |
|
| 5004 | 5003 | WHERE id = %i', |
| 5005 | 5004 | $fileId |
| 5006 | 5005 | ); |
@@ -5008,7 +5007,7 @@ discard block |
||
| 5008 | 5007 | // Load item data |
| 5009 | 5008 | $data_item = DB::queryFirstRow( |
| 5010 | 5009 | 'SELECT id_tree |
| 5011 | - FROM ' . prefixTable('items') . ' |
|
| 5010 | + FROM ' . prefixTable('items').' |
|
| 5012 | 5011 | WHERE id = %i', |
| 5013 | 5012 | $data['id_item'] |
| 5014 | 5013 | ); |
@@ -5038,7 +5037,7 @@ discard block |
||
| 5038 | 5037 | $session->get('user-id'), |
| 5039 | 5038 | 'at_modification', |
| 5040 | 5039 | $session->get('user-login'), |
| 5041 | - 'at_del_file : ' . $data['name'] |
|
| 5040 | + 'at_del_file : '.$data['name'] |
|
| 5042 | 5041 | ); |
| 5043 | 5042 | |
| 5044 | 5043 | // DElete sharekeys |
@@ -5049,7 +5048,7 @@ discard block |
||
| 5049 | 5048 | ); |
| 5050 | 5049 | |
| 5051 | 5050 | // Delete file from server |
| 5052 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 5051 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 5053 | 5052 | $fileToDelete = realpath($fileToDelete); |
| 5054 | 5053 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 5055 | 5054 | fileDelete($fileToDelete, $SETTINGS); |
@@ -5103,7 +5102,7 @@ discard block |
||
| 5103 | 5102 | // Update SESSION with this new favourite |
| 5104 | 5103 | $data = DB::queryfirstrow( |
| 5105 | 5104 | 'SELECT label,id_tree |
| 5106 | - FROM ' . prefixTable('items') . ' |
|
| 5105 | + FROM ' . prefixTable('items').' |
|
| 5107 | 5106 | WHERE id = %i', |
| 5108 | 5107 | $inputData['itemId'] |
| 5109 | 5108 | ); |
@@ -5112,7 +5111,7 @@ discard block |
||
| 5112 | 5111 | [ |
| 5113 | 5112 | $inputData['itemId'] => [ |
| 5114 | 5113 | 'label' => $data['label'], |
| 5115 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 5114 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 5116 | 5115 | ], |
| 5117 | 5116 | ], |
| 5118 | 5117 | 'add' |
@@ -5181,8 +5180,8 @@ discard block |
||
| 5181 | 5180 | // get data about item |
| 5182 | 5181 | $dataSource = DB::queryfirstrow( |
| 5183 | 5182 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5184 | - FROM ' . prefixTable('items') . ' as i |
|
| 5185 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5183 | + FROM ' . prefixTable('items').' as i |
|
| 5184 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5186 | 5185 | WHERE i.id=%i', |
| 5187 | 5186 | $inputData['itemId'] |
| 5188 | 5187 | ); |
@@ -5226,7 +5225,7 @@ discard block |
||
| 5226 | 5225 | // get data about new folder |
| 5227 | 5226 | $dataDestination = DB::queryfirstrow( |
| 5228 | 5227 | 'SELECT personal_folder, title |
| 5229 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5228 | + FROM ' . prefixTable('nested_tree').' |
|
| 5230 | 5229 | WHERE id = %i', |
| 5231 | 5230 | $inputData['folderId'] |
| 5232 | 5231 | ); |
@@ -5279,7 +5278,7 @@ discard block |
||
| 5279 | 5278 | // Get fields for this Item |
| 5280 | 5279 | $rows = DB::query( |
| 5281 | 5280 | 'SELECT id |
| 5282 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5281 | + FROM ' . prefixTable('categories_items').' |
|
| 5283 | 5282 | WHERE item_id = %i', |
| 5284 | 5283 | $inputData['itemId'] |
| 5285 | 5284 | ); |
@@ -5296,7 +5295,7 @@ discard block |
||
| 5296 | 5295 | // Get FILES for this Item |
| 5297 | 5296 | $rows = DB::query( |
| 5298 | 5297 | 'SELECT id |
| 5299 | - FROM ' . prefixTable('files') . ' |
|
| 5298 | + FROM ' . prefixTable('files').' |
|
| 5300 | 5299 | WHERE id_item = %i', |
| 5301 | 5300 | $inputData['itemId'] |
| 5302 | 5301 | ); |
@@ -5343,7 +5342,7 @@ discard block |
||
| 5343 | 5342 | // Get the ITEM object key for the user |
| 5344 | 5343 | $userKey = DB::queryFirstRow( |
| 5345 | 5344 | 'SELECT share_key |
| 5346 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5345 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5347 | 5346 | WHERE user_id = %i AND object_id = %i', |
| 5348 | 5347 | $session->get('user-id'), |
| 5349 | 5348 | $inputData['itemId'] |
@@ -5354,7 +5353,7 @@ discard block |
||
| 5354 | 5353 | // This is a public object |
| 5355 | 5354 | $users = DB::query( |
| 5356 | 5355 | 'SELECT id, public_key |
| 5357 | - FROM ' . prefixTable('users') . ' |
|
| 5356 | + FROM ' . prefixTable('users').' |
|
| 5358 | 5357 | WHERE id NOT IN (%i, %i, %i, %i) |
| 5359 | 5358 | AND public_key != ""', |
| 5360 | 5359 | OTV_USER_ID, |
@@ -5380,14 +5379,14 @@ discard block |
||
| 5380 | 5379 | // Get fields for this Item |
| 5381 | 5380 | $rows = DB::query( |
| 5382 | 5381 | 'SELECT id |
| 5383 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5382 | + FROM ' . prefixTable('categories_items').' |
|
| 5384 | 5383 | WHERE item_id = %i', |
| 5385 | 5384 | $inputData['itemId'] |
| 5386 | 5385 | ); |
| 5387 | 5386 | foreach ($rows as $field) { |
| 5388 | 5387 | $userKey = DB::queryFirstRow( |
| 5389 | 5388 | 'SELECT share_key |
| 5390 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5389 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5391 | 5390 | WHERE user_id = %i AND object_id = %i', |
| 5392 | 5391 | $session->get('user-id'), |
| 5393 | 5392 | $field['id'] |
@@ -5398,7 +5397,7 @@ discard block |
||
| 5398 | 5397 | // This is a public object |
| 5399 | 5398 | $users = DB::query( |
| 5400 | 5399 | 'SELECT id, public_key |
| 5401 | - FROM ' . prefixTable('users') . ' |
|
| 5400 | + FROM ' . prefixTable('users').' |
|
| 5402 | 5401 | WHERE id NOT IN (%i, %i, %i, %i) |
| 5403 | 5402 | AND public_key != ""', |
| 5404 | 5403 | OTV_USER_ID, |
@@ -5424,14 +5423,14 @@ discard block |
||
| 5424 | 5423 | // Get FILES for this Item |
| 5425 | 5424 | $rows = DB::query( |
| 5426 | 5425 | 'SELECT id |
| 5427 | - FROM ' . prefixTable('files') . ' |
|
| 5426 | + FROM ' . prefixTable('files').' |
|
| 5428 | 5427 | WHERE id_item = %i', |
| 5429 | 5428 | $inputData['itemId'] |
| 5430 | 5429 | ); |
| 5431 | 5430 | foreach ($rows as $attachment) { |
| 5432 | 5431 | $userKey = DB::queryFirstRow( |
| 5433 | 5432 | 'SELECT share_key |
| 5434 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5433 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5435 | 5434 | WHERE user_id = %i AND object_id = %i', |
| 5436 | 5435 | $session->get('user-id'), |
| 5437 | 5436 | $attachment['id'] |
@@ -5442,7 +5441,7 @@ discard block |
||
| 5442 | 5441 | // This is a public object |
| 5443 | 5442 | $users = DB::query( |
| 5444 | 5443 | 'SELECT id, public_key |
| 5445 | - FROM ' . prefixTable('users') . ' |
|
| 5444 | + FROM ' . prefixTable('users').' |
|
| 5446 | 5445 | WHERE id NOT IN (%i, %i, %i, %i) |
| 5447 | 5446 | AND public_key != ""', |
| 5448 | 5447 | OTV_USER_ID, |
@@ -5486,7 +5485,7 @@ discard block |
||
| 5486 | 5485 | $session->get('user-id'), |
| 5487 | 5486 | 'at_modification', |
| 5488 | 5487 | $session->get('user-login'), |
| 5489 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5488 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5490 | 5489 | ); |
| 5491 | 5490 | |
| 5492 | 5491 | // Update cache table |
@@ -5545,8 +5544,8 @@ discard block |
||
| 5545 | 5544 | // get data about item |
| 5546 | 5545 | $dataSource = DB::queryfirstrow( |
| 5547 | 5546 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5548 | - FROM ' . prefixTable('items') . ' as i |
|
| 5549 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5547 | + FROM ' . prefixTable('items').' as i |
|
| 5548 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5550 | 5549 | WHERE i.id=%i', |
| 5551 | 5550 | $item_id |
| 5552 | 5551 | ); |
@@ -5568,7 +5567,7 @@ discard block |
||
| 5568 | 5567 | |
| 5569 | 5568 | // get data about new folder |
| 5570 | 5569 | $dataDestination = DB::queryfirstrow( |
| 5571 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5570 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5572 | 5571 | $inputData['folderId'] |
| 5573 | 5572 | ); |
| 5574 | 5573 | |
@@ -5610,7 +5609,7 @@ discard block |
||
| 5610 | 5609 | // Get fields for this Item |
| 5611 | 5610 | $rows = DB::query( |
| 5612 | 5611 | 'SELECT id |
| 5613 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5612 | + FROM ' . prefixTable('categories_items').' |
|
| 5614 | 5613 | WHERE item_id = %i', |
| 5615 | 5614 | $item_id |
| 5616 | 5615 | ); |
@@ -5627,7 +5626,7 @@ discard block |
||
| 5627 | 5626 | // Get FILES for this Item |
| 5628 | 5627 | $rows = DB::query( |
| 5629 | 5628 | 'SELECT id |
| 5630 | - FROM ' . prefixTable('files') . ' |
|
| 5629 | + FROM ' . prefixTable('files').' |
|
| 5631 | 5630 | WHERE id_item = %i', |
| 5632 | 5631 | $item_id |
| 5633 | 5632 | ); |
@@ -5682,7 +5681,7 @@ discard block |
||
| 5682 | 5681 | // Get the ITEM object key for the user |
| 5683 | 5682 | $userKey = DB::queryFirstRow( |
| 5684 | 5683 | 'SELECT share_key |
| 5685 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5684 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5686 | 5685 | WHERE user_id = %i AND object_id = %i', |
| 5687 | 5686 | $session->get('user-id'), |
| 5688 | 5687 | $item_id |
@@ -5693,7 +5692,7 @@ discard block |
||
| 5693 | 5692 | // This is a public object |
| 5694 | 5693 | $users = DB::query( |
| 5695 | 5694 | 'SELECT id, public_key |
| 5696 | - FROM ' . prefixTable('users') . ' |
|
| 5695 | + FROM ' . prefixTable('users').' |
|
| 5697 | 5696 | WHERE id NOT IN (%i, %i, %i, %i) |
| 5698 | 5697 | AND public_key != ""', |
| 5699 | 5698 | OTV_USER_ID, |
@@ -5719,14 +5718,14 @@ discard block |
||
| 5719 | 5718 | // Get fields for this Item |
| 5720 | 5719 | $rows = DB::query( |
| 5721 | 5720 | 'SELECT id |
| 5722 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5721 | + FROM ' . prefixTable('categories_items').' |
|
| 5723 | 5722 | WHERE item_id = %i', |
| 5724 | 5723 | $item_id |
| 5725 | 5724 | ); |
| 5726 | 5725 | foreach ($rows as $field) { |
| 5727 | 5726 | $userKey = DB::queryFirstRow( |
| 5728 | 5727 | 'SELECT share_key |
| 5729 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5728 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5730 | 5729 | WHERE user_id = %i AND object_id = %i', |
| 5731 | 5730 | $session->get('user-id'), |
| 5732 | 5731 | $field['id'] |
@@ -5737,7 +5736,7 @@ discard block |
||
| 5737 | 5736 | // This is a public object |
| 5738 | 5737 | $users = DB::query( |
| 5739 | 5738 | 'SELECT id, public_key |
| 5740 | - FROM ' . prefixTable('users') . ' |
|
| 5739 | + FROM ' . prefixTable('users').' |
|
| 5741 | 5740 | WHERE id NOT IN (%i, %i, %i, %i) |
| 5742 | 5741 | AND public_key != ""', |
| 5743 | 5742 | OTV_USER_ID, |
@@ -5764,14 +5763,14 @@ discard block |
||
| 5764 | 5763 | // Get FILES for this Item |
| 5765 | 5764 | $rows = DB::query( |
| 5766 | 5765 | 'SELECT id |
| 5767 | - FROM ' . prefixTable('files') . ' |
|
| 5766 | + FROM ' . prefixTable('files').' |
|
| 5768 | 5767 | WHERE id_item = %i', |
| 5769 | 5768 | $item_id |
| 5770 | 5769 | ); |
| 5771 | 5770 | foreach ($rows as $attachment) { |
| 5772 | 5771 | $userKey = DB::queryFirstRow( |
| 5773 | 5772 | 'SELECT share_key |
| 5774 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5773 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5775 | 5774 | WHERE user_id = %i AND object_id = %i', |
| 5776 | 5775 | $session->get('user-id'), |
| 5777 | 5776 | $attachment['id'] |
@@ -5782,7 +5781,7 @@ discard block |
||
| 5782 | 5781 | // This is a public object |
| 5783 | 5782 | $users = DB::query( |
| 5784 | 5783 | 'SELECT id, public_key |
| 5785 | - FROM ' . prefixTable('users') . ' |
|
| 5784 | + FROM ' . prefixTable('users').' |
|
| 5786 | 5785 | WHERE id NOT IN (%i, %i, %i, %i) |
| 5787 | 5786 | AND public_key != ""', |
| 5788 | 5787 | OTV_USER_ID, |
@@ -5825,13 +5824,13 @@ discard block |
||
| 5825 | 5824 | $session->get('user-id'), |
| 5826 | 5825 | 'at_modification', |
| 5827 | 5826 | $session->get('user-login'), |
| 5828 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5827 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5829 | 5828 | ); |
| 5830 | 5829 | } |
| 5831 | 5830 | } |
| 5832 | 5831 | |
| 5833 | 5832 | // reload cache table |
| 5834 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5833 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5835 | 5834 | updateCacheTable('reload', null); |
| 5836 | 5835 | |
| 5837 | 5836 | echo (string) prepareExchangedData( |
@@ -5895,7 +5894,7 @@ discard block |
||
| 5895 | 5894 | // get info |
| 5896 | 5895 | $dataSource = DB::queryfirstrow( |
| 5897 | 5896 | 'SELECT label, id_tree |
| 5898 | - FROM ' . prefixTable('items') . ' |
|
| 5897 | + FROM ' . prefixTable('items').' |
|
| 5899 | 5898 | WHERE id=%i', |
| 5900 | 5899 | $item_id |
| 5901 | 5900 | ); |
@@ -5996,14 +5995,14 @@ discard block |
||
| 5996 | 5995 | // Variables |
| 5997 | 5996 | $dataAuthor = DB::queryfirstrow( |
| 5998 | 5997 | 'SELECT email,login |
| 5999 | - FROM ' . prefixTable('users') . ' |
|
| 5998 | + FROM ' . prefixTable('users').' |
|
| 6000 | 5999 | WHERE id = %i', |
| 6001 | 6000 | $post_content[1] |
| 6002 | 6001 | ); |
| 6003 | 6002 | |
| 6004 | 6003 | $dataItem = DB::queryfirstrow( |
| 6005 | 6004 | 'SELECT label, id_tree |
| 6006 | - FROM ' . prefixTable('items') . ' |
|
| 6005 | + FROM ' . prefixTable('items').' |
|
| 6007 | 6006 | WHERE id = %i', |
| 6008 | 6007 | $post_content[0] |
| 6009 | 6008 | ); |
@@ -6020,7 +6019,7 @@ discard block |
||
| 6020 | 6019 | $lang->get('email_request_access_subject'), |
| 6021 | 6020 | str_replace( |
| 6022 | 6021 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 6023 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 6022 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 6024 | 6023 | $lang->get('email_request_access_mail') |
| 6025 | 6024 | ), |
| 6026 | 6025 | $dataAuthor['email'], |
@@ -6029,7 +6028,7 @@ discard block |
||
| 6029 | 6028 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 6030 | 6029 | $dataItem = DB::queryfirstrow( |
| 6031 | 6030 | 'SELECT label,id_tree |
| 6032 | - FROM ' . prefixTable('items') . ' |
|
| 6031 | + FROM ' . prefixTable('items').' |
|
| 6033 | 6032 | WHERE id= %i', |
| 6034 | 6033 | $inputData['id'] |
| 6035 | 6034 | ); |
@@ -6052,7 +6051,7 @@ discard block |
||
| 6052 | 6051 | ), |
| 6053 | 6052 | array( |
| 6054 | 6053 | empty($SETTINGS['email_server_url']) === false ? |
| 6055 | - $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'], |
|
| 6054 | + $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'], |
|
| 6056 | 6055 | addslashes($session->get('user-login')), |
| 6057 | 6056 | addslashes($path), |
| 6058 | 6057 | ), |
@@ -6101,8 +6100,8 @@ discard block |
||
| 6101 | 6100 | // Get all informations for this item |
| 6102 | 6101 | $dataItem = DB::queryfirstrow( |
| 6103 | 6102 | 'SELECT * |
| 6104 | - FROM ' . prefixTable('items') . ' as i |
|
| 6105 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 6103 | + FROM ' . prefixTable('items').' as i |
|
| 6104 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 6106 | 6105 | WHERE i.id=%i AND l.action = %s', |
| 6107 | 6106 | $item_id, |
| 6108 | 6107 | 'at_creation' |
@@ -6131,18 +6130,18 @@ discard block |
||
| 6131 | 6130 | $session->get('user-login'), |
| 6132 | 6131 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 6133 | 6132 | null, |
| 6134 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 6133 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 6135 | 6134 | ); |
| 6136 | 6135 | // Prepare new line |
| 6137 | 6136 | $data = DB::queryfirstrow( |
| 6138 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 6137 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 6139 | 6138 | $item_id |
| 6140 | 6139 | ); |
| 6141 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 6140 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 6142 | 6141 | // send back |
| 6143 | 6142 | $data = array( |
| 6144 | 6143 | 'error' => '', |
| 6145 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 6144 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 6146 | 6145 | ); |
| 6147 | 6146 | echo (string) prepareExchangedData( |
| 6148 | 6147 | $data, |
@@ -6217,8 +6216,8 @@ discard block |
||
| 6217 | 6216 | // Should we log a password change? |
| 6218 | 6217 | $itemQ = DB::queryFirstRow( |
| 6219 | 6218 | 'SELECT s.share_key, i.pw |
| 6220 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6221 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6219 | + FROM ' . prefixTable('items').' AS i |
|
| 6220 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6222 | 6221 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6223 | 6222 | $session->get('user-id'), |
| 6224 | 6223 | $dataReceived['id'] |
@@ -6273,7 +6272,7 @@ discard block |
||
| 6273 | 6272 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6274 | 6273 | $SETTINGS['otv_expiration_period'] = 7; |
| 6275 | 6274 | } |
| 6276 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6275 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6277 | 6276 | |
| 6278 | 6277 | echo json_encode( |
| 6279 | 6278 | array( |
@@ -6304,7 +6303,7 @@ discard block |
||
| 6304 | 6303 | // get parameters from original link |
| 6305 | 6304 | $url = $dataReceived['original_link']; |
| 6306 | 6305 | $parts = parse_url($url); |
| 6307 | - if(isset($parts['query'])){ |
|
| 6306 | + if (isset($parts['query'])) { |
|
| 6308 | 6307 | parse_str($parts['query'], $orignal_link_parameters); |
| 6309 | 6308 | } else { |
| 6310 | 6309 | $orignal_link_parameters = array(); |
@@ -6335,13 +6334,13 @@ discard block |
||
| 6335 | 6334 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6336 | 6335 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6337 | 6336 | if (str_contains($domain_host, 'www.') === true) { |
| 6338 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6337 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6339 | 6338 | } else { |
| 6340 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6339 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6341 | 6340 | } |
| 6342 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6341 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6343 | 6342 | } else { |
| 6344 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6343 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6345 | 6344 | } |
| 6346 | 6345 | |
| 6347 | 6346 | echo (string) prepareExchangedData( |
@@ -6376,8 +6375,8 @@ discard block |
||
| 6376 | 6375 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6377 | 6376 | f.extension AS extension, f.type AS type, |
| 6378 | 6377 | s.share_key AS share_key |
| 6379 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6380 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6378 | + FROM ' . prefixTable('files').' AS f |
|
| 6379 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6381 | 6380 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6382 | 6381 | $session->get('user-id'), |
| 6383 | 6382 | $inputData['id'] |
@@ -6398,7 +6397,7 @@ discard block |
||
| 6398 | 6397 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6399 | 6398 | |
| 6400 | 6399 | // prepare image info |
| 6401 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6400 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6402 | 6401 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6403 | 6402 | |
| 6404 | 6403 | // Get image content |
@@ -6425,7 +6424,7 @@ discard block |
||
| 6425 | 6424 | echo (string) prepareExchangedData( |
| 6426 | 6425 | array( |
| 6427 | 6426 | 'error' => false, |
| 6428 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6427 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6429 | 6428 | 'file_type' => $file_info['type'], |
| 6430 | 6429 | 'file_content' => $fileContent, |
| 6431 | 6430 | ), |
@@ -6478,16 +6477,16 @@ discard block |
||
| 6478 | 6477 | $idFolder = $dataReceived['idFolder']; |
| 6479 | 6478 | |
| 6480 | 6479 | // don't check if Personal Folder |
| 6481 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 6480 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 6482 | 6481 | if ($data['title'] === $session->get('user-id')) { |
| 6483 | 6482 | // send data |
| 6484 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 6483 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 6485 | 6484 | } else { |
| 6486 | 6485 | if ($inputData['option'] === 'same_folder') { |
| 6487 | 6486 | // case unique folder |
| 6488 | 6487 | DB::query( |
| 6489 | 6488 | 'SELECT label |
| 6490 | - FROM ' . prefixTable('items') . ' |
|
| 6489 | + FROM ' . prefixTable('items').' |
|
| 6491 | 6490 | WHERE id_tree = %i AND label = %s', |
| 6492 | 6491 | $idFolder, |
| 6493 | 6492 | $label |
@@ -6499,7 +6498,7 @@ discard block |
||
| 6499 | 6498 | $arrayPf = array(); |
| 6500 | 6499 | if (empty($row['id']) === false) { |
| 6501 | 6500 | $rows = DB::query( |
| 6502 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 6501 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 6503 | 6502 | '1' |
| 6504 | 6503 | ); |
| 6505 | 6504 | foreach ($rows as $record) { |
@@ -6514,12 +6513,12 @@ discard block |
||
| 6514 | 6513 | $where->add('id_tree = %i', $idFolder); |
| 6515 | 6514 | $where->add('label = %s', $label); |
| 6516 | 6515 | if (empty($arrayPf) === false) { |
| 6517 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 6516 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 6518 | 6517 | } |
| 6519 | 6518 | |
| 6520 | 6519 | DB::query( |
| 6521 | 6520 | 'SELECT label |
| 6522 | - FROM ' . prefixTable('items') . ' |
|
| 6521 | + FROM ' . prefixTable('items').' |
|
| 6523 | 6522 | WHERE %l', |
| 6524 | 6523 | $where |
| 6525 | 6524 | ); |
@@ -6531,7 +6530,7 @@ discard block |
||
| 6531 | 6530 | } |
| 6532 | 6531 | |
| 6533 | 6532 | // send data |
| 6534 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 6533 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 6535 | 6534 | } |
| 6536 | 6535 | break; |
| 6537 | 6536 | |
@@ -6641,7 +6640,7 @@ discard block |
||
| 6641 | 6640 | $arbo = $tree->getPath($folder->id, false); |
| 6642 | 6641 | $path = ''; |
| 6643 | 6642 | foreach ($arbo as $elem) { |
| 6644 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6643 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6645 | 6644 | } |
| 6646 | 6645 | |
| 6647 | 6646 | // Build array |
@@ -6710,7 +6709,7 @@ discard block |
||
| 6710 | 6709 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6711 | 6710 | $rows = DB::query( |
| 6712 | 6711 | 'SELECT id, categories |
| 6713 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6712 | + FROM ' . prefixTable('nested_tree').' |
|
| 6714 | 6713 | WHERE id IN (%l)', |
| 6715 | 6714 | implode(',', $foldersArray) |
| 6716 | 6715 | ); |
@@ -6752,7 +6751,7 @@ discard block |
||
| 6752 | 6751 | // get item info |
| 6753 | 6752 | $dataItem = DB::queryFirstRow( |
| 6754 | 6753 | 'SELECT * |
| 6755 | - FROM ' . prefixTable('items') . ' |
|
| 6754 | + FROM ' . prefixTable('items').' |
|
| 6756 | 6755 | WHERE id=%i', |
| 6757 | 6756 | $inputData['itemId'] |
| 6758 | 6757 | ); |
@@ -6764,8 +6763,8 @@ discard block |
||
| 6764 | 6763 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6765 | 6764 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6766 | 6765 | l.old_value as old_value |
| 6767 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6768 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6766 | + FROM ' . prefixTable('log_items').' as l |
|
| 6767 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6769 | 6768 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6770 | 6769 | ORDER BY date DESC', |
| 6771 | 6770 | $inputData['itemId'], |
@@ -6780,18 +6779,18 @@ discard block |
||
| 6780 | 6779 | |
| 6781 | 6780 | // imported via API |
| 6782 | 6781 | if (empty($record['login']) === true) { |
| 6783 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6782 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6784 | 6783 | } |
| 6785 | 6784 | |
| 6786 | 6785 | // Prepare avatar |
| 6787 | 6786 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6788 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6789 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6787 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6788 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6790 | 6789 | } else { |
| 6791 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6790 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6792 | 6791 | } |
| 6793 | 6792 | } else { |
| 6794 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6793 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6795 | 6794 | } |
| 6796 | 6795 | |
| 6797 | 6796 | // Prepare action |
@@ -6811,7 +6810,7 @@ discard block |
||
| 6811 | 6810 | $previous_passwords, |
| 6812 | 6811 | [ |
| 6813 | 6812 | 'password' => htmlentities($previous_pwd['string']), |
| 6814 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6813 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6815 | 6814 | ] |
| 6816 | 6815 | ); |
| 6817 | 6816 | } |
@@ -6824,19 +6823,19 @@ discard block |
||
| 6824 | 6823 | $action = $lang->get($reason[0]); |
| 6825 | 6824 | if ($reason[0] === 'at_moved') { |
| 6826 | 6825 | $tmp = explode(' -> ', $reason[1]); |
| 6827 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6826 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6828 | 6827 | } elseif ($reason[0] === 'at_field') { |
| 6829 | 6828 | $tmp = explode(' => ', $reason[1]); |
| 6830 | 6829 | if (count($tmp) > 1) { |
| 6831 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6832 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6830 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6831 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6833 | 6832 | } else { |
| 6834 | 6833 | $detail = trim($reason[1]); |
| 6835 | 6834 | } |
| 6836 | 6835 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6837 | 6836 | $tmp = explode(' => ', $reason[1]); |
| 6838 | 6837 | $detail = empty(trim($tmp[0])) === true ? |
| 6839 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6838 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6840 | 6839 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6841 | 6840 | $detail = $lang->get($reason[1]); |
| 6842 | 6841 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6845,7 +6844,7 @@ discard block |
||
| 6845 | 6844 | $tmp = explode(':', $reason[1]); |
| 6846 | 6845 | $tmp = explode('.', $tmp[0]); |
| 6847 | 6846 | $detail = isBase64($tmp[0]) === true ? |
| 6848 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6847 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6849 | 6848 | } elseif ($reason[0] === 'at_import') { |
| 6850 | 6849 | $detail = ''; |
| 6851 | 6850 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6864,8 +6863,8 @@ discard block |
||
| 6864 | 6863 | array( |
| 6865 | 6864 | 'avatar' => $avatar, |
| 6866 | 6865 | 'login' => $record['login'], |
| 6867 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6868 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6866 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6867 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6869 | 6868 | 'action' => $action, |
| 6870 | 6869 | 'detail' => $detail, |
| 6871 | 6870 | ) |
@@ -6954,11 +6953,11 @@ discard block |
||
| 6954 | 6953 | |
| 6955 | 6954 | // get some info to add to the notification email |
| 6956 | 6955 | $resp_user = DB::queryfirstrow( |
| 6957 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6956 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6958 | 6957 | $session->get('user-id') |
| 6959 | 6958 | ); |
| 6960 | 6959 | $resp_folder = DB::queryfirstrow( |
| 6961 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6960 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6962 | 6961 | $folder |
| 6963 | 6962 | ); |
| 6964 | 6963 | |
@@ -6967,7 +6966,7 @@ discard block |
||
| 6967 | 6966 | $emailService = new EmailService(); |
| 6968 | 6967 | $rows = DB::query( |
| 6969 | 6968 | 'SELECT email |
| 6970 | - FROM ' . prefixTable('users') . ' |
|
| 6969 | + FROM ' . prefixTable('users').' |
|
| 6971 | 6970 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6972 | 6971 | 1 |
| 6973 | 6972 | ); |
@@ -6998,14 +6997,14 @@ discard block |
||
| 6998 | 6997 | // Get list of users |
| 6999 | 6998 | $usersList = array(); |
| 7000 | 6999 | $usersString = ''; |
| 7001 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 7000 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 7002 | 7001 | foreach ($rows as $record) { |
| 7003 | 7002 | $usersList[$record['login']] = array( |
| 7004 | 7003 | 'id' => $record['id'], |
| 7005 | 7004 | 'login' => $record['login'], |
| 7006 | 7005 | 'email' => $record['email'], |
| 7007 | 7006 | ); |
| 7008 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 7007 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 7009 | 7008 | } |
| 7010 | 7009 | |
| 7011 | 7010 | $data = array( |
@@ -7045,7 +7044,7 @@ discard block |
||
| 7045 | 7044 | // Send email |
| 7046 | 7045 | $dataItem = DB::queryfirstrow( |
| 7047 | 7046 | 'SELECT label, id_tree |
| 7048 | - FROM ' . prefixTable('items') . ' |
|
| 7047 | + FROM ' . prefixTable('items').' |
|
| 7049 | 7048 | WHERE id = %i', |
| 7050 | 7049 | $inputData['itemId'] |
| 7051 | 7050 | ); |
@@ -7099,7 +7098,7 @@ discard block |
||
| 7099 | 7098 | |
| 7100 | 7099 | DB::query( |
| 7101 | 7100 | 'SELECT * |
| 7102 | - FROM ' . prefixTable('notification') . ' |
|
| 7101 | + FROM ' . prefixTable('notification').' |
|
| 7103 | 7102 | WHERE item_id = %i AND user_id = %i', |
| 7104 | 7103 | $inputData['itemId'], |
| 7105 | 7104 | $session->get('user-id') |
@@ -7171,7 +7170,7 @@ discard block |
||
| 7171 | 7170 | // And related logs |
| 7172 | 7171 | $rows = DB::query( |
| 7173 | 7172 | 'SELECT id, file AS filename |
| 7174 | - FROM ' . prefixTable('files') . ' |
|
| 7173 | + FROM ' . prefixTable('files').' |
|
| 7175 | 7174 | WHERE id_item = %i AND confirmed = %i', |
| 7176 | 7175 | $inputData['itemId'], |
| 7177 | 7176 | 0 |
@@ -7185,12 +7184,12 @@ discard block |
||
| 7185 | 7184 | ); |
| 7186 | 7185 | |
| 7187 | 7186 | // Delete file on server |
| 7188 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 7187 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 7189 | 7188 | |
| 7190 | 7189 | // Delete related logs |
| 7191 | 7190 | $logFile = DB::query( |
| 7192 | 7191 | 'SELECT increment_id, raison |
| 7193 | - FROM ' . prefixTable('log_items') . ' |
|
| 7192 | + FROM ' . prefixTable('log_items').' |
|
| 7194 | 7193 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 7195 | 7194 | $inputData['itemId'], |
| 7196 | 7195 | $session->get('user-id'), |
@@ -7249,7 +7248,7 @@ discard block |
||
| 7249 | 7248 | // Confirm attachments |
| 7250 | 7249 | $rows = DB::query( |
| 7251 | 7250 | 'SELECT id, file AS filename |
| 7252 | - FROM ' . prefixTable('files') . ' |
|
| 7251 | + FROM ' . prefixTable('files').' |
|
| 7253 | 7252 | WHERE id_item = %i AND confirmed = %i', |
| 7254 | 7253 | $inputData['itemId'], |
| 7255 | 7254 | 0 |
@@ -7335,15 +7334,15 @@ discard block |
||
| 7335 | 7334 | case 'autocomplete_tags': |
| 7336 | 7335 | // Get a list off all existing TAGS |
| 7337 | 7336 | $listOfTags = ''; |
| 7338 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7337 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7339 | 7338 | foreach ($rows as $record) { |
| 7340 | 7339 | if (empty($listOfTags)) { |
| 7341 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7340 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7342 | 7341 | } else { |
| 7343 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7342 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7344 | 7343 | } |
| 7345 | 7344 | } |
| 7346 | - echo '[' . $listOfTags . ']'; |
|
| 7345 | + echo '['.$listOfTags.']'; |
|
| 7347 | 7346 | break; |
| 7348 | 7347 | } |
| 7349 | 7348 | } |
@@ -7359,7 +7358,7 @@ discard block |
||
| 7359 | 7358 | { |
| 7360 | 7359 | $data = DB::queryFirstRow( |
| 7361 | 7360 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7362 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7361 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7363 | 7362 | $groupe |
| 7364 | 7363 | ); |
| 7365 | 7364 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7463,7 +7462,7 @@ discard block |
||
| 7463 | 7462 | global $SETTINGS; |
| 7464 | 7463 | |
| 7465 | 7464 | // Retrieve the current lock information for the item |
| 7466 | - $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $itemId); |
|
| 7465 | + $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $itemId); |
|
| 7467 | 7466 | |
| 7468 | 7467 | // Check if the item is locked by another user |
| 7469 | 7468 | if ($itemLockInfo && $itemLockInfo['user_id'] !== $userId) { |
@@ -7482,7 +7481,7 @@ discard block |
||
| 7482 | 7481 | |
| 7483 | 7482 | // Check if there's an ongoing background encryption process for the item |
| 7484 | 7483 | $ongoingProcess = DB::queryFirstRow( |
| 7485 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7484 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7486 | 7485 | $itemId |
| 7487 | 7486 | ); |
| 7488 | 7487 | |
@@ -7500,7 +7499,7 @@ discard block |
||
| 7500 | 7499 | function getUserVisibleFolders(int $userId): array |
| 7501 | 7500 | { |
| 7502 | 7501 | // Query to retrieve visible folders for the user |
| 7503 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7502 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7504 | 7503 | |
| 7505 | 7504 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7506 | 7505 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7524,7 +7523,7 @@ discard block |
||
| 7524 | 7523 | |
| 7525 | 7524 | // Query the access rights for the given roles and folder |
| 7526 | 7525 | $accessTypes = DB::queryFirstColumn( |
| 7527 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7526 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7528 | 7527 | $roles, |
| 7529 | 7528 | $treeId |
| 7530 | 7529 | ); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 68 | 68 | // Not allowed page |
| 69 | 69 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 70 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 70 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 71 | 71 | exit; |
| 72 | 72 | } |
| 73 | 73 | |
@@ -100,49 +100,49 @@ discard block |
||
| 100 | 100 | $zones = timezone_list(); |
| 101 | 101 | // prepare list of languages |
| 102 | 102 | $languages = DB::query( |
| 103 | - 'SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC' |
|
| 103 | + 'SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC' |
|
| 104 | 104 | ); |
| 105 | 105 | |
| 106 | 106 | // Do some stats |
| 107 | 107 | $userItemsNumber = DB::queryFirstField( |
| 108 | 108 | 'SELECT COUNT(id_item) as count |
| 109 | - FROM ' . prefixTable('log_items') . ' |
|
| 109 | + FROM ' . prefixTable('log_items').' |
|
| 110 | 110 | WHERE action = "at_creation" AND id_user = %i', |
| 111 | 111 | $session->get('user-id') |
| 112 | 112 | ); |
| 113 | 113 | |
| 114 | 114 | $userModificationNumber = DB::queryFirstField( |
| 115 | 115 | 'SELECT COUNT(id_item) as count |
| 116 | - FROM ' . prefixTable('log_items') . ' |
|
| 116 | + FROM ' . prefixTable('log_items').' |
|
| 117 | 117 | WHERE action = "at_modification" AND id_user = %i', |
| 118 | 118 | $session->get('user-id') |
| 119 | 119 | ); |
| 120 | 120 | |
| 121 | 121 | $userSeenItemsNumber = DB::queryFirstField( |
| 122 | 122 | 'SELECT COUNT(id_item) as count |
| 123 | - FROM ' . prefixTable('log_items') . ' |
|
| 123 | + FROM ' . prefixTable('log_items').' |
|
| 124 | 124 | WHERE action = "at_shown" AND id_user = %i', |
| 125 | 125 | $session->get('user-id') |
| 126 | 126 | ); |
| 127 | 127 | |
| 128 | 128 | $userSeenPasswordsNumber = DB::queryFirstField( |
| 129 | 129 | 'SELECT COUNT(id_item) |
| 130 | - FROM ' . prefixTable('log_items') . ' |
|
| 130 | + FROM ' . prefixTable('log_items').' |
|
| 131 | 131 | WHERE action = "at_password_shown" AND id_user = %i', |
| 132 | 132 | $session->get('user-id') |
| 133 | 133 | ); |
| 134 | 134 | |
| 135 | 135 | $userInfo = DB::queryFirstRow( |
| 136 | 136 | 'SELECT avatar, last_pw_change |
| 137 | - FROM ' . prefixTable('users') . ' |
|
| 137 | + FROM ' . prefixTable('users').' |
|
| 138 | 138 | WHERE id = %i', |
| 139 | 139 | $session->get('user-id') |
| 140 | 140 | ); |
| 141 | 141 | |
| 142 | 142 | if (empty($userInfo['avatar']) === true) { |
| 143 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 143 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 144 | 144 | } else { |
| 145 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar']; |
|
| 145 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar']; |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | // Get Groups name |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | foreach ($session->get('user-roles_array') as $role) { |
| 151 | 151 | $tmp = DB::queryFirstRow( |
| 152 | 152 | 'SELECT title |
| 153 | - FROM ' . prefixTable('roles_title') . ' |
|
| 153 | + FROM ' . prefixTable('roles_title').' |
|
| 154 | 154 | WHERE id = %i', |
| 155 | 155 | $role |
| 156 | 156 | ); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | <h3 id="profile-username" class="text-center"> |
| 197 | 197 | <?php |
| 198 | 198 | if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) { |
| 199 | - echo $session->get('user-name') . ' ' . $session->get('user-lastname'); |
|
| 199 | + echo $session->get('user-name').' '.$session->get('user-lastname'); |
|
| 200 | 200 | } else { |
| 201 | 201 | echo $session->get('user-login'); |
| 202 | 202 | } |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | } else { |
| 265 | 265 | echo date('d/m/Y', (int) $session->get('user-last_connection')); |
| 266 | 266 | } |
| 267 | - echo ' ' . $lang->get('at') . ' '; |
|
| 267 | + echo ' '.$lang->get('at').' '; |
|
| 268 | 268 | if (isset($SETTINGS['time_format']) === true) { |
| 269 | 269 | echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection')); |
| 270 | 270 | } else { |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | </a> |
| 275 | 275 | </li> |
| 276 | 276 | <?php |
| 277 | - if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) { |
|
| 277 | + if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) { |
|
| 278 | 278 | // Handle last password change string |
| 279 | 279 | if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) { |
| 280 | 280 | if (isset($SETTINGS['date_format']) === true) { |
@@ -294,12 +294,12 @@ discard block |
||
| 294 | 294 | ) { |
| 295 | 295 | $numDaysBeforePwExpiration = ''; |
| 296 | 296 | } else { |
| 297 | - $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $LANG['days'] . '.'; |
|
| 297 | + $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$LANG['days'].'.'; |
|
| 298 | 298 | } |
| 299 | 299 | echo ' |
| 300 | 300 | <li class="list-group-item"> |
| 301 | - <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b> |
|
| 302 | - <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a> |
|
| 301 | + <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b> |
|
| 302 | + <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a> |
|
| 303 | 303 | </li>'; |
| 304 | 304 | } |
| 305 | 305 | ?> |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 320 | 320 | echo ' |
| 321 | 321 | <li class="list-group-item"> |
| 322 | - <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b> |
|
| 322 | + <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b> |
|
| 323 | 323 | <button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy pointer"></i></button> |
| 324 | 324 | <a class="float-right mr-2" id="profile-user-api-token">', |
| 325 | 325 | null !== $session->get('user-api_key') ? $session->get('user-api_key') : '', |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | <ul class=""> |
| 357 | 357 | <?php |
| 358 | 358 | foreach ($session->get('user-unsuccessfull_login_attempts_list') as $entry) { |
| 359 | - echo '<li class="">' . $entry . '</li>'; |
|
| 359 | + echo '<li class="">'.$entry.'</li>'; |
|
| 360 | 360 | } ?> |
| 361 | 361 | </ul> |
| 362 | 362 | </div> |
@@ -369,12 +369,12 @@ discard block |
||
| 369 | 369 | <?php |
| 370 | 370 | $rows = DB::query( |
| 371 | 371 | 'SELECT label AS labelAction, date, null |
| 372 | - FROM ' . prefixTable('log_system') . ' |
|
| 372 | + FROM ' . prefixTable('log_system').' |
|
| 373 | 373 | WHERE qui = %i |
| 374 | 374 | UNION |
| 375 | 375 | SELECT l.action, l.date, i.label AS itemLabel |
| 376 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 377 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 376 | + FROM ' . prefixTable('log_items').' AS l |
|
| 377 | + INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 378 | 378 | WHERE l.id_user = %i AND l.action IN ("at_access") |
| 379 | 379 | ORDER BY date DESC |
| 380 | 380 | LIMIT 0, 40', |
@@ -388,9 +388,9 @@ discard block |
||
| 388 | 388 | $text = $lang->get($record['labelAction']); |
| 389 | 389 | } |
| 390 | 390 | if (empty($record['NULL']) === false) { |
| 391 | - $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>'; |
|
| 391 | + $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>'; |
|
| 392 | 392 | } |
| 393 | - echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>'; |
|
| 393 | + echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>'; |
|
| 394 | 394 | } |
| 395 | 395 | ?> |
| 396 | 396 | </ul> |
@@ -422,13 +422,13 @@ discard block |
||
| 422 | 422 | </div> |
| 423 | 423 | |
| 424 | 424 | <div class="form-group"> |
| 425 | - <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label> |
|
| 425 | + <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label> |
|
| 426 | 426 | <div class="col-sm-10"> |
| 427 | 427 | <select class="form-control" id="profile-user-timezone"> |
| 428 | 428 | <?php foreach ($zones as $key => $zone): ?> |
| 429 | 429 | <option value="<?php echo $key; ?>"<?php |
| 430 | 430 | if ($session->has('user-timezone')) |
| 431 | - if($session->get('user-timezone') === $key) |
|
| 431 | + if ($session->get('user-timezone') === $key) |
|
| 432 | 432 | echo ' selected'; |
| 433 | 433 | elseif ($session->get('user-timezone') === 'not_defined') |
| 434 | 434 | if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key) |
@@ -444,10 +444,10 @@ discard block |
||
| 444 | 444 | <select class="form-control" id="profile-user-language"> |
| 445 | 445 | <?php |
| 446 | 446 | foreach ($languages as $language) { |
| 447 | - echo '<option value="' . $language['name'] . '"', |
|
| 447 | + echo '<option value="'.$language['name'].'"', |
|
| 448 | 448 | strtolower($session->get('user-language')) === strtolower($language['name']) ? |
| 449 | 449 | ' selected="selected"' : '', |
| 450 | - '>' . $language['label'] . '</option>'; |
|
| 450 | + '>'.$language['label'].'</option>'; |
|
| 451 | 451 | } |
| 452 | 452 | ?> |
| 453 | 453 | </select> |
@@ -459,11 +459,11 @@ discard block |
||
| 459 | 459 | <div class="col-sm-10"> |
| 460 | 460 | <select class="form-control" id="profile-user-treeloadstrategy"> |
| 461 | 461 | |
| 462 | - <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>> |
|
| 462 | + <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : ''; ?>> |
|
| 463 | 463 | <?php echo $lang->get('sequential'); ?> |
| 464 | 464 | </option> |
| 465 | 465 | |
| 466 | - <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>> |
|
| 466 | + <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>> |
|
| 467 | 467 | <?php echo $lang->get('full'); ?> |
| 468 | 468 | </option> |
| 469 | 469 | </select> |
@@ -475,11 +475,11 @@ discard block |
||
| 475 | 475 | <div class="col-sm-10"> |
| 476 | 476 | <select class="form-control" id="profile-user-split_view_mode"> |
| 477 | 477 | |
| 478 | - <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : '';?>> |
|
| 478 | + <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : ''; ?>> |
|
| 479 | 479 | <?php echo $lang->get('no'); ?> |
| 480 | 480 | </option> |
| 481 | 481 | |
| 482 | - <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : '';?>> |
|
| 482 | + <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : ''; ?>> |
|
| 483 | 483 | <?php echo $lang->get('yes'); ?> |
| 484 | 484 | </option> |
| 485 | 485 | </select> |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | <button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo $lang->get('upload_new_avatar'); ?></button> |
| 515 | 515 | <?php |
| 516 | 516 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 517 | - echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>'; |
|
| 517 | + echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>'; |
|
| 518 | 518 | } |
| 519 | 519 | ?> |
| 520 | 520 | <div id="profile-avatar-file-container" class="hidden"></div> |
