nilsteampassnet /
TeamPass
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | ) { |
| 78 | 78 | // Not allowed page |
| 79 | 79 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 80 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 80 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 81 | 81 | exit; |
| 82 | 82 | } |
| 83 | 83 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | date_default_timezone_set('UTC'); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
| 105 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
| 106 | 106 | header('Content-type: text/html; charset=utf-8'); |
| 107 | 107 | header('Cache-Control: no-cache, must-revalidate'); |
| 108 | 108 | |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | // About special settings |
| 353 | 353 | $dataFolderSettings = DB::queryFirstRow( |
| 354 | 354 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 355 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 355 | + FROM ' . prefixTable('nested_tree').' |
|
| 356 | 356 | WHERE id = %i', |
| 357 | 357 | $inputData['folderId'] |
| 358 | 358 | ); |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | // Get folder complexity |
| 370 | 370 | $folderComplexity = DB::queryfirstrow( |
| 371 | 371 | 'SELECT valeur |
| 372 | - FROM ' . prefixTable('misc') . ' |
|
| 372 | + FROM ' . prefixTable('misc').' |
|
| 373 | 373 | WHERE type = %s AND intitule = %i', |
| 374 | 374 | 'complex', |
| 375 | 375 | $inputData['folderId'] |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | $itemExists = 0; |
| 395 | 395 | $newID = ''; |
| 396 | 396 | $data = DB::queryfirstrow( |
| 397 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 397 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 398 | 398 | WHERE label = %s AND inactif = %i', |
| 399 | 399 | $inputData['label'], |
| 400 | 400 | 0 |
@@ -477,8 +477,8 @@ discard block |
||
| 477 | 477 | (int) $inputData['folderId'], |
| 478 | 478 | (int) $newID, |
| 479 | 479 | $cryptedStuff['objectKey'], |
| 480 | - true, // only for the item creator |
|
| 481 | - false, // no delete all |
|
| 480 | + true, // only for the item creator |
|
| 481 | + false, // no delete all |
|
| 482 | 482 | ); |
| 483 | 483 | |
| 484 | 484 | // update fields |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | // should we encrypt the data |
| 492 | 492 | $dataTmp = DB::queryFirstRow( |
| 493 | 493 | 'SELECT encrypted_data |
| 494 | - FROM ' . prefixTable('categories') . ' |
|
| 494 | + FROM ' . prefixTable('categories').' |
|
| 495 | 495 | WHERE id = %i', |
| 496 | 496 | $field['id'] |
| 497 | 497 | ); |
@@ -521,8 +521,8 @@ discard block |
||
| 521 | 521 | (int) $inputData['folderId'], |
| 522 | 522 | (int) $newObjectId, |
| 523 | 523 | $cryptedStuff['objectKey'], |
| 524 | - true, // only for the item creator |
|
| 525 | - false, // no delete all |
|
| 524 | + true, // only for the item creator |
|
| 525 | + false, // no delete all |
|
| 526 | 526 | ); |
| 527 | 527 | |
| 528 | 528 | array_push( |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | ) { |
| 560 | 560 | DB::queryFirstRow( |
| 561 | 561 | 'SELECT * |
| 562 | - FROM ' . prefixTable('templates') . ' |
|
| 562 | + FROM ' . prefixTable('templates').' |
|
| 563 | 563 | WHERE item_id = %i', |
| 564 | 564 | $newID |
| 565 | 565 | ); |
@@ -628,11 +628,11 @@ discard block |
||
| 628 | 628 | ) { |
| 629 | 629 | foreach ($post_restricted_to as $userRest) { |
| 630 | 630 | if (empty($userRest) === false) { |
| 631 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 631 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 632 | 632 | if (empty($listOfRestricted)) { |
| 633 | 633 | $listOfRestricted = $dataTmp['login']; |
| 634 | 634 | } else { |
| 635 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 635 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 636 | 636 | } |
| 637 | 637 | } |
| 638 | 638 | } |
@@ -646,11 +646,11 @@ discard block |
||
| 646 | 646 | if (empty($data['restricted_to']) === false) { |
| 647 | 647 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
| 648 | 648 | if (empty($userRest) === false) { |
| 649 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 649 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 650 | 650 | if (empty($oldRestrictionList) === true) { |
| 651 | 651 | $oldRestrictionList = $dataTmp['login']; |
| 652 | 652 | } else { |
| 653 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 653 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 654 | 654 | } |
| 655 | 655 | } |
| 656 | 656 | } |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | if (empty($post_uploaded_file_id) === false) { |
| 714 | 714 | $rows = DB::query( |
| 715 | 715 | 'SELECT id |
| 716 | - FROM ' . prefixTable('files') . ' |
|
| 716 | + FROM ' . prefixTable('files').' |
|
| 717 | 717 | WHERE id_item = %s', |
| 718 | 718 | $post_uploaded_file_id |
| 719 | 719 | ); |
@@ -769,7 +769,7 @@ discard block |
||
| 769 | 769 | $lang->get('email_subject_item_updated'), |
| 770 | 770 | str_replace( |
| 771 | 771 | array('#label', '#link'), |
| 772 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
| 772 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
| 773 | 773 | $lang->get('new_item_email_body') |
| 774 | 774 | ), |
| 775 | 775 | $emailAddress, |
@@ -872,11 +872,11 @@ discard block |
||
| 872 | 872 | // Prepare variables |
| 873 | 873 | $itemInfos = array(); |
| 874 | 874 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 875 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 875 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 876 | 876 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 877 | 877 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 878 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars_decode($dataReceived['tags']) : ''; |
|
| 879 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 878 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars_decode($dataReceived['tags']) : ''; |
|
| 879 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 880 | 880 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 881 | 881 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 882 | 882 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -907,8 +907,7 @@ discard block |
||
| 907 | 907 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 908 | 908 | $dataReceived['to_be_deleted_after_date'], |
| 909 | 909 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 910 | - ) : |
|
| 911 | - ''; |
|
| 910 | + ) : ''; |
|
| 912 | 911 | $post_fields = (filter_var_array( |
| 913 | 912 | $dataReceived['fields'], |
| 914 | 913 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -968,7 +967,7 @@ discard block |
||
| 968 | 967 | // About special settings |
| 969 | 968 | $dataFolderSettings = DB::queryFirstRow( |
| 970 | 969 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 971 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 970 | + FROM ' . prefixTable('nested_tree').' |
|
| 972 | 971 | WHERE id = %i', |
| 973 | 972 | $inputData['folderId'] |
| 974 | 973 | ); |
@@ -984,7 +983,7 @@ discard block |
||
| 984 | 983 | // Get folder complexity |
| 985 | 984 | $folderComplexity = DB::queryfirstrow( |
| 986 | 985 | 'SELECT valeur |
| 987 | - FROM ' . prefixTable('misc') . ' |
|
| 986 | + FROM ' . prefixTable('misc').' |
|
| 988 | 987 | WHERE type = %s AND intitule = %i', |
| 989 | 988 | 'complex', |
| 990 | 989 | $inputData['folderId'] |
@@ -1029,8 +1028,8 @@ discard block |
||
| 1029 | 1028 | // Get all informations for this item |
| 1030 | 1029 | $dataItem = DB::queryfirstrow( |
| 1031 | 1030 | 'SELECT * |
| 1032 | - FROM ' . prefixTable('items') . ' as i |
|
| 1033 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1031 | + FROM ' . prefixTable('items').' as i |
|
| 1032 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1034 | 1033 | WHERE i.id=%i AND l.action = %s', |
| 1035 | 1034 | $inputData['itemId'], |
| 1036 | 1035 | 'at_creation' |
@@ -1040,7 +1039,7 @@ discard block |
||
| 1040 | 1039 | //db::debugmode(true); |
| 1041 | 1040 | DB::query( |
| 1042 | 1041 | 'SELECT * |
| 1043 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1042 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1044 | 1043 | WHERE object_id = %i AND user_id = %s', |
| 1045 | 1044 | $inputData['itemId'], |
| 1046 | 1045 | $session->get('user-id') |
@@ -1090,9 +1089,9 @@ discard block |
||
| 1090 | 1089 | '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, |
| 1091 | 1090 | 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, |
| 1092 | 1091 | u.login as user_login, u.email as user_email |
| 1093 | - FROM ' . prefixTable('items') . ' as i |
|
| 1094 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1095 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1092 | + FROM ' . prefixTable('items').' as i |
|
| 1093 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1094 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1096 | 1095 | WHERE i.id=%i', |
| 1097 | 1096 | $inputData['itemId'] |
| 1098 | 1097 | ); |
@@ -1100,7 +1099,7 @@ discard block |
||
| 1100 | 1099 | // Should we log a password change? |
| 1101 | 1100 | $userKey = DB::queryFirstRow( |
| 1102 | 1101 | 'SELECT share_key |
| 1103 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1102 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1104 | 1103 | WHERE user_id = %i AND object_id = %i', |
| 1105 | 1104 | $session->get('user-id'), |
| 1106 | 1105 | $inputData['itemId'] |
@@ -1160,12 +1159,12 @@ discard block |
||
| 1160 | 1159 | (int) $inputData['folderId'], |
| 1161 | 1160 | (int) $inputData['itemId'], |
| 1162 | 1161 | $encrypted_password_key, |
| 1163 | - true, // only for the item creator |
|
| 1164 | - true, // delete all |
|
| 1162 | + true, // only for the item creator |
|
| 1163 | + true, // delete all |
|
| 1165 | 1164 | ); |
| 1166 | 1165 | |
| 1167 | 1166 | // Create a task to create sharekeys for users |
| 1168 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1167 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1169 | 1168 | $tasksToBePerformed = ['item_password']; |
| 1170 | 1169 | /*createTaskForItem( |
| 1171 | 1170 | 'item_update_create_keys', |
@@ -1184,7 +1183,7 @@ discard block |
||
| 1184 | 1183 | // Get list of tags |
| 1185 | 1184 | $itemTags = DB::queryFirstColumn( |
| 1186 | 1185 | 'SELECT tag |
| 1187 | - FROM ' . prefixTable('tags') . ' |
|
| 1186 | + FROM ' . prefixTable('tags').' |
|
| 1188 | 1187 | WHERE item_id = %i', |
| 1189 | 1188 | $inputData['itemId'] |
| 1190 | 1189 | ); |
@@ -1230,7 +1229,7 @@ discard block |
||
| 1230 | 1229 | $session->get('user-id'), |
| 1231 | 1230 | 'at_modification', |
| 1232 | 1231 | $session->get('user-login'), |
| 1233 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1232 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1234 | 1233 | ); |
| 1235 | 1234 | } |
| 1236 | 1235 | |
@@ -1270,8 +1269,8 @@ discard block |
||
| 1270 | 1269 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1271 | 1270 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1272 | 1271 | c.masked AS masked, i.id AS field_item_id |
| 1273 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1274 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1272 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1273 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1275 | 1274 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1276 | 1275 | $field['id'], |
| 1277 | 1276 | $inputData['itemId'] |
@@ -1287,7 +1286,7 @@ discard block |
||
| 1287 | 1286 | // Perform new query |
| 1288 | 1287 | $dataTmpCat = DB::queryFirstRow( |
| 1289 | 1288 | 'SELECT id, title, encrypted_data, masked |
| 1290 | - FROM ' . prefixTable('categories') . ' |
|
| 1289 | + FROM ' . prefixTable('categories').' |
|
| 1291 | 1290 | WHERE id = %i', |
| 1292 | 1291 | $field['id'] |
| 1293 | 1292 | ); |
@@ -1318,8 +1317,8 @@ discard block |
||
| 1318 | 1317 | (int) $inputData['folderId'], |
| 1319 | 1318 | (int) $newId, |
| 1320 | 1319 | $cryptedStuff['objectKey'], |
| 1321 | - true, // only for the item creator |
|
| 1322 | - true, // delete all |
|
| 1320 | + true, // only for the item creator |
|
| 1321 | + true, // delete all |
|
| 1323 | 1322 | ); |
| 1324 | 1323 | |
| 1325 | 1324 | // update value |
@@ -1367,7 +1366,7 @@ discard block |
||
| 1367 | 1366 | $session->get('user-id'), |
| 1368 | 1367 | 'at_modification', |
| 1369 | 1368 | $session->get('user-login'), |
| 1370 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1369 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1371 | 1370 | ); |
| 1372 | 1371 | } else { |
| 1373 | 1372 | // Case where the field already exists |
@@ -1376,7 +1375,7 @@ discard block |
||
| 1376 | 1375 | // Get user sharekey for this field |
| 1377 | 1376 | $userKey = DB::queryFirstRow( |
| 1378 | 1377 | 'SELECT share_key |
| 1379 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1378 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1380 | 1379 | WHERE user_id = %i AND object_id = %i', |
| 1381 | 1380 | $session->get('user-id'), |
| 1382 | 1381 | $dataTmpCat['field_item_id'] |
@@ -1416,8 +1415,8 @@ discard block |
||
| 1416 | 1415 | (int) $inputData['folderId'], |
| 1417 | 1416 | (int) $dataTmpCat['field_item_id'], |
| 1418 | 1417 | $cryptedStuff['objectKey'], |
| 1419 | - true, // only for the item creator |
|
| 1420 | - true, // delete all |
|
| 1418 | + true, // only for the item creator |
|
| 1419 | + true, // delete all |
|
| 1421 | 1420 | ); |
| 1422 | 1421 | |
| 1423 | 1422 | array_push( |
@@ -1457,7 +1456,7 @@ discard block |
||
| 1457 | 1456 | $session->get('user-id'), |
| 1458 | 1457 | 'at_modification', |
| 1459 | 1458 | $session->get('user-login'), |
| 1460 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1459 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1461 | 1460 | ); |
| 1462 | 1461 | } |
| 1463 | 1462 | } |
@@ -1512,7 +1511,7 @@ discard block |
||
| 1512 | 1511 | ) { |
| 1513 | 1512 | DB::queryFirstRow( |
| 1514 | 1513 | 'SELECT * |
| 1515 | - FROM ' . prefixTable('templates') . ' |
|
| 1514 | + FROM ' . prefixTable('templates').' |
|
| 1516 | 1515 | WHERE item_id = %i', |
| 1517 | 1516 | $inputData['itemId'] |
| 1518 | 1517 | ); |
@@ -1555,7 +1554,7 @@ discard block |
||
| 1555 | 1554 | // check if elem exists in Table. If not add it or update it. |
| 1556 | 1555 | DB::query( |
| 1557 | 1556 | 'SELECT * |
| 1558 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1557 | + FROM ' . prefixTable('automatic_del').' |
|
| 1559 | 1558 | WHERE item_id = %i', |
| 1560 | 1559 | $inputData['itemId'] |
| 1561 | 1560 | ); |
@@ -1582,7 +1581,7 @@ discard block |
||
| 1582 | 1581 | // Store updates performed |
| 1583 | 1582 | array_push( |
| 1584 | 1583 | $arrayOfChanges, |
| 1585 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1584 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1586 | 1585 | ); |
| 1587 | 1586 | |
| 1588 | 1587 | // update LOG |
@@ -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('disabled') |
|
| 1627 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1629 | 1628 | ); |
| 1630 | 1629 | |
| 1631 | 1630 | // update LOG |
@@ -1658,7 +1657,7 @@ discard block |
||
| 1658 | 1657 | if (empty($userId) === false) { |
| 1659 | 1658 | $dataTmp = DB::queryfirstrow( |
| 1660 | 1659 | 'SELECT id, name, lastname |
| 1661 | - FROM ' . prefixTable('users') . ' |
|
| 1660 | + FROM ' . prefixTable('users').' |
|
| 1662 | 1661 | WHERE id= %i', |
| 1663 | 1662 | $userId |
| 1664 | 1663 | ); |
@@ -1666,7 +1665,7 @@ discard block |
||
| 1666 | 1665 | // Add to array |
| 1667 | 1666 | array_push( |
| 1668 | 1667 | $arrayOfUsersRestriction, |
| 1669 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1668 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1670 | 1669 | ); |
| 1671 | 1670 | array_push( |
| 1672 | 1671 | $arrayOfUsersIdRestriction, |
@@ -1697,8 +1696,8 @@ discard block |
||
| 1697 | 1696 | // get values before deleting them |
| 1698 | 1697 | $rows = DB::query( |
| 1699 | 1698 | 'SELECT t.title, t.id AS id |
| 1700 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1701 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1699 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1700 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1702 | 1701 | WHERE r.item_id = %i |
| 1703 | 1702 | ORDER BY t.title ASC', |
| 1704 | 1703 | $inputData['itemId'] |
@@ -1732,7 +1731,7 @@ discard block |
||
| 1732 | 1731 | ); |
| 1733 | 1732 | $dataTmp = DB::queryfirstrow( |
| 1734 | 1733 | 'SELECT title |
| 1735 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1734 | + FROM ' . prefixTable('roles_title').' |
|
| 1736 | 1735 | WHERE id = %i', |
| 1737 | 1736 | $role |
| 1738 | 1737 | ); |
@@ -1760,7 +1759,7 @@ discard block |
||
| 1760 | 1759 | // Get current status |
| 1761 | 1760 | $otpStatus = DB::queryFirstRow( |
| 1762 | 1761 | 'SELECT enabled as otp_is_enabled |
| 1763 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1762 | + FROM ' . prefixTable('items_otp').' |
|
| 1764 | 1763 | WHERE item_id = %i', |
| 1765 | 1764 | $inputData['itemId'] |
| 1766 | 1765 | ); |
@@ -1791,7 +1790,7 @@ discard block |
||
| 1791 | 1790 | $session->get('user-id'), |
| 1792 | 1791 | 'at_modification', |
| 1793 | 1792 | $session->get('user-login'), |
| 1794 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1793 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1795 | 1794 | ); |
| 1796 | 1795 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
| 1797 | 1796 | // Create the entry in items_otp table |
@@ -1835,8 +1834,8 @@ discard block |
||
| 1835 | 1834 | $session->get('user-id'), |
| 1836 | 1835 | 'at_modification', |
| 1837 | 1836 | $session->get('user-login'), |
| 1838 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1839 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1837 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1838 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1840 | 1839 | ); |
| 1841 | 1840 | } |
| 1842 | 1841 | |
@@ -1856,7 +1855,7 @@ discard block |
||
| 1856 | 1855 | $session->get('user-id'), |
| 1857 | 1856 | 'at_modification', |
| 1858 | 1857 | $session->get('user-login'), |
| 1859 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1858 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1860 | 1859 | ); |
| 1861 | 1860 | } |
| 1862 | 1861 | // LOGIN |
@@ -1875,7 +1874,7 @@ discard block |
||
| 1875 | 1874 | $session->get('user-id'), |
| 1876 | 1875 | 'at_modification', |
| 1877 | 1876 | $session->get('user-login'), |
| 1878 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1877 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1879 | 1878 | ); |
| 1880 | 1879 | } |
| 1881 | 1880 | |
@@ -1894,7 +1893,7 @@ discard block |
||
| 1894 | 1893 | $session->get('user-id'), |
| 1895 | 1894 | 'at_modification', |
| 1896 | 1895 | $session->get('user-login'), |
| 1897 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1896 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1898 | 1897 | ); |
| 1899 | 1898 | } |
| 1900 | 1899 | // URL |
@@ -1913,7 +1912,7 @@ discard block |
||
| 1913 | 1912 | $session->get('user-id'), |
| 1914 | 1913 | 'at_modification', |
| 1915 | 1914 | $session->get('user-login'), |
| 1916 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1915 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1917 | 1916 | ); |
| 1918 | 1917 | } |
| 1919 | 1918 | // DESCRIPTION |
@@ -1939,7 +1938,7 @@ discard block |
||
| 1939 | 1938 | // FOLDER |
| 1940 | 1939 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1941 | 1940 | // Get name of folders |
| 1942 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1941 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1943 | 1942 | |
| 1944 | 1943 | // Store updates performed |
| 1945 | 1944 | array_push( |
@@ -1955,7 +1954,7 @@ discard block |
||
| 1955 | 1954 | $session->get('user-id'), |
| 1956 | 1955 | 'at_modification', |
| 1957 | 1956 | $session->get('user-login'), |
| 1958 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1957 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1959 | 1958 | ); |
| 1960 | 1959 | } |
| 1961 | 1960 | // ANYONE_CAN_MODIFY |
@@ -1963,7 +1962,7 @@ discard block |
||
| 1963 | 1962 | // Store updates performed |
| 1964 | 1963 | array_push( |
| 1965 | 1964 | $arrayOfChanges, |
| 1966 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 1965 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 1967 | 1966 | ); |
| 1968 | 1967 | |
| 1969 | 1968 | // Log |
@@ -1974,15 +1973,15 @@ discard block |
||
| 1974 | 1973 | $session->get('user-id'), |
| 1975 | 1974 | 'at_modification', |
| 1976 | 1975 | $session->get('user-login'), |
| 1977 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1976 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1978 | 1977 | ); |
| 1979 | 1978 | } |
| 1980 | 1979 | |
| 1981 | 1980 | // Reload new values |
| 1982 | 1981 | $dataItem = DB::queryfirstrow( |
| 1983 | 1982 | 'SELECT * |
| 1984 | - FROM ' . prefixTable('items') . ' as i |
|
| 1985 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1983 | + FROM ' . prefixTable('items').' as i |
|
| 1984 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1986 | 1985 | WHERE i.id = %i AND l.action = %s', |
| 1987 | 1986 | $inputData['itemId'], |
| 1988 | 1987 | 'at_creation' |
@@ -1991,8 +1990,8 @@ discard block |
||
| 1991 | 1990 | $history = ''; |
| 1992 | 1991 | $rows = DB::query( |
| 1993 | 1992 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 1994 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 1995 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 1993 | + FROM ' . prefixTable('log_items').' as l |
|
| 1994 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 1996 | 1995 | WHERE l.action <> %s AND id_item=%s', |
| 1997 | 1996 | 'at_shown', |
| 1998 | 1997 | $inputData['itemId'] |
@@ -2001,14 +2000,14 @@ discard block |
||
| 2001 | 2000 | if ($record['raison'] === NULL) continue; |
| 2002 | 2001 | $reason = explode(':', $record['raison']); |
| 2003 | 2002 | if (count($reason) > 0) { |
| 2004 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2005 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2006 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2003 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2004 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2005 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2007 | 2006 | : $lang->get(trim($reason[0]))) : ''); |
| 2008 | 2007 | if (empty($history)) { |
| 2009 | 2008 | $history = $sentence; |
| 2010 | 2009 | } else { |
| 2011 | - $history .= '<br />' . $sentence; |
|
| 2010 | + $history .= '<br />'.$sentence; |
|
| 2012 | 2011 | } |
| 2013 | 2012 | } |
| 2014 | 2013 | } |
@@ -2144,7 +2143,7 @@ discard block |
||
| 2144 | 2143 | ) { |
| 2145 | 2144 | // load the original record into an array |
| 2146 | 2145 | $originalRecord = DB::queryfirstrow( |
| 2147 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2146 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2148 | 2147 | WHERE id = %i', |
| 2149 | 2148 | $inputData['itemId'] |
| 2150 | 2149 | ); |
@@ -2163,7 +2162,7 @@ discard block |
||
| 2163 | 2162 | |
| 2164 | 2163 | // Load the destination folder record into an array |
| 2165 | 2164 | $dataDestination = DB::queryfirstrow( |
| 2166 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2165 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2167 | 2166 | WHERE id = %i', |
| 2168 | 2167 | $post_dest_id |
| 2169 | 2168 | ); |
@@ -2171,7 +2170,7 @@ discard block |
||
| 2171 | 2170 | // Get the ITEM object key for the user |
| 2172 | 2171 | $userKey = DB::queryFirstRow( |
| 2173 | 2172 | 'SELECT share_key |
| 2174 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2173 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2175 | 2174 | WHERE user_id = %i AND object_id = %i', |
| 2176 | 2175 | $session->get('user-id'), |
| 2177 | 2176 | $inputData['itemId'] |
@@ -2248,8 +2247,8 @@ discard block |
||
| 2248 | 2247 | // Manage Custom Fields |
| 2249 | 2248 | $rows = DB::query( |
| 2250 | 2249 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2251 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2252 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2250 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2251 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2253 | 2252 | WHERE ci.item_id = %i', |
| 2254 | 2253 | $inputData['itemId'] |
| 2255 | 2254 | ); |
@@ -2261,7 +2260,7 @@ discard block |
||
| 2261 | 2260 | // Get user key |
| 2262 | 2261 | $userKey = DB::queryFirstRow( |
| 2263 | 2262 | 'SELECT share_key |
| 2264 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2263 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2265 | 2264 | WHERE user_id = %i AND object_id = %i', |
| 2266 | 2265 | $session->get('user-id'), |
| 2267 | 2266 | $field['id'] |
@@ -2329,15 +2328,15 @@ discard block |
||
| 2329 | 2328 | $rows = DB::query( |
| 2330 | 2329 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2331 | 2330 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2332 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2333 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2331 | + FROM ' . prefixTable('files').' AS f |
|
| 2332 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2334 | 2333 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2335 | 2334 | $session->get('user-id'), |
| 2336 | 2335 | $inputData['itemId'] |
| 2337 | 2336 | ); |
| 2338 | 2337 | foreach ($rows as $record) { |
| 2339 | 2338 | // Check if file still exists |
| 2340 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2339 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2341 | 2340 | // Step1 - decrypt the file |
| 2342 | 2341 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2343 | 2342 | $fileContent = decryptFile( |
@@ -2348,8 +2347,8 @@ discard block |
||
| 2348 | 2347 | |
| 2349 | 2348 | // Step2 - create file |
| 2350 | 2349 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2351 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2352 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2350 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2351 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2353 | 2352 | if ($outstream === false) { |
| 2354 | 2353 | echo prepareExchangedData( |
| 2355 | 2354 | array( |
@@ -2424,7 +2423,7 @@ discard block |
||
| 2424 | 2423 | |
| 2425 | 2424 | // ------------------------- |
| 2426 | 2425 | // Add specific restrictions |
| 2427 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2426 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2428 | 2427 | foreach ($rows as $record) { |
| 2429 | 2428 | DB::insert( |
| 2430 | 2429 | prefixTable('restriction_to_roles'), |
@@ -2436,7 +2435,7 @@ discard block |
||
| 2436 | 2435 | } |
| 2437 | 2436 | |
| 2438 | 2437 | // Add Tags |
| 2439 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2438 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2440 | 2439 | foreach ($rows as $record) { |
| 2441 | 2440 | DB::insert( |
| 2442 | 2441 | prefixTable('tags'), |
@@ -2466,7 +2465,7 @@ discard block |
||
| 2466 | 2465 | $session->get('user-login') |
| 2467 | 2466 | ); |
| 2468 | 2467 | // reload cache table |
| 2469 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 2468 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 2470 | 2469 | updateCacheTable('reload', null); |
| 2471 | 2470 | |
| 2472 | 2471 | echo (string) prepareExchangedData( |
@@ -2537,7 +2536,7 @@ discard block |
||
| 2537 | 2536 | // then we can show it |
| 2538 | 2537 | $item_deleted = DB::queryFirstRow( |
| 2539 | 2538 | 'SELECT * |
| 2540 | - FROM ' . prefixTable('log_items') . ' |
|
| 2539 | + FROM ' . prefixTable('log_items').' |
|
| 2541 | 2540 | WHERE id_item = %i AND action = %s |
| 2542 | 2541 | ORDER BY date DESC |
| 2543 | 2542 | LIMIT 0, 1', |
@@ -2548,7 +2547,7 @@ discard block |
||
| 2548 | 2547 | |
| 2549 | 2548 | $item_restored = DB::queryFirstRow( |
| 2550 | 2549 | 'SELECT * |
| 2551 | - FROM ' . prefixTable('log_items') . ' |
|
| 2550 | + FROM ' . prefixTable('log_items').' |
|
| 2552 | 2551 | WHERE id_item = %i AND action = %s |
| 2553 | 2552 | ORDER BY date DESC |
| 2554 | 2553 | LIMIT 0, 1', |
@@ -2572,8 +2571,8 @@ discard block |
||
| 2572 | 2571 | // Get all informations for this item |
| 2573 | 2572 | $dataItem = DB::queryfirstrow( |
| 2574 | 2573 | 'SELECT * |
| 2575 | - FROM ' . prefixTable('items') . ' as i |
|
| 2576 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2574 | + FROM ' . prefixTable('items').' as i |
|
| 2575 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2577 | 2576 | WHERE i.id = %i AND l.action = %s', |
| 2578 | 2577 | $inputData['id'], |
| 2579 | 2578 | 'at_creation' |
@@ -2582,7 +2581,7 @@ discard block |
||
| 2582 | 2581 | // Notification |
| 2583 | 2582 | DB::queryfirstrow( |
| 2584 | 2583 | 'SELECT * |
| 2585 | - FROM ' . prefixTable('notification') . ' |
|
| 2584 | + FROM ' . prefixTable('notification').' |
|
| 2586 | 2585 | WHERE item_id = %i AND user_id = %i', |
| 2587 | 2586 | $inputData['id'], |
| 2588 | 2587 | $session->get('user-id') |
@@ -2625,7 +2624,7 @@ discard block |
||
| 2625 | 2624 | |
| 2626 | 2625 | // manage case of API user |
| 2627 | 2626 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2628 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2627 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2629 | 2628 | $arrData['id_user'] = API_USER_ID; |
| 2630 | 2629 | $arrData['author_email'] = ''; |
| 2631 | 2630 | $arrData['notification_status'] = false; |
@@ -2635,7 +2634,7 @@ discard block |
||
| 2635 | 2634 | $tags = array(); |
| 2636 | 2635 | $rows = DB::query( |
| 2637 | 2636 | 'SELECT tag |
| 2638 | - FROM ' . prefixTable('tags') . ' |
|
| 2637 | + FROM ' . prefixTable('tags').' |
|
| 2639 | 2638 | WHERE item_id = %i', |
| 2640 | 2639 | $inputData['id'] |
| 2641 | 2640 | ); |
@@ -2660,7 +2659,7 @@ discard block |
||
| 2660 | 2659 | // Check if user has a role that is accepted |
| 2661 | 2660 | $rows_tmp = DB::query( |
| 2662 | 2661 | 'SELECT role_id |
| 2663 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2662 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2664 | 2663 | WHERE item_id=%i', |
| 2665 | 2664 | $inputData['id'] |
| 2666 | 2665 | ); |
@@ -2674,7 +2673,7 @@ discard block |
||
| 2674 | 2673 | // Get the object key for the user |
| 2675 | 2674 | $userKey = DB::queryFirstRow( |
| 2676 | 2675 | 'SELECT share_key |
| 2677 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2676 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2678 | 2677 | WHERE user_id = %i AND object_id = %i', |
| 2679 | 2678 | $session->get('user-id'), |
| 2680 | 2679 | $inputData['id'] |
@@ -2784,8 +2783,8 @@ discard block |
||
| 2784 | 2783 | // Add restriction if item is restricted to roles |
| 2785 | 2784 | $rows = DB::query( |
| 2786 | 2785 | 'SELECT t.title, t.id |
| 2787 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2788 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2786 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2787 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2789 | 2788 | WHERE r.item_id = %i |
| 2790 | 2789 | ORDER BY t.title ASC', |
| 2791 | 2790 | $inputData['id'] |
@@ -2801,8 +2800,8 @@ discard block |
||
| 2801 | 2800 | $tmp = array(); |
| 2802 | 2801 | $rows = DB::query( |
| 2803 | 2802 | 'SELECT k.label, k.id |
| 2804 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2805 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2803 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2804 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2806 | 2805 | WHERE i.item_id = %i |
| 2807 | 2806 | ORDER BY k.label ASC', |
| 2808 | 2807 | $inputData['id'] |
@@ -2885,7 +2884,7 @@ discard block |
||
| 2885 | 2884 | $arrCatList = array(); |
| 2886 | 2885 | $rows_tmp = DB::query( |
| 2887 | 2886 | 'SELECT id_category |
| 2888 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2887 | + FROM ' . prefixTable('categories_folders').' |
|
| 2889 | 2888 | WHERE id_folder=%i', |
| 2890 | 2889 | $inputData['folderId'] |
| 2891 | 2890 | ); |
@@ -2900,8 +2899,8 @@ discard block |
||
| 2900 | 2899 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2901 | 2900 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2902 | 2901 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2903 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2904 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2902 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2903 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2905 | 2904 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2906 | 2905 | $inputData['id'], |
| 2907 | 2906 | $arrCatList |
@@ -2912,7 +2911,7 @@ discard block |
||
| 2912 | 2911 | //db::debugmode(true); |
| 2913 | 2912 | $userKey = DB::queryFirstRow( |
| 2914 | 2913 | 'SELECT share_key |
| 2915 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2914 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2916 | 2915 | WHERE user_id = %i AND object_id = %i', |
| 2917 | 2916 | $session->get('user-id'), |
| 2918 | 2917 | $row['id'] |
@@ -2930,7 +2929,7 @@ discard block |
||
| 2930 | 2929 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2931 | 2930 | // Data is not encrypted in DB |
| 2932 | 2931 | $fieldText = [ |
| 2933 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2932 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2934 | 2933 | 'encrypted' => false, |
| 2935 | 2934 | 'error' => false, |
| 2936 | 2935 | ]; |
@@ -2975,7 +2974,7 @@ discard block |
||
| 2975 | 2974 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2976 | 2975 | $rows_tmp = DB::queryfirstrow( |
| 2977 | 2976 | 'SELECT category_id |
| 2978 | - FROM ' . prefixTable('templates') . ' |
|
| 2977 | + FROM ' . prefixTable('templates').' |
|
| 2979 | 2978 | WHERE item_id = %i', |
| 2980 | 2979 | $inputData['id'] |
| 2981 | 2980 | ); |
@@ -2992,7 +2991,7 @@ discard block |
||
| 2992 | 2991 | // Evaluate if item is ready for all users |
| 2993 | 2992 | $rows_tmp = DB::queryfirstrow( |
| 2994 | 2993 | 'SELECT finished_at |
| 2995 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 2994 | + FROM ' . prefixTable('background_tasks').' |
|
| 2996 | 2995 | WHERE item_id = %i', |
| 2997 | 2996 | $inputData['id'] |
| 2998 | 2997 | ); |
@@ -3009,7 +3008,7 @@ discard block |
||
| 3009 | 3008 | // Is the Item to be deleted? |
| 3010 | 3009 | $dataDelete = DB::queryfirstrow( |
| 3011 | 3010 | 'SELECT * |
| 3012 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3011 | + FROM ' . prefixTable('automatic_del').' |
|
| 3013 | 3012 | WHERE item_id = %i', |
| 3014 | 3013 | $inputData['id'] |
| 3015 | 3014 | ); |
@@ -3088,11 +3087,11 @@ discard block |
||
| 3088 | 3087 | if (empty($dataItem['restricted_to']) === false) { |
| 3089 | 3088 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 3090 | 3089 | if (empty($userRest) === false) { |
| 3091 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 3090 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 3092 | 3091 | if (empty($listOfRestricted)) { |
| 3093 | 3092 | $listOfRestricted = $dataTmp['login']; |
| 3094 | 3093 | } else { |
| 3095 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3094 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3096 | 3095 | } |
| 3097 | 3096 | } |
| 3098 | 3097 | } |
@@ -3166,9 +3165,9 @@ discard block |
||
| 3166 | 3165 | // Load item data |
| 3167 | 3166 | $dataItem = DB::queryFirstRow( |
| 3168 | 3167 | '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 |
| 3169 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3170 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3171 | - INNER JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3168 | + FROM ' . prefixTable('items').' AS i |
|
| 3169 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3170 | + INNER JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3172 | 3171 | WHERE i.id = %i', |
| 3173 | 3172 | $inputData['id'] |
| 3174 | 3173 | ); |
@@ -3190,7 +3189,7 @@ discard block |
||
| 3190 | 3189 | // Check if user has a role that is accepted |
| 3191 | 3190 | $rows_tmp = DB::query( |
| 3192 | 3191 | 'SELECT role_id |
| 3193 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3192 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3194 | 3193 | WHERE item_id=%i', |
| 3195 | 3194 | $inputData['id'] |
| 3196 | 3195 | ); |
@@ -3222,12 +3221,12 @@ discard block |
||
| 3222 | 3221 | // launch query |
| 3223 | 3222 | $rows = DB::query( |
| 3224 | 3223 | 'SELECT id, name, file, extension, size |
| 3225 | - FROM ' . prefixTable('files') . ' |
|
| 3224 | + FROM ' . prefixTable('files').' |
|
| 3226 | 3225 | WHERE id_item = %i AND confirmed = 1', |
| 3227 | 3226 | $inputData['id'] |
| 3228 | 3227 | ); |
| 3229 | 3228 | foreach ($rows as $record) { |
| 3230 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3229 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3231 | 3230 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3232 | 3231 | |
| 3233 | 3232 | array_push( |
@@ -3240,7 +3239,7 @@ discard block |
||
| 3240 | 3239 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3241 | 3240 | 'id' => $record['id'], |
| 3242 | 3241 | 'key' => $session->get('user-key_tmp'), |
| 3243 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3242 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3244 | 3243 | ) |
| 3245 | 3244 | ); |
| 3246 | 3245 | } |
@@ -3278,7 +3277,7 @@ discard block |
||
| 3278 | 3277 | array( |
| 3279 | 3278 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3280 | 3279 | ), |
| 3281 | - 'id=' . $session->get('user-id') |
|
| 3280 | + 'id='.$session->get('user-id') |
|
| 3282 | 3281 | ); |
| 3283 | 3282 | } |
| 3284 | 3283 | |
@@ -3287,8 +3286,8 @@ discard block |
||
| 3287 | 3286 | $listOptionsForRoles = array(); |
| 3288 | 3287 | $rows = DB::query( |
| 3289 | 3288 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3290 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3291 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3289 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3290 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3292 | 3291 | WHERE r.folder_id = %i', |
| 3293 | 3292 | $dataItem['id_tree'] |
| 3294 | 3293 | ); |
@@ -3302,9 +3301,9 @@ discard block |
||
| 3302 | 3301 | ); |
| 3303 | 3302 | $rows2 = DB::query( |
| 3304 | 3303 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3305 | - FROM ' . prefixTable('users') . ' |
|
| 3304 | + FROM ' . prefixTable('users').' |
|
| 3306 | 3305 | WHERE fonction_id LIKE %s', |
| 3307 | - '%' . $record['role_id'] . '%' |
|
| 3306 | + '%'.$record['role_id'].'%' |
|
| 3308 | 3307 | ); |
| 3309 | 3308 | foreach ($rows2 as $record2) { |
| 3310 | 3309 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3317,7 +3316,7 @@ discard block |
||
| 3317 | 3316 | array( |
| 3318 | 3317 | 'id' => (int) $record2['id'], |
| 3319 | 3318 | 'login' => $record2['login'], |
| 3320 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3319 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3321 | 3320 | 'email' => $record2['email'], |
| 3322 | 3321 | ) |
| 3323 | 3322 | ); |
@@ -3336,16 +3335,16 @@ discard block |
||
| 3336 | 3335 | $path = ''; |
| 3337 | 3336 | foreach ($arbo as $elem) { |
| 3338 | 3337 | if (empty($path) === true) { |
| 3339 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3338 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3340 | 3339 | } else { |
| 3341 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3340 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3342 | 3341 | } |
| 3343 | 3342 | } |
| 3344 | 3343 | // Build text to show user |
| 3345 | 3344 | if (empty($path) === true) { |
| 3346 | 3345 | $path = addslashes($dataItem['label']); |
| 3347 | 3346 | } else { |
| 3348 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3347 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3349 | 3348 | } |
| 3350 | 3349 | |
| 3351 | 3350 | // Add Admins to notification list if expected |
@@ -3368,7 +3367,7 @@ discard block |
||
| 3368 | 3367 | array( |
| 3369 | 3368 | addslashes($session->get('user-login')), |
| 3370 | 3369 | $path, |
| 3371 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3370 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3372 | 3371 | ), |
| 3373 | 3372 | $lang->get('email_on_open_notification_mail') |
| 3374 | 3373 | ), |
@@ -3378,7 +3377,7 @@ discard block |
||
| 3378 | 3377 | } |
| 3379 | 3378 | |
| 3380 | 3379 | // has this item a change proposal |
| 3381 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3380 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3382 | 3381 | $returnArray['has_change_proposal'] = DB::count(); |
| 3383 | 3382 | |
| 3384 | 3383 | // Setting |
@@ -3389,7 +3388,7 @@ discard block |
||
| 3389 | 3388 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3390 | 3389 | DB::query( |
| 3391 | 3390 | 'SELECT * |
| 3392 | - FROM ' . prefixTable('otv') . ' |
|
| 3391 | + FROM ' . prefixTable('otv').' |
|
| 3393 | 3392 | WHERE item_id = %i |
| 3394 | 3393 | AND time_limit > %i', |
| 3395 | 3394 | $inputData['id'], |
@@ -3489,7 +3488,7 @@ discard block |
||
| 3489 | 3488 | // Load item data |
| 3490 | 3489 | $data = DB::queryFirstRow( |
| 3491 | 3490 | 'SELECT id_tree, id, label |
| 3492 | - FROM ' . prefixTable('items') . ' |
|
| 3491 | + FROM ' . prefixTable('items').' |
|
| 3493 | 3492 | WHERE id = %i OR item_key = %s', |
| 3494 | 3493 | $inputData['itemId'], |
| 3495 | 3494 | $inputData['itemKey'] |
@@ -3563,7 +3562,7 @@ discard block |
||
| 3563 | 3562 | // Load item data |
| 3564 | 3563 | $dataItem = DB::queryFirstRow( |
| 3565 | 3564 | 'SELECT secret, enabled |
| 3566 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3565 | + FROM ' . prefixTable('items_otp').' |
|
| 3567 | 3566 | WHERE item_id = %i', |
| 3568 | 3567 | $inputData['id'] |
| 3569 | 3568 | ); |
@@ -3645,13 +3644,13 @@ discard block |
||
| 3645 | 3644 | |
| 3646 | 3645 | // Check if user is allowed to access this folder |
| 3647 | 3646 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3648 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3647 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3649 | 3648 | break; |
| 3650 | 3649 | } |
| 3651 | 3650 | |
| 3652 | 3651 | // Check if title doesn't contains html codes |
| 3653 | 3652 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3654 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3653 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3655 | 3654 | break; |
| 3656 | 3655 | } |
| 3657 | 3656 | // check that title is not numeric |
@@ -3662,9 +3661,9 @@ discard block |
||
| 3662 | 3661 | |
| 3663 | 3662 | // Check if duplicate folders name are allowed |
| 3664 | 3663 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3665 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3664 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3666 | 3665 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3667 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3666 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3668 | 3667 | break; |
| 3669 | 3668 | } |
| 3670 | 3669 | } |
@@ -3672,7 +3671,7 @@ discard block |
||
| 3672 | 3671 | // query on folder |
| 3673 | 3672 | $data = DB::queryfirstrow( |
| 3674 | 3673 | 'SELECT parent_id, personal_folder |
| 3675 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3674 | + FROM ' . prefixTable('nested_tree').' |
|
| 3676 | 3675 | WHERE id = %i', |
| 3677 | 3676 | $inputData['folderId'] |
| 3678 | 3677 | ); |
@@ -3682,20 +3681,20 @@ discard block |
||
| 3682 | 3681 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3683 | 3682 | $data = DB::queryfirstrow( |
| 3684 | 3683 | 'SELECT valeur |
| 3685 | - FROM ' . prefixTable('misc') . ' |
|
| 3684 | + FROM ' . prefixTable('misc').' |
|
| 3686 | 3685 | WHERE intitule = %i AND type = %s', |
| 3687 | 3686 | $data['parent_id'], |
| 3688 | 3687 | 'complex' |
| 3689 | 3688 | ); |
| 3690 | 3689 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3691 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3690 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3692 | 3691 | break; |
| 3693 | 3692 | } |
| 3694 | 3693 | } |
| 3695 | 3694 | |
| 3696 | 3695 | // update Folders table |
| 3697 | 3696 | $tmp = DB::queryFirstRow( |
| 3698 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3697 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3699 | 3698 | $dataReceived['folder'] |
| 3700 | 3699 | ); |
| 3701 | 3700 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3764,42 +3763,42 @@ discard block |
||
| 3764 | 3763 | in_array($post_target_folder_id, $session->get('user-accessible_folders')) === false) && ($post_target_folder_id === '0' && |
| 3765 | 3764 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3766 | 3765 | ) { |
| 3767 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3766 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3768 | 3767 | echo $returnValues; |
| 3769 | 3768 | break; |
| 3770 | 3769 | } |
| 3771 | 3770 | |
| 3772 | 3771 | $tmp_source = DB::queryFirstRow( |
| 3773 | 3772 | 'SELECT title, parent_id, personal_folder |
| 3774 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3773 | + FROM ' . prefixTable('nested_tree').' |
|
| 3775 | 3774 | WHERE id = %i', |
| 3776 | 3775 | $post_source_folder_id |
| 3777 | 3776 | ); |
| 3778 | 3777 | |
| 3779 | 3778 | $tmp_target = DB::queryFirstRow( |
| 3780 | 3779 | 'SELECT title, parent_id, personal_folder |
| 3781 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3780 | + FROM ' . prefixTable('nested_tree').' |
|
| 3782 | 3781 | WHERE id = %i', |
| 3783 | 3782 | $post_target_folder_id |
| 3784 | 3783 | ); |
| 3785 | 3784 | |
| 3786 | 3785 | // check if target is not a child of source |
| 3787 | 3786 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3788 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3787 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3789 | 3788 | echo $returnValues; |
| 3790 | 3789 | break; |
| 3791 | 3790 | } |
| 3792 | 3791 | |
| 3793 | 3792 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3794 | 3793 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3795 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3794 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3796 | 3795 | echo $returnValues; |
| 3797 | 3796 | break; |
| 3798 | 3797 | } |
| 3799 | 3798 | |
| 3800 | 3799 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3801 | 3800 | if ($tmp_source['title'] === $session->get('user-id') || $tmp_target['title'] === $session->get('user-id')) { |
| 3802 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3801 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3803 | 3802 | echo $returnValues; |
| 3804 | 3803 | break; |
| 3805 | 3804 | } |
@@ -3919,7 +3918,7 @@ discard block |
||
| 3919 | 3918 | $uniqueLoadData['path'] = $arr_arbo; |
| 3920 | 3919 | |
| 3921 | 3920 | // store last folder accessed in cookie |
| 3922 | - $arr_cookie_options = array ( |
|
| 3921 | + $arr_cookie_options = array( |
|
| 3923 | 3922 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3924 | 3923 | 'path' => '/', |
| 3925 | 3924 | 'secure' => true, |
@@ -3934,7 +3933,7 @@ discard block |
||
| 3934 | 3933 | foreach ($session->get('user-roles_array') as $role) { |
| 3935 | 3934 | $roleQ = DB::queryfirstrow( |
| 3936 | 3935 | 'SELECT allow_pw_change |
| 3937 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3936 | + FROM ' . prefixTable('roles_title').' |
|
| 3938 | 3937 | WHERE id = %i', |
| 3939 | 3938 | $role |
| 3940 | 3939 | ); |
@@ -3965,11 +3964,11 @@ discard block |
||
| 3965 | 3964 | |
| 3966 | 3965 | foreach ($session->get('user-roles_array') as $role) { |
| 3967 | 3966 | $access = DB::queryFirstRow( |
| 3968 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3967 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3969 | 3968 | $role, |
| 3970 | 3969 | $inputData['id'] |
| 3971 | 3970 | ); |
| 3972 | - if (DB::count()>0) { |
|
| 3971 | + if (DB::count() > 0) { |
|
| 3973 | 3972 | if ($access['type'] === 'R') { |
| 3974 | 3973 | array_push($arrTmp, 10); |
| 3975 | 3974 | } elseif ($access['type'] === 'W') { |
@@ -4027,7 +4026,7 @@ discard block |
||
| 4027 | 4026 | } else { |
| 4028 | 4027 | DB::query( |
| 4029 | 4028 | 'SELECT * |
| 4030 | - FROM ' . prefixTable('items') . ' |
|
| 4029 | + FROM ' . prefixTable('items').' |
|
| 4031 | 4030 | WHERE inactif = %i', |
| 4032 | 4031 | 0 |
| 4033 | 4032 | ); |
@@ -4037,7 +4036,7 @@ discard block |
||
| 4037 | 4036 | |
| 4038 | 4037 | // Get folder complexity |
| 4039 | 4038 | $folderComplexity = DB::queryFirstRow( |
| 4040 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4039 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4041 | 4040 | 'complex', |
| 4042 | 4041 | $inputData['id'] |
| 4043 | 4042 | ); |
@@ -4049,7 +4048,7 @@ discard block |
||
| 4049 | 4048 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4050 | 4049 | $folderRow = DB::query( |
| 4051 | 4050 | 'SELECT id_category |
| 4052 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4051 | + FROM ' . prefixTable('categories_folders').' |
|
| 4053 | 4052 | WHERE id_folder = %i', |
| 4054 | 4053 | $inputData['id'] |
| 4055 | 4054 | ); |
@@ -4164,13 +4163,13 @@ discard block |
||
| 4164 | 4163 | // List all ITEMS |
| 4165 | 4164 | if ($folderIsPf === false) { |
| 4166 | 4165 | $where->add('i.inactif=%i', 0); |
| 4167 | - $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)"); |
|
| 4166 | + $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)"); |
|
| 4168 | 4167 | if (empty($limited_to_items) === false) { |
| 4169 | 4168 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 4170 | 4169 | } |
| 4171 | 4170 | |
| 4172 | - $query_limit = ' LIMIT ' . |
|
| 4173 | - $start . ',' . |
|
| 4171 | + $query_limit = ' LIMIT '. |
|
| 4172 | + $start.','. |
|
| 4174 | 4173 | $post_nb_items_to_display_once; |
| 4175 | 4174 | //db::debugmode(true); |
| 4176 | 4175 | $rows = DB::query( |
@@ -4182,9 +4181,9 @@ discard block |
||
| 4182 | 4181 | l.id_user AS log_user, |
| 4183 | 4182 | i.url AS link, |
| 4184 | 4183 | i.email AS email |
| 4185 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4186 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4187 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4184 | + FROM ' . prefixTable('items').' AS i |
|
| 4185 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4186 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4188 | 4187 | WHERE %l |
| 4189 | 4188 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4190 | 4189 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4204,9 +4203,9 @@ discard block |
||
| 4204 | 4203 | l.id_user AS log_user, |
| 4205 | 4204 | i.url AS link, |
| 4206 | 4205 | i.email AS email |
| 4207 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4208 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4209 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4206 | + FROM ' . prefixTable('items').' AS i |
|
| 4207 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4208 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4210 | 4209 | WHERE %l |
| 4211 | 4210 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4212 | 4211 | ORDER BY i.label ASC, l.date DESC', |
@@ -4239,7 +4238,7 @@ discard block |
||
| 4239 | 4238 | $item_is_restricted_to_role = false; |
| 4240 | 4239 | DB::queryfirstrow( |
| 4241 | 4240 | 'SELECT role_id |
| 4242 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4241 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4243 | 4242 | WHERE item_id = %i', |
| 4244 | 4243 | $record['id'] |
| 4245 | 4244 | ); |
@@ -4251,7 +4250,7 @@ discard block |
||
| 4251 | 4250 | $user_is_included_in_role = false; |
| 4252 | 4251 | DB::query( |
| 4253 | 4252 | 'SELECT role_id |
| 4254 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4253 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4255 | 4254 | WHERE item_id = %i AND role_id IN %ls', |
| 4256 | 4255 | $record['id'], |
| 4257 | 4256 | $session->get('user-roles_array') |
@@ -4458,9 +4457,9 @@ discard block |
||
| 4458 | 4457 | if ((int) $start === 0) { |
| 4459 | 4458 | DB::query( |
| 4460 | 4459 | 'SELECT i.id |
| 4461 | - FROM ' . prefixTable('items') . ' as i |
|
| 4462 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4463 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4460 | + FROM ' . prefixTable('items').' as i |
|
| 4461 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4462 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4464 | 4463 | WHERE %l |
| 4465 | 4464 | ORDER BY i.label ASC, l.date DESC', |
| 4466 | 4465 | $where |
@@ -4524,8 +4523,8 @@ discard block |
||
| 4524 | 4523 | // Run query |
| 4525 | 4524 | $dataItem = DB::queryfirstrow( |
| 4526 | 4525 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4527 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4528 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4526 | + FROM ' . prefixTable('items').' AS i |
|
| 4527 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4529 | 4528 | WHERE user_id = %i AND i.item_key = %s', |
| 4530 | 4529 | $session->get('user-id'), |
| 4531 | 4530 | $inputData['itemKey'] |
@@ -4577,7 +4576,7 @@ discard block |
||
| 4577 | 4576 | // get if existing edition lock |
| 4578 | 4577 | $dataItemEditionLocks = DB::query( |
| 4579 | 4578 | 'SELECT timestamp, user_id |
| 4580 | - FROM ' . prefixTable('items_edition') . ' |
|
| 4579 | + FROM ' . prefixTable('items_edition').' |
|
| 4581 | 4580 | WHERE item_id = %i |
| 4582 | 4581 | ORDER BY increment_id DESC', |
| 4583 | 4582 | $inputData['itemId'] |
@@ -4586,7 +4585,7 @@ discard block |
||
| 4586 | 4585 | if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
| 4587 | 4586 | |
| 4588 | 4587 | // Check if item has no edition lock |
| 4589 | - if ((int) DB::count() > 0 ) { |
|
| 4588 | + if ((int) DB::count() > 0) { |
|
| 4590 | 4589 | // get last edition lock |
| 4591 | 4590 | $dataLastItemEditionLock = $dataItemEditionLocks[0]; |
| 4592 | 4591 | |
@@ -4596,10 +4595,10 @@ discard block |
||
| 4596 | 4595 | } else { |
| 4597 | 4596 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4598 | 4597 | } |
| 4599 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4598 | + if (WIP === true) error_log('delay: '.$delay); |
|
| 4600 | 4599 | |
| 4601 | 4600 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4602 | - if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
|
| 4601 | + if (round(abs(time() - $dataTmp['timestamp']), 0) > $delay) { |
|
| 4603 | 4602 | // Case where time is expired |
| 4604 | 4603 | // In this case, delete edition lock and possible ongoing processes |
| 4605 | 4604 | // and continue editing this time |
@@ -4616,7 +4615,7 @@ discard block |
||
| 4616 | 4615 | // Get process Id |
| 4617 | 4616 | $processDetail = DB::queryFirstRow( |
| 4618 | 4617 | 'SELECT increment_id |
| 4619 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4618 | + FROM ' . prefixTable('background_tasks').' |
|
| 4620 | 4619 | WHERE item_id = %i AND finished_at = ""', |
| 4621 | 4620 | $inputData['itemId'] |
| 4622 | 4621 | ); |
@@ -4634,7 +4633,7 @@ discard block |
||
| 4634 | 4633 | // get if existing process ongoing for this item |
| 4635 | 4634 | $dataItemProcessOngoing = DB::queryFirstRow( |
| 4636 | 4635 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 4637 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4636 | + FROM ' . prefixTable('background_tasks').' |
|
| 4638 | 4637 | WHERE item_id = %i AND finished_at = "" |
| 4639 | 4638 | ORDER BY increment_id DESC', |
| 4640 | 4639 | $inputData['itemId'] |
@@ -4661,7 +4660,7 @@ discard block |
||
| 4661 | 4660 | ); |
| 4662 | 4661 | break; |
| 4663 | 4662 | } |
| 4664 | - } elseif (round(abs(time() - $dataTmp['timestamp']),0) <= $delay) { |
|
| 4663 | + } elseif (round(abs(time() - $dataTmp['timestamp']), 0) <= $delay) { |
|
| 4665 | 4664 | // Case where edition lock is already taken by another user |
| 4666 | 4665 | // Then no edition is possible |
| 4667 | 4666 | $returnValues = array( |
@@ -4690,7 +4689,7 @@ discard block |
||
| 4690 | 4689 | // do query on this folder |
| 4691 | 4690 | $data_this_folder = DB::queryFirstRow( |
| 4692 | 4691 | 'SELECT id, personal_folder, title |
| 4693 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4692 | + FROM ' . prefixTable('nested_tree').' |
|
| 4694 | 4693 | WHERE id = %s', |
| 4695 | 4694 | $inputData['folderId'] |
| 4696 | 4695 | ); |
@@ -4730,8 +4729,8 @@ discard block |
||
| 4730 | 4729 | $visibilite = ''; |
| 4731 | 4730 | $data = DB::queryFirstRow( |
| 4732 | 4731 | 'SELECT m.valeur, n.personal_folder |
| 4733 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4734 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4732 | + FROM ' . prefixTable('misc').' AS m |
|
| 4733 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4735 | 4734 | WHERE type=%s AND intitule = %s', |
| 4736 | 4735 | 'complex', |
| 4737 | 4736 | $inputData['folderId'] |
@@ -4744,8 +4743,8 @@ discard block |
||
| 4744 | 4743 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4745 | 4744 | $rows = DB::query( |
| 4746 | 4745 | 'SELECT t.title |
| 4747 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4748 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4746 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4747 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4749 | 4748 | WHERE v.folder_id = %i |
| 4750 | 4749 | GROUP BY title', |
| 4751 | 4750 | $inputData['folderId'] |
@@ -4754,7 +4753,7 @@ discard block |
||
| 4754 | 4753 | if (empty($visibilite)) { |
| 4755 | 4754 | $visibilite = $record['title']; |
| 4756 | 4755 | } else { |
| 4757 | - $visibilite .= ' - ' . $record['title']; |
|
| 4756 | + $visibilite .= ' - '.$record['title']; |
|
| 4758 | 4757 | } |
| 4759 | 4758 | } |
| 4760 | 4759 | } else { |
@@ -4764,14 +4763,14 @@ discard block |
||
| 4764 | 4763 | // do new query to know if current folder is pf |
| 4765 | 4764 | $data_pf = DB::queryFirstRow( |
| 4766 | 4765 | 'SELECT personal_folder |
| 4767 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4766 | + FROM ' . prefixTable('nested_tree').' |
|
| 4768 | 4767 | WHERE id = %s', |
| 4769 | 4768 | $inputData['folderId'] |
| 4770 | 4769 | ); |
| 4771 | 4770 | |
| 4772 | 4771 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4773 | 4772 | |
| 4774 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4773 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4775 | 4774 | } |
| 4776 | 4775 | |
| 4777 | 4776 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4781,8 +4780,8 @@ discard block |
||
| 4781 | 4780 | $listOptionsForRoles = array(); |
| 4782 | 4781 | $rows = DB::query( |
| 4783 | 4782 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4784 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4785 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4783 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4784 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4786 | 4785 | WHERE r.folder_id = %i', |
| 4787 | 4786 | $inputData['folderId'] |
| 4788 | 4787 | ); |
@@ -4796,7 +4795,7 @@ discard block |
||
| 4796 | 4795 | ); |
| 4797 | 4796 | $rows2 = DB::query( |
| 4798 | 4797 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4799 | - FROM ' . prefixTable('users') . ' |
|
| 4798 | + FROM ' . prefixTable('users').' |
|
| 4800 | 4799 | WHERE admin = 0 AND fonction_id is not null' |
| 4801 | 4800 | ); |
| 4802 | 4801 | foreach ($rows2 as $record2) { |
@@ -4810,7 +4809,7 @@ discard block |
||
| 4810 | 4809 | array( |
| 4811 | 4810 | 'id' => $record2['id'], |
| 4812 | 4811 | 'login' => $record2['login'], |
| 4813 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4812 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4814 | 4813 | 'email' => $record2['email'], |
| 4815 | 4814 | ) |
| 4816 | 4815 | ); |
@@ -4827,13 +4826,13 @@ discard block |
||
| 4827 | 4826 | //db::debugmode(true); |
| 4828 | 4827 | $access = DB::queryFirstRow( |
| 4829 | 4828 | 'SELECT type |
| 4830 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4829 | + FROM ' . prefixTable('roles_values').' |
|
| 4831 | 4830 | WHERE role_id = %i AND folder_id = %i', |
| 4832 | 4831 | $role, |
| 4833 | 4832 | $inputData['folderId'] |
| 4834 | 4833 | ); |
| 4835 | 4834 | //db::debugmode(false); |
| 4836 | - if (DB::count()>0) { |
|
| 4835 | + if (DB::count() > 0) { |
|
| 4837 | 4836 | if ($access['type'] === 'R') { |
| 4838 | 4837 | array_push($arrTmp, 10); |
| 4839 | 4838 | } elseif ($access['type'] === 'W') { |
@@ -4938,7 +4937,7 @@ discard block |
||
| 4938 | 4937 | // Get some info before deleting |
| 4939 | 4938 | $data = DB::queryFirstRow( |
| 4940 | 4939 | 'SELECT name, id_item, file |
| 4941 | - FROM ' . prefixTable('files') . ' |
|
| 4940 | + FROM ' . prefixTable('files').' |
|
| 4942 | 4941 | WHERE id = %i', |
| 4943 | 4942 | $fileId |
| 4944 | 4943 | ); |
@@ -4946,7 +4945,7 @@ discard block |
||
| 4946 | 4945 | // Load item data |
| 4947 | 4946 | $data_item = DB::queryFirstRow( |
| 4948 | 4947 | 'SELECT id_tree |
| 4949 | - FROM ' . prefixTable('items') . ' |
|
| 4948 | + FROM ' . prefixTable('items').' |
|
| 4950 | 4949 | WHERE id = %i', |
| 4951 | 4950 | $data['id_item'] |
| 4952 | 4951 | ); |
@@ -4976,7 +4975,7 @@ discard block |
||
| 4976 | 4975 | $session->get('user-id'), |
| 4977 | 4976 | 'at_modification', |
| 4978 | 4977 | $session->get('user-login'), |
| 4979 | - 'at_del_file : ' . $data['name'] |
|
| 4978 | + 'at_del_file : '.$data['name'] |
|
| 4980 | 4979 | ); |
| 4981 | 4980 | |
| 4982 | 4981 | // DElete sharekeys |
@@ -4987,7 +4986,7 @@ discard block |
||
| 4987 | 4986 | ); |
| 4988 | 4987 | |
| 4989 | 4988 | // Delete file from server |
| 4990 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 4989 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 4991 | 4990 | $fileToDelete = realpath($fileToDelete); |
| 4992 | 4991 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 4993 | 4992 | fileDelete($fileToDelete, $SETTINGS); |
@@ -5041,7 +5040,7 @@ discard block |
||
| 5041 | 5040 | // Update SESSION with this new favourite |
| 5042 | 5041 | $data = DB::queryfirstrow( |
| 5043 | 5042 | 'SELECT label,id_tree |
| 5044 | - FROM ' . prefixTable('items') . ' |
|
| 5043 | + FROM ' . prefixTable('items').' |
|
| 5045 | 5044 | WHERE id = %i', |
| 5046 | 5045 | $inputData['itemId'] |
| 5047 | 5046 | ); |
@@ -5050,7 +5049,7 @@ discard block |
||
| 5050 | 5049 | [ |
| 5051 | 5050 | $inputData['itemId'] => [ |
| 5052 | 5051 | 'label' => $data['label'], |
| 5053 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 5052 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 5054 | 5053 | ], |
| 5055 | 5054 | ], |
| 5056 | 5055 | 'add' |
@@ -5119,8 +5118,8 @@ discard block |
||
| 5119 | 5118 | // get data about item |
| 5120 | 5119 | $dataSource = DB::queryfirstrow( |
| 5121 | 5120 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5122 | - FROM ' . prefixTable('items') . ' as i |
|
| 5123 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5121 | + FROM ' . prefixTable('items').' as i |
|
| 5122 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5124 | 5123 | WHERE i.id=%i', |
| 5125 | 5124 | $inputData['itemId'] |
| 5126 | 5125 | ); |
@@ -5128,7 +5127,7 @@ discard block |
||
| 5128 | 5127 | // get data about new folder |
| 5129 | 5128 | $dataDestination = DB::queryfirstrow( |
| 5130 | 5129 | 'SELECT personal_folder, title |
| 5131 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5130 | + FROM ' . prefixTable('nested_tree').' |
|
| 5132 | 5131 | WHERE id = %i', |
| 5133 | 5132 | $inputData['folderId'] |
| 5134 | 5133 | ); |
@@ -5181,7 +5180,7 @@ discard block |
||
| 5181 | 5180 | // Get fields for this Item |
| 5182 | 5181 | $rows = DB::query( |
| 5183 | 5182 | 'SELECT id |
| 5184 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5183 | + FROM ' . prefixTable('categories_items').' |
|
| 5185 | 5184 | WHERE item_id = %i', |
| 5186 | 5185 | $inputData['itemId'] |
| 5187 | 5186 | ); |
@@ -5198,7 +5197,7 @@ discard block |
||
| 5198 | 5197 | // Get FILES for this Item |
| 5199 | 5198 | $rows = DB::query( |
| 5200 | 5199 | 'SELECT id |
| 5201 | - FROM ' . prefixTable('files') . ' |
|
| 5200 | + FROM ' . prefixTable('files').' |
|
| 5202 | 5201 | WHERE id_item = %i', |
| 5203 | 5202 | $inputData['itemId'] |
| 5204 | 5203 | ); |
@@ -5245,7 +5244,7 @@ discard block |
||
| 5245 | 5244 | // Get the ITEM object key for the user |
| 5246 | 5245 | $userKey = DB::queryFirstRow( |
| 5247 | 5246 | 'SELECT share_key |
| 5248 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5247 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5249 | 5248 | WHERE user_id = %i AND object_id = %i', |
| 5250 | 5249 | $session->get('user-id'), |
| 5251 | 5250 | $inputData['itemId'] |
@@ -5256,8 +5255,8 @@ discard block |
||
| 5256 | 5255 | // This is a public object |
| 5257 | 5256 | $users = DB::query( |
| 5258 | 5257 | 'SELECT id, public_key |
| 5259 | - FROM ' . prefixTable('users') . ' |
|
| 5260 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5258 | + FROM ' . prefixTable('users').' |
|
| 5259 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5261 | 5260 | AND public_key != ""' |
| 5262 | 5261 | ); |
| 5263 | 5262 | foreach ($users as $user) { |
@@ -5277,14 +5276,14 @@ discard block |
||
| 5277 | 5276 | // Get fields for this Item |
| 5278 | 5277 | $rows = DB::query( |
| 5279 | 5278 | 'SELECT id |
| 5280 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5279 | + FROM ' . prefixTable('categories_items').' |
|
| 5281 | 5280 | WHERE item_id = %i', |
| 5282 | 5281 | $inputData['itemId'] |
| 5283 | 5282 | ); |
| 5284 | 5283 | foreach ($rows as $field) { |
| 5285 | 5284 | $userKey = DB::queryFirstRow( |
| 5286 | 5285 | 'SELECT share_key |
| 5287 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5286 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5288 | 5287 | WHERE user_id = %i AND object_id = %i', |
| 5289 | 5288 | $session->get('user-id'), |
| 5290 | 5289 | $field['id'] |
@@ -5295,8 +5294,8 @@ discard block |
||
| 5295 | 5294 | // This is a public object |
| 5296 | 5295 | $users = DB::query( |
| 5297 | 5296 | 'SELECT id, public_key |
| 5298 | - FROM ' . prefixTable('users') . ' |
|
| 5299 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5297 | + FROM ' . prefixTable('users').' |
|
| 5298 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5300 | 5299 | AND public_key != ""' |
| 5301 | 5300 | ); |
| 5302 | 5301 | foreach ($users as $user) { |
@@ -5317,14 +5316,14 @@ discard block |
||
| 5317 | 5316 | // Get FILES for this Item |
| 5318 | 5317 | $rows = DB::query( |
| 5319 | 5318 | 'SELECT id |
| 5320 | - FROM ' . prefixTable('files') . ' |
|
| 5319 | + FROM ' . prefixTable('files').' |
|
| 5321 | 5320 | WHERE id_item = %i', |
| 5322 | 5321 | $inputData['itemId'] |
| 5323 | 5322 | ); |
| 5324 | 5323 | foreach ($rows as $attachment) { |
| 5325 | 5324 | $userKey = DB::queryFirstRow( |
| 5326 | 5325 | 'SELECT share_key |
| 5327 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5326 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5328 | 5327 | WHERE user_id = %i AND object_id = %i', |
| 5329 | 5328 | $session->get('user-id'), |
| 5330 | 5329 | $attachment['id'] |
@@ -5335,8 +5334,8 @@ discard block |
||
| 5335 | 5334 | // This is a public object |
| 5336 | 5335 | $users = DB::query( |
| 5337 | 5336 | 'SELECT id, public_key |
| 5338 | - FROM ' . prefixTable('users') . ' |
|
| 5339 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5337 | + FROM ' . prefixTable('users').' |
|
| 5338 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5340 | 5339 | AND public_key != ""' |
| 5341 | 5340 | ); |
| 5342 | 5341 | foreach ($users as $user) { |
@@ -5374,7 +5373,7 @@ discard block |
||
| 5374 | 5373 | $session->get('user-id'), |
| 5375 | 5374 | 'at_modification', |
| 5376 | 5375 | $session->get('user-login'), |
| 5377 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5376 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5378 | 5377 | ); |
| 5379 | 5378 | |
| 5380 | 5379 | // Update cache table |
@@ -5433,8 +5432,8 @@ discard block |
||
| 5433 | 5432 | // get data about item |
| 5434 | 5433 | $dataSource = DB::queryfirstrow( |
| 5435 | 5434 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5436 | - FROM ' . prefixTable('items') . ' as i |
|
| 5437 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5435 | + FROM ' . prefixTable('items').' as i |
|
| 5436 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5438 | 5437 | WHERE i.id=%i', |
| 5439 | 5438 | $item_id |
| 5440 | 5439 | ); |
@@ -5456,7 +5455,7 @@ discard block |
||
| 5456 | 5455 | |
| 5457 | 5456 | // get data about new folder |
| 5458 | 5457 | $dataDestination = DB::queryfirstrow( |
| 5459 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5458 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5460 | 5459 | $inputData['folderId'] |
| 5461 | 5460 | ); |
| 5462 | 5461 | |
@@ -5498,7 +5497,7 @@ discard block |
||
| 5498 | 5497 | // Get fields for this Item |
| 5499 | 5498 | $rows = DB::query( |
| 5500 | 5499 | 'SELECT id |
| 5501 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5500 | + FROM ' . prefixTable('categories_items').' |
|
| 5502 | 5501 | WHERE item_id = %i', |
| 5503 | 5502 | $item_id |
| 5504 | 5503 | ); |
@@ -5515,7 +5514,7 @@ discard block |
||
| 5515 | 5514 | // Get FILES for this Item |
| 5516 | 5515 | $rows = DB::query( |
| 5517 | 5516 | 'SELECT id |
| 5518 | - FROM ' . prefixTable('files') . ' |
|
| 5517 | + FROM ' . prefixTable('files').' |
|
| 5519 | 5518 | WHERE id_item = %i', |
| 5520 | 5519 | $item_id |
| 5521 | 5520 | ); |
@@ -5570,7 +5569,7 @@ discard block |
||
| 5570 | 5569 | // Get the ITEM object key for the user |
| 5571 | 5570 | $userKey = DB::queryFirstRow( |
| 5572 | 5571 | 'SELECT share_key |
| 5573 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5572 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5574 | 5573 | WHERE user_id = %i AND object_id = %i', |
| 5575 | 5574 | $session->get('user-id'), |
| 5576 | 5575 | $item_id |
@@ -5581,8 +5580,8 @@ discard block |
||
| 5581 | 5580 | // This is a public object |
| 5582 | 5581 | $users = DB::query( |
| 5583 | 5582 | 'SELECT id, public_key |
| 5584 | - FROM ' . prefixTable('users') . ' |
|
| 5585 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5583 | + FROM ' . prefixTable('users').' |
|
| 5584 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5586 | 5585 | AND public_key != ""' |
| 5587 | 5586 | ); |
| 5588 | 5587 | foreach ($users as $user) { |
@@ -5602,14 +5601,14 @@ discard block |
||
| 5602 | 5601 | // Get fields for this Item |
| 5603 | 5602 | $rows = DB::query( |
| 5604 | 5603 | 'SELECT id |
| 5605 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5604 | + FROM ' . prefixTable('categories_items').' |
|
| 5606 | 5605 | WHERE item_id = %i', |
| 5607 | 5606 | $item_id |
| 5608 | 5607 | ); |
| 5609 | 5608 | foreach ($rows as $field) { |
| 5610 | 5609 | $userKey = DB::queryFirstRow( |
| 5611 | 5610 | 'SELECT share_key |
| 5612 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5611 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5613 | 5612 | WHERE user_id = %i AND object_id = %i', |
| 5614 | 5613 | $session->get('user-id'), |
| 5615 | 5614 | $field['id'] |
@@ -5620,8 +5619,8 @@ discard block |
||
| 5620 | 5619 | // This is a public object |
| 5621 | 5620 | $users = DB::query( |
| 5622 | 5621 | 'SELECT id, public_key |
| 5623 | - FROM ' . prefixTable('users') . ' |
|
| 5624 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5622 | + FROM ' . prefixTable('users').' |
|
| 5623 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5625 | 5624 | AND public_key != ""' |
| 5626 | 5625 | ); |
| 5627 | 5626 | foreach ($users as $user) { |
@@ -5642,14 +5641,14 @@ discard block |
||
| 5642 | 5641 | // Get FILES for this Item |
| 5643 | 5642 | $rows = DB::query( |
| 5644 | 5643 | 'SELECT id |
| 5645 | - FROM ' . prefixTable('files') . ' |
|
| 5644 | + FROM ' . prefixTable('files').' |
|
| 5646 | 5645 | WHERE id_item = %i', |
| 5647 | 5646 | $item_id |
| 5648 | 5647 | ); |
| 5649 | 5648 | foreach ($rows as $attachment) { |
| 5650 | 5649 | $userKey = DB::queryFirstRow( |
| 5651 | 5650 | 'SELECT share_key |
| 5652 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5651 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5653 | 5652 | WHERE user_id = %i AND object_id = %i', |
| 5654 | 5653 | $session->get('user-id'), |
| 5655 | 5654 | $attachment['id'] |
@@ -5660,8 +5659,8 @@ discard block |
||
| 5660 | 5659 | // This is a public object |
| 5661 | 5660 | $users = DB::query( |
| 5662 | 5661 | 'SELECT id, public_key |
| 5663 | - FROM ' . prefixTable('users') . ' |
|
| 5664 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5662 | + FROM ' . prefixTable('users').' |
|
| 5663 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5665 | 5664 | AND public_key != ""' |
| 5666 | 5665 | ); |
| 5667 | 5666 | foreach ($users as $user) { |
@@ -5698,13 +5697,13 @@ discard block |
||
| 5698 | 5697 | $session->get('user-id'), |
| 5699 | 5698 | 'at_modification', |
| 5700 | 5699 | $session->get('user-login'), |
| 5701 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5700 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5702 | 5701 | ); |
| 5703 | 5702 | } |
| 5704 | 5703 | } |
| 5705 | 5704 | |
| 5706 | 5705 | // reload cache table |
| 5707 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5706 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5708 | 5707 | updateCacheTable('reload', null); |
| 5709 | 5708 | |
| 5710 | 5709 | echo (string) prepareExchangedData( |
@@ -5768,7 +5767,7 @@ discard block |
||
| 5768 | 5767 | // get info |
| 5769 | 5768 | $dataSource = DB::queryfirstrow( |
| 5770 | 5769 | 'SELECT label, id_tree |
| 5771 | - FROM ' . prefixTable('items') . ' |
|
| 5770 | + FROM ' . prefixTable('items').' |
|
| 5772 | 5771 | WHERE id=%i', |
| 5773 | 5772 | $item_id |
| 5774 | 5773 | ); |
@@ -5867,8 +5866,8 @@ discard block |
||
| 5867 | 5866 | } |
| 5868 | 5867 | if ($inputData['cat'] === 'request_access_to_author') { |
| 5869 | 5868 | // Variables |
| 5870 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
| 5871 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
| 5869 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
| 5870 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
| 5872 | 5871 | |
| 5873 | 5872 | // Get path |
| 5874 | 5873 | $path = geItemReadablePath( |
@@ -5882,7 +5881,7 @@ discard block |
||
| 5882 | 5881 | $lang->get('email_request_access_subject'), |
| 5883 | 5882 | str_replace( |
| 5884 | 5883 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5885 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5884 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5886 | 5885 | $lang->get('email_request_access_mail') |
| 5887 | 5886 | ), |
| 5888 | 5887 | $dataAuthor['email'], |
@@ -5891,7 +5890,7 @@ discard block |
||
| 5891 | 5890 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5892 | 5891 | $dataItem = DB::queryfirstrow( |
| 5893 | 5892 | 'SELECT label,id_tree |
| 5894 | - FROM ' . prefixTable('items') . ' |
|
| 5893 | + FROM ' . prefixTable('items').' |
|
| 5895 | 5894 | WHERE id= %i', |
| 5896 | 5895 | $inputData['id'] |
| 5897 | 5896 | ); |
@@ -5914,7 +5913,7 @@ discard block |
||
| 5914 | 5913 | ), |
| 5915 | 5914 | array( |
| 5916 | 5915 | empty($SETTINGS['email_server_url']) === false ? |
| 5917 | - $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'], |
|
| 5916 | + $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'], |
|
| 5918 | 5917 | addslashes($session->get('user-login')), |
| 5919 | 5918 | addslashes($path), |
| 5920 | 5919 | ), |
@@ -6014,8 +6013,8 @@ discard block |
||
| 6014 | 6013 | // Get all informations for this item |
| 6015 | 6014 | $dataItem = DB::queryfirstrow( |
| 6016 | 6015 | 'SELECT * |
| 6017 | - FROM ' . prefixTable('items') . ' as i |
|
| 6018 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 6016 | + FROM ' . prefixTable('items').' as i |
|
| 6017 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 6019 | 6018 | WHERE i.id=%i AND l.action = %s', |
| 6020 | 6019 | $item_id, |
| 6021 | 6020 | 'at_creation' |
@@ -6044,18 +6043,18 @@ discard block |
||
| 6044 | 6043 | $session->get('user-login'), |
| 6045 | 6044 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 6046 | 6045 | null, |
| 6047 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 6046 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 6048 | 6047 | ); |
| 6049 | 6048 | // Prepare new line |
| 6050 | 6049 | $data = DB::queryfirstrow( |
| 6051 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 6050 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 6052 | 6051 | $item_id |
| 6053 | 6052 | ); |
| 6054 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 6053 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 6055 | 6054 | // send back |
| 6056 | 6055 | $data = array( |
| 6057 | 6056 | 'error' => '', |
| 6058 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 6057 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 6059 | 6058 | ); |
| 6060 | 6059 | echo (string) prepareExchangedData( |
| 6061 | 6060 | $data, |
@@ -6127,7 +6126,7 @@ discard block |
||
| 6127 | 6126 | ); |
| 6128 | 6127 | |
| 6129 | 6128 | // delete all existing old otv codes |
| 6130 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time()); |
|
| 6129 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time()); |
|
| 6131 | 6130 | foreach ($rows as $record) { |
| 6132 | 6131 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 6133 | 6132 | } |
@@ -6149,8 +6148,8 @@ discard block |
||
| 6149 | 6148 | // Should we log a password change? |
| 6150 | 6149 | $itemQ = DB::queryFirstRow( |
| 6151 | 6150 | 'SELECT s.share_key, i.pw |
| 6152 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6153 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6151 | + FROM ' . prefixTable('items').' AS i |
|
| 6152 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6154 | 6153 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6155 | 6154 | $session->get('user-id'), |
| 6156 | 6155 | $dataReceived['id'] |
@@ -6205,7 +6204,7 @@ discard block |
||
| 6205 | 6204 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6206 | 6205 | $SETTINGS['otv_expiration_period'] = 7; |
| 6207 | 6206 | } |
| 6208 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6207 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6209 | 6208 | |
| 6210 | 6209 | echo json_encode( |
| 6211 | 6210 | array( |
@@ -6236,7 +6235,7 @@ discard block |
||
| 6236 | 6235 | // get parameters from original link |
| 6237 | 6236 | $url = $dataReceived['original_link']; |
| 6238 | 6237 | $parts = parse_url($url); |
| 6239 | - if(isset($parts['query'])){ |
|
| 6238 | + if (isset($parts['query'])) { |
|
| 6240 | 6239 | parse_str($parts['query'], $orignal_link_parameters); |
| 6241 | 6240 | } else { |
| 6242 | 6241 | $orignal_link_parameters = array(); |
@@ -6267,13 +6266,13 @@ discard block |
||
| 6267 | 6266 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6268 | 6267 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6269 | 6268 | if (str_contains($domain_host, 'www.') === true) { |
| 6270 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6269 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6271 | 6270 | } else { |
| 6272 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6271 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6273 | 6272 | } |
| 6274 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6273 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6275 | 6274 | } else { |
| 6276 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6275 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6277 | 6276 | } |
| 6278 | 6277 | |
| 6279 | 6278 | echo (string) prepareExchangedData( |
@@ -6308,8 +6307,8 @@ discard block |
||
| 6308 | 6307 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6309 | 6308 | f.extension AS extension, f.type AS type, |
| 6310 | 6309 | s.share_key AS share_key |
| 6311 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6312 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6310 | + FROM ' . prefixTable('files').' AS f |
|
| 6311 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6313 | 6312 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6314 | 6313 | $session->get('user-id'), |
| 6315 | 6314 | $inputData['id'] |
@@ -6330,7 +6329,7 @@ discard block |
||
| 6330 | 6329 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6331 | 6330 | |
| 6332 | 6331 | // prepare image info |
| 6333 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6332 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6334 | 6333 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6335 | 6334 | |
| 6336 | 6335 | // Get image content |
@@ -6345,7 +6344,7 @@ discard block |
||
| 6345 | 6344 | echo (string) prepareExchangedData( |
| 6346 | 6345 | array( |
| 6347 | 6346 | 'error' => false, |
| 6348 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6347 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6349 | 6348 | 'file_type' => $file_info['type'], |
| 6350 | 6349 | 'file_content' => $fileContent, |
| 6351 | 6350 | ), |
@@ -6398,16 +6397,16 @@ discard block |
||
| 6398 | 6397 | $idFolder = $dataReceived['idFolder']; |
| 6399 | 6398 | |
| 6400 | 6399 | // don't check if Personal Folder |
| 6401 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 6400 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 6402 | 6401 | if ($data['title'] === $session->get('user-id')) { |
| 6403 | 6402 | // send data |
| 6404 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 6403 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 6405 | 6404 | } else { |
| 6406 | 6405 | if ($inputData['option'] === 'same_folder') { |
| 6407 | 6406 | // case unique folder |
| 6408 | 6407 | DB::query( |
| 6409 | 6408 | 'SELECT label |
| 6410 | - FROM ' . prefixTable('items') . ' |
|
| 6409 | + FROM ' . prefixTable('items').' |
|
| 6411 | 6410 | WHERE id_tree = %i AND label = %s', |
| 6412 | 6411 | $idFolder, |
| 6413 | 6412 | $label |
@@ -6419,7 +6418,7 @@ discard block |
||
| 6419 | 6418 | $arrayPf = array(); |
| 6420 | 6419 | if (empty($row['id']) === false) { |
| 6421 | 6420 | $rows = DB::query( |
| 6422 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 6421 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 6423 | 6422 | '1' |
| 6424 | 6423 | ); |
| 6425 | 6424 | foreach ($rows as $record) { |
@@ -6434,12 +6433,12 @@ discard block |
||
| 6434 | 6433 | $where->add('id_tree = %i', $idFolder); |
| 6435 | 6434 | $where->add('label = %s', $label); |
| 6436 | 6435 | if (empty($arrayPf) === false) { |
| 6437 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 6436 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 6438 | 6437 | } |
| 6439 | 6438 | |
| 6440 | 6439 | DB::query( |
| 6441 | 6440 | 'SELECT label |
| 6442 | - FROM ' . prefixTable('items') . ' |
|
| 6441 | + FROM ' . prefixTable('items').' |
|
| 6443 | 6442 | WHERE %l', |
| 6444 | 6443 | $where |
| 6445 | 6444 | ); |
@@ -6451,7 +6450,7 @@ discard block |
||
| 6451 | 6450 | } |
| 6452 | 6451 | |
| 6453 | 6452 | // send data |
| 6454 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 6453 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 6455 | 6454 | } |
| 6456 | 6455 | break; |
| 6457 | 6456 | |
@@ -6561,7 +6560,7 @@ discard block |
||
| 6561 | 6560 | $arbo = $tree->getPath($folder->id, false); |
| 6562 | 6561 | $path = ''; |
| 6563 | 6562 | foreach ($arbo as $elem) { |
| 6564 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6563 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6565 | 6564 | } |
| 6566 | 6565 | |
| 6567 | 6566 | // Build array |
@@ -6631,7 +6630,7 @@ discard block |
||
| 6631 | 6630 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6632 | 6631 | $rows = DB::query( |
| 6633 | 6632 | 'SELECT id, categories |
| 6634 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6633 | + FROM ' . prefixTable('nested_tree').' |
|
| 6635 | 6634 | WHERE id IN (%l)', |
| 6636 | 6635 | implode(',', $foldersArray) |
| 6637 | 6636 | ); |
@@ -6673,7 +6672,7 @@ discard block |
||
| 6673 | 6672 | // get item info |
| 6674 | 6673 | $dataItem = DB::queryFirstRow( |
| 6675 | 6674 | 'SELECT * |
| 6676 | - FROM ' . prefixTable('items') . ' |
|
| 6675 | + FROM ' . prefixTable('items').' |
|
| 6677 | 6676 | WHERE id=%i', |
| 6678 | 6677 | $inputData['itemId'] |
| 6679 | 6678 | ); |
@@ -6685,8 +6684,8 @@ discard block |
||
| 6685 | 6684 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6686 | 6685 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6687 | 6686 | l.old_value as old_value |
| 6688 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6689 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6687 | + FROM ' . prefixTable('log_items').' as l |
|
| 6688 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6690 | 6689 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6691 | 6690 | ORDER BY date DESC', |
| 6692 | 6691 | $inputData['itemId'], |
@@ -6701,18 +6700,18 @@ discard block |
||
| 6701 | 6700 | |
| 6702 | 6701 | // imported via API |
| 6703 | 6702 | if (empty($record['login']) === true) { |
| 6704 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6703 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6705 | 6704 | } |
| 6706 | 6705 | |
| 6707 | 6706 | // Prepare avatar |
| 6708 | 6707 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6709 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6710 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6708 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6709 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6711 | 6710 | } else { |
| 6712 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6711 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6713 | 6712 | } |
| 6714 | 6713 | } else { |
| 6715 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6714 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6716 | 6715 | } |
| 6717 | 6716 | |
| 6718 | 6717 | // Prepare action |
@@ -6732,7 +6731,7 @@ discard block |
||
| 6732 | 6731 | $previous_passwords, |
| 6733 | 6732 | [ |
| 6734 | 6733 | 'password' => htmlentities($previous_pwd['string']), |
| 6735 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6734 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6736 | 6735 | ] |
| 6737 | 6736 | ); |
| 6738 | 6737 | } |
@@ -6745,19 +6744,19 @@ discard block |
||
| 6745 | 6744 | $action = $lang->get($reason[0]); |
| 6746 | 6745 | if ($reason[0] === 'at_moved') { |
| 6747 | 6746 | $tmp = explode(' -> ', $reason[1]); |
| 6748 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6747 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6749 | 6748 | } elseif ($reason[0] === 'at_field') { |
| 6750 | 6749 | $tmp = explode(' => ', $reason[1]); |
| 6751 | 6750 | if (count($tmp) > 1) { |
| 6752 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6753 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6751 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6752 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6754 | 6753 | } else { |
| 6755 | 6754 | $detail = trim($reason[1]); |
| 6756 | 6755 | } |
| 6757 | 6756 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6758 | 6757 | $tmp = explode(' => ', $reason[1]); |
| 6759 | 6758 | $detail = empty(trim($tmp[0])) === true ? |
| 6760 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6759 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6761 | 6760 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6762 | 6761 | $detail = $lang->get($reason[1]); |
| 6763 | 6762 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6766,7 +6765,7 @@ discard block |
||
| 6766 | 6765 | $tmp = explode(':', $reason[1]); |
| 6767 | 6766 | $tmp = explode('.', $tmp[0]); |
| 6768 | 6767 | $detail = isBase64($tmp[0]) === true ? |
| 6769 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6768 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6770 | 6769 | } elseif ($reason[0] === 'at_import') { |
| 6771 | 6770 | $detail = ''; |
| 6772 | 6771 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6785,8 +6784,8 @@ discard block |
||
| 6785 | 6784 | array( |
| 6786 | 6785 | 'avatar' => $avatar, |
| 6787 | 6786 | 'login' => $record['login'], |
| 6788 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6789 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6787 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6788 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6790 | 6789 | 'action' => $action, |
| 6791 | 6790 | 'detail' => $detail, |
| 6792 | 6791 | ) |
@@ -6875,18 +6874,18 @@ discard block |
||
| 6875 | 6874 | |
| 6876 | 6875 | // get some info to add to the notification email |
| 6877 | 6876 | $resp_user = DB::queryfirstrow( |
| 6878 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6877 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6879 | 6878 | $session->get('user-id') |
| 6880 | 6879 | ); |
| 6881 | 6880 | $resp_folder = DB::queryfirstrow( |
| 6882 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6881 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6883 | 6882 | $folder |
| 6884 | 6883 | ); |
| 6885 | 6884 | |
| 6886 | 6885 | // notify Managers |
| 6887 | 6886 | $rows = DB::query( |
| 6888 | 6887 | 'SELECT email |
| 6889 | - FROM ' . prefixTable('users') . ' |
|
| 6888 | + FROM ' . prefixTable('users').' |
|
| 6890 | 6889 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6891 | 6890 | 1 |
| 6892 | 6891 | ); |
@@ -6917,14 +6916,14 @@ discard block |
||
| 6917 | 6916 | // Get list of users |
| 6918 | 6917 | $usersList = array(); |
| 6919 | 6918 | $usersString = ''; |
| 6920 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 6919 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 6921 | 6920 | foreach ($rows as $record) { |
| 6922 | 6921 | $usersList[$record['login']] = array( |
| 6923 | 6922 | 'id' => $record['id'], |
| 6924 | 6923 | 'login' => $record['login'], |
| 6925 | 6924 | 'email' => $record['email'], |
| 6926 | 6925 | ); |
| 6927 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 6926 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 6928 | 6927 | } |
| 6929 | 6928 | |
| 6930 | 6929 | $data = array( |
@@ -6964,7 +6963,7 @@ discard block |
||
| 6964 | 6963 | // Send email |
| 6965 | 6964 | $dataItem = DB::queryfirstrow( |
| 6966 | 6965 | 'SELECT label, id_tree |
| 6967 | - FROM ' . prefixTable('items') . ' |
|
| 6966 | + FROM ' . prefixTable('items').' |
|
| 6968 | 6967 | WHERE id = %i', |
| 6969 | 6968 | $inputData['itemId'] |
| 6970 | 6969 | ); |
@@ -7018,7 +7017,7 @@ discard block |
||
| 7018 | 7017 | |
| 7019 | 7018 | DB::query( |
| 7020 | 7019 | 'SELECT * |
| 7021 | - FROM ' . prefixTable('notification') . ' |
|
| 7020 | + FROM ' . prefixTable('notification').' |
|
| 7022 | 7021 | WHERE item_id = %i AND user_id = %i', |
| 7023 | 7022 | $inputData['itemId'], |
| 7024 | 7023 | $session->get('user-id') |
@@ -7090,7 +7089,7 @@ discard block |
||
| 7090 | 7089 | // And related logs |
| 7091 | 7090 | $rows = DB::query( |
| 7092 | 7091 | 'SELECT id, file AS filename |
| 7093 | - FROM ' . prefixTable('files') . ' |
|
| 7092 | + FROM ' . prefixTable('files').' |
|
| 7094 | 7093 | WHERE id_item = %i AND confirmed = %i', |
| 7095 | 7094 | $inputData['itemId'], |
| 7096 | 7095 | 0 |
@@ -7104,12 +7103,12 @@ discard block |
||
| 7104 | 7103 | ); |
| 7105 | 7104 | |
| 7106 | 7105 | // Delete file on server |
| 7107 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 7106 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 7108 | 7107 | |
| 7109 | 7108 | // Delete related logs |
| 7110 | 7109 | $logFile = DB::query( |
| 7111 | 7110 | 'SELECT increment_id, raison |
| 7112 | - FROM ' . prefixTable('log_items') . ' |
|
| 7111 | + FROM ' . prefixTable('log_items').' |
|
| 7113 | 7112 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 7114 | 7113 | $inputData['itemId'], |
| 7115 | 7114 | $session->get('user-id'), |
@@ -7168,7 +7167,7 @@ discard block |
||
| 7168 | 7167 | // Confirm attachments |
| 7169 | 7168 | $rows = DB::query( |
| 7170 | 7169 | 'SELECT id, file AS filename |
| 7171 | - FROM ' . prefixTable('files') . ' |
|
| 7170 | + FROM ' . prefixTable('files').' |
|
| 7172 | 7171 | WHERE id_item = %i AND confirmed = %i', |
| 7173 | 7172 | $inputData['itemId'], |
| 7174 | 7173 | 0 |
@@ -7231,7 +7230,7 @@ discard block |
||
| 7231 | 7230 | // Locked Item (if already locked), go back and warn |
| 7232 | 7231 | $dataTmp = DB::queryFirstRow( |
| 7233 | 7232 | 'SELECT timestamp, user_id |
| 7234 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7233 | + FROM ' . prefixTable('items_edition').' |
|
| 7235 | 7234 | WHERE item_id = %i', |
| 7236 | 7235 | $inputData['itemId'] |
| 7237 | 7236 | ); |
@@ -7241,7 +7240,7 @@ discard block |
||
| 7241 | 7240 | // Get if current user is the one who locked the item |
| 7242 | 7241 | $userLockedItemQueryResults = DB::queryFirstRow( |
| 7243 | 7242 | 'SELECT user_id |
| 7244 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7243 | + FROM ' . prefixTable('items_edition').' |
|
| 7245 | 7244 | WHERE item_id = %i AND user_id = %i', |
| 7246 | 7245 | $inputData['itemId'], |
| 7247 | 7246 | $session->get('user-id') |
@@ -7251,8 +7250,8 @@ discard block |
||
| 7251 | 7250 | // Get if existing process ongoing for this item |
| 7252 | 7251 | $dataItemProcessOngoing = DB::queryFirstRow( |
| 7253 | 7252 | 'SELECT JSON_EXTRACT(p.arguments, "$.all_users_except_id") AS all_users_except_id |
| 7254 | - FROM ' . prefixTable('background_tasks') . ' AS p |
|
| 7255 | - INNER JOIN ' . prefixTable('items_edition') . ' AS i ON (i.item_id = p.item_id) |
|
| 7253 | + FROM ' . prefixTable('background_tasks').' AS p |
|
| 7254 | + INNER JOIN ' . prefixTable('items_edition').' AS i ON (i.item_id = p.item_id) |
|
| 7256 | 7255 | WHERE p.item_id = %i AND p.finished_at = "" |
| 7257 | 7256 | ORDER BY p.increment_id DESC', |
| 7258 | 7257 | $inputData['itemId'] |
@@ -7260,7 +7259,7 @@ discard block |
||
| 7260 | 7259 | |
| 7261 | 7260 | // Get delay period |
| 7262 | 7261 | if (isset($SETTINGS['delay_item_edition']) && $SETTINGS['delay_item_edition'] > 0 && empty($dataTmp['timestamp']) === false) { |
| 7263 | - $delay = $SETTINGS['delay_item_edition']*60; |
|
| 7262 | + $delay = $SETTINGS['delay_item_edition'] * 60; |
|
| 7264 | 7263 | } else { |
| 7265 | 7264 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 7266 | 7265 | } |
@@ -7289,7 +7288,7 @@ discard block |
||
| 7289 | 7288 | |
| 7290 | 7289 | $data = DB::queryFirstRow( |
| 7291 | 7290 | 'SELECT visible_folders |
| 7292 | - FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', |
|
| 7291 | + FROM ' . prefixTable('cache_tree').' WHERE user_id = %i', |
|
| 7293 | 7292 | $inputData['userId'] |
| 7294 | 7293 | ); |
| 7295 | 7294 | // Check if tree ID is in visible folders. |
@@ -7320,7 +7319,7 @@ discard block |
||
| 7320 | 7319 | $edit = $delete = null; |
| 7321 | 7320 | $data = DB::queryFirstColumn( |
| 7322 | 7321 | 'SELECT type |
| 7323 | - FROM ' . prefixTable('roles_values') . ' |
|
| 7322 | + FROM ' . prefixTable('roles_values').' |
|
| 7324 | 7323 | WHERE role_id IN %ls AND folder_id = %i', |
| 7325 | 7324 | array_column($session->get('system-array_roles'), 'id'), |
| 7326 | 7325 | $inputData['treeId'], |
@@ -7340,7 +7339,7 @@ discard block |
||
| 7340 | 7339 | $edit = true; |
| 7341 | 7340 | } |
| 7342 | 7341 | } |
| 7343 | - if (LOG_TO_SERVER === true) error_log('TEAMPASS - Folder: '.$inputData['treeId'].' - User: '.$inputData['userId'].' - access: ' . $access . ' - edit: ' . $edit . ' - delete: ' . $delete); |
|
| 7342 | + if (LOG_TO_SERVER === true) error_log('TEAMPASS - Folder: '.$inputData['treeId'].' - User: '.$inputData['userId'].' - access: '.$access.' - edit: '.$edit.' - delete: '.$delete); |
|
| 7344 | 7343 | |
| 7345 | 7344 | $data = array( |
| 7346 | 7345 | 'error' => false, |
@@ -7370,15 +7369,15 @@ discard block |
||
| 7370 | 7369 | case 'autocomplete_tags': |
| 7371 | 7370 | // Get a list off all existing TAGS |
| 7372 | 7371 | $listOfTags = ''; |
| 7373 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7372 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7374 | 7373 | foreach ($rows as $record) { |
| 7375 | 7374 | if (empty($listOfTags)) { |
| 7376 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7375 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7377 | 7376 | } else { |
| 7378 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7377 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7379 | 7378 | } |
| 7380 | 7379 | } |
| 7381 | - echo '[' . $listOfTags . ']'; |
|
| 7380 | + echo '['.$listOfTags.']'; |
|
| 7382 | 7381 | break; |
| 7383 | 7382 | } |
| 7384 | 7383 | } |
@@ -7394,7 +7393,7 @@ discard block |
||
| 7394 | 7393 | { |
| 7395 | 7394 | $data = DB::queryFirstRow( |
| 7396 | 7395 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7397 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7396 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7398 | 7397 | $groupe |
| 7399 | 7398 | ); |
| 7400 | 7399 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
