nilsteampassnet /
TeamPass
@@ -2603,7 +2603,9 @@ |
||
| 2603 | 2603 | } |
| 2604 | 2604 | |
| 2605 | 2605 | foreach ($results as $adUser) { |
| 2606 | - if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
|
| 2606 | + if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) { |
|
| 2607 | + continue; |
|
| 2608 | + } |
|
| 2607 | 2609 | // Build the list of all groups in AD |
| 2608 | 2610 | if (isset($adUser['memberof']) === true) { |
| 2609 | 2611 | foreach($adUser['memberof'] as $j => $adUserGroup) { |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 64 | 64 | // Not allowed page |
| 65 | 65 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 66 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 66 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 67 | 67 | exit; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | // Prepare variables |
| 124 | 124 | $login = filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 125 | 125 | $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL); |
| 126 | - $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
|
| 126 | + $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
|
| 127 | 127 | $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 128 | 128 | $name = filter_var($dataReceived['name'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 129 | 129 | $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT); |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | // Check if user already exists |
| 155 | 155 | $data = DB::query( |
| 156 | 156 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 157 | - FROM ' . prefixTable('users') . ' |
|
| 157 | + FROM ' . prefixTable('users').' |
|
| 158 | 158 | WHERE login = %s |
| 159 | 159 | AND deleted_at IS NULL', |
| 160 | 160 | $login |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | |
| 391 | 391 | // Get info about user to delete |
| 392 | 392 | $data_user = DB::queryfirstrow( |
| 393 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 393 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 394 | 394 | WHERE id = %i', |
| 395 | 395 | $post_id |
| 396 | 396 | ); |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | ); |
| 425 | 425 | // delete personal folder and subfolders |
| 426 | 426 | $data = DB::queryfirstrow( |
| 427 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 427 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 428 | 428 | WHERE title = %s AND personal_folder = %i', |
| 429 | 429 | $post_id, |
| 430 | 430 | '1' |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 438 | 438 | // delete items & logs |
| 439 | 439 | $items = DB::query( |
| 440 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 440 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 441 | 441 | WHERE id_tree=%i AND perso = %i', |
| 442 | 442 | $folder->id, |
| 443 | 443 | '1' |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | // Delete any process related to user |
| 462 | 462 | $processes = DB::query( |
| 463 | 463 | 'SELECT increment_id |
| 464 | - FROM ' . prefixTable('processes') . ' |
|
| 464 | + FROM ' . prefixTable('processes').' |
|
| 465 | 465 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 466 | 466 | $post_id |
| 467 | 467 | ); |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | |
| 522 | 522 | // Get info about user to delete |
| 523 | 523 | $data_user = DB::queryfirstrow( |
| 524 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 524 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 525 | 525 | WHERE id = %i', |
| 526 | 526 | $post_id |
| 527 | 527 | ); |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | |
| 564 | 564 | // Get info about user to delete |
| 565 | 565 | $data_user = DB::queryfirstrow( |
| 566 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 566 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 567 | 567 | WHERE id = %i', |
| 568 | 568 | $post_id |
| 569 | 569 | ); |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | // Get info about user to delete |
| 607 | 607 | $data_user = DB::queryfirstrow( |
| 608 | 608 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
| 609 | - FROM ' . prefixTable('users') . ' |
|
| 609 | + FROM ' . prefixTable('users').' |
|
| 610 | 610 | WHERE id = %i', |
| 611 | 611 | $post_id |
| 612 | 612 | ); |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | // Get info about user to delete |
| 652 | 652 | $data_user = DB::queryfirstrow( |
| 653 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 653 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 654 | 654 | WHERE id = %i', |
| 655 | 655 | $post_id |
| 656 | 656 | ); |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | // Get info about user to delete |
| 694 | 694 | $data_user = DB::queryfirstrow( |
| 695 | 695 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 696 | - FROM ' . prefixTable('users') . ' |
|
| 696 | + FROM ' . prefixTable('users').' |
|
| 697 | 697 | WHERE id = %i', |
| 698 | 698 | $post_id |
| 699 | 699 | ); |
@@ -736,7 +736,7 @@ discard block |
||
| 736 | 736 | // Get info about user to delete |
| 737 | 737 | $data_user = DB::queryfirstrow( |
| 738 | 738 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 739 | - FROM ' . prefixTable('users') . ' |
|
| 739 | + FROM ' . prefixTable('users').' |
|
| 740 | 740 | WHERE id = %i', |
| 741 | 741 | $post_id |
| 742 | 742 | ); |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | // Get info about user to delete |
| 777 | 777 | $data_user = DB::queryfirstrow( |
| 778 | 778 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 779 | - FROM ' . prefixTable('users') . ' |
|
| 779 | + FROM ' . prefixTable('users').' |
|
| 780 | 780 | WHERE id = %i', |
| 781 | 781 | $post_id |
| 782 | 782 | ); |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | $return = array(); |
| 816 | 816 | // Check if folder exists |
| 817 | 817 | $data = DB::query( |
| 818 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 818 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 819 | 819 | WHERE title = %s AND parent_id = %i', |
| 820 | 820 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
| 821 | 821 | '0' |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | } |
| 829 | 829 | // Check if role exists |
| 830 | 830 | $data = DB::query( |
| 831 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 831 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 832 | 832 | WHERE title = %s', |
| 833 | 833 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 834 | 834 | ); |
@@ -848,7 +848,7 @@ discard block |
||
| 848 | 848 | case 'user_log_items': |
| 849 | 849 | $nb_pages = 1; |
| 850 | 850 | $logs = $sql_filter = ''; |
| 851 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . $lang->get('pages') . ' : </td>'; |
|
| 851 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.$lang->get('pages').' : </td>'; |
|
| 852 | 852 | |
| 853 | 853 | // Prepare POST variables |
| 854 | 854 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -860,14 +860,14 @@ discard block |
||
| 860 | 860 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) |
| 861 | 861 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) !== 'all' |
| 862 | 862 | ) { |
| 863 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "'"; |
|
| 863 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)."'"; |
|
| 864 | 864 | } |
| 865 | 865 | // get number of pages |
| 866 | 866 | DB::query( |
| 867 | 867 | 'SELECT * |
| 868 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 869 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 870 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 868 | + FROM ' . prefixTable('log_items').' as l |
|
| 869 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 870 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 871 | 871 | WHERE l.id_user = %i ' . $sql_filter, |
| 872 | 872 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 873 | 873 | ); |
@@ -885,19 +885,19 @@ discard block |
||
| 885 | 885 | // launch query |
| 886 | 886 | $rows = DB::query( |
| 887 | 887 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
| 888 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 889 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 890 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 891 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
| 888 | + FROM ' . prefixTable('log_items').' as l |
|
| 889 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 890 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 891 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
| 892 | 892 | ORDER BY date DESC |
| 893 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
| 893 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
| 894 | 894 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 895 | 895 | ); |
| 896 | 896 | } else { |
| 897 | 897 | // get number of pages |
| 898 | 898 | DB::query( |
| 899 | 899 | 'SELECT * |
| 900 | - FROM ' . prefixTable('log_system') . ' |
|
| 900 | + FROM ' . prefixTable('log_system').' |
|
| 901 | 901 | WHERE type = %s AND field_1=%i', |
| 902 | 902 | 'user_mngt', |
| 903 | 903 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -916,7 +916,7 @@ discard block |
||
| 916 | 916 | // launch query |
| 917 | 917 | $rows = DB::query( |
| 918 | 918 | 'SELECT * |
| 919 | - FROM ' . prefixTable('log_system') . ' |
|
| 919 | + FROM ' . prefixTable('log_system').' |
|
| 920 | 920 | WHERE type = %s AND field_1 = %i |
| 921 | 921 | ORDER BY date DESC |
| 922 | 922 | LIMIT %i, %i', |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | if (isset($counter) && $counter != 0) { |
| 931 | 931 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
| 932 | 932 | for ($i = 1; $i <= $nb_pages; ++$i) { |
| 933 | - $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>'; |
|
| 933 | + $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>'; |
|
| 934 | 934 | } |
| 935 | 935 | } |
| 936 | 936 | $pages .= '</tr></table>'; |
@@ -939,7 +939,7 @@ discard block |
||
| 939 | 939 | if ($post_scope === 'user_mngt') { |
| 940 | 940 | $user = DB::queryfirstrow( |
| 941 | 941 | 'SELECT login |
| 942 | - from ' . prefixTable('users') . ' |
|
| 942 | + from ' . prefixTable('users').' |
|
| 943 | 943 | WHERE id=%i', |
| 944 | 944 | $record['qui'] |
| 945 | 945 | ); |
@@ -949,7 +949,7 @@ discard block |
||
| 949 | 949 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
| 950 | 950 | $label = $lang->get('log_user_initial_pwd_changed'); |
| 951 | 951 | } elseif ($tmp[0] == 'at_user_email_changed') { |
| 952 | - $label = $lang->get('log_user_email_changed') . $tmp[1]; |
|
| 952 | + $label = $lang->get('log_user_email_changed').$tmp[1]; |
|
| 953 | 953 | } elseif ($tmp[0] == 'at_user_added') { |
| 954 | 954 | $label = $lang->get('log_user_created'); |
| 955 | 955 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -960,14 +960,14 @@ discard block |
||
| 960 | 960 | $label = $lang->get('log_user_pwd_changed'); |
| 961 | 961 | } |
| 962 | 962 | // prepare log |
| 963 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>'; |
|
| 963 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>'; |
|
| 964 | 964 | } else { |
| 965 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . $lang->get($record['action']) . '</td></tr>'; |
|
| 965 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.$lang->get($record['action']).'</td></tr>'; |
|
| 966 | 966 | } |
| 967 | 967 | } |
| 968 | 968 | } |
| 969 | 969 | |
| 970 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
| 970 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
| 971 | 971 | break; |
| 972 | 972 | |
| 973 | 973 | /* |
@@ -990,7 +990,7 @@ discard block |
||
| 990 | 990 | } else { |
| 991 | 991 | // Get folder id for Admin |
| 992 | 992 | $admin_folder = DB::queryFirstRow( |
| 993 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 993 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 994 | 994 | WHERE title = %i AND personal_folder = %i', |
| 995 | 995 | (int) $session->get('user-id'), |
| 996 | 996 | '1' |
@@ -1001,15 +1001,15 @@ discard block |
||
| 1001 | 1001 | // Get each Items in PF |
| 1002 | 1002 | $rows = DB::query( |
| 1003 | 1003 | 'SELECT i.pw, i.label, l.id_user |
| 1004 | - FROM ' . prefixTable('items') . ' as i |
|
| 1005 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
| 1004 | + FROM ' . prefixTable('items').' as i |
|
| 1005 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
| 1006 | 1006 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
| 1007 | 1007 | 'at_creation', |
| 1008 | 1008 | '1', |
| 1009 | 1009 | intval($folder->id) |
| 1010 | 1010 | ); |
| 1011 | 1011 | foreach ($rows as $record) { |
| 1012 | - echo $record['label'] . ' - '; |
|
| 1012 | + echo $record['label'].' - '; |
|
| 1013 | 1013 | // Change user |
| 1014 | 1014 | DB::update( |
| 1015 | 1015 | prefixTable('log_items'), |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | // Get info about user to delete |
| 1045 | 1045 | $data_user = DB::queryfirstrow( |
| 1046 | 1046 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1047 | - FROM ' . prefixTable('users') . ' |
|
| 1047 | + FROM ' . prefixTable('users').' |
|
| 1048 | 1048 | WHERE id = %i', |
| 1049 | 1049 | $post_user_id |
| 1050 | 1050 | ); |
@@ -1081,7 +1081,7 @@ discard block |
||
| 1081 | 1081 | |
| 1082 | 1082 | // Do |
| 1083 | 1083 | $rows = DB::query( |
| 1084 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 1084 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 1085 | 1085 | WHERE timestamp != %s AND admin != %i', |
| 1086 | 1086 | '', |
| 1087 | 1087 | '1' |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | // Get info about user to delete |
| 1091 | 1091 | $data_user = DB::queryfirstrow( |
| 1092 | 1092 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1093 | - FROM ' . prefixTable('users') . ' |
|
| 1093 | + FROM ' . prefixTable('users').' |
|
| 1094 | 1094 | WHERE id = %i', |
| 1095 | 1095 | $record['id'] |
| 1096 | 1096 | ); |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | // Get info about user |
| 1152 | 1152 | $rowUser = DB::queryfirstrow( |
| 1153 | 1153 | 'SELECT * |
| 1154 | - FROM ' . prefixTable('users') . ' |
|
| 1154 | + FROM ' . prefixTable('users').' |
|
| 1155 | 1155 | WHERE id = %i', |
| 1156 | 1156 | $post_id |
| 1157 | 1157 | ); |
@@ -1178,7 +1178,7 @@ discard block |
||
| 1178 | 1178 | // array of roles for actual user |
| 1179 | 1179 | //$my_functions = explode(';', $rowUser['fonction_id']); |
| 1180 | 1180 | |
| 1181 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 1181 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 1182 | 1182 | foreach ($rows as $record) { |
| 1183 | 1183 | if ( |
| 1184 | 1184 | (int) $session->get('user-admin') === 1 |
@@ -1215,7 +1215,7 @@ discard block |
||
| 1215 | 1215 | $rolesList = array(); |
| 1216 | 1216 | $managedBy = array(); |
| 1217 | 1217 | $selected = ''; |
| 1218 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 1218 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 1219 | 1219 | foreach ($rows as $reccord) { |
| 1220 | 1220 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 1221 | 1221 | } |
@@ -1246,7 +1246,7 @@ discard block |
||
| 1246 | 1246 | array_push( |
| 1247 | 1247 | $managedBy, |
| 1248 | 1248 | array( |
| 1249 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
| 1249 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
| 1250 | 1250 | 'id' => $fonction['id'], |
| 1251 | 1251 | 'selected' => $selected, |
| 1252 | 1252 | ) |
@@ -1328,9 +1328,9 @@ discard block |
||
| 1328 | 1328 | |
| 1329 | 1329 | // get USER STATUS |
| 1330 | 1330 | if ($rowUser['disabled'] == 1) { |
| 1331 | - $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>'; |
|
| 1331 | + $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>'; |
|
| 1332 | 1332 | } else { |
| 1333 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
| 1333 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
| 1334 | 1334 | } |
| 1335 | 1335 | |
| 1336 | 1336 | $arrData['error'] = false; |
@@ -1427,7 +1427,7 @@ discard block |
||
| 1427 | 1427 | // count number of admins |
| 1428 | 1428 | $users = DB::query( |
| 1429 | 1429 | 'SELECT id |
| 1430 | - FROM ' . prefixTable('users') . ' |
|
| 1430 | + FROM ' . prefixTable('users').' |
|
| 1431 | 1431 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
| 1432 | 1432 | $post_id |
| 1433 | 1433 | ); |
@@ -1450,7 +1450,7 @@ discard block |
||
| 1450 | 1450 | // Exclude roles from AD - PR #3635 |
| 1451 | 1451 | $adRoles = DB::query( |
| 1452 | 1452 | 'SELECT roles_from_ad_groups |
| 1453 | - FROM ' . prefixTable('users') . ' |
|
| 1453 | + FROM ' . prefixTable('users').' |
|
| 1454 | 1454 | WHERE id = '. $dataReceived['user_id'] |
| 1455 | 1455 | )[0]['roles_from_ad_groups']; |
| 1456 | 1456 | $fonctions = []; |
@@ -1529,7 +1529,7 @@ discard block |
||
| 1529 | 1529 | |
| 1530 | 1530 | // Get info about user to delete |
| 1531 | 1531 | $data_user = DB::queryfirstrow( |
| 1532 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1532 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1533 | 1533 | WHERE id = %i', |
| 1534 | 1534 | $post_id |
| 1535 | 1535 | ); |
@@ -1550,7 +1550,7 @@ discard block |
||
| 1550 | 1550 | ); |
| 1551 | 1551 | // delete personal folder and subfolders |
| 1552 | 1552 | $data = DB::queryfirstrow( |
| 1553 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1553 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1554 | 1554 | WHERE title = %s AND personal_folder = %i', |
| 1555 | 1555 | $post_id, |
| 1556 | 1556 | '1' |
@@ -1563,7 +1563,7 @@ discard block |
||
| 1563 | 1563 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1564 | 1564 | // delete items & logs |
| 1565 | 1565 | $items = DB::query( |
| 1566 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1566 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1567 | 1567 | WHERE id_tree=%i AND perso = %i', |
| 1568 | 1568 | $folder->id, |
| 1569 | 1569 | '1' |
@@ -1584,7 +1584,7 @@ discard block |
||
| 1584 | 1584 | } else { |
| 1585 | 1585 | // Get old data about user |
| 1586 | 1586 | $oldData = DB::queryfirstrow( |
| 1587 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1587 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1588 | 1588 | WHERE id = %i', |
| 1589 | 1589 | $post_id |
| 1590 | 1590 | ); |
@@ -1621,7 +1621,7 @@ discard block |
||
| 1621 | 1621 | |
| 1622 | 1622 | // update LOG |
| 1623 | 1623 | if ($oldData['email'] !== $post_email) { |
| 1624 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1624 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1625 | 1625 | } |
| 1626 | 1626 | } |
| 1627 | 1627 | echo prepareExchangedData( |
@@ -1679,7 +1679,7 @@ discard block |
||
| 1679 | 1679 | |
| 1680 | 1680 | // Get info about user to delete |
| 1681 | 1681 | $data_user = DB::queryfirstrow( |
| 1682 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1682 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1683 | 1683 | WHERE id = %i', |
| 1684 | 1684 | $post_id |
| 1685 | 1685 | ); |
@@ -1729,7 +1729,7 @@ discard block |
||
| 1729 | 1729 | } |
| 1730 | 1730 | |
| 1731 | 1731 | DB::queryfirstrow( |
| 1732 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1732 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1733 | 1733 | WHERE login = %s |
| 1734 | 1734 | AND deleted_at IS NULL', |
| 1735 | 1735 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1781,7 +1781,7 @@ discard block |
||
| 1781 | 1781 | // get User info |
| 1782 | 1782 | $rowUser = DB::queryFirstRow( |
| 1783 | 1783 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
| 1784 | - FROM ' . prefixTable('users') . ' |
|
| 1784 | + FROM ' . prefixTable('users').' |
|
| 1785 | 1785 | WHERE id = %i', |
| 1786 | 1786 | $post_id |
| 1787 | 1787 | ); |
@@ -1791,7 +1791,7 @@ discard block |
||
| 1791 | 1791 | $html = ''; |
| 1792 | 1792 | |
| 1793 | 1793 | 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) { |
| 1794 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
| 1794 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
| 1795 | 1795 | } |
| 1796 | 1796 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
| 1797 | 1797 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1802,7 +1802,7 @@ discard block |
||
| 1802 | 1802 | // refine folders based upon roles |
| 1803 | 1803 | $rows = DB::query( |
| 1804 | 1804 | 'SELECT folder_id, type |
| 1805 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1805 | + FROM ' . prefixTable('roles_values').' |
|
| 1806 | 1806 | WHERE role_id IN %ls |
| 1807 | 1807 | ORDER BY folder_id ASC', |
| 1808 | 1808 | $arrData['functions'] |
@@ -1825,7 +1825,7 @@ discard block |
||
| 1825 | 1825 | } |
| 1826 | 1826 | |
| 1827 | 1827 | // add allowed folders |
| 1828 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1828 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1829 | 1829 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1830 | 1830 | } |
| 1831 | 1831 | |
@@ -1836,7 +1836,7 @@ discard block |
||
| 1836 | 1836 | // get folder name |
| 1837 | 1837 | $row = DB::queryFirstRow( |
| 1838 | 1838 | 'SELECT title, nlevel, id |
| 1839 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1839 | + FROM ' . prefixTable('nested_tree').' |
|
| 1840 | 1840 | WHERE id = %i', |
| 1841 | 1841 | $fld['id'] |
| 1842 | 1842 | ); |
@@ -1849,38 +1849,38 @@ discard block |
||
| 1849 | 1849 | |
| 1850 | 1850 | // manage right icon |
| 1851 | 1851 | if ($fld['type'] == 'W') { |
| 1852 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1853 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1854 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1852 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1853 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1854 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1855 | 1855 | } elseif ($fld['type'] == 'ND') { |
| 1856 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1857 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1858 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1856 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1857 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1858 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1859 | 1859 | } elseif ($fld['type'] == 'NE') { |
| 1860 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1861 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1862 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1860 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1861 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1862 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1863 | 1863 | } elseif ($fld['type'] == 'NDNE') { |
| 1864 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1865 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1866 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1864 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1865 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1866 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1867 | 1867 | } elseif ($fld['type'] == '') { |
| 1868 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
| 1868 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
| 1869 | 1869 | } else { |
| 1870 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
| 1870 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
| 1871 | 1871 | } |
| 1872 | 1872 | |
| 1873 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1874 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1875 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
| 1876 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1873 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1874 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1875 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
| 1876 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1877 | 1877 | break; |
| 1878 | 1878 | } |
| 1879 | 1879 | } |
| 1880 | 1880 | } |
| 1881 | 1881 | |
| 1882 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1883 | - $html . '</tbody></table>'; |
|
| 1882 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1883 | + $html.'</tbody></table>'; |
|
| 1884 | 1884 | } else { |
| 1885 | 1885 | $html_full = ''; |
| 1886 | 1886 | } |
@@ -1926,7 +1926,7 @@ discard block |
||
| 1926 | 1926 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
| 1927 | 1927 | $rows = DB::query( |
| 1928 | 1928 | 'SELECT * |
| 1929 | - FROM ' . prefixTable('users') . ' |
|
| 1929 | + FROM ' . prefixTable('users').' |
|
| 1930 | 1930 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1931 | 1931 | '0', |
| 1932 | 1932 | array_filter($session->get('user-roles_array')) |
@@ -1934,7 +1934,7 @@ discard block |
||
| 1934 | 1934 | } else { |
| 1935 | 1935 | $rows = DB::query( |
| 1936 | 1936 | 'SELECT * |
| 1937 | - FROM ' . prefixTable('users') . ' |
|
| 1937 | + FROM ' . prefixTable('users').' |
|
| 1938 | 1938 | WHERE admin = %i', |
| 1939 | 1939 | '0' |
| 1940 | 1940 | ); |
@@ -1946,7 +1946,7 @@ discard block |
||
| 1946 | 1946 | $groupIds = []; |
| 1947 | 1947 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1948 | 1948 | $tmp = DB::queryfirstrow( |
| 1949 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1949 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1950 | 1950 | WHERE id = %i', |
| 1951 | 1951 | $group |
| 1952 | 1952 | ); |
@@ -1958,7 +1958,7 @@ discard block |
||
| 1958 | 1958 | |
| 1959 | 1959 | // Get managed_by |
| 1960 | 1960 | $managedBy = DB::queryfirstrow( |
| 1961 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1961 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1962 | 1962 | WHERE id = %i', |
| 1963 | 1963 | $record['isAdministratedByRole'] |
| 1964 | 1964 | ); |
@@ -1968,7 +1968,7 @@ discard block |
||
| 1968 | 1968 | $foldersAllowedIds = []; |
| 1969 | 1969 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1970 | 1970 | $tmp = DB::queryfirstrow( |
| 1971 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1971 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1972 | 1972 | WHERE id = %i', |
| 1973 | 1973 | $role |
| 1974 | 1974 | ); |
@@ -1981,7 +1981,7 @@ discard block |
||
| 1981 | 1981 | $foldersForbiddenIds = []; |
| 1982 | 1982 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1983 | 1983 | $tmp = DB::queryfirstrow( |
| 1984 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1984 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1985 | 1985 | WHERE id = %i', |
| 1986 | 1986 | $role |
| 1987 | 1987 | ); |
@@ -1999,7 +1999,7 @@ discard block |
||
| 1999 | 1999 | 'login' => $record['login'], |
| 2000 | 2000 | 'groups' => implode(', ', $groups), |
| 2001 | 2001 | 'groupIds' => $groupIds, |
| 2002 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
| 2002 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
| 2003 | 2003 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 2004 | 2004 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 2005 | 2005 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -2080,7 +2080,7 @@ discard block |
||
| 2080 | 2080 | |
| 2081 | 2081 | // Get info about user |
| 2082 | 2082 | $data_user = DB::queryfirstrow( |
| 2083 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2083 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2084 | 2084 | WHERE id = %i', |
| 2085 | 2085 | $post_source_id |
| 2086 | 2086 | ); |
@@ -2273,14 +2273,14 @@ discard block |
||
| 2273 | 2273 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 2274 | 2274 | $data_user = DB::queryfirstrow( |
| 2275 | 2275 | 'SELECT fonction_id, public_key |
| 2276 | - FROM ' . prefixTable('users') . ' |
|
| 2276 | + FROM ' . prefixTable('users').' |
|
| 2277 | 2277 | WHERE id = %i', |
| 2278 | 2278 | $post_user_id |
| 2279 | 2279 | ); |
| 2280 | 2280 | |
| 2281 | 2281 | if ($data_user) { |
| 2282 | 2282 | // Ensure array is unique |
| 2283 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2283 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2284 | 2284 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2285 | 2285 | } else { |
| 2286 | 2286 | // User not found |
@@ -2296,7 +2296,7 @@ discard block |
||
| 2296 | 2296 | } |
| 2297 | 2297 | |
| 2298 | 2298 | // Manage specific case of api key |
| 2299 | - if($post_field === 'user_api_key') { |
|
| 2299 | + if ($post_field === 'user_api_key') { |
|
| 2300 | 2300 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 2301 | 2301 | $session->set('user-api_key', $post_new_value); |
| 2302 | 2302 | |
@@ -2405,7 +2405,7 @@ discard block |
||
| 2405 | 2405 | echo prepareExchangedData( |
| 2406 | 2406 | array( |
| 2407 | 2407 | 'error' => true, |
| 2408 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 2408 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 2409 | 2409 | ), |
| 2410 | 2410 | 'encode' |
| 2411 | 2411 | ); |
@@ -2432,7 +2432,7 @@ discard block |
||
| 2432 | 2432 | echo prepareExchangedData( |
| 2433 | 2433 | array( |
| 2434 | 2434 | 'error' => true, |
| 2435 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 2435 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 2436 | 2436 | ), |
| 2437 | 2437 | 'encode' |
| 2438 | 2438 | ); |
@@ -2443,7 +2443,7 @@ discard block |
||
| 2443 | 2443 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 2444 | 2444 | // Build the list of all groups in AD |
| 2445 | 2445 | if (isset($adUser['memberof']) === true) { |
| 2446 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2446 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2447 | 2447 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2448 | 2448 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2449 | 2449 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | // Get his ID |
| 2460 | 2460 | $userInfo = DB::queryfirstrow( |
| 2461 | 2461 | 'SELECT id, login, fonction_id, auth_type |
| 2462 | - FROM ' . prefixTable('users') . ' |
|
| 2462 | + FROM ' . prefixTable('users').' |
|
| 2463 | 2463 | WHERE login = %s', |
| 2464 | 2464 | $userLogin |
| 2465 | 2465 | ); |
@@ -2495,7 +2495,7 @@ discard block |
||
| 2495 | 2495 | |
| 2496 | 2496 | // Get all groups in Teampass |
| 2497 | 2497 | $teampassRoles = array(); |
| 2498 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2498 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2499 | 2499 | foreach ($rows as $record) { |
| 2500 | 2500 | array_push( |
| 2501 | 2501 | $teampassRoles, |
@@ -2565,7 +2565,7 @@ discard block |
||
| 2565 | 2565 | // Check if user already exists |
| 2566 | 2566 | $data = DB::query( |
| 2567 | 2567 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2568 | - FROM ' . prefixTable('users') . ' |
|
| 2568 | + FROM ' . prefixTable('users').' |
|
| 2569 | 2569 | WHERE login = %s', |
| 2570 | 2570 | $post_login |
| 2571 | 2571 | ); |
@@ -2745,12 +2745,12 @@ discard block |
||
| 2745 | 2745 | // Send mail to user with new OTP |
| 2746 | 2746 | $userInfo = DB::queryFirstRow( |
| 2747 | 2747 | 'SELECT email |
| 2748 | - FROM ' . prefixTable('users') . ' |
|
| 2748 | + FROM ' . prefixTable('users').' |
|
| 2749 | 2749 | WHERE id = %i', |
| 2750 | 2750 | $post_userId |
| 2751 | 2751 | ); |
| 2752 | 2752 | sendEmail( |
| 2753 | - 'TEAMPASS - ' . $lang->get('temporary_encryption_code'), |
|
| 2753 | + 'TEAMPASS - '.$lang->get('temporary_encryption_code'), |
|
| 2754 | 2754 | str_replace( |
| 2755 | 2755 | array('#enc_code#'), |
| 2756 | 2756 | array($post_otp), |
@@ -2812,7 +2812,7 @@ discard block |
||
| 2812 | 2812 | // Check if user already exists |
| 2813 | 2813 | DB::query( |
| 2814 | 2814 | 'SELECT id |
| 2815 | - FROM ' . prefixTable('users') . ' |
|
| 2815 | + FROM ' . prefixTable('users').' |
|
| 2816 | 2816 | WHERE id = %i', |
| 2817 | 2817 | $post_id |
| 2818 | 2818 | ); |
@@ -2891,7 +2891,7 @@ discard block |
||
| 2891 | 2891 | // Check if user already exists |
| 2892 | 2892 | $userInfo = DB::queryfirstrow( |
| 2893 | 2893 | 'SELECT id, private_key, public_key |
| 2894 | - FROM ' . prefixTable('users') . ' |
|
| 2894 | + FROM ' . prefixTable('users').' |
|
| 2895 | 2895 | WHERE id = %i', |
| 2896 | 2896 | $post_userid |
| 2897 | 2897 | ); |
@@ -2938,7 +2938,7 @@ discard block |
||
| 2938 | 2938 | if (count($session->get('user-personal_folders')) > 0) { |
| 2939 | 2939 | DB::query( |
| 2940 | 2940 | 'SELECT id |
| 2941 | - FROM ' . prefixTable('items') . ' |
|
| 2941 | + FROM ' . prefixTable('items').' |
|
| 2942 | 2942 | WHERE id_tree IN %ls', |
| 2943 | 2943 | $session->get('user-personal_folders') |
| 2944 | 2944 | ); |
@@ -3019,7 +3019,7 @@ discard block |
||
| 3019 | 3019 | // Check if user already exists |
| 3020 | 3020 | DB::query( |
| 3021 | 3021 | 'SELECT id |
| 3022 | - FROM ' . prefixTable('users') . ' |
|
| 3022 | + FROM ' . prefixTable('users').' |
|
| 3023 | 3023 | WHERE id = %i', |
| 3024 | 3024 | $post_id |
| 3025 | 3025 | ); |
@@ -3097,10 +3097,10 @@ discard block |
||
| 3097 | 3097 | 'process_type' => 'create_user_keys', |
| 3098 | 3098 | 'arguments' => json_encode([ |
| 3099 | 3099 | 'new_user_id' => (int) $post_user_id, |
| 3100 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 3101 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 3100 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 3101 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 3102 | 3102 | 'owner_id' => (int) $session->get('user-id'), |
| 3103 | - 'creator_pwd' => cryption($session->get('user-password'), '','encrypt', $SETTINGS)['string'], |
|
| 3103 | + 'creator_pwd' => cryption($session->get('user-password'), '', 'encrypt', $SETTINGS)['string'], |
|
| 3104 | 3104 | 'email_body' => $lang->get('email_body_user_config_5'), |
| 3105 | 3105 | 'send_email' => 1, |
| 3106 | 3106 | ]), |
@@ -3263,7 +3263,7 @@ discard block |
||
| 3263 | 3263 | // get user info |
| 3264 | 3264 | $userInfo = DB::queryFirstRow( |
| 3265 | 3265 | 'SELECT * |
| 3266 | - FROM ' . prefixTable('users') . ' |
|
| 3266 | + FROM ' . prefixTable('users').' |
|
| 3267 | 3267 | WHERE id = %i', |
| 3268 | 3268 | $user_id |
| 3269 | 3269 | ); |
@@ -3356,8 +3356,8 @@ discard block |
||
| 3356 | 3356 | // get user info |
| 3357 | 3357 | $processesProgress = DB::query( |
| 3358 | 3358 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 3359 | - FROM ' . prefixTable('users') . ' AS u |
|
| 3360 | - INNER JOIN ' . prefixTable('processes_tasks') . ' AS pt ON (pt.process_id = u.ongoing_process_id) |
|
| 3359 | + FROM ' . prefixTable('users').' AS u |
|
| 3360 | + INNER JOIN ' . prefixTable('processes_tasks').' AS pt ON (pt.process_id = u.ongoing_process_id) |
|
| 3361 | 3361 | WHERE u.id = %i', |
| 3362 | 3362 | $user_id |
| 3363 | 3363 | ); |
@@ -3365,9 +3365,9 @@ discard block |
||
| 3365 | 3365 | //print_r($processesProgress); |
| 3366 | 3366 | $finished_steps = 0; |
| 3367 | 3367 | $nb_steps = count($processesProgress); |
| 3368 | - foreach($processesProgress as $process) { |
|
| 3368 | + foreach ($processesProgress as $process) { |
|
| 3369 | 3369 | if ((int) $process['is_in_progress'] === -1) { |
| 3370 | - $finished_steps ++; |
|
| 3370 | + $finished_steps++; |
|
| 3371 | 3371 | } |
| 3372 | 3372 | } |
| 3373 | 3373 | |
@@ -3376,7 +3376,7 @@ discard block |
||
| 3376 | 3376 | 'error' => false, |
| 3377 | 3377 | 'message' => '', |
| 3378 | 3378 | 'user_id' => $user_id, |
| 3379 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 3379 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 3380 | 3380 | 'debug' => $finished_steps.",".$nb_steps, |
| 3381 | 3381 | ), |
| 3382 | 3382 | 'encode' |
@@ -3441,7 +3441,7 @@ discard block |
||
| 3441 | 3441 | |
| 3442 | 3442 | // Get info about user |
| 3443 | 3443 | $data_user = DB::queryfirstrow( |
| 3444 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3444 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3445 | 3445 | WHERE id = %i', |
| 3446 | 3446 | $value[1] |
| 3447 | 3447 | ); |
@@ -3474,7 +3474,7 @@ discard block |
||
| 3474 | 3474 | logEvents( |
| 3475 | 3475 | $SETTINGS, |
| 3476 | 3476 | 'user_mngt', |
| 3477 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3477 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3478 | 3478 | (string) $session->get('user-id'), |
| 3479 | 3479 | $session->get('user-login'), |
| 3480 | 3480 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -3505,7 +3505,7 @@ discard block |
||
| 3505 | 3505 | |
| 3506 | 3506 | // Get info about user |
| 3507 | 3507 | $data_user = DB::queryfirstrow( |
| 3508 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3508 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3509 | 3509 | WHERE id = %i', |
| 3510 | 3510 | $value[1] |
| 3511 | 3511 | ); |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | function purgeTemporaryFiles(): void |
| 72 | 72 | { |
| 73 | 73 | // Load expected files |
| 74 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
| 75 | - include __DIR__. '/../includes/config/tp.config.php'; |
|
| 74 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
| 75 | + include __DIR__.'/../includes/config/tp.config.php'; |
|
| 76 | 76 | |
| 77 | 77 | if (isset($SETTINGS) === true) { |
| 78 | 78 | //read folder |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | //delete file FILES |
| 83 | 83 | while (false !== ($f = readdir($dir))) { |
| 84 | 84 | if ($f !== '.' && $f !== '..' && $f !== '.htaccess') { |
| 85 | - if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) { |
|
| 86 | - fileDelete($dir . '/' . $f, $SETTINGS); |
|
| 85 | + if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) { |
|
| 86 | + fileDelete($dir.'/'.$f, $SETTINGS); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | while (false !== ($f = readdir($dir))) { |
| 103 | 103 | if ($f !== '.' && $f !== '..') { |
| 104 | 104 | if (strpos($f, '_delete.') > 0) { |
| 105 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS); |
|
| 105 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS); |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | } |
@@ -72,8 +72,8 @@ |
||
| 72 | 72 | function rebuildConfigFile(): void |
| 73 | 73 | { |
| 74 | 74 | // Load expected files |
| 75 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
| 76 | - include __DIR__. '/../includes/config/tp.config.php'; |
|
| 75 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
| 76 | + include __DIR__.'/../includes/config/tp.config.php'; |
|
| 77 | 77 | |
| 78 | 78 | if (isset($SETTINGS) === true) { |
| 79 | 79 | handleConfigFile('rebuild', $SETTINGS); |
@@ -1822,7 +1822,9 @@ |
||
| 1822 | 1822 | $inputData['itemId'] |
| 1823 | 1823 | ); |
| 1824 | 1824 | foreach ($rows as $record) { |
| 1825 | - if ($record['raison'] === NULL) continue; |
|
| 1825 | + if ($record['raison'] === NULL) { |
|
| 1826 | + continue; |
|
| 1827 | + } |
|
| 1826 | 1828 | $reason = explode(':', $record['raison']); |
| 1827 | 1829 | if (count($reason) > 0) { |
| 1828 | 1830 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | ) { |
| 68 | 68 | // Not allowed page |
| 69 | 69 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 70 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 70 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 71 | 71 | exit; |
| 72 | 72 | } |
| 73 | 73 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | date_default_timezone_set('UTC'); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
| 95 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
| 96 | 96 | header('Content-type: text/html; charset=utf-8'); |
| 97 | 97 | header('Cache-Control: no-cache, must-revalidate'); |
| 98 | 98 | |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | // About special settings |
| 343 | 343 | $dataFolderSettings = DB::queryFirstRow( |
| 344 | 344 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 345 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 345 | + FROM ' . prefixTable('nested_tree').' |
|
| 346 | 346 | WHERE id = %i', |
| 347 | 347 | $inputData['folderId'] |
| 348 | 348 | ); |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | // Get folder complexity |
| 360 | 360 | $folderComplexity = DB::queryfirstrow( |
| 361 | 361 | 'SELECT valeur |
| 362 | - FROM ' . prefixTable('misc') . ' |
|
| 362 | + FROM ' . prefixTable('misc').' |
|
| 363 | 363 | WHERE type = %s AND intitule = %i', |
| 364 | 364 | 'complex', |
| 365 | 365 | $inputData['folderId'] |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | $itemExists = 0; |
| 385 | 385 | $newID = ''; |
| 386 | 386 | $data = DB::queryfirstrow( |
| 387 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 387 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 388 | 388 | WHERE label = %s AND inactif = %i', |
| 389 | 389 | $inputData['label'], |
| 390 | 390 | 0 |
@@ -471,8 +471,8 @@ discard block |
||
| 471 | 471 | (int) $newID, |
| 472 | 472 | $objectKey['pwd'], |
| 473 | 473 | $SETTINGS, |
| 474 | - true, // only for the item creator |
|
| 475 | - false, // no delete all |
|
| 474 | + true, // only for the item creator |
|
| 475 | + false, // no delete all |
|
| 476 | 476 | ); |
| 477 | 477 | |
| 478 | 478 | // update fields |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | // should we encrypt the data |
| 486 | 486 | $dataTmp = DB::queryFirstRow( |
| 487 | 487 | 'SELECT encrypted_data |
| 488 | - FROM ' . prefixTable('categories') . ' |
|
| 488 | + FROM ' . prefixTable('categories').' |
|
| 489 | 489 | WHERE id = %i', |
| 490 | 490 | $field['id'] |
| 491 | 491 | ); |
@@ -525,8 +525,8 @@ discard block |
||
| 525 | 525 | (int) $newObjectId, |
| 526 | 526 | $cryptedStuff['objectKey'], |
| 527 | 527 | $SETTINGS, |
| 528 | - true, // only for the item creator |
|
| 529 | - false, // no delete all |
|
| 528 | + true, // only for the item creator |
|
| 529 | + false, // no delete all |
|
| 530 | 530 | ); |
| 531 | 531 | |
| 532 | 532 | } else { |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | ) { |
| 556 | 556 | DB::queryFirstRow( |
| 557 | 557 | 'SELECT * |
| 558 | - FROM ' . prefixTable('templates') . ' |
|
| 558 | + FROM ' . prefixTable('templates').' |
|
| 559 | 559 | WHERE item_id = %i', |
| 560 | 560 | $newID |
| 561 | 561 | ); |
@@ -624,11 +624,11 @@ discard block |
||
| 624 | 624 | ) { |
| 625 | 625 | foreach ($post_restricted_to as $userRest) { |
| 626 | 626 | if (empty($userRest) === false) { |
| 627 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 627 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 628 | 628 | if (empty($listOfRestricted)) { |
| 629 | 629 | $listOfRestricted = $dataTmp['login']; |
| 630 | 630 | } else { |
| 631 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 631 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 632 | 632 | } |
| 633 | 633 | } |
| 634 | 634 | } |
@@ -642,11 +642,11 @@ discard block |
||
| 642 | 642 | if (empty($data['restricted_to']) === false) { |
| 643 | 643 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
| 644 | 644 | if (empty($userRest) === false) { |
| 645 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 645 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 646 | 646 | if (empty($oldRestrictionList) === true) { |
| 647 | 647 | $oldRestrictionList = $dataTmp['login']; |
| 648 | 648 | } else { |
| 649 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 649 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | 652 | } |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | if (empty($post_uploaded_file_id) === false) { |
| 710 | 710 | $rows = DB::query( |
| 711 | 711 | 'SELECT id |
| 712 | - FROM ' . prefixTable('files') . ' |
|
| 712 | + FROM ' . prefixTable('files').' |
|
| 713 | 713 | WHERE id_item = %s', |
| 714 | 714 | $post_uploaded_file_id |
| 715 | 715 | ); |
@@ -763,7 +763,7 @@ discard block |
||
| 763 | 763 | $lang->get('email_subject_item_updated'), |
| 764 | 764 | str_replace( |
| 765 | 765 | array('#label', '#link'), |
| 766 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
| 766 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
| 767 | 767 | $lang->get('new_item_email_body') |
| 768 | 768 | ), |
| 769 | 769 | $emailAddress, |
@@ -856,11 +856,11 @@ discard block |
||
| 856 | 856 | // Prepare variables |
| 857 | 857 | $itemInfos = array(); |
| 858 | 858 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 859 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 859 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 860 | 860 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 861 | 861 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 862 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars_decode($dataReceived['tags']) : ''; |
|
| 863 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 862 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars_decode($dataReceived['tags']) : ''; |
|
| 863 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 864 | 864 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 865 | 865 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 866 | 866 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -891,8 +891,7 @@ discard block |
||
| 891 | 891 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 892 | 892 | $dataReceived['to_be_deleted_after_date'], |
| 893 | 893 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 894 | - ) : |
|
| 895 | - ''; |
|
| 894 | + ) : ''; |
|
| 896 | 895 | $post_fields = (filter_var_array( |
| 897 | 896 | $dataReceived['fields'], |
| 898 | 897 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -952,7 +951,7 @@ discard block |
||
| 952 | 951 | // About special settings |
| 953 | 952 | $dataFolderSettings = DB::queryFirstRow( |
| 954 | 953 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 955 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 954 | + FROM ' . prefixTable('nested_tree').' |
|
| 956 | 955 | WHERE id = %i', |
| 957 | 956 | $inputData['folderId'] |
| 958 | 957 | ); |
@@ -968,7 +967,7 @@ discard block |
||
| 968 | 967 | // Get folder complexity |
| 969 | 968 | $folderComplexity = DB::queryfirstrow( |
| 970 | 969 | 'SELECT valeur |
| 971 | - FROM ' . prefixTable('misc') . ' |
|
| 970 | + FROM ' . prefixTable('misc').' |
|
| 972 | 971 | WHERE type = %s AND intitule = %i', |
| 973 | 972 | 'complex', |
| 974 | 973 | $inputData['folderId'] |
@@ -1006,8 +1005,8 @@ discard block |
||
| 1006 | 1005 | // Get all informations for this item |
| 1007 | 1006 | $dataItem = DB::queryfirstrow( |
| 1008 | 1007 | 'SELECT * |
| 1009 | - FROM ' . prefixTable('items') . ' as i |
|
| 1010 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1008 | + FROM ' . prefixTable('items').' as i |
|
| 1009 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1011 | 1010 | WHERE i.id=%i AND l.action = %s', |
| 1012 | 1011 | $inputData['itemId'], |
| 1013 | 1012 | 'at_creation' |
@@ -1017,7 +1016,7 @@ discard block |
||
| 1017 | 1016 | //db::debugmode(true); |
| 1018 | 1017 | DB::query( |
| 1019 | 1018 | 'SELECT * |
| 1020 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1019 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1021 | 1020 | WHERE object_id = %i AND user_id = %s', |
| 1022 | 1021 | $inputData['itemId'], |
| 1023 | 1022 | $session->get('user-id') |
@@ -1066,9 +1065,9 @@ discard block |
||
| 1066 | 1065 | '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, |
| 1067 | 1066 | 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, |
| 1068 | 1067 | u.login as user_login, u.email as user_email |
| 1069 | - FROM ' . prefixTable('items') . ' as i |
|
| 1070 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1071 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1068 | + FROM ' . prefixTable('items').' as i |
|
| 1069 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1070 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1072 | 1071 | WHERE i.id=%i', |
| 1073 | 1072 | $inputData['itemId'] |
| 1074 | 1073 | ); |
@@ -1076,7 +1075,7 @@ discard block |
||
| 1076 | 1075 | // Should we log a password change? |
| 1077 | 1076 | $userKey = DB::queryFirstRow( |
| 1078 | 1077 | 'SELECT share_key |
| 1079 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1078 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1080 | 1079 | WHERE user_id = %i AND object_id = %i', |
| 1081 | 1080 | $session->get('user-id'), |
| 1082 | 1081 | $inputData['itemId'] |
@@ -1144,7 +1143,7 @@ discard block |
||
| 1144 | 1143 | // Get list of tags |
| 1145 | 1144 | $itemTags = DB::queryFirstColumn( |
| 1146 | 1145 | 'SELECT tag |
| 1147 | - FROM ' . prefixTable('tags') . ' |
|
| 1146 | + FROM ' . prefixTable('tags').' |
|
| 1148 | 1147 | WHERE item_id = %i', |
| 1149 | 1148 | $inputData['itemId'] |
| 1150 | 1149 | ); |
@@ -1190,7 +1189,7 @@ discard block |
||
| 1190 | 1189 | $session->get('user-id'), |
| 1191 | 1190 | 'at_modification', |
| 1192 | 1191 | $session->get('user-login'), |
| 1193 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1192 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1194 | 1193 | ); |
| 1195 | 1194 | } |
| 1196 | 1195 | |
@@ -1229,8 +1228,8 @@ discard block |
||
| 1229 | 1228 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1230 | 1229 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1231 | 1230 | c.masked AS masked, i.id AS field_item_id |
| 1232 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1233 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1231 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1232 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1234 | 1233 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1235 | 1234 | $field['id'], |
| 1236 | 1235 | $inputData['itemId'] |
@@ -1244,7 +1243,7 @@ discard block |
||
| 1244 | 1243 | // Perform new query |
| 1245 | 1244 | $dataTmpCat = DB::queryFirstRow( |
| 1246 | 1245 | 'SELECT id, title, encrypted_data, masked |
| 1247 | - FROM ' . prefixTable('categories') . ' |
|
| 1246 | + FROM ' . prefixTable('categories').' |
|
| 1248 | 1247 | WHERE id = %i', |
| 1249 | 1248 | $field['id'] |
| 1250 | 1249 | ); |
@@ -1316,7 +1315,7 @@ discard block |
||
| 1316 | 1315 | $session->get('user-id'), |
| 1317 | 1316 | 'at_modification', |
| 1318 | 1317 | $session->get('user-login'), |
| 1319 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1318 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1320 | 1319 | ); |
| 1321 | 1320 | } else { |
| 1322 | 1321 | // compare the old and new value |
@@ -1324,7 +1323,7 @@ discard block |
||
| 1324 | 1323 | // Get user sharekey for this field |
| 1325 | 1324 | $userKey = DB::queryFirstRow( |
| 1326 | 1325 | 'SELECT share_key |
| 1327 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1326 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1328 | 1327 | WHERE user_id = %i AND object_id = %i', |
| 1329 | 1328 | $session->get('user-id'), |
| 1330 | 1329 | $dataTmpCat['field_item_id'] |
@@ -1398,7 +1397,7 @@ discard block |
||
| 1398 | 1397 | $session->get('user-id'), |
| 1399 | 1398 | 'at_modification', |
| 1400 | 1399 | $session->get('user-login'), |
| 1401 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1400 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1402 | 1401 | ); |
| 1403 | 1402 | } |
| 1404 | 1403 | } |
@@ -1423,7 +1422,7 @@ discard block |
||
| 1423 | 1422 | ) { |
| 1424 | 1423 | DB::queryFirstRow( |
| 1425 | 1424 | 'SELECT * |
| 1426 | - FROM ' . prefixTable('templates') . ' |
|
| 1425 | + FROM ' . prefixTable('templates').' |
|
| 1427 | 1426 | WHERE item_id = %i', |
| 1428 | 1427 | $inputData['itemId'] |
| 1429 | 1428 | ); |
@@ -1466,7 +1465,7 @@ discard block |
||
| 1466 | 1465 | // check if elem exists in Table. If not add it or update it. |
| 1467 | 1466 | DB::query( |
| 1468 | 1467 | 'SELECT * |
| 1469 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1468 | + FROM ' . prefixTable('automatic_del').' |
|
| 1470 | 1469 | WHERE item_id = %i', |
| 1471 | 1470 | $inputData['itemId'] |
| 1472 | 1471 | ); |
@@ -1493,7 +1492,7 @@ discard block |
||
| 1493 | 1492 | // Store updates performed |
| 1494 | 1493 | array_push( |
| 1495 | 1494 | $arrayOfChanges, |
| 1496 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1495 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1497 | 1496 | ); |
| 1498 | 1497 | |
| 1499 | 1498 | // update LOG |
@@ -1536,7 +1535,7 @@ discard block |
||
| 1536 | 1535 | // Store updates performed |
| 1537 | 1536 | array_push( |
| 1538 | 1537 | $arrayOfChanges, |
| 1539 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1538 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1540 | 1539 | ); |
| 1541 | 1540 | |
| 1542 | 1541 | // update LOG |
@@ -1569,7 +1568,7 @@ discard block |
||
| 1569 | 1568 | if (empty($userId) === false) { |
| 1570 | 1569 | $dataTmp = DB::queryfirstrow( |
| 1571 | 1570 | 'SELECT id, name, lastname |
| 1572 | - FROM ' . prefixTable('users') . ' |
|
| 1571 | + FROM ' . prefixTable('users').' |
|
| 1573 | 1572 | WHERE id= %i', |
| 1574 | 1573 | $userId |
| 1575 | 1574 | ); |
@@ -1577,7 +1576,7 @@ discard block |
||
| 1577 | 1576 | // Add to array |
| 1578 | 1577 | array_push( |
| 1579 | 1578 | $arrayOfUsersRestriction, |
| 1580 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1579 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1581 | 1580 | ); |
| 1582 | 1581 | array_push( |
| 1583 | 1582 | $arrayOfUsersIdRestriction, |
@@ -1608,8 +1607,8 @@ discard block |
||
| 1608 | 1607 | // get values before deleting them |
| 1609 | 1608 | $rows = DB::query( |
| 1610 | 1609 | 'SELECT t.title, t.id AS id |
| 1611 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1612 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1610 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1611 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1613 | 1612 | WHERE r.item_id = %i |
| 1614 | 1613 | ORDER BY t.title ASC', |
| 1615 | 1614 | $inputData['itemId'] |
@@ -1643,7 +1642,7 @@ discard block |
||
| 1643 | 1642 | ); |
| 1644 | 1643 | $dataTmp = DB::queryfirstrow( |
| 1645 | 1644 | 'SELECT title |
| 1646 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1645 | + FROM ' . prefixTable('roles_title').' |
|
| 1647 | 1646 | WHERE id = %i', |
| 1648 | 1647 | $role |
| 1649 | 1648 | ); |
@@ -1671,7 +1670,7 @@ discard block |
||
| 1671 | 1670 | // Get current status |
| 1672 | 1671 | $otpStatus = DB::queryFirstRow( |
| 1673 | 1672 | 'SELECT enabled as otp_is_enabled |
| 1674 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1673 | + FROM ' . prefixTable('items_otp').' |
|
| 1675 | 1674 | WHERE item_id = %i', |
| 1676 | 1675 | $inputData['itemId'] |
| 1677 | 1676 | ); |
@@ -1702,7 +1701,7 @@ discard block |
||
| 1702 | 1701 | $session->get('user-id'), |
| 1703 | 1702 | 'at_modification', |
| 1704 | 1703 | $session->get('user-login'), |
| 1705 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1704 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1706 | 1705 | ); |
| 1707 | 1706 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
| 1708 | 1707 | // Create the entry in items_otp table |
@@ -1746,8 +1745,8 @@ discard block |
||
| 1746 | 1745 | $session->get('user-id'), |
| 1747 | 1746 | 'at_modification', |
| 1748 | 1747 | $session->get('user-login'), |
| 1749 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1750 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1748 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1749 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1751 | 1750 | ); |
| 1752 | 1751 | } |
| 1753 | 1752 | |
@@ -1767,7 +1766,7 @@ discard block |
||
| 1767 | 1766 | $session->get('user-id'), |
| 1768 | 1767 | 'at_modification', |
| 1769 | 1768 | $session->get('user-login'), |
| 1770 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1769 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1771 | 1770 | ); |
| 1772 | 1771 | } |
| 1773 | 1772 | // LOGIN |
@@ -1786,7 +1785,7 @@ discard block |
||
| 1786 | 1785 | $session->get('user-id'), |
| 1787 | 1786 | 'at_modification', |
| 1788 | 1787 | $session->get('user-login'), |
| 1789 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1788 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1790 | 1789 | ); |
| 1791 | 1790 | } |
| 1792 | 1791 | |
@@ -1805,7 +1804,7 @@ discard block |
||
| 1805 | 1804 | $session->get('user-id'), |
| 1806 | 1805 | 'at_modification', |
| 1807 | 1806 | $session->get('user-login'), |
| 1808 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1807 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1809 | 1808 | ); |
| 1810 | 1809 | } |
| 1811 | 1810 | // URL |
@@ -1824,7 +1823,7 @@ discard block |
||
| 1824 | 1823 | $session->get('user-id'), |
| 1825 | 1824 | 'at_modification', |
| 1826 | 1825 | $session->get('user-login'), |
| 1827 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1826 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1828 | 1827 | ); |
| 1829 | 1828 | } |
| 1830 | 1829 | // DESCRIPTION |
@@ -1849,7 +1848,7 @@ discard block |
||
| 1849 | 1848 | // FOLDER |
| 1850 | 1849 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1851 | 1850 | // Get name of folders |
| 1852 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1851 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1853 | 1852 | |
| 1854 | 1853 | // Store updates performed |
| 1855 | 1854 | array_push( |
@@ -1865,7 +1864,7 @@ discard block |
||
| 1865 | 1864 | $session->get('user-id'), |
| 1866 | 1865 | 'at_modification', |
| 1867 | 1866 | $session->get('user-login'), |
| 1868 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1867 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1869 | 1868 | ); |
| 1870 | 1869 | } |
| 1871 | 1870 | // ANYONE_CAN_MODIFY |
@@ -1873,7 +1872,7 @@ discard block |
||
| 1873 | 1872 | // Store updates performed |
| 1874 | 1873 | array_push( |
| 1875 | 1874 | $arrayOfChanges, |
| 1876 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 1875 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 1877 | 1876 | ); |
| 1878 | 1877 | |
| 1879 | 1878 | // Log |
@@ -1884,15 +1883,15 @@ discard block |
||
| 1884 | 1883 | $session->get('user-id'), |
| 1885 | 1884 | 'at_modification', |
| 1886 | 1885 | $session->get('user-login'), |
| 1887 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1886 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1888 | 1887 | ); |
| 1889 | 1888 | } |
| 1890 | 1889 | |
| 1891 | 1890 | // Reload new values |
| 1892 | 1891 | $dataItem = DB::queryfirstrow( |
| 1893 | 1892 | 'SELECT * |
| 1894 | - FROM ' . prefixTable('items') . ' as i |
|
| 1895 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1893 | + FROM ' . prefixTable('items').' as i |
|
| 1894 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1896 | 1895 | WHERE i.id = %i AND l.action = %s', |
| 1897 | 1896 | $inputData['itemId'], |
| 1898 | 1897 | 'at_creation' |
@@ -1901,8 +1900,8 @@ discard block |
||
| 1901 | 1900 | $history = ''; |
| 1902 | 1901 | $rows = DB::query( |
| 1903 | 1902 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 1904 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 1905 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 1903 | + FROM ' . prefixTable('log_items').' as l |
|
| 1904 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 1906 | 1905 | WHERE l.action <> %s AND id_item=%s', |
| 1907 | 1906 | 'at_shown', |
| 1908 | 1907 | $inputData['itemId'] |
@@ -1911,14 +1910,14 @@ discard block |
||
| 1911 | 1910 | if ($record['raison'] === NULL) continue; |
| 1912 | 1911 | $reason = explode(':', $record['raison']); |
| 1913 | 1912 | if (count($reason) > 0) { |
| 1914 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 1915 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 1916 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 1913 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 1914 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 1915 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 1917 | 1916 | : $lang->get(trim($reason[0]))) : ''); |
| 1918 | 1917 | if (empty($history)) { |
| 1919 | 1918 | $history = $sentence; |
| 1920 | 1919 | } else { |
| 1921 | - $history .= '<br />' . $sentence; |
|
| 1920 | + $history .= '<br />'.$sentence; |
|
| 1922 | 1921 | } |
| 1923 | 1922 | } |
| 1924 | 1923 | } |
@@ -2045,7 +2044,7 @@ discard block |
||
| 2045 | 2044 | ) { |
| 2046 | 2045 | // load the original record into an array |
| 2047 | 2046 | $originalRecord = DB::queryfirstrow( |
| 2048 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2047 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2049 | 2048 | WHERE id = %i', |
| 2050 | 2049 | $inputData['itemId'] |
| 2051 | 2050 | ); |
@@ -2064,7 +2063,7 @@ discard block |
||
| 2064 | 2063 | |
| 2065 | 2064 | // Load the destination folder record into an array |
| 2066 | 2065 | $dataDestination = DB::queryfirstrow( |
| 2067 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2066 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2068 | 2067 | WHERE id = %i', |
| 2069 | 2068 | $post_dest_id |
| 2070 | 2069 | ); |
@@ -2072,7 +2071,7 @@ discard block |
||
| 2072 | 2071 | // Get the ITEM object key for the user |
| 2073 | 2072 | $userKey = DB::queryFirstRow( |
| 2074 | 2073 | 'SELECT share_key |
| 2075 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2074 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2076 | 2075 | WHERE user_id = %i AND object_id = %i', |
| 2077 | 2076 | $session->get('user-id'), |
| 2078 | 2077 | $inputData['itemId'] |
@@ -2153,7 +2152,7 @@ discard block |
||
| 2153 | 2152 | // Manage Custom Fields |
| 2154 | 2153 | $rows = DB::query( |
| 2155 | 2154 | 'SELECT * |
| 2156 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2155 | + FROM ' . prefixTable('categories_items').' |
|
| 2157 | 2156 | WHERE item_id = %i', |
| 2158 | 2157 | $inputData['itemId'] |
| 2159 | 2158 | ); |
@@ -2211,15 +2210,15 @@ discard block |
||
| 2211 | 2210 | $rows = DB::query( |
| 2212 | 2211 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2213 | 2212 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2214 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2215 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2213 | + FROM ' . prefixTable('files').' AS f |
|
| 2214 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2216 | 2215 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2217 | 2216 | $session->get('user-id'), |
| 2218 | 2217 | $inputData['itemId'] |
| 2219 | 2218 | ); |
| 2220 | 2219 | foreach ($rows as $record) { |
| 2221 | 2220 | // Check if file still exists |
| 2222 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2221 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2223 | 2222 | // Step1 - decrypt the file |
| 2224 | 2223 | $fileContent = decryptFile( |
| 2225 | 2224 | $record['file'], |
@@ -2228,8 +2227,8 @@ discard block |
||
| 2228 | 2227 | ); |
| 2229 | 2228 | |
| 2230 | 2229 | // Step2 - create file |
| 2231 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2232 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2230 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2231 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2233 | 2232 | if ($outstream === false) { |
| 2234 | 2233 | echo prepareExchangedData( |
| 2235 | 2234 | array( |
@@ -2302,7 +2301,7 @@ discard block |
||
| 2302 | 2301 | |
| 2303 | 2302 | // ------------------------- |
| 2304 | 2303 | // Add specific restrictions |
| 2305 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2304 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2306 | 2305 | foreach ($rows as $record) { |
| 2307 | 2306 | DB::insert( |
| 2308 | 2307 | prefixTable('restriction_to_roles'), |
@@ -2314,7 +2313,7 @@ discard block |
||
| 2314 | 2313 | } |
| 2315 | 2314 | |
| 2316 | 2315 | // Add Tags |
| 2317 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2316 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2318 | 2317 | foreach ($rows as $record) { |
| 2319 | 2318 | DB::insert( |
| 2320 | 2319 | prefixTable('tags'), |
@@ -2344,7 +2343,7 @@ discard block |
||
| 2344 | 2343 | $session->get('user-login') |
| 2345 | 2344 | ); |
| 2346 | 2345 | // reload cache table |
| 2347 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 2346 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 2348 | 2347 | updateCacheTable('reload', null); |
| 2349 | 2348 | |
| 2350 | 2349 | echo (string) prepareExchangedData( |
@@ -2415,7 +2414,7 @@ discard block |
||
| 2415 | 2414 | // then we can show it |
| 2416 | 2415 | $item_deleted = DB::queryFirstRow( |
| 2417 | 2416 | 'SELECT * |
| 2418 | - FROM ' . prefixTable('log_items') . ' |
|
| 2417 | + FROM ' . prefixTable('log_items').' |
|
| 2419 | 2418 | WHERE id_item = %i AND action = %s |
| 2420 | 2419 | ORDER BY date DESC |
| 2421 | 2420 | LIMIT 0, 1', |
@@ -2426,7 +2425,7 @@ discard block |
||
| 2426 | 2425 | |
| 2427 | 2426 | $item_restored = DB::queryFirstRow( |
| 2428 | 2427 | 'SELECT * |
| 2429 | - FROM ' . prefixTable('log_items') . ' |
|
| 2428 | + FROM ' . prefixTable('log_items').' |
|
| 2430 | 2429 | WHERE id_item = %i AND action = %s |
| 2431 | 2430 | ORDER BY date DESC |
| 2432 | 2431 | LIMIT 0, 1', |
@@ -2450,8 +2449,8 @@ discard block |
||
| 2450 | 2449 | // Get all informations for this item |
| 2451 | 2450 | $dataItem = DB::queryfirstrow( |
| 2452 | 2451 | 'SELECT * |
| 2453 | - FROM ' . prefixTable('items') . ' as i |
|
| 2454 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2452 | + FROM ' . prefixTable('items').' as i |
|
| 2453 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2455 | 2454 | WHERE i.id = %i AND l.action = %s', |
| 2456 | 2455 | $inputData['id'], |
| 2457 | 2456 | 'at_creation' |
@@ -2460,7 +2459,7 @@ discard block |
||
| 2460 | 2459 | // Notification |
| 2461 | 2460 | DB::queryfirstrow( |
| 2462 | 2461 | 'SELECT * |
| 2463 | - FROM ' . prefixTable('notification') . ' |
|
| 2462 | + FROM ' . prefixTable('notification').' |
|
| 2464 | 2463 | WHERE item_id = %i AND user_id = %i', |
| 2465 | 2464 | $inputData['id'], |
| 2466 | 2465 | $session->get('user-id') |
@@ -2503,7 +2502,7 @@ discard block |
||
| 2503 | 2502 | |
| 2504 | 2503 | // manage case of API user |
| 2505 | 2504 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2506 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2505 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2507 | 2506 | $arrData['id_user'] = API_USER_ID; |
| 2508 | 2507 | $arrData['author_email'] = ''; |
| 2509 | 2508 | $arrData['notification_status'] = false; |
@@ -2513,7 +2512,7 @@ discard block |
||
| 2513 | 2512 | $tags = array(); |
| 2514 | 2513 | $rows = DB::query( |
| 2515 | 2514 | 'SELECT tag |
| 2516 | - FROM ' . prefixTable('tags') . ' |
|
| 2515 | + FROM ' . prefixTable('tags').' |
|
| 2517 | 2516 | WHERE item_id = %i', |
| 2518 | 2517 | $inputData['id'] |
| 2519 | 2518 | ); |
@@ -2538,7 +2537,7 @@ discard block |
||
| 2538 | 2537 | // Check if user has a role that is accepted |
| 2539 | 2538 | $rows_tmp = DB::query( |
| 2540 | 2539 | 'SELECT role_id |
| 2541 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2540 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2542 | 2541 | WHERE item_id=%i', |
| 2543 | 2542 | $inputData['id'] |
| 2544 | 2543 | ); |
@@ -2552,7 +2551,7 @@ discard block |
||
| 2552 | 2551 | // Get the object key for the user |
| 2553 | 2552 | $userKey = DB::queryFirstRow( |
| 2554 | 2553 | 'SELECT share_key |
| 2555 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2554 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2556 | 2555 | WHERE user_id = %i AND object_id = %i', |
| 2557 | 2556 | $session->get('user-id'), |
| 2558 | 2557 | $inputData['id'] |
@@ -2659,8 +2658,8 @@ discard block |
||
| 2659 | 2658 | // Add restriction if item is restricted to roles |
| 2660 | 2659 | $rows = DB::query( |
| 2661 | 2660 | 'SELECT t.title, t.id |
| 2662 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2663 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2661 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2662 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2664 | 2663 | WHERE r.item_id = %i |
| 2665 | 2664 | ORDER BY t.title ASC', |
| 2666 | 2665 | $inputData['id'] |
@@ -2676,8 +2675,8 @@ discard block |
||
| 2676 | 2675 | $tmp = array(); |
| 2677 | 2676 | $rows = DB::query( |
| 2678 | 2677 | 'SELECT k.label, k.id |
| 2679 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2680 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2678 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2679 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2681 | 2680 | WHERE i.item_id = %i |
| 2682 | 2681 | ORDER BY k.label ASC', |
| 2683 | 2682 | $inputData['id'] |
@@ -2760,7 +2759,7 @@ discard block |
||
| 2760 | 2759 | $arrCatList = array(); |
| 2761 | 2760 | $rows_tmp = DB::query( |
| 2762 | 2761 | 'SELECT id_category |
| 2763 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2762 | + FROM ' . prefixTable('categories_folders').' |
|
| 2764 | 2763 | WHERE id_folder=%i', |
| 2765 | 2764 | $inputData['folderId'] |
| 2766 | 2765 | ); |
@@ -2775,8 +2774,8 @@ discard block |
||
| 2775 | 2774 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2776 | 2775 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2777 | 2776 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2778 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2779 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2777 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2778 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2780 | 2779 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2781 | 2780 | $inputData['id'], |
| 2782 | 2781 | $arrCatList |
@@ -2787,7 +2786,7 @@ discard block |
||
| 2787 | 2786 | //db::debugmode(true); |
| 2788 | 2787 | $userKey = DB::queryFirstRow( |
| 2789 | 2788 | 'SELECT share_key |
| 2790 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2789 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2791 | 2790 | WHERE user_id = %i AND object_id = %i', |
| 2792 | 2791 | $session->get('user-id'), |
| 2793 | 2792 | $row['id'] |
@@ -2805,7 +2804,7 @@ discard block |
||
| 2805 | 2804 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2806 | 2805 | // Data is not encrypted in DB |
| 2807 | 2806 | $fieldText = [ |
| 2808 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2807 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2809 | 2808 | 'encrypted' => false, |
| 2810 | 2809 | 'error' => false, |
| 2811 | 2810 | ]; |
@@ -2850,7 +2849,7 @@ discard block |
||
| 2850 | 2849 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2851 | 2850 | $rows_tmp = DB::queryfirstrow( |
| 2852 | 2851 | 'SELECT category_id |
| 2853 | - FROM ' . prefixTable('templates') . ' |
|
| 2852 | + FROM ' . prefixTable('templates').' |
|
| 2854 | 2853 | WHERE item_id = %i', |
| 2855 | 2854 | $inputData['id'] |
| 2856 | 2855 | ); |
@@ -2867,7 +2866,7 @@ discard block |
||
| 2867 | 2866 | // Evaluate if item is ready for all users |
| 2868 | 2867 | $rows_tmp = DB::queryfirstrow( |
| 2869 | 2868 | 'SELECT finished_at |
| 2870 | - FROM ' . prefixTable('processes') . ' |
|
| 2869 | + FROM ' . prefixTable('processes').' |
|
| 2871 | 2870 | WHERE item_id = %i', |
| 2872 | 2871 | $inputData['id'] |
| 2873 | 2872 | ); |
@@ -2884,7 +2883,7 @@ discard block |
||
| 2884 | 2883 | // Is the Item to be deleted? |
| 2885 | 2884 | $dataDelete = DB::queryfirstrow( |
| 2886 | 2885 | 'SELECT * |
| 2887 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 2886 | + FROM ' . prefixTable('automatic_del').' |
|
| 2888 | 2887 | WHERE item_id = %i', |
| 2889 | 2888 | $inputData['id'] |
| 2890 | 2889 | ); |
@@ -2963,11 +2962,11 @@ discard block |
||
| 2963 | 2962 | if (empty($dataItem['restricted_to']) === false) { |
| 2964 | 2963 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 2965 | 2964 | if (empty($userRest) === false) { |
| 2966 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 2965 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 2967 | 2966 | if (empty($listOfRestricted)) { |
| 2968 | 2967 | $listOfRestricted = $dataTmp['login']; |
| 2969 | 2968 | } else { |
| 2970 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 2969 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 2971 | 2970 | } |
| 2972 | 2971 | } |
| 2973 | 2972 | } |
@@ -3041,9 +3040,9 @@ discard block |
||
| 3041 | 3040 | // Load item data |
| 3042 | 3041 | $dataItem = DB::queryFirstRow( |
| 3043 | 3042 | '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 |
| 3044 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3045 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3046 | - INNER JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3043 | + FROM ' . prefixTable('items').' AS i |
|
| 3044 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3045 | + INNER JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3047 | 3046 | WHERE i.id = %i', |
| 3048 | 3047 | $inputData['id'] |
| 3049 | 3048 | ); |
@@ -3065,7 +3064,7 @@ discard block |
||
| 3065 | 3064 | // Check if user has a role that is accepted |
| 3066 | 3065 | $rows_tmp = DB::query( |
| 3067 | 3066 | 'SELECT role_id |
| 3068 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3067 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3069 | 3068 | WHERE item_id=%i', |
| 3070 | 3069 | $inputData['id'] |
| 3071 | 3070 | ); |
@@ -3112,7 +3111,7 @@ discard block |
||
| 3112 | 3111 | // launch query |
| 3113 | 3112 | $rows = DB::query( |
| 3114 | 3113 | 'SELECT id, name, file, extension, size |
| 3115 | - FROM ' . prefixTable('files') . ' |
|
| 3114 | + FROM ' . prefixTable('files').' |
|
| 3116 | 3115 | WHERE id_item = %i AND confirmed = 1', |
| 3117 | 3116 | $inputData['id'] |
| 3118 | 3117 | ); |
@@ -3121,7 +3120,7 @@ discard block |
||
| 3121 | 3120 | $attachments, |
| 3122 | 3121 | array( |
| 3123 | 3122 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
| 3124 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
| 3123 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
| 3125 | 3124 | 'extension' => $record['extension'], |
| 3126 | 3125 | 'size' => formatSizeUnits((int) $record['size']), |
| 3127 | 3126 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -3164,7 +3163,7 @@ discard block |
||
| 3164 | 3163 | array( |
| 3165 | 3164 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3166 | 3165 | ), |
| 3167 | - 'id=' . $session->get('user-id') |
|
| 3166 | + 'id='.$session->get('user-id') |
|
| 3168 | 3167 | ); |
| 3169 | 3168 | } |
| 3170 | 3169 | |
@@ -3173,8 +3172,8 @@ discard block |
||
| 3173 | 3172 | $listOptionsForRoles = array(); |
| 3174 | 3173 | $rows = DB::query( |
| 3175 | 3174 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3176 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3177 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3175 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3176 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3178 | 3177 | WHERE r.folder_id = %i', |
| 3179 | 3178 | $dataItem['id_tree'] |
| 3180 | 3179 | ); |
@@ -3188,9 +3187,9 @@ discard block |
||
| 3188 | 3187 | ); |
| 3189 | 3188 | $rows2 = DB::query( |
| 3190 | 3189 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3191 | - FROM ' . prefixTable('users') . ' |
|
| 3190 | + FROM ' . prefixTable('users').' |
|
| 3192 | 3191 | WHERE fonction_id LIKE %s', |
| 3193 | - '%' . $record['role_id'] . '%' |
|
| 3192 | + '%'.$record['role_id'].'%' |
|
| 3194 | 3193 | ); |
| 3195 | 3194 | foreach ($rows2 as $record2) { |
| 3196 | 3195 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3203,7 +3202,7 @@ discard block |
||
| 3203 | 3202 | array( |
| 3204 | 3203 | 'id' => (int) $record2['id'], |
| 3205 | 3204 | 'login' => $record2['login'], |
| 3206 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3205 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3207 | 3206 | 'email' => $record2['email'], |
| 3208 | 3207 | ) |
| 3209 | 3208 | ); |
@@ -3222,16 +3221,16 @@ discard block |
||
| 3222 | 3221 | $path = ''; |
| 3223 | 3222 | foreach ($arbo as $elem) { |
| 3224 | 3223 | if (empty($path) === true) { |
| 3225 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3224 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3226 | 3225 | } else { |
| 3227 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3226 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3228 | 3227 | } |
| 3229 | 3228 | } |
| 3230 | 3229 | // Build text to show user |
| 3231 | 3230 | if (empty($path) === true) { |
| 3232 | 3231 | $path = addslashes($dataItem['label']); |
| 3233 | 3232 | } else { |
| 3234 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3233 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3235 | 3234 | } |
| 3236 | 3235 | |
| 3237 | 3236 | // Add Admins to notification list if expected |
@@ -3254,7 +3253,7 @@ discard block |
||
| 3254 | 3253 | array( |
| 3255 | 3254 | addslashes($session->get('user-login')), |
| 3256 | 3255 | $path, |
| 3257 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3256 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3258 | 3257 | ), |
| 3259 | 3258 | $lang->get('email_on_open_notification_mail') |
| 3260 | 3259 | ), |
@@ -3265,7 +3264,7 @@ discard block |
||
| 3265 | 3264 | } |
| 3266 | 3265 | |
| 3267 | 3266 | // has this item a change proposal |
| 3268 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3267 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3269 | 3268 | $returnArray['has_change_proposal'] = DB::count(); |
| 3270 | 3269 | |
| 3271 | 3270 | // Setting |
@@ -3276,7 +3275,7 @@ discard block |
||
| 3276 | 3275 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3277 | 3276 | DB::query( |
| 3278 | 3277 | 'SELECT * |
| 3279 | - FROM ' . prefixTable('otv') . ' |
|
| 3278 | + FROM ' . prefixTable('otv').' |
|
| 3280 | 3279 | WHERE item_id = %i |
| 3281 | 3280 | AND time_limit > %i', |
| 3282 | 3281 | $inputData['id'], |
@@ -3380,7 +3379,7 @@ discard block |
||
| 3380 | 3379 | // Load item data |
| 3381 | 3380 | $data = DB::queryFirstRow( |
| 3382 | 3381 | 'SELECT id_tree, id, label |
| 3383 | - FROM ' . prefixTable('items') . ' |
|
| 3382 | + FROM ' . prefixTable('items').' |
|
| 3384 | 3383 | WHERE id = %i OR item_key = %s', |
| 3385 | 3384 | $inputData['itemId'], |
| 3386 | 3385 | $inputData['itemKey'] |
@@ -3454,7 +3453,7 @@ discard block |
||
| 3454 | 3453 | // Load item data |
| 3455 | 3454 | $dataItem = DB::queryFirstRow( |
| 3456 | 3455 | 'SELECT secret, enabled |
| 3457 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3456 | + FROM ' . prefixTable('items_otp').' |
|
| 3458 | 3457 | WHERE item_id = %i', |
| 3459 | 3458 | $inputData['id'] |
| 3460 | 3459 | ); |
@@ -3528,13 +3527,13 @@ discard block |
||
| 3528 | 3527 | |
| 3529 | 3528 | // Check if user is allowed to access this folder |
| 3530 | 3529 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3531 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3530 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3532 | 3531 | break; |
| 3533 | 3532 | } |
| 3534 | 3533 | |
| 3535 | 3534 | // Check if title doesn't contains html codes |
| 3536 | 3535 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3537 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3536 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3538 | 3537 | break; |
| 3539 | 3538 | } |
| 3540 | 3539 | // check that title is not numeric |
@@ -3545,9 +3544,9 @@ discard block |
||
| 3545 | 3544 | |
| 3546 | 3545 | // Check if duplicate folders name are allowed |
| 3547 | 3546 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3548 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3547 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3549 | 3548 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3550 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3549 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3551 | 3550 | break; |
| 3552 | 3551 | } |
| 3553 | 3552 | } |
@@ -3555,7 +3554,7 @@ discard block |
||
| 3555 | 3554 | // query on folder |
| 3556 | 3555 | $data = DB::queryfirstrow( |
| 3557 | 3556 | 'SELECT parent_id, personal_folder |
| 3558 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3557 | + FROM ' . prefixTable('nested_tree').' |
|
| 3559 | 3558 | WHERE id = %i', |
| 3560 | 3559 | $inputData['folderId'] |
| 3561 | 3560 | ); |
@@ -3565,20 +3564,20 @@ discard block |
||
| 3565 | 3564 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3566 | 3565 | $data = DB::queryfirstrow( |
| 3567 | 3566 | 'SELECT valeur |
| 3568 | - FROM ' . prefixTable('misc') . ' |
|
| 3567 | + FROM ' . prefixTable('misc').' |
|
| 3569 | 3568 | WHERE intitule = %i AND type = %s', |
| 3570 | 3569 | $data['parent_id'], |
| 3571 | 3570 | 'complex' |
| 3572 | 3571 | ); |
| 3573 | 3572 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3574 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3573 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3575 | 3574 | break; |
| 3576 | 3575 | } |
| 3577 | 3576 | } |
| 3578 | 3577 | |
| 3579 | 3578 | // update Folders table |
| 3580 | 3579 | $tmp = DB::queryFirstRow( |
| 3581 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3580 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3582 | 3581 | $dataReceived['folder'] |
| 3583 | 3582 | ); |
| 3584 | 3583 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3646,42 +3645,42 @@ discard block |
||
| 3646 | 3645 | in_array($post_target_folder_id, $session->get('user-accessible_folders')) === false) && ($post_target_folder_id === '0' && |
| 3647 | 3646 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3648 | 3647 | ) { |
| 3649 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3648 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3650 | 3649 | echo $returnValues; |
| 3651 | 3650 | break; |
| 3652 | 3651 | } |
| 3653 | 3652 | |
| 3654 | 3653 | $tmp_source = DB::queryFirstRow( |
| 3655 | 3654 | 'SELECT title, parent_id, personal_folder |
| 3656 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3655 | + FROM ' . prefixTable('nested_tree').' |
|
| 3657 | 3656 | WHERE id = %i', |
| 3658 | 3657 | $post_source_folder_id |
| 3659 | 3658 | ); |
| 3660 | 3659 | |
| 3661 | 3660 | $tmp_target = DB::queryFirstRow( |
| 3662 | 3661 | 'SELECT title, parent_id, personal_folder |
| 3663 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3662 | + FROM ' . prefixTable('nested_tree').' |
|
| 3664 | 3663 | WHERE id = %i', |
| 3665 | 3664 | $post_target_folder_id |
| 3666 | 3665 | ); |
| 3667 | 3666 | |
| 3668 | 3667 | // check if target is not a child of source |
| 3669 | 3668 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3670 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3669 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3671 | 3670 | echo $returnValues; |
| 3672 | 3671 | break; |
| 3673 | 3672 | } |
| 3674 | 3673 | |
| 3675 | 3674 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3676 | 3675 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3677 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3676 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3678 | 3677 | echo $returnValues; |
| 3679 | 3678 | break; |
| 3680 | 3679 | } |
| 3681 | 3680 | |
| 3682 | 3681 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3683 | 3682 | if ($tmp_source['title'] === $session->get('user-id') || $tmp_target['title'] === $session->get('user-id')) { |
| 3684 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3683 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3685 | 3684 | echo $returnValues; |
| 3686 | 3685 | break; |
| 3687 | 3686 | } |
@@ -3801,7 +3800,7 @@ discard block |
||
| 3801 | 3800 | $uniqueLoadData['path'] = $arr_arbo; |
| 3802 | 3801 | |
| 3803 | 3802 | // store last folder accessed in cookie |
| 3804 | - $arr_cookie_options = array ( |
|
| 3803 | + $arr_cookie_options = array( |
|
| 3805 | 3804 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3806 | 3805 | 'path' => '/', |
| 3807 | 3806 | 'secure' => true, |
@@ -3819,7 +3818,7 @@ discard block |
||
| 3819 | 3818 | foreach ($session->get('user-roles_array') as $role) { |
| 3820 | 3819 | $roleQ = DB::queryfirstrow( |
| 3821 | 3820 | 'SELECT allow_pw_change |
| 3822 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3821 | + FROM ' . prefixTable('roles_title').' |
|
| 3823 | 3822 | WHERE id = %i', |
| 3824 | 3823 | $role |
| 3825 | 3824 | ); |
@@ -3850,11 +3849,11 @@ discard block |
||
| 3850 | 3849 | |
| 3851 | 3850 | foreach ($session->get('user-roles_array') as $role) { |
| 3852 | 3851 | $access = DB::queryFirstRow( |
| 3853 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3852 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3854 | 3853 | $role, |
| 3855 | 3854 | $inputData['id'] |
| 3856 | 3855 | ); |
| 3857 | - if (DB::count()>0) { |
|
| 3856 | + if (DB::count() > 0) { |
|
| 3858 | 3857 | if ($access['type'] === 'R') { |
| 3859 | 3858 | array_push($arrTmp, 10); |
| 3860 | 3859 | } elseif ($access['type'] === 'W') { |
@@ -3912,7 +3911,7 @@ discard block |
||
| 3912 | 3911 | } else { |
| 3913 | 3912 | DB::query( |
| 3914 | 3913 | 'SELECT * |
| 3915 | - FROM ' . prefixTable('items') . ' |
|
| 3914 | + FROM ' . prefixTable('items').' |
|
| 3916 | 3915 | WHERE inactif = %i', |
| 3917 | 3916 | 0 |
| 3918 | 3917 | ); |
@@ -3922,7 +3921,7 @@ discard block |
||
| 3922 | 3921 | |
| 3923 | 3922 | // Get folder complexity |
| 3924 | 3923 | $folderComplexity = DB::queryFirstRow( |
| 3925 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3924 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3926 | 3925 | 'complex', |
| 3927 | 3926 | $inputData['id'] |
| 3928 | 3927 | ); |
@@ -3934,7 +3933,7 @@ discard block |
||
| 3934 | 3933 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 3935 | 3934 | $folderRow = DB::query( |
| 3936 | 3935 | 'SELECT id_category |
| 3937 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3936 | + FROM ' . prefixTable('categories_folders').' |
|
| 3938 | 3937 | WHERE id_folder = %i', |
| 3939 | 3938 | $inputData['id'] |
| 3940 | 3939 | ); |
@@ -4049,13 +4048,13 @@ discard block |
||
| 4049 | 4048 | // List all ITEMS |
| 4050 | 4049 | if ($folderIsPf === false) { |
| 4051 | 4050 | $where->add('i.inactif=%i', 0); |
| 4052 | - $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
| 4051 | + $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
| 4053 | 4052 | if (empty($limited_to_items) === false) { |
| 4054 | 4053 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 4055 | 4054 | } |
| 4056 | 4055 | |
| 4057 | - $query_limit = ' LIMIT ' . |
|
| 4058 | - $start . ',' . |
|
| 4056 | + $query_limit = ' LIMIT '. |
|
| 4057 | + $start.','. |
|
| 4059 | 4058 | $post_nb_items_to_display_once; |
| 4060 | 4059 | //db::debugmode(true); |
| 4061 | 4060 | $rows = DB::query( |
@@ -4066,9 +4065,9 @@ discard block |
||
| 4066 | 4065 | MIN(l.action) AS log_action, |
| 4067 | 4066 | l.id_user AS log_user, |
| 4068 | 4067 | i.url AS link |
| 4069 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4070 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4071 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4068 | + FROM ' . prefixTable('items').' AS i |
|
| 4069 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4070 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4072 | 4071 | WHERE %l |
| 4073 | 4072 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4074 | 4073 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4087,9 +4086,9 @@ discard block |
||
| 4087 | 4086 | MIN(l.action) AS log_action, |
| 4088 | 4087 | l.id_user AS log_user, |
| 4089 | 4088 | i.url AS link |
| 4090 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4091 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4092 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4089 | + FROM ' . prefixTable('items').' AS i |
|
| 4090 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4091 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4093 | 4092 | WHERE %l |
| 4094 | 4093 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4095 | 4094 | ORDER BY i.label ASC, l.date DESC', |
@@ -4120,7 +4119,7 @@ discard block |
||
| 4120 | 4119 | $item_is_restricted_to_role = false; |
| 4121 | 4120 | DB::queryfirstrow( |
| 4122 | 4121 | 'SELECT role_id |
| 4123 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4122 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4124 | 4123 | WHERE item_id = %i', |
| 4125 | 4124 | $record['id'] |
| 4126 | 4125 | ); |
@@ -4132,7 +4131,7 @@ discard block |
||
| 4132 | 4131 | $user_is_included_in_role = false; |
| 4133 | 4132 | DB::query( |
| 4134 | 4133 | 'SELECT role_id |
| 4135 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4134 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4136 | 4135 | WHERE item_id = %i AND role_id IN %ls', |
| 4137 | 4136 | $record['id'], |
| 4138 | 4137 | $session->get('user-roles_array') |
@@ -4338,9 +4337,9 @@ discard block |
||
| 4338 | 4337 | if ((int) $start === 0) { |
| 4339 | 4338 | DB::query( |
| 4340 | 4339 | 'SELECT i.id |
| 4341 | - FROM ' . prefixTable('items') . ' as i |
|
| 4342 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4343 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4340 | + FROM ' . prefixTable('items').' as i |
|
| 4341 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4342 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4344 | 4343 | WHERE %l |
| 4345 | 4344 | ORDER BY i.label ASC, l.date DESC', |
| 4346 | 4345 | $where |
@@ -4404,8 +4403,8 @@ discard block |
||
| 4404 | 4403 | // Run query |
| 4405 | 4404 | $dataItem = DB::queryfirstrow( |
| 4406 | 4405 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4407 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4408 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4406 | + FROM ' . prefixTable('items').' AS i |
|
| 4407 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4409 | 4408 | WHERE user_id = %i AND i.item_key = %s', |
| 4410 | 4409 | $session->get('user-id'), |
| 4411 | 4410 | $inputData['itemKey'] |
@@ -4456,13 +4455,13 @@ discard block |
||
| 4456 | 4455 | if (null !== $inputData['itemId'] && empty($inputData['itemId']) === false) { |
| 4457 | 4456 | $dataItem = DB::queryfirstrow( |
| 4458 | 4457 | 'SELECT perso, anyone_can_modify |
| 4459 | - FROM ' . prefixTable('items') . ' |
|
| 4458 | + FROM ' . prefixTable('items').' |
|
| 4460 | 4459 | WHERE id=%i', |
| 4461 | 4460 | $inputData['itemId'] |
| 4462 | 4461 | ); |
| 4463 | 4462 | |
| 4464 | 4463 | // Lock Item (if already locked), go back and warn |
| 4465 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 4464 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $inputData['itemId']); |
|
| 4466 | 4465 | |
| 4467 | 4466 | // If token is taken for this Item and delay is passed then delete it. |
| 4468 | 4467 | if ( |
@@ -4473,7 +4472,7 @@ discard block |
||
| 4473 | 4472 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $inputData['itemId']); |
| 4474 | 4473 | //reload the previous data |
| 4475 | 4474 | $dataTmp = DB::queryFirstRow( |
| 4476 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
| 4475 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
| 4477 | 4476 | $inputData['itemId'] |
| 4478 | 4477 | ); |
| 4479 | 4478 | } |
@@ -4516,7 +4515,7 @@ discard block |
||
| 4516 | 4515 | // do query on this folder |
| 4517 | 4516 | $data_this_folder = DB::queryFirstRow( |
| 4518 | 4517 | 'SELECT id, personal_folder, title |
| 4519 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4518 | + FROM ' . prefixTable('nested_tree').' |
|
| 4520 | 4519 | WHERE id = %s', |
| 4521 | 4520 | $inputData['folderId'] |
| 4522 | 4521 | ); |
@@ -4556,8 +4555,8 @@ discard block |
||
| 4556 | 4555 | $visibilite = ''; |
| 4557 | 4556 | $data = DB::queryFirstRow( |
| 4558 | 4557 | 'SELECT m.valeur, n.personal_folder |
| 4559 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4560 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4558 | + FROM ' . prefixTable('misc').' AS m |
|
| 4559 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4561 | 4560 | WHERE type=%s AND intitule = %s', |
| 4562 | 4561 | 'complex', |
| 4563 | 4562 | $inputData['folderId'] |
@@ -4570,8 +4569,8 @@ discard block |
||
| 4570 | 4569 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4571 | 4570 | $rows = DB::query( |
| 4572 | 4571 | 'SELECT t.title |
| 4573 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4574 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4572 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4573 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4575 | 4574 | WHERE v.folder_id = %i |
| 4576 | 4575 | GROUP BY title', |
| 4577 | 4576 | $inputData['folderId'] |
@@ -4580,7 +4579,7 @@ discard block |
||
| 4580 | 4579 | if (empty($visibilite)) { |
| 4581 | 4580 | $visibilite = $record['title']; |
| 4582 | 4581 | } else { |
| 4583 | - $visibilite .= ' - ' . $record['title']; |
|
| 4582 | + $visibilite .= ' - '.$record['title']; |
|
| 4584 | 4583 | } |
| 4585 | 4584 | } |
| 4586 | 4585 | } else { |
@@ -4590,14 +4589,14 @@ discard block |
||
| 4590 | 4589 | // do new query to know if current folder is pf |
| 4591 | 4590 | $data_pf = DB::queryFirstRow( |
| 4592 | 4591 | 'SELECT personal_folder |
| 4593 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4592 | + FROM ' . prefixTable('nested_tree').' |
|
| 4594 | 4593 | WHERE id = %s', |
| 4595 | 4594 | $inputData['folderId'] |
| 4596 | 4595 | ); |
| 4597 | 4596 | |
| 4598 | 4597 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4599 | 4598 | |
| 4600 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4599 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4601 | 4600 | } |
| 4602 | 4601 | |
| 4603 | 4602 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4607,8 +4606,8 @@ discard block |
||
| 4607 | 4606 | $listOptionsForRoles = array(); |
| 4608 | 4607 | $rows = DB::query( |
| 4609 | 4608 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4610 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4611 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4609 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4610 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4612 | 4611 | WHERE r.folder_id = %i', |
| 4613 | 4612 | $inputData['folderId'] |
| 4614 | 4613 | ); |
@@ -4622,7 +4621,7 @@ discard block |
||
| 4622 | 4621 | ); |
| 4623 | 4622 | $rows2 = DB::query( |
| 4624 | 4623 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4625 | - FROM ' . prefixTable('users') . ' |
|
| 4624 | + FROM ' . prefixTable('users').' |
|
| 4626 | 4625 | WHERE admin = 0 AND fonction_id is not null' |
| 4627 | 4626 | ); |
| 4628 | 4627 | foreach ($rows2 as $record2) { |
@@ -4636,7 +4635,7 @@ discard block |
||
| 4636 | 4635 | array( |
| 4637 | 4636 | 'id' => $record2['id'], |
| 4638 | 4637 | 'login' => $record2['login'], |
| 4639 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4638 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4640 | 4639 | 'email' => $record2['email'], |
| 4641 | 4640 | ) |
| 4642 | 4641 | ); |
@@ -4653,13 +4652,13 @@ discard block |
||
| 4653 | 4652 | //db::debugmode(true); |
| 4654 | 4653 | $access = DB::queryFirstRow( |
| 4655 | 4654 | 'SELECT type |
| 4656 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4655 | + FROM ' . prefixTable('roles_values').' |
|
| 4657 | 4656 | WHERE role_id = %i AND folder_id = %i', |
| 4658 | 4657 | $role, |
| 4659 | 4658 | $inputData['folderId'] |
| 4660 | 4659 | ); |
| 4661 | 4660 | //db::debugmode(false); |
| 4662 | - if (DB::count()>0) { |
|
| 4661 | + if (DB::count() > 0) { |
|
| 4663 | 4662 | if ($access['type'] === 'R') { |
| 4664 | 4663 | array_push($arrTmp, 10); |
| 4665 | 4664 | } elseif ($access['type'] === 'W') { |
@@ -4732,7 +4731,7 @@ discard block |
||
| 4732 | 4731 | // Get some info before deleting |
| 4733 | 4732 | $data = DB::queryFirstRow( |
| 4734 | 4733 | 'SELECT name, id_item, file |
| 4735 | - FROM ' . prefixTable('files') . ' |
|
| 4734 | + FROM ' . prefixTable('files').' |
|
| 4736 | 4735 | WHERE id = %i', |
| 4737 | 4736 | $fileId |
| 4738 | 4737 | ); |
@@ -4740,7 +4739,7 @@ discard block |
||
| 4740 | 4739 | // Load item data |
| 4741 | 4740 | $data_item = DB::queryFirstRow( |
| 4742 | 4741 | 'SELECT id_tree |
| 4743 | - FROM ' . prefixTable('items') . ' |
|
| 4742 | + FROM ' . prefixTable('items').' |
|
| 4744 | 4743 | WHERE id = %i', |
| 4745 | 4744 | $data['id_item'] |
| 4746 | 4745 | ); |
@@ -4770,7 +4769,7 @@ discard block |
||
| 4770 | 4769 | $session->get('user-id'), |
| 4771 | 4770 | 'at_modification', |
| 4772 | 4771 | $session->get('user-login'), |
| 4773 | - 'at_del_file : ' . $data['name'] |
|
| 4772 | + 'at_del_file : '.$data['name'] |
|
| 4774 | 4773 | ); |
| 4775 | 4774 | |
| 4776 | 4775 | // DElete sharekeys |
@@ -4781,7 +4780,7 @@ discard block |
||
| 4781 | 4780 | ); |
| 4782 | 4781 | |
| 4783 | 4782 | // Delete file from server |
| 4784 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
| 4783 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
| 4785 | 4784 | } |
| 4786 | 4785 | |
| 4787 | 4786 | echo (string) prepareExchangedData( |
@@ -4831,7 +4830,7 @@ discard block |
||
| 4831 | 4830 | // Update SESSION with this new favourite |
| 4832 | 4831 | $data = DB::queryfirstrow( |
| 4833 | 4832 | 'SELECT label,id_tree |
| 4834 | - FROM ' . prefixTable('items') . ' |
|
| 4833 | + FROM ' . prefixTable('items').' |
|
| 4835 | 4834 | WHERE id = %i', |
| 4836 | 4835 | $inputData['itemId'] |
| 4837 | 4836 | ); |
@@ -4840,7 +4839,7 @@ discard block |
||
| 4840 | 4839 | [ |
| 4841 | 4840 | $inputData['itemId'] => [ |
| 4842 | 4841 | 'label' => $data['label'], |
| 4843 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 4842 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 4844 | 4843 | ], |
| 4845 | 4844 | ], |
| 4846 | 4845 | 'add' |
@@ -4909,8 +4908,8 @@ discard block |
||
| 4909 | 4908 | // get data about item |
| 4910 | 4909 | $dataSource = DB::queryfirstrow( |
| 4911 | 4910 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4912 | - FROM ' . prefixTable('items') . ' as i |
|
| 4913 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4911 | + FROM ' . prefixTable('items').' as i |
|
| 4912 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4914 | 4913 | WHERE i.id=%i', |
| 4915 | 4914 | $inputData['itemId'] |
| 4916 | 4915 | ); |
@@ -4918,7 +4917,7 @@ discard block |
||
| 4918 | 4917 | // get data about new folder |
| 4919 | 4918 | $dataDestination = DB::queryfirstrow( |
| 4920 | 4919 | 'SELECT personal_folder, title |
| 4921 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4920 | + FROM ' . prefixTable('nested_tree').' |
|
| 4922 | 4921 | WHERE id = %i', |
| 4923 | 4922 | $inputData['folderId'] |
| 4924 | 4923 | ); |
@@ -4971,7 +4970,7 @@ discard block |
||
| 4971 | 4970 | // Get fields for this Item |
| 4972 | 4971 | $rows = DB::query( |
| 4973 | 4972 | 'SELECT id |
| 4974 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4973 | + FROM ' . prefixTable('categories_items').' |
|
| 4975 | 4974 | WHERE item_id = %i', |
| 4976 | 4975 | $inputData['itemId'] |
| 4977 | 4976 | ); |
@@ -4988,7 +4987,7 @@ discard block |
||
| 4988 | 4987 | // Get FILES for this Item |
| 4989 | 4988 | $rows = DB::query( |
| 4990 | 4989 | 'SELECT id |
| 4991 | - FROM ' . prefixTable('files') . ' |
|
| 4990 | + FROM ' . prefixTable('files').' |
|
| 4992 | 4991 | WHERE id_item = %i', |
| 4993 | 4992 | $inputData['itemId'] |
| 4994 | 4993 | ); |
@@ -5035,7 +5034,7 @@ discard block |
||
| 5035 | 5034 | // Get the ITEM object key for the user |
| 5036 | 5035 | $userKey = DB::queryFirstRow( |
| 5037 | 5036 | 'SELECT share_key |
| 5038 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5037 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5039 | 5038 | WHERE user_id = %i AND object_id = %i', |
| 5040 | 5039 | $session->get('user-id'), |
| 5041 | 5040 | $inputData['itemId'] |
@@ -5046,8 +5045,8 @@ discard block |
||
| 5046 | 5045 | // This is a public object |
| 5047 | 5046 | $users = DB::query( |
| 5048 | 5047 | 'SELECT id, public_key |
| 5049 | - FROM ' . prefixTable('users') . ' |
|
| 5050 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5048 | + FROM ' . prefixTable('users').' |
|
| 5049 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5051 | 5050 | AND public_key != ""' |
| 5052 | 5051 | ); |
| 5053 | 5052 | foreach ($users as $user) { |
@@ -5067,14 +5066,14 @@ discard block |
||
| 5067 | 5066 | // Get fields for this Item |
| 5068 | 5067 | $rows = DB::query( |
| 5069 | 5068 | 'SELECT id |
| 5070 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5069 | + FROM ' . prefixTable('categories_items').' |
|
| 5071 | 5070 | WHERE item_id = %i', |
| 5072 | 5071 | $inputData['itemId'] |
| 5073 | 5072 | ); |
| 5074 | 5073 | foreach ($rows as $field) { |
| 5075 | 5074 | $userKey = DB::queryFirstRow( |
| 5076 | 5075 | 'SELECT share_key |
| 5077 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5076 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5078 | 5077 | WHERE user_id = %i AND object_id = %i', |
| 5079 | 5078 | $session->get('user-id'), |
| 5080 | 5079 | $field['id'] |
@@ -5085,8 +5084,8 @@ discard block |
||
| 5085 | 5084 | // This is a public object |
| 5086 | 5085 | $users = DB::query( |
| 5087 | 5086 | 'SELECT id, public_key |
| 5088 | - FROM ' . prefixTable('users') . ' |
|
| 5089 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5087 | + FROM ' . prefixTable('users').' |
|
| 5088 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5090 | 5089 | AND public_key != ""' |
| 5091 | 5090 | ); |
| 5092 | 5091 | foreach ($users as $user) { |
@@ -5107,14 +5106,14 @@ discard block |
||
| 5107 | 5106 | // Get FILES for this Item |
| 5108 | 5107 | $rows = DB::query( |
| 5109 | 5108 | 'SELECT id |
| 5110 | - FROM ' . prefixTable('files') . ' |
|
| 5109 | + FROM ' . prefixTable('files').' |
|
| 5111 | 5110 | WHERE id_item = %i', |
| 5112 | 5111 | $inputData['itemId'] |
| 5113 | 5112 | ); |
| 5114 | 5113 | foreach ($rows as $attachment) { |
| 5115 | 5114 | $userKey = DB::queryFirstRow( |
| 5116 | 5115 | 'SELECT share_key |
| 5117 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5116 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5118 | 5117 | WHERE user_id = %i AND object_id = %i', |
| 5119 | 5118 | $session->get('user-id'), |
| 5120 | 5119 | $attachment['id'] |
@@ -5125,8 +5124,8 @@ discard block |
||
| 5125 | 5124 | // This is a public object |
| 5126 | 5125 | $users = DB::query( |
| 5127 | 5126 | 'SELECT id, public_key |
| 5128 | - FROM ' . prefixTable('users') . ' |
|
| 5129 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5127 | + FROM ' . prefixTable('users').' |
|
| 5128 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5130 | 5129 | AND public_key != ""' |
| 5131 | 5130 | ); |
| 5132 | 5131 | foreach ($users as $user) { |
@@ -5164,7 +5163,7 @@ discard block |
||
| 5164 | 5163 | $session->get('user-id'), |
| 5165 | 5164 | 'at_modification', |
| 5166 | 5165 | $session->get('user-login'), |
| 5167 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5166 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5168 | 5167 | ); |
| 5169 | 5168 | |
| 5170 | 5169 | // Update cache table |
@@ -5223,8 +5222,8 @@ discard block |
||
| 5223 | 5222 | // get data about item |
| 5224 | 5223 | $dataSource = DB::queryfirstrow( |
| 5225 | 5224 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5226 | - FROM ' . prefixTable('items') . ' as i |
|
| 5227 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5225 | + FROM ' . prefixTable('items').' as i |
|
| 5226 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5228 | 5227 | WHERE i.id=%i', |
| 5229 | 5228 | $item_id |
| 5230 | 5229 | ); |
@@ -5246,7 +5245,7 @@ discard block |
||
| 5246 | 5245 | |
| 5247 | 5246 | // get data about new folder |
| 5248 | 5247 | $dataDestination = DB::queryfirstrow( |
| 5249 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5248 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5250 | 5249 | $inputData['folderId'] |
| 5251 | 5250 | ); |
| 5252 | 5251 | |
@@ -5288,7 +5287,7 @@ discard block |
||
| 5288 | 5287 | // Get fields for this Item |
| 5289 | 5288 | $rows = DB::query( |
| 5290 | 5289 | 'SELECT id |
| 5291 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5290 | + FROM ' . prefixTable('categories_items').' |
|
| 5292 | 5291 | WHERE item_id = %i', |
| 5293 | 5292 | $item_id |
| 5294 | 5293 | ); |
@@ -5305,7 +5304,7 @@ discard block |
||
| 5305 | 5304 | // Get FILES for this Item |
| 5306 | 5305 | $rows = DB::query( |
| 5307 | 5306 | 'SELECT id |
| 5308 | - FROM ' . prefixTable('files') . ' |
|
| 5307 | + FROM ' . prefixTable('files').' |
|
| 5309 | 5308 | WHERE id_item = %i', |
| 5310 | 5309 | $item_id |
| 5311 | 5310 | ); |
@@ -5360,7 +5359,7 @@ discard block |
||
| 5360 | 5359 | // Get the ITEM object key for the user |
| 5361 | 5360 | $userKey = DB::queryFirstRow( |
| 5362 | 5361 | 'SELECT share_key |
| 5363 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5362 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5364 | 5363 | WHERE user_id = %i AND object_id = %i', |
| 5365 | 5364 | $session->get('user-id'), |
| 5366 | 5365 | $item_id |
@@ -5371,8 +5370,8 @@ discard block |
||
| 5371 | 5370 | // This is a public object |
| 5372 | 5371 | $users = DB::query( |
| 5373 | 5372 | 'SELECT id, public_key |
| 5374 | - FROM ' . prefixTable('users') . ' |
|
| 5375 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5373 | + FROM ' . prefixTable('users').' |
|
| 5374 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5376 | 5375 | AND public_key != ""' |
| 5377 | 5376 | ); |
| 5378 | 5377 | foreach ($users as $user) { |
@@ -5392,14 +5391,14 @@ discard block |
||
| 5392 | 5391 | // Get fields for this Item |
| 5393 | 5392 | $rows = DB::query( |
| 5394 | 5393 | 'SELECT id |
| 5395 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5394 | + FROM ' . prefixTable('categories_items').' |
|
| 5396 | 5395 | WHERE item_id = %i', |
| 5397 | 5396 | $item_id |
| 5398 | 5397 | ); |
| 5399 | 5398 | foreach ($rows as $field) { |
| 5400 | 5399 | $userKey = DB::queryFirstRow( |
| 5401 | 5400 | 'SELECT share_key |
| 5402 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5401 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5403 | 5402 | WHERE user_id = %i AND object_id = %i', |
| 5404 | 5403 | $session->get('user-id'), |
| 5405 | 5404 | $field['id'] |
@@ -5410,8 +5409,8 @@ discard block |
||
| 5410 | 5409 | // This is a public object |
| 5411 | 5410 | $users = DB::query( |
| 5412 | 5411 | 'SELECT id, public_key |
| 5413 | - FROM ' . prefixTable('users') . ' |
|
| 5414 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5412 | + FROM ' . prefixTable('users').' |
|
| 5413 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5415 | 5414 | AND public_key != ""' |
| 5416 | 5415 | ); |
| 5417 | 5416 | foreach ($users as $user) { |
@@ -5432,14 +5431,14 @@ discard block |
||
| 5432 | 5431 | // Get FILES for this Item |
| 5433 | 5432 | $rows = DB::query( |
| 5434 | 5433 | 'SELECT id |
| 5435 | - FROM ' . prefixTable('files') . ' |
|
| 5434 | + FROM ' . prefixTable('files').' |
|
| 5436 | 5435 | WHERE id_item = %i', |
| 5437 | 5436 | $item_id |
| 5438 | 5437 | ); |
| 5439 | 5438 | foreach ($rows as $attachment) { |
| 5440 | 5439 | $userKey = DB::queryFirstRow( |
| 5441 | 5440 | 'SELECT share_key |
| 5442 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5441 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5443 | 5442 | WHERE user_id = %i AND object_id = %i', |
| 5444 | 5443 | $session->get('user-id'), |
| 5445 | 5444 | $attachment['id'] |
@@ -5450,8 +5449,8 @@ discard block |
||
| 5450 | 5449 | // This is a public object |
| 5451 | 5450 | $users = DB::query( |
| 5452 | 5451 | 'SELECT id, public_key |
| 5453 | - FROM ' . prefixTable('users') . ' |
|
| 5454 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5452 | + FROM ' . prefixTable('users').' |
|
| 5453 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5455 | 5454 | AND public_key != ""' |
| 5456 | 5455 | ); |
| 5457 | 5456 | foreach ($users as $user) { |
@@ -5488,13 +5487,13 @@ discard block |
||
| 5488 | 5487 | $session->get('user-id'), |
| 5489 | 5488 | 'at_modification', |
| 5490 | 5489 | $session->get('user-login'), |
| 5491 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5490 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5492 | 5491 | ); |
| 5493 | 5492 | } |
| 5494 | 5493 | } |
| 5495 | 5494 | |
| 5496 | 5495 | // reload cache table |
| 5497 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5496 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5498 | 5497 | updateCacheTable('reload', null); |
| 5499 | 5498 | |
| 5500 | 5499 | echo (string) prepareExchangedData( |
@@ -5558,7 +5557,7 @@ discard block |
||
| 5558 | 5557 | // get info |
| 5559 | 5558 | $dataSource = DB::queryfirstrow( |
| 5560 | 5559 | 'SELECT label, id_tree |
| 5561 | - FROM ' . prefixTable('items') . ' |
|
| 5560 | + FROM ' . prefixTable('items').' |
|
| 5562 | 5561 | WHERE id=%i', |
| 5563 | 5562 | $item_id |
| 5564 | 5563 | ); |
@@ -5657,8 +5656,8 @@ discard block |
||
| 5657 | 5656 | } |
| 5658 | 5657 | if ($inputData['cat'] === 'request_access_to_author') { |
| 5659 | 5658 | // Variables |
| 5660 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
| 5661 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
| 5659 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
| 5660 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
| 5662 | 5661 | |
| 5663 | 5662 | // Get path |
| 5664 | 5663 | $path = geItemReadablePath( |
@@ -5672,7 +5671,7 @@ discard block |
||
| 5672 | 5671 | $lang->get('email_request_access_subject'), |
| 5673 | 5672 | str_replace( |
| 5674 | 5673 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5675 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5674 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5676 | 5675 | $lang->get('email_request_access_mail') |
| 5677 | 5676 | ), |
| 5678 | 5677 | $dataAuthor['email'], |
@@ -5682,7 +5681,7 @@ discard block |
||
| 5682 | 5681 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5683 | 5682 | $dataItem = DB::queryfirstrow( |
| 5684 | 5683 | 'SELECT label,id_tree |
| 5685 | - FROM ' . prefixTable('items') . ' |
|
| 5684 | + FROM ' . prefixTable('items').' |
|
| 5686 | 5685 | WHERE id= %i', |
| 5687 | 5686 | $inputData['id'] |
| 5688 | 5687 | ); |
@@ -5705,7 +5704,7 @@ discard block |
||
| 5705 | 5704 | ), |
| 5706 | 5705 | array( |
| 5707 | 5706 | empty($SETTINGS['email_server_url']) === false ? |
| 5708 | - $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'], |
|
| 5707 | + $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'], |
|
| 5709 | 5708 | addslashes($session->get('user-login')), |
| 5710 | 5709 | addslashes($path), |
| 5711 | 5710 | ), |
@@ -5806,8 +5805,8 @@ discard block |
||
| 5806 | 5805 | // Get all informations for this item |
| 5807 | 5806 | $dataItem = DB::queryfirstrow( |
| 5808 | 5807 | 'SELECT * |
| 5809 | - FROM ' . prefixTable('items') . ' as i |
|
| 5810 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5808 | + FROM ' . prefixTable('items').' as i |
|
| 5809 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5811 | 5810 | WHERE i.id=%i AND l.action = %s', |
| 5812 | 5811 | $item_id, |
| 5813 | 5812 | 'at_creation' |
@@ -5836,18 +5835,18 @@ discard block |
||
| 5836 | 5835 | $session->get('user-login'), |
| 5837 | 5836 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 5838 | 5837 | null, |
| 5839 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 5838 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 5840 | 5839 | ); |
| 5841 | 5840 | // Prepare new line |
| 5842 | 5841 | $data = DB::queryfirstrow( |
| 5843 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5842 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5844 | 5843 | $item_id |
| 5845 | 5844 | ); |
| 5846 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 5845 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 5847 | 5846 | // send back |
| 5848 | 5847 | $data = array( |
| 5849 | 5848 | 'error' => '', |
| 5850 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5849 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5851 | 5850 | ); |
| 5852 | 5851 | echo (string) prepareExchangedData( |
| 5853 | 5852 | $data, |
@@ -5919,7 +5918,7 @@ discard block |
||
| 5919 | 5918 | ); |
| 5920 | 5919 | |
| 5921 | 5920 | // delete all existing old otv codes |
| 5922 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time()); |
|
| 5921 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time()); |
|
| 5923 | 5922 | foreach ($rows as $record) { |
| 5924 | 5923 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 5925 | 5924 | } |
@@ -5941,8 +5940,8 @@ discard block |
||
| 5941 | 5940 | // Should we log a password change? |
| 5942 | 5941 | $itemQ = DB::queryFirstRow( |
| 5943 | 5942 | 'SELECT s.share_key, i.pw |
| 5944 | - FROM ' . prefixTable('items') . ' AS i |
|
| 5945 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 5943 | + FROM ' . prefixTable('items').' AS i |
|
| 5944 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 5946 | 5945 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5947 | 5946 | $session->get('user-id'), |
| 5948 | 5947 | $dataReceived['id'] |
@@ -5995,7 +5994,7 @@ discard block |
||
| 5995 | 5994 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 5996 | 5995 | $SETTINGS['otv_expiration_period'] = 7; |
| 5997 | 5996 | } |
| 5998 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
| 5997 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
| 5999 | 5998 | |
| 6000 | 5999 | echo json_encode( |
| 6001 | 6000 | array( |
@@ -6037,7 +6036,7 @@ discard block |
||
| 6037 | 6036 | ); |
| 6038 | 6037 | |
| 6039 | 6038 | $data = DB::queryFirstRow( |
| 6040 | - 'SELECT * FROM ' . prefixTable('otv') . ' WHERE id = %i', |
|
| 6039 | + 'SELECT * FROM '.prefixTable('otv').' WHERE id = %i', |
|
| 6041 | 6040 | $dataReceived['otv_id'] |
| 6042 | 6041 | ); |
| 6043 | 6042 | |
@@ -6046,13 +6045,13 @@ discard block |
||
| 6046 | 6045 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6047 | 6046 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6048 | 6047 | if (str_contains($domain_host, 'www.') === true) { |
| 6049 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6048 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6050 | 6049 | } else { |
| 6051 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6050 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6052 | 6051 | } |
| 6053 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?otv=true&code=' . $data['code'] . '&key=' . $data['encrypted'] . '&stamp=' . $data['time_limit']; |
|
| 6052 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?otv=true&code='.$data['code'].'&key='.$data['encrypted'].'&stamp='.$data['time_limit']; |
|
| 6054 | 6053 | } else { |
| 6055 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&code=' . $data['code'] . '&key=' . $data['encrypted'] . '&stamp=' . $data['time_limit']; |
|
| 6054 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&code='.$data['code'].'&key='.$data['encrypted'].'&stamp='.$data['time_limit']; |
|
| 6056 | 6055 | } |
| 6057 | 6056 | |
| 6058 | 6057 | echo (string) prepareExchangedData( |
@@ -6087,8 +6086,8 @@ discard block |
||
| 6087 | 6086 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6088 | 6087 | f.extension AS extension, f.type AS type, |
| 6089 | 6088 | s.share_key AS share_key |
| 6090 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6091 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6089 | + FROM ' . prefixTable('files').' AS f |
|
| 6090 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6092 | 6091 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6093 | 6092 | $session->get('user-id'), |
| 6094 | 6093 | $inputData['id'] |
@@ -6109,7 +6108,7 @@ discard block |
||
| 6109 | 6108 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6110 | 6109 | |
| 6111 | 6110 | // prepare image info |
| 6112 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6111 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6113 | 6112 | $post_title = isBase64($post_title) === true ? |
| 6114 | 6113 | base64_decode($post_title) : $post_title; |
| 6115 | 6114 | $image_code = $file_info['file']; |
@@ -6126,7 +6125,7 @@ discard block |
||
| 6126 | 6125 | echo (string) prepareExchangedData( |
| 6127 | 6126 | array( |
| 6128 | 6127 | 'error' => false, |
| 6129 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6128 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6130 | 6129 | 'file_type' => $file_info['type'], |
| 6131 | 6130 | 'file_content' => $fileContent, |
| 6132 | 6131 | ), |
@@ -6179,16 +6178,16 @@ discard block |
||
| 6179 | 6178 | $idFolder = $dataReceived['idFolder']; |
| 6180 | 6179 | |
| 6181 | 6180 | // don't check if Personal Folder |
| 6182 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 6181 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 6183 | 6182 | if ($data['title'] === $session->get('user-id')) { |
| 6184 | 6183 | // send data |
| 6185 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 6184 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 6186 | 6185 | } else { |
| 6187 | 6186 | if ($inputData['option'] === 'same_folder') { |
| 6188 | 6187 | // case unique folder |
| 6189 | 6188 | DB::query( |
| 6190 | 6189 | 'SELECT label |
| 6191 | - FROM ' . prefixTable('items') . ' |
|
| 6190 | + FROM ' . prefixTable('items').' |
|
| 6192 | 6191 | WHERE id_tree = %i AND label = %s', |
| 6193 | 6192 | $idFolder, |
| 6194 | 6193 | $label |
@@ -6200,7 +6199,7 @@ discard block |
||
| 6200 | 6199 | $arrayPf = array(); |
| 6201 | 6200 | if (empty($row['id']) === false) { |
| 6202 | 6201 | $rows = DB::query( |
| 6203 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 6202 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 6204 | 6203 | '1' |
| 6205 | 6204 | ); |
| 6206 | 6205 | foreach ($rows as $record) { |
@@ -6215,12 +6214,12 @@ discard block |
||
| 6215 | 6214 | $where->add('id_tree = %i', $idFolder); |
| 6216 | 6215 | $where->add('label = %s', $label); |
| 6217 | 6216 | if (empty($arrayPf) === false) { |
| 6218 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 6217 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 6219 | 6218 | } |
| 6220 | 6219 | |
| 6221 | 6220 | DB::query( |
| 6222 | 6221 | 'SELECT label |
| 6223 | - FROM ' . prefixTable('items') . ' |
|
| 6222 | + FROM ' . prefixTable('items').' |
|
| 6224 | 6223 | WHERE %l', |
| 6225 | 6224 | $where |
| 6226 | 6225 | ); |
@@ -6232,7 +6231,7 @@ discard block |
||
| 6232 | 6231 | } |
| 6233 | 6232 | |
| 6234 | 6233 | // send data |
| 6235 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 6234 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 6236 | 6235 | } |
| 6237 | 6236 | break; |
| 6238 | 6237 | |
@@ -6343,7 +6342,7 @@ discard block |
||
| 6343 | 6342 | $arbo = $tree->getPath($folder->id, false); |
| 6344 | 6343 | $path = ''; |
| 6345 | 6344 | foreach ($arbo as $elem) { |
| 6346 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6345 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6347 | 6346 | } |
| 6348 | 6347 | |
| 6349 | 6348 | // Build array |
@@ -6413,7 +6412,7 @@ discard block |
||
| 6413 | 6412 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6414 | 6413 | $rows = DB::query( |
| 6415 | 6414 | 'SELECT id, categories |
| 6416 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6415 | + FROM ' . prefixTable('nested_tree').' |
|
| 6417 | 6416 | WHERE id IN (%l)', |
| 6418 | 6417 | implode(',', $foldersArray) |
| 6419 | 6418 | ); |
@@ -6455,7 +6454,7 @@ discard block |
||
| 6455 | 6454 | // get item info |
| 6456 | 6455 | $dataItem = DB::queryFirstRow( |
| 6457 | 6456 | 'SELECT * |
| 6458 | - FROM ' . prefixTable('items') . ' |
|
| 6457 | + FROM ' . prefixTable('items').' |
|
| 6459 | 6458 | WHERE id=%i', |
| 6460 | 6459 | $inputData['itemId'] |
| 6461 | 6460 | ); |
@@ -6467,8 +6466,8 @@ discard block |
||
| 6467 | 6466 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6468 | 6467 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6469 | 6468 | l.old_value as old_value |
| 6470 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6471 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6469 | + FROM ' . prefixTable('log_items').' as l |
|
| 6470 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6472 | 6471 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6473 | 6472 | ORDER BY date DESC', |
| 6474 | 6473 | $inputData['itemId'], |
@@ -6483,18 +6482,18 @@ discard block |
||
| 6483 | 6482 | |
| 6484 | 6483 | // imported via API |
| 6485 | 6484 | if (empty($record['login']) === true) { |
| 6486 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6485 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6487 | 6486 | } |
| 6488 | 6487 | |
| 6489 | 6488 | // Prepare avatar |
| 6490 | 6489 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6491 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6492 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6490 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6491 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6493 | 6492 | } else { |
| 6494 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6493 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6495 | 6494 | } |
| 6496 | 6495 | } else { |
| 6497 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6496 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6498 | 6497 | } |
| 6499 | 6498 | |
| 6500 | 6499 | // Prepare action |
@@ -6514,7 +6513,7 @@ discard block |
||
| 6514 | 6513 | $previous_passwords, |
| 6515 | 6514 | [ |
| 6516 | 6515 | 'password' => htmlentities($previous_pwd['string']), |
| 6517 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6516 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6518 | 6517 | ] |
| 6519 | 6518 | ); |
| 6520 | 6519 | } |
@@ -6527,19 +6526,19 @@ discard block |
||
| 6527 | 6526 | $action = $lang->get($reason[0]); |
| 6528 | 6527 | if ($reason[0] === 'at_moved') { |
| 6529 | 6528 | $tmp = explode(' -> ', $reason[1]); |
| 6530 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6529 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6531 | 6530 | } elseif ($reason[0] === 'at_field') { |
| 6532 | 6531 | $tmp = explode(' => ', $reason[1]); |
| 6533 | 6532 | if (count($tmp) > 1) { |
| 6534 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6535 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6533 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6534 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6536 | 6535 | } else { |
| 6537 | 6536 | $detail = trim($reason[1]); |
| 6538 | 6537 | } |
| 6539 | 6538 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6540 | 6539 | $tmp = explode(' => ', $reason[1]); |
| 6541 | 6540 | $detail = empty(trim($tmp[0])) === true ? |
| 6542 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6541 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6543 | 6542 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6544 | 6543 | $detail = $lang->get($reason[1]); |
| 6545 | 6544 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6548,7 +6547,7 @@ discard block |
||
| 6548 | 6547 | $tmp = explode(':', $reason[1]); |
| 6549 | 6548 | $tmp = explode('.', $tmp[0]); |
| 6550 | 6549 | $detail = isBase64($tmp[0]) === true ? |
| 6551 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6550 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6552 | 6551 | } elseif ($reason[0] === 'at_import') { |
| 6553 | 6552 | $detail = ''; |
| 6554 | 6553 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6567,8 +6566,8 @@ discard block |
||
| 6567 | 6566 | array( |
| 6568 | 6567 | 'avatar' => $avatar, |
| 6569 | 6568 | 'login' => $record['login'], |
| 6570 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6571 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6569 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6570 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6572 | 6571 | 'action' => $action, |
| 6573 | 6572 | 'detail' => $detail, |
| 6574 | 6573 | ) |
@@ -6657,18 +6656,18 @@ discard block |
||
| 6657 | 6656 | |
| 6658 | 6657 | // get some info to add to the notification email |
| 6659 | 6658 | $resp_user = DB::queryfirstrow( |
| 6660 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6659 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6661 | 6660 | $session->get('user-id') |
| 6662 | 6661 | ); |
| 6663 | 6662 | $resp_folder = DB::queryfirstrow( |
| 6664 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6663 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6665 | 6664 | $folder |
| 6666 | 6665 | ); |
| 6667 | 6666 | |
| 6668 | 6667 | // notify Managers |
| 6669 | 6668 | $rows = DB::query( |
| 6670 | 6669 | 'SELECT email |
| 6671 | - FROM ' . prefixTable('users') . ' |
|
| 6670 | + FROM ' . prefixTable('users').' |
|
| 6672 | 6671 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6673 | 6672 | 1 |
| 6674 | 6673 | ); |
@@ -6699,14 +6698,14 @@ discard block |
||
| 6699 | 6698 | // Get list of users |
| 6700 | 6699 | $usersList = array(); |
| 6701 | 6700 | $usersString = ''; |
| 6702 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 6701 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 6703 | 6702 | foreach ($rows as $record) { |
| 6704 | 6703 | $usersList[$record['login']] = array( |
| 6705 | 6704 | 'id' => $record['id'], |
| 6706 | 6705 | 'login' => $record['login'], |
| 6707 | 6706 | 'email' => $record['email'], |
| 6708 | 6707 | ); |
| 6709 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 6708 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 6710 | 6709 | } |
| 6711 | 6710 | |
| 6712 | 6711 | $data = array( |
@@ -6746,7 +6745,7 @@ discard block |
||
| 6746 | 6745 | // Send email |
| 6747 | 6746 | $dataItem = DB::queryfirstrow( |
| 6748 | 6747 | 'SELECT label, id_tree |
| 6749 | - FROM ' . prefixTable('items') . ' |
|
| 6748 | + FROM ' . prefixTable('items').' |
|
| 6750 | 6749 | WHERE id = %i', |
| 6751 | 6750 | $inputData['itemId'] |
| 6752 | 6751 | ); |
@@ -6800,7 +6799,7 @@ discard block |
||
| 6800 | 6799 | |
| 6801 | 6800 | DB::query( |
| 6802 | 6801 | 'SELECT * |
| 6803 | - FROM ' . prefixTable('notification') . ' |
|
| 6802 | + FROM ' . prefixTable('notification').' |
|
| 6804 | 6803 | WHERE item_id = %i AND user_id = %i', |
| 6805 | 6804 | $inputData['itemId'], |
| 6806 | 6805 | $session->get('user-id') |
@@ -6872,7 +6871,7 @@ discard block |
||
| 6872 | 6871 | // And related logs |
| 6873 | 6872 | $rows = DB::query( |
| 6874 | 6873 | 'SELECT id, file AS filename |
| 6875 | - FROM ' . prefixTable('files') . ' |
|
| 6874 | + FROM ' . prefixTable('files').' |
|
| 6876 | 6875 | WHERE id_item = %i AND confirmed = %i', |
| 6877 | 6876 | $inputData['itemId'], |
| 6878 | 6877 | 0 |
@@ -6886,12 +6885,12 @@ discard block |
||
| 6886 | 6885 | ); |
| 6887 | 6886 | |
| 6888 | 6887 | // Delete file on server |
| 6889 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6888 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6890 | 6889 | |
| 6891 | 6890 | // Delete related logs |
| 6892 | 6891 | $logFile = DB::query( |
| 6893 | 6892 | 'SELECT increment_id, raison |
| 6894 | - FROM ' . prefixTable('log_items') . ' |
|
| 6893 | + FROM ' . prefixTable('log_items').' |
|
| 6895 | 6894 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6896 | 6895 | $inputData['itemId'], |
| 6897 | 6896 | $session->get('user-id'), |
@@ -6950,7 +6949,7 @@ discard block |
||
| 6950 | 6949 | // Confirm attachments |
| 6951 | 6950 | $rows = DB::query( |
| 6952 | 6951 | 'SELECT id, file AS filename |
| 6953 | - FROM ' . prefixTable('files') . ' |
|
| 6952 | + FROM ' . prefixTable('files').' |
|
| 6954 | 6953 | WHERE id_item = %i AND confirmed = %i', |
| 6955 | 6954 | $inputData['itemId'], |
| 6956 | 6955 | 0 |
@@ -7008,7 +7007,7 @@ discard block |
||
| 7008 | 7007 | |
| 7009 | 7008 | $data = DB::queryFirstRow( |
| 7010 | 7009 | 'SELECT visible_folders |
| 7011 | - FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', |
|
| 7010 | + FROM ' . prefixTable('cache_tree').' WHERE user_id = %i', |
|
| 7012 | 7011 | $inputData['userId'] |
| 7013 | 7012 | ); |
| 7014 | 7013 | // Check if tree ID is in visible folders. |
@@ -7037,7 +7036,7 @@ discard block |
||
| 7037 | 7036 | // Is there no edit or no delete defined |
| 7038 | 7037 | $data = DB::queryFirstColumn( |
| 7039 | 7038 | 'SELECT type |
| 7040 | - FROM ' . prefixTable('roles_values') . ' |
|
| 7039 | + FROM ' . prefixTable('roles_values').' |
|
| 7041 | 7040 | WHERE role_id IN %ls AND folder_id = %i', |
| 7042 | 7041 | array_column($session->get('system-array_roles'), 'id'), |
| 7043 | 7042 | $inputData['treeId'], |
@@ -7083,15 +7082,15 @@ discard block |
||
| 7083 | 7082 | case 'autocomplete_tags': |
| 7084 | 7083 | // Get a list off all existing TAGS |
| 7085 | 7084 | $listOfTags = ''; |
| 7086 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7085 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7087 | 7086 | foreach ($rows as $record) { |
| 7088 | 7087 | if (empty($listOfTags)) { |
| 7089 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7088 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7090 | 7089 | } else { |
| 7091 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7090 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7092 | 7091 | } |
| 7093 | 7092 | } |
| 7094 | - echo '[' . $listOfTags . ']'; |
|
| 7093 | + echo '['.$listOfTags.']'; |
|
| 7095 | 7094 | break; |
| 7096 | 7095 | } |
| 7097 | 7096 | } |
@@ -7107,7 +7106,7 @@ discard block |
||
| 7107 | 7106 | { |
| 7108 | 7107 | $data = DB::queryFirstRow( |
| 7109 | 7108 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7110 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7109 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7111 | 7110 | $groupe |
| 7112 | 7111 | ); |
| 7113 | 7112 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $arrQueryStringParams = $this->getQueryStringParams(); |
| 40 | 40 | |
| 41 | 41 | if (strtoupper($requestMethod) === 'POST') { |
| 42 | - require API_ROOT_PATH . "/Model/AuthModel.php"; |
|
| 42 | + require API_ROOT_PATH."/Model/AuthModel.php"; |
|
| 43 | 43 | try { |
| 44 | 44 | $authModel = new AuthModel(); |
| 45 | 45 | $arrUser = $authModel->getUserAuth( |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | if (array_key_exists("token", $arrUser)) { |
| 51 | 51 | $responseData = json_encode($arrUser); |
| 52 | 52 | } else { |
| 53 | - $strErrorDesc = $arrUser['error'] . " (" . $arrUser['info'] . ")"; |
|
| 53 | + $strErrorDesc = $arrUser['error']." (".$arrUser['info'].")"; |
|
| 54 | 54 | $strErrorHeader = 'HTTP/1.1 401 Unauthorized'; |
| 55 | 55 | } |
| 56 | 56 | } catch (Error $e) { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | WHERE code = %s', |
| 77 | 77 | filter_input(INPUT_GET, 'code', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 78 | 78 | ); |
| 79 | - if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
| 79 | + if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
| 80 | 80 | // otv is too old |
| 81 | 81 | if ($data['time_limit'] < time() || ($data['views'] + 1) > $data['max_views']) { |
| 82 | 82 | $html = 'Link is too old!'; |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | <tr><th>URL:</th><td>'.$url.'</td></tr> |
| 180 | 180 | </table></div> |
| 181 | 181 | <p class="mt-3 text-info"><i class="fas fa-info mr-2"></i>Copy carefully the data you need.<br>This page is visible until <b>'. |
| 182 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views']+1)).' more time(s)</b>.</div> |
|
| 182 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views'] + 1)).' more time(s)</b>.</div> |
|
| 183 | 183 | </div>'; |
| 184 | 184 | // log |
| 185 | 185 | logItems( |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | try { |
| 48 | 48 | Container::addConnection($connection); |
| 49 | 49 | // get id attribute |
| 50 | - if (isset($SETTINGS['ldap_guid_attibute']) ===true && empty($SETTINGS['ldap_guid_attibute']) === false) { |
|
| 50 | + if (isset($SETTINGS['ldap_guid_attibute']) === true && empty($SETTINGS['ldap_guid_attibute']) === false) { |
|
| 51 | 51 | $idAttribute = $SETTINGS['ldap_guid_attibute']; |
| 52 | 52 | } else { |
| 53 | 53 | $idAttribute = 'objectguid'; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | { |
| 46 | 46 | $superGlobal = new SuperGlobal(); |
| 47 | 47 | $uri = parse_url($superGlobal->get('REQUEST_URI', 'SERVER'), PHP_URL_PATH); |
| 48 | - $uri = explode( '/', $uri ); |
|
| 48 | + $uri = explode('/', $uri); |
|
| 49 | 49 | return $this->sanitizeUrl(array_slice($uri, ((int) array_search('index.php', $uri) + 1))); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $filters = []; |
| 73 | 73 | $array_size = count($array); |
| 74 | - for ($i=0; $i < $array_size; $i++) { |
|
| 74 | + for ($i = 0; $i < $array_size; $i++) { |
|
| 75 | 75 | array_push($filters, 'trim|escape'); |
| 76 | 76 | } |
| 77 | 77 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * @param mixed $data |
| 90 | 90 | * @param string $httpHeader |
| 91 | 91 | */ |
| 92 | - protected function sendOutput($data, $httpHeaders=array()): void |
|
| 92 | + protected function sendOutput($data, $httpHeaders = array()): void |
|
| 93 | 93 | { |
| 94 | 94 | header_remove('Set-Cookie'); |
| 95 | 95 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - $items = DB::query('SELECT id,label FROM ' . prefixTable('items') . ' WHERE id_tree NOT IN %li', $foldersIds); |
|
| 88 | + $items = DB::query('SELECT id,label FROM '.prefixTable('items').' WHERE id_tree NOT IN %li', $foldersIds); |
|
| 89 | 89 | foreach ($items as $item) { |
| 90 | 90 | //Delete item |
| 91 | 91 | DB::DELETE(prefixTable('items'), 'id = %i', $item['id']); |
@@ -104,12 +104,12 @@ discard block |
||
| 104 | 104 | // delete orphan items |
| 105 | 105 | $rows = DB::query( |
| 106 | 106 | 'SELECT id |
| 107 | - FROM ' . prefixTable('items') . ' |
|
| 107 | + FROM ' . prefixTable('items').' |
|
| 108 | 108 | ORDER BY id ASC' |
| 109 | 109 | ); |
| 110 | 110 | foreach ($rows as $item) { |
| 111 | 111 | DB::query( |
| 112 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s', |
|
| 112 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s', |
|
| 113 | 113 | $item['id'], |
| 114 | 114 | 'at_creation' |
| 115 | 115 | ); |
