nilsteampassnet /
TeamPass
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | ) { |
| 80 | 80 | // Not allowed page |
| 81 | 81 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 82 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 82 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 83 | 83 | exit; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | date_default_timezone_set('UTC'); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
| 107 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
| 108 | 108 | header('Content-type: text/html; charset=utf-8'); |
| 109 | 109 | header('Cache-Control: no-cache, must-revalidate'); |
| 110 | 110 | |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | // About special settings |
| 355 | 355 | $dataFolderSettings = DB::queryFirstRow( |
| 356 | 356 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 357 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 357 | + FROM ' . prefixTable('nested_tree').' |
|
| 358 | 358 | WHERE id = %i', |
| 359 | 359 | $inputData['folderId'] |
| 360 | 360 | ); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | // Get folder complexity |
| 372 | 372 | $folderComplexity = DB::queryfirstrow( |
| 373 | 373 | 'SELECT valeur |
| 374 | - FROM ' . prefixTable('misc') . ' |
|
| 374 | + FROM ' . prefixTable('misc').' |
|
| 375 | 375 | WHERE type = %s AND intitule = %i', |
| 376 | 376 | 'complex', |
| 377 | 377 | $inputData['folderId'] |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | $itemExists = 0; |
| 397 | 397 | $newID = ''; |
| 398 | 398 | $data = DB::queryfirstrow( |
| 399 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 399 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 400 | 400 | WHERE label = %s AND inactif = %i', |
| 401 | 401 | $inputData['label'], |
| 402 | 402 | 0 |
@@ -480,8 +480,8 @@ discard block |
||
| 480 | 480 | (int) $inputData['folderId'], |
| 481 | 481 | (int) $newID, |
| 482 | 482 | $cryptedStuff['objectKey'], |
| 483 | - true, // only for the item creator |
|
| 484 | - false, // no delete all |
|
| 483 | + true, // only for the item creator |
|
| 484 | + false, // no delete all |
|
| 485 | 485 | ); |
| 486 | 486 | |
| 487 | 487 | // update fields |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | // should we encrypt the data |
| 495 | 495 | $dataTmp = DB::queryFirstRow( |
| 496 | 496 | 'SELECT encrypted_data |
| 497 | - FROM ' . prefixTable('categories') . ' |
|
| 497 | + FROM ' . prefixTable('categories').' |
|
| 498 | 498 | WHERE id = %i', |
| 499 | 499 | $field['id'] |
| 500 | 500 | ); |
@@ -524,8 +524,8 @@ discard block |
||
| 524 | 524 | (int) $inputData['folderId'], |
| 525 | 525 | (int) $newObjectId, |
| 526 | 526 | $cryptedStuff['objectKey'], |
| 527 | - true, // only for the item creator |
|
| 528 | - false, // no delete all |
|
| 527 | + true, // only for the item creator |
|
| 528 | + false, // no delete all |
|
| 529 | 529 | ); |
| 530 | 530 | |
| 531 | 531 | array_push( |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | ) { |
| 563 | 563 | DB::queryFirstRow( |
| 564 | 564 | 'SELECT * |
| 565 | - FROM ' . prefixTable('templates') . ' |
|
| 565 | + FROM ' . prefixTable('templates').' |
|
| 566 | 566 | WHERE item_id = %i', |
| 567 | 567 | $newID |
| 568 | 568 | ); |
@@ -631,11 +631,11 @@ discard block |
||
| 631 | 631 | ) { |
| 632 | 632 | foreach ($post_restricted_to as $userRest) { |
| 633 | 633 | if (empty($userRest) === false) { |
| 634 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 634 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 635 | 635 | if (empty($listOfRestricted)) { |
| 636 | 636 | $listOfRestricted = $dataTmp['login']; |
| 637 | 637 | } else { |
| 638 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 638 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 639 | 639 | } |
| 640 | 640 | } |
| 641 | 641 | } |
@@ -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_decode($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_decode($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') |
@@ -1133,9 +1132,9 @@ discard block |
||
| 1133 | 1132 | '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, |
| 1134 | 1133 | 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, |
| 1135 | 1134 | u.login as user_login, u.email as user_email |
| 1136 | - FROM ' . prefixTable('items') . ' as i |
|
| 1137 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1138 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1135 | + FROM ' . prefixTable('items').' as i |
|
| 1136 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1137 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1139 | 1138 | WHERE i.id=%i', |
| 1140 | 1139 | $inputData['itemId'] |
| 1141 | 1140 | ); |
@@ -1143,7 +1142,7 @@ discard block |
||
| 1143 | 1142 | // Should we log a password change? |
| 1144 | 1143 | $userKey = DB::queryFirstRow( |
| 1145 | 1144 | 'SELECT share_key |
| 1146 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1145 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1147 | 1146 | WHERE user_id = %i AND object_id = %i', |
| 1148 | 1147 | $session->get('user-id'), |
| 1149 | 1148 | $inputData['itemId'] |
@@ -1203,12 +1202,12 @@ discard block |
||
| 1203 | 1202 | (int) $inputData['folderId'], |
| 1204 | 1203 | (int) $inputData['itemId'], |
| 1205 | 1204 | $encrypted_password_key, |
| 1206 | - true, // only for the item creator |
|
| 1207 | - true, // delete all |
|
| 1205 | + true, // only for the item creator |
|
| 1206 | + true, // delete all |
|
| 1208 | 1207 | ); |
| 1209 | 1208 | |
| 1210 | 1209 | // Create a task to create sharekeys for users |
| 1211 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1210 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1212 | 1211 | $tasksToBePerformed = ['item_password']; |
| 1213 | 1212 | /*createTaskForItem( |
| 1214 | 1213 | 'item_update_create_keys', |
@@ -1227,7 +1226,7 @@ discard block |
||
| 1227 | 1226 | // Get list of tags |
| 1228 | 1227 | $itemTags = DB::queryFirstColumn( |
| 1229 | 1228 | 'SELECT tag |
| 1230 | - FROM ' . prefixTable('tags') . ' |
|
| 1229 | + FROM ' . prefixTable('tags').' |
|
| 1231 | 1230 | WHERE item_id = %i', |
| 1232 | 1231 | $inputData['itemId'] |
| 1233 | 1232 | ); |
@@ -1273,7 +1272,7 @@ discard block |
||
| 1273 | 1272 | $session->get('user-id'), |
| 1274 | 1273 | 'at_modification', |
| 1275 | 1274 | $session->get('user-login'), |
| 1276 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1275 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1277 | 1276 | ); |
| 1278 | 1277 | } |
| 1279 | 1278 | |
@@ -1313,8 +1312,8 @@ discard block |
||
| 1313 | 1312 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1314 | 1313 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1315 | 1314 | c.masked AS masked, i.id AS field_item_id |
| 1316 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1317 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1315 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1316 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1318 | 1317 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1319 | 1318 | $field['id'], |
| 1320 | 1319 | $inputData['itemId'] |
@@ -1330,7 +1329,7 @@ discard block |
||
| 1330 | 1329 | // Perform new query |
| 1331 | 1330 | $dataTmpCat = DB::queryFirstRow( |
| 1332 | 1331 | 'SELECT id, title, encrypted_data, masked |
| 1333 | - FROM ' . prefixTable('categories') . ' |
|
| 1332 | + FROM ' . prefixTable('categories').' |
|
| 1334 | 1333 | WHERE id = %i', |
| 1335 | 1334 | $field['id'] |
| 1336 | 1335 | ); |
@@ -1361,8 +1360,8 @@ discard block |
||
| 1361 | 1360 | (int) $inputData['folderId'], |
| 1362 | 1361 | (int) $newId, |
| 1363 | 1362 | $cryptedStuff['objectKey'], |
| 1364 | - true, // only for the item creator |
|
| 1365 | - true, // delete all |
|
| 1363 | + true, // only for the item creator |
|
| 1364 | + true, // delete all |
|
| 1366 | 1365 | ); |
| 1367 | 1366 | |
| 1368 | 1367 | // update value |
@@ -1410,7 +1409,7 @@ discard block |
||
| 1410 | 1409 | $session->get('user-id'), |
| 1411 | 1410 | 'at_modification', |
| 1412 | 1411 | $session->get('user-login'), |
| 1413 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1412 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1414 | 1413 | ); |
| 1415 | 1414 | } else { |
| 1416 | 1415 | // Case where the field already exists |
@@ -1419,7 +1418,7 @@ discard block |
||
| 1419 | 1418 | // Get user sharekey for this field |
| 1420 | 1419 | $userKey = DB::queryFirstRow( |
| 1421 | 1420 | 'SELECT share_key |
| 1422 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1421 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1423 | 1422 | WHERE user_id = %i AND object_id = %i', |
| 1424 | 1423 | $session->get('user-id'), |
| 1425 | 1424 | $dataTmpCat['field_item_id'] |
@@ -1459,8 +1458,8 @@ discard block |
||
| 1459 | 1458 | (int) $inputData['folderId'], |
| 1460 | 1459 | (int) $dataTmpCat['field_item_id'], |
| 1461 | 1460 | $cryptedStuff['objectKey'], |
| 1462 | - true, // only for the item creator |
|
| 1463 | - true, // delete all |
|
| 1461 | + true, // only for the item creator |
|
| 1462 | + true, // delete all |
|
| 1464 | 1463 | ); |
| 1465 | 1464 | |
| 1466 | 1465 | array_push( |
@@ -1500,7 +1499,7 @@ discard block |
||
| 1500 | 1499 | $session->get('user-id'), |
| 1501 | 1500 | 'at_modification', |
| 1502 | 1501 | $session->get('user-login'), |
| 1503 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1502 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1504 | 1503 | ); |
| 1505 | 1504 | } |
| 1506 | 1505 | } |
@@ -1555,7 +1554,7 @@ discard block |
||
| 1555 | 1554 | ) { |
| 1556 | 1555 | DB::queryFirstRow( |
| 1557 | 1556 | 'SELECT * |
| 1558 | - FROM ' . prefixTable('templates') . ' |
|
| 1557 | + FROM ' . prefixTable('templates').' |
|
| 1559 | 1558 | WHERE item_id = %i', |
| 1560 | 1559 | $inputData['itemId'] |
| 1561 | 1560 | ); |
@@ -1598,7 +1597,7 @@ discard block |
||
| 1598 | 1597 | // check if elem exists in Table. If not add it or update it. |
| 1599 | 1598 | DB::query( |
| 1600 | 1599 | 'SELECT * |
| 1601 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1600 | + FROM ' . prefixTable('automatic_del').' |
|
| 1602 | 1601 | WHERE item_id = %i', |
| 1603 | 1602 | $inputData['itemId'] |
| 1604 | 1603 | ); |
@@ -1625,7 +1624,7 @@ discard block |
||
| 1625 | 1624 | // Store updates performed |
| 1626 | 1625 | array_push( |
| 1627 | 1626 | $arrayOfChanges, |
| 1628 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1627 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1629 | 1628 | ); |
| 1630 | 1629 | |
| 1631 | 1630 | // update LOG |
@@ -1668,7 +1667,7 @@ discard block |
||
| 1668 | 1667 | // Store updates performed |
| 1669 | 1668 | array_push( |
| 1670 | 1669 | $arrayOfChanges, |
| 1671 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1670 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1672 | 1671 | ); |
| 1673 | 1672 | |
| 1674 | 1673 | // update LOG |
@@ -1701,7 +1700,7 @@ discard block |
||
| 1701 | 1700 | if (empty($userId) === false) { |
| 1702 | 1701 | $dataTmp = DB::queryfirstrow( |
| 1703 | 1702 | 'SELECT id, name, lastname |
| 1704 | - FROM ' . prefixTable('users') . ' |
|
| 1703 | + FROM ' . prefixTable('users').' |
|
| 1705 | 1704 | WHERE id= %i', |
| 1706 | 1705 | $userId |
| 1707 | 1706 | ); |
@@ -1709,7 +1708,7 @@ discard block |
||
| 1709 | 1708 | // Add to array |
| 1710 | 1709 | array_push( |
| 1711 | 1710 | $arrayOfUsersRestriction, |
| 1712 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1711 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1713 | 1712 | ); |
| 1714 | 1713 | array_push( |
| 1715 | 1714 | $arrayOfUsersIdRestriction, |
@@ -1740,8 +1739,8 @@ discard block |
||
| 1740 | 1739 | // get values before deleting them |
| 1741 | 1740 | $rows = DB::query( |
| 1742 | 1741 | 'SELECT t.title, t.id AS id |
| 1743 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1744 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1742 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1743 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1745 | 1744 | WHERE r.item_id = %i |
| 1746 | 1745 | ORDER BY t.title ASC', |
| 1747 | 1746 | $inputData['itemId'] |
@@ -1775,7 +1774,7 @@ discard block |
||
| 1775 | 1774 | ); |
| 1776 | 1775 | $dataTmp = DB::queryfirstrow( |
| 1777 | 1776 | 'SELECT title |
| 1778 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1777 | + FROM ' . prefixTable('roles_title').' |
|
| 1779 | 1778 | WHERE id = %i', |
| 1780 | 1779 | $role |
| 1781 | 1780 | ); |
@@ -1803,7 +1802,7 @@ discard block |
||
| 1803 | 1802 | // Get current status |
| 1804 | 1803 | $otpStatus = DB::queryFirstRow( |
| 1805 | 1804 | 'SELECT enabled as otp_is_enabled |
| 1806 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1805 | + FROM ' . prefixTable('items_otp').' |
|
| 1807 | 1806 | WHERE item_id = %i', |
| 1808 | 1807 | $inputData['itemId'] |
| 1809 | 1808 | ); |
@@ -1834,7 +1833,7 @@ discard block |
||
| 1834 | 1833 | $session->get('user-id'), |
| 1835 | 1834 | 'at_modification', |
| 1836 | 1835 | $session->get('user-login'), |
| 1837 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1836 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1838 | 1837 | ); |
| 1839 | 1838 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
| 1840 | 1839 | // Create the entry in items_otp table |
@@ -1878,8 +1877,8 @@ discard block |
||
| 1878 | 1877 | $session->get('user-id'), |
| 1879 | 1878 | 'at_modification', |
| 1880 | 1879 | $session->get('user-login'), |
| 1881 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1882 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1880 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1881 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1883 | 1882 | ); |
| 1884 | 1883 | } |
| 1885 | 1884 | |
@@ -1899,7 +1898,7 @@ discard block |
||
| 1899 | 1898 | $session->get('user-id'), |
| 1900 | 1899 | 'at_modification', |
| 1901 | 1900 | $session->get('user-login'), |
| 1902 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1901 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1903 | 1902 | ); |
| 1904 | 1903 | } |
| 1905 | 1904 | // LOGIN |
@@ -1918,7 +1917,7 @@ discard block |
||
| 1918 | 1917 | $session->get('user-id'), |
| 1919 | 1918 | 'at_modification', |
| 1920 | 1919 | $session->get('user-login'), |
| 1921 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1920 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1922 | 1921 | ); |
| 1923 | 1922 | } |
| 1924 | 1923 | |
@@ -1937,7 +1936,7 @@ discard block |
||
| 1937 | 1936 | $session->get('user-id'), |
| 1938 | 1937 | 'at_modification', |
| 1939 | 1938 | $session->get('user-login'), |
| 1940 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1939 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1941 | 1940 | ); |
| 1942 | 1941 | } |
| 1943 | 1942 | // URL |
@@ -1956,7 +1955,7 @@ discard block |
||
| 1956 | 1955 | $session->get('user-id'), |
| 1957 | 1956 | 'at_modification', |
| 1958 | 1957 | $session->get('user-login'), |
| 1959 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1958 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1960 | 1959 | ); |
| 1961 | 1960 | } |
| 1962 | 1961 | // DESCRIPTION |
@@ -1982,7 +1981,7 @@ discard block |
||
| 1982 | 1981 | // FOLDER |
| 1983 | 1982 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1984 | 1983 | // Get name of folders |
| 1985 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1984 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1986 | 1985 | |
| 1987 | 1986 | // Store updates performed |
| 1988 | 1987 | array_push( |
@@ -1998,7 +1997,7 @@ discard block |
||
| 1998 | 1997 | $session->get('user-id'), |
| 1999 | 1998 | 'at_modification', |
| 2000 | 1999 | $session->get('user-login'), |
| 2001 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 2000 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 2002 | 2001 | ); |
| 2003 | 2002 | } |
| 2004 | 2003 | // ANYONE_CAN_MODIFY |
@@ -2006,7 +2005,7 @@ discard block |
||
| 2006 | 2005 | // Store updates performed |
| 2007 | 2006 | array_push( |
| 2008 | 2007 | $arrayOfChanges, |
| 2009 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2008 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2010 | 2009 | ); |
| 2011 | 2010 | |
| 2012 | 2011 | // Log |
@@ -2017,15 +2016,15 @@ discard block |
||
| 2017 | 2016 | $session->get('user-id'), |
| 2018 | 2017 | 'at_modification', |
| 2019 | 2018 | $session->get('user-login'), |
| 2020 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2019 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2021 | 2020 | ); |
| 2022 | 2021 | } |
| 2023 | 2022 | |
| 2024 | 2023 | // Reload new values |
| 2025 | 2024 | $dataItem = DB::queryfirstrow( |
| 2026 | 2025 | 'SELECT * |
| 2027 | - FROM ' . prefixTable('items') . ' as i |
|
| 2028 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2026 | + FROM ' . prefixTable('items').' as i |
|
| 2027 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2029 | 2028 | WHERE i.id = %i AND l.action = %s', |
| 2030 | 2029 | $inputData['itemId'], |
| 2031 | 2030 | 'at_creation' |
@@ -2034,8 +2033,8 @@ discard block |
||
| 2034 | 2033 | $history = ''; |
| 2035 | 2034 | $rows = DB::query( |
| 2036 | 2035 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2037 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2038 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2036 | + FROM ' . prefixTable('log_items').' as l |
|
| 2037 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2039 | 2038 | WHERE l.action <> %s AND id_item=%s', |
| 2040 | 2039 | 'at_shown', |
| 2041 | 2040 | $inputData['itemId'] |
@@ -2044,14 +2043,14 @@ discard block |
||
| 2044 | 2043 | if ($record['raison'] === NULL) continue; |
| 2045 | 2044 | $reason = explode(':', $record['raison']); |
| 2046 | 2045 | if (count($reason) > 0) { |
| 2047 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2048 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2049 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2046 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2047 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2048 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2050 | 2049 | : $lang->get(trim($reason[0]))) : ''); |
| 2051 | 2050 | if (empty($history)) { |
| 2052 | 2051 | $history = $sentence; |
| 2053 | 2052 | } else { |
| 2054 | - $history .= '<br />' . $sentence; |
|
| 2053 | + $history .= '<br />'.$sentence; |
|
| 2055 | 2054 | } |
| 2056 | 2055 | } |
| 2057 | 2056 | } |
@@ -2187,7 +2186,7 @@ discard block |
||
| 2187 | 2186 | ) { |
| 2188 | 2187 | // load the original record into an array |
| 2189 | 2188 | $originalRecord = DB::queryfirstrow( |
| 2190 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2189 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2191 | 2190 | WHERE id = %i', |
| 2192 | 2191 | $inputData['itemId'] |
| 2193 | 2192 | ); |
@@ -2206,7 +2205,7 @@ discard block |
||
| 2206 | 2205 | |
| 2207 | 2206 | // Load the destination folder record into an array |
| 2208 | 2207 | $dataDestination = DB::queryfirstrow( |
| 2209 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2208 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2210 | 2209 | WHERE id = %i', |
| 2211 | 2210 | $post_dest_id |
| 2212 | 2211 | ); |
@@ -2214,7 +2213,7 @@ discard block |
||
| 2214 | 2213 | // Get the ITEM object key for the user |
| 2215 | 2214 | $userKey = DB::queryFirstRow( |
| 2216 | 2215 | 'SELECT share_key |
| 2217 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2216 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2218 | 2217 | WHERE user_id = %i AND object_id = %i', |
| 2219 | 2218 | $session->get('user-id'), |
| 2220 | 2219 | $inputData['itemId'] |
@@ -2291,8 +2290,8 @@ discard block |
||
| 2291 | 2290 | // Manage Custom Fields |
| 2292 | 2291 | $rows = DB::query( |
| 2293 | 2292 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2294 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2295 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2293 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2294 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2296 | 2295 | WHERE ci.item_id = %i', |
| 2297 | 2296 | $inputData['itemId'] |
| 2298 | 2297 | ); |
@@ -2304,7 +2303,7 @@ discard block |
||
| 2304 | 2303 | // Get user key |
| 2305 | 2304 | $userKey = DB::queryFirstRow( |
| 2306 | 2305 | 'SELECT share_key |
| 2307 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2306 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2308 | 2307 | WHERE user_id = %i AND object_id = %i', |
| 2309 | 2308 | $session->get('user-id'), |
| 2310 | 2309 | $field['id'] |
@@ -2372,15 +2371,15 @@ discard block |
||
| 2372 | 2371 | $rows = DB::query( |
| 2373 | 2372 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2374 | 2373 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2375 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2376 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2374 | + FROM ' . prefixTable('files').' AS f |
|
| 2375 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2377 | 2376 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2378 | 2377 | $session->get('user-id'), |
| 2379 | 2378 | $inputData['itemId'] |
| 2380 | 2379 | ); |
| 2381 | 2380 | foreach ($rows as $record) { |
| 2382 | 2381 | // Check if file still exists |
| 2383 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2382 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2384 | 2383 | // Step1 - decrypt the file |
| 2385 | 2384 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2386 | 2385 | $fileContent = decryptFile( |
@@ -2391,8 +2390,8 @@ discard block |
||
| 2391 | 2390 | |
| 2392 | 2391 | // Step2 - create file |
| 2393 | 2392 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2394 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2395 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2393 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2394 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2396 | 2395 | if ($outstream === false) { |
| 2397 | 2396 | echo prepareExchangedData( |
| 2398 | 2397 | array( |
@@ -2467,7 +2466,7 @@ discard block |
||
| 2467 | 2466 | |
| 2468 | 2467 | // ------------------------- |
| 2469 | 2468 | // Add specific restrictions |
| 2470 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2469 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2471 | 2470 | foreach ($rows as $record) { |
| 2472 | 2471 | DB::insert( |
| 2473 | 2472 | prefixTable('restriction_to_roles'), |
@@ -2479,7 +2478,7 @@ discard block |
||
| 2479 | 2478 | } |
| 2480 | 2479 | |
| 2481 | 2480 | // Add Tags |
| 2482 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2481 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2483 | 2482 | foreach ($rows as $record) { |
| 2484 | 2483 | DB::insert( |
| 2485 | 2484 | prefixTable('tags'), |
@@ -2509,7 +2508,7 @@ discard block |
||
| 2509 | 2508 | $session->get('user-login') |
| 2510 | 2509 | ); |
| 2511 | 2510 | // reload cache table |
| 2512 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 2511 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 2513 | 2512 | updateCacheTable('reload', null); |
| 2514 | 2513 | |
| 2515 | 2514 | echo (string) prepareExchangedData( |
@@ -2580,7 +2579,7 @@ discard block |
||
| 2580 | 2579 | // then we can show it |
| 2581 | 2580 | $item_deleted = DB::queryFirstRow( |
| 2582 | 2581 | 'SELECT * |
| 2583 | - FROM ' . prefixTable('log_items') . ' |
|
| 2582 | + FROM ' . prefixTable('log_items').' |
|
| 2584 | 2583 | WHERE id_item = %i AND action = %s |
| 2585 | 2584 | ORDER BY date DESC |
| 2586 | 2585 | LIMIT 0, 1', |
@@ -2591,7 +2590,7 @@ discard block |
||
| 2591 | 2590 | |
| 2592 | 2591 | $item_restored = DB::queryFirstRow( |
| 2593 | 2592 | 'SELECT * |
| 2594 | - FROM ' . prefixTable('log_items') . ' |
|
| 2593 | + FROM ' . prefixTable('log_items').' |
|
| 2595 | 2594 | WHERE id_item = %i AND action = %s |
| 2596 | 2595 | ORDER BY date DESC |
| 2597 | 2596 | LIMIT 0, 1', |
@@ -2615,8 +2614,8 @@ discard block |
||
| 2615 | 2614 | // Get all informations for this item |
| 2616 | 2615 | $dataItem = DB::queryfirstrow( |
| 2617 | 2616 | 'SELECT * |
| 2618 | - FROM ' . prefixTable('items') . ' as i |
|
| 2619 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2617 | + FROM ' . prefixTable('items').' as i |
|
| 2618 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2620 | 2619 | WHERE i.id = %i AND l.action = %s', |
| 2621 | 2620 | $inputData['id'], |
| 2622 | 2621 | 'at_creation' |
@@ -2625,7 +2624,7 @@ discard block |
||
| 2625 | 2624 | // Notification |
| 2626 | 2625 | DB::queryfirstrow( |
| 2627 | 2626 | 'SELECT * |
| 2628 | - FROM ' . prefixTable('notification') . ' |
|
| 2627 | + FROM ' . prefixTable('notification').' |
|
| 2629 | 2628 | WHERE item_id = %i AND user_id = %i', |
| 2630 | 2629 | $inputData['id'], |
| 2631 | 2630 | $session->get('user-id') |
@@ -2668,7 +2667,7 @@ discard block |
||
| 2668 | 2667 | |
| 2669 | 2668 | // manage case of API user |
| 2670 | 2669 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2671 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2670 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2672 | 2671 | $arrData['id_user'] = API_USER_ID; |
| 2673 | 2672 | $arrData['author_email'] = ''; |
| 2674 | 2673 | $arrData['notification_status'] = false; |
@@ -2678,7 +2677,7 @@ discard block |
||
| 2678 | 2677 | $tags = array(); |
| 2679 | 2678 | $rows = DB::query( |
| 2680 | 2679 | 'SELECT tag |
| 2681 | - FROM ' . prefixTable('tags') . ' |
|
| 2680 | + FROM ' . prefixTable('tags').' |
|
| 2682 | 2681 | WHERE item_id = %i', |
| 2683 | 2682 | $inputData['id'] |
| 2684 | 2683 | ); |
@@ -2703,7 +2702,7 @@ discard block |
||
| 2703 | 2702 | // Check if user has a role that is accepted |
| 2704 | 2703 | $rows_tmp = DB::query( |
| 2705 | 2704 | 'SELECT role_id |
| 2706 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2705 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2707 | 2706 | WHERE item_id=%i', |
| 2708 | 2707 | $inputData['id'] |
| 2709 | 2708 | ); |
@@ -2717,7 +2716,7 @@ discard block |
||
| 2717 | 2716 | // Get the object key for the user |
| 2718 | 2717 | $userKey = DB::queryFirstRow( |
| 2719 | 2718 | 'SELECT share_key |
| 2720 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2719 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2721 | 2720 | WHERE user_id = %i AND object_id = %i', |
| 2722 | 2721 | $session->get('user-id'), |
| 2723 | 2722 | $inputData['id'] |
@@ -2827,8 +2826,8 @@ discard block |
||
| 2827 | 2826 | // Add restriction if item is restricted to roles |
| 2828 | 2827 | $rows = DB::query( |
| 2829 | 2828 | 'SELECT t.title, t.id |
| 2830 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2831 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2829 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2830 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2832 | 2831 | WHERE r.item_id = %i |
| 2833 | 2832 | ORDER BY t.title ASC', |
| 2834 | 2833 | $inputData['id'] |
@@ -2844,8 +2843,8 @@ discard block |
||
| 2844 | 2843 | $tmp = array(); |
| 2845 | 2844 | $rows = DB::query( |
| 2846 | 2845 | 'SELECT k.label, k.id |
| 2847 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2848 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2846 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2847 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2849 | 2848 | WHERE i.item_id = %i |
| 2850 | 2849 | ORDER BY k.label ASC', |
| 2851 | 2850 | $inputData['id'] |
@@ -2928,7 +2927,7 @@ discard block |
||
| 2928 | 2927 | $arrCatList = array(); |
| 2929 | 2928 | $rows_tmp = DB::query( |
| 2930 | 2929 | 'SELECT id_category |
| 2931 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2930 | + FROM ' . prefixTable('categories_folders').' |
|
| 2932 | 2931 | WHERE id_folder=%i', |
| 2933 | 2932 | $inputData['folderId'] |
| 2934 | 2933 | ); |
@@ -2943,8 +2942,8 @@ discard block |
||
| 2943 | 2942 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2944 | 2943 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2945 | 2944 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2946 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2947 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2945 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2946 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2948 | 2947 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2949 | 2948 | $inputData['id'], |
| 2950 | 2949 | $arrCatList |
@@ -2955,7 +2954,7 @@ discard block |
||
| 2955 | 2954 | //db::debugmode(true); |
| 2956 | 2955 | $userKey = DB::queryFirstRow( |
| 2957 | 2956 | 'SELECT share_key |
| 2958 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2957 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2959 | 2958 | WHERE user_id = %i AND object_id = %i', |
| 2960 | 2959 | $session->get('user-id'), |
| 2961 | 2960 | $row['id'] |
@@ -2973,7 +2972,7 @@ discard block |
||
| 2973 | 2972 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2974 | 2973 | // Data is not encrypted in DB |
| 2975 | 2974 | $fieldText = [ |
| 2976 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2975 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2977 | 2976 | 'encrypted' => false, |
| 2978 | 2977 | 'error' => false, |
| 2979 | 2978 | ]; |
@@ -3018,7 +3017,7 @@ discard block |
||
| 3018 | 3017 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 3019 | 3018 | $rows_tmp = DB::queryfirstrow( |
| 3020 | 3019 | 'SELECT category_id |
| 3021 | - FROM ' . prefixTable('templates') . ' |
|
| 3020 | + FROM ' . prefixTable('templates').' |
|
| 3022 | 3021 | WHERE item_id = %i', |
| 3023 | 3022 | $inputData['id'] |
| 3024 | 3023 | ); |
@@ -3035,7 +3034,7 @@ discard block |
||
| 3035 | 3034 | // Evaluate if item is ready for all users |
| 3036 | 3035 | $rows_tmp = DB::queryfirstrow( |
| 3037 | 3036 | 'SELECT finished_at |
| 3038 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3037 | + FROM ' . prefixTable('background_tasks').' |
|
| 3039 | 3038 | WHERE item_id = %i', |
| 3040 | 3039 | $inputData['id'] |
| 3041 | 3040 | ); |
@@ -3052,7 +3051,7 @@ discard block |
||
| 3052 | 3051 | // Is the Item to be deleted? |
| 3053 | 3052 | $dataDelete = DB::queryfirstrow( |
| 3054 | 3053 | 'SELECT * |
| 3055 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3054 | + FROM ' . prefixTable('automatic_del').' |
|
| 3056 | 3055 | WHERE item_id = %i', |
| 3057 | 3056 | $inputData['id'] |
| 3058 | 3057 | ); |
@@ -3131,11 +3130,11 @@ discard block |
||
| 3131 | 3130 | if (empty($dataItem['restricted_to']) === false) { |
| 3132 | 3131 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 3133 | 3132 | if (empty($userRest) === false) { |
| 3134 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 3133 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 3135 | 3134 | if (empty($listOfRestricted)) { |
| 3136 | 3135 | $listOfRestricted = $dataTmp['login']; |
| 3137 | 3136 | } else { |
| 3138 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3137 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3139 | 3138 | } |
| 3140 | 3139 | } |
| 3141 | 3140 | } |
@@ -3209,9 +3208,9 @@ discard block |
||
| 3209 | 3208 | // Load item data |
| 3210 | 3209 | $dataItem = DB::queryFirstRow( |
| 3211 | 3210 | '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 |
| 3212 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3213 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3214 | - INNER JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3211 | + FROM ' . prefixTable('items').' AS i |
|
| 3212 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3213 | + INNER JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3215 | 3214 | WHERE i.id = %i', |
| 3216 | 3215 | $inputData['id'] |
| 3217 | 3216 | ); |
@@ -3233,7 +3232,7 @@ discard block |
||
| 3233 | 3232 | // Check if user has a role that is accepted |
| 3234 | 3233 | $rows_tmp = DB::query( |
| 3235 | 3234 | 'SELECT role_id |
| 3236 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3235 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3237 | 3236 | WHERE item_id=%i', |
| 3238 | 3237 | $inputData['id'] |
| 3239 | 3238 | ); |
@@ -3265,12 +3264,12 @@ discard block |
||
| 3265 | 3264 | // launch query |
| 3266 | 3265 | $rows = DB::query( |
| 3267 | 3266 | 'SELECT id, name, file, extension, size |
| 3268 | - FROM ' . prefixTable('files') . ' |
|
| 3267 | + FROM ' . prefixTable('files').' |
|
| 3269 | 3268 | WHERE id_item = %i AND confirmed = 1', |
| 3270 | 3269 | $inputData['id'] |
| 3271 | 3270 | ); |
| 3272 | 3271 | foreach ($rows as $record) { |
| 3273 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3272 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3274 | 3273 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3275 | 3274 | |
| 3276 | 3275 | array_push( |
@@ -3283,7 +3282,7 @@ discard block |
||
| 3283 | 3282 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3284 | 3283 | 'id' => $record['id'], |
| 3285 | 3284 | 'key' => $session->get('user-key_tmp'), |
| 3286 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3285 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3287 | 3286 | ) |
| 3288 | 3287 | ); |
| 3289 | 3288 | } |
@@ -3321,7 +3320,7 @@ discard block |
||
| 3321 | 3320 | array( |
| 3322 | 3321 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3323 | 3322 | ), |
| 3324 | - 'id=' . $session->get('user-id') |
|
| 3323 | + 'id='.$session->get('user-id') |
|
| 3325 | 3324 | ); |
| 3326 | 3325 | } |
| 3327 | 3326 | |
@@ -3330,8 +3329,8 @@ discard block |
||
| 3330 | 3329 | $listOptionsForRoles = array(); |
| 3331 | 3330 | $rows = DB::query( |
| 3332 | 3331 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3333 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3334 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3332 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3333 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3335 | 3334 | WHERE r.folder_id = %i', |
| 3336 | 3335 | $dataItem['id_tree'] |
| 3337 | 3336 | ); |
@@ -3345,9 +3344,9 @@ discard block |
||
| 3345 | 3344 | ); |
| 3346 | 3345 | $rows2 = DB::query( |
| 3347 | 3346 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3348 | - FROM ' . prefixTable('users') . ' |
|
| 3347 | + FROM ' . prefixTable('users').' |
|
| 3349 | 3348 | WHERE fonction_id LIKE %s', |
| 3350 | - '%' . $record['role_id'] . '%' |
|
| 3349 | + '%'.$record['role_id'].'%' |
|
| 3351 | 3350 | ); |
| 3352 | 3351 | foreach ($rows2 as $record2) { |
| 3353 | 3352 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3360,7 +3359,7 @@ discard block |
||
| 3360 | 3359 | array( |
| 3361 | 3360 | 'id' => (int) $record2['id'], |
| 3362 | 3361 | 'login' => $record2['login'], |
| 3363 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3362 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3364 | 3363 | 'email' => $record2['email'], |
| 3365 | 3364 | ) |
| 3366 | 3365 | ); |
@@ -3379,16 +3378,16 @@ discard block |
||
| 3379 | 3378 | $path = ''; |
| 3380 | 3379 | foreach ($arbo as $elem) { |
| 3381 | 3380 | if (empty($path) === true) { |
| 3382 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3381 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3383 | 3382 | } else { |
| 3384 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3383 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3385 | 3384 | } |
| 3386 | 3385 | } |
| 3387 | 3386 | // Build text to show user |
| 3388 | 3387 | if (empty($path) === true) { |
| 3389 | 3388 | $path = addslashes($dataItem['label']); |
| 3390 | 3389 | } else { |
| 3391 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3390 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3392 | 3391 | } |
| 3393 | 3392 | |
| 3394 | 3393 | // Add Admins to notification list if expected |
@@ -3411,7 +3410,7 @@ discard block |
||
| 3411 | 3410 | array( |
| 3412 | 3411 | addslashes($session->get('user-login')), |
| 3413 | 3412 | $path, |
| 3414 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3413 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3415 | 3414 | ), |
| 3416 | 3415 | $lang->get('email_on_open_notification_mail') |
| 3417 | 3416 | ), |
@@ -3421,7 +3420,7 @@ discard block |
||
| 3421 | 3420 | } |
| 3422 | 3421 | |
| 3423 | 3422 | // has this item a change proposal |
| 3424 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3423 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3425 | 3424 | $returnArray['has_change_proposal'] = DB::count(); |
| 3426 | 3425 | |
| 3427 | 3426 | // Setting |
@@ -3432,7 +3431,7 @@ discard block |
||
| 3432 | 3431 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3433 | 3432 | DB::query( |
| 3434 | 3433 | 'SELECT * |
| 3435 | - FROM ' . prefixTable('otv') . ' |
|
| 3434 | + FROM ' . prefixTable('otv').' |
|
| 3436 | 3435 | WHERE item_id = %i |
| 3437 | 3436 | AND time_limit > %i', |
| 3438 | 3437 | $inputData['id'], |
@@ -3532,7 +3531,7 @@ discard block |
||
| 3532 | 3531 | // Load item data |
| 3533 | 3532 | $data = DB::queryFirstRow( |
| 3534 | 3533 | 'SELECT id_tree, id, label |
| 3535 | - FROM ' . prefixTable('items') . ' |
|
| 3534 | + FROM ' . prefixTable('items').' |
|
| 3536 | 3535 | WHERE id = %i OR item_key = %s', |
| 3537 | 3536 | $inputData['itemId'], |
| 3538 | 3537 | $inputData['itemKey'] |
@@ -3623,7 +3622,7 @@ discard block |
||
| 3623 | 3622 | // Load item data |
| 3624 | 3623 | $dataItem = DB::queryFirstRow( |
| 3625 | 3624 | 'SELECT secret, enabled |
| 3626 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3625 | + FROM ' . prefixTable('items_otp').' |
|
| 3627 | 3626 | WHERE item_id = %i', |
| 3628 | 3627 | $inputData['id'] |
| 3629 | 3628 | ); |
@@ -3705,13 +3704,13 @@ discard block |
||
| 3705 | 3704 | |
| 3706 | 3705 | // Check if user is allowed to access this folder |
| 3707 | 3706 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3708 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3707 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3709 | 3708 | break; |
| 3710 | 3709 | } |
| 3711 | 3710 | |
| 3712 | 3711 | // Check if title doesn't contains html codes |
| 3713 | 3712 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3714 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3713 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3715 | 3714 | break; |
| 3716 | 3715 | } |
| 3717 | 3716 | // check that title is not numeric |
@@ -3722,9 +3721,9 @@ discard block |
||
| 3722 | 3721 | |
| 3723 | 3722 | // Check if duplicate folders name are allowed |
| 3724 | 3723 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3725 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3724 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3726 | 3725 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3727 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3726 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3728 | 3727 | break; |
| 3729 | 3728 | } |
| 3730 | 3729 | } |
@@ -3732,7 +3731,7 @@ discard block |
||
| 3732 | 3731 | // query on folder |
| 3733 | 3732 | $data = DB::queryfirstrow( |
| 3734 | 3733 | 'SELECT parent_id, personal_folder |
| 3735 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3734 | + FROM ' . prefixTable('nested_tree').' |
|
| 3736 | 3735 | WHERE id = %i', |
| 3737 | 3736 | $inputData['folderId'] |
| 3738 | 3737 | ); |
@@ -3742,20 +3741,20 @@ discard block |
||
| 3742 | 3741 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3743 | 3742 | $data = DB::queryfirstrow( |
| 3744 | 3743 | 'SELECT valeur |
| 3745 | - FROM ' . prefixTable('misc') . ' |
|
| 3744 | + FROM ' . prefixTable('misc').' |
|
| 3746 | 3745 | WHERE intitule = %i AND type = %s', |
| 3747 | 3746 | $data['parent_id'], |
| 3748 | 3747 | 'complex' |
| 3749 | 3748 | ); |
| 3750 | 3749 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3751 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3750 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3752 | 3751 | break; |
| 3753 | 3752 | } |
| 3754 | 3753 | } |
| 3755 | 3754 | |
| 3756 | 3755 | // update Folders table |
| 3757 | 3756 | $tmp = DB::queryFirstRow( |
| 3758 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3757 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3759 | 3758 | $dataReceived['folder'] |
| 3760 | 3759 | ); |
| 3761 | 3760 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3824,42 +3823,42 @@ discard block |
||
| 3824 | 3823 | in_array($post_target_folder_id, $session->get('user-accessible_folders')) === false) && ($post_target_folder_id === '0' && |
| 3825 | 3824 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3826 | 3825 | ) { |
| 3827 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3826 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3828 | 3827 | echo $returnValues; |
| 3829 | 3828 | break; |
| 3830 | 3829 | } |
| 3831 | 3830 | |
| 3832 | 3831 | $tmp_source = DB::queryFirstRow( |
| 3833 | 3832 | 'SELECT title, parent_id, personal_folder |
| 3834 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3833 | + FROM ' . prefixTable('nested_tree').' |
|
| 3835 | 3834 | WHERE id = %i', |
| 3836 | 3835 | $post_source_folder_id |
| 3837 | 3836 | ); |
| 3838 | 3837 | |
| 3839 | 3838 | $tmp_target = DB::queryFirstRow( |
| 3840 | 3839 | 'SELECT title, parent_id, personal_folder |
| 3841 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3840 | + FROM ' . prefixTable('nested_tree').' |
|
| 3842 | 3841 | WHERE id = %i', |
| 3843 | 3842 | $post_target_folder_id |
| 3844 | 3843 | ); |
| 3845 | 3844 | |
| 3846 | 3845 | // check if target is not a child of source |
| 3847 | 3846 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3848 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3847 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3849 | 3848 | echo $returnValues; |
| 3850 | 3849 | break; |
| 3851 | 3850 | } |
| 3852 | 3851 | |
| 3853 | 3852 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3854 | 3853 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3855 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3854 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3856 | 3855 | echo $returnValues; |
| 3857 | 3856 | break; |
| 3858 | 3857 | } |
| 3859 | 3858 | |
| 3860 | 3859 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3861 | 3860 | if ($tmp_source['title'] === $session->get('user-id') || $tmp_target['title'] === $session->get('user-id')) { |
| 3862 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3861 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3863 | 3862 | echo $returnValues; |
| 3864 | 3863 | break; |
| 3865 | 3864 | } |
@@ -3980,7 +3979,7 @@ discard block |
||
| 3980 | 3979 | $uniqueLoadData['path'] = $arr_arbo; |
| 3981 | 3980 | |
| 3982 | 3981 | // store last folder accessed in cookie |
| 3983 | - $arr_cookie_options = array ( |
|
| 3982 | + $arr_cookie_options = array( |
|
| 3984 | 3983 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3985 | 3984 | 'path' => '/', |
| 3986 | 3985 | 'secure' => true, |
@@ -3995,7 +3994,7 @@ discard block |
||
| 3995 | 3994 | foreach ($session->get('user-roles_array') as $role) { |
| 3996 | 3995 | $roleQ = DB::queryfirstrow( |
| 3997 | 3996 | 'SELECT allow_pw_change |
| 3998 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3997 | + FROM ' . prefixTable('roles_title').' |
|
| 3999 | 3998 | WHERE id = %i', |
| 4000 | 3999 | $role |
| 4001 | 4000 | ); |
@@ -4026,11 +4025,11 @@ discard block |
||
| 4026 | 4025 | |
| 4027 | 4026 | foreach ($session->get('user-roles_array') as $role) { |
| 4028 | 4027 | $access = DB::queryFirstRow( |
| 4029 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 4028 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 4030 | 4029 | $role, |
| 4031 | 4030 | $inputData['id'] |
| 4032 | 4031 | ); |
| 4033 | - if (DB::count()>0) { |
|
| 4032 | + if (DB::count() > 0) { |
|
| 4034 | 4033 | if ($access['type'] === 'R') { |
| 4035 | 4034 | array_push($arrTmp, 10); |
| 4036 | 4035 | } elseif ($access['type'] === 'W') { |
@@ -4088,7 +4087,7 @@ discard block |
||
| 4088 | 4087 | } else { |
| 4089 | 4088 | DB::query( |
| 4090 | 4089 | 'SELECT * |
| 4091 | - FROM ' . prefixTable('items') . ' |
|
| 4090 | + FROM ' . prefixTable('items').' |
|
| 4092 | 4091 | WHERE inactif = %i', |
| 4093 | 4092 | 0 |
| 4094 | 4093 | ); |
@@ -4098,7 +4097,7 @@ discard block |
||
| 4098 | 4097 | |
| 4099 | 4098 | // Get folder complexity |
| 4100 | 4099 | $folderComplexity = DB::queryFirstRow( |
| 4101 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4100 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4102 | 4101 | 'complex', |
| 4103 | 4102 | $inputData['id'] |
| 4104 | 4103 | ); |
@@ -4110,7 +4109,7 @@ discard block |
||
| 4110 | 4109 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4111 | 4110 | $folderRow = DB::query( |
| 4112 | 4111 | 'SELECT id_category |
| 4113 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4112 | + FROM ' . prefixTable('categories_folders').' |
|
| 4114 | 4113 | WHERE id_folder = %i', |
| 4115 | 4114 | $inputData['id'] |
| 4116 | 4115 | ); |
@@ -4225,13 +4224,13 @@ discard block |
||
| 4225 | 4224 | // List all ITEMS |
| 4226 | 4225 | if ($folderIsPf === false) { |
| 4227 | 4226 | $where->add('i.inactif=%i', 0); |
| 4228 | - $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
| 4227 | + $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
| 4229 | 4228 | if (empty($limited_to_items) === false) { |
| 4230 | 4229 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 4231 | 4230 | } |
| 4232 | 4231 | |
| 4233 | - $query_limit = ' LIMIT ' . |
|
| 4234 | - $start . ',' . |
|
| 4232 | + $query_limit = ' LIMIT '. |
|
| 4233 | + $start.','. |
|
| 4235 | 4234 | $post_nb_items_to_display_once; |
| 4236 | 4235 | //db::debugmode(true); |
| 4237 | 4236 | $rows = DB::query( |
@@ -4243,9 +4242,9 @@ discard block |
||
| 4243 | 4242 | l.id_user AS log_user, |
| 4244 | 4243 | i.url AS link, |
| 4245 | 4244 | i.email AS email |
| 4246 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4247 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4248 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4245 | + FROM ' . prefixTable('items').' AS i |
|
| 4246 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4247 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4249 | 4248 | WHERE %l |
| 4250 | 4249 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4251 | 4250 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4265,9 +4264,9 @@ discard block |
||
| 4265 | 4264 | l.id_user AS log_user, |
| 4266 | 4265 | i.url AS link, |
| 4267 | 4266 | i.email AS email |
| 4268 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4269 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4270 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4267 | + FROM ' . prefixTable('items').' AS i |
|
| 4268 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4269 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4271 | 4270 | WHERE %l |
| 4272 | 4271 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4273 | 4272 | ORDER BY i.label ASC, l.date DESC', |
@@ -4298,7 +4297,7 @@ discard block |
||
| 4298 | 4297 | $item_is_restricted_to_role = false; |
| 4299 | 4298 | DB::queryfirstrow( |
| 4300 | 4299 | 'SELECT role_id |
| 4301 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4300 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4302 | 4301 | WHERE item_id = %i', |
| 4303 | 4302 | $record['id'] |
| 4304 | 4303 | ); |
@@ -4310,7 +4309,7 @@ discard block |
||
| 4310 | 4309 | $user_is_included_in_role = false; |
| 4311 | 4310 | DB::query( |
| 4312 | 4311 | 'SELECT role_id |
| 4313 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4312 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4314 | 4313 | WHERE item_id = %i AND role_id IN %ls', |
| 4315 | 4314 | $record['id'], |
| 4316 | 4315 | $session->get('user-roles_array') |
@@ -4517,9 +4516,9 @@ discard block |
||
| 4517 | 4516 | if ((int) $start === 0) { |
| 4518 | 4517 | DB::query( |
| 4519 | 4518 | 'SELECT i.id |
| 4520 | - FROM ' . prefixTable('items') . ' as i |
|
| 4521 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4522 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4519 | + FROM ' . prefixTable('items').' as i |
|
| 4520 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4521 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4523 | 4522 | WHERE %l |
| 4524 | 4523 | ORDER BY i.label ASC, l.date DESC', |
| 4525 | 4524 | $where |
@@ -4583,8 +4582,8 @@ discard block |
||
| 4583 | 4582 | // Run query |
| 4584 | 4583 | $dataItem = DB::queryfirstrow( |
| 4585 | 4584 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4586 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4587 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4585 | + FROM ' . prefixTable('items').' AS i |
|
| 4586 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4588 | 4587 | WHERE user_id = %i AND i.item_key = %s', |
| 4589 | 4588 | $session->get('user-id'), |
| 4590 | 4589 | $inputData['itemKey'] |
@@ -4636,7 +4635,7 @@ discard block |
||
| 4636 | 4635 | // get if existing edition lock |
| 4637 | 4636 | $dataItemEditionLocks = DB::query( |
| 4638 | 4637 | 'SELECT timestamp, user_id |
| 4639 | - FROM ' . prefixTable('items_edition') . ' |
|
| 4638 | + FROM ' . prefixTable('items_edition').' |
|
| 4640 | 4639 | WHERE item_id = %i |
| 4641 | 4640 | ORDER BY increment_id DESC', |
| 4642 | 4641 | $inputData['itemId'] |
@@ -4645,7 +4644,7 @@ discard block |
||
| 4645 | 4644 | if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
| 4646 | 4645 | |
| 4647 | 4646 | // Check if item has no edition lock |
| 4648 | - if ((int) DB::count() > 0 ) { |
|
| 4647 | + if ((int) DB::count() > 0) { |
|
| 4649 | 4648 | // get last edition lock |
| 4650 | 4649 | $dataLastItemEditionLock = $dataItemEditionLocks[0]; |
| 4651 | 4650 | |
@@ -4655,10 +4654,10 @@ discard block |
||
| 4655 | 4654 | } else { |
| 4656 | 4655 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4657 | 4656 | } |
| 4658 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4657 | + if (WIP === true) error_log('delay: '.$delay); |
|
| 4659 | 4658 | |
| 4660 | 4659 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4661 | - if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
|
| 4660 | + if (round(abs(time() - $dataTmp['timestamp']), 0) > $delay) { |
|
| 4662 | 4661 | // Case where time is expired |
| 4663 | 4662 | // In this case, delete edition lock and possible ongoing processes |
| 4664 | 4663 | // and continue editing this time |
@@ -4675,7 +4674,7 @@ discard block |
||
| 4675 | 4674 | // Get process Id |
| 4676 | 4675 | $processDetail = DB::queryFirstRow( |
| 4677 | 4676 | 'SELECT increment_id |
| 4678 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4677 | + FROM ' . prefixTable('background_tasks').' |
|
| 4679 | 4678 | WHERE item_id = %i AND finished_at = ""', |
| 4680 | 4679 | $inputData['itemId'] |
| 4681 | 4680 | ); |
@@ -4693,7 +4692,7 @@ discard block |
||
| 4693 | 4692 | // get if existing process ongoing for this item |
| 4694 | 4693 | $dataItemProcessOngoing = DB::queryFirstRow( |
| 4695 | 4694 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 4696 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4695 | + FROM ' . prefixTable('background_tasks').' |
|
| 4697 | 4696 | WHERE item_id = %i AND finished_at = "" |
| 4698 | 4697 | ORDER BY increment_id DESC', |
| 4699 | 4698 | $inputData['itemId'] |
@@ -4720,7 +4719,7 @@ discard block |
||
| 4720 | 4719 | ); |
| 4721 | 4720 | break; |
| 4722 | 4721 | } |
| 4723 | - } elseif (round(abs(time() - $dataTmp['timestamp']),0) <= $delay) { |
|
| 4722 | + } elseif (round(abs(time() - $dataTmp['timestamp']), 0) <= $delay) { |
|
| 4724 | 4723 | // Case where edition lock is already taken by another user |
| 4725 | 4724 | // Then no edition is possible |
| 4726 | 4725 | $returnValues = array( |
@@ -4749,7 +4748,7 @@ discard block |
||
| 4749 | 4748 | // do query on this folder |
| 4750 | 4749 | $data_this_folder = DB::queryFirstRow( |
| 4751 | 4750 | 'SELECT id, personal_folder, title |
| 4752 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4751 | + FROM ' . prefixTable('nested_tree').' |
|
| 4753 | 4752 | WHERE id = %s', |
| 4754 | 4753 | $inputData['folderId'] |
| 4755 | 4754 | ); |
@@ -4789,8 +4788,8 @@ discard block |
||
| 4789 | 4788 | $visibilite = ''; |
| 4790 | 4789 | $data = DB::queryFirstRow( |
| 4791 | 4790 | 'SELECT m.valeur, n.personal_folder |
| 4792 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4793 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4791 | + FROM ' . prefixTable('misc').' AS m |
|
| 4792 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4794 | 4793 | WHERE type=%s AND intitule = %s', |
| 4795 | 4794 | 'complex', |
| 4796 | 4795 | $inputData['folderId'] |
@@ -4803,8 +4802,8 @@ discard block |
||
| 4803 | 4802 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4804 | 4803 | $rows = DB::query( |
| 4805 | 4804 | 'SELECT t.title |
| 4806 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4807 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4805 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4806 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4808 | 4807 | WHERE v.folder_id = %i |
| 4809 | 4808 | GROUP BY title', |
| 4810 | 4809 | $inputData['folderId'] |
@@ -4813,7 +4812,7 @@ discard block |
||
| 4813 | 4812 | if (empty($visibilite)) { |
| 4814 | 4813 | $visibilite = $record['title']; |
| 4815 | 4814 | } else { |
| 4816 | - $visibilite .= ' - ' . $record['title']; |
|
| 4815 | + $visibilite .= ' - '.$record['title']; |
|
| 4817 | 4816 | } |
| 4818 | 4817 | } |
| 4819 | 4818 | } else { |
@@ -4823,14 +4822,14 @@ discard block |
||
| 4823 | 4822 | // do new query to know if current folder is pf |
| 4824 | 4823 | $data_pf = DB::queryFirstRow( |
| 4825 | 4824 | 'SELECT personal_folder |
| 4826 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4825 | + FROM ' . prefixTable('nested_tree').' |
|
| 4827 | 4826 | WHERE id = %s', |
| 4828 | 4827 | $inputData['folderId'] |
| 4829 | 4828 | ); |
| 4830 | 4829 | |
| 4831 | 4830 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4832 | 4831 | |
| 4833 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4832 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4834 | 4833 | } |
| 4835 | 4834 | |
| 4836 | 4835 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4840,8 +4839,8 @@ discard block |
||
| 4840 | 4839 | $listOptionsForRoles = array(); |
| 4841 | 4840 | $rows = DB::query( |
| 4842 | 4841 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4843 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4844 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4842 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4843 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4845 | 4844 | WHERE r.folder_id = %i', |
| 4846 | 4845 | $inputData['folderId'] |
| 4847 | 4846 | ); |
@@ -4855,7 +4854,7 @@ discard block |
||
| 4855 | 4854 | ); |
| 4856 | 4855 | $rows2 = DB::query( |
| 4857 | 4856 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4858 | - FROM ' . prefixTable('users') . ' |
|
| 4857 | + FROM ' . prefixTable('users').' |
|
| 4859 | 4858 | WHERE admin = 0 AND fonction_id is not null' |
| 4860 | 4859 | ); |
| 4861 | 4860 | foreach ($rows2 as $record2) { |
@@ -4869,7 +4868,7 @@ discard block |
||
| 4869 | 4868 | array( |
| 4870 | 4869 | 'id' => $record2['id'], |
| 4871 | 4870 | 'login' => $record2['login'], |
| 4872 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4871 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4873 | 4872 | 'email' => $record2['email'], |
| 4874 | 4873 | ) |
| 4875 | 4874 | ); |
@@ -4886,13 +4885,13 @@ discard block |
||
| 4886 | 4885 | //db::debugmode(true); |
| 4887 | 4886 | $access = DB::queryFirstRow( |
| 4888 | 4887 | 'SELECT type |
| 4889 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4888 | + FROM ' . prefixTable('roles_values').' |
|
| 4890 | 4889 | WHERE role_id = %i AND folder_id = %i', |
| 4891 | 4890 | $role, |
| 4892 | 4891 | $inputData['folderId'] |
| 4893 | 4892 | ); |
| 4894 | 4893 | //db::debugmode(false); |
| 4895 | - if (DB::count()>0) { |
|
| 4894 | + if (DB::count() > 0) { |
|
| 4896 | 4895 | if ($access['type'] === 'R') { |
| 4897 | 4896 | array_push($arrTmp, 10); |
| 4898 | 4897 | } elseif ($access['type'] === 'W') { |
@@ -4997,7 +4996,7 @@ discard block |
||
| 4997 | 4996 | // Get some info before deleting |
| 4998 | 4997 | $data = DB::queryFirstRow( |
| 4999 | 4998 | 'SELECT name, id_item, file |
| 5000 | - FROM ' . prefixTable('files') . ' |
|
| 4999 | + FROM ' . prefixTable('files').' |
|
| 5001 | 5000 | WHERE id = %i', |
| 5002 | 5001 | $fileId |
| 5003 | 5002 | ); |
@@ -5005,7 +5004,7 @@ discard block |
||
| 5005 | 5004 | // Load item data |
| 5006 | 5005 | $data_item = DB::queryFirstRow( |
| 5007 | 5006 | 'SELECT id_tree |
| 5008 | - FROM ' . prefixTable('items') . ' |
|
| 5007 | + FROM ' . prefixTable('items').' |
|
| 5009 | 5008 | WHERE id = %i', |
| 5010 | 5009 | $data['id_item'] |
| 5011 | 5010 | ); |
@@ -5035,7 +5034,7 @@ discard block |
||
| 5035 | 5034 | $session->get('user-id'), |
| 5036 | 5035 | 'at_modification', |
| 5037 | 5036 | $session->get('user-login'), |
| 5038 | - 'at_del_file : ' . $data['name'] |
|
| 5037 | + 'at_del_file : '.$data['name'] |
|
| 5039 | 5038 | ); |
| 5040 | 5039 | |
| 5041 | 5040 | // DElete sharekeys |
@@ -5046,7 +5045,7 @@ discard block |
||
| 5046 | 5045 | ); |
| 5047 | 5046 | |
| 5048 | 5047 | // Delete file from server |
| 5049 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 5048 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 5050 | 5049 | $fileToDelete = realpath($fileToDelete); |
| 5051 | 5050 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 5052 | 5051 | fileDelete($fileToDelete, $SETTINGS); |
@@ -5100,7 +5099,7 @@ discard block |
||
| 5100 | 5099 | // Update SESSION with this new favourite |
| 5101 | 5100 | $data = DB::queryfirstrow( |
| 5102 | 5101 | 'SELECT label,id_tree |
| 5103 | - FROM ' . prefixTable('items') . ' |
|
| 5102 | + FROM ' . prefixTable('items').' |
|
| 5104 | 5103 | WHERE id = %i', |
| 5105 | 5104 | $inputData['itemId'] |
| 5106 | 5105 | ); |
@@ -5109,7 +5108,7 @@ discard block |
||
| 5109 | 5108 | [ |
| 5110 | 5109 | $inputData['itemId'] => [ |
| 5111 | 5110 | 'label' => $data['label'], |
| 5112 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 5111 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 5113 | 5112 | ], |
| 5114 | 5113 | ], |
| 5115 | 5114 | 'add' |
@@ -5178,8 +5177,8 @@ discard block |
||
| 5178 | 5177 | // get data about item |
| 5179 | 5178 | $dataSource = DB::queryfirstrow( |
| 5180 | 5179 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5181 | - FROM ' . prefixTable('items') . ' as i |
|
| 5182 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5180 | + FROM ' . prefixTable('items').' as i |
|
| 5181 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5183 | 5182 | WHERE i.id=%i', |
| 5184 | 5183 | $inputData['itemId'] |
| 5185 | 5184 | ); |
@@ -5223,7 +5222,7 @@ discard block |
||
| 5223 | 5222 | // get data about new folder |
| 5224 | 5223 | $dataDestination = DB::queryfirstrow( |
| 5225 | 5224 | 'SELECT personal_folder, title |
| 5226 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5225 | + FROM ' . prefixTable('nested_tree').' |
|
| 5227 | 5226 | WHERE id = %i', |
| 5228 | 5227 | $inputData['folderId'] |
| 5229 | 5228 | ); |
@@ -5276,7 +5275,7 @@ discard block |
||
| 5276 | 5275 | // Get fields for this Item |
| 5277 | 5276 | $rows = DB::query( |
| 5278 | 5277 | 'SELECT id |
| 5279 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5278 | + FROM ' . prefixTable('categories_items').' |
|
| 5280 | 5279 | WHERE item_id = %i', |
| 5281 | 5280 | $inputData['itemId'] |
| 5282 | 5281 | ); |
@@ -5293,7 +5292,7 @@ discard block |
||
| 5293 | 5292 | // Get FILES for this Item |
| 5294 | 5293 | $rows = DB::query( |
| 5295 | 5294 | 'SELECT id |
| 5296 | - FROM ' . prefixTable('files') . ' |
|
| 5295 | + FROM ' . prefixTable('files').' |
|
| 5297 | 5296 | WHERE id_item = %i', |
| 5298 | 5297 | $inputData['itemId'] |
| 5299 | 5298 | ); |
@@ -5340,7 +5339,7 @@ discard block |
||
| 5340 | 5339 | // Get the ITEM object key for the user |
| 5341 | 5340 | $userKey = DB::queryFirstRow( |
| 5342 | 5341 | 'SELECT share_key |
| 5343 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5342 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5344 | 5343 | WHERE user_id = %i AND object_id = %i', |
| 5345 | 5344 | $session->get('user-id'), |
| 5346 | 5345 | $inputData['itemId'] |
@@ -5351,8 +5350,8 @@ discard block |
||
| 5351 | 5350 | // This is a public object |
| 5352 | 5351 | $users = DB::query( |
| 5353 | 5352 | 'SELECT id, public_key |
| 5354 | - FROM ' . prefixTable('users') . ' |
|
| 5355 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5353 | + FROM ' . prefixTable('users').' |
|
| 5354 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5356 | 5355 | AND public_key != ""' |
| 5357 | 5356 | ); |
| 5358 | 5357 | foreach ($users as $user) { |
@@ -5372,14 +5371,14 @@ discard block |
||
| 5372 | 5371 | // Get fields for this Item |
| 5373 | 5372 | $rows = DB::query( |
| 5374 | 5373 | 'SELECT id |
| 5375 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5374 | + FROM ' . prefixTable('categories_items').' |
|
| 5376 | 5375 | WHERE item_id = %i', |
| 5377 | 5376 | $inputData['itemId'] |
| 5378 | 5377 | ); |
| 5379 | 5378 | foreach ($rows as $field) { |
| 5380 | 5379 | $userKey = DB::queryFirstRow( |
| 5381 | 5380 | 'SELECT share_key |
| 5382 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5381 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5383 | 5382 | WHERE user_id = %i AND object_id = %i', |
| 5384 | 5383 | $session->get('user-id'), |
| 5385 | 5384 | $field['id'] |
@@ -5390,8 +5389,8 @@ discard block |
||
| 5390 | 5389 | // This is a public object |
| 5391 | 5390 | $users = DB::query( |
| 5392 | 5391 | 'SELECT id, public_key |
| 5393 | - FROM ' . prefixTable('users') . ' |
|
| 5394 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5392 | + FROM ' . prefixTable('users').' |
|
| 5393 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5395 | 5394 | AND public_key != ""' |
| 5396 | 5395 | ); |
| 5397 | 5396 | foreach ($users as $user) { |
@@ -5412,14 +5411,14 @@ discard block |
||
| 5412 | 5411 | // Get FILES for this Item |
| 5413 | 5412 | $rows = DB::query( |
| 5414 | 5413 | 'SELECT id |
| 5415 | - FROM ' . prefixTable('files') . ' |
|
| 5414 | + FROM ' . prefixTable('files').' |
|
| 5416 | 5415 | WHERE id_item = %i', |
| 5417 | 5416 | $inputData['itemId'] |
| 5418 | 5417 | ); |
| 5419 | 5418 | foreach ($rows as $attachment) { |
| 5420 | 5419 | $userKey = DB::queryFirstRow( |
| 5421 | 5420 | 'SELECT share_key |
| 5422 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5421 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5423 | 5422 | WHERE user_id = %i AND object_id = %i', |
| 5424 | 5423 | $session->get('user-id'), |
| 5425 | 5424 | $attachment['id'] |
@@ -5430,8 +5429,8 @@ discard block |
||
| 5430 | 5429 | // This is a public object |
| 5431 | 5430 | $users = DB::query( |
| 5432 | 5431 | 'SELECT id, public_key |
| 5433 | - FROM ' . prefixTable('users') . ' |
|
| 5434 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5432 | + FROM ' . prefixTable('users').' |
|
| 5433 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5435 | 5434 | AND public_key != ""' |
| 5436 | 5435 | ); |
| 5437 | 5436 | foreach ($users as $user) { |
@@ -5469,7 +5468,7 @@ discard block |
||
| 5469 | 5468 | $session->get('user-id'), |
| 5470 | 5469 | 'at_modification', |
| 5471 | 5470 | $session->get('user-login'), |
| 5472 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5471 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5473 | 5472 | ); |
| 5474 | 5473 | |
| 5475 | 5474 | // Update cache table |
@@ -5528,8 +5527,8 @@ discard block |
||
| 5528 | 5527 | // get data about item |
| 5529 | 5528 | $dataSource = DB::queryfirstrow( |
| 5530 | 5529 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5531 | - FROM ' . prefixTable('items') . ' as i |
|
| 5532 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5530 | + FROM ' . prefixTable('items').' as i |
|
| 5531 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5533 | 5532 | WHERE i.id=%i', |
| 5534 | 5533 | $item_id |
| 5535 | 5534 | ); |
@@ -5551,7 +5550,7 @@ discard block |
||
| 5551 | 5550 | |
| 5552 | 5551 | // get data about new folder |
| 5553 | 5552 | $dataDestination = DB::queryfirstrow( |
| 5554 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5553 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5555 | 5554 | $inputData['folderId'] |
| 5556 | 5555 | ); |
| 5557 | 5556 | |
@@ -5593,7 +5592,7 @@ discard block |
||
| 5593 | 5592 | // Get fields for this Item |
| 5594 | 5593 | $rows = DB::query( |
| 5595 | 5594 | 'SELECT id |
| 5596 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5595 | + FROM ' . prefixTable('categories_items').' |
|
| 5597 | 5596 | WHERE item_id = %i', |
| 5598 | 5597 | $item_id |
| 5599 | 5598 | ); |
@@ -5610,7 +5609,7 @@ discard block |
||
| 5610 | 5609 | // Get FILES for this Item |
| 5611 | 5610 | $rows = DB::query( |
| 5612 | 5611 | 'SELECT id |
| 5613 | - FROM ' . prefixTable('files') . ' |
|
| 5612 | + FROM ' . prefixTable('files').' |
|
| 5614 | 5613 | WHERE id_item = %i', |
| 5615 | 5614 | $item_id |
| 5616 | 5615 | ); |
@@ -5665,7 +5664,7 @@ discard block |
||
| 5665 | 5664 | // Get the ITEM object key for the user |
| 5666 | 5665 | $userKey = DB::queryFirstRow( |
| 5667 | 5666 | 'SELECT share_key |
| 5668 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5667 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5669 | 5668 | WHERE user_id = %i AND object_id = %i', |
| 5670 | 5669 | $session->get('user-id'), |
| 5671 | 5670 | $item_id |
@@ -5676,8 +5675,8 @@ discard block |
||
| 5676 | 5675 | // This is a public object |
| 5677 | 5676 | $users = DB::query( |
| 5678 | 5677 | 'SELECT id, public_key |
| 5679 | - FROM ' . prefixTable('users') . ' |
|
| 5680 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5678 | + FROM ' . prefixTable('users').' |
|
| 5679 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5681 | 5680 | AND public_key != ""' |
| 5682 | 5681 | ); |
| 5683 | 5682 | foreach ($users as $user) { |
@@ -5697,14 +5696,14 @@ discard block |
||
| 5697 | 5696 | // Get fields for this Item |
| 5698 | 5697 | $rows = DB::query( |
| 5699 | 5698 | 'SELECT id |
| 5700 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5699 | + FROM ' . prefixTable('categories_items').' |
|
| 5701 | 5700 | WHERE item_id = %i', |
| 5702 | 5701 | $item_id |
| 5703 | 5702 | ); |
| 5704 | 5703 | foreach ($rows as $field) { |
| 5705 | 5704 | $userKey = DB::queryFirstRow( |
| 5706 | 5705 | 'SELECT share_key |
| 5707 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5706 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5708 | 5707 | WHERE user_id = %i AND object_id = %i', |
| 5709 | 5708 | $session->get('user-id'), |
| 5710 | 5709 | $field['id'] |
@@ -5715,8 +5714,8 @@ discard block |
||
| 5715 | 5714 | // This is a public object |
| 5716 | 5715 | $users = DB::query( |
| 5717 | 5716 | 'SELECT id, public_key |
| 5718 | - FROM ' . prefixTable('users') . ' |
|
| 5719 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5717 | + FROM ' . prefixTable('users').' |
|
| 5718 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5720 | 5719 | AND public_key != ""' |
| 5721 | 5720 | ); |
| 5722 | 5721 | foreach ($users as $user) { |
@@ -5737,14 +5736,14 @@ discard block |
||
| 5737 | 5736 | // Get FILES for this Item |
| 5738 | 5737 | $rows = DB::query( |
| 5739 | 5738 | 'SELECT id |
| 5740 | - FROM ' . prefixTable('files') . ' |
|
| 5739 | + FROM ' . prefixTable('files').' |
|
| 5741 | 5740 | WHERE id_item = %i', |
| 5742 | 5741 | $item_id |
| 5743 | 5742 | ); |
| 5744 | 5743 | foreach ($rows as $attachment) { |
| 5745 | 5744 | $userKey = DB::queryFirstRow( |
| 5746 | 5745 | 'SELECT share_key |
| 5747 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5746 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5748 | 5747 | WHERE user_id = %i AND object_id = %i', |
| 5749 | 5748 | $session->get('user-id'), |
| 5750 | 5749 | $attachment['id'] |
@@ -5755,8 +5754,8 @@ discard block |
||
| 5755 | 5754 | // This is a public object |
| 5756 | 5755 | $users = DB::query( |
| 5757 | 5756 | 'SELECT id, public_key |
| 5758 | - FROM ' . prefixTable('users') . ' |
|
| 5759 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5757 | + FROM ' . prefixTable('users').' |
|
| 5758 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5760 | 5759 | AND public_key != ""' |
| 5761 | 5760 | ); |
| 5762 | 5761 | foreach ($users as $user) { |
@@ -5793,13 +5792,13 @@ discard block |
||
| 5793 | 5792 | $session->get('user-id'), |
| 5794 | 5793 | 'at_modification', |
| 5795 | 5794 | $session->get('user-login'), |
| 5796 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5795 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5797 | 5796 | ); |
| 5798 | 5797 | } |
| 5799 | 5798 | } |
| 5800 | 5799 | |
| 5801 | 5800 | // reload cache table |
| 5802 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5801 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5803 | 5802 | updateCacheTable('reload', null); |
| 5804 | 5803 | |
| 5805 | 5804 | echo (string) prepareExchangedData( |
@@ -5863,7 +5862,7 @@ discard block |
||
| 5863 | 5862 | // get info |
| 5864 | 5863 | $dataSource = DB::queryfirstrow( |
| 5865 | 5864 | 'SELECT label, id_tree |
| 5866 | - FROM ' . prefixTable('items') . ' |
|
| 5865 | + FROM ' . prefixTable('items').' |
|
| 5867 | 5866 | WHERE id=%i', |
| 5868 | 5867 | $item_id |
| 5869 | 5868 | ); |
@@ -5962,8 +5961,8 @@ discard block |
||
| 5962 | 5961 | } |
| 5963 | 5962 | if ($inputData['cat'] === 'request_access_to_author') { |
| 5964 | 5963 | // Variables |
| 5965 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
| 5966 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
| 5964 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
| 5965 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
| 5967 | 5966 | |
| 5968 | 5967 | // Get path |
| 5969 | 5968 | $path = geItemReadablePath( |
@@ -5977,7 +5976,7 @@ discard block |
||
| 5977 | 5976 | $lang->get('email_request_access_subject'), |
| 5978 | 5977 | str_replace( |
| 5979 | 5978 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5980 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5979 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5981 | 5980 | $lang->get('email_request_access_mail') |
| 5982 | 5981 | ), |
| 5983 | 5982 | $dataAuthor['email'], |
@@ -5986,7 +5985,7 @@ discard block |
||
| 5986 | 5985 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5987 | 5986 | $dataItem = DB::queryfirstrow( |
| 5988 | 5987 | 'SELECT label,id_tree |
| 5989 | - FROM ' . prefixTable('items') . ' |
|
| 5988 | + FROM ' . prefixTable('items').' |
|
| 5990 | 5989 | WHERE id= %i', |
| 5991 | 5990 | $inputData['id'] |
| 5992 | 5991 | ); |
@@ -6009,7 +6008,7 @@ discard block |
||
| 6009 | 6008 | ), |
| 6010 | 6009 | array( |
| 6011 | 6010 | empty($SETTINGS['email_server_url']) === false ? |
| 6012 | - $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'], |
|
| 6011 | + $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'], |
|
| 6013 | 6012 | addslashes($session->get('user-login')), |
| 6014 | 6013 | addslashes($path), |
| 6015 | 6014 | ), |
@@ -6109,8 +6108,8 @@ discard block |
||
| 6109 | 6108 | // Get all informations for this item |
| 6110 | 6109 | $dataItem = DB::queryfirstrow( |
| 6111 | 6110 | 'SELECT * |
| 6112 | - FROM ' . prefixTable('items') . ' as i |
|
| 6113 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 6111 | + FROM ' . prefixTable('items').' as i |
|
| 6112 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 6114 | 6113 | WHERE i.id=%i AND l.action = %s', |
| 6115 | 6114 | $item_id, |
| 6116 | 6115 | 'at_creation' |
@@ -6139,18 +6138,18 @@ discard block |
||
| 6139 | 6138 | $session->get('user-login'), |
| 6140 | 6139 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 6141 | 6140 | null, |
| 6142 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 6141 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 6143 | 6142 | ); |
| 6144 | 6143 | // Prepare new line |
| 6145 | 6144 | $data = DB::queryfirstrow( |
| 6146 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 6145 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 6147 | 6146 | $item_id |
| 6148 | 6147 | ); |
| 6149 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 6148 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 6150 | 6149 | // send back |
| 6151 | 6150 | $data = array( |
| 6152 | 6151 | 'error' => '', |
| 6153 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 6152 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 6154 | 6153 | ); |
| 6155 | 6154 | echo (string) prepareExchangedData( |
| 6156 | 6155 | $data, |
@@ -6222,7 +6221,7 @@ discard block |
||
| 6222 | 6221 | ); |
| 6223 | 6222 | |
| 6224 | 6223 | // delete all existing old otv codes |
| 6225 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time()); |
|
| 6224 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time()); |
|
| 6226 | 6225 | foreach ($rows as $record) { |
| 6227 | 6226 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 6228 | 6227 | } |
@@ -6244,8 +6243,8 @@ discard block |
||
| 6244 | 6243 | // Should we log a password change? |
| 6245 | 6244 | $itemQ = DB::queryFirstRow( |
| 6246 | 6245 | 'SELECT s.share_key, i.pw |
| 6247 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6248 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6246 | + FROM ' . prefixTable('items').' AS i |
|
| 6247 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6249 | 6248 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6250 | 6249 | $session->get('user-id'), |
| 6251 | 6250 | $dataReceived['id'] |
@@ -6300,7 +6299,7 @@ discard block |
||
| 6300 | 6299 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6301 | 6300 | $SETTINGS['otv_expiration_period'] = 7; |
| 6302 | 6301 | } |
| 6303 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6302 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6304 | 6303 | |
| 6305 | 6304 | echo json_encode( |
| 6306 | 6305 | array( |
@@ -6331,7 +6330,7 @@ discard block |
||
| 6331 | 6330 | // get parameters from original link |
| 6332 | 6331 | $url = $dataReceived['original_link']; |
| 6333 | 6332 | $parts = parse_url($url); |
| 6334 | - if(isset($parts['query'])){ |
|
| 6333 | + if (isset($parts['query'])) { |
|
| 6335 | 6334 | parse_str($parts['query'], $orignal_link_parameters); |
| 6336 | 6335 | } else { |
| 6337 | 6336 | $orignal_link_parameters = array(); |
@@ -6362,13 +6361,13 @@ discard block |
||
| 6362 | 6361 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6363 | 6362 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6364 | 6363 | if (str_contains($domain_host, 'www.') === true) { |
| 6365 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6364 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6366 | 6365 | } else { |
| 6367 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6366 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6368 | 6367 | } |
| 6369 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6368 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6370 | 6369 | } else { |
| 6371 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6370 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6372 | 6371 | } |
| 6373 | 6372 | |
| 6374 | 6373 | echo (string) prepareExchangedData( |
@@ -6403,8 +6402,8 @@ discard block |
||
| 6403 | 6402 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6404 | 6403 | f.extension AS extension, f.type AS type, |
| 6405 | 6404 | s.share_key AS share_key |
| 6406 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6407 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6405 | + FROM ' . prefixTable('files').' AS f |
|
| 6406 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6408 | 6407 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6409 | 6408 | $session->get('user-id'), |
| 6410 | 6409 | $inputData['id'] |
@@ -6425,7 +6424,7 @@ discard block |
||
| 6425 | 6424 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6426 | 6425 | |
| 6427 | 6426 | // prepare image info |
| 6428 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6427 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6429 | 6428 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6430 | 6429 | |
| 6431 | 6430 | // Get image content |
@@ -6440,7 +6439,7 @@ discard block |
||
| 6440 | 6439 | echo (string) prepareExchangedData( |
| 6441 | 6440 | array( |
| 6442 | 6441 | 'error' => false, |
| 6443 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6442 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6444 | 6443 | 'file_type' => $file_info['type'], |
| 6445 | 6444 | 'file_content' => $fileContent, |
| 6446 | 6445 | ), |
@@ -6493,16 +6492,16 @@ discard block |
||
| 6493 | 6492 | $idFolder = $dataReceived['idFolder']; |
| 6494 | 6493 | |
| 6495 | 6494 | // don't check if Personal Folder |
| 6496 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 6495 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 6497 | 6496 | if ($data['title'] === $session->get('user-id')) { |
| 6498 | 6497 | // send data |
| 6499 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 6498 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 6500 | 6499 | } else { |
| 6501 | 6500 | if ($inputData['option'] === 'same_folder') { |
| 6502 | 6501 | // case unique folder |
| 6503 | 6502 | DB::query( |
| 6504 | 6503 | 'SELECT label |
| 6505 | - FROM ' . prefixTable('items') . ' |
|
| 6504 | + FROM ' . prefixTable('items').' |
|
| 6506 | 6505 | WHERE id_tree = %i AND label = %s', |
| 6507 | 6506 | $idFolder, |
| 6508 | 6507 | $label |
@@ -6514,7 +6513,7 @@ discard block |
||
| 6514 | 6513 | $arrayPf = array(); |
| 6515 | 6514 | if (empty($row['id']) === false) { |
| 6516 | 6515 | $rows = DB::query( |
| 6517 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 6516 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 6518 | 6517 | '1' |
| 6519 | 6518 | ); |
| 6520 | 6519 | foreach ($rows as $record) { |
@@ -6529,12 +6528,12 @@ discard block |
||
| 6529 | 6528 | $where->add('id_tree = %i', $idFolder); |
| 6530 | 6529 | $where->add('label = %s', $label); |
| 6531 | 6530 | if (empty($arrayPf) === false) { |
| 6532 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 6531 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 6533 | 6532 | } |
| 6534 | 6533 | |
| 6535 | 6534 | DB::query( |
| 6536 | 6535 | 'SELECT label |
| 6537 | - FROM ' . prefixTable('items') . ' |
|
| 6536 | + FROM ' . prefixTable('items').' |
|
| 6538 | 6537 | WHERE %l', |
| 6539 | 6538 | $where |
| 6540 | 6539 | ); |
@@ -6546,7 +6545,7 @@ discard block |
||
| 6546 | 6545 | } |
| 6547 | 6546 | |
| 6548 | 6547 | // send data |
| 6549 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 6548 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 6550 | 6549 | } |
| 6551 | 6550 | break; |
| 6552 | 6551 | |
@@ -6656,7 +6655,7 @@ discard block |
||
| 6656 | 6655 | $arbo = $tree->getPath($folder->id, false); |
| 6657 | 6656 | $path = ''; |
| 6658 | 6657 | foreach ($arbo as $elem) { |
| 6659 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6658 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6660 | 6659 | } |
| 6661 | 6660 | |
| 6662 | 6661 | // Build array |
@@ -6725,7 +6724,7 @@ discard block |
||
| 6725 | 6724 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6726 | 6725 | $rows = DB::query( |
| 6727 | 6726 | 'SELECT id, categories |
| 6728 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6727 | + FROM ' . prefixTable('nested_tree').' |
|
| 6729 | 6728 | WHERE id IN (%l)', |
| 6730 | 6729 | implode(',', $foldersArray) |
| 6731 | 6730 | ); |
@@ -6767,7 +6766,7 @@ discard block |
||
| 6767 | 6766 | // get item info |
| 6768 | 6767 | $dataItem = DB::queryFirstRow( |
| 6769 | 6768 | 'SELECT * |
| 6770 | - FROM ' . prefixTable('items') . ' |
|
| 6769 | + FROM ' . prefixTable('items').' |
|
| 6771 | 6770 | WHERE id=%i', |
| 6772 | 6771 | $inputData['itemId'] |
| 6773 | 6772 | ); |
@@ -6779,8 +6778,8 @@ discard block |
||
| 6779 | 6778 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6780 | 6779 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6781 | 6780 | l.old_value as old_value |
| 6782 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6783 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6781 | + FROM ' . prefixTable('log_items').' as l |
|
| 6782 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6784 | 6783 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6785 | 6784 | ORDER BY date DESC', |
| 6786 | 6785 | $inputData['itemId'], |
@@ -6795,18 +6794,18 @@ discard block |
||
| 6795 | 6794 | |
| 6796 | 6795 | // imported via API |
| 6797 | 6796 | if (empty($record['login']) === true) { |
| 6798 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6797 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6799 | 6798 | } |
| 6800 | 6799 | |
| 6801 | 6800 | // Prepare avatar |
| 6802 | 6801 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6803 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6804 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6802 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6803 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6805 | 6804 | } else { |
| 6806 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6805 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6807 | 6806 | } |
| 6808 | 6807 | } else { |
| 6809 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6808 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6810 | 6809 | } |
| 6811 | 6810 | |
| 6812 | 6811 | // Prepare action |
@@ -6826,7 +6825,7 @@ discard block |
||
| 6826 | 6825 | $previous_passwords, |
| 6827 | 6826 | [ |
| 6828 | 6827 | 'password' => htmlentities($previous_pwd['string']), |
| 6829 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6828 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6830 | 6829 | ] |
| 6831 | 6830 | ); |
| 6832 | 6831 | } |
@@ -6839,19 +6838,19 @@ discard block |
||
| 6839 | 6838 | $action = $lang->get($reason[0]); |
| 6840 | 6839 | if ($reason[0] === 'at_moved') { |
| 6841 | 6840 | $tmp = explode(' -> ', $reason[1]); |
| 6842 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6841 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6843 | 6842 | } elseif ($reason[0] === 'at_field') { |
| 6844 | 6843 | $tmp = explode(' => ', $reason[1]); |
| 6845 | 6844 | if (count($tmp) > 1) { |
| 6846 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6847 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6845 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6846 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6848 | 6847 | } else { |
| 6849 | 6848 | $detail = trim($reason[1]); |
| 6850 | 6849 | } |
| 6851 | 6850 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6852 | 6851 | $tmp = explode(' => ', $reason[1]); |
| 6853 | 6852 | $detail = empty(trim($tmp[0])) === true ? |
| 6854 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6853 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6855 | 6854 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6856 | 6855 | $detail = $lang->get($reason[1]); |
| 6857 | 6856 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6860,7 +6859,7 @@ discard block |
||
| 6860 | 6859 | $tmp = explode(':', $reason[1]); |
| 6861 | 6860 | $tmp = explode('.', $tmp[0]); |
| 6862 | 6861 | $detail = isBase64($tmp[0]) === true ? |
| 6863 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6862 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6864 | 6863 | } elseif ($reason[0] === 'at_import') { |
| 6865 | 6864 | $detail = ''; |
| 6866 | 6865 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6879,8 +6878,8 @@ discard block |
||
| 6879 | 6878 | array( |
| 6880 | 6879 | 'avatar' => $avatar, |
| 6881 | 6880 | 'login' => $record['login'], |
| 6882 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6883 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6881 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6882 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6884 | 6883 | 'action' => $action, |
| 6885 | 6884 | 'detail' => $detail, |
| 6886 | 6885 | ) |
@@ -6969,11 +6968,11 @@ discard block |
||
| 6969 | 6968 | |
| 6970 | 6969 | // get some info to add to the notification email |
| 6971 | 6970 | $resp_user = DB::queryfirstrow( |
| 6972 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6971 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6973 | 6972 | $session->get('user-id') |
| 6974 | 6973 | ); |
| 6975 | 6974 | $resp_folder = DB::queryfirstrow( |
| 6976 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6975 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6977 | 6976 | $folder |
| 6978 | 6977 | ); |
| 6979 | 6978 | |
@@ -6982,7 +6981,7 @@ discard block |
||
| 6982 | 6981 | $emailService = new EmailService(); |
| 6983 | 6982 | $rows = DB::query( |
| 6984 | 6983 | 'SELECT email |
| 6985 | - FROM ' . prefixTable('users') . ' |
|
| 6984 | + FROM ' . prefixTable('users').' |
|
| 6986 | 6985 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6987 | 6986 | 1 |
| 6988 | 6987 | ); |
@@ -7013,14 +7012,14 @@ discard block |
||
| 7013 | 7012 | // Get list of users |
| 7014 | 7013 | $usersList = array(); |
| 7015 | 7014 | $usersString = ''; |
| 7016 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 7015 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 7017 | 7016 | foreach ($rows as $record) { |
| 7018 | 7017 | $usersList[$record['login']] = array( |
| 7019 | 7018 | 'id' => $record['id'], |
| 7020 | 7019 | 'login' => $record['login'], |
| 7021 | 7020 | 'email' => $record['email'], |
| 7022 | 7021 | ); |
| 7023 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 7022 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 7024 | 7023 | } |
| 7025 | 7024 | |
| 7026 | 7025 | $data = array( |
@@ -7060,7 +7059,7 @@ discard block |
||
| 7060 | 7059 | // Send email |
| 7061 | 7060 | $dataItem = DB::queryfirstrow( |
| 7062 | 7061 | 'SELECT label, id_tree |
| 7063 | - FROM ' . prefixTable('items') . ' |
|
| 7062 | + FROM ' . prefixTable('items').' |
|
| 7064 | 7063 | WHERE id = %i', |
| 7065 | 7064 | $inputData['itemId'] |
| 7066 | 7065 | ); |
@@ -7114,7 +7113,7 @@ discard block |
||
| 7114 | 7113 | |
| 7115 | 7114 | DB::query( |
| 7116 | 7115 | 'SELECT * |
| 7117 | - FROM ' . prefixTable('notification') . ' |
|
| 7116 | + FROM ' . prefixTable('notification').' |
|
| 7118 | 7117 | WHERE item_id = %i AND user_id = %i', |
| 7119 | 7118 | $inputData['itemId'], |
| 7120 | 7119 | $session->get('user-id') |
@@ -7186,7 +7185,7 @@ discard block |
||
| 7186 | 7185 | // And related logs |
| 7187 | 7186 | $rows = DB::query( |
| 7188 | 7187 | 'SELECT id, file AS filename |
| 7189 | - FROM ' . prefixTable('files') . ' |
|
| 7188 | + FROM ' . prefixTable('files').' |
|
| 7190 | 7189 | WHERE id_item = %i AND confirmed = %i', |
| 7191 | 7190 | $inputData['itemId'], |
| 7192 | 7191 | 0 |
@@ -7200,12 +7199,12 @@ discard block |
||
| 7200 | 7199 | ); |
| 7201 | 7200 | |
| 7202 | 7201 | // Delete file on server |
| 7203 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 7202 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 7204 | 7203 | |
| 7205 | 7204 | // Delete related logs |
| 7206 | 7205 | $logFile = DB::query( |
| 7207 | 7206 | 'SELECT increment_id, raison |
| 7208 | - FROM ' . prefixTable('log_items') . ' |
|
| 7207 | + FROM ' . prefixTable('log_items').' |
|
| 7209 | 7208 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 7210 | 7209 | $inputData['itemId'], |
| 7211 | 7210 | $session->get('user-id'), |
@@ -7264,7 +7263,7 @@ discard block |
||
| 7264 | 7263 | // Confirm attachments |
| 7265 | 7264 | $rows = DB::query( |
| 7266 | 7265 | 'SELECT id, file AS filename |
| 7267 | - FROM ' . prefixTable('files') . ' |
|
| 7266 | + FROM ' . prefixTable('files').' |
|
| 7268 | 7267 | WHERE id_item = %i AND confirmed = %i', |
| 7269 | 7268 | $inputData['itemId'], |
| 7270 | 7269 | 0 |
@@ -7350,15 +7349,15 @@ discard block |
||
| 7350 | 7349 | case 'autocomplete_tags': |
| 7351 | 7350 | // Get a list off all existing TAGS |
| 7352 | 7351 | $listOfTags = ''; |
| 7353 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7352 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7354 | 7353 | foreach ($rows as $record) { |
| 7355 | 7354 | if (empty($listOfTags)) { |
| 7356 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7355 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7357 | 7356 | } else { |
| 7358 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7357 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7359 | 7358 | } |
| 7360 | 7359 | } |
| 7361 | - echo '[' . $listOfTags . ']'; |
|
| 7360 | + echo '['.$listOfTags.']'; |
|
| 7362 | 7361 | break; |
| 7363 | 7362 | } |
| 7364 | 7363 | } |
@@ -7374,7 +7373,7 @@ discard block |
||
| 7374 | 7373 | { |
| 7375 | 7374 | $data = DB::queryFirstRow( |
| 7376 | 7375 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7377 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7376 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7378 | 7377 | $groupe |
| 7379 | 7378 | ); |
| 7380 | 7379 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7446,7 +7445,7 @@ discard block |
||
| 7446 | 7445 | // Locked Item (if already locked), go back and warn |
| 7447 | 7446 | $dataTmp = DB::queryFirstRow( |
| 7448 | 7447 | 'SELECT timestamp, user_id |
| 7449 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7448 | + FROM ' . prefixTable('items_edition').' |
|
| 7450 | 7449 | WHERE item_id = %i', |
| 7451 | 7450 | $itemId |
| 7452 | 7451 | ); |
@@ -7456,7 +7455,7 @@ discard block |
||
| 7456 | 7455 | // Get if current user is the one who locked the item |
| 7457 | 7456 | $userLockedItemQueryResults = DB::queryFirstRow( |
| 7458 | 7457 | 'SELECT user_id |
| 7459 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7458 | + FROM ' . prefixTable('items_edition').' |
|
| 7460 | 7459 | WHERE item_id = %i AND user_id = %i', |
| 7461 | 7460 | $itemId, |
| 7462 | 7461 | $session->get('user-id') |
@@ -7466,8 +7465,8 @@ discard block |
||
| 7466 | 7465 | // Get if existing process ongoing for this item |
| 7467 | 7466 | $dataItemProcessOngoing = DB::queryFirstRow( |
| 7468 | 7467 | 'SELECT JSON_EXTRACT(p.arguments, "$.all_users_except_id") AS all_users_except_id |
| 7469 | - FROM ' . prefixTable('background_tasks') . ' AS p |
|
| 7470 | - INNER JOIN ' . prefixTable('items_edition') . ' AS i ON (i.item_id = p.item_id) |
|
| 7468 | + FROM ' . prefixTable('background_tasks').' AS p |
|
| 7469 | + INNER JOIN ' . prefixTable('items_edition').' AS i ON (i.item_id = p.item_id) |
|
| 7471 | 7470 | WHERE p.item_id = %i AND p.finished_at = "" |
| 7472 | 7471 | ORDER BY p.increment_id DESC', |
| 7473 | 7472 | $itemId |
@@ -7475,7 +7474,7 @@ discard block |
||
| 7475 | 7474 | |
| 7476 | 7475 | // Get delay period |
| 7477 | 7476 | if (isset($SETTINGS['delay_item_edition']) && $SETTINGS['delay_item_edition'] > 0 && empty($dataTmp['timestamp']) === false) { |
| 7478 | - $delay = $SETTINGS['delay_item_edition']*60; |
|
| 7477 | + $delay = $SETTINGS['delay_item_edition'] * 60; |
|
| 7479 | 7478 | } else { |
| 7480 | 7479 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 7481 | 7480 | } |
@@ -7504,7 +7503,7 @@ discard block |
||
| 7504 | 7503 | |
| 7505 | 7504 | $data = DB::queryFirstRow( |
| 7506 | 7505 | 'SELECT visible_folders |
| 7507 | - FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', |
|
| 7506 | + FROM ' . prefixTable('cache_tree').' WHERE user_id = %i', |
|
| 7508 | 7507 | $userId |
| 7509 | 7508 | ); |
| 7510 | 7509 | // Check if tree ID is in visible folders. |
@@ -7528,7 +7527,7 @@ discard block |
||
| 7528 | 7527 | $edit = $delete = false; |
| 7529 | 7528 | $data = DB::queryFirstColumn( |
| 7530 | 7529 | 'SELECT type |
| 7531 | - FROM ' . prefixTable('roles_values') . ' |
|
| 7530 | + FROM ' . prefixTable('roles_values').' |
|
| 7532 | 7531 | WHERE role_id IN %ls AND folder_id = %i', |
| 7533 | 7532 | array_column($session->get('system-array_roles'), 'id'), |
| 7534 | 7533 | $treeId, |
@@ -7552,7 +7551,7 @@ discard block |
||
| 7552 | 7551 | $delete = true; |
| 7553 | 7552 | } |
| 7554 | 7553 | } |
| 7555 | - if (LOG_TO_SERVER === true) error_log('TEAMPASS - Folder: '.$treeId.' - User: '.$userId.' - access: ' . $access . ' - edit: ' . $edit . ' - delete: ' . $delete); |
|
| 7554 | + if (LOG_TO_SERVER === true) error_log('TEAMPASS - Folder: '.$treeId.' - User: '.$userId.' - access: '.$access.' - edit: '.$edit.' - delete: '.$delete); |
|
| 7556 | 7555 | |
| 7557 | 7556 | return array( |
| 7558 | 7557 | 'error' => false, |
@@ -1089,7 +1089,9 @@ discard block |
||
| 1089 | 1089 | $session->get('user-id') |
| 1090 | 1090 | ); |
| 1091 | 1091 | if (DB::count() === 0) { |
| 1092 | - if (LOG_TO_SERVER === true) error_log('TEAMPASS | user '.$session->get('user-id').' has no sharekey for item '.$inputData['itemId']); |
|
| 1092 | + if (LOG_TO_SERVER === true) { |
|
| 1093 | + error_log('TEAMPASS | user '.$session->get('user-id').' has no sharekey for item '.$inputData['itemId']); |
|
| 1094 | + } |
|
| 1093 | 1095 | echo (string) prepareExchangedData( |
| 1094 | 1096 | array( |
| 1095 | 1097 | 'error' => true, |
@@ -1208,7 +1210,9 @@ discard block |
||
| 1208 | 1210 | ); |
| 1209 | 1211 | |
| 1210 | 1212 | // Create a task to create sharekeys for users |
| 1211 | - 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 | + } |
|
| 1212 | 1216 | $tasksToBePerformed = ['item_password']; |
| 1213 | 1217 | /*createTaskForItem( |
| 1214 | 1218 | 'item_update_create_keys', |
@@ -1534,7 +1538,9 @@ discard block |
||
| 1534 | 1538 | |
| 1535 | 1539 | // create a task for all fields updated |
| 1536 | 1540 | if ($encryptionTaskIsRequested === true) { |
| 1537 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1541 | + if (WIP === true) { |
|
| 1542 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1543 | + } |
|
| 1538 | 1544 | createTaskForItem( |
| 1539 | 1545 | 'item_update_create_keys', |
| 1540 | 1546 | $tasksToBePerformed, |
@@ -2041,7 +2047,9 @@ discard block |
||
| 2041 | 2047 | $inputData['itemId'] |
| 2042 | 2048 | ); |
| 2043 | 2049 | foreach ($rows as $record) { |
| 2044 | - if ($record['raison'] === NULL) continue; |
|
| 2050 | + if ($record['raison'] === NULL) { |
|
| 2051 | + continue; |
|
| 2052 | + } |
|
| 2045 | 2053 | $reason = explode(':', $record['raison']); |
| 2046 | 2054 | if (count($reason) > 0) { |
| 2047 | 2055 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4642,7 +4650,9 @@ discard block |
||
| 4642 | 4650 | $inputData['itemId'] |
| 4643 | 4651 | ); |
| 4644 | 4652 | |
| 4645 | - if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
|
| 4653 | + if (WIP === true) { |
|
| 4654 | + error_log('Existing edition locks: '.DB::count()); |
|
| 4655 | + } |
|
| 4646 | 4656 | |
| 4647 | 4657 | // Check if item has no edition lock |
| 4648 | 4658 | if ((int) DB::count() > 0 ) { |
@@ -4655,7 +4665,9 @@ discard block |
||
| 4655 | 4665 | } else { |
| 4656 | 4666 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4657 | 4667 | } |
| 4658 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4668 | + if (WIP === true) { |
|
| 4669 | + error_log('delay: ' . $delay); |
|
| 4670 | + } |
|
| 4659 | 4671 | |
| 4660 | 4672 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4661 | 4673 | if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
@@ -4663,7 +4675,9 @@ discard block |
||
| 4663 | 4675 | // In this case, delete edition lock and possible ongoing processes |
| 4664 | 4676 | // and continue editing this time |
| 4665 | 4677 | // We coonsidere if the most recent item is still locked then all other locks can be removed |
| 4666 | - if (WIP === true) error_log('Delay is expired, removing old locks'); |
|
| 4678 | + if (WIP === true) { |
|
| 4679 | + error_log('Delay is expired, removing old locks'); |
|
| 4680 | + } |
|
| 4667 | 4681 | foreach ($dataItemEditionLocks as $itemEditionLock) { |
| 4668 | 4682 | // delete lock |
| 4669 | 4683 | DB::delete( |
@@ -7552,7 +7566,9 @@ discard block |
||
| 7552 | 7566 | $delete = true; |
| 7553 | 7567 | } |
| 7554 | 7568 | } |
| 7555 | - if (LOG_TO_SERVER === true) error_log('TEAMPASS - Folder: '.$treeId.' - User: '.$userId.' - access: ' . $access . ' - edit: ' . $edit . ' - delete: ' . $delete); |
|
| 7569 | + if (LOG_TO_SERVER === true) { |
|
| 7570 | + error_log('TEAMPASS - Folder: '.$treeId.' - User: '.$userId.' - access: ' . $access . ' - edit: ' . $edit . ' - delete: ' . $delete); |
|
| 7571 | + } |
|
| 7556 | 7572 | |
| 7557 | 7573 | return array( |
| 7558 | 7574 | 'error' => false, |
