@@ -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 | } |
@@ -649,11 +649,11 @@ discard block |
||
| 649 | 649 | if (empty($data['restricted_to']) === false) { |
| 650 | 650 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
| 651 | 651 | if (empty($userRest) === false) { |
| 652 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 652 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 653 | 653 | if (empty($oldRestrictionList) === true) { |
| 654 | 654 | $oldRestrictionList = $dataTmp['login']; |
| 655 | 655 | } else { |
| 656 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 656 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 657 | 657 | } |
| 658 | 658 | } |
| 659 | 659 | } |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | if (empty($post_uploaded_file_id) === false) { |
| 717 | 717 | $rows = DB::query( |
| 718 | 718 | 'SELECT id |
| 719 | - FROM ' . prefixTable('files') . ' |
|
| 719 | + FROM ' . prefixTable('files').' |
|
| 720 | 720 | WHERE id_item = %s', |
| 721 | 721 | $post_uploaded_file_id |
| 722 | 722 | ); |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | $lang->get('email_subject_item_updated'), |
| 773 | 773 | str_replace( |
| 774 | 774 | array('#label', '#link'), |
| 775 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
| 775 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
| 776 | 776 | $lang->get('new_item_email_body') |
| 777 | 777 | ), |
| 778 | 778 | $emailAddress, |
@@ -876,11 +876,11 @@ discard block |
||
| 876 | 876 | // Prepare variables |
| 877 | 877 | $itemInfos = array(); |
| 878 | 878 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 879 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 879 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 880 | 880 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 881 | 881 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 882 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 883 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 882 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 883 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 884 | 884 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 885 | 885 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 886 | 886 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -911,8 +911,7 @@ discard block |
||
| 911 | 911 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 912 | 912 | $dataReceived['to_be_deleted_after_date'], |
| 913 | 913 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 914 | - ) : |
|
| 915 | - ''; |
|
| 914 | + ) : ''; |
|
| 916 | 915 | $post_fields = (filter_var_array( |
| 917 | 916 | $dataReceived['fields'], |
| 918 | 917 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -972,7 +971,7 @@ discard block |
||
| 972 | 971 | // About special settings |
| 973 | 972 | $dataFolderSettings = DB::queryFirstRow( |
| 974 | 973 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 975 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 974 | + FROM ' . prefixTable('nested_tree').' |
|
| 976 | 975 | WHERE id = %i', |
| 977 | 976 | $inputData['folderId'] |
| 978 | 977 | ); |
@@ -988,7 +987,7 @@ discard block |
||
| 988 | 987 | // Get folder complexity |
| 989 | 988 | $folderComplexity = DB::queryfirstrow( |
| 990 | 989 | 'SELECT valeur |
| 991 | - FROM ' . prefixTable('misc') . ' |
|
| 990 | + FROM ' . prefixTable('misc').' |
|
| 992 | 991 | WHERE type = %s AND intitule = %i', |
| 993 | 992 | 'complex', |
| 994 | 993 | $inputData['folderId'] |
@@ -1033,8 +1032,8 @@ discard block |
||
| 1033 | 1032 | // Get all informations for this item |
| 1034 | 1033 | $dataItem = DB::queryfirstrow( |
| 1035 | 1034 | 'SELECT * |
| 1036 | - FROM ' . prefixTable('items') . ' as i |
|
| 1037 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1035 | + FROM ' . prefixTable('items').' as i |
|
| 1036 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1038 | 1037 | WHERE i.id=%i AND l.action = %s', |
| 1039 | 1038 | $inputData['itemId'], |
| 1040 | 1039 | 'at_creation' |
@@ -1083,7 +1082,7 @@ discard block |
||
| 1083 | 1082 | //db::debugmode(true); |
| 1084 | 1083 | DB::query( |
| 1085 | 1084 | 'SELECT * |
| 1086 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1085 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1087 | 1086 | WHERE object_id = %i AND user_id = %s', |
| 1088 | 1087 | $inputData['itemId'], |
| 1089 | 1088 | $session->get('user-id') |
@@ -1135,9 +1134,9 @@ discard block |
||
| 1135 | 1134 | '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, |
| 1136 | 1135 | 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, |
| 1137 | 1136 | u.login as user_login, u.email as user_email |
| 1138 | - FROM ' . prefixTable('items') . ' as i |
|
| 1139 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1140 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1137 | + FROM ' . prefixTable('items').' as i |
|
| 1138 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1139 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1141 | 1140 | WHERE i.id=%i', |
| 1142 | 1141 | $inputData['itemId'] |
| 1143 | 1142 | ); |
@@ -1145,7 +1144,7 @@ discard block |
||
| 1145 | 1144 | // Should we log a password change? |
| 1146 | 1145 | $userKey = DB::queryFirstRow( |
| 1147 | 1146 | 'SELECT share_key |
| 1148 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1147 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1149 | 1148 | WHERE user_id = %i AND object_id = %i', |
| 1150 | 1149 | $session->get('user-id'), |
| 1151 | 1150 | $inputData['itemId'] |
@@ -1205,12 +1204,12 @@ discard block |
||
| 1205 | 1204 | (int) $inputData['folderId'], |
| 1206 | 1205 | (int) $inputData['itemId'], |
| 1207 | 1206 | $encrypted_password_key, |
| 1208 | - true, // only for the item creator |
|
| 1209 | - true, // delete all |
|
| 1207 | + true, // only for the item creator |
|
| 1208 | + true, // delete all |
|
| 1210 | 1209 | ); |
| 1211 | 1210 | |
| 1212 | 1211 | // Create a task to create sharekeys for users |
| 1213 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1212 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1214 | 1213 | $tasksToBePerformed = ['item_password']; |
| 1215 | 1214 | $encryptionTaskIsRequested = true; |
| 1216 | 1215 | } else { |
@@ -1221,7 +1220,7 @@ discard block |
||
| 1221 | 1220 | // Get list of tags |
| 1222 | 1221 | $itemTags = DB::queryFirstColumn( |
| 1223 | 1222 | 'SELECT tag |
| 1224 | - FROM ' . prefixTable('tags') . ' |
|
| 1223 | + FROM ' . prefixTable('tags').' |
|
| 1225 | 1224 | WHERE item_id = %i', |
| 1226 | 1225 | $inputData['itemId'] |
| 1227 | 1226 | ); |
@@ -1267,7 +1266,7 @@ discard block |
||
| 1267 | 1266 | $session->get('user-id'), |
| 1268 | 1267 | 'at_modification', |
| 1269 | 1268 | $session->get('user-login'), |
| 1270 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1269 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1271 | 1270 | ); |
| 1272 | 1271 | } |
| 1273 | 1272 | |
@@ -1307,8 +1306,8 @@ discard block |
||
| 1307 | 1306 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1308 | 1307 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1309 | 1308 | c.masked AS masked, i.id AS field_item_id |
| 1310 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1311 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1309 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1310 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1312 | 1311 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1313 | 1312 | $field['id'], |
| 1314 | 1313 | $inputData['itemId'] |
@@ -1324,7 +1323,7 @@ discard block |
||
| 1324 | 1323 | // Perform new query |
| 1325 | 1324 | $dataTmpCat = DB::queryFirstRow( |
| 1326 | 1325 | 'SELECT id, title, encrypted_data, masked |
| 1327 | - FROM ' . prefixTable('categories') . ' |
|
| 1326 | + FROM ' . prefixTable('categories').' |
|
| 1328 | 1327 | WHERE id = %i', |
| 1329 | 1328 | $field['id'] |
| 1330 | 1329 | ); |
@@ -1355,8 +1354,8 @@ discard block |
||
| 1355 | 1354 | (int) $inputData['folderId'], |
| 1356 | 1355 | (int) $newId, |
| 1357 | 1356 | $cryptedStuff['objectKey'], |
| 1358 | - true, // only for the item creator |
|
| 1359 | - true, // delete all |
|
| 1357 | + true, // only for the item creator |
|
| 1358 | + true, // delete all |
|
| 1360 | 1359 | ); |
| 1361 | 1360 | |
| 1362 | 1361 | // update value |
@@ -1404,7 +1403,7 @@ discard block |
||
| 1404 | 1403 | $session->get('user-id'), |
| 1405 | 1404 | 'at_modification', |
| 1406 | 1405 | $session->get('user-login'), |
| 1407 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1406 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1408 | 1407 | ); |
| 1409 | 1408 | } else { |
| 1410 | 1409 | // Case where the field already exists |
@@ -1413,7 +1412,7 @@ discard block |
||
| 1413 | 1412 | // Get user sharekey for this field |
| 1414 | 1413 | $userKey = DB::queryFirstRow( |
| 1415 | 1414 | 'SELECT share_key |
| 1416 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1415 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1417 | 1416 | WHERE user_id = %i AND object_id = %i', |
| 1418 | 1417 | $session->get('user-id'), |
| 1419 | 1418 | $dataTmpCat['field_item_id'] |
@@ -1453,8 +1452,8 @@ discard block |
||
| 1453 | 1452 | (int) $inputData['folderId'], |
| 1454 | 1453 | (int) $dataTmpCat['field_item_id'], |
| 1455 | 1454 | $cryptedStuff['objectKey'], |
| 1456 | - true, // only for the item creator |
|
| 1457 | - true, // delete all |
|
| 1455 | + true, // only for the item creator |
|
| 1456 | + true, // delete all |
|
| 1458 | 1457 | ); |
| 1459 | 1458 | |
| 1460 | 1459 | array_push( |
@@ -1494,7 +1493,7 @@ discard block |
||
| 1494 | 1493 | $session->get('user-id'), |
| 1495 | 1494 | 'at_modification', |
| 1496 | 1495 | $session->get('user-login'), |
| 1497 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1496 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1498 | 1497 | ); |
| 1499 | 1498 | } |
| 1500 | 1499 | } |
@@ -1549,7 +1548,7 @@ discard block |
||
| 1549 | 1548 | ) { |
| 1550 | 1549 | DB::queryFirstRow( |
| 1551 | 1550 | 'SELECT * |
| 1552 | - FROM ' . prefixTable('templates') . ' |
|
| 1551 | + FROM ' . prefixTable('templates').' |
|
| 1553 | 1552 | WHERE item_id = %i', |
| 1554 | 1553 | $inputData['itemId'] |
| 1555 | 1554 | ); |
@@ -1592,7 +1591,7 @@ discard block |
||
| 1592 | 1591 | // check if elem exists in Table. If not add it or update it. |
| 1593 | 1592 | DB::query( |
| 1594 | 1593 | 'SELECT * |
| 1595 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1594 | + FROM ' . prefixTable('automatic_del').' |
|
| 1596 | 1595 | WHERE item_id = %i', |
| 1597 | 1596 | $inputData['itemId'] |
| 1598 | 1597 | ); |
@@ -1619,7 +1618,7 @@ discard block |
||
| 1619 | 1618 | // Store updates performed |
| 1620 | 1619 | array_push( |
| 1621 | 1620 | $arrayOfChanges, |
| 1622 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1621 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1623 | 1622 | ); |
| 1624 | 1623 | |
| 1625 | 1624 | // update LOG |
@@ -1662,7 +1661,7 @@ discard block |
||
| 1662 | 1661 | // Store updates performed |
| 1663 | 1662 | array_push( |
| 1664 | 1663 | $arrayOfChanges, |
| 1665 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1664 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1666 | 1665 | ); |
| 1667 | 1666 | |
| 1668 | 1667 | // update LOG |
@@ -1695,7 +1694,7 @@ discard block |
||
| 1695 | 1694 | if (empty($userId) === false) { |
| 1696 | 1695 | $dataTmp = DB::queryfirstrow( |
| 1697 | 1696 | 'SELECT id, name, lastname |
| 1698 | - FROM ' . prefixTable('users') . ' |
|
| 1697 | + FROM ' . prefixTable('users').' |
|
| 1699 | 1698 | WHERE id= %i', |
| 1700 | 1699 | $userId |
| 1701 | 1700 | ); |
@@ -1703,7 +1702,7 @@ discard block |
||
| 1703 | 1702 | // Add to array |
| 1704 | 1703 | array_push( |
| 1705 | 1704 | $arrayOfUsersRestriction, |
| 1706 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1705 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1707 | 1706 | ); |
| 1708 | 1707 | array_push( |
| 1709 | 1708 | $arrayOfUsersIdRestriction, |
@@ -1734,8 +1733,8 @@ discard block |
||
| 1734 | 1733 | // get values before deleting them |
| 1735 | 1734 | $rows = DB::query( |
| 1736 | 1735 | 'SELECT t.title, t.id AS id |
| 1737 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1738 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1736 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1737 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1739 | 1738 | WHERE r.item_id = %i |
| 1740 | 1739 | ORDER BY t.title ASC', |
| 1741 | 1740 | $inputData['itemId'] |
@@ -1769,7 +1768,7 @@ discard block |
||
| 1769 | 1768 | ); |
| 1770 | 1769 | $dataTmp = DB::queryfirstrow( |
| 1771 | 1770 | 'SELECT title |
| 1772 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1771 | + FROM ' . prefixTable('roles_title').' |
|
| 1773 | 1772 | WHERE id = %i', |
| 1774 | 1773 | $role |
| 1775 | 1774 | ); |
@@ -1797,7 +1796,7 @@ discard block |
||
| 1797 | 1796 | // Get current status |
| 1798 | 1797 | $otpStatus = DB::queryFirstRow( |
| 1799 | 1798 | 'SELECT enabled as otp_is_enabled |
| 1800 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1799 | + FROM ' . prefixTable('items_otp').' |
|
| 1801 | 1800 | WHERE item_id = %i', |
| 1802 | 1801 | $inputData['itemId'] |
| 1803 | 1802 | ); |
@@ -1828,7 +1827,7 @@ discard block |
||
| 1828 | 1827 | $session->get('user-id'), |
| 1829 | 1828 | 'at_modification', |
| 1830 | 1829 | $session->get('user-login'), |
| 1831 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1830 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1832 | 1831 | ); |
| 1833 | 1832 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
| 1834 | 1833 | // Create the entry in items_otp table |
@@ -1872,8 +1871,8 @@ discard block |
||
| 1872 | 1871 | $session->get('user-id'), |
| 1873 | 1872 | 'at_modification', |
| 1874 | 1873 | $session->get('user-login'), |
| 1875 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1876 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1874 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1875 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1877 | 1876 | ); |
| 1878 | 1877 | } |
| 1879 | 1878 | |
@@ -1893,7 +1892,7 @@ discard block |
||
| 1893 | 1892 | $session->get('user-id'), |
| 1894 | 1893 | 'at_modification', |
| 1895 | 1894 | $session->get('user-login'), |
| 1896 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1895 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1897 | 1896 | ); |
| 1898 | 1897 | } |
| 1899 | 1898 | // LOGIN |
@@ -1912,7 +1911,7 @@ discard block |
||
| 1912 | 1911 | $session->get('user-id'), |
| 1913 | 1912 | 'at_modification', |
| 1914 | 1913 | $session->get('user-login'), |
| 1915 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1914 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1916 | 1915 | ); |
| 1917 | 1916 | } |
| 1918 | 1917 | |
@@ -1931,7 +1930,7 @@ discard block |
||
| 1931 | 1930 | $session->get('user-id'), |
| 1932 | 1931 | 'at_modification', |
| 1933 | 1932 | $session->get('user-login'), |
| 1934 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1933 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1935 | 1934 | ); |
| 1936 | 1935 | } |
| 1937 | 1936 | // URL |
@@ -1950,7 +1949,7 @@ discard block |
||
| 1950 | 1949 | $session->get('user-id'), |
| 1951 | 1950 | 'at_modification', |
| 1952 | 1951 | $session->get('user-login'), |
| 1953 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1952 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1954 | 1953 | ); |
| 1955 | 1954 | } |
| 1956 | 1955 | // DESCRIPTION |
@@ -1976,7 +1975,7 @@ discard block |
||
| 1976 | 1975 | // FOLDER |
| 1977 | 1976 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1978 | 1977 | // Get name of folders |
| 1979 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1978 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1980 | 1979 | |
| 1981 | 1980 | // Store updates performed |
| 1982 | 1981 | array_push( |
@@ -1992,7 +1991,7 @@ discard block |
||
| 1992 | 1991 | $session->get('user-id'), |
| 1993 | 1992 | 'at_modification', |
| 1994 | 1993 | $session->get('user-login'), |
| 1995 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1994 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1996 | 1995 | ); |
| 1997 | 1996 | } |
| 1998 | 1997 | // ANYONE_CAN_MODIFY |
@@ -2000,7 +1999,7 @@ discard block |
||
| 2000 | 1999 | // Store updates performed |
| 2001 | 2000 | array_push( |
| 2002 | 2001 | $arrayOfChanges, |
| 2003 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2002 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2004 | 2003 | ); |
| 2005 | 2004 | |
| 2006 | 2005 | // Log |
@@ -2011,15 +2010,15 @@ discard block |
||
| 2011 | 2010 | $session->get('user-id'), |
| 2012 | 2011 | 'at_modification', |
| 2013 | 2012 | $session->get('user-login'), |
| 2014 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2013 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2015 | 2014 | ); |
| 2016 | 2015 | } |
| 2017 | 2016 | |
| 2018 | 2017 | // Reload new values |
| 2019 | 2018 | $dataItem = DB::queryfirstrow( |
| 2020 | 2019 | 'SELECT * |
| 2021 | - FROM ' . prefixTable('items') . ' as i |
|
| 2022 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2020 | + FROM ' . prefixTable('items').' as i |
|
| 2021 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2023 | 2022 | WHERE i.id = %i AND l.action = %s', |
| 2024 | 2023 | $inputData['itemId'], |
| 2025 | 2024 | 'at_creation' |
@@ -2028,8 +2027,8 @@ discard block |
||
| 2028 | 2027 | $history = ''; |
| 2029 | 2028 | $rows = DB::query( |
| 2030 | 2029 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2031 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2032 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2030 | + FROM ' . prefixTable('log_items').' as l |
|
| 2031 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2033 | 2032 | WHERE l.action <> %s AND id_item=%s', |
| 2034 | 2033 | 'at_shown', |
| 2035 | 2034 | $inputData['itemId'] |
@@ -2038,14 +2037,14 @@ discard block |
||
| 2038 | 2037 | if ($record['raison'] === NULL) continue; |
| 2039 | 2038 | $reason = explode(':', $record['raison']); |
| 2040 | 2039 | if (count($reason) > 0) { |
| 2041 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2042 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2043 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2040 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2041 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2042 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2044 | 2043 | : $lang->get(trim($reason[0]))) : ''); |
| 2045 | 2044 | if (empty($history)) { |
| 2046 | 2045 | $history = $sentence; |
| 2047 | 2046 | } else { |
| 2048 | - $history .= '<br />' . $sentence; |
|
| 2047 | + $history .= '<br />'.$sentence; |
|
| 2049 | 2048 | } |
| 2050 | 2049 | } |
| 2051 | 2050 | } |
@@ -2183,7 +2182,7 @@ discard block |
||
| 2183 | 2182 | ) { |
| 2184 | 2183 | // load the original record into an array |
| 2185 | 2184 | $originalRecord = DB::queryfirstrow( |
| 2186 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2185 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2187 | 2186 | WHERE id = %i', |
| 2188 | 2187 | $inputData['itemId'] |
| 2189 | 2188 | ); |
@@ -2202,7 +2201,7 @@ discard block |
||
| 2202 | 2201 | |
| 2203 | 2202 | // Load the destination folder record into an array |
| 2204 | 2203 | $dataDestination = DB::queryfirstrow( |
| 2205 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2204 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2206 | 2205 | WHERE id = %i', |
| 2207 | 2206 | $post_dest_id |
| 2208 | 2207 | ); |
@@ -2210,7 +2209,7 @@ discard block |
||
| 2210 | 2209 | // Get the ITEM object key for the user |
| 2211 | 2210 | $userKey = DB::queryFirstRow( |
| 2212 | 2211 | 'SELECT share_key |
| 2213 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2212 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2214 | 2213 | WHERE user_id = %i AND object_id = %i', |
| 2215 | 2214 | $session->get('user-id'), |
| 2216 | 2215 | $inputData['itemId'] |
@@ -2288,8 +2287,8 @@ discard block |
||
| 2288 | 2287 | // Manage Custom Fields |
| 2289 | 2288 | $rows = DB::query( |
| 2290 | 2289 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2291 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2292 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2290 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2291 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2293 | 2292 | WHERE ci.item_id = %i', |
| 2294 | 2293 | $inputData['itemId'] |
| 2295 | 2294 | ); |
@@ -2301,7 +2300,7 @@ discard block |
||
| 2301 | 2300 | // Get user key |
| 2302 | 2301 | $userKey = DB::queryFirstRow( |
| 2303 | 2302 | 'SELECT share_key |
| 2304 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2303 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2305 | 2304 | WHERE user_id = %i AND object_id = %i', |
| 2306 | 2305 | $session->get('user-id'), |
| 2307 | 2306 | $field['id'] |
@@ -2369,15 +2368,15 @@ discard block |
||
| 2369 | 2368 | $rows = DB::query( |
| 2370 | 2369 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2371 | 2370 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2372 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2373 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2371 | + FROM ' . prefixTable('files').' AS f |
|
| 2372 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2374 | 2373 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2375 | 2374 | $session->get('user-id'), |
| 2376 | 2375 | $inputData['itemId'] |
| 2377 | 2376 | ); |
| 2378 | 2377 | foreach ($rows as $record) { |
| 2379 | 2378 | // Check if file still exists |
| 2380 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2379 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2381 | 2380 | // Step1 - decrypt the file |
| 2382 | 2381 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2383 | 2382 | $fileContent = decryptFile( |
@@ -2388,8 +2387,8 @@ discard block |
||
| 2388 | 2387 | |
| 2389 | 2388 | // Step2 - create file |
| 2390 | 2389 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2391 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2392 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2390 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2391 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2393 | 2392 | if ($outstream === false) { |
| 2394 | 2393 | echo prepareExchangedData( |
| 2395 | 2394 | array( |
@@ -2463,7 +2462,7 @@ discard block |
||
| 2463 | 2462 | |
| 2464 | 2463 | // ------------------------- |
| 2465 | 2464 | // Add specific restrictions |
| 2466 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2465 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2467 | 2466 | foreach ($rows as $record) { |
| 2468 | 2467 | DB::insert( |
| 2469 | 2468 | prefixTable('restriction_to_roles'), |
@@ -2475,7 +2474,7 @@ discard block |
||
| 2475 | 2474 | } |
| 2476 | 2475 | |
| 2477 | 2476 | // Add Tags |
| 2478 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2477 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2479 | 2478 | foreach ($rows as $record) { |
| 2480 | 2479 | DB::insert( |
| 2481 | 2480 | prefixTable('tags'), |
@@ -2576,7 +2575,7 @@ discard block |
||
| 2576 | 2575 | // then we can show it |
| 2577 | 2576 | $item_deleted = DB::queryFirstRow( |
| 2578 | 2577 | 'SELECT * |
| 2579 | - FROM ' . prefixTable('log_items') . ' |
|
| 2578 | + FROM ' . prefixTable('log_items').' |
|
| 2580 | 2579 | WHERE id_item = %i AND action = %s |
| 2581 | 2580 | ORDER BY date DESC |
| 2582 | 2581 | LIMIT 0, 1', |
@@ -2587,7 +2586,7 @@ discard block |
||
| 2587 | 2586 | |
| 2588 | 2587 | $item_restored = DB::queryFirstRow( |
| 2589 | 2588 | 'SELECT * |
| 2590 | - FROM ' . prefixTable('log_items') . ' |
|
| 2589 | + FROM ' . prefixTable('log_items').' |
|
| 2591 | 2590 | WHERE id_item = %i AND action = %s |
| 2592 | 2591 | ORDER BY date DESC |
| 2593 | 2592 | LIMIT 0, 1', |
@@ -2611,8 +2610,8 @@ discard block |
||
| 2611 | 2610 | // Get all informations for this item |
| 2612 | 2611 | $dataItem = DB::queryfirstrow( |
| 2613 | 2612 | 'SELECT * |
| 2614 | - FROM ' . prefixTable('items') . ' as i |
|
| 2615 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2613 | + FROM ' . prefixTable('items').' as i |
|
| 2614 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2616 | 2615 | WHERE i.id = %i AND l.action = %s', |
| 2617 | 2616 | $inputData['id'], |
| 2618 | 2617 | 'at_creation' |
@@ -2621,7 +2620,7 @@ discard block |
||
| 2621 | 2620 | // Notification |
| 2622 | 2621 | DB::queryfirstrow( |
| 2623 | 2622 | 'SELECT * |
| 2624 | - FROM ' . prefixTable('notification') . ' |
|
| 2623 | + FROM ' . prefixTable('notification').' |
|
| 2625 | 2624 | WHERE item_id = %i AND user_id = %i', |
| 2626 | 2625 | $inputData['id'], |
| 2627 | 2626 | $session->get('user-id') |
@@ -2640,7 +2639,7 @@ discard block |
||
| 2640 | 2639 | |
| 2641 | 2640 | // manage case of API user |
| 2642 | 2641 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2643 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2642 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2644 | 2643 | $arrData['id_user'] = API_USER_ID; |
| 2645 | 2644 | $arrData['author_email'] = ''; |
| 2646 | 2645 | $arrData['notification_status'] = false; |
@@ -2650,7 +2649,7 @@ discard block |
||
| 2650 | 2649 | $tags = array(); |
| 2651 | 2650 | $rows = DB::query( |
| 2652 | 2651 | 'SELECT tag |
| 2653 | - FROM ' . prefixTable('tags') . ' |
|
| 2652 | + FROM ' . prefixTable('tags').' |
|
| 2654 | 2653 | WHERE item_id = %i', |
| 2655 | 2654 | $inputData['id'] |
| 2656 | 2655 | ); |
@@ -2675,7 +2674,7 @@ discard block |
||
| 2675 | 2674 | // Check if user has a role that is accepted |
| 2676 | 2675 | $rows_tmp = DB::query( |
| 2677 | 2676 | 'SELECT role_id |
| 2678 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2677 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2679 | 2678 | WHERE item_id=%i', |
| 2680 | 2679 | $inputData['id'] |
| 2681 | 2680 | ); |
@@ -2689,7 +2688,7 @@ discard block |
||
| 2689 | 2688 | // Get the object key for the user |
| 2690 | 2689 | $userKey = DB::queryFirstRow( |
| 2691 | 2690 | 'SELECT share_key |
| 2692 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2691 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2693 | 2692 | WHERE user_id = %i AND object_id = %i', |
| 2694 | 2693 | $session->get('user-id'), |
| 2695 | 2694 | $inputData['id'] |
@@ -2786,8 +2785,8 @@ discard block |
||
| 2786 | 2785 | // Add restriction if item is restricted to roles |
| 2787 | 2786 | $rows = DB::query( |
| 2788 | 2787 | 'SELECT t.title, t.id |
| 2789 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2790 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2788 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2789 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2791 | 2790 | WHERE r.item_id = %i |
| 2792 | 2791 | ORDER BY t.title ASC', |
| 2793 | 2792 | $inputData['id'] |
@@ -2803,8 +2802,8 @@ discard block |
||
| 2803 | 2802 | $tmp = array(); |
| 2804 | 2803 | $rows = DB::query( |
| 2805 | 2804 | 'SELECT k.label, k.id |
| 2806 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2807 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2805 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2806 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2808 | 2807 | WHERE i.item_id = %i |
| 2809 | 2808 | ORDER BY k.label ASC', |
| 2810 | 2809 | $inputData['id'] |
@@ -2887,7 +2886,7 @@ discard block |
||
| 2887 | 2886 | $arrCatList = array(); |
| 2888 | 2887 | $rows_tmp = DB::query( |
| 2889 | 2888 | 'SELECT id_category |
| 2890 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2889 | + FROM ' . prefixTable('categories_folders').' |
|
| 2891 | 2890 | WHERE id_folder=%i', |
| 2892 | 2891 | $inputData['folderId'] |
| 2893 | 2892 | ); |
@@ -2902,8 +2901,8 @@ discard block |
||
| 2902 | 2901 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2903 | 2902 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2904 | 2903 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2905 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2906 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2904 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2905 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2907 | 2906 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2908 | 2907 | $inputData['id'], |
| 2909 | 2908 | $arrCatList |
@@ -2914,7 +2913,7 @@ discard block |
||
| 2914 | 2913 | //db::debugmode(true); |
| 2915 | 2914 | $userKey = DB::queryFirstRow( |
| 2916 | 2915 | 'SELECT share_key |
| 2917 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2916 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2918 | 2917 | WHERE user_id = %i AND object_id = %i', |
| 2919 | 2918 | $session->get('user-id'), |
| 2920 | 2919 | $row['id'] |
@@ -2932,7 +2931,7 @@ discard block |
||
| 2932 | 2931 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2933 | 2932 | // Data is not encrypted in DB |
| 2934 | 2933 | $fieldText = [ |
| 2935 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2934 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2936 | 2935 | 'encrypted' => false, |
| 2937 | 2936 | 'error' => false, |
| 2938 | 2937 | ]; |
@@ -2977,7 +2976,7 @@ discard block |
||
| 2977 | 2976 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2978 | 2977 | $rows_tmp = DB::queryfirstrow( |
| 2979 | 2978 | 'SELECT category_id |
| 2980 | - FROM ' . prefixTable('templates') . ' |
|
| 2979 | + FROM ' . prefixTable('templates').' |
|
| 2981 | 2980 | WHERE item_id = %i', |
| 2982 | 2981 | $inputData['id'] |
| 2983 | 2982 | ); |
@@ -2994,7 +2993,7 @@ discard block |
||
| 2994 | 2993 | // Evaluate if item is ready for all users |
| 2995 | 2994 | $rows_tmp = DB::queryfirstrow( |
| 2996 | 2995 | 'SELECT finished_at |
| 2997 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 2996 | + FROM ' . prefixTable('background_tasks').' |
|
| 2998 | 2997 | WHERE item_id = %i', |
| 2999 | 2998 | $inputData['id'] |
| 3000 | 2999 | ); |
@@ -3011,7 +3010,7 @@ discard block |
||
| 3011 | 3010 | // Is the Item to be deleted? |
| 3012 | 3011 | $dataDelete = DB::queryfirstrow( |
| 3013 | 3012 | 'SELECT * |
| 3014 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3013 | + FROM ' . prefixTable('automatic_del').' |
|
| 3015 | 3014 | WHERE item_id = %i', |
| 3016 | 3015 | $inputData['id'] |
| 3017 | 3016 | ); |
@@ -3090,11 +3089,11 @@ discard block |
||
| 3090 | 3089 | if (empty($dataItem['restricted_to']) === false) { |
| 3091 | 3090 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 3092 | 3091 | if (empty($userRest) === false) { |
| 3093 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 3092 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 3094 | 3093 | if (empty($listOfRestricted)) { |
| 3095 | 3094 | $listOfRestricted = $dataTmp['login']; |
| 3096 | 3095 | } else { |
| 3097 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3096 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3098 | 3097 | } |
| 3099 | 3098 | } |
| 3100 | 3099 | } |
@@ -3168,9 +3167,9 @@ discard block |
||
| 3168 | 3167 | // Load item data |
| 3169 | 3168 | $dataItem = DB::queryFirstRow( |
| 3170 | 3169 | '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 |
| 3171 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3172 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3173 | - INNER JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3170 | + FROM ' . prefixTable('items').' AS i |
|
| 3171 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3172 | + INNER JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3174 | 3173 | WHERE i.id = %i', |
| 3175 | 3174 | $inputData['id'] |
| 3176 | 3175 | ); |
@@ -3192,7 +3191,7 @@ discard block |
||
| 3192 | 3191 | // Check if user has a role that is accepted |
| 3193 | 3192 | $rows_tmp = DB::query( |
| 3194 | 3193 | 'SELECT role_id |
| 3195 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3194 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3196 | 3195 | WHERE item_id=%i', |
| 3197 | 3196 | $inputData['id'] |
| 3198 | 3197 | ); |
@@ -3224,12 +3223,12 @@ discard block |
||
| 3224 | 3223 | // launch query |
| 3225 | 3224 | $rows = DB::query( |
| 3226 | 3225 | 'SELECT id, name, file, extension, size |
| 3227 | - FROM ' . prefixTable('files') . ' |
|
| 3226 | + FROM ' . prefixTable('files').' |
|
| 3228 | 3227 | WHERE id_item = %i AND confirmed = 1', |
| 3229 | 3228 | $inputData['id'] |
| 3230 | 3229 | ); |
| 3231 | 3230 | foreach ($rows as $record) { |
| 3232 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3231 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3233 | 3232 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3234 | 3233 | |
| 3235 | 3234 | array_push( |
@@ -3242,7 +3241,7 @@ discard block |
||
| 3242 | 3241 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3243 | 3242 | 'id' => $record['id'], |
| 3244 | 3243 | 'key' => $session->get('user-key_tmp'), |
| 3245 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3244 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3246 | 3245 | ) |
| 3247 | 3246 | ); |
| 3248 | 3247 | } |
@@ -3280,7 +3279,7 @@ discard block |
||
| 3280 | 3279 | array( |
| 3281 | 3280 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3282 | 3281 | ), |
| 3283 | - 'id=' . $session->get('user-id') |
|
| 3282 | + 'id='.$session->get('user-id') |
|
| 3284 | 3283 | ); |
| 3285 | 3284 | } |
| 3286 | 3285 | |
@@ -3289,8 +3288,8 @@ discard block |
||
| 3289 | 3288 | $listOptionsForRoles = array(); |
| 3290 | 3289 | $rows = DB::query( |
| 3291 | 3290 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3292 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3293 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3291 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3292 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3294 | 3293 | WHERE r.folder_id = %i', |
| 3295 | 3294 | $dataItem['id_tree'] |
| 3296 | 3295 | ); |
@@ -3304,9 +3303,9 @@ discard block |
||
| 3304 | 3303 | ); |
| 3305 | 3304 | $rows2 = DB::query( |
| 3306 | 3305 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3307 | - FROM ' . prefixTable('users') . ' |
|
| 3306 | + FROM ' . prefixTable('users').' |
|
| 3308 | 3307 | WHERE fonction_id LIKE %s', |
| 3309 | - '%' . $record['role_id'] . '%' |
|
| 3308 | + '%'.$record['role_id'].'%' |
|
| 3310 | 3309 | ); |
| 3311 | 3310 | foreach ($rows2 as $record2) { |
| 3312 | 3311 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3319,7 +3318,7 @@ discard block |
||
| 3319 | 3318 | array( |
| 3320 | 3319 | 'id' => (int) $record2['id'], |
| 3321 | 3320 | 'login' => $record2['login'], |
| 3322 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3321 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3323 | 3322 | 'email' => $record2['email'], |
| 3324 | 3323 | ) |
| 3325 | 3324 | ); |
@@ -3338,16 +3337,16 @@ discard block |
||
| 3338 | 3337 | $path = ''; |
| 3339 | 3338 | foreach ($arbo as $elem) { |
| 3340 | 3339 | if (empty($path) === true) { |
| 3341 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3340 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3342 | 3341 | } else { |
| 3343 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3342 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3344 | 3343 | } |
| 3345 | 3344 | } |
| 3346 | 3345 | // Build text to show user |
| 3347 | 3346 | if (empty($path) === true) { |
| 3348 | 3347 | $path = addslashes($dataItem['label']); |
| 3349 | 3348 | } else { |
| 3350 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3349 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3351 | 3350 | } |
| 3352 | 3351 | |
| 3353 | 3352 | // Add Admins to notification list if expected |
@@ -3370,7 +3369,7 @@ discard block |
||
| 3370 | 3369 | array( |
| 3371 | 3370 | addslashes($session->get('user-login')), |
| 3372 | 3371 | $path, |
| 3373 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3372 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3374 | 3373 | ), |
| 3375 | 3374 | $lang->get('email_on_open_notification_mail') |
| 3376 | 3375 | ), |
@@ -3380,7 +3379,7 @@ discard block |
||
| 3380 | 3379 | } |
| 3381 | 3380 | |
| 3382 | 3381 | // has this item a change proposal |
| 3383 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3382 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3384 | 3383 | $returnArray['has_change_proposal'] = DB::count(); |
| 3385 | 3384 | |
| 3386 | 3385 | // Setting |
@@ -3391,7 +3390,7 @@ discard block |
||
| 3391 | 3390 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3392 | 3391 | DB::query( |
| 3393 | 3392 | 'SELECT * |
| 3394 | - FROM ' . prefixTable('otv') . ' |
|
| 3393 | + FROM ' . prefixTable('otv').' |
|
| 3395 | 3394 | WHERE item_id = %i |
| 3396 | 3395 | AND time_limit > %i', |
| 3397 | 3396 | $inputData['id'], |
@@ -3491,7 +3490,7 @@ discard block |
||
| 3491 | 3490 | // Load item data |
| 3492 | 3491 | $data = DB::queryFirstRow( |
| 3493 | 3492 | 'SELECT id_tree, id, label |
| 3494 | - FROM ' . prefixTable('items') . ' |
|
| 3493 | + FROM ' . prefixTable('items').' |
|
| 3495 | 3494 | WHERE id = %i OR item_key = %s', |
| 3496 | 3495 | $inputData['itemId'], |
| 3497 | 3496 | $inputData['itemKey'] |
@@ -3582,7 +3581,7 @@ discard block |
||
| 3582 | 3581 | // Load item data |
| 3583 | 3582 | $dataItem = DB::queryFirstRow( |
| 3584 | 3583 | 'SELECT secret, enabled |
| 3585 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3584 | + FROM ' . prefixTable('items_otp').' |
|
| 3586 | 3585 | WHERE item_id = %i', |
| 3587 | 3586 | $inputData['id'] |
| 3588 | 3587 | ); |
@@ -3664,13 +3663,13 @@ discard block |
||
| 3664 | 3663 | |
| 3665 | 3664 | // Check if user is allowed to access this folder |
| 3666 | 3665 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3667 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3666 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3668 | 3667 | break; |
| 3669 | 3668 | } |
| 3670 | 3669 | |
| 3671 | 3670 | // Check if title doesn't contains html codes |
| 3672 | 3671 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3673 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3672 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3674 | 3673 | break; |
| 3675 | 3674 | } |
| 3676 | 3675 | // check that title is not numeric |
@@ -3681,9 +3680,9 @@ discard block |
||
| 3681 | 3680 | |
| 3682 | 3681 | // Check if duplicate folders name are allowed |
| 3683 | 3682 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3684 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3683 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3685 | 3684 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3686 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3685 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3687 | 3686 | break; |
| 3688 | 3687 | } |
| 3689 | 3688 | } |
@@ -3691,7 +3690,7 @@ discard block |
||
| 3691 | 3690 | // query on folder |
| 3692 | 3691 | $data = DB::queryfirstrow( |
| 3693 | 3692 | 'SELECT parent_id, personal_folder |
| 3694 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3693 | + FROM ' . prefixTable('nested_tree').' |
|
| 3695 | 3694 | WHERE id = %i', |
| 3696 | 3695 | $inputData['folderId'] |
| 3697 | 3696 | ); |
@@ -3701,20 +3700,20 @@ discard block |
||
| 3701 | 3700 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3702 | 3701 | $data = DB::queryfirstrow( |
| 3703 | 3702 | 'SELECT valeur |
| 3704 | - FROM ' . prefixTable('misc') . ' |
|
| 3703 | + FROM ' . prefixTable('misc').' |
|
| 3705 | 3704 | WHERE intitule = %i AND type = %s', |
| 3706 | 3705 | $data['parent_id'], |
| 3707 | 3706 | 'complex' |
| 3708 | 3707 | ); |
| 3709 | 3708 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3710 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3709 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3711 | 3710 | break; |
| 3712 | 3711 | } |
| 3713 | 3712 | } |
| 3714 | 3713 | |
| 3715 | 3714 | // update Folders table |
| 3716 | 3715 | $tmp = DB::queryFirstRow( |
| 3717 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3716 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3718 | 3717 | $dataReceived['folder'] |
| 3719 | 3718 | ); |
| 3720 | 3719 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3783,42 +3782,42 @@ discard block |
||
| 3783 | 3782 | in_array($post_target_folder_id, $session->get('user-accessible_folders')) === false) && ($post_target_folder_id === '0' && |
| 3784 | 3783 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3785 | 3784 | ) { |
| 3786 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3785 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3787 | 3786 | echo $returnValues; |
| 3788 | 3787 | break; |
| 3789 | 3788 | } |
| 3790 | 3789 | |
| 3791 | 3790 | $tmp_source = DB::queryFirstRow( |
| 3792 | 3791 | 'SELECT title, parent_id, personal_folder |
| 3793 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3792 | + FROM ' . prefixTable('nested_tree').' |
|
| 3794 | 3793 | WHERE id = %i', |
| 3795 | 3794 | $post_source_folder_id |
| 3796 | 3795 | ); |
| 3797 | 3796 | |
| 3798 | 3797 | $tmp_target = DB::queryFirstRow( |
| 3799 | 3798 | 'SELECT title, parent_id, personal_folder |
| 3800 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3799 | + FROM ' . prefixTable('nested_tree').' |
|
| 3801 | 3800 | WHERE id = %i', |
| 3802 | 3801 | $post_target_folder_id |
| 3803 | 3802 | ); |
| 3804 | 3803 | |
| 3805 | 3804 | // check if target is not a child of source |
| 3806 | 3805 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3807 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3806 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3808 | 3807 | echo $returnValues; |
| 3809 | 3808 | break; |
| 3810 | 3809 | } |
| 3811 | 3810 | |
| 3812 | 3811 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3813 | 3812 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3814 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3813 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3815 | 3814 | echo $returnValues; |
| 3816 | 3815 | break; |
| 3817 | 3816 | } |
| 3818 | 3817 | |
| 3819 | 3818 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3820 | 3819 | if ($tmp_source['title'] === $session->get('user-id') || $tmp_target['title'] === $session->get('user-id')) { |
| 3821 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3820 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3822 | 3821 | echo $returnValues; |
| 3823 | 3822 | break; |
| 3824 | 3823 | } |
@@ -3939,7 +3938,7 @@ discard block |
||
| 3939 | 3938 | $uniqueLoadData['path'] = $arr_arbo; |
| 3940 | 3939 | |
| 3941 | 3940 | // store last folder accessed in cookie |
| 3942 | - $arr_cookie_options = array ( |
|
| 3941 | + $arr_cookie_options = array( |
|
| 3943 | 3942 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3944 | 3943 | 'path' => '/', |
| 3945 | 3944 | 'secure' => true, |
@@ -3954,7 +3953,7 @@ discard block |
||
| 3954 | 3953 | foreach ($session->get('user-roles_array') as $role) { |
| 3955 | 3954 | $roleQ = DB::queryfirstrow( |
| 3956 | 3955 | 'SELECT allow_pw_change |
| 3957 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3956 | + FROM ' . prefixTable('roles_title').' |
|
| 3958 | 3957 | WHERE id = %i', |
| 3959 | 3958 | $role |
| 3960 | 3959 | ); |
@@ -3985,11 +3984,11 @@ discard block |
||
| 3985 | 3984 | |
| 3986 | 3985 | foreach ($session->get('user-roles_array') as $role) { |
| 3987 | 3986 | $access = DB::queryFirstRow( |
| 3988 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3987 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3989 | 3988 | $role, |
| 3990 | 3989 | $inputData['id'] |
| 3991 | 3990 | ); |
| 3992 | - if (DB::count()>0) { |
|
| 3991 | + if (DB::count() > 0) { |
|
| 3993 | 3992 | if ($access['type'] === 'R') { |
| 3994 | 3993 | array_push($arrTmp, 10); |
| 3995 | 3994 | } elseif ($access['type'] === 'W') { |
@@ -4054,7 +4053,7 @@ discard block |
||
| 4054 | 4053 | } else { |
| 4055 | 4054 | DB::query( |
| 4056 | 4055 | 'SELECT * |
| 4057 | - FROM ' . prefixTable('items') . ' |
|
| 4056 | + FROM ' . prefixTable('items').' |
|
| 4058 | 4057 | WHERE inactif = %i', |
| 4059 | 4058 | 0 |
| 4060 | 4059 | ); |
@@ -4064,7 +4063,7 @@ discard block |
||
| 4064 | 4063 | |
| 4065 | 4064 | // Get folder complexity |
| 4066 | 4065 | $folderComplexity = DB::queryFirstRow( |
| 4067 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4066 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4068 | 4067 | 'complex', |
| 4069 | 4068 | $inputData['id'] |
| 4070 | 4069 | ); |
@@ -4076,7 +4075,7 @@ discard block |
||
| 4076 | 4075 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4077 | 4076 | $folderRow = DB::query( |
| 4078 | 4077 | 'SELECT id_category |
| 4079 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4078 | + FROM ' . prefixTable('categories_folders').' |
|
| 4080 | 4079 | WHERE id_folder = %i', |
| 4081 | 4080 | $inputData['id'] |
| 4082 | 4081 | ); |
@@ -4191,9 +4190,9 @@ discard block |
||
| 4191 | 4190 | // List all ITEMS |
| 4192 | 4191 | if ($folderIsPf === false) { |
| 4193 | 4192 | $where->add('i.inactif=%i', 0); |
| 4194 | - $sql_e='(SELECT date FROM ' . prefixTable('log_items') |
|
| 4193 | + $sql_e = '(SELECT date FROM '.prefixTable('log_items') |
|
| 4195 | 4194 | . " WHERE action = 'at_creation' AND id_item=i.id " |
| 4196 | - . 'union all SELECT date FROM '. prefixTable('log_items') |
|
| 4195 | + . 'union all SELECT date FROM '.prefixTable('log_items') |
|
| 4197 | 4196 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
| 4198 | 4197 | AND id_item=i.id ORDER BY date DESC LIMIT 1)"; |
| 4199 | 4198 | $where->add('l.date=%l', $sql_e); |
@@ -4201,8 +4200,8 @@ discard block |
||
| 4201 | 4200 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 4202 | 4201 | } |
| 4203 | 4202 | |
| 4204 | - $query_limit = ' LIMIT ' . |
|
| 4205 | - $start . ',' . |
|
| 4203 | + $query_limit = ' LIMIT '. |
|
| 4204 | + $start.','. |
|
| 4206 | 4205 | $post_nb_items_to_display_once; |
| 4207 | 4206 | //db::debugmode(true); |
| 4208 | 4207 | $rows = DB::query( |
@@ -4214,9 +4213,9 @@ discard block |
||
| 4214 | 4213 | l.id_user AS log_user, |
| 4215 | 4214 | i.url AS link, |
| 4216 | 4215 | i.email AS email |
| 4217 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4218 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4219 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4216 | + FROM ' . prefixTable('items').' AS i |
|
| 4217 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4218 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4220 | 4219 | WHERE %l |
| 4221 | 4220 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4222 | 4221 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4236,9 +4235,9 @@ discard block |
||
| 4236 | 4235 | l.id_user AS log_user, |
| 4237 | 4236 | i.url AS link, |
| 4238 | 4237 | i.email AS email |
| 4239 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4240 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4241 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4238 | + FROM ' . prefixTable('items').' AS i |
|
| 4239 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4240 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4242 | 4241 | WHERE %l |
| 4243 | 4242 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4244 | 4243 | ORDER BY i.label ASC, l.date DESC', |
@@ -4269,7 +4268,7 @@ discard block |
||
| 4269 | 4268 | $item_is_restricted_to_role = false; |
| 4270 | 4269 | DB::queryfirstrow( |
| 4271 | 4270 | 'SELECT role_id |
| 4272 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4271 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4273 | 4272 | WHERE item_id = %i', |
| 4274 | 4273 | $record['id'] |
| 4275 | 4274 | ); |
@@ -4281,7 +4280,7 @@ discard block |
||
| 4281 | 4280 | $user_is_included_in_role = false; |
| 4282 | 4281 | DB::query( |
| 4283 | 4282 | 'SELECT role_id |
| 4284 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4283 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4285 | 4284 | WHERE item_id = %i AND role_id IN %ls', |
| 4286 | 4285 | $record['id'], |
| 4287 | 4286 | $session->get('user-roles_array') |
@@ -4488,9 +4487,9 @@ discard block |
||
| 4488 | 4487 | if ((int) $start === 0) { |
| 4489 | 4488 | DB::query( |
| 4490 | 4489 | 'SELECT i.id |
| 4491 | - FROM ' . prefixTable('items') . ' as i |
|
| 4492 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4493 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4490 | + FROM ' . prefixTable('items').' as i |
|
| 4491 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4492 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4494 | 4493 | WHERE %l |
| 4495 | 4494 | ORDER BY i.label ASC, l.date DESC', |
| 4496 | 4495 | $where |
@@ -4554,8 +4553,8 @@ discard block |
||
| 4554 | 4553 | // Run query |
| 4555 | 4554 | $dataItem = DB::queryfirstrow( |
| 4556 | 4555 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4557 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4558 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4556 | + FROM ' . prefixTable('items').' AS i |
|
| 4557 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4559 | 4558 | WHERE user_id = %i AND i.item_key = %s', |
| 4560 | 4559 | $session->get('user-id'), |
| 4561 | 4560 | $inputData['itemKey'] |
@@ -4606,7 +4605,7 @@ discard block |
||
| 4606 | 4605 | // get if existing edition lock |
| 4607 | 4606 | $dataItemEditionLocks = DB::query( |
| 4608 | 4607 | 'SELECT timestamp, user_id |
| 4609 | - FROM ' . prefixTable('items_edition') . ' |
|
| 4608 | + FROM ' . prefixTable('items_edition').' |
|
| 4610 | 4609 | WHERE item_id = %i |
| 4611 | 4610 | ORDER BY increment_id DESC', |
| 4612 | 4611 | $inputData['itemId'] |
@@ -4615,7 +4614,7 @@ discard block |
||
| 4615 | 4614 | if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
| 4616 | 4615 | |
| 4617 | 4616 | // Check if item has no edition lock |
| 4618 | - if ((int) DB::count() > 0 ) { |
|
| 4617 | + if ((int) DB::count() > 0) { |
|
| 4619 | 4618 | // get last edition lock |
| 4620 | 4619 | $dataLastItemEditionLock = $dataItemEditionLocks[0]; |
| 4621 | 4620 | |
@@ -4625,10 +4624,10 @@ discard block |
||
| 4625 | 4624 | } else { |
| 4626 | 4625 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4627 | 4626 | } |
| 4628 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4627 | + if (WIP === true) error_log('delay: '.$delay); |
|
| 4629 | 4628 | |
| 4630 | 4629 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4631 | - if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
|
| 4630 | + if (round(abs(time() - $dataTmp['timestamp']), 0) > $delay) { |
|
| 4632 | 4631 | // Case where time is expired |
| 4633 | 4632 | // In this case, delete edition lock and possible ongoing processes |
| 4634 | 4633 | // and continue editing this time |
@@ -4645,7 +4644,7 @@ discard block |
||
| 4645 | 4644 | // Get process Id |
| 4646 | 4645 | $processDetail = DB::queryFirstRow( |
| 4647 | 4646 | 'SELECT increment_id |
| 4648 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4647 | + FROM ' . prefixTable('background_tasks').' |
|
| 4649 | 4648 | WHERE item_id = %i AND finished_at = ""', |
| 4650 | 4649 | $inputData['itemId'] |
| 4651 | 4650 | ); |
@@ -4663,7 +4662,7 @@ discard block |
||
| 4663 | 4662 | // get if existing process ongoing for this item |
| 4664 | 4663 | $dataItemProcessOngoing = DB::queryFirstRow( |
| 4665 | 4664 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 4666 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4665 | + FROM ' . prefixTable('background_tasks').' |
|
| 4667 | 4666 | WHERE item_id = %i AND finished_at = "" |
| 4668 | 4667 | ORDER BY increment_id DESC', |
| 4669 | 4668 | $inputData['itemId'] |
@@ -4690,7 +4689,7 @@ discard block |
||
| 4690 | 4689 | ); |
| 4691 | 4690 | break; |
| 4692 | 4691 | } |
| 4693 | - } elseif (round(abs(time() - $dataTmp['timestamp']),0) <= $delay) { |
|
| 4692 | + } elseif (round(abs(time() - $dataTmp['timestamp']), 0) <= $delay) { |
|
| 4694 | 4693 | // Case where edition lock is already taken by another user |
| 4695 | 4694 | // Then no edition is possible |
| 4696 | 4695 | $returnValues = array( |
@@ -4719,7 +4718,7 @@ discard block |
||
| 4719 | 4718 | // do query on this folder |
| 4720 | 4719 | $data_this_folder = DB::queryFirstRow( |
| 4721 | 4720 | 'SELECT id, personal_folder, title |
| 4722 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4721 | + FROM ' . prefixTable('nested_tree').' |
|
| 4723 | 4722 | WHERE id = %s', |
| 4724 | 4723 | $inputData['folderId'] |
| 4725 | 4724 | ); |
@@ -4759,8 +4758,8 @@ discard block |
||
| 4759 | 4758 | $visibilite = ''; |
| 4760 | 4759 | $data = DB::queryFirstRow( |
| 4761 | 4760 | 'SELECT m.valeur, n.personal_folder |
| 4762 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4763 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4761 | + FROM ' . prefixTable('misc').' AS m |
|
| 4762 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4764 | 4763 | WHERE type=%s AND intitule = %s', |
| 4765 | 4764 | 'complex', |
| 4766 | 4765 | $inputData['folderId'] |
@@ -4773,8 +4772,8 @@ discard block |
||
| 4773 | 4772 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4774 | 4773 | $rows = DB::query( |
| 4775 | 4774 | 'SELECT t.title |
| 4776 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4777 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4775 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4776 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4778 | 4777 | WHERE v.folder_id = %i |
| 4779 | 4778 | GROUP BY title', |
| 4780 | 4779 | $inputData['folderId'] |
@@ -4783,7 +4782,7 @@ discard block |
||
| 4783 | 4782 | if (empty($visibilite)) { |
| 4784 | 4783 | $visibilite = $record['title']; |
| 4785 | 4784 | } else { |
| 4786 | - $visibilite .= ' - ' . $record['title']; |
|
| 4785 | + $visibilite .= ' - '.$record['title']; |
|
| 4787 | 4786 | } |
| 4788 | 4787 | } |
| 4789 | 4788 | } else { |
@@ -4793,14 +4792,14 @@ discard block |
||
| 4793 | 4792 | // do new query to know if current folder is pf |
| 4794 | 4793 | $data_pf = DB::queryFirstRow( |
| 4795 | 4794 | 'SELECT personal_folder |
| 4796 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4795 | + FROM ' . prefixTable('nested_tree').' |
|
| 4797 | 4796 | WHERE id = %s', |
| 4798 | 4797 | $inputData['folderId'] |
| 4799 | 4798 | ); |
| 4800 | 4799 | |
| 4801 | 4800 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4802 | 4801 | |
| 4803 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4802 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4804 | 4803 | } |
| 4805 | 4804 | |
| 4806 | 4805 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4810,8 +4809,8 @@ discard block |
||
| 4810 | 4809 | $listOptionsForRoles = array(); |
| 4811 | 4810 | $rows = DB::query( |
| 4812 | 4811 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4813 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4814 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4812 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4813 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4815 | 4814 | WHERE r.folder_id = %i', |
| 4816 | 4815 | $inputData['folderId'] |
| 4817 | 4816 | ); |
@@ -4825,7 +4824,7 @@ discard block |
||
| 4825 | 4824 | ); |
| 4826 | 4825 | $rows2 = DB::query( |
| 4827 | 4826 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4828 | - FROM ' . prefixTable('users') . ' |
|
| 4827 | + FROM ' . prefixTable('users').' |
|
| 4829 | 4828 | WHERE admin = 0 AND fonction_id is not null' |
| 4830 | 4829 | ); |
| 4831 | 4830 | foreach ($rows2 as $record2) { |
@@ -4839,7 +4838,7 @@ discard block |
||
| 4839 | 4838 | array( |
| 4840 | 4839 | 'id' => $record2['id'], |
| 4841 | 4840 | 'login' => $record2['login'], |
| 4842 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4841 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4843 | 4842 | 'email' => $record2['email'], |
| 4844 | 4843 | ) |
| 4845 | 4844 | ); |
@@ -4856,13 +4855,13 @@ discard block |
||
| 4856 | 4855 | //db::debugmode(true); |
| 4857 | 4856 | $access = DB::queryFirstRow( |
| 4858 | 4857 | 'SELECT type |
| 4859 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4858 | + FROM ' . prefixTable('roles_values').' |
|
| 4860 | 4859 | WHERE role_id = %i AND folder_id = %i', |
| 4861 | 4860 | $role, |
| 4862 | 4861 | $inputData['folderId'] |
| 4863 | 4862 | ); |
| 4864 | 4863 | //db::debugmode(false); |
| 4865 | - if (DB::count()>0) { |
|
| 4864 | + if (DB::count() > 0) { |
|
| 4866 | 4865 | if ($access['type'] === 'R') { |
| 4867 | 4866 | array_push($arrTmp, 10); |
| 4868 | 4867 | } elseif ($access['type'] === 'W') { |
@@ -4890,7 +4889,7 @@ discard block |
||
| 4890 | 4889 | // Check if personal folder is owned by user |
| 4891 | 4890 | $folder_title = DB::queryFirstRow( |
| 4892 | 4891 | 'SELECT title |
| 4893 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4892 | + FROM ' . prefixTable('nested_tree').' |
|
| 4894 | 4893 | WHERE id = %s AND title = %s', |
| 4895 | 4894 | $inputData['folderId'], |
| 4896 | 4895 | $session->get('user-id'), |
@@ -4989,7 +4988,7 @@ discard block |
||
| 4989 | 4988 | // Get some info before deleting |
| 4990 | 4989 | $data = DB::queryFirstRow( |
| 4991 | 4990 | 'SELECT name, id_item, file |
| 4992 | - FROM ' . prefixTable('files') . ' |
|
| 4991 | + FROM ' . prefixTable('files').' |
|
| 4993 | 4992 | WHERE id = %i', |
| 4994 | 4993 | $fileId |
| 4995 | 4994 | ); |
@@ -4997,7 +4996,7 @@ discard block |
||
| 4997 | 4996 | // Load item data |
| 4998 | 4997 | $data_item = DB::queryFirstRow( |
| 4999 | 4998 | 'SELECT id_tree |
| 5000 | - FROM ' . prefixTable('items') . ' |
|
| 4999 | + FROM ' . prefixTable('items').' |
|
| 5001 | 5000 | WHERE id = %i', |
| 5002 | 5001 | $data['id_item'] |
| 5003 | 5002 | ); |
@@ -5027,7 +5026,7 @@ discard block |
||
| 5027 | 5026 | $session->get('user-id'), |
| 5028 | 5027 | 'at_modification', |
| 5029 | 5028 | $session->get('user-login'), |
| 5030 | - 'at_del_file : ' . $data['name'] |
|
| 5029 | + 'at_del_file : '.$data['name'] |
|
| 5031 | 5030 | ); |
| 5032 | 5031 | |
| 5033 | 5032 | // DElete sharekeys |
@@ -5038,7 +5037,7 @@ discard block |
||
| 5038 | 5037 | ); |
| 5039 | 5038 | |
| 5040 | 5039 | // Delete file from server |
| 5041 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 5040 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 5042 | 5041 | $fileToDelete = realpath($fileToDelete); |
| 5043 | 5042 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 5044 | 5043 | fileDelete($fileToDelete, $SETTINGS); |
@@ -5092,7 +5091,7 @@ discard block |
||
| 5092 | 5091 | // Update SESSION with this new favourite |
| 5093 | 5092 | $data = DB::queryfirstrow( |
| 5094 | 5093 | 'SELECT label,id_tree |
| 5095 | - FROM ' . prefixTable('items') . ' |
|
| 5094 | + FROM ' . prefixTable('items').' |
|
| 5096 | 5095 | WHERE id = %i', |
| 5097 | 5096 | $inputData['itemId'] |
| 5098 | 5097 | ); |
@@ -5101,7 +5100,7 @@ discard block |
||
| 5101 | 5100 | [ |
| 5102 | 5101 | $inputData['itemId'] => [ |
| 5103 | 5102 | 'label' => $data['label'], |
| 5104 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 5103 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 5105 | 5104 | ], |
| 5106 | 5105 | ], |
| 5107 | 5106 | 'add' |
@@ -5170,8 +5169,8 @@ discard block |
||
| 5170 | 5169 | // get data about item |
| 5171 | 5170 | $dataSource = DB::queryfirstrow( |
| 5172 | 5171 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5173 | - FROM ' . prefixTable('items') . ' as i |
|
| 5174 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5172 | + FROM ' . prefixTable('items').' as i |
|
| 5173 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5175 | 5174 | WHERE i.id=%i', |
| 5176 | 5175 | $inputData['itemId'] |
| 5177 | 5176 | ); |
@@ -5215,7 +5214,7 @@ discard block |
||
| 5215 | 5214 | // get data about new folder |
| 5216 | 5215 | $dataDestination = DB::queryfirstrow( |
| 5217 | 5216 | 'SELECT personal_folder, title |
| 5218 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5217 | + FROM ' . prefixTable('nested_tree').' |
|
| 5219 | 5218 | WHERE id = %i', |
| 5220 | 5219 | $inputData['folderId'] |
| 5221 | 5220 | ); |
@@ -5268,7 +5267,7 @@ discard block |
||
| 5268 | 5267 | // Get fields for this Item |
| 5269 | 5268 | $rows = DB::query( |
| 5270 | 5269 | 'SELECT id |
| 5271 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5270 | + FROM ' . prefixTable('categories_items').' |
|
| 5272 | 5271 | WHERE item_id = %i', |
| 5273 | 5272 | $inputData['itemId'] |
| 5274 | 5273 | ); |
@@ -5285,7 +5284,7 @@ discard block |
||
| 5285 | 5284 | // Get FILES for this Item |
| 5286 | 5285 | $rows = DB::query( |
| 5287 | 5286 | 'SELECT id |
| 5288 | - FROM ' . prefixTable('files') . ' |
|
| 5287 | + FROM ' . prefixTable('files').' |
|
| 5289 | 5288 | WHERE id_item = %i', |
| 5290 | 5289 | $inputData['itemId'] |
| 5291 | 5290 | ); |
@@ -5332,7 +5331,7 @@ discard block |
||
| 5332 | 5331 | // Get the ITEM object key for the user |
| 5333 | 5332 | $userKey = DB::queryFirstRow( |
| 5334 | 5333 | 'SELECT share_key |
| 5335 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5334 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5336 | 5335 | WHERE user_id = %i AND object_id = %i', |
| 5337 | 5336 | $session->get('user-id'), |
| 5338 | 5337 | $inputData['itemId'] |
@@ -5343,8 +5342,8 @@ discard block |
||
| 5343 | 5342 | // This is a public object |
| 5344 | 5343 | $users = DB::query( |
| 5345 | 5344 | 'SELECT id, public_key |
| 5346 | - FROM ' . prefixTable('users') . ' |
|
| 5347 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5345 | + FROM ' . prefixTable('users').' |
|
| 5346 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5348 | 5347 | AND public_key != ""' |
| 5349 | 5348 | ); |
| 5350 | 5349 | foreach ($users as $user) { |
@@ -5364,14 +5363,14 @@ discard block |
||
| 5364 | 5363 | // Get fields for this Item |
| 5365 | 5364 | $rows = DB::query( |
| 5366 | 5365 | 'SELECT id |
| 5367 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5366 | + FROM ' . prefixTable('categories_items').' |
|
| 5368 | 5367 | WHERE item_id = %i', |
| 5369 | 5368 | $inputData['itemId'] |
| 5370 | 5369 | ); |
| 5371 | 5370 | foreach ($rows as $field) { |
| 5372 | 5371 | $userKey = DB::queryFirstRow( |
| 5373 | 5372 | 'SELECT share_key |
| 5374 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5373 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5375 | 5374 | WHERE user_id = %i AND object_id = %i', |
| 5376 | 5375 | $session->get('user-id'), |
| 5377 | 5376 | $field['id'] |
@@ -5382,8 +5381,8 @@ discard block |
||
| 5382 | 5381 | // This is a public object |
| 5383 | 5382 | $users = DB::query( |
| 5384 | 5383 | 'SELECT id, public_key |
| 5385 | - FROM ' . prefixTable('users') . ' |
|
| 5386 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5384 | + FROM ' . prefixTable('users').' |
|
| 5385 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5387 | 5386 | AND public_key != ""' |
| 5388 | 5387 | ); |
| 5389 | 5388 | foreach ($users as $user) { |
@@ -5404,14 +5403,14 @@ discard block |
||
| 5404 | 5403 | // Get FILES for this Item |
| 5405 | 5404 | $rows = DB::query( |
| 5406 | 5405 | 'SELECT id |
| 5407 | - FROM ' . prefixTable('files') . ' |
|
| 5406 | + FROM ' . prefixTable('files').' |
|
| 5408 | 5407 | WHERE id_item = %i', |
| 5409 | 5408 | $inputData['itemId'] |
| 5410 | 5409 | ); |
| 5411 | 5410 | foreach ($rows as $attachment) { |
| 5412 | 5411 | $userKey = DB::queryFirstRow( |
| 5413 | 5412 | 'SELECT share_key |
| 5414 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5413 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5415 | 5414 | WHERE user_id = %i AND object_id = %i', |
| 5416 | 5415 | $session->get('user-id'), |
| 5417 | 5416 | $attachment['id'] |
@@ -5422,8 +5421,8 @@ discard block |
||
| 5422 | 5421 | // This is a public object |
| 5423 | 5422 | $users = DB::query( |
| 5424 | 5423 | 'SELECT id, public_key |
| 5425 | - FROM ' . prefixTable('users') . ' |
|
| 5426 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5424 | + FROM ' . prefixTable('users').' |
|
| 5425 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5427 | 5426 | AND public_key != ""' |
| 5428 | 5427 | ); |
| 5429 | 5428 | foreach ($users as $user) { |
@@ -5461,7 +5460,7 @@ discard block |
||
| 5461 | 5460 | $session->get('user-id'), |
| 5462 | 5461 | 'at_modification', |
| 5463 | 5462 | $session->get('user-login'), |
| 5464 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5463 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5465 | 5464 | ); |
| 5466 | 5465 | |
| 5467 | 5466 | // Update cache table |
@@ -5520,8 +5519,8 @@ discard block |
||
| 5520 | 5519 | // get data about item |
| 5521 | 5520 | $dataSource = DB::queryfirstrow( |
| 5522 | 5521 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5523 | - FROM ' . prefixTable('items') . ' as i |
|
| 5524 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5522 | + FROM ' . prefixTable('items').' as i |
|
| 5523 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5525 | 5524 | WHERE i.id=%i', |
| 5526 | 5525 | $item_id |
| 5527 | 5526 | ); |
@@ -5543,7 +5542,7 @@ discard block |
||
| 5543 | 5542 | |
| 5544 | 5543 | // get data about new folder |
| 5545 | 5544 | $dataDestination = DB::queryfirstrow( |
| 5546 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5545 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5547 | 5546 | $inputData['folderId'] |
| 5548 | 5547 | ); |
| 5549 | 5548 | |
@@ -5585,7 +5584,7 @@ discard block |
||
| 5585 | 5584 | // Get fields for this Item |
| 5586 | 5585 | $rows = DB::query( |
| 5587 | 5586 | 'SELECT id |
| 5588 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5587 | + FROM ' . prefixTable('categories_items').' |
|
| 5589 | 5588 | WHERE item_id = %i', |
| 5590 | 5589 | $item_id |
| 5591 | 5590 | ); |
@@ -5602,7 +5601,7 @@ discard block |
||
| 5602 | 5601 | // Get FILES for this Item |
| 5603 | 5602 | $rows = DB::query( |
| 5604 | 5603 | 'SELECT id |
| 5605 | - FROM ' . prefixTable('files') . ' |
|
| 5604 | + FROM ' . prefixTable('files').' |
|
| 5606 | 5605 | WHERE id_item = %i', |
| 5607 | 5606 | $item_id |
| 5608 | 5607 | ); |
@@ -5657,7 +5656,7 @@ discard block |
||
| 5657 | 5656 | // Get the ITEM object key for the user |
| 5658 | 5657 | $userKey = DB::queryFirstRow( |
| 5659 | 5658 | 'SELECT share_key |
| 5660 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5659 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5661 | 5660 | WHERE user_id = %i AND object_id = %i', |
| 5662 | 5661 | $session->get('user-id'), |
| 5663 | 5662 | $item_id |
@@ -5668,8 +5667,8 @@ discard block |
||
| 5668 | 5667 | // This is a public object |
| 5669 | 5668 | $users = DB::query( |
| 5670 | 5669 | 'SELECT id, public_key |
| 5671 | - FROM ' . prefixTable('users') . ' |
|
| 5672 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5670 | + FROM ' . prefixTable('users').' |
|
| 5671 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5673 | 5672 | AND public_key != ""' |
| 5674 | 5673 | ); |
| 5675 | 5674 | foreach ($users as $user) { |
@@ -5689,14 +5688,14 @@ discard block |
||
| 5689 | 5688 | // Get fields for this Item |
| 5690 | 5689 | $rows = DB::query( |
| 5691 | 5690 | 'SELECT id |
| 5692 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5691 | + FROM ' . prefixTable('categories_items').' |
|
| 5693 | 5692 | WHERE item_id = %i', |
| 5694 | 5693 | $item_id |
| 5695 | 5694 | ); |
| 5696 | 5695 | foreach ($rows as $field) { |
| 5697 | 5696 | $userKey = DB::queryFirstRow( |
| 5698 | 5697 | 'SELECT share_key |
| 5699 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5698 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5700 | 5699 | WHERE user_id = %i AND object_id = %i', |
| 5701 | 5700 | $session->get('user-id'), |
| 5702 | 5701 | $field['id'] |
@@ -5707,8 +5706,8 @@ discard block |
||
| 5707 | 5706 | // This is a public object |
| 5708 | 5707 | $users = DB::query( |
| 5709 | 5708 | 'SELECT id, public_key |
| 5710 | - FROM ' . prefixTable('users') . ' |
|
| 5711 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5709 | + FROM ' . prefixTable('users').' |
|
| 5710 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5712 | 5711 | AND public_key != ""' |
| 5713 | 5712 | ); |
| 5714 | 5713 | foreach ($users as $user) { |
@@ -5729,14 +5728,14 @@ discard block |
||
| 5729 | 5728 | // Get FILES for this Item |
| 5730 | 5729 | $rows = DB::query( |
| 5731 | 5730 | 'SELECT id |
| 5732 | - FROM ' . prefixTable('files') . ' |
|
| 5731 | + FROM ' . prefixTable('files').' |
|
| 5733 | 5732 | WHERE id_item = %i', |
| 5734 | 5733 | $item_id |
| 5735 | 5734 | ); |
| 5736 | 5735 | foreach ($rows as $attachment) { |
| 5737 | 5736 | $userKey = DB::queryFirstRow( |
| 5738 | 5737 | 'SELECT share_key |
| 5739 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5738 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5740 | 5739 | WHERE user_id = %i AND object_id = %i', |
| 5741 | 5740 | $session->get('user-id'), |
| 5742 | 5741 | $attachment['id'] |
@@ -5747,8 +5746,8 @@ discard block |
||
| 5747 | 5746 | // This is a public object |
| 5748 | 5747 | $users = DB::query( |
| 5749 | 5748 | 'SELECT id, public_key |
| 5750 | - FROM ' . prefixTable('users') . ' |
|
| 5751 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5749 | + FROM ' . prefixTable('users').' |
|
| 5750 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5752 | 5751 | AND public_key != ""' |
| 5753 | 5752 | ); |
| 5754 | 5753 | foreach ($users as $user) { |
@@ -5785,13 +5784,13 @@ discard block |
||
| 5785 | 5784 | $session->get('user-id'), |
| 5786 | 5785 | 'at_modification', |
| 5787 | 5786 | $session->get('user-login'), |
| 5788 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5787 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5789 | 5788 | ); |
| 5790 | 5789 | } |
| 5791 | 5790 | } |
| 5792 | 5791 | |
| 5793 | 5792 | // reload cache table |
| 5794 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5793 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5795 | 5794 | updateCacheTable('reload', null); |
| 5796 | 5795 | |
| 5797 | 5796 | echo (string) prepareExchangedData( |
@@ -5855,7 +5854,7 @@ discard block |
||
| 5855 | 5854 | // get info |
| 5856 | 5855 | $dataSource = DB::queryfirstrow( |
| 5857 | 5856 | 'SELECT label, id_tree |
| 5858 | - FROM ' . prefixTable('items') . ' |
|
| 5857 | + FROM ' . prefixTable('items').' |
|
| 5859 | 5858 | WHERE id=%i', |
| 5860 | 5859 | $item_id |
| 5861 | 5860 | ); |
@@ -5954,8 +5953,8 @@ discard block |
||
| 5954 | 5953 | } |
| 5955 | 5954 | if ($inputData['cat'] === 'request_access_to_author') { |
| 5956 | 5955 | // Variables |
| 5957 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
| 5958 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
| 5956 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
| 5957 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
| 5959 | 5958 | |
| 5960 | 5959 | // Get path |
| 5961 | 5960 | $path = geItemReadablePath( |
@@ -5969,7 +5968,7 @@ discard block |
||
| 5969 | 5968 | $lang->get('email_request_access_subject'), |
| 5970 | 5969 | str_replace( |
| 5971 | 5970 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5972 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5971 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5973 | 5972 | $lang->get('email_request_access_mail') |
| 5974 | 5973 | ), |
| 5975 | 5974 | $dataAuthor['email'], |
@@ -5978,7 +5977,7 @@ discard block |
||
| 5978 | 5977 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5979 | 5978 | $dataItem = DB::queryfirstrow( |
| 5980 | 5979 | 'SELECT label,id_tree |
| 5981 | - FROM ' . prefixTable('items') . ' |
|
| 5980 | + FROM ' . prefixTable('items').' |
|
| 5982 | 5981 | WHERE id= %i', |
| 5983 | 5982 | $inputData['id'] |
| 5984 | 5983 | ); |
@@ -6001,7 +6000,7 @@ discard block |
||
| 6001 | 6000 | ), |
| 6002 | 6001 | array( |
| 6003 | 6002 | empty($SETTINGS['email_server_url']) === false ? |
| 6004 | - $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'], |
|
| 6003 | + $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'], |
|
| 6005 | 6004 | addslashes($session->get('user-login')), |
| 6006 | 6005 | addslashes($path), |
| 6007 | 6006 | ), |
@@ -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, |
@@ -6214,7 +6213,7 @@ discard block |
||
| 6214 | 6213 | ); |
| 6215 | 6214 | |
| 6216 | 6215 | // delete all existing old otv codes |
| 6217 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time()); |
|
| 6216 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time()); |
|
| 6218 | 6217 | foreach ($rows as $record) { |
| 6219 | 6218 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 6220 | 6219 | } |
@@ -6236,8 +6235,8 @@ discard block |
||
| 6236 | 6235 | // Should we log a password change? |
| 6237 | 6236 | $itemQ = DB::queryFirstRow( |
| 6238 | 6237 | 'SELECT s.share_key, i.pw |
| 6239 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6240 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6238 | + FROM ' . prefixTable('items').' AS i |
|
| 6239 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6241 | 6240 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6242 | 6241 | $session->get('user-id'), |
| 6243 | 6242 | $dataReceived['id'] |
@@ -6292,7 +6291,7 @@ discard block |
||
| 6292 | 6291 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6293 | 6292 | $SETTINGS['otv_expiration_period'] = 7; |
| 6294 | 6293 | } |
| 6295 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6294 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6296 | 6295 | |
| 6297 | 6296 | echo json_encode( |
| 6298 | 6297 | array( |
@@ -6323,7 +6322,7 @@ discard block |
||
| 6323 | 6322 | // get parameters from original link |
| 6324 | 6323 | $url = $dataReceived['original_link']; |
| 6325 | 6324 | $parts = parse_url($url); |
| 6326 | - if(isset($parts['query'])){ |
|
| 6325 | + if (isset($parts['query'])) { |
|
| 6327 | 6326 | parse_str($parts['query'], $orignal_link_parameters); |
| 6328 | 6327 | } else { |
| 6329 | 6328 | $orignal_link_parameters = array(); |
@@ -6354,13 +6353,13 @@ discard block |
||
| 6354 | 6353 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6355 | 6354 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6356 | 6355 | if (str_contains($domain_host, 'www.') === true) { |
| 6357 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6356 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6358 | 6357 | } else { |
| 6359 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6358 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6360 | 6359 | } |
| 6361 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6360 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6362 | 6361 | } else { |
| 6363 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6362 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6364 | 6363 | } |
| 6365 | 6364 | |
| 6366 | 6365 | echo (string) prepareExchangedData( |
@@ -6395,8 +6394,8 @@ discard block |
||
| 6395 | 6394 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6396 | 6395 | f.extension AS extension, f.type AS type, |
| 6397 | 6396 | s.share_key AS share_key |
| 6398 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6399 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6397 | + FROM ' . prefixTable('files').' AS f |
|
| 6398 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6400 | 6399 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6401 | 6400 | $session->get('user-id'), |
| 6402 | 6401 | $inputData['id'] |
@@ -6417,7 +6416,7 @@ discard block |
||
| 6417 | 6416 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6418 | 6417 | |
| 6419 | 6418 | // prepare image info |
| 6420 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6419 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6421 | 6420 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6422 | 6421 | |
| 6423 | 6422 | // Get image content |
@@ -6444,7 +6443,7 @@ discard block |
||
| 6444 | 6443 | echo (string) prepareExchangedData( |
| 6445 | 6444 | array( |
| 6446 | 6445 | 'error' => false, |
| 6447 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6446 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6448 | 6447 | 'file_type' => $file_info['type'], |
| 6449 | 6448 | 'file_content' => $fileContent, |
| 6450 | 6449 | ), |
@@ -6497,16 +6496,16 @@ discard block |
||
| 6497 | 6496 | $idFolder = $dataReceived['idFolder']; |
| 6498 | 6497 | |
| 6499 | 6498 | // don't check if Personal Folder |
| 6500 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 6499 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 6501 | 6500 | if ($data['title'] === $session->get('user-id')) { |
| 6502 | 6501 | // send data |
| 6503 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 6502 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 6504 | 6503 | } else { |
| 6505 | 6504 | if ($inputData['option'] === 'same_folder') { |
| 6506 | 6505 | // case unique folder |
| 6507 | 6506 | DB::query( |
| 6508 | 6507 | 'SELECT label |
| 6509 | - FROM ' . prefixTable('items') . ' |
|
| 6508 | + FROM ' . prefixTable('items').' |
|
| 6510 | 6509 | WHERE id_tree = %i AND label = %s', |
| 6511 | 6510 | $idFolder, |
| 6512 | 6511 | $label |
@@ -6518,7 +6517,7 @@ discard block |
||
| 6518 | 6517 | $arrayPf = array(); |
| 6519 | 6518 | if (empty($row['id']) === false) { |
| 6520 | 6519 | $rows = DB::query( |
| 6521 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 6520 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 6522 | 6521 | '1' |
| 6523 | 6522 | ); |
| 6524 | 6523 | foreach ($rows as $record) { |
@@ -6533,12 +6532,12 @@ discard block |
||
| 6533 | 6532 | $where->add('id_tree = %i', $idFolder); |
| 6534 | 6533 | $where->add('label = %s', $label); |
| 6535 | 6534 | if (empty($arrayPf) === false) { |
| 6536 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 6535 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 6537 | 6536 | } |
| 6538 | 6537 | |
| 6539 | 6538 | DB::query( |
| 6540 | 6539 | 'SELECT label |
| 6541 | - FROM ' . prefixTable('items') . ' |
|
| 6540 | + FROM ' . prefixTable('items').' |
|
| 6542 | 6541 | WHERE %l', |
| 6543 | 6542 | $where |
| 6544 | 6543 | ); |
@@ -6550,7 +6549,7 @@ discard block |
||
| 6550 | 6549 | } |
| 6551 | 6550 | |
| 6552 | 6551 | // send data |
| 6553 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 6552 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 6554 | 6553 | } |
| 6555 | 6554 | break; |
| 6556 | 6555 | |
@@ -6660,7 +6659,7 @@ discard block |
||
| 6660 | 6659 | $arbo = $tree->getPath($folder->id, false); |
| 6661 | 6660 | $path = ''; |
| 6662 | 6661 | foreach ($arbo as $elem) { |
| 6663 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6662 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6664 | 6663 | } |
| 6665 | 6664 | |
| 6666 | 6665 | // Build array |
@@ -6729,7 +6728,7 @@ discard block |
||
| 6729 | 6728 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6730 | 6729 | $rows = DB::query( |
| 6731 | 6730 | 'SELECT id, categories |
| 6732 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6731 | + FROM ' . prefixTable('nested_tree').' |
|
| 6733 | 6732 | WHERE id IN (%l)', |
| 6734 | 6733 | implode(',', $foldersArray) |
| 6735 | 6734 | ); |
@@ -6771,7 +6770,7 @@ discard block |
||
| 6771 | 6770 | // get item info |
| 6772 | 6771 | $dataItem = DB::queryFirstRow( |
| 6773 | 6772 | 'SELECT * |
| 6774 | - FROM ' . prefixTable('items') . ' |
|
| 6773 | + FROM ' . prefixTable('items').' |
|
| 6775 | 6774 | WHERE id=%i', |
| 6776 | 6775 | $inputData['itemId'] |
| 6777 | 6776 | ); |
@@ -6783,8 +6782,8 @@ discard block |
||
| 6783 | 6782 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6784 | 6783 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6785 | 6784 | l.old_value as old_value |
| 6786 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6787 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6785 | + FROM ' . prefixTable('log_items').' as l |
|
| 6786 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6788 | 6787 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6789 | 6788 | ORDER BY date DESC', |
| 6790 | 6789 | $inputData['itemId'], |
@@ -6799,18 +6798,18 @@ discard block |
||
| 6799 | 6798 | |
| 6800 | 6799 | // imported via API |
| 6801 | 6800 | if (empty($record['login']) === true) { |
| 6802 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6801 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6803 | 6802 | } |
| 6804 | 6803 | |
| 6805 | 6804 | // Prepare avatar |
| 6806 | 6805 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6807 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6808 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6806 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6807 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6809 | 6808 | } else { |
| 6810 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6809 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6811 | 6810 | } |
| 6812 | 6811 | } else { |
| 6813 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6812 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6814 | 6813 | } |
| 6815 | 6814 | |
| 6816 | 6815 | // Prepare action |
@@ -6830,7 +6829,7 @@ discard block |
||
| 6830 | 6829 | $previous_passwords, |
| 6831 | 6830 | [ |
| 6832 | 6831 | 'password' => htmlentities($previous_pwd['string']), |
| 6833 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6832 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6834 | 6833 | ] |
| 6835 | 6834 | ); |
| 6836 | 6835 | } |
@@ -6843,19 +6842,19 @@ discard block |
||
| 6843 | 6842 | $action = $lang->get($reason[0]); |
| 6844 | 6843 | if ($reason[0] === 'at_moved') { |
| 6845 | 6844 | $tmp = explode(' -> ', $reason[1]); |
| 6846 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6845 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6847 | 6846 | } elseif ($reason[0] === 'at_field') { |
| 6848 | 6847 | $tmp = explode(' => ', $reason[1]); |
| 6849 | 6848 | if (count($tmp) > 1) { |
| 6850 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6851 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6849 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6850 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6852 | 6851 | } else { |
| 6853 | 6852 | $detail = trim($reason[1]); |
| 6854 | 6853 | } |
| 6855 | 6854 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6856 | 6855 | $tmp = explode(' => ', $reason[1]); |
| 6857 | 6856 | $detail = empty(trim($tmp[0])) === true ? |
| 6858 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6857 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6859 | 6858 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6860 | 6859 | $detail = $lang->get($reason[1]); |
| 6861 | 6860 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6864,7 +6863,7 @@ discard block |
||
| 6864 | 6863 | $tmp = explode(':', $reason[1]); |
| 6865 | 6864 | $tmp = explode('.', $tmp[0]); |
| 6866 | 6865 | $detail = isBase64($tmp[0]) === true ? |
| 6867 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6866 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6868 | 6867 | } elseif ($reason[0] === 'at_import') { |
| 6869 | 6868 | $detail = ''; |
| 6870 | 6869 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6883,8 +6882,8 @@ discard block |
||
| 6883 | 6882 | array( |
| 6884 | 6883 | 'avatar' => $avatar, |
| 6885 | 6884 | 'login' => $record['login'], |
| 6886 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6887 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6885 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6886 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6888 | 6887 | 'action' => $action, |
| 6889 | 6888 | 'detail' => $detail, |
| 6890 | 6889 | ) |
@@ -6973,11 +6972,11 @@ discard block |
||
| 6973 | 6972 | |
| 6974 | 6973 | // get some info to add to the notification email |
| 6975 | 6974 | $resp_user = DB::queryfirstrow( |
| 6976 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6975 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6977 | 6976 | $session->get('user-id') |
| 6978 | 6977 | ); |
| 6979 | 6978 | $resp_folder = DB::queryfirstrow( |
| 6980 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6979 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6981 | 6980 | $folder |
| 6982 | 6981 | ); |
| 6983 | 6982 | |
@@ -6986,7 +6985,7 @@ discard block |
||
| 6986 | 6985 | $emailService = new EmailService(); |
| 6987 | 6986 | $rows = DB::query( |
| 6988 | 6987 | 'SELECT email |
| 6989 | - FROM ' . prefixTable('users') . ' |
|
| 6988 | + FROM ' . prefixTable('users').' |
|
| 6990 | 6989 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6991 | 6990 | 1 |
| 6992 | 6991 | ); |
@@ -7017,14 +7016,14 @@ discard block |
||
| 7017 | 7016 | // Get list of users |
| 7018 | 7017 | $usersList = array(); |
| 7019 | 7018 | $usersString = ''; |
| 7020 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 7019 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 7021 | 7020 | foreach ($rows as $record) { |
| 7022 | 7021 | $usersList[$record['login']] = array( |
| 7023 | 7022 | 'id' => $record['id'], |
| 7024 | 7023 | 'login' => $record['login'], |
| 7025 | 7024 | 'email' => $record['email'], |
| 7026 | 7025 | ); |
| 7027 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 7026 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 7028 | 7027 | } |
| 7029 | 7028 | |
| 7030 | 7029 | $data = array( |
@@ -7064,7 +7063,7 @@ discard block |
||
| 7064 | 7063 | // Send email |
| 7065 | 7064 | $dataItem = DB::queryfirstrow( |
| 7066 | 7065 | 'SELECT label, id_tree |
| 7067 | - FROM ' . prefixTable('items') . ' |
|
| 7066 | + FROM ' . prefixTable('items').' |
|
| 7068 | 7067 | WHERE id = %i', |
| 7069 | 7068 | $inputData['itemId'] |
| 7070 | 7069 | ); |
@@ -7118,7 +7117,7 @@ discard block |
||
| 7118 | 7117 | |
| 7119 | 7118 | DB::query( |
| 7120 | 7119 | 'SELECT * |
| 7121 | - FROM ' . prefixTable('notification') . ' |
|
| 7120 | + FROM ' . prefixTable('notification').' |
|
| 7122 | 7121 | WHERE item_id = %i AND user_id = %i', |
| 7123 | 7122 | $inputData['itemId'], |
| 7124 | 7123 | $session->get('user-id') |
@@ -7190,7 +7189,7 @@ discard block |
||
| 7190 | 7189 | // And related logs |
| 7191 | 7190 | $rows = DB::query( |
| 7192 | 7191 | 'SELECT id, file AS filename |
| 7193 | - FROM ' . prefixTable('files') . ' |
|
| 7192 | + FROM ' . prefixTable('files').' |
|
| 7194 | 7193 | WHERE id_item = %i AND confirmed = %i', |
| 7195 | 7194 | $inputData['itemId'], |
| 7196 | 7195 | 0 |
@@ -7204,12 +7203,12 @@ discard block |
||
| 7204 | 7203 | ); |
| 7205 | 7204 | |
| 7206 | 7205 | // Delete file on server |
| 7207 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 7206 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 7208 | 7207 | |
| 7209 | 7208 | // Delete related logs |
| 7210 | 7209 | $logFile = DB::query( |
| 7211 | 7210 | 'SELECT increment_id, raison |
| 7212 | - FROM ' . prefixTable('log_items') . ' |
|
| 7211 | + FROM ' . prefixTable('log_items').' |
|
| 7213 | 7212 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 7214 | 7213 | $inputData['itemId'], |
| 7215 | 7214 | $session->get('user-id'), |
@@ -7268,7 +7267,7 @@ discard block |
||
| 7268 | 7267 | // Confirm attachments |
| 7269 | 7268 | $rows = DB::query( |
| 7270 | 7269 | 'SELECT id, file AS filename |
| 7271 | - FROM ' . prefixTable('files') . ' |
|
| 7270 | + FROM ' . prefixTable('files').' |
|
| 7272 | 7271 | WHERE id_item = %i AND confirmed = %i', |
| 7273 | 7272 | $inputData['itemId'], |
| 7274 | 7273 | 0 |
@@ -7354,15 +7353,15 @@ discard block |
||
| 7354 | 7353 | case 'autocomplete_tags': |
| 7355 | 7354 | // Get a list off all existing TAGS |
| 7356 | 7355 | $listOfTags = ''; |
| 7357 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7356 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7358 | 7357 | foreach ($rows as $record) { |
| 7359 | 7358 | if (empty($listOfTags)) { |
| 7360 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7359 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7361 | 7360 | } else { |
| 7362 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7361 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7363 | 7362 | } |
| 7364 | 7363 | } |
| 7365 | - echo '[' . $listOfTags . ']'; |
|
| 7364 | + echo '['.$listOfTags.']'; |
|
| 7366 | 7365 | break; |
| 7367 | 7366 | } |
| 7368 | 7367 | } |
@@ -7378,7 +7377,7 @@ discard block |
||
| 7378 | 7377 | { |
| 7379 | 7378 | $data = DB::queryFirstRow( |
| 7380 | 7379 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7381 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7380 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7382 | 7381 | $groupe |
| 7383 | 7382 | ); |
| 7384 | 7383 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7482,7 +7481,7 @@ discard block |
||
| 7482 | 7481 | global $SETTINGS; |
| 7483 | 7482 | |
| 7484 | 7483 | // Retrieve the current lock information for the item |
| 7485 | - $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $itemId); |
|
| 7484 | + $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $itemId); |
|
| 7486 | 7485 | |
| 7487 | 7486 | // Check if the item is locked by another user |
| 7488 | 7487 | if ($itemLockInfo && $itemLockInfo['user_id'] !== $userId) { |
@@ -7501,7 +7500,7 @@ discard block |
||
| 7501 | 7500 | |
| 7502 | 7501 | // Check if there's an ongoing background encryption process for the item |
| 7503 | 7502 | $ongoingProcess = DB::queryFirstRow( |
| 7504 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7503 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7505 | 7504 | $itemId |
| 7506 | 7505 | ); |
| 7507 | 7506 | |
@@ -7519,7 +7518,7 @@ discard block |
||
| 7519 | 7518 | function getUserVisibleFolders(int $userId): array |
| 7520 | 7519 | { |
| 7521 | 7520 | // Query to retrieve visible folders for the user |
| 7522 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7521 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7523 | 7522 | |
| 7524 | 7523 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7525 | 7524 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7543,7 +7542,7 @@ discard block |
||
| 7543 | 7542 | |
| 7544 | 7543 | // Query the access rights for the given roles and folder |
| 7545 | 7544 | $accessTypes = DB::queryFirstColumn( |
| 7546 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7545 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7547 | 7546 | $roles, |
| 7548 | 7547 | $treeId |
| 7549 | 7548 | ); |
@@ -1210,7 +1210,9 @@ discard block |
||
| 1210 | 1210 | ); |
| 1211 | 1211 | |
| 1212 | 1212 | // Create a task to create sharekeys for users |
| 1213 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1213 | + if (WIP=== true) { |
|
| 1214 | + error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1215 | + } |
|
| 1214 | 1216 | $tasksToBePerformed = ['item_password']; |
| 1215 | 1217 | $encryptionTaskIsRequested = true; |
| 1216 | 1218 | } else { |
@@ -1528,7 +1530,9 @@ discard block |
||
| 1528 | 1530 | |
| 1529 | 1531 | // create a task for all fields updated |
| 1530 | 1532 | if ($encryptionTaskIsRequested === true) { |
| 1531 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1533 | + if (WIP === true) { |
|
| 1534 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1535 | + } |
|
| 1532 | 1536 | createTaskForItem( |
| 1533 | 1537 | 'item_update_create_keys', |
| 1534 | 1538 | $tasksToBePerformed, |
@@ -2035,7 +2039,9 @@ discard block |
||
| 2035 | 2039 | $inputData['itemId'] |
| 2036 | 2040 | ); |
| 2037 | 2041 | foreach ($rows as $record) { |
| 2038 | - if ($record['raison'] === NULL) continue; |
|
| 2042 | + if ($record['raison'] === NULL) { |
|
| 2043 | + continue; |
|
| 2044 | + } |
|
| 2039 | 2045 | $reason = explode(':', $record['raison']); |
| 2040 | 2046 | if (count($reason) > 0) { |
| 2041 | 2047 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4612,7 +4618,9 @@ discard block |
||
| 4612 | 4618 | $inputData['itemId'] |
| 4613 | 4619 | ); |
| 4614 | 4620 | |
| 4615 | - if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
|
| 4621 | + if (WIP === true) { |
|
| 4622 | + error_log('Existing edition locks: '.DB::count()); |
|
| 4623 | + } |
|
| 4616 | 4624 | |
| 4617 | 4625 | // Check if item has no edition lock |
| 4618 | 4626 | if ((int) DB::count() > 0 ) { |
@@ -4625,7 +4633,9 @@ discard block |
||
| 4625 | 4633 | } else { |
| 4626 | 4634 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4627 | 4635 | } |
| 4628 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4636 | + if (WIP === true) { |
|
| 4637 | + error_log('delay: ' . $delay); |
|
| 4638 | + } |
|
| 4629 | 4639 | |
| 4630 | 4640 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4631 | 4641 | if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
@@ -4633,7 +4643,9 @@ discard block |
||
| 4633 | 4643 | // In this case, delete edition lock and possible ongoing processes |
| 4634 | 4644 | // and continue editing this time |
| 4635 | 4645 | // We coonsidere if the most recent item is still locked then all other locks can be removed |
| 4636 | - if (WIP === true) error_log('Delay is expired, removing old locks'); |
|
| 4646 | + if (WIP === true) { |
|
| 4647 | + error_log('Delay is expired, removing old locks'); |
|
| 4648 | + } |
|
| 4637 | 4649 | foreach ($dataItemEditionLocks as $itemEditionLock) { |
| 4638 | 4650 | // delete lock |
| 4639 | 4651 | DB::delete( |
@@ -4896,7 +4908,9 @@ discard block |
||
| 4896 | 4908 | $session->get('user-id'), |
| 4897 | 4909 | ); |
| 4898 | 4910 | |
| 4899 | - if ($folder_title) $accessLevel = 30; |
|
| 4911 | + if ($folder_title) { |
|
| 4912 | + $accessLevel = 30; |
|
| 4913 | + } |
|
| 4900 | 4914 | } |
| 4901 | 4915 | |
| 4902 | 4916 | // Access is not allowed to this folder |