nilsteampassnet /
TeamPass
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 75 | 75 | // Not allowed page |
| 76 | 76 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 77 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 77 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 78 | 78 | exit; |
| 79 | 79 | } |
| 80 | 80 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | // Get info about user to modify |
| 147 | 147 | $targetUserInfos = DB::queryFirstRow( |
| 148 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 148 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 149 | 149 | WHERE id = %i', |
| 150 | 150 | (int) $dataReceived['user_id'] |
| 151 | 151 | ); |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | // Check if user already exists |
| 278 | 278 | $data = DB::query( |
| 279 | 279 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 280 | - FROM ' . prefixTable('users') . ' |
|
| 280 | + FROM ' . prefixTable('users').' |
|
| 281 | 281 | WHERE login = %s |
| 282 | 282 | AND deleted_at IS NULL', |
| 283 | 283 | $login |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | |
| 497 | 497 | // Get info about user to delete |
| 498 | 498 | $data_user = DB::queryFirstRow( |
| 499 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 499 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 500 | 500 | WHERE id = %i', |
| 501 | 501 | $post_id |
| 502 | 502 | ); |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | ); |
| 531 | 531 | // delete personal folder and subfolders |
| 532 | 532 | $data = DB::queryFirstRow( |
| 533 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 533 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 534 | 534 | WHERE title = %s AND personal_folder = %i', |
| 535 | 535 | $post_id, |
| 536 | 536 | '1' |
@@ -543,7 +543,7 @@ discard block |
||
| 543 | 543 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 544 | 544 | // delete items & logs |
| 545 | 545 | $items = DB::query( |
| 546 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 546 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 547 | 547 | WHERE id_tree=%i AND perso = %i', |
| 548 | 548 | $folder->id, |
| 549 | 549 | '1' |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | // Delete any process related to user |
| 568 | 568 | $processes = DB::query( |
| 569 | 569 | 'SELECT increment_id |
| 570 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 570 | + FROM ' . prefixTable('background_tasks').' |
|
| 571 | 571 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 572 | 572 | $post_id |
| 573 | 573 | ); |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | $return = array(); |
| 621 | 621 | // Check if folder exists |
| 622 | 622 | $data = DB::query( |
| 623 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 623 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 624 | 624 | WHERE title = %s AND parent_id = %i', |
| 625 | 625 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
| 626 | 626 | '0' |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | } |
| 634 | 634 | // Check if role exists |
| 635 | 635 | $data = DB::query( |
| 636 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 636 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 637 | 637 | WHERE title = %s', |
| 638 | 638 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 639 | 639 | ); |
@@ -662,7 +662,7 @@ discard block |
||
| 662 | 662 | // Get info about user to delete |
| 663 | 663 | $data_user = DB::queryFirstRow( |
| 664 | 664 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 665 | - FROM ' . prefixTable('users') . ' |
|
| 665 | + FROM ' . prefixTable('users').' |
|
| 666 | 666 | WHERE id = %i', |
| 667 | 667 | $post_user_id |
| 668 | 668 | ); |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | // Get info about user |
| 719 | 719 | $rowUser = DB::queryFirstRow( |
| 720 | 720 | 'SELECT * |
| 721 | - FROM ' . prefixTable('users') . ' |
|
| 721 | + FROM ' . prefixTable('users').' |
|
| 722 | 722 | WHERE id = %i', |
| 723 | 723 | $post_id |
| 724 | 724 | ); |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | $session->set('user-roles_array', explode(';', $session->get('user-roles'))); |
| 747 | 747 | $rows = DB::query(' |
| 748 | 748 | SELECT id,title,creator_id |
| 749 | - FROM ' . prefixTable('roles_title') .' |
|
| 749 | + FROM ' . prefixTable('roles_title').' |
|
| 750 | 750 | WHERE id IN %li', |
| 751 | 751 | $session->get('user-roles_array') |
| 752 | 752 | ); |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | $rolesList = array(); |
| 785 | 785 | $managedBy = array(); |
| 786 | 786 | $selected = ''; |
| 787 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 787 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 788 | 788 | foreach ($rows as $reccord) { |
| 789 | 789 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 790 | 790 | } |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | array_push( |
| 816 | 816 | $managedBy, |
| 817 | 817 | array( |
| 818 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
| 818 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
| 819 | 819 | 'id' => $fonction['id'], |
| 820 | 820 | 'selected' => $selected, |
| 821 | 821 | ) |
@@ -897,9 +897,9 @@ discard block |
||
| 897 | 897 | |
| 898 | 898 | // get USER STATUS |
| 899 | 899 | if ($rowUser['disabled'] == 1) { |
| 900 | - $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . $lang->get('user_info_unlock_question') . '</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . $lang->get('user_info_delete_question') . '</label>'; |
|
| 900 | + $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.$lang->get('user_info_unlock_question').'</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.$lang->get('user_info_delete_question').'</label>'; |
|
| 901 | 901 | } else { |
| 902 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
| 902 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
| 903 | 903 | } |
| 904 | 904 | |
| 905 | 905 | $arrData['error'] = false; |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | |
| 987 | 987 | // Get info about user to modify |
| 988 | 988 | $data_user = DB::queryFirstRow( |
| 989 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 989 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 990 | 990 | WHERE id = %i', |
| 991 | 991 | $post_id |
| 992 | 992 | ); |
@@ -997,7 +997,7 @@ discard block |
||
| 997 | 997 | // count number of admins |
| 998 | 998 | $users = DB::query( |
| 999 | 999 | 'SELECT id |
| 1000 | - FROM ' . prefixTable('users') . ' |
|
| 1000 | + FROM ' . prefixTable('users').' |
|
| 1001 | 1001 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
| 1002 | 1002 | $post_id |
| 1003 | 1003 | ); |
@@ -1020,7 +1020,7 @@ discard block |
||
| 1020 | 1020 | // Exclude roles from AD - PR #3635 |
| 1021 | 1021 | $adRoles = DB::query( |
| 1022 | 1022 | 'SELECT roles_from_ad_groups |
| 1023 | - FROM ' . prefixTable('users') . ' |
|
| 1023 | + FROM ' . prefixTable('users').' |
|
| 1024 | 1024 | WHERE id = %i', |
| 1025 | 1025 | $post_id |
| 1026 | 1026 | )[0]['roles_from_ad_groups']; |
@@ -1124,7 +1124,7 @@ discard block |
||
| 1124 | 1124 | ); |
| 1125 | 1125 | // delete personal folder and subfolders |
| 1126 | 1126 | $data = DB::queryFirstRow( |
| 1127 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1127 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1128 | 1128 | WHERE title = %s AND personal_folder = %i', |
| 1129 | 1129 | $post_id, |
| 1130 | 1130 | '1' |
@@ -1137,7 +1137,7 @@ discard block |
||
| 1137 | 1137 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1138 | 1138 | // delete items & logs |
| 1139 | 1139 | $items = DB::query( |
| 1140 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1140 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1141 | 1141 | WHERE id_tree=%i AND perso = %i', |
| 1142 | 1142 | $folder->id, |
| 1143 | 1143 | '1' |
@@ -1158,7 +1158,7 @@ discard block |
||
| 1158 | 1158 | } else { |
| 1159 | 1159 | // Get old data about user |
| 1160 | 1160 | $oldData = DB::queryFirstRow( |
| 1161 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1161 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1162 | 1162 | WHERE id = %i', |
| 1163 | 1163 | $post_id |
| 1164 | 1164 | ); |
@@ -1195,7 +1195,7 @@ discard block |
||
| 1195 | 1195 | |
| 1196 | 1196 | // update LOG |
| 1197 | 1197 | if ($oldData['email'] !== $post_email) { |
| 1198 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1198 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1199 | 1199 | } |
| 1200 | 1200 | } |
| 1201 | 1201 | echo prepareExchangedData( |
@@ -1243,7 +1243,7 @@ discard block |
||
| 1243 | 1243 | } |
| 1244 | 1244 | |
| 1245 | 1245 | DB::queryFirstRow( |
| 1246 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1246 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1247 | 1247 | WHERE login = %s |
| 1248 | 1248 | AND deleted_at IS NULL', |
| 1249 | 1249 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1295,7 +1295,7 @@ discard block |
||
| 1295 | 1295 | // get User info |
| 1296 | 1296 | $rowUser = DB::queryFirstRow( |
| 1297 | 1297 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
| 1298 | - FROM ' . prefixTable('users') . ' |
|
| 1298 | + FROM ' . prefixTable('users').' |
|
| 1299 | 1299 | WHERE id = %i', |
| 1300 | 1300 | $post_id |
| 1301 | 1301 | ); |
@@ -1305,7 +1305,7 @@ discard block |
||
| 1305 | 1305 | $html = ''; |
| 1306 | 1306 | |
| 1307 | 1307 | if (isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) { |
| 1308 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
| 1308 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
| 1309 | 1309 | } |
| 1310 | 1310 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
| 1311 | 1311 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1316,7 +1316,7 @@ discard block |
||
| 1316 | 1316 | // refine folders based upon roles |
| 1317 | 1317 | $rows = DB::query( |
| 1318 | 1318 | 'SELECT folder_id, type |
| 1319 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1319 | + FROM ' . prefixTable('roles_values').' |
|
| 1320 | 1320 | WHERE role_id IN %ls |
| 1321 | 1321 | ORDER BY folder_id ASC', |
| 1322 | 1322 | $arrData['functions'] |
@@ -1339,7 +1339,7 @@ discard block |
||
| 1339 | 1339 | } |
| 1340 | 1340 | |
| 1341 | 1341 | // add allowed folders |
| 1342 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1342 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1343 | 1343 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1344 | 1344 | } |
| 1345 | 1345 | |
@@ -1350,7 +1350,7 @@ discard block |
||
| 1350 | 1350 | // get folder name |
| 1351 | 1351 | $row = DB::queryFirstRow( |
| 1352 | 1352 | 'SELECT title, nlevel, id |
| 1353 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1353 | + FROM ' . prefixTable('nested_tree').' |
|
| 1354 | 1354 | WHERE id = %i', |
| 1355 | 1355 | $fld['id'] |
| 1356 | 1356 | ); |
@@ -1363,38 +1363,38 @@ discard block |
||
| 1363 | 1363 | |
| 1364 | 1364 | // manage right icon |
| 1365 | 1365 | if ($fld['type'] == 'W') { |
| 1366 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1367 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1368 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1366 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1367 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1368 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1369 | 1369 | } elseif ($fld['type'] == 'ND') { |
| 1370 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1371 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1372 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1370 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1371 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1372 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1373 | 1373 | } elseif ($fld['type'] == 'NE') { |
| 1374 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1375 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1376 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1374 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1375 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1376 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1377 | 1377 | } elseif ($fld['type'] == 'NDNE') { |
| 1378 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1379 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1380 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1378 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1379 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1380 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1381 | 1381 | } elseif ($fld['type'] == '') { |
| 1382 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
| 1382 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
| 1383 | 1383 | } else { |
| 1384 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
| 1384 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
| 1385 | 1385 | } |
| 1386 | 1386 | |
| 1387 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1388 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1389 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
| 1390 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1387 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1388 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1389 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
| 1390 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1391 | 1391 | break; |
| 1392 | 1392 | } |
| 1393 | 1393 | } |
| 1394 | 1394 | } |
| 1395 | 1395 | |
| 1396 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1397 | - $html . '</tbody></table>'; |
|
| 1396 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1397 | + $html.'</tbody></table>'; |
|
| 1398 | 1398 | } else { |
| 1399 | 1399 | $html_full = ''; |
| 1400 | 1400 | } |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
| 1441 | 1441 | $rows = DB::query( |
| 1442 | 1442 | 'SELECT * |
| 1443 | - FROM ' . prefixTable('users') . ' |
|
| 1443 | + FROM ' . prefixTable('users').' |
|
| 1444 | 1444 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1445 | 1445 | '0', |
| 1446 | 1446 | array_filter($session->get('user-roles_array')) |
@@ -1448,7 +1448,7 @@ discard block |
||
| 1448 | 1448 | } else { |
| 1449 | 1449 | $rows = DB::query( |
| 1450 | 1450 | 'SELECT * |
| 1451 | - FROM ' . prefixTable('users') . ' |
|
| 1451 | + FROM ' . prefixTable('users').' |
|
| 1452 | 1452 | WHERE admin = %i', |
| 1453 | 1453 | '0' |
| 1454 | 1454 | ); |
@@ -1460,7 +1460,7 @@ discard block |
||
| 1460 | 1460 | $groupIds = []; |
| 1461 | 1461 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1462 | 1462 | $tmp = DB::queryFirstRow( |
| 1463 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1463 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1464 | 1464 | WHERE id = %i', |
| 1465 | 1465 | $group |
| 1466 | 1466 | ); |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | |
| 1473 | 1473 | // Get managed_by |
| 1474 | 1474 | $managedBy = DB::queryFirstRow( |
| 1475 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1475 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1476 | 1476 | WHERE id = %i', |
| 1477 | 1477 | $record['isAdministratedByRole'] |
| 1478 | 1478 | ); |
@@ -1482,7 +1482,7 @@ discard block |
||
| 1482 | 1482 | $foldersAllowedIds = []; |
| 1483 | 1483 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1484 | 1484 | $tmp = DB::queryFirstRow( |
| 1485 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1485 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1486 | 1486 | WHERE id = %i', |
| 1487 | 1487 | $role |
| 1488 | 1488 | ); |
@@ -1495,7 +1495,7 @@ discard block |
||
| 1495 | 1495 | $foldersForbiddenIds = []; |
| 1496 | 1496 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1497 | 1497 | $tmp = DB::queryFirstRow( |
| 1498 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1498 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1499 | 1499 | WHERE id = %i', |
| 1500 | 1500 | $role |
| 1501 | 1501 | ); |
@@ -1513,7 +1513,7 @@ discard block |
||
| 1513 | 1513 | 'login' => $record['login'], |
| 1514 | 1514 | 'groups' => implode(', ', $groups), |
| 1515 | 1515 | 'groupIds' => $groupIds, |
| 1516 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1516 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1517 | 1517 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1518 | 1518 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1519 | 1519 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -1614,7 +1614,7 @@ discard block |
||
| 1614 | 1614 | |
| 1615 | 1615 | // Get info about user |
| 1616 | 1616 | $data_user = DB::queryFirstRow( |
| 1617 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1617 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1618 | 1618 | WHERE id = %i', |
| 1619 | 1619 | $inputData['source_id'] |
| 1620 | 1620 | ); |
@@ -1841,14 +1841,14 @@ discard block |
||
| 1841 | 1841 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 1842 | 1842 | $data_user = DB::queryFirstRow( |
| 1843 | 1843 | 'SELECT fonction_id, public_key |
| 1844 | - FROM ' . prefixTable('users') . ' |
|
| 1844 | + FROM ' . prefixTable('users').' |
|
| 1845 | 1845 | WHERE id = %i', |
| 1846 | 1846 | $post_user_id |
| 1847 | 1847 | ); |
| 1848 | 1848 | |
| 1849 | 1849 | if ($data_user) { |
| 1850 | 1850 | // Ensure array is unique |
| 1851 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 1851 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 1852 | 1852 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 1853 | 1853 | } else { |
| 1854 | 1854 | // User not found |
@@ -1864,14 +1864,14 @@ discard block |
||
| 1864 | 1864 | } |
| 1865 | 1865 | |
| 1866 | 1866 | // Manage specific case of api key |
| 1867 | - if($post_field === 'user_api_key') { |
|
| 1867 | + if ($post_field === 'user_api_key') { |
|
| 1868 | 1868 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 1869 | 1869 | $session->set('user-api_key', $post_new_value); |
| 1870 | 1870 | |
| 1871 | 1871 | // test if user has an api key |
| 1872 | 1872 | $data_user = DB::queryFirstRow( |
| 1873 | 1873 | 'SELECT value |
| 1874 | - FROM ' . prefixTable('api') . ' |
|
| 1874 | + FROM ' . prefixTable('api').' |
|
| 1875 | 1875 | WHERE user_id = %i', |
| 1876 | 1876 | $post_user_id |
| 1877 | 1877 | ); |
@@ -1991,7 +1991,7 @@ discard block |
||
| 1991 | 1991 | } catch (\LdapRecord\Auth\BindException $e) { |
| 1992 | 1992 | $error = $e->getDetailedError(); |
| 1993 | 1993 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 1994 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 1994 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 1995 | 1995 | } |
| 1996 | 1996 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 1997 | 1997 | echo prepareExchangedData( |
@@ -2021,7 +2021,7 @@ discard block |
||
| 2021 | 2021 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2022 | 2022 | $error = $e->getDetailedError(); |
| 2023 | 2023 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2024 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2024 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2025 | 2025 | } |
| 2026 | 2026 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 2027 | 2027 | echo prepareExchangedData( |
@@ -2038,7 +2038,7 @@ discard block |
||
| 2038 | 2038 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 2039 | 2039 | // Build the list of all groups in AD |
| 2040 | 2040 | if (isset($adUser['memberof']) === true) { |
| 2041 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2041 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2042 | 2042 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2043 | 2043 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2044 | 2044 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2054,7 +2054,7 @@ discard block |
||
| 2054 | 2054 | // Get his ID |
| 2055 | 2055 | $userInfo = DB::queryFirstRow( |
| 2056 | 2056 | 'SELECT id, login, fonction_id, auth_type |
| 2057 | - FROM ' . prefixTable('users') . ' |
|
| 2057 | + FROM ' . prefixTable('users').' |
|
| 2058 | 2058 | WHERE login = %s', |
| 2059 | 2059 | $userLogin |
| 2060 | 2060 | ); |
@@ -2090,7 +2090,7 @@ discard block |
||
| 2090 | 2090 | |
| 2091 | 2091 | // Get all groups in Teampass |
| 2092 | 2092 | $teampassRoles = array(); |
| 2093 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2093 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2094 | 2094 | foreach ($rows as $record) { |
| 2095 | 2095 | array_push( |
| 2096 | 2096 | $teampassRoles, |
@@ -2155,7 +2155,7 @@ discard block |
||
| 2155 | 2155 | // Check if user already exists |
| 2156 | 2156 | $data = DB::query( |
| 2157 | 2157 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2158 | - FROM ' . prefixTable('users') . ' |
|
| 2158 | + FROM ' . prefixTable('users').' |
|
| 2159 | 2159 | WHERE login = %s', |
| 2160 | 2160 | $post_login |
| 2161 | 2161 | ); |
@@ -2332,7 +2332,7 @@ discard block |
||
| 2332 | 2332 | // Check if user already exists |
| 2333 | 2333 | DB::query( |
| 2334 | 2334 | 'SELECT id |
| 2335 | - FROM ' . prefixTable('users') . ' |
|
| 2335 | + FROM ' . prefixTable('users').' |
|
| 2336 | 2336 | WHERE id = %i', |
| 2337 | 2337 | $post_id |
| 2338 | 2338 | ); |
@@ -2394,7 +2394,7 @@ discard block |
||
| 2394 | 2394 | // Get all groups in Teampass |
| 2395 | 2395 | $teampassRoles = array(); |
| 2396 | 2396 | $titleToIdMap = []; |
| 2397 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2397 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2398 | 2398 | foreach ($rows as $record) { |
| 2399 | 2399 | array_push( |
| 2400 | 2400 | $teampassRoles, |
@@ -2440,7 +2440,7 @@ discard block |
||
| 2440 | 2440 | // Get his ID |
| 2441 | 2441 | $userInfo = DB::queryFirstRow( |
| 2442 | 2442 | 'SELECT id, login, fonction_id, auth_type |
| 2443 | - FROM ' . prefixTable('users') . ' |
|
| 2443 | + FROM ' . prefixTable('users').' |
|
| 2444 | 2444 | WHERE login = %s', |
| 2445 | 2445 | $userLogin |
| 2446 | 2446 | ); |
@@ -2547,7 +2547,7 @@ discard block |
||
| 2547 | 2547 | // Check if user already exists |
| 2548 | 2548 | DB::query( |
| 2549 | 2549 | 'SELECT id |
| 2550 | - FROM ' . prefixTable('users') . ' |
|
| 2550 | + FROM ' . prefixTable('users').' |
|
| 2551 | 2551 | WHERE id = %i', |
| 2552 | 2552 | $post_id |
| 2553 | 2553 | ); |
@@ -2614,7 +2614,7 @@ discard block |
||
| 2614 | 2614 | // Search TP_USER in db |
| 2615 | 2615 | $userTP = DB::queryFirstRow( |
| 2616 | 2616 | 'SELECT pw |
| 2617 | - FROM ' . prefixTable('users') . ' |
|
| 2617 | + FROM ' . prefixTable('users').' |
|
| 2618 | 2618 | WHERE id = %i', |
| 2619 | 2619 | TP_USER_ID |
| 2620 | 2620 | ); |
@@ -2636,8 +2636,8 @@ discard block |
||
| 2636 | 2636 | 'process_type' => 'create_user_keys', |
| 2637 | 2637 | 'arguments' => json_encode([ |
| 2638 | 2638 | 'new_user_id' => (int) $post_user_id, |
| 2639 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 2640 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 2639 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 2640 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 2641 | 2641 | 'owner_id' => (int) TP_USER_ID, |
| 2642 | 2642 | 'creator_pwd' => $userTP['pw'], |
| 2643 | 2643 | 'email_body' => $lang->get('email_body_user_config_5'), |
@@ -2726,8 +2726,8 @@ discard block |
||
| 2726 | 2726 | // get user info |
| 2727 | 2727 | $processesProgress = DB::query( |
| 2728 | 2728 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 2729 | - FROM ' . prefixTable('users') . ' AS u |
|
| 2730 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2729 | + FROM ' . prefixTable('users').' AS u |
|
| 2730 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2731 | 2731 | WHERE u.id = %i', |
| 2732 | 2732 | $user_id |
| 2733 | 2733 | ); |
@@ -2735,9 +2735,9 @@ discard block |
||
| 2735 | 2735 | //print_r($processesProgress); |
| 2736 | 2736 | $finished_steps = 0; |
| 2737 | 2737 | $nb_steps = count($processesProgress); |
| 2738 | - foreach($processesProgress as $process) { |
|
| 2738 | + foreach ($processesProgress as $process) { |
|
| 2739 | 2739 | if ((int) $process['is_in_progress'] === -1) { |
| 2740 | - $finished_steps ++; |
|
| 2740 | + $finished_steps++; |
|
| 2741 | 2741 | } |
| 2742 | 2742 | } |
| 2743 | 2743 | |
@@ -2746,7 +2746,7 @@ discard block |
||
| 2746 | 2746 | 'error' => false, |
| 2747 | 2747 | 'message' => '', |
| 2748 | 2748 | 'user_id' => $user_id, |
| 2749 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 2749 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 2750 | 2750 | 'debug' => $finished_steps.",".$nb_steps, |
| 2751 | 2751 | ), |
| 2752 | 2752 | 'encode' |
@@ -2836,7 +2836,7 @@ discard block |
||
| 2836 | 2836 | |
| 2837 | 2837 | // Get info about user |
| 2838 | 2838 | $data_user = DB::queryFirstRow( |
| 2839 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2839 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2840 | 2840 | WHERE id = %i', |
| 2841 | 2841 | $value[1] |
| 2842 | 2842 | ); |
@@ -2870,7 +2870,7 @@ discard block |
||
| 2870 | 2870 | logEvents( |
| 2871 | 2871 | $SETTINGS, |
| 2872 | 2872 | 'user_mngt', |
| 2873 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 2873 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 2874 | 2874 | (string) $session->get('user-id'), |
| 2875 | 2875 | $session->get('user-login'), |
| 2876 | 2876 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -2904,7 +2904,7 @@ discard block |
||
| 2904 | 2904 | |
| 2905 | 2905 | // Get info about user |
| 2906 | 2906 | $data_user = DB::queryFirstRow( |
| 2907 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2907 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2908 | 2908 | WHERE id = %i', |
| 2909 | 2909 | $id[1] |
| 2910 | 2910 | ); |
@@ -1836,7 +1836,7 @@ |
||
| 1836 | 1836 | '', |
| 1837 | 1837 | 'encrypt' |
| 1838 | 1838 | ); |
| 1839 | - } |
|
| 1839 | + } |
|
| 1840 | 1840 | |
| 1841 | 1841 | // Check if status or secret or phone number has changed |
| 1842 | 1842 | if (DB::count() > 0 |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | ) { |
| 80 | 80 | // Not allowed page |
| 81 | 81 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 82 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 82 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 83 | 83 | exit; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | date_default_timezone_set('UTC'); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
| 107 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
| 108 | 108 | header('Content-type: text/html; charset=utf-8'); |
| 109 | 109 | header('Cache-Control: no-cache, must-revalidate'); |
| 110 | 110 | |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | // About special settings |
| 366 | 366 | $dataFolderSettings = DB::queryFirstRow( |
| 367 | 367 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 368 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 368 | + FROM ' . prefixTable('nested_tree').' |
|
| 369 | 369 | WHERE id = %i', |
| 370 | 370 | $inputData['folderId'] |
| 371 | 371 | ); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | // Get folder complexity |
| 383 | 383 | $folderComplexity = DB::queryFirstRow( |
| 384 | 384 | 'SELECT valeur |
| 385 | - FROM ' . prefixTable('misc') . ' |
|
| 385 | + FROM ' . prefixTable('misc').' |
|
| 386 | 386 | WHERE type = %s AND intitule = %i', |
| 387 | 387 | 'complex', |
| 388 | 388 | $inputData['folderId'] |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | $itemExists = 0; |
| 408 | 408 | $newID = ''; |
| 409 | 409 | $data = DB::queryFirstRow( |
| 410 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 410 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 411 | 411 | WHERE label = %s AND inactif = %i', |
| 412 | 412 | $inputData['label'], |
| 413 | 413 | 0 |
@@ -488,8 +488,8 @@ discard block |
||
| 488 | 488 | (int) $post_folder_is_personal, |
| 489 | 489 | (int) $newID, |
| 490 | 490 | $cryptedStuff['objectKey'], |
| 491 | - true, // only for the item creator |
|
| 492 | - false, // no delete all |
|
| 491 | + true, // only for the item creator |
|
| 492 | + false, // no delete all |
|
| 493 | 493 | ); |
| 494 | 494 | |
| 495 | 495 | // update fields |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | // should we encrypt the data |
| 503 | 503 | $dataTmp = DB::queryFirstRow( |
| 504 | 504 | 'SELECT encrypted_data |
| 505 | - FROM ' . prefixTable('categories') . ' |
|
| 505 | + FROM ' . prefixTable('categories').' |
|
| 506 | 506 | WHERE id = %i', |
| 507 | 507 | $field['id'] |
| 508 | 508 | ); |
@@ -531,8 +531,8 @@ discard block |
||
| 531 | 531 | (int) $post_folder_is_personal, |
| 532 | 532 | (int) $newObjectId, |
| 533 | 533 | $cryptedStuff['objectKey'], |
| 534 | - true, // only for the item creator |
|
| 535 | - false, // no delete all |
|
| 534 | + true, // only for the item creator |
|
| 535 | + false, // no delete all |
|
| 536 | 536 | ); |
| 537 | 537 | |
| 538 | 538 | array_push( |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | ) { |
| 569 | 569 | DB::queryFirstRow( |
| 570 | 570 | 'SELECT * |
| 571 | - FROM ' . prefixTable('templates') . ' |
|
| 571 | + FROM ' . prefixTable('templates').' |
|
| 572 | 572 | WHERE item_id = %i', |
| 573 | 573 | $newID |
| 574 | 574 | ); |
@@ -637,11 +637,11 @@ discard block |
||
| 637 | 637 | ) { |
| 638 | 638 | foreach ($post_restricted_to as $userRest) { |
| 639 | 639 | if (empty($userRest) === false) { |
| 640 | - $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 640 | + $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 641 | 641 | if (empty($listOfRestricted)) { |
| 642 | 642 | $listOfRestricted = $dataTmp['login']; |
| 643 | 643 | } else { |
| 644 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 644 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 645 | 645 | } |
| 646 | 646 | } |
| 647 | 647 | } |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | if (empty($userRest) === false) { |
| 658 | 658 | $dataTmp = DB::queryFirstRow( |
| 659 | 659 | 'SELECT login |
| 660 | - FROM ' . prefixTable('users') . ' |
|
| 660 | + FROM ' . prefixTable('users').' |
|
| 661 | 661 | WHERE id= %i', |
| 662 | 662 | $userRest |
| 663 | 663 | ); |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | if (empty($oldRestrictionList) === true) { |
| 666 | 666 | $oldRestrictionList = $dataTmp['login']; |
| 667 | 667 | } else { |
| 668 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 668 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | } |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | if (empty($post_uploaded_file_id) === false) { |
| 729 | 729 | $rows = DB::query( |
| 730 | 730 | 'SELECT id |
| 731 | - FROM ' . prefixTable('files') . ' |
|
| 731 | + FROM ' . prefixTable('files').' |
|
| 732 | 732 | WHERE id_item = %s', |
| 733 | 733 | $post_uploaded_file_id |
| 734 | 734 | ); |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | $lang->get('email_subject_item_updated'), |
| 785 | 785 | str_replace( |
| 786 | 786 | array('#label', '#link'), |
| 787 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']), |
|
| 787 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']), |
|
| 788 | 788 | $lang->get('new_item_email_body') |
| 789 | 789 | ), |
| 790 | 790 | $emailAddress, |
@@ -888,11 +888,11 @@ discard block |
||
| 888 | 888 | // Prepare variables |
| 889 | 889 | $itemInfos = array(); |
| 890 | 890 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 891 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 891 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 892 | 892 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 893 | 893 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 894 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 895 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 894 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 895 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 896 | 896 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 897 | 897 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 898 | 898 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -923,8 +923,7 @@ discard block |
||
| 923 | 923 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 924 | 924 | $dataReceived['to_be_deleted_after_date'], |
| 925 | 925 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 926 | - ) : |
|
| 927 | - ''; |
|
| 926 | + ) : ''; |
|
| 928 | 927 | $post_fields = (filter_var_array( |
| 929 | 928 | $dataReceived['fields'], |
| 930 | 929 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -984,7 +983,7 @@ discard block |
||
| 984 | 983 | // About special settings |
| 985 | 984 | $dataFolderSettings = DB::queryFirstRow( |
| 986 | 985 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 987 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 986 | + FROM ' . prefixTable('nested_tree').' |
|
| 988 | 987 | WHERE id = %i', |
| 989 | 988 | $inputData['folderId'] |
| 990 | 989 | ); |
@@ -1000,7 +999,7 @@ discard block |
||
| 1000 | 999 | // Get folder complexity |
| 1001 | 1000 | $folderComplexity = DB::queryFirstRow( |
| 1002 | 1001 | 'SELECT valeur |
| 1003 | - FROM ' . prefixTable('misc') . ' |
|
| 1002 | + FROM ' . prefixTable('misc').' |
|
| 1004 | 1003 | WHERE type = %s AND intitule = %i', |
| 1005 | 1004 | 'complex', |
| 1006 | 1005 | $inputData['folderId'] |
@@ -1045,8 +1044,8 @@ discard block |
||
| 1045 | 1044 | // Get all informations for this item |
| 1046 | 1045 | $dataItem = DB::queryFirstRow( |
| 1047 | 1046 | 'SELECT * |
| 1048 | - FROM ' . prefixTable('items') . ' as i |
|
| 1049 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1047 | + FROM ' . prefixTable('items').' as i |
|
| 1048 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1050 | 1049 | WHERE i.id=%i AND l.action = %s', |
| 1051 | 1050 | $inputData['itemId'], |
| 1052 | 1051 | 'at_creation' |
@@ -1089,7 +1088,7 @@ discard block |
||
| 1089 | 1088 | //db::debugmode(true); |
| 1090 | 1089 | DB::query( |
| 1091 | 1090 | 'SELECT * |
| 1092 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1091 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1093 | 1092 | WHERE object_id = %i AND user_id = %s', |
| 1094 | 1093 | $inputData['itemId'], |
| 1095 | 1094 | $session->get('user-id') |
@@ -1149,9 +1148,9 @@ discard block |
||
| 1149 | 1148 | '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, |
| 1150 | 1149 | 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, |
| 1151 | 1150 | u.login as user_login, u.email as user_email |
| 1152 | - FROM ' . prefixTable('items') . ' as i |
|
| 1153 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1154 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1151 | + FROM ' . prefixTable('items').' as i |
|
| 1152 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1153 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1155 | 1154 | WHERE i.id=%i', |
| 1156 | 1155 | $inputData['itemId'] |
| 1157 | 1156 | ); |
@@ -1159,7 +1158,7 @@ discard block |
||
| 1159 | 1158 | // Should we log a password change? |
| 1160 | 1159 | $userKey = DB::queryFirstRow( |
| 1161 | 1160 | 'SELECT share_key |
| 1162 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1161 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1163 | 1162 | WHERE user_id = %i AND object_id = %i', |
| 1164 | 1163 | $session->get('user-id'), |
| 1165 | 1164 | $inputData['itemId'] |
@@ -1223,12 +1222,12 @@ discard block |
||
| 1223 | 1222 | (int) $post_folder_is_personal, |
| 1224 | 1223 | (int) $inputData['itemId'], |
| 1225 | 1224 | $encrypted_password_key, |
| 1226 | - true, // only for the item creator |
|
| 1227 | - true, // delete all |
|
| 1225 | + true, // only for the item creator |
|
| 1226 | + true, // delete all |
|
| 1228 | 1227 | ); |
| 1229 | 1228 | |
| 1230 | 1229 | // Create a task to create sharekeys for users |
| 1231 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1230 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1232 | 1231 | $tasksToBePerformed = ['item_password']; |
| 1233 | 1232 | $encryptionTaskIsRequested = true; |
| 1234 | 1233 | } else { |
@@ -1239,7 +1238,7 @@ discard block |
||
| 1239 | 1238 | // Get list of tags |
| 1240 | 1239 | $itemTags = DB::queryFirstColumn( |
| 1241 | 1240 | 'SELECT tag |
| 1242 | - FROM ' . prefixTable('tags') . ' |
|
| 1241 | + FROM ' . prefixTable('tags').' |
|
| 1243 | 1242 | WHERE item_id = %i', |
| 1244 | 1243 | $inputData['itemId'] |
| 1245 | 1244 | ); |
@@ -1285,7 +1284,7 @@ discard block |
||
| 1285 | 1284 | $session->get('user-id'), |
| 1286 | 1285 | 'at_modification', |
| 1287 | 1286 | $session->get('user-login'), |
| 1288 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1287 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1289 | 1288 | ); |
| 1290 | 1289 | } |
| 1291 | 1290 | |
@@ -1325,8 +1324,8 @@ discard block |
||
| 1325 | 1324 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1326 | 1325 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1327 | 1326 | c.masked AS masked, i.id AS field_item_id |
| 1328 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1329 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1327 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1328 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1330 | 1329 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1331 | 1330 | $field['id'], |
| 1332 | 1331 | $inputData['itemId'] |
@@ -1342,7 +1341,7 @@ discard block |
||
| 1342 | 1341 | // Perform new query |
| 1343 | 1342 | $dataTmpCat = DB::queryFirstRow( |
| 1344 | 1343 | 'SELECT id, title, encrypted_data, masked |
| 1345 | - FROM ' . prefixTable('categories') . ' |
|
| 1344 | + FROM ' . prefixTable('categories').' |
|
| 1346 | 1345 | WHERE id = %i', |
| 1347 | 1346 | $field['id'] |
| 1348 | 1347 | ); |
@@ -1372,8 +1371,8 @@ discard block |
||
| 1372 | 1371 | (int) $post_folder_is_personal, |
| 1373 | 1372 | (int) $newId, |
| 1374 | 1373 | $cryptedStuff['objectKey'], |
| 1375 | - true, // only for the item creator |
|
| 1376 | - true, // delete all |
|
| 1374 | + true, // only for the item creator |
|
| 1375 | + true, // delete all |
|
| 1377 | 1376 | ); |
| 1378 | 1377 | |
| 1379 | 1378 | // update value |
@@ -1423,7 +1422,7 @@ discard block |
||
| 1423 | 1422 | $session->get('user-id'), |
| 1424 | 1423 | 'at_modification', |
| 1425 | 1424 | $session->get('user-login'), |
| 1426 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1425 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1427 | 1426 | ); |
| 1428 | 1427 | } else { |
| 1429 | 1428 | // Case where the field already exists |
@@ -1432,7 +1431,7 @@ discard block |
||
| 1432 | 1431 | // Get user sharekey for this field |
| 1433 | 1432 | $userKey = DB::queryFirstRow( |
| 1434 | 1433 | 'SELECT share_key |
| 1435 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1434 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1436 | 1435 | WHERE user_id = %i AND object_id = %i', |
| 1437 | 1436 | $session->get('user-id'), |
| 1438 | 1437 | $dataTmpCat['field_item_id'] |
@@ -1471,8 +1470,8 @@ discard block |
||
| 1471 | 1470 | (int) $post_folder_is_personal, |
| 1472 | 1471 | (int) $dataTmpCat['field_item_id'], |
| 1473 | 1472 | $cryptedStuff['objectKey'], |
| 1474 | - true, // only for the item creator |
|
| 1475 | - true, // delete all |
|
| 1473 | + true, // only for the item creator |
|
| 1474 | + true, // delete all |
|
| 1476 | 1475 | ); |
| 1477 | 1476 | |
| 1478 | 1477 | if ($encryptedFieldIsChanged === false) { |
@@ -1514,7 +1513,7 @@ discard block |
||
| 1514 | 1513 | $session->get('user-id'), |
| 1515 | 1514 | 'at_modification', |
| 1516 | 1515 | $session->get('user-login'), |
| 1517 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1516 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1518 | 1517 | ); |
| 1519 | 1518 | } |
| 1520 | 1519 | } |
@@ -1568,7 +1567,7 @@ discard block |
||
| 1568 | 1567 | ) { |
| 1569 | 1568 | DB::queryFirstRow( |
| 1570 | 1569 | 'SELECT * |
| 1571 | - FROM ' . prefixTable('templates') . ' |
|
| 1570 | + FROM ' . prefixTable('templates').' |
|
| 1572 | 1571 | WHERE item_id = %i', |
| 1573 | 1572 | $inputData['itemId'] |
| 1574 | 1573 | ); |
@@ -1611,7 +1610,7 @@ discard block |
||
| 1611 | 1610 | // check if elem exists in Table. If not add it or update it. |
| 1612 | 1611 | DB::query( |
| 1613 | 1612 | 'SELECT * |
| 1614 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1613 | + FROM ' . prefixTable('automatic_del').' |
|
| 1615 | 1614 | WHERE item_id = %i', |
| 1616 | 1615 | $inputData['itemId'] |
| 1617 | 1616 | ); |
@@ -1638,7 +1637,7 @@ discard block |
||
| 1638 | 1637 | // Store updates performed |
| 1639 | 1638 | array_push( |
| 1640 | 1639 | $arrayOfChanges, |
| 1641 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1640 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1642 | 1641 | ); |
| 1643 | 1642 | |
| 1644 | 1643 | // update LOG |
@@ -1681,7 +1680,7 @@ discard block |
||
| 1681 | 1680 | // Store updates performed |
| 1682 | 1681 | array_push( |
| 1683 | 1682 | $arrayOfChanges, |
| 1684 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1683 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1685 | 1684 | ); |
| 1686 | 1685 | |
| 1687 | 1686 | // update LOG |
@@ -1709,7 +1708,7 @@ discard block |
||
| 1709 | 1708 | if (empty($userId) === false) { |
| 1710 | 1709 | $dataTmp = DB::queryFirstRow( |
| 1711 | 1710 | 'SELECT id, name, lastname |
| 1712 | - FROM ' . prefixTable('users') . ' |
|
| 1711 | + FROM ' . prefixTable('users').' |
|
| 1713 | 1712 | WHERE id= %i', |
| 1714 | 1713 | $userId |
| 1715 | 1714 | ); |
@@ -1717,7 +1716,7 @@ discard block |
||
| 1717 | 1716 | // Add to array |
| 1718 | 1717 | array_push( |
| 1719 | 1718 | $arrayOfUsersRestriction, |
| 1720 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1719 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1721 | 1720 | ); |
| 1722 | 1721 | array_push( |
| 1723 | 1722 | $arrayOfUsersIdRestriction, |
@@ -1748,8 +1747,8 @@ discard block |
||
| 1748 | 1747 | // get values before deleting them |
| 1749 | 1748 | $rows = DB::query( |
| 1750 | 1749 | 'SELECT t.title, t.id AS id |
| 1751 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1752 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1750 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1751 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1753 | 1752 | WHERE r.item_id = %i |
| 1754 | 1753 | ORDER BY t.title ASC', |
| 1755 | 1754 | $inputData['itemId'] |
@@ -1783,7 +1782,7 @@ discard block |
||
| 1783 | 1782 | ); |
| 1784 | 1783 | $dataTmp = DB::queryFirstRow( |
| 1785 | 1784 | 'SELECT title |
| 1786 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1785 | + FROM ' . prefixTable('roles_title').' |
|
| 1787 | 1786 | WHERE id = %i', |
| 1788 | 1787 | $role |
| 1789 | 1788 | ); |
@@ -1811,7 +1810,7 @@ discard block |
||
| 1811 | 1810 | // Get current status |
| 1812 | 1811 | $otpStatus = DB::queryFirstRow( |
| 1813 | 1812 | 'SELECT enabled as otp_is_enabled, phone_number, secret |
| 1814 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1813 | + FROM ' . prefixTable('items_otp').' |
|
| 1815 | 1814 | WHERE item_id = %i', |
| 1816 | 1815 | $inputData['itemId'] |
| 1817 | 1816 | ); |
@@ -1825,7 +1824,7 @@ discard block |
||
| 1825 | 1824 | 'decrypt' |
| 1826 | 1825 | )['string']; |
| 1827 | 1826 | } else { |
| 1828 | - $currentsecret=''; |
|
| 1827 | + $currentsecret = ''; |
|
| 1829 | 1828 | } |
| 1830 | 1829 | |
| 1831 | 1830 | // If OTP secret provided then encrypt it |
@@ -1874,7 +1873,7 @@ discard block |
||
| 1874 | 1873 | $session->get('user-id'), |
| 1875 | 1874 | 'at_modification', |
| 1876 | 1875 | $session->get('user-login'), |
| 1877 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1876 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1878 | 1877 | ); |
| 1879 | 1878 | } |
| 1880 | 1879 | if ($otpStatus['phone_number'] !== $post_otp_phone_number) { |
@@ -1885,7 +1884,7 @@ discard block |
||
| 1885 | 1884 | $session->get('user-id'), |
| 1886 | 1885 | 'at_modification', |
| 1887 | 1886 | $session->get('user-login'), |
| 1888 | - 'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number |
|
| 1887 | + 'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number |
|
| 1889 | 1888 | ); |
| 1890 | 1889 | } |
| 1891 | 1890 | if ($currentsecret !== $post_otp_secret) { |
@@ -1934,8 +1933,8 @@ discard block |
||
| 1934 | 1933 | $session->get('user-id'), |
| 1935 | 1934 | 'at_modification', |
| 1936 | 1935 | $session->get('user-login'), |
| 1937 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1938 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1936 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1937 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1939 | 1938 | ); |
| 1940 | 1939 | } |
| 1941 | 1940 | |
@@ -1955,7 +1954,7 @@ discard block |
||
| 1955 | 1954 | $session->get('user-id'), |
| 1956 | 1955 | 'at_modification', |
| 1957 | 1956 | $session->get('user-login'), |
| 1958 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1957 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1959 | 1958 | ); |
| 1960 | 1959 | } |
| 1961 | 1960 | // LOGIN |
@@ -1974,7 +1973,7 @@ discard block |
||
| 1974 | 1973 | $session->get('user-id'), |
| 1975 | 1974 | 'at_modification', |
| 1976 | 1975 | $session->get('user-login'), |
| 1977 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1976 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1978 | 1977 | ); |
| 1979 | 1978 | } |
| 1980 | 1979 | |
@@ -1993,7 +1992,7 @@ discard block |
||
| 1993 | 1992 | $session->get('user-id'), |
| 1994 | 1993 | 'at_modification', |
| 1995 | 1994 | $session->get('user-login'), |
| 1996 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1995 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1997 | 1996 | ); |
| 1998 | 1997 | } |
| 1999 | 1998 | // URL |
@@ -2012,7 +2011,7 @@ discard block |
||
| 2012 | 2011 | $session->get('user-id'), |
| 2013 | 2012 | 'at_modification', |
| 2014 | 2013 | $session->get('user-login'), |
| 2015 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 2014 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 2016 | 2015 | ); |
| 2017 | 2016 | } |
| 2018 | 2017 | // DESCRIPTION |
@@ -2038,7 +2037,7 @@ discard block |
||
| 2038 | 2037 | // FOLDER |
| 2039 | 2038 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 2040 | 2039 | // Get name of folders |
| 2041 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2040 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2042 | 2041 | |
| 2043 | 2042 | // Store updates performed |
| 2044 | 2043 | array_push( |
@@ -2054,7 +2053,7 @@ discard block |
||
| 2054 | 2053 | $session->get('user-id'), |
| 2055 | 2054 | 'at_modification', |
| 2056 | 2055 | $session->get('user-login'), |
| 2057 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 2056 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 2058 | 2057 | ); |
| 2059 | 2058 | } |
| 2060 | 2059 | // ANYONE_CAN_MODIFY |
@@ -2062,7 +2061,7 @@ discard block |
||
| 2062 | 2061 | // Store updates performed |
| 2063 | 2062 | array_push( |
| 2064 | 2063 | $arrayOfChanges, |
| 2065 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2064 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2066 | 2065 | ); |
| 2067 | 2066 | |
| 2068 | 2067 | // Log |
@@ -2073,15 +2072,15 @@ discard block |
||
| 2073 | 2072 | $session->get('user-id'), |
| 2074 | 2073 | 'at_modification', |
| 2075 | 2074 | $session->get('user-login'), |
| 2076 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2075 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2077 | 2076 | ); |
| 2078 | 2077 | } |
| 2079 | 2078 | |
| 2080 | 2079 | // Reload new values |
| 2081 | 2080 | $dataItem = DB::queryFirstRow( |
| 2082 | 2081 | 'SELECT * |
| 2083 | - FROM ' . prefixTable('items') . ' as i |
|
| 2084 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2082 | + FROM ' . prefixTable('items').' as i |
|
| 2083 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2085 | 2084 | WHERE i.id = %i AND l.action = %s', |
| 2086 | 2085 | $inputData['itemId'], |
| 2087 | 2086 | 'at_creation' |
@@ -2090,8 +2089,8 @@ discard block |
||
| 2090 | 2089 | $history = ''; |
| 2091 | 2090 | $rows = DB::query( |
| 2092 | 2091 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2093 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2094 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2092 | + FROM ' . prefixTable('log_items').' as l |
|
| 2093 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2095 | 2094 | WHERE l.action <> %s AND id_item=%s', |
| 2096 | 2095 | 'at_shown', |
| 2097 | 2096 | $inputData['itemId'] |
@@ -2100,14 +2099,14 @@ discard block |
||
| 2100 | 2099 | if ($record['raison'] === NULL) continue; |
| 2101 | 2100 | $reason = explode(':', $record['raison']); |
| 2102 | 2101 | if (count($reason) > 0) { |
| 2103 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2104 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2105 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2102 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2103 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2104 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2106 | 2105 | : $lang->get(trim($reason[0]))) : ''); |
| 2107 | 2106 | if (empty($history)) { |
| 2108 | 2107 | $history = $sentence; |
| 2109 | 2108 | } else { |
| 2110 | - $history .= '<br />' . $sentence; |
|
| 2109 | + $history .= '<br />'.$sentence; |
|
| 2111 | 2110 | } |
| 2112 | 2111 | } |
| 2113 | 2112 | } |
@@ -2245,7 +2244,7 @@ discard block |
||
| 2245 | 2244 | ) { |
| 2246 | 2245 | // load the original record into an array |
| 2247 | 2246 | $originalRecord = DB::queryFirstRow( |
| 2248 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2247 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2249 | 2248 | WHERE id = %i', |
| 2250 | 2249 | $inputData['itemId'] |
| 2251 | 2250 | ); |
@@ -2264,7 +2263,7 @@ discard block |
||
| 2264 | 2263 | |
| 2265 | 2264 | // Load the destination folder record into an array |
| 2266 | 2265 | $dataDestination = DB::queryFirstRow( |
| 2267 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2266 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2268 | 2267 | WHERE id = %i', |
| 2269 | 2268 | $post_dest_id |
| 2270 | 2269 | ); |
@@ -2272,7 +2271,7 @@ discard block |
||
| 2272 | 2271 | // Get the ITEM object key for the user |
| 2273 | 2272 | $userKey = DB::queryFirstRow( |
| 2274 | 2273 | 'SELECT share_key |
| 2275 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2274 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2276 | 2275 | WHERE user_id = %i AND object_id = %i', |
| 2277 | 2276 | $session->get('user-id'), |
| 2278 | 2277 | $inputData['itemId'] |
@@ -2349,8 +2348,8 @@ discard block |
||
| 2349 | 2348 | // Manage Custom Fields |
| 2350 | 2349 | $rows = DB::query( |
| 2351 | 2350 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2352 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2353 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2351 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2352 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2354 | 2353 | WHERE ci.item_id = %i', |
| 2355 | 2354 | $inputData['itemId'] |
| 2356 | 2355 | ); |
@@ -2362,7 +2361,7 @@ discard block |
||
| 2362 | 2361 | // Get user key |
| 2363 | 2362 | $userKey = DB::queryFirstRow( |
| 2364 | 2363 | 'SELECT share_key |
| 2365 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2364 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2366 | 2365 | WHERE user_id = %i AND object_id = %i', |
| 2367 | 2366 | $session->get('user-id'), |
| 2368 | 2367 | $field['id'] |
@@ -2429,15 +2428,15 @@ discard block |
||
| 2429 | 2428 | $rows = DB::query( |
| 2430 | 2429 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2431 | 2430 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2432 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2433 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2431 | + FROM ' . prefixTable('files').' AS f |
|
| 2432 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2434 | 2433 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2435 | 2434 | $session->get('user-id'), |
| 2436 | 2435 | $inputData['itemId'] |
| 2437 | 2436 | ); |
| 2438 | 2437 | foreach ($rows as $record) { |
| 2439 | 2438 | // Check if file still exists |
| 2440 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2439 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2441 | 2440 | // Step1 - decrypt the file |
| 2442 | 2441 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2443 | 2442 | $fileContent = decryptFile( |
@@ -2448,8 +2447,8 @@ discard block |
||
| 2448 | 2447 | |
| 2449 | 2448 | // Step2 - create file |
| 2450 | 2449 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2451 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2452 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2450 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2451 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2453 | 2452 | if ($outstream === false) { |
| 2454 | 2453 | echo prepareExchangedData( |
| 2455 | 2454 | array( |
@@ -2522,7 +2521,7 @@ discard block |
||
| 2522 | 2521 | |
| 2523 | 2522 | // ------------------------- |
| 2524 | 2523 | // Add specific restrictions |
| 2525 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2524 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2526 | 2525 | foreach ($rows as $record) { |
| 2527 | 2526 | DB::insert( |
| 2528 | 2527 | prefixTable('restriction_to_roles'), |
@@ -2534,7 +2533,7 @@ discard block |
||
| 2534 | 2533 | } |
| 2535 | 2534 | |
| 2536 | 2535 | // Add Tags |
| 2537 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2536 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2538 | 2537 | foreach ($rows as $record) { |
| 2539 | 2538 | DB::insert( |
| 2540 | 2539 | prefixTable('tags'), |
@@ -2636,7 +2635,7 @@ discard block |
||
| 2636 | 2635 | // then we can show it |
| 2637 | 2636 | $item_deleted = DB::queryFirstRow( |
| 2638 | 2637 | 'SELECT * |
| 2639 | - FROM ' . prefixTable('log_items') . ' |
|
| 2638 | + FROM ' . prefixTable('log_items').' |
|
| 2640 | 2639 | WHERE id_item = %i AND action = %s |
| 2641 | 2640 | ORDER BY date DESC |
| 2642 | 2641 | LIMIT 0, 1', |
@@ -2647,7 +2646,7 @@ discard block |
||
| 2647 | 2646 | |
| 2648 | 2647 | $item_restored = DB::queryFirstRow( |
| 2649 | 2648 | 'SELECT * |
| 2650 | - FROM ' . prefixTable('log_items') . ' |
|
| 2649 | + FROM ' . prefixTable('log_items').' |
|
| 2651 | 2650 | WHERE id_item = %i AND action = %s |
| 2652 | 2651 | ORDER BY date DESC |
| 2653 | 2652 | LIMIT 0, 1', |
@@ -2671,8 +2670,8 @@ discard block |
||
| 2671 | 2670 | // Get all informations for this item |
| 2672 | 2671 | $dataItem = DB::queryFirstRow( |
| 2673 | 2672 | 'SELECT * |
| 2674 | - FROM ' . prefixTable('items') . ' as i |
|
| 2675 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2673 | + FROM ' . prefixTable('items').' as i |
|
| 2674 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2676 | 2675 | WHERE i.id = %i AND l.action = %s', |
| 2677 | 2676 | $inputData['id'], |
| 2678 | 2677 | 'at_creation' |
@@ -2681,7 +2680,7 @@ discard block |
||
| 2681 | 2680 | // Notification |
| 2682 | 2681 | DB::queryFirstRow( |
| 2683 | 2682 | 'SELECT * |
| 2684 | - FROM ' . prefixTable('notification') . ' |
|
| 2683 | + FROM ' . prefixTable('notification').' |
|
| 2685 | 2684 | WHERE item_id = %i AND user_id = %i', |
| 2686 | 2685 | $inputData['id'], |
| 2687 | 2686 | $session->get('user-id') |
@@ -2700,7 +2699,7 @@ discard block |
||
| 2700 | 2699 | |
| 2701 | 2700 | // manage case of API user |
| 2702 | 2701 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2703 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2702 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2704 | 2703 | $arrData['id_user'] = API_USER_ID; |
| 2705 | 2704 | $arrData['author_email'] = ''; |
| 2706 | 2705 | $arrData['notification_status'] = false; |
@@ -2710,7 +2709,7 @@ discard block |
||
| 2710 | 2709 | $tags = array(); |
| 2711 | 2710 | $rows = DB::query( |
| 2712 | 2711 | 'SELECT tag |
| 2713 | - FROM ' . prefixTable('tags') . ' |
|
| 2712 | + FROM ' . prefixTable('tags').' |
|
| 2714 | 2713 | WHERE item_id = %i', |
| 2715 | 2714 | $inputData['id'] |
| 2716 | 2715 | ); |
@@ -2735,7 +2734,7 @@ discard block |
||
| 2735 | 2734 | // Check if user has a role that is accepted |
| 2736 | 2735 | $rows_tmp = DB::query( |
| 2737 | 2736 | 'SELECT role_id |
| 2738 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2737 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2739 | 2738 | WHERE item_id=%i', |
| 2740 | 2739 | $inputData['id'] |
| 2741 | 2740 | ); |
@@ -2749,7 +2748,7 @@ discard block |
||
| 2749 | 2748 | // Get the object key for the user |
| 2750 | 2749 | $userKey = DB::queryFirstRow( |
| 2751 | 2750 | 'SELECT share_key |
| 2752 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2751 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2753 | 2752 | WHERE user_id = %i AND object_id = %i', |
| 2754 | 2753 | $session->get('user-id'), |
| 2755 | 2754 | $inputData['id'] |
@@ -2846,8 +2845,8 @@ discard block |
||
| 2846 | 2845 | // Add restriction if item is restricted to roles |
| 2847 | 2846 | $rows = DB::query( |
| 2848 | 2847 | 'SELECT t.title, t.id |
| 2849 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2850 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2848 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2849 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2851 | 2850 | WHERE r.item_id = %i |
| 2852 | 2851 | ORDER BY t.title ASC', |
| 2853 | 2852 | $inputData['id'] |
@@ -2863,8 +2862,8 @@ discard block |
||
| 2863 | 2862 | $tmp = array(); |
| 2864 | 2863 | $rows = DB::query( |
| 2865 | 2864 | 'SELECT k.label, k.id |
| 2866 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2867 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2865 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2866 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2868 | 2867 | WHERE i.item_id = %i |
| 2869 | 2868 | ORDER BY k.label ASC', |
| 2870 | 2869 | $inputData['id'] |
@@ -2947,7 +2946,7 @@ discard block |
||
| 2947 | 2946 | $arrCatList = array(); |
| 2948 | 2947 | $rows_tmp = DB::query( |
| 2949 | 2948 | 'SELECT id_category |
| 2950 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2949 | + FROM ' . prefixTable('categories_folders').' |
|
| 2951 | 2950 | WHERE id_folder=%i', |
| 2952 | 2951 | $inputData['folderId'] |
| 2953 | 2952 | ); |
@@ -2962,8 +2961,8 @@ discard block |
||
| 2962 | 2961 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2963 | 2962 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2964 | 2963 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2965 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2966 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2964 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2965 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2967 | 2966 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2968 | 2967 | $inputData['id'], |
| 2969 | 2968 | $arrCatList |
@@ -2974,7 +2973,7 @@ discard block |
||
| 2974 | 2973 | //db::debugmode(true); |
| 2975 | 2974 | $userKey = DB::queryFirstRow( |
| 2976 | 2975 | 'SELECT share_key |
| 2977 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2976 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2978 | 2977 | WHERE user_id = %i AND object_id = %i', |
| 2979 | 2978 | $session->get('user-id'), |
| 2980 | 2979 | $row['id'] |
@@ -2992,7 +2991,7 @@ discard block |
||
| 2992 | 2991 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2993 | 2992 | // Data is not encrypted in DB |
| 2994 | 2993 | $fieldText = [ |
| 2995 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2994 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2996 | 2995 | 'encrypted' => false, |
| 2997 | 2996 | 'error' => false, |
| 2998 | 2997 | ]; |
@@ -3037,7 +3036,7 @@ discard block |
||
| 3037 | 3036 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 3038 | 3037 | $rows_tmp = DB::queryFirstRow( |
| 3039 | 3038 | 'SELECT category_id |
| 3040 | - FROM ' . prefixTable('templates') . ' |
|
| 3039 | + FROM ' . prefixTable('templates').' |
|
| 3041 | 3040 | WHERE item_id = %i', |
| 3042 | 3041 | $inputData['id'] |
| 3043 | 3042 | ); |
@@ -3054,7 +3053,7 @@ discard block |
||
| 3054 | 3053 | // Evaluate if item is ready for all users |
| 3055 | 3054 | $rows_tmp = DB::queryFirstRow( |
| 3056 | 3055 | 'SELECT finished_at |
| 3057 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3056 | + FROM ' . prefixTable('background_tasks').' |
|
| 3058 | 3057 | WHERE item_id = %i', |
| 3059 | 3058 | $inputData['id'] |
| 3060 | 3059 | ); |
@@ -3071,7 +3070,7 @@ discard block |
||
| 3071 | 3070 | // Is the Item to be deleted? |
| 3072 | 3071 | $dataDelete = DB::queryFirstRow( |
| 3073 | 3072 | 'SELECT * |
| 3074 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3073 | + FROM ' . prefixTable('automatic_del').' |
|
| 3075 | 3074 | WHERE item_id = %i', |
| 3076 | 3075 | $inputData['id'] |
| 3077 | 3076 | ); |
@@ -3152,14 +3151,14 @@ discard block |
||
| 3152 | 3151 | if (empty($userRest) === false) { |
| 3153 | 3152 | $dataTmp = DB::queryFirstRow( |
| 3154 | 3153 | 'SELECT login |
| 3155 | - FROM ' . prefixTable('users') . ' |
|
| 3154 | + FROM ' . prefixTable('users').' |
|
| 3156 | 3155 | WHERE id= %i', |
| 3157 | 3156 | $userRest |
| 3158 | 3157 | ); |
| 3159 | 3158 | if (empty($listOfRestricted)) { |
| 3160 | 3159 | $listOfRestricted = $dataTmp['login']; |
| 3161 | 3160 | } else { |
| 3162 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3161 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3163 | 3162 | } |
| 3164 | 3163 | } |
| 3165 | 3164 | } |
@@ -3233,9 +3232,9 @@ discard block |
||
| 3233 | 3232 | // Load item data |
| 3234 | 3233 | $dataItem = DB::queryFirstRow( |
| 3235 | 3234 | '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 |
| 3236 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3237 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3238 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3235 | + FROM ' . prefixTable('items').' AS i |
|
| 3236 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3237 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3239 | 3238 | WHERE i.id = %i', |
| 3240 | 3239 | $inputData['id'] |
| 3241 | 3240 | ); |
@@ -3257,7 +3256,7 @@ discard block |
||
| 3257 | 3256 | // Check if user has a role that is accepted |
| 3258 | 3257 | $rows_tmp = DB::query( |
| 3259 | 3258 | 'SELECT role_id |
| 3260 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3259 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3261 | 3260 | WHERE item_id=%i', |
| 3262 | 3261 | $inputData['id'] |
| 3263 | 3262 | ); |
@@ -3289,12 +3288,12 @@ discard block |
||
| 3289 | 3288 | // launch query |
| 3290 | 3289 | $rows = DB::query( |
| 3291 | 3290 | 'SELECT id, name, file, extension, size |
| 3292 | - FROM ' . prefixTable('files') . ' |
|
| 3291 | + FROM ' . prefixTable('files').' |
|
| 3293 | 3292 | WHERE id_item = %i AND confirmed = 1', |
| 3294 | 3293 | $inputData['id'] |
| 3295 | 3294 | ); |
| 3296 | 3295 | foreach ($rows as $record) { |
| 3297 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3296 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3298 | 3297 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3299 | 3298 | |
| 3300 | 3299 | array_push( |
@@ -3307,7 +3306,7 @@ discard block |
||
| 3307 | 3306 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3308 | 3307 | 'id' => $record['id'], |
| 3309 | 3308 | 'key' => $session->get('user-key_tmp'), |
| 3310 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3309 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3311 | 3310 | ) |
| 3312 | 3311 | ); |
| 3313 | 3312 | } |
@@ -3345,7 +3344,7 @@ discard block |
||
| 3345 | 3344 | array( |
| 3346 | 3345 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3347 | 3346 | ), |
| 3348 | - 'id=' . $session->get('user-id') |
|
| 3347 | + 'id='.$session->get('user-id') |
|
| 3349 | 3348 | ); |
| 3350 | 3349 | } |
| 3351 | 3350 | |
@@ -3354,8 +3353,8 @@ discard block |
||
| 3354 | 3353 | $listOptionsForRoles = array(); |
| 3355 | 3354 | $rows = DB::query( |
| 3356 | 3355 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3357 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3358 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3356 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3357 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3359 | 3358 | WHERE r.folder_id = %i', |
| 3360 | 3359 | $dataItem['id_tree'] |
| 3361 | 3360 | ); |
@@ -3369,9 +3368,9 @@ discard block |
||
| 3369 | 3368 | ); |
| 3370 | 3369 | $rows2 = DB::query( |
| 3371 | 3370 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3372 | - FROM ' . prefixTable('users') . ' |
|
| 3371 | + FROM ' . prefixTable('users').' |
|
| 3373 | 3372 | WHERE fonction_id LIKE %s', |
| 3374 | - '%' . $record['role_id'] . '%' |
|
| 3373 | + '%'.$record['role_id'].'%' |
|
| 3375 | 3374 | ); |
| 3376 | 3375 | foreach ($rows2 as $record2) { |
| 3377 | 3376 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3384,7 +3383,7 @@ discard block |
||
| 3384 | 3383 | array( |
| 3385 | 3384 | 'id' => (int) $record2['id'], |
| 3386 | 3385 | 'login' => $record2['login'], |
| 3387 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3386 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3388 | 3387 | 'email' => $record2['email'], |
| 3389 | 3388 | ) |
| 3390 | 3389 | ); |
@@ -3403,16 +3402,16 @@ discard block |
||
| 3403 | 3402 | $path = ''; |
| 3404 | 3403 | foreach ($arbo as $elem) { |
| 3405 | 3404 | if (empty($path) === true) { |
| 3406 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3405 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3407 | 3406 | } else { |
| 3408 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3407 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3409 | 3408 | } |
| 3410 | 3409 | } |
| 3411 | 3410 | // Build text to show user |
| 3412 | 3411 | if (empty($path) === true) { |
| 3413 | 3412 | $path = addslashes($dataItem['label']); |
| 3414 | 3413 | } else { |
| 3415 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3414 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3416 | 3415 | } |
| 3417 | 3416 | |
| 3418 | 3417 | // Add Admins to notification list if expected |
@@ -3435,7 +3434,7 @@ discard block |
||
| 3435 | 3434 | array( |
| 3436 | 3435 | addslashes($session->get('user-login')), |
| 3437 | 3436 | $path, |
| 3438 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3437 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3439 | 3438 | ), |
| 3440 | 3439 | $lang->get('email_on_open_notification_mail') |
| 3441 | 3440 | ), |
@@ -3445,7 +3444,7 @@ discard block |
||
| 3445 | 3444 | } |
| 3446 | 3445 | |
| 3447 | 3446 | // has this item a change proposal |
| 3448 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3447 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3449 | 3448 | $returnArray['has_change_proposal'] = DB::count(); |
| 3450 | 3449 | |
| 3451 | 3450 | // Setting |
@@ -3456,7 +3455,7 @@ discard block |
||
| 3456 | 3455 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3457 | 3456 | DB::query( |
| 3458 | 3457 | 'SELECT * |
| 3459 | - FROM ' . prefixTable('otv') . ' |
|
| 3458 | + FROM ' . prefixTable('otv').' |
|
| 3460 | 3459 | WHERE item_id = %i |
| 3461 | 3460 | AND time_limit > %i', |
| 3462 | 3461 | $inputData['id'], |
@@ -3555,7 +3554,7 @@ discard block |
||
| 3555 | 3554 | // Load item data |
| 3556 | 3555 | $data = DB::queryFirstRow( |
| 3557 | 3556 | 'SELECT id_tree, id, label |
| 3558 | - FROM ' . prefixTable('items') . ' |
|
| 3557 | + FROM ' . prefixTable('items').' |
|
| 3559 | 3558 | WHERE id = %i OR item_key = %s', |
| 3560 | 3559 | $inputData['itemId'], |
| 3561 | 3560 | $inputData['itemKey'] |
@@ -3646,7 +3645,7 @@ discard block |
||
| 3646 | 3645 | // Load item data |
| 3647 | 3646 | $dataItem = DB::queryFirstRow( |
| 3648 | 3647 | 'SELECT secret, enabled |
| 3649 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3648 | + FROM ' . prefixTable('items_otp').' |
|
| 3650 | 3649 | WHERE item_id = %i', |
| 3651 | 3650 | $inputData['id'] |
| 3652 | 3651 | ); |
@@ -3728,13 +3727,13 @@ discard block |
||
| 3728 | 3727 | |
| 3729 | 3728 | // Check if user is allowed to access this folder |
| 3730 | 3729 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3731 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3730 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3732 | 3731 | break; |
| 3733 | 3732 | } |
| 3734 | 3733 | |
| 3735 | 3734 | // Check if title doesn't contains html codes |
| 3736 | 3735 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3737 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3736 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3738 | 3737 | break; |
| 3739 | 3738 | } |
| 3740 | 3739 | // check that title is not numeric |
@@ -3745,9 +3744,9 @@ discard block |
||
| 3745 | 3744 | |
| 3746 | 3745 | // Check if duplicate folders name are allowed |
| 3747 | 3746 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3748 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3747 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3749 | 3748 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3750 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3749 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3751 | 3750 | break; |
| 3752 | 3751 | } |
| 3753 | 3752 | } |
@@ -3755,7 +3754,7 @@ discard block |
||
| 3755 | 3754 | // query on folder |
| 3756 | 3755 | $data = DB::queryFirstRow( |
| 3757 | 3756 | 'SELECT parent_id, personal_folder |
| 3758 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3757 | + FROM ' . prefixTable('nested_tree').' |
|
| 3759 | 3758 | WHERE id = %i', |
| 3760 | 3759 | $inputData['folderId'] |
| 3761 | 3760 | ); |
@@ -3765,20 +3764,20 @@ discard block |
||
| 3765 | 3764 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3766 | 3765 | $data = DB::queryFirstRow( |
| 3767 | 3766 | 'SELECT valeur |
| 3768 | - FROM ' . prefixTable('misc') . ' |
|
| 3767 | + FROM ' . prefixTable('misc').' |
|
| 3769 | 3768 | WHERE intitule = %i AND type = %s', |
| 3770 | 3769 | $data['parent_id'], |
| 3771 | 3770 | 'complex' |
| 3772 | 3771 | ); |
| 3773 | 3772 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3774 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3773 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3775 | 3774 | break; |
| 3776 | 3775 | } |
| 3777 | 3776 | } |
| 3778 | 3777 | |
| 3779 | 3778 | // update Folders table |
| 3780 | 3779 | $tmp = DB::queryFirstRow( |
| 3781 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3780 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3782 | 3781 | $dataReceived['folder'] |
| 3783 | 3782 | ); |
| 3784 | 3783 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3892,7 +3891,7 @@ discard block |
||
| 3892 | 3891 | $uniqueLoadData['path'] = $arr_arbo; |
| 3893 | 3892 | |
| 3894 | 3893 | // store last folder accessed in cookie |
| 3895 | - $arr_cookie_options = array ( |
|
| 3894 | + $arr_cookie_options = array( |
|
| 3896 | 3895 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3897 | 3896 | 'path' => '/', |
| 3898 | 3897 | 'secure' => true, |
@@ -3907,7 +3906,7 @@ discard block |
||
| 3907 | 3906 | foreach ($session->get('user-roles_array') as $role) { |
| 3908 | 3907 | $roleQ = DB::queryFirstRow( |
| 3909 | 3908 | 'SELECT allow_pw_change |
| 3910 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3909 | + FROM ' . prefixTable('roles_title').' |
|
| 3911 | 3910 | WHERE id = %i', |
| 3912 | 3911 | $role |
| 3913 | 3912 | ); |
@@ -3938,11 +3937,11 @@ discard block |
||
| 3938 | 3937 | |
| 3939 | 3938 | foreach ($session->get('user-roles_array') as $role) { |
| 3940 | 3939 | $access = DB::queryFirstRow( |
| 3941 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3940 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3942 | 3941 | $role, |
| 3943 | 3942 | $inputData['id'] |
| 3944 | 3943 | ); |
| 3945 | - if (DB::count()>0) { |
|
| 3944 | + if (DB::count() > 0) { |
|
| 3946 | 3945 | if ($access['type'] === 'R') { |
| 3947 | 3946 | array_push($arrTmp, 10); |
| 3948 | 3947 | } elseif ($access['type'] === 'W') { |
@@ -4007,7 +4006,7 @@ discard block |
||
| 4007 | 4006 | } else { |
| 4008 | 4007 | DB::query( |
| 4009 | 4008 | 'SELECT * |
| 4010 | - FROM ' . prefixTable('items') . ' |
|
| 4009 | + FROM ' . prefixTable('items').' |
|
| 4011 | 4010 | WHERE inactif = %i', |
| 4012 | 4011 | 0 |
| 4013 | 4012 | ); |
@@ -4017,7 +4016,7 @@ discard block |
||
| 4017 | 4016 | |
| 4018 | 4017 | // Get folder complexity |
| 4019 | 4018 | $folderComplexity = DB::queryFirstRow( |
| 4020 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4019 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4021 | 4020 | 'complex', |
| 4022 | 4021 | $inputData['id'] |
| 4023 | 4022 | ); |
@@ -4029,7 +4028,7 @@ discard block |
||
| 4029 | 4028 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4030 | 4029 | $folderRow = DB::query( |
| 4031 | 4030 | 'SELECT id_category |
| 4032 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4031 | + FROM ' . prefixTable('categories_folders').' |
|
| 4033 | 4032 | WHERE id_folder = %i', |
| 4034 | 4033 | $inputData['id'] |
| 4035 | 4034 | ); |
@@ -4144,15 +4143,15 @@ discard block |
||
| 4144 | 4143 | // List all ITEMS |
| 4145 | 4144 | if ($folderIsPf === false) { |
| 4146 | 4145 | $where->add('i.inactif=%i', 0); |
| 4147 | - $sql_e='(SELECT date FROM ' . prefixTable('log_items') |
|
| 4146 | + $sql_e = '(SELECT date FROM '.prefixTable('log_items') |
|
| 4148 | 4147 | . " WHERE action = 'at_creation' AND id_item=i.id " |
| 4149 | - . 'union all SELECT date FROM '. prefixTable('log_items') |
|
| 4148 | + . 'union all SELECT date FROM '.prefixTable('log_items') |
|
| 4150 | 4149 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
| 4151 | 4150 | AND id_item=i.id ORDER BY date DESC LIMIT 1)"; |
| 4152 | 4151 | $where->add('l.date=%l', $sql_e); |
| 4153 | 4152 | |
| 4154 | - $query_limit = ' LIMIT ' . |
|
| 4155 | - $start . ',' . |
|
| 4153 | + $query_limit = ' LIMIT '. |
|
| 4154 | + $start.','. |
|
| 4156 | 4155 | $post_nb_items_to_display_once; |
| 4157 | 4156 | //db::debugmode(true); |
| 4158 | 4157 | $rows = DB::query( |
@@ -4164,9 +4163,9 @@ discard block |
||
| 4164 | 4163 | l.id_user AS log_user, |
| 4165 | 4164 | i.url AS link, |
| 4166 | 4165 | i.email AS email |
| 4167 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4168 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4169 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4166 | + FROM ' . prefixTable('items').' AS i |
|
| 4167 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4168 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4170 | 4169 | WHERE %l |
| 4171 | 4170 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4172 | 4171 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4186,9 +4185,9 @@ discard block |
||
| 4186 | 4185 | l.id_user AS log_user, |
| 4187 | 4186 | i.url AS link, |
| 4188 | 4187 | i.email AS email |
| 4189 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4190 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4191 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4188 | + FROM ' . prefixTable('items').' AS i |
|
| 4189 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4190 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4192 | 4191 | WHERE %l |
| 4193 | 4192 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4194 | 4193 | ORDER BY i.label ASC, l.date DESC', |
@@ -4219,7 +4218,7 @@ discard block |
||
| 4219 | 4218 | $item_is_restricted_to_role = false; |
| 4220 | 4219 | DB::queryFirstRow( |
| 4221 | 4220 | 'SELECT role_id |
| 4222 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4221 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4223 | 4222 | WHERE item_id = %i', |
| 4224 | 4223 | $record['id'] |
| 4225 | 4224 | ); |
@@ -4231,7 +4230,7 @@ discard block |
||
| 4231 | 4230 | $user_is_included_in_role = false; |
| 4232 | 4231 | DB::query( |
| 4233 | 4232 | 'SELECT role_id |
| 4234 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4233 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4235 | 4234 | WHERE item_id = %i AND role_id IN %ls', |
| 4236 | 4235 | $record['id'], |
| 4237 | 4236 | $session->get('user-roles_array') |
@@ -4441,9 +4440,9 @@ discard block |
||
| 4441 | 4440 | if ((int) $start === 0) { |
| 4442 | 4441 | DB::query( |
| 4443 | 4442 | 'SELECT i.id |
| 4444 | - FROM ' . prefixTable('items') . ' as i |
|
| 4445 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4446 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4443 | + FROM ' . prefixTable('items').' as i |
|
| 4444 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4445 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4447 | 4446 | WHERE %l |
| 4448 | 4447 | ORDER BY i.label ASC, l.date DESC', |
| 4449 | 4448 | $where |
@@ -4508,8 +4507,8 @@ discard block |
||
| 4508 | 4507 | $dataItem = DB::queryFirstRow( |
| 4509 | 4508 | 'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id, |
| 4510 | 4509 | i.label AS label, i.id_tree AS id_tree |
| 4511 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4512 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4510 | + FROM ' . prefixTable('items').' AS i |
|
| 4511 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4513 | 4512 | WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)', |
| 4514 | 4513 | $session->get('user-id'), |
| 4515 | 4514 | $inputData['itemKey'] ?? '', |
@@ -4620,7 +4619,7 @@ discard block |
||
| 4620 | 4619 | // do query on this folder |
| 4621 | 4620 | $data_this_folder = DB::queryFirstRow( |
| 4622 | 4621 | 'SELECT id, personal_folder, title |
| 4623 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4622 | + FROM ' . prefixTable('nested_tree').' |
|
| 4624 | 4623 | WHERE id = %s', |
| 4625 | 4624 | $inputData['folderId'] |
| 4626 | 4625 | ); |
@@ -4660,8 +4659,8 @@ discard block |
||
| 4660 | 4659 | $visibilite = ''; |
| 4661 | 4660 | $data = DB::queryFirstRow( |
| 4662 | 4661 | 'SELECT m.valeur, n.personal_folder |
| 4663 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4664 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4662 | + FROM ' . prefixTable('misc').' AS m |
|
| 4663 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4665 | 4664 | WHERE type=%s AND intitule = %s', |
| 4666 | 4665 | 'complex', |
| 4667 | 4666 | $inputData['folderId'] |
@@ -4674,8 +4673,8 @@ discard block |
||
| 4674 | 4673 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4675 | 4674 | $rows = DB::query( |
| 4676 | 4675 | 'SELECT t.title |
| 4677 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4678 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4676 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4677 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4679 | 4678 | WHERE v.folder_id = %i |
| 4680 | 4679 | GROUP BY title', |
| 4681 | 4680 | $inputData['folderId'] |
@@ -4684,7 +4683,7 @@ discard block |
||
| 4684 | 4683 | if (empty($visibilite)) { |
| 4685 | 4684 | $visibilite = $record['title']; |
| 4686 | 4685 | } else { |
| 4687 | - $visibilite .= ' - ' . $record['title']; |
|
| 4686 | + $visibilite .= ' - '.$record['title']; |
|
| 4688 | 4687 | } |
| 4689 | 4688 | } |
| 4690 | 4689 | } else { |
@@ -4694,14 +4693,14 @@ discard block |
||
| 4694 | 4693 | // do new query to know if current folder is pf |
| 4695 | 4694 | $data_pf = DB::queryFirstRow( |
| 4696 | 4695 | 'SELECT personal_folder |
| 4697 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4696 | + FROM ' . prefixTable('nested_tree').' |
|
| 4698 | 4697 | WHERE id = %s', |
| 4699 | 4698 | $inputData['folderId'] |
| 4700 | 4699 | ); |
| 4701 | 4700 | |
| 4702 | 4701 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4703 | 4702 | |
| 4704 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4703 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4705 | 4704 | } |
| 4706 | 4705 | |
| 4707 | 4706 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4711,8 +4710,8 @@ discard block |
||
| 4711 | 4710 | $listOptionsForRoles = array(); |
| 4712 | 4711 | $rows = DB::query( |
| 4713 | 4712 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4714 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4715 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4713 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4714 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4716 | 4715 | WHERE r.folder_id = %i', |
| 4717 | 4716 | $inputData['folderId'] |
| 4718 | 4717 | ); |
@@ -4726,7 +4725,7 @@ discard block |
||
| 4726 | 4725 | ); |
| 4727 | 4726 | $rows2 = DB::query( |
| 4728 | 4727 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4729 | - FROM ' . prefixTable('users') . ' |
|
| 4728 | + FROM ' . prefixTable('users').' |
|
| 4730 | 4729 | WHERE admin = 0 AND fonction_id is not null' |
| 4731 | 4730 | ); |
| 4732 | 4731 | foreach ($rows2 as $record2) { |
@@ -4740,7 +4739,7 @@ discard block |
||
| 4740 | 4739 | array( |
| 4741 | 4740 | 'id' => $record2['id'], |
| 4742 | 4741 | 'login' => $record2['login'], |
| 4743 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4742 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4744 | 4743 | 'email' => $record2['email'], |
| 4745 | 4744 | ) |
| 4746 | 4745 | ); |
@@ -4757,12 +4756,12 @@ discard block |
||
| 4757 | 4756 | foreach ($session->get('user-roles_array') as $role) { |
| 4758 | 4757 | $access = DB::queryFirstRow( |
| 4759 | 4758 | 'SELECT type |
| 4760 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4759 | + FROM ' . prefixTable('roles_values').' |
|
| 4761 | 4760 | WHERE role_id = %i AND folder_id = %i', |
| 4762 | 4761 | $role, |
| 4763 | 4762 | $inputData['folderId'] |
| 4764 | 4763 | ); |
| 4765 | - if (DB::count()>0) { |
|
| 4764 | + if (DB::count() > 0) { |
|
| 4766 | 4765 | if ($access['type'] === 'R') { |
| 4767 | 4766 | array_push($arrTmp, 10); |
| 4768 | 4767 | } elseif ($access['type'] === 'W') { |
@@ -4790,7 +4789,7 @@ discard block |
||
| 4790 | 4789 | // Check if personal folder is owned by user |
| 4791 | 4790 | $folder = DB::queryFirstRow( |
| 4792 | 4791 | 'SELECT id |
| 4793 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4792 | + FROM ' . prefixTable('nested_tree').' |
|
| 4794 | 4793 | WHERE title = %s', |
| 4795 | 4794 | $session->get('user-id'), |
| 4796 | 4795 | ); |
@@ -4895,7 +4894,7 @@ discard block |
||
| 4895 | 4894 | // Get some info before deleting |
| 4896 | 4895 | $data = DB::queryFirstRow( |
| 4897 | 4896 | 'SELECT name, id_item, file |
| 4898 | - FROM ' . prefixTable('files') . ' |
|
| 4897 | + FROM ' . prefixTable('files').' |
|
| 4899 | 4898 | WHERE id = %i', |
| 4900 | 4899 | $fileId |
| 4901 | 4900 | ); |
@@ -4903,7 +4902,7 @@ discard block |
||
| 4903 | 4902 | // Load item data |
| 4904 | 4903 | $data_item = DB::queryFirstRow( |
| 4905 | 4904 | 'SELECT id_tree |
| 4906 | - FROM ' . prefixTable('items') . ' |
|
| 4905 | + FROM ' . prefixTable('items').' |
|
| 4907 | 4906 | WHERE id = %i', |
| 4908 | 4907 | $data['id_item'] |
| 4909 | 4908 | ); |
@@ -4933,7 +4932,7 @@ discard block |
||
| 4933 | 4932 | $session->get('user-id'), |
| 4934 | 4933 | 'at_modification', |
| 4935 | 4934 | $session->get('user-login'), |
| 4936 | - 'at_del_file : ' . $data['name'] |
|
| 4935 | + 'at_del_file : '.$data['name'] |
|
| 4937 | 4936 | ); |
| 4938 | 4937 | |
| 4939 | 4938 | // DElete sharekeys |
@@ -4944,7 +4943,7 @@ discard block |
||
| 4944 | 4943 | ); |
| 4945 | 4944 | |
| 4946 | 4945 | // Delete file from server |
| 4947 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 4946 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 4948 | 4947 | $fileToDelete = realpath($fileToDelete); |
| 4949 | 4948 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 4950 | 4949 | fileDelete($fileToDelete, $SETTINGS); |
@@ -4998,7 +4997,7 @@ discard block |
||
| 4998 | 4997 | // Update SESSION with this new favourite |
| 4999 | 4998 | $data = DB::queryFirstRow( |
| 5000 | 4999 | 'SELECT label,id_tree |
| 5001 | - FROM ' . prefixTable('items') . ' |
|
| 5000 | + FROM ' . prefixTable('items').' |
|
| 5002 | 5001 | WHERE id = %i', |
| 5003 | 5002 | $inputData['itemId'] |
| 5004 | 5003 | ); |
@@ -5007,7 +5006,7 @@ discard block |
||
| 5007 | 5006 | [ |
| 5008 | 5007 | $inputData['itemId'] => [ |
| 5009 | 5008 | 'label' => $data['label'], |
| 5010 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 5009 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 5011 | 5010 | ], |
| 5012 | 5011 | ], |
| 5013 | 5012 | 'add' |
@@ -5076,8 +5075,8 @@ discard block |
||
| 5076 | 5075 | // get data about item |
| 5077 | 5076 | $dataSource = DB::queryFirstRow( |
| 5078 | 5077 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5079 | - FROM ' . prefixTable('items') . ' as i |
|
| 5080 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5078 | + FROM ' . prefixTable('items').' as i |
|
| 5079 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5081 | 5080 | WHERE i.id=%i', |
| 5082 | 5081 | $inputData['itemId'] |
| 5083 | 5082 | ); |
@@ -5121,7 +5120,7 @@ discard block |
||
| 5121 | 5120 | // get data about new folder |
| 5122 | 5121 | $dataDestination = DB::queryFirstRow( |
| 5123 | 5122 | 'SELECT personal_folder, title |
| 5124 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5123 | + FROM ' . prefixTable('nested_tree').' |
|
| 5125 | 5124 | WHERE id = %i', |
| 5126 | 5125 | $inputData['folderId'] |
| 5127 | 5126 | ); |
@@ -5174,7 +5173,7 @@ discard block |
||
| 5174 | 5173 | // Get fields for this Item |
| 5175 | 5174 | $rows = DB::query( |
| 5176 | 5175 | 'SELECT id |
| 5177 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5176 | + FROM ' . prefixTable('categories_items').' |
|
| 5178 | 5177 | WHERE item_id = %i', |
| 5179 | 5178 | $inputData['itemId'] |
| 5180 | 5179 | ); |
@@ -5191,7 +5190,7 @@ discard block |
||
| 5191 | 5190 | // Get FILES for this Item |
| 5192 | 5191 | $rows = DB::query( |
| 5193 | 5192 | 'SELECT id |
| 5194 | - FROM ' . prefixTable('files') . ' |
|
| 5193 | + FROM ' . prefixTable('files').' |
|
| 5195 | 5194 | WHERE id_item = %i', |
| 5196 | 5195 | $inputData['itemId'] |
| 5197 | 5196 | ); |
@@ -5238,7 +5237,7 @@ discard block |
||
| 5238 | 5237 | // Get the ITEM object key for the user |
| 5239 | 5238 | $userKey = DB::queryFirstRow( |
| 5240 | 5239 | 'SELECT share_key |
| 5241 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5240 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5242 | 5241 | WHERE user_id = %i AND object_id = %i', |
| 5243 | 5242 | $session->get('user-id'), |
| 5244 | 5243 | $inputData['itemId'] |
@@ -5249,7 +5248,7 @@ discard block |
||
| 5249 | 5248 | // This is a public object |
| 5250 | 5249 | $users = DB::query( |
| 5251 | 5250 | 'SELECT id, public_key |
| 5252 | - FROM ' . prefixTable('users') . ' |
|
| 5251 | + FROM ' . prefixTable('users').' |
|
| 5253 | 5252 | WHERE id NOT IN %li |
| 5254 | 5253 | AND public_key != ""', |
| 5255 | 5254 | $tpUsersIDs |
@@ -5272,14 +5271,14 @@ discard block |
||
| 5272 | 5271 | // Get fields for this Item |
| 5273 | 5272 | $rows = DB::query( |
| 5274 | 5273 | 'SELECT id |
| 5275 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5274 | + FROM ' . prefixTable('categories_items').' |
|
| 5276 | 5275 | WHERE item_id = %i', |
| 5277 | 5276 | $inputData['itemId'] |
| 5278 | 5277 | ); |
| 5279 | 5278 | foreach ($rows as $field) { |
| 5280 | 5279 | $userKey = DB::queryFirstRow( |
| 5281 | 5280 | 'SELECT share_key |
| 5282 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5281 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5283 | 5282 | WHERE user_id = %i AND object_id = %i', |
| 5284 | 5283 | $session->get('user-id'), |
| 5285 | 5284 | $field['id'] |
@@ -5290,7 +5289,7 @@ discard block |
||
| 5290 | 5289 | // This is a public object |
| 5291 | 5290 | $users = DB::query( |
| 5292 | 5291 | 'SELECT id, public_key |
| 5293 | - FROM ' . prefixTable('users') . ' |
|
| 5292 | + FROM ' . prefixTable('users').' |
|
| 5294 | 5293 | WHERE id NOT IN %li |
| 5295 | 5294 | AND public_key != ""', |
| 5296 | 5295 | $tpUsersIDs |
@@ -5313,14 +5312,14 @@ discard block |
||
| 5313 | 5312 | // Get FILES for this Item |
| 5314 | 5313 | $rows = DB::query( |
| 5315 | 5314 | 'SELECT id |
| 5316 | - FROM ' . prefixTable('files') . ' |
|
| 5315 | + FROM ' . prefixTable('files').' |
|
| 5317 | 5316 | WHERE id_item = %i', |
| 5318 | 5317 | $inputData['itemId'] |
| 5319 | 5318 | ); |
| 5320 | 5319 | foreach ($rows as $attachment) { |
| 5321 | 5320 | $userKey = DB::queryFirstRow( |
| 5322 | 5321 | 'SELECT share_key |
| 5323 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5322 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5324 | 5323 | WHERE user_id = %i AND object_id = %i', |
| 5325 | 5324 | $session->get('user-id'), |
| 5326 | 5325 | $attachment['id'] |
@@ -5331,7 +5330,7 @@ discard block |
||
| 5331 | 5330 | // This is a public object |
| 5332 | 5331 | $users = DB::query( |
| 5333 | 5332 | 'SELECT id, public_key |
| 5334 | - FROM ' . prefixTable('users') . ' |
|
| 5333 | + FROM ' . prefixTable('users').' |
|
| 5335 | 5334 | WHERE id NOT IN %li |
| 5336 | 5335 | AND public_key != ""', |
| 5337 | 5336 | $tpUsersIDs |
@@ -5372,7 +5371,7 @@ discard block |
||
| 5372 | 5371 | $session->get('user-id'), |
| 5373 | 5372 | 'at_modification', |
| 5374 | 5373 | $session->get('user-login'), |
| 5375 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5374 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5376 | 5375 | ); |
| 5377 | 5376 | |
| 5378 | 5377 | // Update cache table |
@@ -5431,8 +5430,8 @@ discard block |
||
| 5431 | 5430 | // get data about item |
| 5432 | 5431 | $dataSource = DB::queryFirstRow( |
| 5433 | 5432 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5434 | - FROM ' . prefixTable('items') . ' as i |
|
| 5435 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5433 | + FROM ' . prefixTable('items').' as i |
|
| 5434 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5436 | 5435 | WHERE i.id=%i', |
| 5437 | 5436 | $item_id |
| 5438 | 5437 | ); |
@@ -5454,7 +5453,7 @@ discard block |
||
| 5454 | 5453 | |
| 5455 | 5454 | // get data about new folder |
| 5456 | 5455 | $dataDestination = DB::queryFirstRow( |
| 5457 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5456 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5458 | 5457 | $inputData['folderId'] |
| 5459 | 5458 | ); |
| 5460 | 5459 | |
@@ -5496,7 +5495,7 @@ discard block |
||
| 5496 | 5495 | // Get fields for this Item |
| 5497 | 5496 | $rows = DB::query( |
| 5498 | 5497 | 'SELECT id |
| 5499 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5498 | + FROM ' . prefixTable('categories_items').' |
|
| 5500 | 5499 | WHERE item_id = %i', |
| 5501 | 5500 | $item_id |
| 5502 | 5501 | ); |
@@ -5513,7 +5512,7 @@ discard block |
||
| 5513 | 5512 | // Get FILES for this Item |
| 5514 | 5513 | $rows = DB::query( |
| 5515 | 5514 | 'SELECT id |
| 5516 | - FROM ' . prefixTable('files') . ' |
|
| 5515 | + FROM ' . prefixTable('files').' |
|
| 5517 | 5516 | WHERE id_item = %i', |
| 5518 | 5517 | $item_id |
| 5519 | 5518 | ); |
@@ -5568,7 +5567,7 @@ discard block |
||
| 5568 | 5567 | // Get the ITEM object key for the user |
| 5569 | 5568 | $userKey = DB::queryFirstRow( |
| 5570 | 5569 | 'SELECT share_key |
| 5571 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5570 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5572 | 5571 | WHERE user_id = %i AND object_id = %i', |
| 5573 | 5572 | $session->get('user-id'), |
| 5574 | 5573 | $item_id |
@@ -5579,7 +5578,7 @@ discard block |
||
| 5579 | 5578 | // This is a public object |
| 5580 | 5579 | $users = DB::query( |
| 5581 | 5580 | 'SELECT id, public_key |
| 5582 | - FROM ' . prefixTable('users') . ' |
|
| 5581 | + FROM ' . prefixTable('users').' |
|
| 5583 | 5582 | WHERE id NOT IN %li |
| 5584 | 5583 | AND public_key != ""', |
| 5585 | 5584 | $tpUsersIDs |
@@ -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,7 +5619,7 @@ discard block |
||
| 5620 | 5619 | // This is a public object |
| 5621 | 5620 | $users = DB::query( |
| 5622 | 5621 | 'SELECT id, public_key |
| 5623 | - FROM ' . prefixTable('users') . ' |
|
| 5622 | + FROM ' . prefixTable('users').' |
|
| 5624 | 5623 | WHERE id NOT IN %li |
| 5625 | 5624 | AND public_key != ""', |
| 5626 | 5625 | $tpUsersIDs |
@@ -5644,14 +5643,14 @@ discard block |
||
| 5644 | 5643 | // Get FILES for this Item |
| 5645 | 5644 | $rows = DB::query( |
| 5646 | 5645 | 'SELECT id |
| 5647 | - FROM ' . prefixTable('files') . ' |
|
| 5646 | + FROM ' . prefixTable('files').' |
|
| 5648 | 5647 | WHERE id_item = %i', |
| 5649 | 5648 | $item_id |
| 5650 | 5649 | ); |
| 5651 | 5650 | foreach ($rows as $attachment) { |
| 5652 | 5651 | $userKey = DB::queryFirstRow( |
| 5653 | 5652 | 'SELECT share_key |
| 5654 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5653 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5655 | 5654 | WHERE user_id = %i AND object_id = %i', |
| 5656 | 5655 | $session->get('user-id'), |
| 5657 | 5656 | $attachment['id'] |
@@ -5662,7 +5661,7 @@ discard block |
||
| 5662 | 5661 | // This is a public object |
| 5663 | 5662 | $users = DB::query( |
| 5664 | 5663 | 'SELECT id, public_key |
| 5665 | - FROM ' . prefixTable('users') . ' |
|
| 5664 | + FROM ' . prefixTable('users').' |
|
| 5666 | 5665 | WHERE id NOT IN %li |
| 5667 | 5666 | AND public_key != ""', |
| 5668 | 5667 | $tpUsersIDs |
@@ -5702,13 +5701,13 @@ discard block |
||
| 5702 | 5701 | $session->get('user-id'), |
| 5703 | 5702 | 'at_modification', |
| 5704 | 5703 | $session->get('user-login'), |
| 5705 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5704 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5706 | 5705 | ); |
| 5707 | 5706 | } |
| 5708 | 5707 | } |
| 5709 | 5708 | |
| 5710 | 5709 | // reload cache table |
| 5711 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5710 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5712 | 5711 | updateCacheTable('reload', null); |
| 5713 | 5712 | |
| 5714 | 5713 | echo (string) prepareExchangedData( |
@@ -5772,7 +5771,7 @@ discard block |
||
| 5772 | 5771 | // get info |
| 5773 | 5772 | $dataSource = DB::queryFirstRow( |
| 5774 | 5773 | 'SELECT label, id_tree |
| 5775 | - FROM ' . prefixTable('items') . ' |
|
| 5774 | + FROM ' . prefixTable('items').' |
|
| 5776 | 5775 | WHERE id=%i', |
| 5777 | 5776 | $item_id |
| 5778 | 5777 | ); |
@@ -5873,14 +5872,14 @@ discard block |
||
| 5873 | 5872 | // Variables |
| 5874 | 5873 | $dataAuthor = DB::queryFirstRow( |
| 5875 | 5874 | 'SELECT email,login |
| 5876 | - FROM ' . prefixTable('users') . ' |
|
| 5875 | + FROM ' . prefixTable('users').' |
|
| 5877 | 5876 | WHERE id = %i', |
| 5878 | 5877 | $post_content[1] |
| 5879 | 5878 | ); |
| 5880 | 5879 | |
| 5881 | 5880 | $dataItem = DB::queryFirstRow( |
| 5882 | 5881 | 'SELECT label, id_tree |
| 5883 | - FROM ' . prefixTable('items') . ' |
|
| 5882 | + FROM ' . prefixTable('items').' |
|
| 5884 | 5883 | WHERE id = %i', |
| 5885 | 5884 | $post_content[0] |
| 5886 | 5885 | ); |
@@ -5897,7 +5896,7 @@ discard block |
||
| 5897 | 5896 | $lang->get('email_request_access_subject'), |
| 5898 | 5897 | str_replace( |
| 5899 | 5898 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5900 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5899 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5901 | 5900 | $lang->get('email_request_access_mail') |
| 5902 | 5901 | ), |
| 5903 | 5902 | $dataAuthor['email'], |
@@ -5906,7 +5905,7 @@ discard block |
||
| 5906 | 5905 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5907 | 5906 | $dataItem = DB::queryFirstRow( |
| 5908 | 5907 | 'SELECT label,id_tree |
| 5909 | - FROM ' . prefixTable('items') . ' |
|
| 5908 | + FROM ' . prefixTable('items').' |
|
| 5910 | 5909 | WHERE id= %i', |
| 5911 | 5910 | $inputData['id'] |
| 5912 | 5911 | ); |
@@ -5929,7 +5928,7 @@ discard block |
||
| 5929 | 5928 | ), |
| 5930 | 5929 | array( |
| 5931 | 5930 | empty($SETTINGS['email_server_url']) === false ? |
| 5932 | - $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'], |
|
| 5931 | + $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'], |
|
| 5933 | 5932 | addslashes($session->get('user-login')), |
| 5934 | 5933 | addslashes($path), |
| 5935 | 5934 | ), |
@@ -5978,8 +5977,8 @@ discard block |
||
| 5978 | 5977 | // Get all informations for this item |
| 5979 | 5978 | $dataItem = DB::queryFirstRow( |
| 5980 | 5979 | 'SELECT * |
| 5981 | - FROM ' . prefixTable('items') . ' as i |
|
| 5982 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5980 | + FROM ' . prefixTable('items').' as i |
|
| 5981 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5983 | 5982 | WHERE i.id=%i AND l.action = %s', |
| 5984 | 5983 | $item_id, |
| 5985 | 5984 | 'at_creation' |
@@ -6008,18 +6007,18 @@ discard block |
||
| 6008 | 6007 | $session->get('user-login'), |
| 6009 | 6008 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 6010 | 6009 | null, |
| 6011 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 6010 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 6012 | 6011 | ); |
| 6013 | 6012 | // Prepare new line |
| 6014 | 6013 | $data = DB::queryFirstRow( |
| 6015 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 6014 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 6016 | 6015 | $item_id |
| 6017 | 6016 | ); |
| 6018 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 6017 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 6019 | 6018 | // send back |
| 6020 | 6019 | $data = array( |
| 6021 | 6020 | 'error' => '', |
| 6022 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 6021 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 6023 | 6022 | ); |
| 6024 | 6023 | echo (string) prepareExchangedData( |
| 6025 | 6024 | $data, |
@@ -6094,8 +6093,8 @@ discard block |
||
| 6094 | 6093 | // Should we log a password change? |
| 6095 | 6094 | $itemQ = DB::queryFirstRow( |
| 6096 | 6095 | 'SELECT s.share_key, i.pw |
| 6097 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6098 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6096 | + FROM ' . prefixTable('items').' AS i |
|
| 6097 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6099 | 6098 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6100 | 6099 | $session->get('user-id'), |
| 6101 | 6100 | $dataReceived['id'] |
@@ -6150,7 +6149,7 @@ discard block |
||
| 6150 | 6149 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6151 | 6150 | $SETTINGS['otv_expiration_period'] = 7; |
| 6152 | 6151 | } |
| 6153 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6152 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6154 | 6153 | |
| 6155 | 6154 | echo json_encode( |
| 6156 | 6155 | array( |
@@ -6181,7 +6180,7 @@ discard block |
||
| 6181 | 6180 | // get parameters from original link |
| 6182 | 6181 | $url = $dataReceived['original_link']; |
| 6183 | 6182 | $parts = parse_url($url); |
| 6184 | - if(isset($parts['query'])){ |
|
| 6183 | + if (isset($parts['query'])) { |
|
| 6185 | 6184 | parse_str($parts['query'], $orignal_link_parameters); |
| 6186 | 6185 | } else { |
| 6187 | 6186 | $orignal_link_parameters = array(); |
@@ -6212,13 +6211,13 @@ discard block |
||
| 6212 | 6211 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6213 | 6212 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6214 | 6213 | if (str_contains($domain_host, 'www.') === true) { |
| 6215 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6214 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6216 | 6215 | } else { |
| 6217 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6216 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6218 | 6217 | } |
| 6219 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6218 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6220 | 6219 | } else { |
| 6221 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6220 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6222 | 6221 | } |
| 6223 | 6222 | |
| 6224 | 6223 | echo (string) prepareExchangedData( |
@@ -6253,8 +6252,8 @@ discard block |
||
| 6253 | 6252 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6254 | 6253 | f.extension AS extension, f.type AS type, |
| 6255 | 6254 | s.share_key AS share_key |
| 6256 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6257 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6255 | + FROM ' . prefixTable('files').' AS f |
|
| 6256 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6258 | 6257 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6259 | 6258 | $session->get('user-id'), |
| 6260 | 6259 | $inputData['id'] |
@@ -6275,7 +6274,7 @@ discard block |
||
| 6275 | 6274 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6276 | 6275 | |
| 6277 | 6276 | // prepare image info |
| 6278 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6277 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6279 | 6278 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6280 | 6279 | |
| 6281 | 6280 | // Get image content |
@@ -6302,7 +6301,7 @@ discard block |
||
| 6302 | 6301 | echo (string) prepareExchangedData( |
| 6303 | 6302 | array( |
| 6304 | 6303 | 'error' => false, |
| 6305 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6304 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6306 | 6305 | 'file_type' => $file_info['type'], |
| 6307 | 6306 | 'file_content' => $fileContent, |
| 6308 | 6307 | ), |
@@ -6416,7 +6415,7 @@ discard block |
||
| 6416 | 6415 | $arbo = $tree->getPath($folder->id, false); |
| 6417 | 6416 | $path = ''; |
| 6418 | 6417 | foreach ($arbo as $elem) { |
| 6419 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6418 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6420 | 6419 | } |
| 6421 | 6420 | |
| 6422 | 6421 | // Build array |
@@ -6485,7 +6484,7 @@ discard block |
||
| 6485 | 6484 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6486 | 6485 | $rows = DB::query( |
| 6487 | 6486 | 'SELECT id, categories |
| 6488 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6487 | + FROM ' . prefixTable('nested_tree').' |
|
| 6489 | 6488 | WHERE id IN (%l)', |
| 6490 | 6489 | implode(',', $foldersArray) |
| 6491 | 6490 | ); |
@@ -6527,7 +6526,7 @@ discard block |
||
| 6527 | 6526 | // get item info |
| 6528 | 6527 | $dataItem = DB::queryFirstRow( |
| 6529 | 6528 | 'SELECT * |
| 6530 | - FROM ' . prefixTable('items') . ' |
|
| 6529 | + FROM ' . prefixTable('items').' |
|
| 6531 | 6530 | WHERE id=%i', |
| 6532 | 6531 | $inputData['itemId'] |
| 6533 | 6532 | ); |
@@ -6539,8 +6538,8 @@ discard block |
||
| 6539 | 6538 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6540 | 6539 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6541 | 6540 | l.old_value as old_value |
| 6542 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6543 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6541 | + FROM ' . prefixTable('log_items').' as l |
|
| 6542 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6544 | 6543 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6545 | 6544 | ORDER BY date DESC', |
| 6546 | 6545 | $inputData['itemId'], |
@@ -6555,18 +6554,18 @@ discard block |
||
| 6555 | 6554 | |
| 6556 | 6555 | // imported via API |
| 6557 | 6556 | if (empty($record['login']) === true) { |
| 6558 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6557 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6559 | 6558 | } |
| 6560 | 6559 | |
| 6561 | 6560 | // Prepare avatar |
| 6562 | 6561 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6563 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6564 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6562 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6563 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6565 | 6564 | } else { |
| 6566 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6565 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6567 | 6566 | } |
| 6568 | 6567 | } else { |
| 6569 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6568 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6570 | 6569 | } |
| 6571 | 6570 | |
| 6572 | 6571 | // Prepare action |
@@ -6586,7 +6585,7 @@ discard block |
||
| 6586 | 6585 | $previous_passwords, |
| 6587 | 6586 | [ |
| 6588 | 6587 | 'password' => htmlentities($previous_pwd['string']), |
| 6589 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6588 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6590 | 6589 | ] |
| 6591 | 6590 | ); |
| 6592 | 6591 | } |
@@ -6599,19 +6598,19 @@ discard block |
||
| 6599 | 6598 | $action = $lang->get($reason[0]); |
| 6600 | 6599 | if ($reason[0] === 'at_moved') { |
| 6601 | 6600 | $tmp = explode(' -> ', $reason[1]); |
| 6602 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6601 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6603 | 6602 | } elseif ($reason[0] === 'at_field') { |
| 6604 | 6603 | $tmp = explode(' => ', $reason[1]); |
| 6605 | 6604 | if (count($tmp) > 1) { |
| 6606 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6607 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6605 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6606 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6608 | 6607 | } else { |
| 6609 | 6608 | $detail = trim($reason[1]); |
| 6610 | 6609 | } |
| 6611 | 6610 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6612 | 6611 | $tmp = explode(' => ', $reason[1]); |
| 6613 | 6612 | $detail = empty(trim($tmp[0])) === true ? |
| 6614 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6613 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6615 | 6614 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6616 | 6615 | $detail = $lang->get($reason[1]); |
| 6617 | 6616 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') { |
@@ -6620,7 +6619,7 @@ discard block |
||
| 6620 | 6619 | $tmp = explode(':', $reason[1]); |
| 6621 | 6620 | $tmp = explode('.', $tmp[0]); |
| 6622 | 6621 | $detail = isBase64($tmp[0]) === true ? |
| 6623 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6622 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6624 | 6623 | } elseif ($reason[0] === 'at_import') { |
| 6625 | 6624 | $detail = ''; |
| 6626 | 6625 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6639,8 +6638,8 @@ discard block |
||
| 6639 | 6638 | array( |
| 6640 | 6639 | 'avatar' => $avatar, |
| 6641 | 6640 | 'login' => $record['login'], |
| 6642 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6643 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6641 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6642 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6644 | 6643 | 'action' => $action, |
| 6645 | 6644 | 'detail' => $detail, |
| 6646 | 6645 | ) |
@@ -6728,11 +6727,11 @@ discard block |
||
| 6728 | 6727 | |
| 6729 | 6728 | // get some info to add to the notification email |
| 6730 | 6729 | $resp_user = DB::queryFirstRow( |
| 6731 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6730 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6732 | 6731 | $session->get('user-id') |
| 6733 | 6732 | ); |
| 6734 | 6733 | $resp_folder = DB::queryFirstRow( |
| 6735 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6734 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6736 | 6735 | $folder |
| 6737 | 6736 | ); |
| 6738 | 6737 | |
@@ -6741,7 +6740,7 @@ discard block |
||
| 6741 | 6740 | $emailService = new EmailService(); |
| 6742 | 6741 | $rows = DB::query( |
| 6743 | 6742 | 'SELECT email |
| 6744 | - FROM ' . prefixTable('users') . ' |
|
| 6743 | + FROM ' . prefixTable('users').' |
|
| 6745 | 6744 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6746 | 6745 | 1 |
| 6747 | 6746 | ); |
@@ -6787,7 +6786,7 @@ discard block |
||
| 6787 | 6786 | // Send email |
| 6788 | 6787 | $dataItem = DB::queryFirstRow( |
| 6789 | 6788 | 'SELECT label, id_tree |
| 6790 | - FROM ' . prefixTable('items') . ' |
|
| 6789 | + FROM ' . prefixTable('items').' |
|
| 6791 | 6790 | WHERE id = %i', |
| 6792 | 6791 | $inputData['itemId'] |
| 6793 | 6792 | ); |
@@ -6841,7 +6840,7 @@ discard block |
||
| 6841 | 6840 | |
| 6842 | 6841 | DB::query( |
| 6843 | 6842 | 'SELECT * |
| 6844 | - FROM ' . prefixTable('notification') . ' |
|
| 6843 | + FROM ' . prefixTable('notification').' |
|
| 6845 | 6844 | WHERE item_id = %i AND user_id = %i', |
| 6846 | 6845 | $inputData['itemId'], |
| 6847 | 6846 | $session->get('user-id') |
@@ -6913,7 +6912,7 @@ discard block |
||
| 6913 | 6912 | // And related logs |
| 6914 | 6913 | $rows = DB::query( |
| 6915 | 6914 | 'SELECT id, file AS filename |
| 6916 | - FROM ' . prefixTable('files') . ' |
|
| 6915 | + FROM ' . prefixTable('files').' |
|
| 6917 | 6916 | WHERE id_item = %i AND confirmed = %i', |
| 6918 | 6917 | $inputData['itemId'], |
| 6919 | 6918 | 0 |
@@ -6927,12 +6926,12 @@ discard block |
||
| 6927 | 6926 | ); |
| 6928 | 6927 | |
| 6929 | 6928 | // Delete file on server |
| 6930 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6929 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6931 | 6930 | |
| 6932 | 6931 | // Delete related logs |
| 6933 | 6932 | $logFile = DB::query( |
| 6934 | 6933 | 'SELECT increment_id, raison |
| 6935 | - FROM ' . prefixTable('log_items') . ' |
|
| 6934 | + FROM ' . prefixTable('log_items').' |
|
| 6936 | 6935 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6937 | 6936 | $inputData['itemId'], |
| 6938 | 6937 | $session->get('user-id'), |
@@ -6991,7 +6990,7 @@ discard block |
||
| 6991 | 6990 | // Confirm attachments |
| 6992 | 6991 | $rows = DB::query( |
| 6993 | 6992 | 'SELECT id, file AS filename |
| 6994 | - FROM ' . prefixTable('files') . ' |
|
| 6993 | + FROM ' . prefixTable('files').' |
|
| 6995 | 6994 | WHERE id_item = %i AND confirmed = %i', |
| 6996 | 6995 | $inputData['itemId'], |
| 6997 | 6996 | 0 |
@@ -7073,15 +7072,15 @@ discard block |
||
| 7073 | 7072 | case 'autocomplete_tags': |
| 7074 | 7073 | // Get a list off all existing TAGS |
| 7075 | 7074 | $listOfTags = ''; |
| 7076 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7075 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7077 | 7076 | foreach ($rows as $record) { |
| 7078 | 7077 | if (empty($listOfTags)) { |
| 7079 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7078 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7080 | 7079 | } else { |
| 7081 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7080 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7082 | 7081 | } |
| 7083 | 7082 | } |
| 7084 | - echo '[' . $listOfTags . ']'; |
|
| 7083 | + echo '['.$listOfTags.']'; |
|
| 7085 | 7084 | break; |
| 7086 | 7085 | } |
| 7087 | 7086 | } |
@@ -7097,7 +7096,7 @@ discard block |
||
| 7097 | 7096 | { |
| 7098 | 7097 | $data = DB::queryFirstRow( |
| 7099 | 7098 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7100 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7099 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7101 | 7100 | $groupe |
| 7102 | 7101 | ); |
| 7103 | 7102 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7210,7 +7209,7 @@ discard block |
||
| 7210 | 7209 | $now = time(); |
| 7211 | 7210 | $editionLocks = DB::query( |
| 7212 | 7211 | 'SELECT timestamp, user_id, increment_id |
| 7213 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7212 | + FROM ' . prefixTable('items_edition').' |
|
| 7214 | 7213 | WHERE item_id = %i |
| 7215 | 7214 | ORDER BY increment_id DESC', |
| 7216 | 7215 | $itemId |
@@ -7256,7 +7255,7 @@ discard block |
||
| 7256 | 7255 | |
| 7257 | 7256 | // Delete related background tasks if any |
| 7258 | 7257 | $task = DB::queryFirstRow( |
| 7259 | - 'SELECT increment_id FROM ' . prefixTable('background_tasks') . ' |
|
| 7258 | + 'SELECT increment_id FROM '.prefixTable('background_tasks').' |
|
| 7260 | 7259 | WHERE item_id = %i AND finished_at = ""', |
| 7261 | 7260 | $itemId |
| 7262 | 7261 | ); |
@@ -7269,7 +7268,7 @@ discard block |
||
| 7269 | 7268 | // Check if encryption process is still running |
| 7270 | 7269 | DB::queryFirstRow( |
| 7271 | 7270 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 7272 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 7271 | + FROM ' . prefixTable('background_tasks').' |
|
| 7273 | 7272 | WHERE item_id = %i AND finished_at = "" |
| 7274 | 7273 | ORDER BY increment_id DESC', |
| 7275 | 7274 | $itemId |
@@ -7290,7 +7289,7 @@ discard block |
||
| 7290 | 7289 | } |
| 7291 | 7290 | |
| 7292 | 7291 | return [ |
| 7293 | - 'status' => true, // Encryption in progress |
|
| 7292 | + 'status' => true, // Encryption in progress |
|
| 7294 | 7293 | 'delay' => $delay - $elapsed, // Time remaining before the lock expires |
| 7295 | 7294 | ]; |
| 7296 | 7295 | } |
@@ -7335,7 +7334,7 @@ discard block |
||
| 7335 | 7334 | { |
| 7336 | 7335 | // Check if there's an ongoing background encryption process for the item |
| 7337 | 7336 | $ongoingProcess = DB::queryFirstRow( |
| 7338 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7337 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7339 | 7338 | $itemId |
| 7340 | 7339 | ); |
| 7341 | 7340 | |
@@ -7353,7 +7352,7 @@ discard block |
||
| 7353 | 7352 | function getUserVisibleFolders(int $userId): array |
| 7354 | 7353 | { |
| 7355 | 7354 | // Query to retrieve visible folders for the user |
| 7356 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7355 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7357 | 7356 | |
| 7358 | 7357 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7359 | 7358 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7377,7 +7376,7 @@ discard block |
||
| 7377 | 7376 | |
| 7378 | 7377 | // Query the access rights for the given roles and folder |
| 7379 | 7378 | $accessTypes = DB::queryFirstColumn( |
| 7380 | - 'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7379 | + 'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7381 | 7380 | $roles, |
| 7382 | 7381 | $treeId |
| 7383 | 7382 | ); |
@@ -28,8 +28,8 @@ |
||
| 28 | 28 | * @see https://www.teampass.net |
| 29 | 29 | */ |
| 30 | 30 | |
| 31 | - // TO REMOVE |
|
| 32 | - // - selected_items_to_be_imported |
|
| 31 | + // TO REMOVE |
|
| 32 | + // - selected_items_to_be_imported |
|
| 33 | 33 | |
| 34 | 34 | return array( |
| 35 | 35 | 'at_phone_number' => 'Phone number', |
