@@ -28,8 +28,8 @@ |
||
28 | 28 | * @see https://www.teampass.net |
29 | 29 | */ |
30 | 30 | |
31 | - // TO REMOVE |
|
32 | - // - selected_items_to_be_imported |
|
31 | + // TO REMOVE |
|
32 | + // - selected_items_to_be_imported |
|
33 | 33 | |
34 | 34 | return array( |
35 | 35 | 'no_previous_valide_private_key' => 'No previous private key fits provided password', |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | ) { |
78 | 78 | // Not allowed page |
79 | 79 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
80 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
80 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
81 | 81 | exit; |
82 | 82 | } |
83 | 83 | |
@@ -138,14 +138,14 @@ discard block |
||
138 | 138 | // Prepare variables |
139 | 139 | $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
140 | 140 | |
141 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
141 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
142 | 142 | |
143 | 143 | // get a token |
144 | 144 | $token = GenerateCryptKey(20, false, true, true, false, true); |
145 | 145 | |
146 | 146 | //save file |
147 | - $filename = time() . '-' . $token . '.sql'; |
|
148 | - $filepath = $SETTINGS['path_to_files_folder'] . '/' . $filename; |
|
147 | + $filename = time().'-'.$token.'.sql'; |
|
148 | + $filepath = $SETTINGS['path_to_files_folder'].'/'.$filename; |
|
149 | 149 | $handle = fopen($filepath, 'w+'); |
150 | 150 | |
151 | 151 | if ($handle === false) { |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $tables = array(); |
164 | 164 | $result = DB::query('SHOW TABLES'); |
165 | 165 | foreach ($result as $row) { |
166 | - $tables[] = $row['Tables_in_' . DB_NAME]; |
|
166 | + $tables[] = $row['Tables_in_'.DB_NAME]; |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | $backupSuccess = true; |
@@ -173,9 +173,9 @@ discard block |
||
173 | 173 | if (empty($pre) || substr_count($table, $pre) > 0) { |
174 | 174 | $table = safeString($table); |
175 | 175 | // Write table drop and creation |
176 | - fwrite($handle, 'DROP TABLE IF EXISTS ' . $table . ";\n"); |
|
177 | - $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table); |
|
178 | - fwrite($handle, safeString($row2['Create Table']) . ";\n\n"); |
|
176 | + fwrite($handle, 'DROP TABLE IF EXISTS '.$table.";\n"); |
|
177 | + $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table); |
|
178 | + fwrite($handle, safeString($row2['Create Table']).";\n\n"); |
|
179 | 179 | |
180 | 180 | // Get field information |
181 | 181 | DB::query( |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | } |
201 | 201 | |
202 | 202 | foreach ($rows as $record) { |
203 | - $insertQuery = 'INSERT INTO ' . $table . ' VALUES('; |
|
203 | + $insertQuery = 'INSERT INTO '.$table.' VALUES('; |
|
204 | 204 | $values = array(); |
205 | 205 | |
206 | 206 | foreach ($record as $value) { |
@@ -208,11 +208,11 @@ discard block |
||
208 | 208 | if ($value === null) { |
209 | 209 | $values[] = 'NULL'; |
210 | 210 | } else { |
211 | - $values[] = '"' . addslashes(preg_replace("/\n/", '\\n', $value)) . '"'; |
|
211 | + $values[] = '"'.addslashes(preg_replace("/\n/", '\\n', $value)).'"'; |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 | |
215 | - $insertQuery .= implode(',', $values) . ");\n"; |
|
215 | + $insertQuery .= implode(',', $values).");\n"; |
|
216 | 216 | fwrite($handle, $insertQuery); |
217 | 217 | |
218 | 218 | // Flush buffer periodically to free memory |
@@ -242,14 +242,14 @@ discard block |
||
242 | 242 | prepareFileWithDefuse( |
243 | 243 | 'encrypt', |
244 | 244 | $filepath, |
245 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
245 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
246 | 246 | $post_key |
247 | 247 | ); |
248 | 248 | |
249 | 249 | // Do clean |
250 | 250 | unlink($filepath); |
251 | 251 | rename( |
252 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
252 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
253 | 253 | $filepath |
254 | 254 | ); |
255 | 255 | } |
@@ -271,9 +271,9 @@ discard block |
||
271 | 271 | array( |
272 | 272 | 'error' => false, |
273 | 273 | 'message' => '', |
274 | - 'download' => 'sources/downloadFile.php?name=' . urlencode($filename) . |
|
275 | - '&action=backup&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . |
|
276 | - $session->get('user-key_tmp') . '&pathIsFiles=1', |
|
274 | + 'download' => 'sources/downloadFile.php?name='.urlencode($filename). |
|
275 | + '&action=backup&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='. |
|
276 | + $session->get('user-key_tmp').'&pathIsFiles=1', |
|
277 | 277 | ), |
278 | 278 | 'encode' |
279 | 279 | ); |
@@ -334,13 +334,13 @@ discard block |
||
334 | 334 | error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key); |
335 | 335 | } |
336 | 336 | |
337 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
337 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
338 | 338 | |
339 | 339 | if (empty($post_clearFilename) === true) { |
340 | 340 | // Get filename from database |
341 | 341 | $data = DB::queryFirstRow( |
342 | 342 | 'SELECT valeur |
343 | - FROM ' . prefixTable('misc') . ' |
|
343 | + FROM ' . prefixTable('misc').' |
|
344 | 344 | WHERE increment_id = %i', |
345 | 345 | $post_backupFile |
346 | 346 | ); |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | $post_backupFile = safeString($data['valeur']); |
368 | 368 | |
369 | 369 | // Verify file exists |
370 | - if (!file_exists($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile)) { |
|
370 | + if (!file_exists($SETTINGS['path_to_files_folder'].'/'.$post_backupFile)) { |
|
371 | 371 | echo prepareExchangedData( |
372 | 372 | array( |
373 | 373 | 'error' => true, |
@@ -384,8 +384,8 @@ discard block |
||
384 | 384 | // Decrypt the file |
385 | 385 | $ret = prepareFileWithDefuse( |
386 | 386 | 'decrypt', |
387 | - $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, |
|
388 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile, |
|
387 | + $SETTINGS['path_to_files_folder'].'/'.$post_backupFile, |
|
388 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile, |
|
389 | 389 | $post_key |
390 | 390 | ); |
391 | 391 | |
@@ -402,8 +402,8 @@ discard block |
||
402 | 402 | } |
403 | 403 | |
404 | 404 | // Do clean |
405 | - fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS); |
|
406 | - $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile; |
|
405 | + fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS); |
|
406 | + $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile; |
|
407 | 407 | } else { |
408 | 408 | echo prepareExchangedData( |
409 | 409 | array( |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | DB::query($query); |
488 | 488 | $executedQueries++; |
489 | 489 | } catch (Exception $e) { |
490 | - $errors[] = "Error executing query: " . $e->getMessage() . " - Query: " . substr($query, 0, 100) . "..."; |
|
490 | + $errors[] = "Error executing query: ".$e->getMessage()." - Query: ".substr($query, 0, 100)."..."; |
|
491 | 491 | } |
492 | 492 | $query = ''; |
493 | 493 | } |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | } |
514 | 514 | // Rollback transaction on any exception |
515 | 515 | DB::rollback(); |
516 | - $errors[] = "Transaction failed: " . $e->getMessage(); |
|
516 | + $errors[] = "Transaction failed: ".$e->getMessage(); |
|
517 | 517 | } |
518 | 518 | |
519 | 519 | // Calculate the new offset |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | echo prepareExchangedData( |
529 | 529 | array( |
530 | 530 | 'error' => true, |
531 | - 'message' => 'Errors occurred during import: ' . implode('; ', $errors), |
|
531 | + 'message' => 'Errors occurred during import: '.implode('; ', $errors), |
|
532 | 532 | 'newOffset' => $newOffset, |
533 | 533 | 'totalSize' => $post_totalSize, |
534 | 534 | 'clearFilename' => $post_backupFile, |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | ) { |
80 | 80 | // Not allowed page |
81 | 81 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
82 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
82 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
83 | 83 | exit; |
84 | 84 | } |
85 | 85 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | date_default_timezone_set('UTC'); |
105 | 105 | } |
106 | 106 | |
107 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
107 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
108 | 108 | header('Content-type: text/html; charset=utf-8'); |
109 | 109 | header('Cache-Control: no-cache, must-revalidate'); |
110 | 110 | |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | // About special settings |
366 | 366 | $dataFolderSettings = DB::queryFirstRow( |
367 | 367 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
368 | - FROM ' . prefixTable('nested_tree') . ' |
|
368 | + FROM ' . prefixTable('nested_tree').' |
|
369 | 369 | WHERE id = %i', |
370 | 370 | $inputData['folderId'] |
371 | 371 | ); |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | // Get folder complexity |
383 | 383 | $folderComplexity = DB::queryFirstRow( |
384 | 384 | 'SELECT valeur |
385 | - FROM ' . prefixTable('misc') . ' |
|
385 | + FROM ' . prefixTable('misc').' |
|
386 | 386 | WHERE type = %s AND intitule = %i', |
387 | 387 | 'complex', |
388 | 388 | $inputData['folderId'] |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | $itemExists = 0; |
408 | 408 | $newID = ''; |
409 | 409 | $data = DB::queryFirstRow( |
410 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
410 | + 'SELECT * FROM '.prefixTable('items').' |
|
411 | 411 | WHERE label = %s AND inactif = %i', |
412 | 412 | $inputData['label'], |
413 | 413 | 0 |
@@ -488,8 +488,8 @@ discard block |
||
488 | 488 | (int) $post_folder_is_personal, |
489 | 489 | (int) $newID, |
490 | 490 | $cryptedStuff['objectKey'], |
491 | - true, // only for the item creator |
|
492 | - false, // no delete all |
|
491 | + true, // only for the item creator |
|
492 | + false, // no delete all |
|
493 | 493 | ); |
494 | 494 | |
495 | 495 | // update fields |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | // should we encrypt the data |
503 | 503 | $dataTmp = DB::queryFirstRow( |
504 | 504 | 'SELECT encrypted_data |
505 | - FROM ' . prefixTable('categories') . ' |
|
505 | + FROM ' . prefixTable('categories').' |
|
506 | 506 | WHERE id = %i', |
507 | 507 | $field['id'] |
508 | 508 | ); |
@@ -531,8 +531,8 @@ discard block |
||
531 | 531 | (int) $post_folder_is_personal, |
532 | 532 | (int) $newObjectId, |
533 | 533 | $cryptedStuff['objectKey'], |
534 | - true, // only for the item creator |
|
535 | - false, // no delete all |
|
534 | + true, // only for the item creator |
|
535 | + false, // no delete all |
|
536 | 536 | ); |
537 | 537 | |
538 | 538 | array_push( |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | ) { |
569 | 569 | DB::queryFirstRow( |
570 | 570 | 'SELECT * |
571 | - FROM ' . prefixTable('templates') . ' |
|
571 | + FROM ' . prefixTable('templates').' |
|
572 | 572 | WHERE item_id = %i', |
573 | 573 | $newID |
574 | 574 | ); |
@@ -637,11 +637,11 @@ discard block |
||
637 | 637 | ) { |
638 | 638 | foreach ($post_restricted_to as $userRest) { |
639 | 639 | if (empty($userRest) === false) { |
640 | - $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
640 | + $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
641 | 641 | if (empty($listOfRestricted)) { |
642 | 642 | $listOfRestricted = $dataTmp['login']; |
643 | 643 | } else { |
644 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
644 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
645 | 645 | } |
646 | 646 | } |
647 | 647 | } |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | if (empty($userRest) === false) { |
658 | 658 | $dataTmp = DB::queryFirstRow( |
659 | 659 | 'SELECT login |
660 | - FROM ' . prefixTable('users') . ' |
|
660 | + FROM ' . prefixTable('users').' |
|
661 | 661 | WHERE id= %i', |
662 | 662 | $userRest |
663 | 663 | ); |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | if (empty($oldRestrictionList) === true) { |
666 | 666 | $oldRestrictionList = $dataTmp['login']; |
667 | 667 | } else { |
668 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
668 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
669 | 669 | } |
670 | 670 | } |
671 | 671 | } |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | if (empty($post_uploaded_file_id) === false) { |
729 | 729 | $rows = DB::query( |
730 | 730 | 'SELECT id |
731 | - FROM ' . prefixTable('files') . ' |
|
731 | + FROM ' . prefixTable('files').' |
|
732 | 732 | WHERE id_item = %s', |
733 | 733 | $post_uploaded_file_id |
734 | 734 | ); |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | $lang->get('email_subject_item_updated'), |
785 | 785 | str_replace( |
786 | 786 | array('#label', '#link'), |
787 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']), |
|
787 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']), |
|
788 | 788 | $lang->get('new_item_email_body') |
789 | 789 | ), |
790 | 790 | $emailAddress, |
@@ -888,11 +888,11 @@ discard block |
||
888 | 888 | // Prepare variables |
889 | 889 | $itemInfos = array(); |
890 | 890 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
891 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
891 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
892 | 892 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
893 | 893 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
894 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
895 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
894 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
895 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
896 | 896 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
897 | 897 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
898 | 898 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -923,8 +923,7 @@ discard block |
||
923 | 923 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
924 | 924 | $dataReceived['to_be_deleted_after_date'], |
925 | 925 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
926 | - ) : |
|
927 | - ''; |
|
926 | + ) : ''; |
|
928 | 927 | $post_fields = (filter_var_array( |
929 | 928 | $dataReceived['fields'], |
930 | 929 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -984,7 +983,7 @@ discard block |
||
984 | 983 | // About special settings |
985 | 984 | $dataFolderSettings = DB::queryFirstRow( |
986 | 985 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
987 | - FROM ' . prefixTable('nested_tree') . ' |
|
986 | + FROM ' . prefixTable('nested_tree').' |
|
988 | 987 | WHERE id = %i', |
989 | 988 | $inputData['folderId'] |
990 | 989 | ); |
@@ -1000,7 +999,7 @@ discard block |
||
1000 | 999 | // Get folder complexity |
1001 | 1000 | $folderComplexity = DB::queryFirstRow( |
1002 | 1001 | 'SELECT valeur |
1003 | - FROM ' . prefixTable('misc') . ' |
|
1002 | + FROM ' . prefixTable('misc').' |
|
1004 | 1003 | WHERE type = %s AND intitule = %i', |
1005 | 1004 | 'complex', |
1006 | 1005 | $inputData['folderId'] |
@@ -1045,8 +1044,8 @@ discard block |
||
1045 | 1044 | // Get all informations for this item |
1046 | 1045 | $dataItem = DB::queryFirstRow( |
1047 | 1046 | 'SELECT * |
1048 | - FROM ' . prefixTable('items') . ' as i |
|
1049 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
1047 | + FROM ' . prefixTable('items').' as i |
|
1048 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
1050 | 1049 | WHERE i.id=%i AND l.action = %s', |
1051 | 1050 | $inputData['itemId'], |
1052 | 1051 | 'at_creation' |
@@ -1088,7 +1087,7 @@ discard block |
||
1088 | 1087 | // Does the user has the sharekey for this item? |
1089 | 1088 | DB::query( |
1090 | 1089 | 'SELECT * |
1091 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1090 | + FROM ' . prefixTable('sharekeys_items').' |
|
1092 | 1091 | WHERE object_id = %i AND user_id = %s', |
1093 | 1092 | $inputData['itemId'], |
1094 | 1093 | $session->get('user-id') |
@@ -1149,9 +1148,9 @@ discard block |
||
1149 | 1148 | 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, |
1150 | 1149 | i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification, |
1151 | 1150 | u.login as user_login, u.email as user_email |
1152 | - FROM ' . prefixTable('items') . ' as i |
|
1153 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
1154 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
1151 | + FROM ' . prefixTable('items').' as i |
|
1152 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
1153 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
1155 | 1154 | WHERE i.id=%i', |
1156 | 1155 | $inputData['itemId'] |
1157 | 1156 | ); |
@@ -1159,7 +1158,7 @@ discard block |
||
1159 | 1158 | // Should we log a password change? |
1160 | 1159 | $userKey = DB::queryFirstRow( |
1161 | 1160 | 'SELECT share_key |
1162 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1161 | + FROM ' . prefixTable('sharekeys_items').' |
|
1163 | 1162 | WHERE user_id = %i AND object_id = %i', |
1164 | 1163 | $session->get('user-id'), |
1165 | 1164 | $inputData['itemId'] |
@@ -1223,12 +1222,12 @@ discard block |
||
1223 | 1222 | (int) $post_folder_is_personal, |
1224 | 1223 | (int) $inputData['itemId'], |
1225 | 1224 | $encrypted_password_key, |
1226 | - true, // only for the item creator |
|
1227 | - true, // delete all |
|
1225 | + true, // only for the item creator |
|
1226 | + true, // delete all |
|
1228 | 1227 | ); |
1229 | 1228 | |
1230 | 1229 | // Create a task to create sharekeys for users |
1231 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
1230 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
1232 | 1231 | $tasksToBePerformed = ['item_password']; |
1233 | 1232 | $encryptionTaskIsRequested = true; |
1234 | 1233 | } else { |
@@ -1239,7 +1238,7 @@ discard block |
||
1239 | 1238 | // Get list of tags |
1240 | 1239 | $itemTags = DB::queryFirstColumn( |
1241 | 1240 | 'SELECT tag |
1242 | - FROM ' . prefixTable('tags') . ' |
|
1241 | + FROM ' . prefixTable('tags').' |
|
1243 | 1242 | WHERE item_id = %i', |
1244 | 1243 | $inputData['itemId'] |
1245 | 1244 | ); |
@@ -1285,7 +1284,7 @@ discard block |
||
1285 | 1284 | $session->get('user-id'), |
1286 | 1285 | 'at_modification', |
1287 | 1286 | $session->get('user-login'), |
1288 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
1287 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
1289 | 1288 | ); |
1290 | 1289 | } |
1291 | 1290 | |
@@ -1330,8 +1329,8 @@ discard block |
||
1330 | 1329 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
1331 | 1330 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
1332 | 1331 | c.masked AS masked, i.id AS field_item_id |
1333 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
1334 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
1332 | + FROM ' . prefixTable('categories_items').' AS i |
|
1333 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
1335 | 1334 | WHERE i.field_id = %i AND i.item_id = %i', |
1336 | 1335 | $field['id'], |
1337 | 1336 | $inputData['itemId'] |
@@ -1347,7 +1346,7 @@ discard block |
||
1347 | 1346 | // Perform new query |
1348 | 1347 | $dataTmpCat = DB::queryFirstRow( |
1349 | 1348 | 'SELECT id, title, encrypted_data, masked |
1350 | - FROM ' . prefixTable('categories') . ' |
|
1349 | + FROM ' . prefixTable('categories').' |
|
1351 | 1350 | WHERE id = %i', |
1352 | 1351 | $field['id'] |
1353 | 1352 | ); |
@@ -1377,8 +1376,8 @@ discard block |
||
1377 | 1376 | (int) $post_folder_is_personal, |
1378 | 1377 | (int) $newId, |
1379 | 1378 | $cryptedStuff['objectKey'], |
1380 | - true, // only for the item creator |
|
1381 | - true, // delete all |
|
1379 | + true, // only for the item creator |
|
1380 | + true, // delete all |
|
1382 | 1381 | ); |
1383 | 1382 | |
1384 | 1383 | // update value |
@@ -1428,7 +1427,7 @@ discard block |
||
1428 | 1427 | $session->get('user-id'), |
1429 | 1428 | 'at_modification', |
1430 | 1429 | $session->get('user-login'), |
1431 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
1430 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
1432 | 1431 | ); |
1433 | 1432 | } else { |
1434 | 1433 | // Case where the field already exists |
@@ -1437,7 +1436,7 @@ discard block |
||
1437 | 1436 | // Get user sharekey for this field |
1438 | 1437 | $userKey = DB::queryFirstRow( |
1439 | 1438 | 'SELECT share_key |
1440 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
1439 | + FROM ' . prefixTable('sharekeys_fields').' |
|
1441 | 1440 | WHERE user_id = %i AND object_id = %i', |
1442 | 1441 | $session->get('user-id'), |
1443 | 1442 | $dataTmpCat['field_item_id'] |
@@ -1476,8 +1475,8 @@ discard block |
||
1476 | 1475 | (int) $post_folder_is_personal, |
1477 | 1476 | (int) $dataTmpCat['field_item_id'], |
1478 | 1477 | $cryptedStuff['objectKey'], |
1479 | - true, // only for the item creator |
|
1480 | - true, // delete all |
|
1478 | + true, // only for the item creator |
|
1479 | + true, // delete all |
|
1481 | 1480 | ); |
1482 | 1481 | |
1483 | 1482 | if ($encryptedFieldIsChanged === false) { |
@@ -1519,7 +1518,7 @@ discard block |
||
1519 | 1518 | $session->get('user-id'), |
1520 | 1519 | 'at_modification', |
1521 | 1520 | $session->get('user-login'), |
1522 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
1521 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
1523 | 1522 | ); |
1524 | 1523 | } |
1525 | 1524 | } |
@@ -1573,7 +1572,7 @@ discard block |
||
1573 | 1572 | ) { |
1574 | 1573 | DB::queryFirstRow( |
1575 | 1574 | 'SELECT * |
1576 | - FROM ' . prefixTable('templates') . ' |
|
1575 | + FROM ' . prefixTable('templates').' |
|
1577 | 1576 | WHERE item_id = %i', |
1578 | 1577 | $inputData['itemId'] |
1579 | 1578 | ); |
@@ -1616,7 +1615,7 @@ discard block |
||
1616 | 1615 | // check if elem exists in Table. If not add it or update it. |
1617 | 1616 | DB::query( |
1618 | 1617 | 'SELECT * |
1619 | - FROM ' . prefixTable('automatic_del') . ' |
|
1618 | + FROM ' . prefixTable('automatic_del').' |
|
1620 | 1619 | WHERE item_id = %i', |
1621 | 1620 | $inputData['itemId'] |
1622 | 1621 | ); |
@@ -1643,7 +1642,7 @@ discard block |
||
1643 | 1642 | // Store updates performed |
1644 | 1643 | array_push( |
1645 | 1644 | $arrayOfChanges, |
1646 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
1645 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
1647 | 1646 | ); |
1648 | 1647 | |
1649 | 1648 | // update LOG |
@@ -1686,7 +1685,7 @@ discard block |
||
1686 | 1685 | // Store updates performed |
1687 | 1686 | array_push( |
1688 | 1687 | $arrayOfChanges, |
1689 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
1688 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
1690 | 1689 | ); |
1691 | 1690 | |
1692 | 1691 | // update LOG |
@@ -1714,7 +1713,7 @@ discard block |
||
1714 | 1713 | if (empty($userId) === false) { |
1715 | 1714 | $dataTmp = DB::queryFirstRow( |
1716 | 1715 | 'SELECT id, name, lastname |
1717 | - FROM ' . prefixTable('users') . ' |
|
1716 | + FROM ' . prefixTable('users').' |
|
1718 | 1717 | WHERE id= %i', |
1719 | 1718 | $userId |
1720 | 1719 | ); |
@@ -1722,7 +1721,7 @@ discard block |
||
1722 | 1721 | // Add to array |
1723 | 1722 | array_push( |
1724 | 1723 | $arrayOfUsersRestriction, |
1725 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
1724 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
1726 | 1725 | ); |
1727 | 1726 | array_push( |
1728 | 1727 | $arrayOfUsersIdRestriction, |
@@ -1753,8 +1752,8 @@ discard block |
||
1753 | 1752 | // get values before deleting them |
1754 | 1753 | $rows = DB::query( |
1755 | 1754 | 'SELECT t.title, t.id AS id |
1756 | - FROM ' . prefixTable('roles_title') . ' as t |
|
1757 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
1755 | + FROM ' . prefixTable('roles_title').' as t |
|
1756 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
1758 | 1757 | WHERE r.item_id = %i |
1759 | 1758 | ORDER BY t.title ASC', |
1760 | 1759 | $inputData['itemId'] |
@@ -1788,7 +1787,7 @@ discard block |
||
1788 | 1787 | ); |
1789 | 1788 | $dataTmp = DB::queryFirstRow( |
1790 | 1789 | 'SELECT title |
1791 | - FROM ' . prefixTable('roles_title') . ' |
|
1790 | + FROM ' . prefixTable('roles_title').' |
|
1792 | 1791 | WHERE id = %i', |
1793 | 1792 | $role |
1794 | 1793 | ); |
@@ -1816,7 +1815,7 @@ discard block |
||
1816 | 1815 | // Get current status |
1817 | 1816 | $otpStatus = DB::queryFirstRow( |
1818 | 1817 | 'SELECT enabled as otp_is_enabled, phone_number, secret |
1819 | - FROM ' . prefixTable('items_otp') . ' |
|
1818 | + FROM ' . prefixTable('items_otp').' |
|
1820 | 1819 | WHERE item_id = %i', |
1821 | 1820 | $inputData['itemId'] |
1822 | 1821 | ); |
@@ -1830,7 +1829,7 @@ discard block |
||
1830 | 1829 | 'decrypt' |
1831 | 1830 | )['string']; |
1832 | 1831 | } else { |
1833 | - $currentsecret=''; |
|
1832 | + $currentsecret = ''; |
|
1834 | 1833 | } |
1835 | 1834 | |
1836 | 1835 | // If OTP secret provided then encrypt it |
@@ -1880,7 +1879,7 @@ discard block |
||
1880 | 1879 | $session->get('user-id'), |
1881 | 1880 | 'at_modification', |
1882 | 1881 | $session->get('user-login'), |
1883 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
1882 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
1884 | 1883 | ); |
1885 | 1884 | } |
1886 | 1885 | if ($otpStatus['phone_number'] !== $post_otp_phone_number) { |
@@ -1891,7 +1890,7 @@ discard block |
||
1891 | 1890 | $session->get('user-id'), |
1892 | 1891 | 'at_modification', |
1893 | 1892 | $session->get('user-login'), |
1894 | - 'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number |
|
1893 | + 'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number |
|
1895 | 1894 | ); |
1896 | 1895 | } |
1897 | 1896 | if ($currentsecret !== $post_otp_secret) { |
@@ -1940,8 +1939,8 @@ discard block |
||
1940 | 1939 | $session->get('user-id'), |
1941 | 1940 | 'at_modification', |
1942 | 1941 | $session->get('user-login'), |
1943 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
1944 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1942 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
1943 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1945 | 1944 | ); |
1946 | 1945 | } |
1947 | 1946 | |
@@ -1961,7 +1960,7 @@ discard block |
||
1961 | 1960 | $session->get('user-id'), |
1962 | 1961 | 'at_modification', |
1963 | 1962 | $session->get('user-login'), |
1964 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
1963 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
1965 | 1964 | ); |
1966 | 1965 | } |
1967 | 1966 | // LOGIN |
@@ -1980,7 +1979,7 @@ discard block |
||
1980 | 1979 | $session->get('user-id'), |
1981 | 1980 | 'at_modification', |
1982 | 1981 | $session->get('user-login'), |
1983 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
1982 | + 'at_login : '.$data['login'].' => '.$post_login |
|
1984 | 1983 | ); |
1985 | 1984 | } |
1986 | 1985 | |
@@ -1999,7 +1998,7 @@ discard block |
||
1999 | 1998 | $session->get('user-id'), |
2000 | 1999 | 'at_modification', |
2001 | 2000 | $session->get('user-login'), |
2002 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
2001 | + 'at_email : '.$data['email'].' => '.$post_email |
|
2003 | 2002 | ); |
2004 | 2003 | } |
2005 | 2004 | // URL |
@@ -2018,7 +2017,7 @@ discard block |
||
2018 | 2017 | $session->get('user-id'), |
2019 | 2018 | 'at_modification', |
2020 | 2019 | $session->get('user-login'), |
2021 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
2020 | + 'at_url : '.$data['url'].' => '.$post_url |
|
2022 | 2021 | ); |
2023 | 2022 | } |
2024 | 2023 | // DESCRIPTION |
@@ -2044,7 +2043,7 @@ discard block |
||
2044 | 2043 | // FOLDER |
2045 | 2044 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
2046 | 2045 | // Get name of folders |
2047 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
2046 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
2048 | 2047 | |
2049 | 2048 | // Store updates performed |
2050 | 2049 | array_push( |
@@ -2060,7 +2059,7 @@ discard block |
||
2060 | 2059 | $session->get('user-id'), |
2061 | 2060 | 'at_modification', |
2062 | 2061 | $session->get('user-login'), |
2063 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
2062 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
2064 | 2063 | ); |
2065 | 2064 | } |
2066 | 2065 | // ANYONE_CAN_MODIFY |
@@ -2068,7 +2067,7 @@ discard block |
||
2068 | 2067 | // Store updates performed |
2069 | 2068 | array_push( |
2070 | 2069 | $arrayOfChanges, |
2071 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
2070 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
2072 | 2071 | ); |
2073 | 2072 | |
2074 | 2073 | // Log |
@@ -2079,15 +2078,15 @@ discard block |
||
2079 | 2078 | $session->get('user-id'), |
2080 | 2079 | 'at_modification', |
2081 | 2080 | $session->get('user-login'), |
2082 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
2081 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
2083 | 2082 | ); |
2084 | 2083 | } |
2085 | 2084 | |
2086 | 2085 | // Reload new values |
2087 | 2086 | $dataItem = DB::queryFirstRow( |
2088 | 2087 | 'SELECT * |
2089 | - FROM ' . prefixTable('items') . ' as i |
|
2090 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2088 | + FROM ' . prefixTable('items').' as i |
|
2089 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2091 | 2090 | WHERE i.id = %i AND l.action = %s', |
2092 | 2091 | $inputData['itemId'], |
2093 | 2092 | 'at_creation' |
@@ -2096,8 +2095,8 @@ discard block |
||
2096 | 2095 | $history = ''; |
2097 | 2096 | $rows = DB::query( |
2098 | 2097 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
2099 | - FROM ' . prefixTable('log_items') . ' as l |
|
2100 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
2098 | + FROM ' . prefixTable('log_items').' as l |
|
2099 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
2101 | 2100 | WHERE l.action <> %s AND id_item=%s', |
2102 | 2101 | 'at_shown', |
2103 | 2102 | $inputData['itemId'] |
@@ -2106,14 +2105,14 @@ discard block |
||
2106 | 2105 | if ($record['raison'] === NULL) continue; |
2107 | 2106 | $reason = explode(':', $record['raison']); |
2108 | 2107 | if (count($reason) > 0) { |
2109 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
2110 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
2111 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
2108 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
2109 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
2110 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
2112 | 2111 | : $lang->get(trim($reason[0]))) : ''); |
2113 | 2112 | if (empty($history)) { |
2114 | 2113 | $history = $sentence; |
2115 | 2114 | } else { |
2116 | - $history .= '<br />' . $sentence; |
|
2115 | + $history .= '<br />'.$sentence; |
|
2117 | 2116 | } |
2118 | 2117 | } |
2119 | 2118 | } |
@@ -2251,7 +2250,7 @@ discard block |
||
2251 | 2250 | ) { |
2252 | 2251 | // load the original record into an array |
2253 | 2252 | $originalRecord = DB::queryFirstRow( |
2254 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
2253 | + 'SELECT * FROM '.prefixTable('items').' |
|
2255 | 2254 | WHERE id = %i', |
2256 | 2255 | $inputData['itemId'] |
2257 | 2256 | ); |
@@ -2270,7 +2269,7 @@ discard block |
||
2270 | 2269 | |
2271 | 2270 | // Load the destination folder record into an array |
2272 | 2271 | $dataDestination = DB::queryFirstRow( |
2273 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
2272 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
2274 | 2273 | WHERE id = %i', |
2275 | 2274 | $post_dest_id |
2276 | 2275 | ); |
@@ -2278,7 +2277,7 @@ discard block |
||
2278 | 2277 | // Get the ITEM object key for the user |
2279 | 2278 | $userKey = DB::queryFirstRow( |
2280 | 2279 | 'SELECT share_key |
2281 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2280 | + FROM ' . prefixTable('sharekeys_items').' |
|
2282 | 2281 | WHERE user_id = %i AND object_id = %i', |
2283 | 2282 | $session->get('user-id'), |
2284 | 2283 | $inputData['itemId'] |
@@ -2355,8 +2354,8 @@ discard block |
||
2355 | 2354 | // Manage Custom Fields |
2356 | 2355 | $rows = DB::query( |
2357 | 2356 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
2358 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
2359 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
2357 | + FROM ' . prefixTable('categories_items').' AS ci |
|
2358 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
2360 | 2359 | WHERE ci.item_id = %i', |
2361 | 2360 | $inputData['itemId'] |
2362 | 2361 | ); |
@@ -2368,7 +2367,7 @@ discard block |
||
2368 | 2367 | // Get user key |
2369 | 2368 | $userKey = DB::queryFirstRow( |
2370 | 2369 | 'SELECT share_key |
2371 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2370 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2372 | 2371 | WHERE user_id = %i AND object_id = %i', |
2373 | 2372 | $session->get('user-id'), |
2374 | 2373 | $field['id'] |
@@ -2435,15 +2434,15 @@ discard block |
||
2435 | 2434 | $rows = DB::query( |
2436 | 2435 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
2437 | 2436 | f.size AS size, f.type AS type, s.share_key AS share_key |
2438 | - FROM ' . prefixTable('files') . ' AS f |
|
2439 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
2437 | + FROM ' . prefixTable('files').' AS f |
|
2438 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
2440 | 2439 | WHERE s.user_id = %i AND f.id_item = %i', |
2441 | 2440 | $session->get('user-id'), |
2442 | 2441 | $inputData['itemId'] |
2443 | 2442 | ); |
2444 | 2443 | foreach ($rows as $record) { |
2445 | 2444 | // Check if file still exists |
2446 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
2445 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
2447 | 2446 | // Step1 - decrypt the file |
2448 | 2447 | // deepcode ignore PT: path is sanitized inside decryptFile() |
2449 | 2448 | $fileContent = decryptFile( |
@@ -2454,8 +2453,8 @@ discard block |
||
2454 | 2453 | |
2455 | 2454 | // Step2 - create file |
2456 | 2455 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
2457 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
2458 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
2456 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
2457 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
2459 | 2458 | if ($outstream === false) { |
2460 | 2459 | echo prepareExchangedData( |
2461 | 2460 | array( |
@@ -2528,7 +2527,7 @@ discard block |
||
2528 | 2527 | |
2529 | 2528 | // ------------------------- |
2530 | 2529 | // Add specific restrictions |
2531 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2530 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
2532 | 2531 | foreach ($rows as $record) { |
2533 | 2532 | DB::insert( |
2534 | 2533 | prefixTable('restriction_to_roles'), |
@@ -2540,7 +2539,7 @@ discard block |
||
2540 | 2539 | } |
2541 | 2540 | |
2542 | 2541 | // Add Tags |
2543 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2542 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
2544 | 2543 | foreach ($rows as $record) { |
2545 | 2544 | DB::insert( |
2546 | 2545 | prefixTable('tags'), |
@@ -2642,7 +2641,7 @@ discard block |
||
2642 | 2641 | // then we can show it |
2643 | 2642 | $item_deleted = DB::queryFirstRow( |
2644 | 2643 | 'SELECT * |
2645 | - FROM ' . prefixTable('log_items') . ' |
|
2644 | + FROM ' . prefixTable('log_items').' |
|
2646 | 2645 | WHERE id_item = %i AND action = %s |
2647 | 2646 | ORDER BY date DESC |
2648 | 2647 | LIMIT 0, 1', |
@@ -2653,7 +2652,7 @@ discard block |
||
2653 | 2652 | |
2654 | 2653 | $item_restored = DB::queryFirstRow( |
2655 | 2654 | 'SELECT * |
2656 | - FROM ' . prefixTable('log_items') . ' |
|
2655 | + FROM ' . prefixTable('log_items').' |
|
2657 | 2656 | WHERE id_item = %i AND action = %s |
2658 | 2657 | ORDER BY date DESC |
2659 | 2658 | LIMIT 0, 1', |
@@ -2677,8 +2676,8 @@ discard block |
||
2677 | 2676 | // Get all informations for this item |
2678 | 2677 | $dataItem = DB::queryFirstRow( |
2679 | 2678 | 'SELECT * |
2680 | - FROM ' . prefixTable('items') . ' as i |
|
2681 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2679 | + FROM ' . prefixTable('items').' as i |
|
2680 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2682 | 2681 | WHERE i.id = %i AND l.action = %s', |
2683 | 2682 | $inputData['id'], |
2684 | 2683 | 'at_creation' |
@@ -2687,7 +2686,7 @@ discard block |
||
2687 | 2686 | // Notification |
2688 | 2687 | DB::queryFirstRow( |
2689 | 2688 | 'SELECT * |
2690 | - FROM ' . prefixTable('notification') . ' |
|
2689 | + FROM ' . prefixTable('notification').' |
|
2691 | 2690 | WHERE item_id = %i AND user_id = %i', |
2692 | 2691 | $inputData['id'], |
2693 | 2692 | $session->get('user-id') |
@@ -2706,7 +2705,7 @@ discard block |
||
2706 | 2705 | |
2707 | 2706 | // manage case of API user |
2708 | 2707 | if ($dataItem['id_user'] === API_USER_ID) { |
2709 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
2708 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
2710 | 2709 | $arrData['id_user'] = API_USER_ID; |
2711 | 2710 | $arrData['author_email'] = ''; |
2712 | 2711 | $arrData['notification_status'] = false; |
@@ -2716,7 +2715,7 @@ discard block |
||
2716 | 2715 | $tags = array(); |
2717 | 2716 | $rows = DB::query( |
2718 | 2717 | 'SELECT tag |
2719 | - FROM ' . prefixTable('tags') . ' |
|
2718 | + FROM ' . prefixTable('tags').' |
|
2720 | 2719 | WHERE item_id = %i', |
2721 | 2720 | $inputData['id'] |
2722 | 2721 | ); |
@@ -2740,7 +2739,7 @@ discard block |
||
2740 | 2739 | // Check if user has a role that is accepted |
2741 | 2740 | $rows_tmp = DB::query( |
2742 | 2741 | 'SELECT role_id |
2743 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
2742 | + FROM ' . prefixTable('restriction_to_roles').' |
|
2744 | 2743 | WHERE item_id=%i', |
2745 | 2744 | $inputData['id'] |
2746 | 2745 | ); |
@@ -2754,7 +2753,7 @@ discard block |
||
2754 | 2753 | // Get the object key for the user |
2755 | 2754 | $userKeys = DB::query( |
2756 | 2755 | 'SELECT share_key |
2757 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2756 | + FROM ' . prefixTable('sharekeys_items').' |
|
2758 | 2757 | WHERE user_id = %i AND object_id = %i', |
2759 | 2758 | $session->get('user-id'), |
2760 | 2759 | $inputData['id'] |
@@ -2863,8 +2862,8 @@ discard block |
||
2863 | 2862 | // Add restriction if item is restricted to roles |
2864 | 2863 | $rows = DB::query( |
2865 | 2864 | 'SELECT t.title, t.id |
2866 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
2867 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
2865 | + FROM ' . prefixTable('roles_title').' AS t |
|
2866 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
2868 | 2867 | WHERE r.item_id = %i |
2869 | 2868 | ORDER BY t.title ASC', |
2870 | 2869 | $inputData['id'] |
@@ -2880,8 +2879,8 @@ discard block |
||
2880 | 2879 | $tmp = array(); |
2881 | 2880 | $rows = DB::query( |
2882 | 2881 | 'SELECT k.label, k.id |
2883 | - FROM ' . prefixTable('kb_items') . ' as i |
|
2884 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
2882 | + FROM ' . prefixTable('kb_items').' as i |
|
2883 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
2885 | 2884 | WHERE i.item_id = %i |
2886 | 2885 | ORDER BY k.label ASC', |
2887 | 2886 | $inputData['id'] |
@@ -2964,7 +2963,7 @@ discard block |
||
2964 | 2963 | $arrCatList = array(); |
2965 | 2964 | $rows_tmp = DB::query( |
2966 | 2965 | 'SELECT id_category |
2967 | - FROM ' . prefixTable('categories_folders') . ' |
|
2966 | + FROM ' . prefixTable('categories_folders').' |
|
2968 | 2967 | WHERE id_folder=%i', |
2969 | 2968 | $inputData['folderId'] |
2970 | 2969 | ); |
@@ -2979,8 +2978,8 @@ discard block |
||
2979 | 2978 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
2980 | 2979 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
2981 | 2980 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
2982 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
2983 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
2981 | + FROM ' . prefixTable('categories_items').' AS i |
|
2982 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
2984 | 2983 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
2985 | 2984 | $inputData['id'], |
2986 | 2985 | $arrCatList |
@@ -2991,7 +2990,7 @@ discard block |
||
2991 | 2990 | //db::debugmode(true); |
2992 | 2991 | $userKey = DB::queryFirstRow( |
2993 | 2992 | 'SELECT share_key |
2994 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2993 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2995 | 2994 | WHERE user_id = %i AND object_id = %i', |
2996 | 2995 | $session->get('user-id'), |
2997 | 2996 | $row['id'] |
@@ -3009,7 +3008,7 @@ discard block |
||
3009 | 3008 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
3010 | 3009 | // Data is not encrypted in DB |
3011 | 3010 | $fieldText = [ |
3012 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
3011 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
3013 | 3012 | 'encrypted' => false, |
3014 | 3013 | 'error' => false, |
3015 | 3014 | ]; |
@@ -3054,7 +3053,7 @@ discard block |
||
3054 | 3053 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
3055 | 3054 | $rows_tmp = DB::queryFirstRow( |
3056 | 3055 | 'SELECT category_id |
3057 | - FROM ' . prefixTable('templates') . ' |
|
3056 | + FROM ' . prefixTable('templates').' |
|
3058 | 3057 | WHERE item_id = %i', |
3059 | 3058 | $inputData['id'] |
3060 | 3059 | ); |
@@ -3071,7 +3070,7 @@ discard block |
||
3071 | 3070 | // Evaluate if item is ready for all users |
3072 | 3071 | $rows_tmp = DB::queryFirstRow( |
3073 | 3072 | 'SELECT finished_at |
3074 | - FROM ' . prefixTable('background_tasks') . ' |
|
3073 | + FROM ' . prefixTable('background_tasks').' |
|
3075 | 3074 | WHERE item_id = %i', |
3076 | 3075 | $inputData['id'] |
3077 | 3076 | ); |
@@ -3088,7 +3087,7 @@ discard block |
||
3088 | 3087 | // Is the Item to be deleted? |
3089 | 3088 | $dataDelete = DB::queryFirstRow( |
3090 | 3089 | 'SELECT * |
3091 | - FROM ' . prefixTable('automatic_del') . ' |
|
3090 | + FROM ' . prefixTable('automatic_del').' |
|
3092 | 3091 | WHERE item_id = %i', |
3093 | 3092 | $inputData['id'] |
3094 | 3093 | ); |
@@ -3169,14 +3168,14 @@ discard block |
||
3169 | 3168 | if (empty($userRest) === false) { |
3170 | 3169 | $dataTmp = DB::queryFirstRow( |
3171 | 3170 | 'SELECT login |
3172 | - FROM ' . prefixTable('users') . ' |
|
3171 | + FROM ' . prefixTable('users').' |
|
3173 | 3172 | WHERE id= %i', |
3174 | 3173 | $userRest |
3175 | 3174 | ); |
3176 | 3175 | if (empty($listOfRestricted)) { |
3177 | 3176 | $listOfRestricted = $dataTmp['login']; |
3178 | 3177 | } else { |
3179 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
3178 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
3180 | 3179 | } |
3181 | 3180 | } |
3182 | 3181 | } |
@@ -3250,9 +3249,9 @@ discard block |
||
3250 | 3249 | // Load item data |
3251 | 3250 | $dataItem = DB::queryFirstRow( |
3252 | 3251 | '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 |
3253 | - FROM ' . prefixTable('items') . ' AS i |
|
3254 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
3255 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
3252 | + FROM ' . prefixTable('items').' AS i |
|
3253 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
3254 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
3256 | 3255 | WHERE i.id = %i', |
3257 | 3256 | $inputData['id'] |
3258 | 3257 | ); |
@@ -3274,7 +3273,7 @@ discard block |
||
3274 | 3273 | // Check if user has a role that is accepted |
3275 | 3274 | $rows_tmp = DB::query( |
3276 | 3275 | 'SELECT role_id |
3277 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3276 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3278 | 3277 | WHERE item_id=%i', |
3279 | 3278 | $inputData['id'] |
3280 | 3279 | ); |
@@ -3306,12 +3305,12 @@ discard block |
||
3306 | 3305 | // launch query |
3307 | 3306 | $rows = DB::query( |
3308 | 3307 | 'SELECT id, name, file, extension, size |
3309 | - FROM ' . prefixTable('files') . ' |
|
3308 | + FROM ' . prefixTable('files').' |
|
3310 | 3309 | WHERE id_item = %i AND confirmed = 1', |
3311 | 3310 | $inputData['id'] |
3312 | 3311 | ); |
3313 | 3312 | foreach ($rows as $record) { |
3314 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
3313 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
3315 | 3314 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
3316 | 3315 | |
3317 | 3316 | array_push( |
@@ -3324,7 +3323,7 @@ discard block |
||
3324 | 3323 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
3325 | 3324 | 'id' => $record['id'], |
3326 | 3325 | 'key' => $session->get('user-key_tmp'), |
3327 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
3326 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
3328 | 3327 | ) |
3329 | 3328 | ); |
3330 | 3329 | } |
@@ -3362,7 +3361,7 @@ discard block |
||
3362 | 3361 | array( |
3363 | 3362 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
3364 | 3363 | ), |
3365 | - 'id=' . $session->get('user-id') |
|
3364 | + 'id='.$session->get('user-id') |
|
3366 | 3365 | ); |
3367 | 3366 | } |
3368 | 3367 | |
@@ -3371,8 +3370,8 @@ discard block |
||
3371 | 3370 | $listOptionsForRoles = array(); |
3372 | 3371 | $rows = DB::query( |
3373 | 3372 | 'SELECT r.role_id AS role_id, t.title AS title |
3374 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
3375 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
3373 | + FROM ' . prefixTable('roles_values').' AS r |
|
3374 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
3376 | 3375 | WHERE r.folder_id = %i', |
3377 | 3376 | $dataItem['id_tree'] |
3378 | 3377 | ); |
@@ -3386,9 +3385,9 @@ discard block |
||
3386 | 3385 | ); |
3387 | 3386 | $rows2 = DB::query( |
3388 | 3387 | 'SELECT id, login, fonction_id, email, name, lastname |
3389 | - FROM ' . prefixTable('users') . ' |
|
3388 | + FROM ' . prefixTable('users').' |
|
3390 | 3389 | WHERE fonction_id LIKE %s', |
3391 | - '%' . $record['role_id'] . '%' |
|
3390 | + '%'.$record['role_id'].'%' |
|
3392 | 3391 | ); |
3393 | 3392 | foreach ($rows2 as $record2) { |
3394 | 3393 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3401,7 +3400,7 @@ discard block |
||
3401 | 3400 | array( |
3402 | 3401 | 'id' => (int) $record2['id'], |
3403 | 3402 | 'login' => $record2['login'], |
3404 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
3403 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
3405 | 3404 | 'email' => $record2['email'], |
3406 | 3405 | ) |
3407 | 3406 | ); |
@@ -3420,16 +3419,16 @@ discard block |
||
3420 | 3419 | $path = ''; |
3421 | 3420 | foreach ($arbo as $elem) { |
3422 | 3421 | if (empty($path) === true) { |
3423 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
3422 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
3424 | 3423 | } else { |
3425 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3424 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3426 | 3425 | } |
3427 | 3426 | } |
3428 | 3427 | // Build text to show user |
3429 | 3428 | if (empty($path) === true) { |
3430 | 3429 | $path = addslashes($dataItem['label']); |
3431 | 3430 | } else { |
3432 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
3431 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
3433 | 3432 | } |
3434 | 3433 | |
3435 | 3434 | // Add Admins to notification list if expected |
@@ -3452,7 +3451,7 @@ discard block |
||
3452 | 3451 | array( |
3453 | 3452 | addslashes($session->get('user-login')), |
3454 | 3453 | $path, |
3455 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
3454 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
3456 | 3455 | ), |
3457 | 3456 | $lang->get('email_on_open_notification_mail') |
3458 | 3457 | ), |
@@ -3462,7 +3461,7 @@ discard block |
||
3462 | 3461 | } |
3463 | 3462 | |
3464 | 3463 | // has this item a change proposal |
3465 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
3464 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
3466 | 3465 | $returnArray['has_change_proposal'] = DB::count(); |
3467 | 3466 | |
3468 | 3467 | // Setting |
@@ -3473,7 +3472,7 @@ discard block |
||
3473 | 3472 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
3474 | 3473 | DB::query( |
3475 | 3474 | 'SELECT * |
3476 | - FROM ' . prefixTable('otv') . ' |
|
3475 | + FROM ' . prefixTable('otv').' |
|
3477 | 3476 | WHERE item_id = %i |
3478 | 3477 | AND time_limit > %i', |
3479 | 3478 | $inputData['id'], |
@@ -3572,7 +3571,7 @@ discard block |
||
3572 | 3571 | // Load item data |
3573 | 3572 | $data = DB::queryFirstRow( |
3574 | 3573 | 'SELECT id_tree, id, label |
3575 | - FROM ' . prefixTable('items') . ' |
|
3574 | + FROM ' . prefixTable('items').' |
|
3576 | 3575 | WHERE id = %i OR item_key = %s', |
3577 | 3576 | $inputData['itemId'], |
3578 | 3577 | $inputData['itemKey'] |
@@ -3663,7 +3662,7 @@ discard block |
||
3663 | 3662 | // Load item data |
3664 | 3663 | $dataItem = DB::queryFirstRow( |
3665 | 3664 | 'SELECT secret, enabled |
3666 | - FROM ' . prefixTable('items_otp') . ' |
|
3665 | + FROM ' . prefixTable('items_otp').' |
|
3667 | 3666 | WHERE item_id = %i', |
3668 | 3667 | $inputData['id'] |
3669 | 3668 | ); |
@@ -3745,13 +3744,13 @@ discard block |
||
3745 | 3744 | |
3746 | 3745 | // Check if user is allowed to access this folder |
3747 | 3746 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
3748 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
3747 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
3749 | 3748 | break; |
3750 | 3749 | } |
3751 | 3750 | |
3752 | 3751 | // Check if title doesn't contains html codes |
3753 | 3752 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
3754 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
3753 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
3755 | 3754 | break; |
3756 | 3755 | } |
3757 | 3756 | // check that title is not numeric |
@@ -3762,9 +3761,9 @@ discard block |
||
3762 | 3761 | |
3763 | 3762 | // Check if duplicate folders name are allowed |
3764 | 3763 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
3765 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
3764 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
3766 | 3765 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
3767 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
3766 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
3768 | 3767 | break; |
3769 | 3768 | } |
3770 | 3769 | } |
@@ -3772,7 +3771,7 @@ discard block |
||
3772 | 3771 | // query on folder |
3773 | 3772 | $data = DB::queryFirstRow( |
3774 | 3773 | 'SELECT parent_id, personal_folder |
3775 | - FROM ' . prefixTable('nested_tree') . ' |
|
3774 | + FROM ' . prefixTable('nested_tree').' |
|
3776 | 3775 | WHERE id = %i', |
3777 | 3776 | $inputData['folderId'] |
3778 | 3777 | ); |
@@ -3782,20 +3781,20 @@ discard block |
||
3782 | 3781 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
3783 | 3782 | $data = DB::queryFirstRow( |
3784 | 3783 | 'SELECT valeur |
3785 | - FROM ' . prefixTable('misc') . ' |
|
3784 | + FROM ' . prefixTable('misc').' |
|
3786 | 3785 | WHERE intitule = %i AND type = %s', |
3787 | 3786 | $data['parent_id'], |
3788 | 3787 | 'complex' |
3789 | 3788 | ); |
3790 | 3789 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
3791 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
3790 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
3792 | 3791 | break; |
3793 | 3792 | } |
3794 | 3793 | } |
3795 | 3794 | |
3796 | 3795 | // update Folders table |
3797 | 3796 | $tmp = DB::queryFirstRow( |
3798 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
3797 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
3799 | 3798 | $dataReceived['folder'] |
3800 | 3799 | ); |
3801 | 3800 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3909,7 +3908,7 @@ discard block |
||
3909 | 3908 | $uniqueLoadData['path'] = $arr_arbo; |
3910 | 3909 | |
3911 | 3910 | // store last folder accessed in cookie |
3912 | - $arr_cookie_options = array ( |
|
3911 | + $arr_cookie_options = array( |
|
3913 | 3912 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
3914 | 3913 | 'path' => '/', |
3915 | 3914 | 'secure' => true, |
@@ -3924,7 +3923,7 @@ discard block |
||
3924 | 3923 | foreach ($session->get('user-roles_array') as $role) { |
3925 | 3924 | $roleQ = DB::queryFirstRow( |
3926 | 3925 | 'SELECT allow_pw_change |
3927 | - FROM ' . prefixTable('roles_title') . ' |
|
3926 | + FROM ' . prefixTable('roles_title').' |
|
3928 | 3927 | WHERE id = %i', |
3929 | 3928 | $role |
3930 | 3929 | ); |
@@ -3955,11 +3954,11 @@ discard block |
||
3955 | 3954 | |
3956 | 3955 | foreach ($session->get('user-roles_array') as $role) { |
3957 | 3956 | $access = DB::queryFirstRow( |
3958 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
3957 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
3959 | 3958 | $role, |
3960 | 3959 | $inputData['id'] |
3961 | 3960 | ); |
3962 | - if (DB::count()>0) { |
|
3961 | + if (DB::count() > 0) { |
|
3963 | 3962 | if ($access['type'] === 'R') { |
3964 | 3963 | array_push($arrTmp, 10); |
3965 | 3964 | } elseif ($access['type'] === 'W') { |
@@ -4024,7 +4023,7 @@ discard block |
||
4024 | 4023 | } else { |
4025 | 4024 | DB::query( |
4026 | 4025 | 'SELECT * |
4027 | - FROM ' . prefixTable('items') . ' |
|
4026 | + FROM ' . prefixTable('items').' |
|
4028 | 4027 | WHERE inactif = %i', |
4029 | 4028 | 0 |
4030 | 4029 | ); |
@@ -4034,7 +4033,7 @@ discard block |
||
4034 | 4033 | |
4035 | 4034 | // Get folder complexity |
4036 | 4035 | $folderComplexity = DB::queryFirstRow( |
4037 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
4036 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
4038 | 4037 | 'complex', |
4039 | 4038 | $inputData['id'] |
4040 | 4039 | ); |
@@ -4046,7 +4045,7 @@ discard block |
||
4046 | 4045 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
4047 | 4046 | $folderRow = DB::query( |
4048 | 4047 | 'SELECT id_category |
4049 | - FROM ' . prefixTable('categories_folders') . ' |
|
4048 | + FROM ' . prefixTable('categories_folders').' |
|
4050 | 4049 | WHERE id_folder = %i', |
4051 | 4050 | $inputData['id'] |
4052 | 4051 | ); |
@@ -4161,15 +4160,15 @@ discard block |
||
4161 | 4160 | // List all ITEMS |
4162 | 4161 | if ($folderIsPf === false) { |
4163 | 4162 | $where->add('i.inactif=%i', 0); |
4164 | - $sql_e='(SELECT date FROM ' . prefixTable('log_items') |
|
4163 | + $sql_e = '(SELECT date FROM '.prefixTable('log_items') |
|
4165 | 4164 | . " WHERE action = 'at_creation' AND id_item=i.id " |
4166 | - . 'union all SELECT date FROM '. prefixTable('log_items') |
|
4165 | + . 'union all SELECT date FROM '.prefixTable('log_items') |
|
4167 | 4166 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
4168 | 4167 | AND id_item=i.id ORDER BY date DESC LIMIT 1)"; |
4169 | 4168 | $where->add('l.date=%l', $sql_e); |
4170 | 4169 | |
4171 | - $query_limit = ' LIMIT ' . |
|
4172 | - $start . ',' . |
|
4170 | + $query_limit = ' LIMIT '. |
|
4171 | + $start.','. |
|
4173 | 4172 | $post_nb_items_to_display_once; |
4174 | 4173 | //db::debugmode(true); |
4175 | 4174 | $rows = DB::query( |
@@ -4181,9 +4180,9 @@ discard block |
||
4181 | 4180 | l.id_user AS log_user, |
4182 | 4181 | i.url AS link, |
4183 | 4182 | i.email AS email |
4184 | - FROM ' . prefixTable('items') . ' AS i |
|
4185 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
4186 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
4183 | + FROM ' . prefixTable('items').' AS i |
|
4184 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
4185 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
4187 | 4186 | WHERE %l |
4188 | 4187 | GROUP BY i.id, l.date, l.id_user, l.action |
4189 | 4188 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4203,9 +4202,9 @@ discard block |
||
4203 | 4202 | l.id_user AS log_user, |
4204 | 4203 | i.url AS link, |
4205 | 4204 | i.email AS email |
4206 | - FROM ' . prefixTable('items') . ' AS i |
|
4207 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
4208 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
4205 | + FROM ' . prefixTable('items').' AS i |
|
4206 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
4207 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
4209 | 4208 | WHERE %l |
4210 | 4209 | GROUP BY i.id, l.date, l.id_user, l.action |
4211 | 4210 | ORDER BY i.label ASC, l.date DESC', |
@@ -4236,7 +4235,7 @@ discard block |
||
4236 | 4235 | $item_is_restricted_to_role = false; |
4237 | 4236 | DB::queryFirstRow( |
4238 | 4237 | 'SELECT role_id |
4239 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
4238 | + FROM ' . prefixTable('restriction_to_roles').' |
|
4240 | 4239 | WHERE item_id = %i', |
4241 | 4240 | $record['id'] |
4242 | 4241 | ); |
@@ -4248,7 +4247,7 @@ discard block |
||
4248 | 4247 | $user_is_included_in_role = false; |
4249 | 4248 | DB::query( |
4250 | 4249 | 'SELECT role_id |
4251 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
4250 | + FROM ' . prefixTable('restriction_to_roles').' |
|
4252 | 4251 | WHERE item_id = %i AND role_id IN %ls', |
4253 | 4252 | $record['id'], |
4254 | 4253 | $session->get('user-roles_array') |
@@ -4459,9 +4458,9 @@ discard block |
||
4459 | 4458 | if ((int) $start === 0) { |
4460 | 4459 | DB::query( |
4461 | 4460 | 'SELECT i.id |
4462 | - FROM ' . prefixTable('items') . ' as i |
|
4463 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
4464 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
4461 | + FROM ' . prefixTable('items').' as i |
|
4462 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
4463 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
4465 | 4464 | WHERE %l |
4466 | 4465 | ORDER BY i.label ASC, l.date DESC', |
4467 | 4466 | $where |
@@ -4526,8 +4525,8 @@ discard block |
||
4526 | 4525 | $dataItem = DB::queryFirstRow( |
4527 | 4526 | 'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id, |
4528 | 4527 | i.label AS label, i.id_tree AS id_tree |
4529 | - FROM ' . prefixTable('items') . ' AS i |
|
4530 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
4528 | + FROM ' . prefixTable('items').' AS i |
|
4529 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
4531 | 4530 | WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)', |
4532 | 4531 | $session->get('user-id'), |
4533 | 4532 | $inputData['itemKey'] ?? '', |
@@ -4639,7 +4638,7 @@ discard block |
||
4639 | 4638 | // do query on this folder |
4640 | 4639 | $data_this_folder = DB::queryFirstRow( |
4641 | 4640 | 'SELECT id, personal_folder, title |
4642 | - FROM ' . prefixTable('nested_tree') . ' |
|
4641 | + FROM ' . prefixTable('nested_tree').' |
|
4643 | 4642 | WHERE id = %s', |
4644 | 4643 | $inputData['folderId'] |
4645 | 4644 | ); |
@@ -4679,8 +4678,8 @@ discard block |
||
4679 | 4678 | $visibilite = ''; |
4680 | 4679 | $data = DB::queryFirstRow( |
4681 | 4680 | 'SELECT m.valeur, n.personal_folder |
4682 | - FROM ' . prefixTable('misc') . ' AS m |
|
4683 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
4681 | + FROM ' . prefixTable('misc').' AS m |
|
4682 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
4684 | 4683 | WHERE type=%s AND intitule = %s', |
4685 | 4684 | 'complex', |
4686 | 4685 | $inputData['folderId'] |
@@ -4693,8 +4692,8 @@ discard block |
||
4693 | 4692 | // Prepare Item actual visibility (what Users/Roles can see it) |
4694 | 4693 | $rows = DB::query( |
4695 | 4694 | 'SELECT t.title |
4696 | - FROM ' . prefixTable('roles_values') . ' as v |
|
4697 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
4695 | + FROM ' . prefixTable('roles_values').' as v |
|
4696 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
4698 | 4697 | WHERE v.folder_id = %i |
4699 | 4698 | GROUP BY title', |
4700 | 4699 | $inputData['folderId'] |
@@ -4703,7 +4702,7 @@ discard block |
||
4703 | 4702 | if (empty($visibilite)) { |
4704 | 4703 | $visibilite = $record['title']; |
4705 | 4704 | } else { |
4706 | - $visibilite .= ' - ' . $record['title']; |
|
4705 | + $visibilite .= ' - '.$record['title']; |
|
4707 | 4706 | } |
4708 | 4707 | } |
4709 | 4708 | } else { |
@@ -4713,14 +4712,14 @@ discard block |
||
4713 | 4712 | // do new query to know if current folder is pf |
4714 | 4713 | $data_pf = DB::queryFirstRow( |
4715 | 4714 | 'SELECT personal_folder |
4716 | - FROM ' . prefixTable('nested_tree') . ' |
|
4715 | + FROM ' . prefixTable('nested_tree').' |
|
4717 | 4716 | WHERE id = %s', |
4718 | 4717 | $inputData['folderId'] |
4719 | 4718 | ); |
4720 | 4719 | |
4721 | 4720 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
4722 | 4721 | |
4723 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
4722 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
4724 | 4723 | } |
4725 | 4724 | |
4726 | 4725 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4730,8 +4729,8 @@ discard block |
||
4730 | 4729 | $listOptionsForRoles = array(); |
4731 | 4730 | $rows = DB::query( |
4732 | 4731 | 'SELECT r.role_id AS role_id, t.title AS title |
4733 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
4734 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
4732 | + FROM ' . prefixTable('roles_values').' AS r |
|
4733 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
4735 | 4734 | WHERE r.folder_id = %i', |
4736 | 4735 | $inputData['folderId'] |
4737 | 4736 | ); |
@@ -4745,7 +4744,7 @@ discard block |
||
4745 | 4744 | ); |
4746 | 4745 | $rows2 = DB::query( |
4747 | 4746 | 'SELECT id, login, fonction_id, email, name, lastname |
4748 | - FROM ' . prefixTable('users') . ' |
|
4747 | + FROM ' . prefixTable('users').' |
|
4749 | 4748 | WHERE admin = 0 AND fonction_id is not null' |
4750 | 4749 | ); |
4751 | 4750 | foreach ($rows2 as $record2) { |
@@ -4759,7 +4758,7 @@ discard block |
||
4759 | 4758 | array( |
4760 | 4759 | 'id' => $record2['id'], |
4761 | 4760 | 'login' => $record2['login'], |
4762 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
4761 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
4763 | 4762 | 'email' => $record2['email'], |
4764 | 4763 | ) |
4765 | 4764 | ); |
@@ -4776,12 +4775,12 @@ discard block |
||
4776 | 4775 | foreach ($session->get('user-roles_array') as $role) { |
4777 | 4776 | $access = DB::queryFirstRow( |
4778 | 4777 | 'SELECT type |
4779 | - FROM ' . prefixTable('roles_values') . ' |
|
4778 | + FROM ' . prefixTable('roles_values').' |
|
4780 | 4779 | WHERE role_id = %i AND folder_id = %i', |
4781 | 4780 | $role, |
4782 | 4781 | $inputData['folderId'] |
4783 | 4782 | ); |
4784 | - if (DB::count()>0) { |
|
4783 | + if (DB::count() > 0) { |
|
4785 | 4784 | if ($access['type'] === 'R') { |
4786 | 4785 | array_push($arrTmp, 10); |
4787 | 4786 | } elseif ($access['type'] === 'W') { |
@@ -4809,7 +4808,7 @@ discard block |
||
4809 | 4808 | // Check if personal folder is owned by user |
4810 | 4809 | $folder = DB::queryFirstRow( |
4811 | 4810 | 'SELECT id |
4812 | - FROM ' . prefixTable('nested_tree') . ' |
|
4811 | + FROM ' . prefixTable('nested_tree').' |
|
4813 | 4812 | WHERE title = %s', |
4814 | 4813 | $session->get('user-id'), |
4815 | 4814 | ); |
@@ -4914,7 +4913,7 @@ discard block |
||
4914 | 4913 | // Get some info before deleting |
4915 | 4914 | $data = DB::queryFirstRow( |
4916 | 4915 | 'SELECT name, id_item, file |
4917 | - FROM ' . prefixTable('files') . ' |
|
4916 | + FROM ' . prefixTable('files').' |
|
4918 | 4917 | WHERE id = %i', |
4919 | 4918 | $fileId |
4920 | 4919 | ); |
@@ -4922,7 +4921,7 @@ discard block |
||
4922 | 4921 | // Load item data |
4923 | 4922 | $data_item = DB::queryFirstRow( |
4924 | 4923 | 'SELECT id_tree |
4925 | - FROM ' . prefixTable('items') . ' |
|
4924 | + FROM ' . prefixTable('items').' |
|
4926 | 4925 | WHERE id = %i', |
4927 | 4926 | $data['id_item'] |
4928 | 4927 | ); |
@@ -4952,7 +4951,7 @@ discard block |
||
4952 | 4951 | $session->get('user-id'), |
4953 | 4952 | 'at_modification', |
4954 | 4953 | $session->get('user-login'), |
4955 | - 'at_del_file : ' . $data['name'] |
|
4954 | + 'at_del_file : '.$data['name'] |
|
4956 | 4955 | ); |
4957 | 4956 | |
4958 | 4957 | // DElete sharekeys |
@@ -4963,7 +4962,7 @@ discard block |
||
4963 | 4962 | ); |
4964 | 4963 | |
4965 | 4964 | // Delete file from server |
4966 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
4965 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
4967 | 4966 | $fileToDelete = realpath($fileToDelete); |
4968 | 4967 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
4969 | 4968 | fileDelete($fileToDelete, $SETTINGS); |
@@ -5017,7 +5016,7 @@ discard block |
||
5017 | 5016 | // Update SESSION with this new favourite |
5018 | 5017 | $data = DB::queryFirstRow( |
5019 | 5018 | 'SELECT label,id_tree |
5020 | - FROM ' . prefixTable('items') . ' |
|
5019 | + FROM ' . prefixTable('items').' |
|
5021 | 5020 | WHERE id = %i', |
5022 | 5021 | $inputData['itemId'] |
5023 | 5022 | ); |
@@ -5026,7 +5025,7 @@ discard block |
||
5026 | 5025 | [ |
5027 | 5026 | $inputData['itemId'] => [ |
5028 | 5027 | 'label' => $data['label'], |
5029 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
5028 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
5030 | 5029 | ], |
5031 | 5030 | ], |
5032 | 5031 | 'add' |
@@ -5095,8 +5094,8 @@ discard block |
||
5095 | 5094 | // get data about item |
5096 | 5095 | $dataSource = DB::queryFirstRow( |
5097 | 5096 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
5098 | - FROM ' . prefixTable('items') . ' as i |
|
5099 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
5097 | + FROM ' . prefixTable('items').' as i |
|
5098 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
5100 | 5099 | WHERE i.id=%i', |
5101 | 5100 | $inputData['itemId'] |
5102 | 5101 | ); |
@@ -5140,7 +5139,7 @@ discard block |
||
5140 | 5139 | // get data about new folder |
5141 | 5140 | $dataDestination = DB::queryFirstRow( |
5142 | 5141 | 'SELECT personal_folder, title |
5143 | - FROM ' . prefixTable('nested_tree') . ' |
|
5142 | + FROM ' . prefixTable('nested_tree').' |
|
5144 | 5143 | WHERE id = %i', |
5145 | 5144 | $inputData['folderId'] |
5146 | 5145 | ); |
@@ -5193,7 +5192,7 @@ discard block |
||
5193 | 5192 | // Get fields for this Item |
5194 | 5193 | $rows = DB::query( |
5195 | 5194 | 'SELECT id |
5196 | - FROM ' . prefixTable('categories_items') . ' |
|
5195 | + FROM ' . prefixTable('categories_items').' |
|
5197 | 5196 | WHERE item_id = %i', |
5198 | 5197 | $inputData['itemId'] |
5199 | 5198 | ); |
@@ -5210,7 +5209,7 @@ discard block |
||
5210 | 5209 | // Get FILES for this Item |
5211 | 5210 | $rows = DB::query( |
5212 | 5211 | 'SELECT id |
5213 | - FROM ' . prefixTable('files') . ' |
|
5212 | + FROM ' . prefixTable('files').' |
|
5214 | 5213 | WHERE id_item = %i', |
5215 | 5214 | $inputData['itemId'] |
5216 | 5215 | ); |
@@ -5257,7 +5256,7 @@ discard block |
||
5257 | 5256 | // Get the ITEM object key for the user |
5258 | 5257 | $userKey = DB::queryFirstRow( |
5259 | 5258 | 'SELECT share_key |
5260 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
5259 | + FROM ' . prefixTable('sharekeys_items').' |
|
5261 | 5260 | WHERE user_id = %i AND object_id = %i', |
5262 | 5261 | $session->get('user-id'), |
5263 | 5262 | $inputData['itemId'] |
@@ -5268,7 +5267,7 @@ discard block |
||
5268 | 5267 | // This is a public object |
5269 | 5268 | $users = DB::query( |
5270 | 5269 | 'SELECT id, public_key |
5271 | - FROM ' . prefixTable('users') . ' |
|
5270 | + FROM ' . prefixTable('users').' |
|
5272 | 5271 | WHERE id NOT IN %li |
5273 | 5272 | AND public_key != ""', |
5274 | 5273 | $tpUsersIDs |
@@ -5291,14 +5290,14 @@ discard block |
||
5291 | 5290 | // Get fields for this Item |
5292 | 5291 | $rows = DB::query( |
5293 | 5292 | 'SELECT id |
5294 | - FROM ' . prefixTable('categories_items') . ' |
|
5293 | + FROM ' . prefixTable('categories_items').' |
|
5295 | 5294 | WHERE item_id = %i', |
5296 | 5295 | $inputData['itemId'] |
5297 | 5296 | ); |
5298 | 5297 | foreach ($rows as $field) { |
5299 | 5298 | $userKey = DB::queryFirstRow( |
5300 | 5299 | 'SELECT share_key |
5301 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5300 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5302 | 5301 | WHERE user_id = %i AND object_id = %i', |
5303 | 5302 | $session->get('user-id'), |
5304 | 5303 | $field['id'] |
@@ -5309,7 +5308,7 @@ discard block |
||
5309 | 5308 | // This is a public object |
5310 | 5309 | $users = DB::query( |
5311 | 5310 | 'SELECT id, public_key |
5312 | - FROM ' . prefixTable('users') . ' |
|
5311 | + FROM ' . prefixTable('users').' |
|
5313 | 5312 | WHERE id NOT IN %li |
5314 | 5313 | AND public_key != ""', |
5315 | 5314 | $tpUsersIDs |
@@ -5332,14 +5331,14 @@ discard block |
||
5332 | 5331 | // Get FILES for this Item |
5333 | 5332 | $rows = DB::query( |
5334 | 5333 | 'SELECT id |
5335 | - FROM ' . prefixTable('files') . ' |
|
5334 | + FROM ' . prefixTable('files').' |
|
5336 | 5335 | WHERE id_item = %i', |
5337 | 5336 | $inputData['itemId'] |
5338 | 5337 | ); |
5339 | 5338 | foreach ($rows as $attachment) { |
5340 | 5339 | $userKey = DB::queryFirstRow( |
5341 | 5340 | 'SELECT share_key |
5342 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5341 | + FROM ' . prefixTable('sharekeys_files').' |
|
5343 | 5342 | WHERE user_id = %i AND object_id = %i', |
5344 | 5343 | $session->get('user-id'), |
5345 | 5344 | $attachment['id'] |
@@ -5350,7 +5349,7 @@ discard block |
||
5350 | 5349 | // This is a public object |
5351 | 5350 | $users = DB::query( |
5352 | 5351 | 'SELECT id, public_key |
5353 | - FROM ' . prefixTable('users') . ' |
|
5352 | + FROM ' . prefixTable('users').' |
|
5354 | 5353 | WHERE id NOT IN %li |
5355 | 5354 | AND public_key != ""', |
5356 | 5355 | $tpUsersIDs |
@@ -5391,7 +5390,7 @@ discard block |
||
5391 | 5390 | $session->get('user-id'), |
5392 | 5391 | 'at_modification', |
5393 | 5392 | $session->get('user-login'), |
5394 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5393 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5395 | 5394 | ); |
5396 | 5395 | |
5397 | 5396 | // Update cache table |
@@ -5450,8 +5449,8 @@ discard block |
||
5450 | 5449 | // get data about item |
5451 | 5450 | $dataSource = DB::queryFirstRow( |
5452 | 5451 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
5453 | - FROM ' . prefixTable('items') . ' as i |
|
5454 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
5452 | + FROM ' . prefixTable('items').' as i |
|
5453 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
5455 | 5454 | WHERE i.id=%i', |
5456 | 5455 | $item_id |
5457 | 5456 | ); |
@@ -5473,7 +5472,7 @@ discard block |
||
5473 | 5472 | |
5474 | 5473 | // get data about new folder |
5475 | 5474 | $dataDestination = DB::queryFirstRow( |
5476 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
5475 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
5477 | 5476 | $inputData['folderId'] |
5478 | 5477 | ); |
5479 | 5478 | |
@@ -5515,7 +5514,7 @@ discard block |
||
5515 | 5514 | // Get fields for this Item |
5516 | 5515 | $rows = DB::query( |
5517 | 5516 | 'SELECT id |
5518 | - FROM ' . prefixTable('categories_items') . ' |
|
5517 | + FROM ' . prefixTable('categories_items').' |
|
5519 | 5518 | WHERE item_id = %i', |
5520 | 5519 | $item_id |
5521 | 5520 | ); |
@@ -5532,7 +5531,7 @@ discard block |
||
5532 | 5531 | // Get FILES for this Item |
5533 | 5532 | $rows = DB::query( |
5534 | 5533 | 'SELECT id |
5535 | - FROM ' . prefixTable('files') . ' |
|
5534 | + FROM ' . prefixTable('files').' |
|
5536 | 5535 | WHERE id_item = %i', |
5537 | 5536 | $item_id |
5538 | 5537 | ); |
@@ -5587,7 +5586,7 @@ discard block |
||
5587 | 5586 | // Get the ITEM object key for the user |
5588 | 5587 | $userKey = DB::queryFirstRow( |
5589 | 5588 | 'SELECT share_key |
5590 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
5589 | + FROM ' . prefixTable('sharekeys_items').' |
|
5591 | 5590 | WHERE user_id = %i AND object_id = %i', |
5592 | 5591 | $session->get('user-id'), |
5593 | 5592 | $item_id |
@@ -5598,7 +5597,7 @@ discard block |
||
5598 | 5597 | // This is a public object |
5599 | 5598 | $users = DB::query( |
5600 | 5599 | 'SELECT id, public_key |
5601 | - FROM ' . prefixTable('users') . ' |
|
5600 | + FROM ' . prefixTable('users').' |
|
5602 | 5601 | WHERE id NOT IN %li |
5603 | 5602 | AND public_key != ""', |
5604 | 5603 | $tpUsersIDs |
@@ -5621,14 +5620,14 @@ discard block |
||
5621 | 5620 | // Get fields for this Item |
5622 | 5621 | $rows = DB::query( |
5623 | 5622 | 'SELECT id |
5624 | - FROM ' . prefixTable('categories_items') . ' |
|
5623 | + FROM ' . prefixTable('categories_items').' |
|
5625 | 5624 | WHERE item_id = %i', |
5626 | 5625 | $item_id |
5627 | 5626 | ); |
5628 | 5627 | foreach ($rows as $field) { |
5629 | 5628 | $userKey = DB::queryFirstRow( |
5630 | 5629 | 'SELECT share_key |
5631 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5630 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5632 | 5631 | WHERE user_id = %i AND object_id = %i', |
5633 | 5632 | $session->get('user-id'), |
5634 | 5633 | $field['id'] |
@@ -5639,7 +5638,7 @@ discard block |
||
5639 | 5638 | // This is a public object |
5640 | 5639 | $users = DB::query( |
5641 | 5640 | 'SELECT id, public_key |
5642 | - FROM ' . prefixTable('users') . ' |
|
5641 | + FROM ' . prefixTable('users').' |
|
5643 | 5642 | WHERE id NOT IN %li |
5644 | 5643 | AND public_key != ""', |
5645 | 5644 | $tpUsersIDs |
@@ -5663,14 +5662,14 @@ discard block |
||
5663 | 5662 | // Get FILES for this Item |
5664 | 5663 | $rows = DB::query( |
5665 | 5664 | 'SELECT id |
5666 | - FROM ' . prefixTable('files') . ' |
|
5665 | + FROM ' . prefixTable('files').' |
|
5667 | 5666 | WHERE id_item = %i', |
5668 | 5667 | $item_id |
5669 | 5668 | ); |
5670 | 5669 | foreach ($rows as $attachment) { |
5671 | 5670 | $userKey = DB::queryFirstRow( |
5672 | 5671 | 'SELECT share_key |
5673 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5672 | + FROM ' . prefixTable('sharekeys_files').' |
|
5674 | 5673 | WHERE user_id = %i AND object_id = %i', |
5675 | 5674 | $session->get('user-id'), |
5676 | 5675 | $attachment['id'] |
@@ -5681,7 +5680,7 @@ discard block |
||
5681 | 5680 | // This is a public object |
5682 | 5681 | $users = DB::query( |
5683 | 5682 | 'SELECT id, public_key |
5684 | - FROM ' . prefixTable('users') . ' |
|
5683 | + FROM ' . prefixTable('users').' |
|
5685 | 5684 | WHERE id NOT IN %li |
5686 | 5685 | AND public_key != ""', |
5687 | 5686 | $tpUsersIDs |
@@ -5721,13 +5720,13 @@ discard block |
||
5721 | 5720 | $session->get('user-id'), |
5722 | 5721 | 'at_modification', |
5723 | 5722 | $session->get('user-login'), |
5724 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5723 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5725 | 5724 | ); |
5726 | 5725 | } |
5727 | 5726 | } |
5728 | 5727 | |
5729 | 5728 | // reload cache table |
5730 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
5729 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
5731 | 5730 | updateCacheTable('reload', null); |
5732 | 5731 | |
5733 | 5732 | echo (string) prepareExchangedData( |
@@ -5791,7 +5790,7 @@ discard block |
||
5791 | 5790 | // get info |
5792 | 5791 | $dataSource = DB::queryFirstRow( |
5793 | 5792 | 'SELECT label, id_tree |
5794 | - FROM ' . prefixTable('items') . ' |
|
5793 | + FROM ' . prefixTable('items').' |
|
5795 | 5794 | WHERE id=%i', |
5796 | 5795 | $item_id |
5797 | 5796 | ); |
@@ -5892,14 +5891,14 @@ discard block |
||
5892 | 5891 | // Variables |
5893 | 5892 | $dataAuthor = DB::queryFirstRow( |
5894 | 5893 | 'SELECT email,login |
5895 | - FROM ' . prefixTable('users') . ' |
|
5894 | + FROM ' . prefixTable('users').' |
|
5896 | 5895 | WHERE id = %i', |
5897 | 5896 | $post_content[1] |
5898 | 5897 | ); |
5899 | 5898 | |
5900 | 5899 | $dataItem = DB::queryFirstRow( |
5901 | 5900 | 'SELECT label, id_tree |
5902 | - FROM ' . prefixTable('items') . ' |
|
5901 | + FROM ' . prefixTable('items').' |
|
5903 | 5902 | WHERE id = %i', |
5904 | 5903 | $post_content[0] |
5905 | 5904 | ); |
@@ -5916,7 +5915,7 @@ discard block |
||
5916 | 5915 | $lang->get('email_request_access_subject'), |
5917 | 5916 | str_replace( |
5918 | 5917 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
5919 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
5918 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
5920 | 5919 | $lang->get('email_request_access_mail') |
5921 | 5920 | ), |
5922 | 5921 | $dataAuthor['email'], |
@@ -5925,7 +5924,7 @@ discard block |
||
5925 | 5924 | } elseif ($inputData['cat'] === 'share_this_item') { |
5926 | 5925 | $dataItem = DB::queryFirstRow( |
5927 | 5926 | 'SELECT label,id_tree |
5928 | - FROM ' . prefixTable('items') . ' |
|
5927 | + FROM ' . prefixTable('items').' |
|
5929 | 5928 | WHERE id= %i', |
5930 | 5929 | $inputData['id'] |
5931 | 5930 | ); |
@@ -5948,7 +5947,7 @@ discard block |
||
5948 | 5947 | ), |
5949 | 5948 | array( |
5950 | 5949 | empty($SETTINGS['email_server_url']) === false ? |
5951 | - $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'], |
|
5950 | + $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'], |
|
5952 | 5951 | addslashes($session->get('user-login')), |
5953 | 5952 | addslashes($path), |
5954 | 5953 | ), |
@@ -5997,8 +5996,8 @@ discard block |
||
5997 | 5996 | // Get all informations for this item |
5998 | 5997 | $dataItem = DB::queryFirstRow( |
5999 | 5998 | 'SELECT * |
6000 | - FROM ' . prefixTable('items') . ' as i |
|
6001 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
5999 | + FROM ' . prefixTable('items').' as i |
|
6000 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
6002 | 6001 | WHERE i.id=%i AND l.action = %s', |
6003 | 6002 | $item_id, |
6004 | 6003 | 'at_creation' |
@@ -6027,18 +6026,18 @@ discard block |
||
6027 | 6026 | $session->get('user-login'), |
6028 | 6027 | htmlspecialchars_decode($label, ENT_QUOTES), |
6029 | 6028 | null, |
6030 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
6029 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
6031 | 6030 | ); |
6032 | 6031 | // Prepare new line |
6033 | 6032 | $data = DB::queryFirstRow( |
6034 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
6033 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
6035 | 6034 | $item_id |
6036 | 6035 | ); |
6037 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
6036 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
6038 | 6037 | // send back |
6039 | 6038 | $data = array( |
6040 | 6039 | 'error' => '', |
6041 | - 'new_line' => '<br>' . addslashes($historic), |
|
6040 | + 'new_line' => '<br>'.addslashes($historic), |
|
6042 | 6041 | ); |
6043 | 6042 | echo (string) prepareExchangedData( |
6044 | 6043 | $data, |
@@ -6113,8 +6112,8 @@ discard block |
||
6113 | 6112 | // Should we log a password change? |
6114 | 6113 | $itemQ = DB::queryFirstRow( |
6115 | 6114 | 'SELECT s.share_key, i.pw |
6116 | - FROM ' . prefixTable('items') . ' AS i |
|
6117 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
6115 | + FROM ' . prefixTable('items').' AS i |
|
6116 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
6118 | 6117 | WHERE s.user_id = %i AND s.object_id = %i', |
6119 | 6118 | $session->get('user-id'), |
6120 | 6119 | $dataReceived['id'] |
@@ -6169,7 +6168,7 @@ discard block |
||
6169 | 6168 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
6170 | 6169 | $SETTINGS['otv_expiration_period'] = 7; |
6171 | 6170 | } |
6172 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
6171 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
6173 | 6172 | |
6174 | 6173 | echo json_encode( |
6175 | 6174 | array( |
@@ -6200,7 +6199,7 @@ discard block |
||
6200 | 6199 | // get parameters from original link |
6201 | 6200 | $url = $dataReceived['original_link']; |
6202 | 6201 | $parts = parse_url($url); |
6203 | - if(isset($parts['query'])){ |
|
6202 | + if (isset($parts['query'])) { |
|
6204 | 6203 | parse_str($parts['query'], $orignal_link_parameters); |
6205 | 6204 | } else { |
6206 | 6205 | $orignal_link_parameters = array(); |
@@ -6231,13 +6230,13 @@ discard block |
||
6231 | 6230 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
6232 | 6231 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
6233 | 6232 | if (str_contains($domain_host, 'www.') === true) { |
6234 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
6233 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
6235 | 6234 | } else { |
6236 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
6235 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
6237 | 6236 | } |
6238 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
6237 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
6239 | 6238 | } else { |
6240 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
6239 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
6241 | 6240 | } |
6242 | 6241 | |
6243 | 6242 | echo (string) prepareExchangedData( |
@@ -6272,8 +6271,8 @@ discard block |
||
6272 | 6271 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
6273 | 6272 | f.extension AS extension, f.type AS type, |
6274 | 6273 | s.share_key AS share_key |
6275 | - FROM ' . prefixTable('files') . ' AS f |
|
6276 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
6274 | + FROM ' . prefixTable('files').' AS f |
|
6275 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
6277 | 6276 | WHERE s.user_id = %i AND s.object_id = %i', |
6278 | 6277 | $session->get('user-id'), |
6279 | 6278 | $inputData['id'] |
@@ -6294,7 +6293,7 @@ discard block |
||
6294 | 6293 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
6295 | 6294 | |
6296 | 6295 | // prepare image info |
6297 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
6296 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
6298 | 6297 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
6299 | 6298 | |
6300 | 6299 | // Get image content |
@@ -6321,7 +6320,7 @@ discard block |
||
6321 | 6320 | echo (string) prepareExchangedData( |
6322 | 6321 | array( |
6323 | 6322 | 'error' => false, |
6324 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
6323 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
6325 | 6324 | 'file_type' => $file_info['type'], |
6326 | 6325 | 'file_content' => $fileContent, |
6327 | 6326 | ), |
@@ -6435,7 +6434,7 @@ discard block |
||
6435 | 6434 | $arbo = $tree->getPath($folder->id, false); |
6436 | 6435 | $path = ''; |
6437 | 6436 | foreach ($arbo as $elem) { |
6438 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6437 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6439 | 6438 | } |
6440 | 6439 | |
6441 | 6440 | // Build array |
@@ -6501,7 +6500,7 @@ discard block |
||
6501 | 6500 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
6502 | 6501 | $rows = DB::query( |
6503 | 6502 | 'SELECT id, categories |
6504 | - FROM ' . prefixTable('nested_tree') . ' |
|
6503 | + FROM ' . prefixTable('nested_tree').' |
|
6505 | 6504 | WHERE id IN (%l)', |
6506 | 6505 | implode(',', $foldersArray) |
6507 | 6506 | ); |
@@ -6543,7 +6542,7 @@ discard block |
||
6543 | 6542 | // get item info |
6544 | 6543 | $dataItem = DB::queryFirstRow( |
6545 | 6544 | 'SELECT * |
6546 | - FROM ' . prefixTable('items') . ' |
|
6545 | + FROM ' . prefixTable('items').' |
|
6547 | 6546 | WHERE id=%i', |
6548 | 6547 | $inputData['itemId'] |
6549 | 6548 | ); |
@@ -6555,8 +6554,8 @@ discard block |
||
6555 | 6554 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
6556 | 6555 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
6557 | 6556 | l.old_value as old_value |
6558 | - FROM ' . prefixTable('log_items') . ' as l |
|
6559 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
6557 | + FROM ' . prefixTable('log_items').' as l |
|
6558 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
6560 | 6559 | WHERE id_item=%i AND l.action NOT IN (%l) |
6561 | 6560 | ORDER BY date DESC', |
6562 | 6561 | $inputData['itemId'], |
@@ -6571,18 +6570,18 @@ discard block |
||
6571 | 6570 | |
6572 | 6571 | // imported via API |
6573 | 6572 | if (empty($record['login']) === true) { |
6574 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
6573 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
6575 | 6574 | } |
6576 | 6575 | |
6577 | 6576 | // Prepare avatar |
6578 | 6577 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
6579 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
6580 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
6578 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
6579 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
6581 | 6580 | } else { |
6582 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6581 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6583 | 6582 | } |
6584 | 6583 | } else { |
6585 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6584 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6586 | 6585 | } |
6587 | 6586 | |
6588 | 6587 | // Prepare action |
@@ -6602,7 +6601,7 @@ discard block |
||
6602 | 6601 | $previous_passwords, |
6603 | 6602 | [ |
6604 | 6603 | 'password' => htmlentities($previous_pwd['string']), |
6605 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6604 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6606 | 6605 | ] |
6607 | 6606 | ); |
6608 | 6607 | } |
@@ -6615,19 +6614,19 @@ discard block |
||
6615 | 6614 | $action = $lang->get($reason[0]); |
6616 | 6615 | if ($reason[0] === 'at_moved') { |
6617 | 6616 | $tmp = explode(' -> ', $reason[1]); |
6618 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
6617 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
6619 | 6618 | } elseif ($reason[0] === 'at_field') { |
6620 | 6619 | $tmp = explode(' => ', $reason[1]); |
6621 | 6620 | if (count($tmp) > 1) { |
6622 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
6623 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
6621 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
6622 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
6624 | 6623 | } else { |
6625 | 6624 | $detail = trim($reason[1]); |
6626 | 6625 | } |
6627 | 6626 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
6628 | 6627 | $tmp = explode(' => ', $reason[1]); |
6629 | 6628 | $detail = empty(trim($tmp[0])) === true ? |
6630 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
6629 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
6631 | 6630 | } elseif ($reason[0] === 'at_automatic_del') { |
6632 | 6631 | $detail = $lang->get($reason[1]); |
6633 | 6632 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') { |
@@ -6636,7 +6635,7 @@ discard block |
||
6636 | 6635 | $tmp = explode(':', $reason[1]); |
6637 | 6636 | $tmp = explode('.', $tmp[0]); |
6638 | 6637 | $detail = isBase64($tmp[0]) === true ? |
6639 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
6638 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
6640 | 6639 | } elseif ($reason[0] === 'at_import') { |
6641 | 6640 | $detail = ''; |
6642 | 6641 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6655,8 +6654,8 @@ discard block |
||
6655 | 6654 | array( |
6656 | 6655 | 'avatar' => $avatar, |
6657 | 6656 | 'login' => $record['login'], |
6658 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
6659 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6657 | + 'name' => $record['name'].' '.$record['lastname'], |
|
6658 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6660 | 6659 | 'action' => $action, |
6661 | 6660 | 'detail' => $detail, |
6662 | 6661 | ) |
@@ -6744,11 +6743,11 @@ discard block |
||
6744 | 6743 | |
6745 | 6744 | // get some info to add to the notification email |
6746 | 6745 | $resp_user = DB::queryFirstRow( |
6747 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
6746 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
6748 | 6747 | $session->get('user-id') |
6749 | 6748 | ); |
6750 | 6749 | $resp_folder = DB::queryFirstRow( |
6751 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
6750 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
6752 | 6751 | $folder |
6753 | 6752 | ); |
6754 | 6753 | |
@@ -6757,7 +6756,7 @@ discard block |
||
6757 | 6756 | $emailService = new EmailService(); |
6758 | 6757 | $rows = DB::query( |
6759 | 6758 | 'SELECT email |
6760 | - FROM ' . prefixTable('users') . ' |
|
6759 | + FROM ' . prefixTable('users').' |
|
6761 | 6760 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
6762 | 6761 | 1 |
6763 | 6762 | ); |
@@ -6803,7 +6802,7 @@ discard block |
||
6803 | 6802 | // Send email |
6804 | 6803 | $dataItem = DB::queryFirstRow( |
6805 | 6804 | 'SELECT label, id_tree |
6806 | - FROM ' . prefixTable('items') . ' |
|
6805 | + FROM ' . prefixTable('items').' |
|
6807 | 6806 | WHERE id = %i', |
6808 | 6807 | $inputData['itemId'] |
6809 | 6808 | ); |
@@ -6857,7 +6856,7 @@ discard block |
||
6857 | 6856 | |
6858 | 6857 | DB::query( |
6859 | 6858 | 'SELECT * |
6860 | - FROM ' . prefixTable('notification') . ' |
|
6859 | + FROM ' . prefixTable('notification').' |
|
6861 | 6860 | WHERE item_id = %i AND user_id = %i', |
6862 | 6861 | $inputData['itemId'], |
6863 | 6862 | $session->get('user-id') |
@@ -6929,7 +6928,7 @@ discard block |
||
6929 | 6928 | // And related logs |
6930 | 6929 | $rows = DB::query( |
6931 | 6930 | 'SELECT id, file AS filename |
6932 | - FROM ' . prefixTable('files') . ' |
|
6931 | + FROM ' . prefixTable('files').' |
|
6933 | 6932 | WHERE id_item = %i AND confirmed = %i', |
6934 | 6933 | $inputData['itemId'], |
6935 | 6934 | 0 |
@@ -6943,12 +6942,12 @@ discard block |
||
6943 | 6942 | ); |
6944 | 6943 | |
6945 | 6944 | // Delete file on server |
6946 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
6945 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
6947 | 6946 | |
6948 | 6947 | // Delete related logs |
6949 | 6948 | $logFile = DB::query( |
6950 | 6949 | 'SELECT increment_id, raison |
6951 | - FROM ' . prefixTable('log_items') . ' |
|
6950 | + FROM ' . prefixTable('log_items').' |
|
6952 | 6951 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
6953 | 6952 | $inputData['itemId'], |
6954 | 6953 | $session->get('user-id'), |
@@ -7007,7 +7006,7 @@ discard block |
||
7007 | 7006 | // Confirm attachments |
7008 | 7007 | $rows = DB::query( |
7009 | 7008 | 'SELECT id, file AS filename |
7010 | - FROM ' . prefixTable('files') . ' |
|
7009 | + FROM ' . prefixTable('files').' |
|
7011 | 7010 | WHERE id_item = %i AND confirmed = %i', |
7012 | 7011 | $inputData['itemId'], |
7013 | 7012 | 0 |
@@ -7123,7 +7122,7 @@ discard block |
||
7123 | 7122 | $successfulDeletions = array(); |
7124 | 7123 | $failedDeletions = array(); |
7125 | 7124 | |
7126 | - foreach( $selectedItemIds as $itemId) { |
|
7125 | + foreach ($selectedItemIds as $itemId) { |
|
7127 | 7126 | // Check that user can access this item |
7128 | 7127 | $granted = accessToItemIsGranted((int) $itemId, $SETTINGS); |
7129 | 7128 | if ($granted !== true) { |
@@ -7134,7 +7133,7 @@ discard block |
||
7134 | 7133 | // Load item data |
7135 | 7134 | $data = DB::queryFirstRow( |
7136 | 7135 | 'SELECT id_tree, id, label |
7137 | - FROM ' . prefixTable('items') . ' |
|
7136 | + FROM ' . prefixTable('items').' |
|
7138 | 7137 | WHERE id = %i', |
7139 | 7138 | $itemId |
7140 | 7139 | ); |
@@ -7217,15 +7216,15 @@ discard block |
||
7217 | 7216 | case 'autocomplete_tags': |
7218 | 7217 | // Get a list off all existing TAGS |
7219 | 7218 | $listOfTags = ''; |
7220 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
7219 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
7221 | 7220 | foreach ($rows as $record) { |
7222 | 7221 | if (empty($listOfTags)) { |
7223 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
7222 | + $listOfTags = '"'.$record['tag'].'"'; |
|
7224 | 7223 | } else { |
7225 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
7224 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
7226 | 7225 | } |
7227 | 7226 | } |
7228 | - echo '[' . $listOfTags . ']'; |
|
7227 | + echo '['.$listOfTags.']'; |
|
7229 | 7228 | break; |
7230 | 7229 | } |
7231 | 7230 | } |
@@ -7241,7 +7240,7 @@ discard block |
||
7241 | 7240 | { |
7242 | 7241 | $data = DB::queryFirstRow( |
7243 | 7242 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
7244 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
7243 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
7245 | 7244 | $groupe |
7246 | 7245 | ); |
7247 | 7246 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7361,7 +7360,7 @@ discard block |
||
7361 | 7360 | // Get item date |
7362 | 7361 | $itemRestrictedUsersList = DB::queryFirstRow( |
7363 | 7362 | 'SELECT restricted_to |
7364 | - FROM ' . prefixTable('items') . ' |
|
7363 | + FROM ' . prefixTable('items').' |
|
7365 | 7364 | WHERE id = %i', |
7366 | 7365 | $itemId |
7367 | 7366 | ); |
@@ -7394,7 +7393,7 @@ discard block |
||
7394 | 7393 | $now = time(); |
7395 | 7394 | $editionLocks = DB::query( |
7396 | 7395 | 'SELECT timestamp, user_id, increment_id |
7397 | - FROM ' . prefixTable('items_edition') . ' |
|
7396 | + FROM ' . prefixTable('items_edition').' |
|
7398 | 7397 | WHERE item_id = %i |
7399 | 7398 | ORDER BY increment_id DESC', |
7400 | 7399 | $itemId |
@@ -7440,7 +7439,7 @@ discard block |
||
7440 | 7439 | |
7441 | 7440 | // Delete related background tasks if any |
7442 | 7441 | $task = DB::queryFirstRow( |
7443 | - 'SELECT increment_id FROM ' . prefixTable('background_tasks') . ' |
|
7442 | + 'SELECT increment_id FROM '.prefixTable('background_tasks').' |
|
7444 | 7443 | WHERE item_id = %i AND finished_at = ""', |
7445 | 7444 | $itemId |
7446 | 7445 | ); |
@@ -7453,7 +7452,7 @@ discard block |
||
7453 | 7452 | // Check if encryption process is still running |
7454 | 7453 | DB::queryFirstRow( |
7455 | 7454 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
7456 | - FROM ' . prefixTable('background_tasks') . ' |
|
7455 | + FROM ' . prefixTable('background_tasks').' |
|
7457 | 7456 | WHERE item_id = %i AND finished_at = "" |
7458 | 7457 | ORDER BY increment_id DESC', |
7459 | 7458 | $itemId |
@@ -7474,7 +7473,7 @@ discard block |
||
7474 | 7473 | } |
7475 | 7474 | |
7476 | 7475 | return [ |
7477 | - 'status' => true, // Encryption in progress |
|
7476 | + 'status' => true, // Encryption in progress |
|
7478 | 7477 | 'delay' => $delay - $elapsed, // Time remaining before the lock expires |
7479 | 7478 | ]; |
7480 | 7479 | } |
@@ -7519,7 +7518,7 @@ discard block |
||
7519 | 7518 | { |
7520 | 7519 | // Check if there's an ongoing background encryption process for the item |
7521 | 7520 | $ongoingProcess = DB::queryFirstRow( |
7522 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
7521 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
7523 | 7522 | $itemId |
7524 | 7523 | ); |
7525 | 7524 | |
@@ -7537,7 +7536,7 @@ discard block |
||
7537 | 7536 | function getUserVisibleFolders(int $userId): array |
7538 | 7537 | { |
7539 | 7538 | // Query to retrieve visible folders for the user |
7540 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
7539 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
7541 | 7540 | |
7542 | 7541 | // Decode JSON data into an array; return an empty array if the data is invalid |
7543 | 7542 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7561,7 +7560,7 @@ discard block |
||
7561 | 7560 | |
7562 | 7561 | // Query the access rights for the given roles and folder |
7563 | 7562 | $accessTypes = DB::queryFirstColumn( |
7564 | - 'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
7563 | + 'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
7565 | 7564 | $roles, |
7566 | 7565 | $treeId |
7567 | 7566 | ); |
@@ -1228,7 +1228,9 @@ discard block |
||
1228 | 1228 | ); |
1229 | 1229 | |
1230 | 1230 | // Create a task to create sharekeys for users |
1231 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
1231 | + if (WIP=== true) { |
|
1232 | + error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
1233 | + } |
|
1232 | 1234 | $tasksToBePerformed = ['item_password']; |
1233 | 1235 | $encryptionTaskIsRequested = true; |
1234 | 1236 | } else { |
@@ -1553,7 +1555,9 @@ discard block |
||
1553 | 1555 | |
1554 | 1556 | // create a task for all fields updated |
1555 | 1557 | if ($encryptionTaskIsRequested === true && (int) $dataItem['perso'] !== 1) { |
1556 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
1558 | + if (WIP === true) { |
|
1559 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
1560 | + } |
|
1557 | 1561 | createTaskForItem( |
1558 | 1562 | 'item_update_create_keys', |
1559 | 1563 | array_unique($tasksToBePerformed), |
@@ -2103,7 +2107,9 @@ discard block |
||
2103 | 2107 | $inputData['itemId'] |
2104 | 2108 | ); |
2105 | 2109 | foreach ($rows as $record) { |
2106 | - if ($record['raison'] === NULL) continue; |
|
2110 | + if ($record['raison'] === NULL) { |
|
2111 | + continue; |
|
2112 | + } |
|
2107 | 2113 | $reason = explode(':', $record['raison']); |
2108 | 2114 | if (count($reason) > 0) { |
2109 | 2115 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4819,8 +4825,9 @@ discard block |
||
4819 | 4825 | $ids = $tree->getDescendants($folder['id'], true, false, true); |
4820 | 4826 | |
4821 | 4827 | // This folder is owned by user |
4822 | - if (in_array($inputData['folderId'], $ids)) |
|
4823 | - $accessLevel = 30; |
|
4828 | + if (in_array($inputData['folderId'], $ids)) { |
|
4829 | + $accessLevel = 30; |
|
4830 | + } |
|
4824 | 4831 | } |
4825 | 4832 | } |
4826 | 4833 |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | ) { |
80 | 80 | // Not allowed page |
81 | 81 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
82 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
82 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
83 | 83 | exit; |
84 | 84 | } |
85 | 85 | |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | |
268 | 268 | // Get current user hash |
269 | 269 | $userHash = DB::queryFirstRow( |
270 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
270 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
271 | 271 | $session->get('user-id') |
272 | 272 | )['pw']; |
273 | 273 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | * @param string $post_key |
323 | 323 | * @return string |
324 | 324 | */ |
325 | -function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string |
|
325 | +function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string |
|
326 | 326 | { |
327 | 327 | $session = SessionManager::getSession(); |
328 | 328 | |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | if (isset($dataReceived['user_id'])) { |
358 | 358 | // Get info about user to modify |
359 | 359 | $targetUserInfos = DB::queryFirstRow( |
360 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
360 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
361 | 361 | WHERE id = %i', |
362 | 362 | $dataReceived['user_id'] |
363 | 363 | ); |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | case 'mail_me'://action_mail |
507 | 507 | // Get info about user to send email |
508 | 508 | $data_user = DB::queryFirstRow( |
509 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
509 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
510 | 510 | WHERE email = %s', |
511 | 511 | filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
512 | 512 | ); |
@@ -624,7 +624,7 @@ discard block |
||
624 | 624 | if (isset($dataReceived['user_id'])) { |
625 | 625 | // Get info about user to modify |
626 | 626 | $targetUserInfos = DB::queryFirstRow( |
627 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
627 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
628 | 628 | WHERE id = %i', |
629 | 629 | $dataReceived['user_id'] |
630 | 630 | ); |
@@ -708,7 +708,7 @@ discard block |
||
708 | 708 | |
709 | 709 | // Get current user hash |
710 | 710 | $userHash = DB::queryFirstRow( |
711 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
711 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
712 | 712 | $session->get('user-id') |
713 | 713 | )['pw']; |
714 | 714 | |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | |
747 | 747 | // Get current user hash |
748 | 748 | $userHash = DB::queryFirstRow( |
749 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
749 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
750 | 750 | $session->get('user-id') |
751 | 751 | )['pw']; |
752 | 752 | |
@@ -790,7 +790,7 @@ discard block |
||
790 | 790 | |
791 | 791 | // Get current user hash |
792 | 792 | $userHash = DB::queryFirstRow( |
793 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %i;", |
|
793 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %i;", |
|
794 | 794 | $session->get('user-id') |
795 | 795 | )['pw']; |
796 | 796 | |
@@ -834,7 +834,7 @@ discard block |
||
834 | 834 | * @param array $SETTINGS |
835 | 835 | * @return string |
836 | 836 | */ |
837 | -function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
837 | +function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
838 | 838 | { |
839 | 839 | $session = SessionManager::getSession(); |
840 | 840 | switch ($post_type) { |
@@ -935,7 +935,7 @@ discard block |
||
935 | 935 | ) |
936 | 936 | ); |
937 | 937 | |
938 | - return '[{"token" : "' . $token . '"}]'; |
|
938 | + return '[{"token" : "'.$token.'"}]'; |
|
939 | 939 | |
940 | 940 | /* |
941 | 941 | * Default case |
@@ -951,7 +951,7 @@ discard block |
||
951 | 951 | } |
952 | 952 | |
953 | 953 | |
954 | -function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
954 | +function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
955 | 955 | { |
956 | 956 | switch ($post_type) { |
957 | 957 | /* |
@@ -1020,7 +1020,7 @@ discard block |
||
1020 | 1020 | array( |
1021 | 1021 | 'error' => false, |
1022 | 1022 | 'timestamp' => $session->get('user-session_duration'), |
1023 | - 'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
1023 | + 'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
1024 | 1024 | 'max_session_duration' => $maximum_session_expiration_time, |
1025 | 1025 | ), |
1026 | 1026 | 'encode' |
@@ -1072,7 +1072,7 @@ discard block |
||
1072 | 1072 | // get number of items |
1073 | 1073 | DB::queryFirstRow( |
1074 | 1074 | 'SELECT increment_id |
1075 | - FROM ' . prefixTable('sharekeys_items') . |
|
1075 | + FROM ' . prefixTable('sharekeys_items'). |
|
1076 | 1076 | ' WHERE user_id = %i', |
1077 | 1077 | $userId |
1078 | 1078 | ); |
@@ -1127,7 +1127,7 @@ discard block |
||
1127 | 1127 | // check if expected security level is reached |
1128 | 1128 | $dataUser = DB::queryFirstRow( |
1129 | 1129 | 'SELECT * |
1130 | - FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
1130 | + FROM ' . prefixTable('users').' WHERE id = %i', |
|
1131 | 1131 | $post_user_id |
1132 | 1132 | ); |
1133 | 1133 | |
@@ -1148,8 +1148,8 @@ discard block |
||
1148 | 1148 | if (empty($dataUser['fonction_id']) === false) { |
1149 | 1149 | $data = DB::queryFirstRow( |
1150 | 1150 | 'SELECT complexity |
1151 | - FROM ' . prefixTable('roles_title') . ' |
|
1152 | - WHERE id IN (' . $dataUser['fonction_id'] . ') |
|
1151 | + FROM ' . prefixTable('roles_title').' |
|
1152 | + WHERE id IN (' . $dataUser['fonction_id'].') |
|
1153 | 1153 | ORDER BY complexity DESC' |
1154 | 1154 | ); |
1155 | 1155 | } else { |
@@ -1162,8 +1162,8 @@ discard block |
||
1162 | 1162 | return prepareExchangedData( |
1163 | 1163 | array( |
1164 | 1164 | 'error' => true, |
1165 | - 'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' . |
|
1166 | - $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>', |
|
1165 | + 'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'. |
|
1166 | + $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>', |
|
1167 | 1167 | ), |
1168 | 1168 | 'encode' |
1169 | 1169 | ); |
@@ -1267,14 +1267,14 @@ discard block |
||
1267 | 1267 | // Get data about user |
1268 | 1268 | $dataUser = DB::queryFirstRow( |
1269 | 1269 | 'SELECT id, email, pw |
1270 | - FROM ' . prefixTable('users') . ' |
|
1270 | + FROM ' . prefixTable('users').' |
|
1271 | 1271 | WHERE login = %s', |
1272 | 1272 | $post_login |
1273 | 1273 | ); |
1274 | 1274 | } else { |
1275 | 1275 | $dataUser = DB::queryFirstRow( |
1276 | 1276 | 'SELECT id, login, email, pw |
1277 | - FROM ' . prefixTable('users') . ' |
|
1277 | + FROM ' . prefixTable('users').' |
|
1278 | 1278 | WHERE id = %i', |
1279 | 1279 | $post_id |
1280 | 1280 | ); |
@@ -1328,7 +1328,7 @@ discard block |
||
1328 | 1328 | // Check if token already used |
1329 | 1329 | $dataToken = DB::queryFirstRow( |
1330 | 1330 | 'SELECT end_timestamp, reason |
1331 | - FROM ' . prefixTable('tokens') . ' |
|
1331 | + FROM ' . prefixTable('tokens').' |
|
1332 | 1332 | WHERE token = %s AND user_id = %i', |
1333 | 1333 | $post_token, |
1334 | 1334 | $dataUser['id'] |
@@ -1339,11 +1339,11 @@ discard block |
||
1339 | 1339 | return prepareExchangedData( |
1340 | 1340 | array( |
1341 | 1341 | 'error' => true, |
1342 | - 'message' => 'TOKEN already used',//$lang->get('no_email_set'), |
|
1342 | + 'message' => 'TOKEN already used', //$lang->get('no_email_set'), |
|
1343 | 1343 | ), |
1344 | 1344 | 'encode' |
1345 | 1345 | ); |
1346 | - } elseif(DB::count() === 0) { |
|
1346 | + } elseif (DB::count() === 0) { |
|
1347 | 1347 | // Store token for this action |
1348 | 1348 | DB::insert( |
1349 | 1349 | prefixTable('tokens'), |
@@ -1405,7 +1405,7 @@ discard block |
||
1405 | 1405 | 'email' => $dataUser['email'], |
1406 | 1406 | 'email_result' => str_replace( |
1407 | 1407 | '#email#', |
1408 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
1408 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
1409 | 1409 | addslashes($lang->get('admin_email_result_ok')) |
1410 | 1410 | ), |
1411 | 1411 | ), |
@@ -1421,7 +1421,7 @@ discard block |
||
1421 | 1421 | 'email' => $dataUser['email'], |
1422 | 1422 | 'email_result' => str_replace( |
1423 | 1423 | '#email#', |
1424 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
1424 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
1425 | 1425 | addslashes($lang->get('admin_email_result_ok')) |
1426 | 1426 | ), |
1427 | 1427 | ), |
@@ -1438,7 +1438,7 @@ discard block |
||
1438 | 1438 | |
1439 | 1439 | if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) { |
1440 | 1440 | $row = DB::queryFirstRow( |
1441 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', |
|
1441 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', |
|
1442 | 1442 | 'cron', |
1443 | 1443 | 'sending_emails' |
1444 | 1444 | ); |
@@ -1446,7 +1446,7 @@ discard block |
||
1446 | 1446 | if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) { |
1447 | 1447 | $rows = DB::query( |
1448 | 1448 | 'SELECT * |
1449 | - FROM ' . prefixTable('emails') . |
|
1449 | + FROM ' . prefixTable('emails'). |
|
1450 | 1450 | ' WHERE status != %s', |
1451 | 1451 | 'sent' |
1452 | 1452 | ); |
@@ -1498,8 +1498,8 @@ discard block |
||
1498 | 1498 | $arr_html = array(); |
1499 | 1499 | $rows = DB::query( |
1500 | 1500 | 'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted |
1501 | - FROM ' . prefixTable('log_items') . ' AS l |
|
1502 | - RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
1501 | + FROM ' . prefixTable('log_items').' AS l |
|
1502 | + RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
1503 | 1503 | WHERE l.action = %s AND l.id_user = %i |
1504 | 1504 | ORDER BY l.date DESC |
1505 | 1505 | LIMIT 0, 100', |
@@ -1531,7 +1531,7 @@ discard block |
||
1531 | 1531 | if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true |
1532 | 1532 | && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1) |
1533 | 1533 | ) { |
1534 | - DB::query('SELECT * FROM ' . prefixTable('suggestion')); |
|
1534 | + DB::query('SELECT * FROM '.prefixTable('suggestion')); |
|
1535 | 1535 | $nb_suggestions_waiting = DB::count(); |
1536 | 1536 | } |
1537 | 1537 | |
@@ -1566,13 +1566,13 @@ discard block |
||
1566 | 1566 | if ($data === 'stat_languages') { |
1567 | 1567 | $tmp = ''; |
1568 | 1568 | foreach ($stats_data[$data] as $key => $value) { |
1569 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
1569 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
1570 | 1570 | } |
1571 | 1571 | $statsToSend[$data] = $tmp; |
1572 | 1572 | } elseif ($data === 'stat_country') { |
1573 | 1573 | $tmp = ''; |
1574 | 1574 | foreach ($stats_data[$data] as $key => $value) { |
1575 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
1575 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
1576 | 1576 | } |
1577 | 1577 | $statsToSend[$data] = $tmp; |
1578 | 1578 | } else { |
@@ -1659,7 +1659,7 @@ discard block |
||
1659 | 1659 | $url_found = $value; |
1660 | 1660 | if (empty($url_found) === false) { |
1661 | 1661 | $tmp = parse_url($url_found); |
1662 | - $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
1662 | + $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
1663 | 1663 | $value = $anonym_url; |
1664 | 1664 | } else { |
1665 | 1665 | $value = ''; |
@@ -1689,7 +1689,7 @@ discard block |
||
1689 | 1689 | $teampass_errors = ''; |
1690 | 1690 | $rows = DB::query( |
1691 | 1691 | 'SELECT label, date AS error_date |
1692 | - FROM ' . prefixTable('log_system') . " |
|
1692 | + FROM ' . prefixTable('log_system')." |
|
1693 | 1693 | WHERE `type` LIKE 'error' |
1694 | 1694 | ORDER BY `date` DESC |
1695 | 1695 | LIMIT 0, 10" |
@@ -1697,9 +1697,9 @@ discard block |
||
1697 | 1697 | if (DB::count() > 0) { |
1698 | 1698 | foreach ($rows as $record) { |
1699 | 1699 | if (empty($teampass_errors) === true) { |
1700 | - $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
1700 | + $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
1701 | 1701 | } else { |
1702 | - $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
1702 | + $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
1703 | 1703 | } |
1704 | 1704 | } |
1705 | 1705 | } |
@@ -1711,7 +1711,7 @@ discard block |
||
1711 | 1711 | |
1712 | 1712 | // Now prepare text |
1713 | 1713 | $txt = '### Page on which it happened |
1714 | -' . $data['current_page'] . ' |
|
1714 | +' . $data['current_page'].' |
|
1715 | 1715 | |
1716 | 1716 | ### Steps to reproduce |
1717 | 1717 | 1. |
@@ -1726,39 +1726,39 @@ discard block |
||
1726 | 1726 | Tell us what happens instead |
1727 | 1727 | |
1728 | 1728 | ### Server configuration |
1729 | -**Operating system**: ' . php_uname() . ' |
|
1729 | +**Operating system**: ' . php_uname().' |
|
1730 | 1730 | |
1731 | -**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . ' |
|
1731 | +**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].' |
|
1732 | 1732 | |
1733 | -**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . ' |
|
1733 | +**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).' |
|
1734 | 1734 | |
1735 | -**PHP version:** ' . PHP_VERSION . ' |
|
1735 | +**PHP version:** ' . PHP_VERSION.' |
|
1736 | 1736 | |
1737 | -**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . ' |
|
1737 | +**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.' |
|
1738 | 1738 | |
1739 | 1739 | **Teampass configuration variables:** |
1740 | 1740 | ``` |
1741 | -' . $list_of_options . ' |
|
1741 | +' . $list_of_options.' |
|
1742 | 1742 | ``` |
1743 | 1743 | |
1744 | 1744 | **Updated from an older Teampass or fresh install:** |
1745 | 1745 | |
1746 | 1746 | ### Client configuration |
1747 | 1747 | |
1748 | -**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . ' |
|
1748 | +**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].' |
|
1749 | 1749 | |
1750 | -**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits |
|
1750 | +**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits |
|
1751 | 1751 | |
1752 | 1752 | ### Logs |
1753 | 1753 | |
1754 | 1754 | #### Web server error log |
1755 | 1755 | ``` |
1756 | -' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ') |
|
1756 | +' . $err['message'].' - '.$err['file'].' ('.$err['line'].') |
|
1757 | 1757 | ``` |
1758 | 1758 | |
1759 | 1759 | #### Teampass 10 last system errors |
1760 | 1760 | ``` |
1761 | -' . $teampass_errors . ' |
|
1761 | +' . $teampass_errors.' |
|
1762 | 1762 | ``` |
1763 | 1763 | |
1764 | 1764 | #### Log from the web-browser developer console (CTRL + SHIFT + i) |
@@ -1798,7 +1798,7 @@ discard block |
||
1798 | 1798 | // Check if user exists |
1799 | 1799 | $userInfo = DB::queryFirstRow( |
1800 | 1800 | 'SELECT public_key, private_key, pw, auth_type |
1801 | - FROM ' . prefixTable('users') . ' |
|
1801 | + FROM ' . prefixTable('users').' |
|
1802 | 1802 | WHERE id = %i', |
1803 | 1803 | $post_user_id |
1804 | 1804 | ); |
@@ -1807,9 +1807,9 @@ discard block |
||
1807 | 1807 | // Get one item |
1808 | 1808 | $currentUserKey = DB::queryFirstRow( |
1809 | 1809 | 'SELECT object_id, share_key, increment_id |
1810 | - FROM ' . prefixTable('sharekeys_items') . ' AS si |
|
1811 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id) |
|
1812 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON (i.id_tree = nt.id) |
|
1810 | + FROM ' . prefixTable('sharekeys_items').' AS si |
|
1811 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id) |
|
1812 | + INNER JOIN ' . prefixTable('nested_tree').' AS nt ON (i.id_tree = nt.id) |
|
1813 | 1813 | WHERE user_id = %i AND nt.personal_folder = %i', |
1814 | 1814 | $post_user_id, |
1815 | 1815 | 0 |
@@ -1903,7 +1903,7 @@ discard block |
||
1903 | 1903 | // Get user info |
1904 | 1904 | $userData = DB::queryFirstRow( |
1905 | 1905 | 'SELECT private_key |
1906 | - FROM ' . prefixTable('users') . ' |
|
1906 | + FROM ' . prefixTable('users').' |
|
1907 | 1907 | WHERE id = %i', |
1908 | 1908 | $post_user_id |
1909 | 1909 | ); |
@@ -1984,7 +1984,7 @@ discard block |
||
1984 | 1984 | // Get user info |
1985 | 1985 | $userData = DB::queryFirstRow( |
1986 | 1986 | 'SELECT email, auth_type, login |
1987 | - FROM ' . prefixTable('users') . ' |
|
1987 | + FROM ' . prefixTable('users').' |
|
1988 | 1988 | WHERE id = %i', |
1989 | 1989 | $post_user_id |
1990 | 1990 | ); |
@@ -2082,7 +2082,7 @@ discard block |
||
2082 | 2082 | // Get user info |
2083 | 2083 | $userData = DB::queryFirstRow( |
2084 | 2084 | 'SELECT email, auth_type, login |
2085 | - FROM ' . prefixTable('users') . ' |
|
2085 | + FROM ' . prefixTable('users').' |
|
2086 | 2086 | WHERE id = %i', |
2087 | 2087 | $userId |
2088 | 2088 | ); |
@@ -2148,7 +2148,7 @@ discard block |
||
2148 | 2148 | // Check if user exists |
2149 | 2149 | DB::queryFirstRow( |
2150 | 2150 | 'SELECT * |
2151 | - FROM ' . prefixTable('users') . ' |
|
2151 | + FROM ' . prefixTable('users').' |
|
2152 | 2152 | WHERE id = %i', |
2153 | 2153 | $post_user_id |
2154 | 2154 | ); |
@@ -2218,7 +2218,7 @@ discard block |
||
2218 | 2218 | // Check if user exists |
2219 | 2219 | $userInfo = DB::queryFirstRow( |
2220 | 2220 | 'SELECT public_key |
2221 | - FROM ' . prefixTable('users') . ' |
|
2221 | + FROM ' . prefixTable('users').' |
|
2222 | 2222 | WHERE id = %i', |
2223 | 2223 | $post_user_id |
2224 | 2224 | ); |
@@ -2366,15 +2366,15 @@ discard block |
||
2366 | 2366 | // Loop on items |
2367 | 2367 | $rows = DB::query( |
2368 | 2368 | 'SELECT id, pw |
2369 | - FROM ' . prefixTable('items') . ' |
|
2369 | + FROM ' . prefixTable('items').' |
|
2370 | 2370 | WHERE perso = 0 |
2371 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2371 | + LIMIT ' . $post_start.', '.$post_length |
|
2372 | 2372 | ); |
2373 | 2373 | foreach ($rows as $record) { |
2374 | 2374 | // Get itemKey from current user |
2375 | 2375 | $currentUserKey = DB::queryFirstRow( |
2376 | 2376 | 'SELECT share_key, increment_id |
2377 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2377 | + FROM ' . prefixTable('sharekeys_items').' |
|
2378 | 2378 | WHERE object_id = %i AND user_id = %i', |
2379 | 2379 | $record['id'], |
2380 | 2380 | $session->get('user-id') |
@@ -2406,7 +2406,7 @@ discard block |
||
2406 | 2406 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2407 | 2407 | $currentUserKey = DB::queryFirstRow( |
2408 | 2408 | 'SELECT increment_id |
2409 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2409 | + FROM ' . prefixTable('sharekeys_items').' |
|
2410 | 2410 | WHERE object_id = %i AND user_id = %i', |
2411 | 2411 | $record['id'], |
2412 | 2412 | $post_user_id |
@@ -2439,7 +2439,7 @@ discard block |
||
2439 | 2439 | // SHould we change step? |
2440 | 2440 | DB::query( |
2441 | 2441 | 'SELECT * |
2442 | - FROM ' . prefixTable('items') . ' |
|
2442 | + FROM ' . prefixTable('items').' |
|
2443 | 2443 | WHERE perso = 0' |
2444 | 2444 | ); |
2445 | 2445 | |
@@ -2464,15 +2464,15 @@ discard block |
||
2464 | 2464 | // Loop on logs |
2465 | 2465 | $rows = DB::query( |
2466 | 2466 | 'SELECT increment_id |
2467 | - FROM ' . prefixTable('log_items') . ' |
|
2467 | + FROM ' . prefixTable('log_items').' |
|
2468 | 2468 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
2469 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2469 | + LIMIT ' . $post_start.', '.$post_length |
|
2470 | 2470 | ); |
2471 | 2471 | foreach ($rows as $record) { |
2472 | 2472 | // Get itemKey from current user |
2473 | 2473 | $currentUserKey = DB::queryFirstRow( |
2474 | 2474 | 'SELECT share_key |
2475 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
2475 | + FROM ' . prefixTable('sharekeys_logs').' |
|
2476 | 2476 | WHERE object_id = %i AND user_id = %i', |
2477 | 2477 | $record['increment_id'], |
2478 | 2478 | $session->get('user-id') |
@@ -2504,7 +2504,7 @@ discard block |
||
2504 | 2504 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2505 | 2505 | $currentUserKey = DB::queryFirstRow( |
2506 | 2506 | 'SELECT increment_id |
2507 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2507 | + FROM ' . prefixTable('sharekeys_items').' |
|
2508 | 2508 | WHERE object_id = %i AND user_id = %i', |
2509 | 2509 | $record['id'], |
2510 | 2510 | $post_user_id |
@@ -2526,7 +2526,7 @@ discard block |
||
2526 | 2526 | // SHould we change step? |
2527 | 2527 | DB::query( |
2528 | 2528 | 'SELECT increment_id |
2529 | - FROM ' . prefixTable('log_items') . ' |
|
2529 | + FROM ' . prefixTable('log_items').' |
|
2530 | 2530 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
2531 | 2531 | ); |
2532 | 2532 | |
@@ -2551,15 +2551,15 @@ discard block |
||
2551 | 2551 | // Loop on fields |
2552 | 2552 | $rows = DB::query( |
2553 | 2553 | 'SELECT id |
2554 | - FROM ' . prefixTable('categories_items') . ' |
|
2554 | + FROM ' . prefixTable('categories_items').' |
|
2555 | 2555 | WHERE encryption_type = "teampass_aes" |
2556 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2556 | + LIMIT ' . $post_start.', '.$post_length |
|
2557 | 2557 | ); |
2558 | 2558 | foreach ($rows as $record) { |
2559 | 2559 | // Get itemKey from current user |
2560 | 2560 | $currentUserKey = DB::queryFirstRow( |
2561 | 2561 | 'SELECT share_key |
2562 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2562 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2563 | 2563 | WHERE object_id = %i AND user_id = %i', |
2564 | 2564 | $record['id'], |
2565 | 2565 | $session->get('user-id') |
@@ -2591,7 +2591,7 @@ discard block |
||
2591 | 2591 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2592 | 2592 | $currentUserKey = DB::queryFirstRow( |
2593 | 2593 | 'SELECT increment_id |
2594 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2594 | + FROM ' . prefixTable('sharekeys_items').' |
|
2595 | 2595 | WHERE object_id = %i AND user_id = %i', |
2596 | 2596 | $record['id'], |
2597 | 2597 | $post_user_id |
@@ -2613,7 +2613,7 @@ discard block |
||
2613 | 2613 | // SHould we change step? |
2614 | 2614 | DB::query( |
2615 | 2615 | 'SELECT * |
2616 | - FROM ' . prefixTable('categories_items') . ' |
|
2616 | + FROM ' . prefixTable('categories_items').' |
|
2617 | 2617 | WHERE encryption_type = "teampass_aes"' |
2618 | 2618 | ); |
2619 | 2619 | |
@@ -2638,14 +2638,14 @@ discard block |
||
2638 | 2638 | // Loop on suggestions |
2639 | 2639 | $rows = DB::query( |
2640 | 2640 | 'SELECT id |
2641 | - FROM ' . prefixTable('suggestion') . ' |
|
2642 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2641 | + FROM ' . prefixTable('suggestion').' |
|
2642 | + LIMIT ' . $post_start.', '.$post_length |
|
2643 | 2643 | ); |
2644 | 2644 | foreach ($rows as $record) { |
2645 | 2645 | // Get itemKey from current user |
2646 | 2646 | $currentUserKey = DB::queryFirstRow( |
2647 | 2647 | 'SELECT share_key |
2648 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
2648 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
2649 | 2649 | WHERE object_id = %i AND user_id = %i', |
2650 | 2650 | $record['id'], |
2651 | 2651 | $session->get('user-id') |
@@ -2677,7 +2677,7 @@ discard block |
||
2677 | 2677 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2678 | 2678 | $currentUserKey = DB::queryFirstRow( |
2679 | 2679 | 'SELECT increment_id |
2680 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2680 | + FROM ' . prefixTable('sharekeys_items').' |
|
2681 | 2681 | WHERE object_id = %i AND user_id = %i', |
2682 | 2682 | $record['id'], |
2683 | 2683 | $post_user_id |
@@ -2723,15 +2723,15 @@ discard block |
||
2723 | 2723 | // Loop on files |
2724 | 2724 | $rows = DB::query( |
2725 | 2725 | 'SELECT id |
2726 | - FROM ' . prefixTable('files') . ' |
|
2727 | - WHERE status = "' . TP_ENCRYPTION_NAME . '" |
|
2728 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2726 | + FROM ' . prefixTable('files').' |
|
2727 | + WHERE status = "' . TP_ENCRYPTION_NAME.'" |
|
2728 | + LIMIT ' . $post_start.', '.$post_length |
|
2729 | 2729 | ); //aes_encryption |
2730 | 2730 | foreach ($rows as $record) { |
2731 | 2731 | // Get itemKey from current user |
2732 | 2732 | $currentUserKey = DB::queryFirstRow( |
2733 | 2733 | 'SELECT share_key |
2734 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
2734 | + FROM ' . prefixTable('sharekeys_files').' |
|
2735 | 2735 | WHERE object_id = %i AND user_id = %i', |
2736 | 2736 | $record['id'], |
2737 | 2737 | $session->get('user-id') |
@@ -2763,7 +2763,7 @@ discard block |
||
2763 | 2763 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2764 | 2764 | $currentUserKey = DB::queryFirstRow( |
2765 | 2765 | 'SELECT increment_id |
2766 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2766 | + FROM ' . prefixTable('sharekeys_items').' |
|
2767 | 2767 | WHERE object_id = %i AND user_id = %i', |
2768 | 2768 | $record['id'], |
2769 | 2769 | $post_user_id |
@@ -2785,8 +2785,8 @@ discard block |
||
2785 | 2785 | // SHould we change step? |
2786 | 2786 | DB::query( |
2787 | 2787 | 'SELECT * |
2788 | - FROM ' . prefixTable('files') . ' |
|
2789 | - WHERE status = "' . TP_ENCRYPTION_NAME . '"' |
|
2788 | + FROM ' . prefixTable('files').' |
|
2789 | + WHERE status = "' . TP_ENCRYPTION_NAME.'"' |
|
2790 | 2790 | ); |
2791 | 2791 | |
2792 | 2792 | $next_start = (int) $post_start + (int) $post_length; |
@@ -2819,9 +2819,9 @@ discard block |
||
2819 | 2819 | if (count($session->get('user-personal_folders')) > 0) { |
2820 | 2820 | $rows = DB::query( |
2821 | 2821 | 'SELECT id, pw |
2822 | - FROM ' . prefixTable('items') . ' |
|
2822 | + FROM ' . prefixTable('items').' |
|
2823 | 2823 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s |
2824 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
2824 | + LIMIT ' . $post_start.', '.$post_length, |
|
2825 | 2825 | $session->get('user-personal_folders'), |
2826 | 2826 | "defuse" |
2827 | 2827 | ); |
@@ -2829,7 +2829,7 @@ discard block |
||
2829 | 2829 | // Get itemKey from current user |
2830 | 2830 | $currentUserKey = DB::queryFirstRow( |
2831 | 2831 | 'SELECT share_key, increment_id |
2832 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2832 | + FROM ' . prefixTable('sharekeys_items').' |
|
2833 | 2833 | WHERE object_id = %i AND user_id = %i', |
2834 | 2834 | $record['id'], |
2835 | 2835 | $session->get('user-id') |
@@ -2856,7 +2856,7 @@ discard block |
||
2856 | 2856 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2857 | 2857 | $currentUserKey = DB::queryFirstRow( |
2858 | 2858 | 'SELECT increment_id |
2859 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2859 | + FROM ' . prefixTable('sharekeys_items').' |
|
2860 | 2860 | WHERE object_id = %i AND user_id = %i', |
2861 | 2861 | $record['id'], |
2862 | 2862 | $post_user_id |
@@ -2879,7 +2879,7 @@ discard block |
||
2879 | 2879 | // SHould we change step? |
2880 | 2880 | DB::query( |
2881 | 2881 | 'SELECT * |
2882 | - FROM ' . prefixTable('items') . ' |
|
2882 | + FROM ' . prefixTable('items').' |
|
2883 | 2883 | WHERE perso = 0' |
2884 | 2884 | ); |
2885 | 2885 | |
@@ -2907,7 +2907,7 @@ discard block |
||
2907 | 2907 | // Check if user exists |
2908 | 2908 | $userInfo = DB::queryFirstRow( |
2909 | 2909 | 'SELECT public_key, encrypted_psk |
2910 | - FROM ' . prefixTable('users') . ' |
|
2910 | + FROM ' . prefixTable('users').' |
|
2911 | 2911 | WHERE id = %i', |
2912 | 2912 | $post_user_id |
2913 | 2913 | ); |
@@ -2933,7 +2933,7 @@ discard block |
||
2933 | 2933 | if ($post_counterItemsToTreat === -1) { |
2934 | 2934 | DB::query( |
2935 | 2935 | 'SELECT id |
2936 | - FROM ' . prefixTable('items') . ' |
|
2936 | + FROM ' . prefixTable('items').' |
|
2937 | 2937 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
2938 | 2938 | $session->get('user-personal_folders'), |
2939 | 2939 | 'teampass_aes' |
@@ -2946,7 +2946,7 @@ discard block |
||
2946 | 2946 | // Loop on persoanl items |
2947 | 2947 | $rows = DB::query( |
2948 | 2948 | 'SELECT id, pw |
2949 | - FROM ' . prefixTable('items') . ' |
|
2949 | + FROM ' . prefixTable('items').' |
|
2950 | 2950 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s |
2951 | 2951 | LIMIT ' . $post_length, |
2952 | 2952 | $session->get('user-personal_folders'), |
@@ -2990,7 +2990,7 @@ discard block |
||
2990 | 2990 | // Loop on files |
2991 | 2991 | $rows = DB::query( |
2992 | 2992 | 'SELECT id, file |
2993 | - FROM ' . prefixTable('files') . ' |
|
2993 | + FROM ' . prefixTable('files').' |
|
2994 | 2994 | WHERE status != %s |
2995 | 2995 | AND id_item = %i', |
2996 | 2996 | TP_ENCRYPTION_NAME, |
@@ -3001,13 +3001,13 @@ discard block |
||
3001 | 3001 | // Now decrypt the file |
3002 | 3002 | prepareFileWithDefuse( |
3003 | 3003 | 'decrypt', |
3004 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'], |
|
3005 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete', |
|
3004 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'], |
|
3005 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete', |
|
3006 | 3006 | $post_user_psk |
3007 | 3007 | ); |
3008 | 3008 | |
3009 | 3009 | // Encrypt the file |
3010 | - $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']); |
|
3010 | + $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']); |
|
3011 | 3011 | |
3012 | 3012 | DB::update( |
3013 | 3013 | prefixTable('files'), |
@@ -3030,7 +3030,7 @@ discard block |
||
3030 | 3030 | ); |
3031 | 3031 | |
3032 | 3032 | // Unlink original file |
3033 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']); |
|
3033 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']); |
|
3034 | 3034 | } |
3035 | 3035 | } |
3036 | 3036 | |
@@ -3038,7 +3038,7 @@ discard block |
||
3038 | 3038 | $next_start = (int) $post_start + (int) $post_length; |
3039 | 3039 | DB::query( |
3040 | 3040 | 'SELECT id |
3041 | - FROM ' . prefixTable('items') . ' |
|
3041 | + FROM ' . prefixTable('items').' |
|
3042 | 3042 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
3043 | 3043 | $session->get('user-personal_folders'), |
3044 | 3044 | 'teampass_aes' |
@@ -3108,7 +3108,7 @@ discard block |
||
3108 | 3108 | // Get user info |
3109 | 3109 | $userData = DB::queryFirstRow( |
3110 | 3110 | 'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, keys_recovery_time |
3111 | - FROM ' . prefixTable('users') . ' |
|
3111 | + FROM ' . prefixTable('users').' |
|
3112 | 3112 | WHERE id = %i', |
3113 | 3113 | $post_user_id |
3114 | 3114 | ); |
@@ -3155,7 +3155,7 @@ discard block |
||
3155 | 3155 | // Get user info |
3156 | 3156 | $userData = DB::queryFirstRow( |
3157 | 3157 | 'SELECT auth_type, login, private_key |
3158 | - FROM ' . prefixTable('users') . ' |
|
3158 | + FROM ' . prefixTable('users').' |
|
3159 | 3159 | WHERE id = %i', |
3160 | 3160 | $post_user_id |
3161 | 3161 | ); |
@@ -3205,7 +3205,7 @@ discard block |
||
3205 | 3205 | return prepareExchangedData( |
3206 | 3206 | array( |
3207 | 3207 | 'error' => false, |
3208 | - 'message' => $lang->get('done'),'', |
|
3208 | + 'message' => $lang->get('done'), '', |
|
3209 | 3209 | ), |
3210 | 3210 | 'encode' |
3211 | 3211 | ); |
@@ -3254,7 +3254,7 @@ discard block |
||
3254 | 3254 | // Get user info |
3255 | 3255 | $userData = DB::queryFirstRow( |
3256 | 3256 | 'SELECT u.auth_type, u.login, u.private_key, u.special |
3257 | - FROM ' . prefixTable('users') . ' AS u |
|
3257 | + FROM ' . prefixTable('users').' AS u |
|
3258 | 3258 | WHERE u.id = %i', |
3259 | 3259 | $post_user_id |
3260 | 3260 | ); |
@@ -3290,7 +3290,7 @@ discard block |
||
3290 | 3290 | return prepareExchangedData( |
3291 | 3291 | array( |
3292 | 3292 | 'error' => false, |
3293 | - 'message' => $lang->get('done'),'', |
|
3293 | + 'message' => $lang->get('done'), '', |
|
3294 | 3294 | ), |
3295 | 3295 | 'encode' |
3296 | 3296 | ); |
@@ -3312,8 +3312,8 @@ discard block |
||
3312 | 3312 | // Get one itemKey from current user |
3313 | 3313 | $currentUserKey = DB::queryFirstRow( |
3314 | 3314 | 'SELECT ski.share_key, ski.increment_id, l.id_user |
3315 | - FROM ' . prefixTable('sharekeys_items') . ' AS ski |
|
3316 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item |
|
3315 | + FROM ' . prefixTable('sharekeys_items').' AS ski |
|
3316 | + INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item |
|
3317 | 3317 | WHERE ski.user_id = %i |
3318 | 3318 | ORDER BY RAND() |
3319 | 3319 | LIMIT 1', |
@@ -3381,8 +3381,8 @@ discard block |
||
3381 | 3381 | 'process_type' => 'create_user_keys', |
3382 | 3382 | 'arguments' => json_encode([ |
3383 | 3383 | 'new_user_id' => (int) $post_user_id, |
3384 | - 'new_user_pwd' => cryption($post_previous_pwd, '','encrypt')['string'], |
|
3385 | - 'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'], |
|
3384 | + 'new_user_pwd' => cryption($post_previous_pwd, '', 'encrypt')['string'], |
|
3385 | + 'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'], |
|
3386 | 3386 | 'send_email' => 0, |
3387 | 3387 | 'otp_provided_new_value' => 0, |
3388 | 3388 | 'user_self_change' => 1, |
@@ -3452,7 +3452,7 @@ discard block |
||
3452 | 3452 | id, |
3453 | 3453 | private_key, |
3454 | 3454 | created_at |
3455 | - FROM " . prefixTable('user_private_keys') . " |
|
3455 | + FROM " . prefixTable('user_private_keys')." |
|
3456 | 3456 | WHERE user_id = %i |
3457 | 3457 | ORDER BY created_at DESC, id DESC", |
3458 | 3458 | $userId |
@@ -3480,9 +3480,9 @@ discard block |
||
3480 | 3480 | // Select one personal item share_key to test decryption |
3481 | 3481 | $currentUserItemKey = DB::queryFirstRow( |
3482 | 3482 | 'SELECT si.share_key, si.increment_id, l.id_user, i.perso |
3483 | - FROM ' . prefixTable('sharekeys_items') . ' AS si |
|
3484 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON si.object_id = l.id_item |
|
3485 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = l.id_item |
|
3483 | + FROM ' . prefixTable('sharekeys_items').' AS si |
|
3484 | + INNER JOIN ' . prefixTable('log_items').' AS l ON si.object_id = l.id_item |
|
3485 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = l.id_item |
|
3486 | 3486 | WHERE si.user_id = %i AND i.perso = 1 AND si.share_key != "" |
3487 | 3487 | ORDER BY RAND() |
3488 | 3488 | LIMIT 1', |
@@ -3543,7 +3543,7 @@ discard block |
||
3543 | 3543 | $session->get('user-id') |
3544 | 3544 | ); |
3545 | 3545 | // Return data |
3546 | - return '[{"new_value":"' . $session->get('user-session_duration') . '"}]'; |
|
3546 | + return '[{"new_value":"'.$session->get('user-session_duration').'"}]'; |
|
3547 | 3547 | } |
3548 | 3548 | |
3549 | 3549 | return '[{"new_value":"expired"}]'; |
@@ -99,19 +99,19 @@ discard block |
||
99 | 99 | $text = Crypto::decrypt($message, $key); |
100 | 100 | } |
101 | 101 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
102 | - error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage()); |
|
102 | + error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage()); |
|
103 | 103 | $err = 'wrong_key_or_modified_ciphertext'; |
104 | 104 | } catch (CryptoException\BadFormatException $ex) { |
105 | - error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage()); |
|
105 | + error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage()); |
|
106 | 106 | $err = 'bad_format'; |
107 | 107 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
108 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
108 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
109 | 109 | $err = 'environment_error'; |
110 | 110 | } catch (CryptoException\IOException $ex) { |
111 | - error_log('TEAMPASS-Error-IO: ' . $ex->getMessage()); |
|
111 | + error_log('TEAMPASS-Error-IO: '.$ex->getMessage()); |
|
112 | 112 | $err = 'io_error'; |
113 | 113 | } catch (Exception $ex) { |
114 | - error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage()); |
|
114 | + error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage()); |
|
115 | 115 | $err = 'unexpected_error'; |
116 | 116 | } |
117 | 117 | |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | */ |
197 | 197 | function trimElement($chaine, string $element): string |
198 | 198 | { |
199 | - if (! empty($chaine)) { |
|
199 | + if (!empty($chaine)) { |
|
200 | 200 | if (is_array($chaine) === true) { |
201 | 201 | $chaine = implode(';', $chaine); |
202 | 202 | } |
@@ -244,8 +244,8 @@ discard block |
||
244 | 244 | */ |
245 | 245 | function db_error_handler(array $params): void |
246 | 246 | { |
247 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
248 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
247 | + echo 'Error: '.$params['error']."<br>\n"; |
|
248 | + echo 'Query: '.$params['query']."<br>\n"; |
|
249 | 249 | throw new Exception('Error - Query', 1); |
250 | 250 | } |
251 | 251 | |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $session->set('user-forbiden_personal_folders', []); |
324 | 324 | |
325 | 325 | // Get list of Folders |
326 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
326 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
327 | 327 | foreach ($rows as $record) { |
328 | 328 | array_push($groupesVisibles, $record['id']); |
329 | 329 | } |
@@ -332,20 +332,20 @@ discard block |
||
332 | 332 | // get complete list of ROLES |
333 | 333 | $tmp = explode(';', $idFonctions); |
334 | 334 | $rows = DB::query( |
335 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
335 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
336 | 336 | ORDER BY title ASC' |
337 | 337 | ); |
338 | 338 | foreach ($rows as $record) { |
339 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
339 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
340 | 340 | array_push($tmp, $record['id']); |
341 | 341 | } |
342 | 342 | } |
343 | 343 | $session->set('user-roles', implode(';', $tmp)); |
344 | 344 | $session->set('user-admin', 1); |
345 | 345 | // Check if admin has created Folders and Roles |
346 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
346 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
347 | 347 | $session->set('user-nb_folders', DB::count()); |
348 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
348 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
349 | 349 | $session->set('user-nb_roles', DB::count()); |
350 | 350 | |
351 | 351 | return true; |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | // Does this user is allowed to see other items |
429 | 429 | $inc = 0; |
430 | 430 | $rows = DB::query( |
431 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
431 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
432 | 432 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
433 | 433 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
434 | 434 | $globalsUserId, |
@@ -445,8 +445,8 @@ discard block |
||
445 | 445 | // Check for the users roles if some specific rights exist on items |
446 | 446 | $rows = DB::query( |
447 | 447 | 'SELECT i.id_tree, r.item_id |
448 | - FROM ' . prefixTable('items') . ' as i |
|
449 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
448 | + FROM ' . prefixTable('items').' as i |
|
449 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
450 | 450 | WHERE i.id_tree <> "" '. |
451 | 451 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
452 | 452 | 'ORDER BY i.id_tree ASC', |
@@ -490,18 +490,18 @@ discard block |
||
490 | 490 | $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems); |
491 | 491 | $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders); |
492 | 492 | // Folders and Roles numbers |
493 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
494 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
493 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
494 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
495 | 495 | $session->set('user-nb_folders', DB::count()); |
496 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
497 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
496 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
497 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
498 | 498 | $session->set('user-nb_roles', DB::count()); |
499 | 499 | // check if change proposals on User's items |
500 | 500 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
501 | 501 | $countNewItems = DB::query( |
502 | 502 | 'SELECT COUNT(*) |
503 | - FROM ' . prefixTable('items_change') . ' AS c |
|
504 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
503 | + FROM ' . prefixTable('items_change').' AS c |
|
504 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
505 | 505 | WHERE i.action = %s AND i.id_user = %i', |
506 | 506 | 'at_creation', |
507 | 507 | $globalsUserId |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | { |
529 | 529 | $rows = DB::query( |
530 | 530 | 'SELECT * |
531 | - FROM ' . prefixTable('roles_values') . ' |
|
531 | + FROM ' . prefixTable('roles_values').' |
|
532 | 532 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
533 | 533 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
534 | 534 | $userRoles, |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | ) { |
596 | 596 | $persoFld = DB::queryFirstRow( |
597 | 597 | 'SELECT id |
598 | - FROM ' . prefixTable('nested_tree') . ' |
|
598 | + FROM ' . prefixTable('nested_tree').' |
|
599 | 599 | WHERE title = %s AND personal_folder = %i'. |
600 | 600 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
601 | 601 | $globalsUserId, |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | } |
629 | 629 | $persoFlds = DB::query( |
630 | 630 | 'SELECT id |
631 | - FROM ' . prefixTable('nested_tree') . ' |
|
631 | + FROM ' . prefixTable('nested_tree').' |
|
632 | 632 | WHERE %l', |
633 | 633 | $where |
634 | 634 | ); |
@@ -696,12 +696,12 @@ discard block |
||
696 | 696 | //Load Tree |
697 | 697 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
698 | 698 | // truncate table |
699 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
699 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
700 | 700 | // reload date |
701 | 701 | $rows = DB::query( |
702 | 702 | 'SELECT * |
703 | - FROM ' . prefixTable('items') . ' as i |
|
704 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
703 | + FROM ' . prefixTable('items').' as i |
|
704 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
705 | 705 | AND l.action = %s |
706 | 706 | AND i.inactif = %i', |
707 | 707 | 'at_creation', |
@@ -713,18 +713,18 @@ discard block |
||
713 | 713 | $tags = ''; |
714 | 714 | $itemTags = DB::query( |
715 | 715 | 'SELECT tag |
716 | - FROM ' . prefixTable('tags') . ' |
|
716 | + FROM ' . prefixTable('tags').' |
|
717 | 717 | WHERE item_id = %i AND tag != ""', |
718 | 718 | $record['id'] |
719 | 719 | ); |
720 | 720 | foreach ($itemTags as $itemTag) { |
721 | - $tags .= $itemTag['tag'] . ' '; |
|
721 | + $tags .= $itemTag['tag'].' '; |
|
722 | 722 | } |
723 | 723 | |
724 | 724 | // Get renewal period |
725 | 725 | $resNT = DB::queryFirstRow( |
726 | 726 | 'SELECT renewal_period |
727 | - FROM ' . prefixTable('nested_tree') . ' |
|
727 | + FROM ' . prefixTable('nested_tree').' |
|
728 | 728 | WHERE id = %i', |
729 | 729 | $record['id_tree'] |
730 | 730 | ); |
@@ -737,7 +737,7 @@ discard block |
||
737 | 737 | // Is this a User id? |
738 | 738 | $user = DB::queryFirstRow( |
739 | 739 | 'SELECT id, login |
740 | - FROM ' . prefixTable('users') . ' |
|
740 | + FROM ' . prefixTable('users').' |
|
741 | 741 | WHERE id = %i', |
742 | 742 | $elem->title |
743 | 743 | ); |
@@ -755,11 +755,11 @@ discard block |
||
755 | 755 | 'id' => $record['id'], |
756 | 756 | 'label' => $record['label'], |
757 | 757 | 'description' => $record['description'] ?? '', |
758 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
758 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
759 | 759 | 'tags' => $tags, |
760 | 760 | 'id_tree' => $record['id_tree'], |
761 | 761 | 'perso' => $record['perso'], |
762 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
762 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
763 | 763 | 'login' => $record['login'] ?? '', |
764 | 764 | 'folder' => implode(' » ', $folder), |
765 | 765 | 'author' => $record['id_user'], |
@@ -788,7 +788,7 @@ discard block |
||
788 | 788 | // get new value from db |
789 | 789 | $data = DB::queryFirstRow( |
790 | 790 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
791 | - FROM ' . prefixTable('items') . ' |
|
791 | + FROM ' . prefixTable('items').' |
|
792 | 792 | WHERE id=%i', |
793 | 793 | $ident |
794 | 794 | ); |
@@ -796,12 +796,12 @@ discard block |
||
796 | 796 | $tags = ''; |
797 | 797 | $itemTags = DB::query( |
798 | 798 | 'SELECT tag |
799 | - FROM ' . prefixTable('tags') . ' |
|
799 | + FROM ' . prefixTable('tags').' |
|
800 | 800 | WHERE item_id = %i AND tag != ""', |
801 | 801 | $ident |
802 | 802 | ); |
803 | 803 | foreach ($itemTags as $itemTag) { |
804 | - $tags .= $itemTag['tag'] . ' '; |
|
804 | + $tags .= $itemTag['tag'].' '; |
|
805 | 805 | } |
806 | 806 | // form id_tree to full foldername |
807 | 807 | $folder = []; |
@@ -812,7 +812,7 @@ discard block |
||
812 | 812 | // Is this a User id? |
813 | 813 | $user = DB::queryFirstRow( |
814 | 814 | 'SELECT id, login |
815 | - FROM ' . prefixTable('users') . ' |
|
815 | + FROM ' . prefixTable('users').' |
|
816 | 816 | WHERE id = %i', |
817 | 817 | $elem->title |
818 | 818 | ); |
@@ -830,10 +830,10 @@ discard block |
||
830 | 830 | 'label' => $data['label'], |
831 | 831 | 'description' => $data['description'], |
832 | 832 | 'tags' => $tags, |
833 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
833 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
834 | 834 | 'id_tree' => $data['id_tree'], |
835 | 835 | 'perso' => $data['perso'], |
836 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
836 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
837 | 837 | 'login' => $data['login'] ?? '', |
838 | 838 | 'folder' => implode(' » ', $folder), |
839 | 839 | 'author' => $session->get('user-id'), |
@@ -863,8 +863,8 @@ discard block |
||
863 | 863 | // get new value from db |
864 | 864 | $data = DB::queryFirstRow( |
865 | 865 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
866 | - FROM ' . prefixTable('items') . ' as i |
|
867 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
866 | + FROM ' . prefixTable('items').' as i |
|
867 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
868 | 868 | WHERE i.id = %i |
869 | 869 | AND l.action = %s', |
870 | 870 | $ident, |
@@ -874,12 +874,12 @@ discard block |
||
874 | 874 | $tags = ''; |
875 | 875 | $itemTags = DB::query( |
876 | 876 | 'SELECT tag |
877 | - FROM ' . prefixTable('tags') . ' |
|
877 | + FROM ' . prefixTable('tags').' |
|
878 | 878 | WHERE item_id = %i AND tag != ""', |
879 | 879 | $ident |
880 | 880 | ); |
881 | 881 | foreach ($itemTags as $itemTag) { |
882 | - $tags .= $itemTag['tag'] . ' '; |
|
882 | + $tags .= $itemTag['tag'].' '; |
|
883 | 883 | } |
884 | 884 | // form id_tree to full foldername |
885 | 885 | $folder = []; |
@@ -890,7 +890,7 @@ discard block |
||
890 | 890 | // Is this a User id? |
891 | 891 | $user = DB::queryFirstRow( |
892 | 892 | 'SELECT id, login |
893 | - FROM ' . prefixTable('users') . ' |
|
893 | + FROM ' . prefixTable('users').' |
|
894 | 894 | WHERE id = %i', |
895 | 895 | $elem->title |
896 | 896 | ); |
@@ -909,7 +909,7 @@ discard block |
||
909 | 909 | 'label' => $data['label'], |
910 | 910 | 'description' => $data['description'], |
911 | 911 | 'tags' => empty($tags) === false ? $tags : 'None', |
912 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
912 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
913 | 913 | 'id_tree' => $data['id_tree'], |
914 | 914 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
915 | 915 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -931,53 +931,53 @@ discard block |
||
931 | 931 | function getStatisticsData(array $SETTINGS): array |
932 | 932 | { |
933 | 933 | DB::query( |
934 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
934 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
935 | 935 | 0 |
936 | 936 | ); |
937 | 937 | $counter_folders = DB::count(); |
938 | 938 | DB::query( |
939 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
939 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
940 | 940 | 1 |
941 | 941 | ); |
942 | 942 | $counter_folders_perso = DB::count(); |
943 | 943 | DB::query( |
944 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
944 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
945 | 945 | 0 |
946 | 946 | ); |
947 | 947 | $counter_items = DB::count(); |
948 | 948 | DB::query( |
949 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
949 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
950 | 950 | 1 |
951 | 951 | ); |
952 | 952 | $counter_items_perso = DB::count(); |
953 | 953 | DB::query( |
954 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
954 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
955 | 955 | 'OTV', 'TP', 'API' |
956 | 956 | ); |
957 | 957 | $counter_users = DB::count(); |
958 | 958 | DB::query( |
959 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
959 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
960 | 960 | 1 |
961 | 961 | ); |
962 | 962 | $admins = DB::count(); |
963 | 963 | DB::query( |
964 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
964 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
965 | 965 | 1 |
966 | 966 | ); |
967 | 967 | $managers = DB::count(); |
968 | 968 | DB::query( |
969 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
969 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
970 | 970 | 1 |
971 | 971 | ); |
972 | 972 | $readOnly = DB::count(); |
973 | 973 | // list the languages |
974 | 974 | $usedLang = []; |
975 | 975 | $tp_languages = DB::query( |
976 | - 'SELECT name FROM ' . prefixTable('languages') |
|
976 | + 'SELECT name FROM '.prefixTable('languages') |
|
977 | 977 | ); |
978 | 978 | foreach ($tp_languages as $tp_language) { |
979 | 979 | DB::query( |
980 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
980 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
981 | 981 | $tp_language['name'] |
982 | 982 | ); |
983 | 983 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -986,12 +986,12 @@ discard block |
||
986 | 986 | // get list of ips |
987 | 987 | $usedIp = []; |
988 | 988 | $tp_ips = DB::query( |
989 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
989 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
990 | 990 | ); |
991 | 991 | foreach ($tp_ips as $ip) { |
992 | 992 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
993 | 993 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
994 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
994 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
995 | 995 | $usedIp[$ip['user_ip']] = 1; |
996 | 996 | } |
997 | 997 | } |
@@ -1086,7 +1086,7 @@ discard block |
||
1086 | 1086 | <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;"> |
1087 | 1087 | <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;"> |
1088 | 1088 | <br><div style="float:right;">' . |
1089 | - $textMail . |
|
1089 | + $textMail. |
|
1090 | 1090 | '<br><br></td></tr></table> |
1091 | 1091 | </td></tr></table> |
1092 | 1092 | <br></body></html>'; |
@@ -1167,7 +1167,7 @@ discard block |
||
1167 | 1167 | { |
1168 | 1168 | array_walk_recursive( |
1169 | 1169 | $array, |
1170 | - static function (&$item): void { |
|
1170 | + static function(&$item): void { |
|
1171 | 1171 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
1172 | 1172 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
1173 | 1173 | } |
@@ -1278,7 +1278,7 @@ discard block |
||
1278 | 1278 | */ |
1279 | 1279 | function prefixTable(string $table): string |
1280 | 1280 | { |
1281 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
1281 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
1282 | 1282 | return $safeTable; |
1283 | 1283 | } |
1284 | 1284 | |
@@ -1395,7 +1395,7 @@ discard block |
||
1395 | 1395 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
1396 | 1396 | { |
1397 | 1397 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
1398 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
1398 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
1399 | 1399 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
1400 | 1400 | socket_close($sock); |
1401 | 1401 | } |
@@ -1442,14 +1442,14 @@ discard block |
||
1442 | 1442 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
1443 | 1443 | if ($type === 'user_mngt') { |
1444 | 1444 | send_syslog( |
1445 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
1445 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
1446 | 1446 | $SETTINGS['syslog_host'], |
1447 | 1447 | $SETTINGS['syslog_port'], |
1448 | 1448 | 'teampass' |
1449 | 1449 | ); |
1450 | 1450 | } else { |
1451 | 1451 | send_syslog( |
1452 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
1452 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
1453 | 1453 | $SETTINGS['syslog_host'], |
1454 | 1454 | $SETTINGS['syslog_port'], |
1455 | 1455 | 'teampass' |
@@ -1524,7 +1524,7 @@ discard block |
||
1524 | 1524 | if (empty($item_label) === true) { |
1525 | 1525 | $dataItem = DB::queryFirstRow( |
1526 | 1526 | 'SELECT id, id_tree, label |
1527 | - FROM ' . prefixTable('items') . ' |
|
1527 | + FROM ' . prefixTable('items').' |
|
1528 | 1528 | WHERE id = %i', |
1529 | 1529 | $item_id |
1530 | 1530 | ); |
@@ -1532,11 +1532,11 @@ discard block |
||
1532 | 1532 | } |
1533 | 1533 | |
1534 | 1534 | send_syslog( |
1535 | - 'action=' . str_replace('at_', '', $action) . |
|
1536 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
1537 | - ' itemno=' . $item_id . |
|
1538 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
1539 | - ' itemname="' . addslashes($item_label) . '"', |
|
1535 | + 'action='.str_replace('at_', '', $action). |
|
1536 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
1537 | + ' itemno='.$item_id. |
|
1538 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
1539 | + ' itemname="'.addslashes($item_label).'"', |
|
1540 | 1540 | $SETTINGS['syslog_host'], |
1541 | 1541 | $SETTINGS['syslog_port'], |
1542 | 1542 | 'teampass' |
@@ -1567,8 +1567,8 @@ discard block |
||
1567 | 1567 | // send email to user that what to be notified |
1568 | 1568 | $notification = DB::queryFirstField( |
1569 | 1569 | 'SELECT email |
1570 | - FROM ' . prefixTable('notification') . ' AS n |
|
1571 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
1570 | + FROM ' . prefixTable('notification').' AS n |
|
1571 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
1572 | 1572 | WHERE n.item_id = %i AND n.user_id != %i', |
1573 | 1573 | $item_id, |
1574 | 1574 | $globalsUserId |
@@ -1579,7 +1579,7 @@ discard block |
||
1579 | 1579 | // Get list of changes |
1580 | 1580 | $htmlChanges = '<ul>'; |
1581 | 1581 | foreach ($changes as $change) { |
1582 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
1582 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
1583 | 1583 | } |
1584 | 1584 | $htmlChanges .= '</ul>'; |
1585 | 1585 | // send email |
@@ -1616,15 +1616,15 @@ discard block |
||
1616 | 1616 | $path = ''; |
1617 | 1617 | foreach ($arbo as $elem) { |
1618 | 1618 | if (empty($path) === true) { |
1619 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
1619 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
1620 | 1620 | } else { |
1621 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1621 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1622 | 1622 | } |
1623 | 1623 | } |
1624 | 1624 | |
1625 | 1625 | // Build text to show user |
1626 | 1626 | if (empty($label) === false) { |
1627 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
1627 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
1628 | 1628 | } |
1629 | 1629 | return empty($path) === true ? '' : $path; |
1630 | 1630 | } |
@@ -1680,7 +1680,7 @@ discard block |
||
1680 | 1680 | { |
1681 | 1681 | // Perform a copy if the file exists |
1682 | 1682 | if (file_exists($configFilePath)) { |
1683 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
1683 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
1684 | 1684 | if (!copy($configFilePath, $backupFilePath)) { |
1685 | 1685 | return "ERROR: Could not copy file '$configFilePath'"; |
1686 | 1686 | } |
@@ -1688,10 +1688,10 @@ discard block |
||
1688 | 1688 | |
1689 | 1689 | // Regenerate the config file |
1690 | 1690 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
1691 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
1691 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
1692 | 1692 | foreach ($rows as $record) { |
1693 | 1693 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
1694 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
1694 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
1695 | 1695 | } |
1696 | 1696 | $data[] = ");\n"; |
1697 | 1697 | $data = array_unique($data); |
@@ -1736,7 +1736,7 @@ discard block |
||
1736 | 1736 | { |
1737 | 1737 | global $SETTINGS; |
1738 | 1738 | /* LOAD CPASSMAN SETTINGS */ |
1739 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1739 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1740 | 1740 | $SETTINGS = []; |
1741 | 1741 | $SETTINGS['duplicate_folder'] = 0; |
1742 | 1742 | //by default, this is set to 0; |
@@ -1746,7 +1746,7 @@ discard block |
||
1746 | 1746 | //by default, this value is set to 5; |
1747 | 1747 | $settings = []; |
1748 | 1748 | $rows = DB::query( |
1749 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
1749 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
1750 | 1750 | [ |
1751 | 1751 | 'type' => 'admin', |
1752 | 1752 | 'type2' => 'settings', |
@@ -1778,7 +1778,7 @@ discard block |
||
1778 | 1778 | $source_cf = []; |
1779 | 1779 | $rows = DB::query( |
1780 | 1780 | 'SELECT id_category |
1781 | - FROM ' . prefixTable('categories_folders') . ' |
|
1781 | + FROM ' . prefixTable('categories_folders').' |
|
1782 | 1782 | WHERE id_folder = %i', |
1783 | 1783 | $source_id |
1784 | 1784 | ); |
@@ -1789,7 +1789,7 @@ discard block |
||
1789 | 1789 | $target_cf = []; |
1790 | 1790 | $rows = DB::query( |
1791 | 1791 | 'SELECT id_category |
1792 | - FROM ' . prefixTable('categories_folders') . ' |
|
1792 | + FROM ' . prefixTable('categories_folders').' |
|
1793 | 1793 | WHERE id_folder = %i', |
1794 | 1794 | $target_id |
1795 | 1795 | ); |
@@ -1884,10 +1884,10 @@ discard block |
||
1884 | 1884 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1885 | 1885 | $err = 'wrong_key'; |
1886 | 1886 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1887 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1887 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1888 | 1888 | $err = 'environment_error'; |
1889 | 1889 | } catch (CryptoException\IOException $ex) { |
1890 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1890 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1891 | 1891 | $err = 'general_error'; |
1892 | 1892 | } |
1893 | 1893 | |
@@ -1920,10 +1920,10 @@ discard block |
||
1920 | 1920 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1921 | 1921 | $err = 'wrong_key'; |
1922 | 1922 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1923 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1923 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1924 | 1924 | $err = 'environment_error'; |
1925 | 1925 | } catch (CryptoException\IOException $ex) { |
1926 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1926 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1927 | 1927 | $err = 'general_error'; |
1928 | 1928 | } |
1929 | 1929 | |
@@ -2009,7 +2009,7 @@ discard block |
||
2009 | 2009 | ) { |
2010 | 2010 | // Check if the path exists |
2011 | 2011 | $path = basename($path); |
2012 | - if (! file_exists($path)) { |
|
2012 | + if (!file_exists($path)) { |
|
2013 | 2013 | return false; |
2014 | 2014 | } |
2015 | 2015 | |
@@ -2062,7 +2062,7 @@ discard block |
||
2062 | 2062 | // Load item data |
2063 | 2063 | $data = DB::queryFirstRow( |
2064 | 2064 | 'SELECT id_tree |
2065 | - FROM ' . prefixTable('items') . ' |
|
2065 | + FROM ' . prefixTable('items').' |
|
2066 | 2066 | WHERE id = %i', |
2067 | 2067 | $item_id |
2068 | 2068 | ); |
@@ -2125,7 +2125,7 @@ discard block |
||
2125 | 2125 | } |
2126 | 2126 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
2127 | 2127 | } |
2128 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
2128 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
2129 | 2129 | return $email; |
2130 | 2130 | } |
2131 | 2131 | |
@@ -2156,11 +2156,11 @@ discard block |
||
2156 | 2156 | function formatSizeUnits(int $bytes): string |
2157 | 2157 | { |
2158 | 2158 | if ($bytes >= 1073741824) { |
2159 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
2159 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
2160 | 2160 | } elseif ($bytes >= 1048576) { |
2161 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
2161 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
2162 | 2162 | } elseif ($bytes >= 1024) { |
2163 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
2163 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
2164 | 2164 | } elseif ($bytes > 1) { |
2165 | 2165 | $bytes .= ' bytes'; |
2166 | 2166 | } elseif ($bytes === 1) { |
@@ -2409,7 +2409,7 @@ discard block |
||
2409 | 2409 | $cipher->enableContinuousBuffer(); |
2410 | 2410 | |
2411 | 2411 | // Encrypt the file content |
2412 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
2412 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
2413 | 2413 | $fileContent = file_get_contents($filePath); |
2414 | 2414 | $plaintext = $fileContent; |
2415 | 2415 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2417,9 +2417,9 @@ discard block |
||
2417 | 2417 | // Save new file |
2418 | 2418 | // deepcode ignore InsecureHash: is simply used to get a unique name |
2419 | 2419 | $hash = uniqid('', true); |
2420 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
2420 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
2421 | 2421 | file_put_contents($fileOut, $ciphertext); |
2422 | - unlink($fileInPath . '/' . $fileInName); |
|
2422 | + unlink($fileInPath.'/'.$fileInName); |
|
2423 | 2423 | return [ |
2424 | 2424 | 'fileHash' => base64_encode($hash), |
2425 | 2425 | 'objectKey' => base64_encode($objectKey), |
@@ -2435,9 +2435,9 @@ discard block |
||
2435 | 2435 | * |
2436 | 2436 | * @return string|array |
2437 | 2437 | */ |
2438 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
2438 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
2439 | 2439 | { |
2440 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
2440 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
2441 | 2441 | define('FILE_BUFFER_SIZE', 128 * 1024); |
2442 | 2442 | } |
2443 | 2443 | |
@@ -2454,7 +2454,7 @@ discard block |
||
2454 | 2454 | $cipher->enableContinuousBuffer(); |
2455 | 2455 | $cipher->disablePadding(); |
2456 | 2456 | // Get file content |
2457 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
2457 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
2458 | 2458 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
2459 | 2459 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
2460 | 2460 | } else { |
@@ -2550,7 +2550,7 @@ discard block |
||
2550 | 2550 | // Only create the sharekey for a user |
2551 | 2551 | $user = DB::queryFirstRow( |
2552 | 2552 | 'SELECT public_key |
2553 | - FROM ' . prefixTable('users') . ' |
|
2553 | + FROM ' . prefixTable('users').' |
|
2554 | 2554 | WHERE id = %i |
2555 | 2555 | AND public_key != ""', |
2556 | 2556 | $userId |
@@ -2591,7 +2591,7 @@ discard block |
||
2591 | 2591 | } |
2592 | 2592 | $users = DB::query( |
2593 | 2593 | 'SELECT id, public_key |
2594 | - FROM ' . prefixTable('users') . ' |
|
2594 | + FROM ' . prefixTable('users').' |
|
2595 | 2595 | WHERE id NOT IN %li |
2596 | 2596 | AND public_key != ""', |
2597 | 2597 | $user_ids |
@@ -2600,7 +2600,7 @@ discard block |
||
2600 | 2600 | foreach ($users as $user) { |
2601 | 2601 | // Insert in DB the new object key for this item by user |
2602 | 2602 | if (count($objectKeyArray) === 0) { |
2603 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
2603 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
2604 | 2604 | DB::insert( |
2605 | 2605 | $object_name, |
2606 | 2606 | [ |
@@ -2614,7 +2614,7 @@ discard block |
||
2614 | 2614 | ); |
2615 | 2615 | } else { |
2616 | 2616 | foreach ($objectKeyArray as $object) { |
2617 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
2617 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
2618 | 2618 | DB::insert( |
2619 | 2619 | $object_name, |
2620 | 2620 | [ |
@@ -2642,7 +2642,7 @@ discard block |
||
2642 | 2642 | function isBase64(string $str): bool |
2643 | 2643 | { |
2644 | 2644 | $str = (string) trim($str); |
2645 | - if (! isset($str[0])) { |
|
2645 | + if (!isset($str[0])) { |
|
2646 | 2646 | return false; |
2647 | 2647 | } |
2648 | 2648 | |
@@ -2716,7 +2716,7 @@ discard block |
||
2716 | 2716 | } catch (\LdapRecord\Auth\BindException $e) { |
2717 | 2717 | $error = $e->getDetailedError(); |
2718 | 2718 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2719 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2719 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2720 | 2720 | } |
2721 | 2721 | // deepcode ignore ServerLeak: No important data is sent |
2722 | 2722 | echo 'An error occurred.'; |
@@ -2733,7 +2733,7 @@ discard block |
||
2733 | 2733 | } catch (\LdapRecord\Auth\BindException $e) { |
2734 | 2734 | $error = $e->getDetailedError(); |
2735 | 2735 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2736 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2736 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2737 | 2737 | } |
2738 | 2738 | // deepcode ignore ServerLeak: No important data is sent |
2739 | 2739 | echo 'An error occurred.'; |
@@ -2760,7 +2760,7 @@ discard block |
||
2760 | 2760 | // expect if personal item |
2761 | 2761 | DB::delete( |
2762 | 2762 | prefixTable('sharekeys_items'), |
2763 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2763 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2764 | 2764 | $userId |
2765 | 2765 | ); |
2766 | 2766 | // Remove all item sharekeys files |
@@ -2768,8 +2768,8 @@ discard block |
||
2768 | 2768 | prefixTable('sharekeys_files'), |
2769 | 2769 | 'user_id = %i AND object_id NOT IN ( |
2770 | 2770 | SELECT f.id |
2771 | - FROM ' . prefixTable('items') . ' AS i |
|
2772 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
2771 | + FROM ' . prefixTable('items').' AS i |
|
2772 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
2773 | 2773 | WHERE i.perso = 1 |
2774 | 2774 | )', |
2775 | 2775 | $userId |
@@ -2779,8 +2779,8 @@ discard block |
||
2779 | 2779 | prefixTable('sharekeys_fields'), |
2780 | 2780 | 'user_id = %i AND object_id NOT IN ( |
2781 | 2781 | SELECT c.id |
2782 | - FROM ' . prefixTable('items') . ' AS i |
|
2783 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
2782 | + FROM ' . prefixTable('items').' AS i |
|
2783 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
2784 | 2784 | WHERE i.perso = 1 |
2785 | 2785 | )', |
2786 | 2786 | $userId |
@@ -2788,13 +2788,13 @@ discard block |
||
2788 | 2788 | // Remove all item sharekeys logs |
2789 | 2789 | DB::delete( |
2790 | 2790 | prefixTable('sharekeys_logs'), |
2791 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2791 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2792 | 2792 | $userId |
2793 | 2793 | ); |
2794 | 2794 | // Remove all item sharekeys suggestions |
2795 | 2795 | DB::delete( |
2796 | 2796 | prefixTable('sharekeys_suggestions'), |
2797 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2797 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2798 | 2798 | $userId |
2799 | 2799 | ); |
2800 | 2800 | return false; |
@@ -2815,7 +2815,7 @@ discard block |
||
2815 | 2815 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
2816 | 2816 | $now->setTimezone(new DateTimeZone($timezone)); |
2817 | 2817 | $offsets[] = $offset = $now->getOffset(); |
2818 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
2818 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
2819 | 2819 | } |
2820 | 2820 | |
2821 | 2821 | array_multisort($offsets, $timezones); |
@@ -2835,7 +2835,7 @@ discard block |
||
2835 | 2835 | { |
2836 | 2836 | $hours = intval($offset / 3600); |
2837 | 2837 | $minutes = abs(intval($offset % 3600 / 60)); |
2838 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2838 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2839 | 2839 | } |
2840 | 2840 | |
2841 | 2841 | /** |
@@ -2934,8 +2934,7 @@ discard block |
||
2934 | 2934 | { |
2935 | 2935 | if (isset($array[$key]) === true |
2936 | 2936 | && (is_int($value) === true ? |
2937 | - (int) $array[$key] === $value : |
|
2938 | - (string) $array[$key] === $value) |
|
2937 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
2939 | 2938 | ) { |
2940 | 2939 | return true; |
2941 | 2940 | } |
@@ -2957,8 +2956,7 @@ discard block |
||
2957 | 2956 | { |
2958 | 2957 | if (isset($var) === false |
2959 | 2958 | || (is_int($value) === true ? |
2960 | - (int) $var === $value : |
|
2961 | - (string) $var === $value) |
|
2959 | + (int) $var === $value : (string) $var === $value) |
|
2962 | 2960 | ) { |
2963 | 2961 | return true; |
2964 | 2962 | } |
@@ -3009,7 +3007,7 @@ discard block |
||
3009 | 3007 | */ |
3010 | 3008 | function isSetArrayOfValues(array $arrayOfValues): bool |
3011 | 3009 | { |
3012 | - foreach($arrayOfValues as $value) { |
|
3010 | + foreach ($arrayOfValues as $value) { |
|
3013 | 3011 | if (isset($value) === false) { |
3014 | 3012 | return false; |
3015 | 3013 | } |
@@ -3031,7 +3029,7 @@ discard block |
||
3031 | 3029 | /*PHP8 - integer|string*/$value |
3032 | 3030 | ) : bool |
3033 | 3031 | { |
3034 | - foreach($arrayOfVars as $variable) { |
|
3032 | + foreach ($arrayOfVars as $variable) { |
|
3035 | 3033 | if ($variable !== $value) { |
3036 | 3034 | return false; |
3037 | 3035 | } |
@@ -3051,7 +3049,7 @@ discard block |
||
3051 | 3049 | /*PHP8 - integer|string*/$value |
3052 | 3050 | ) : bool |
3053 | 3051 | { |
3054 | - foreach($arrayOfVars as $variable) { |
|
3052 | + foreach ($arrayOfVars as $variable) { |
|
3055 | 3053 | if ($variable === $value) { |
3056 | 3054 | return true; |
3057 | 3055 | } |
@@ -3065,7 +3063,7 @@ discard block |
||
3065 | 3063 | * @param string|int|null $value |
3066 | 3064 | * @return boolean |
3067 | 3065 | */ |
3068 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
3066 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
3069 | 3067 | { |
3070 | 3068 | if (is_null($value) === true || empty($value) === true) { |
3071 | 3069 | return true; |
@@ -3120,7 +3118,7 @@ discard block |
||
3120 | 3118 | * @param array $filters |
3121 | 3119 | * @return array|string |
3122 | 3120 | */ |
3123 | -function dataSanitizer(array $data, array $filters): array|string |
|
3121 | +function dataSanitizer(array $data, array $filters): array | string |
|
3124 | 3122 | { |
3125 | 3123 | // Load Sanitizer library |
3126 | 3124 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3149,7 +3147,7 @@ discard block |
||
3149 | 3147 | // Exists ? |
3150 | 3148 | $userCacheId = DB::queryFirstRow( |
3151 | 3149 | 'SELECT increment_id |
3152 | - FROM ' . prefixTable('cache_tree') . ' |
|
3150 | + FROM ' . prefixTable('cache_tree').' |
|
3153 | 3151 | WHERE user_id = %i', |
3154 | 3152 | $user_id |
3155 | 3153 | ); |
@@ -3200,7 +3198,7 @@ discard block |
||
3200 | 3198 | */ |
3201 | 3199 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
3202 | 3200 | { |
3203 | - $resultat = ($nombre/$total) * $pourcentage; |
|
3201 | + $resultat = ($nombre / $total) * $pourcentage; |
|
3204 | 3202 | return round($resultat); |
3205 | 3203 | } |
3206 | 3204 | |
@@ -3230,7 +3228,7 @@ discard block |
||
3230 | 3228 | |
3231 | 3229 | // Get last folder update |
3232 | 3230 | $lastFolderChange = DB::queryFirstRow( |
3233 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
3231 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
3234 | 3232 | WHERE type = %s AND intitule = %s', |
3235 | 3233 | 'timestamp', |
3236 | 3234 | 'last_folder_change' |
@@ -3251,7 +3249,7 @@ discard block |
||
3251 | 3249 | // Does this user has a tree cache |
3252 | 3250 | $userCacheTree = DB::queryFirstRow( |
3253 | 3251 | 'SELECT '.$fieldName.' |
3254 | - FROM ' . prefixTable('cache_tree') . ' |
|
3252 | + FROM ' . prefixTable('cache_tree').' |
|
3255 | 3253 | WHERE user_id = %i', |
3256 | 3254 | $session->get('user-id') |
3257 | 3255 | ); |
@@ -3289,7 +3287,7 @@ discard block |
||
3289 | 3287 | if (count($folderIds) === 0) { |
3290 | 3288 | $folderIds = DB::queryFirstColumn( |
3291 | 3289 | 'SELECT id |
3292 | - FROM ' . prefixTable('nested_tree') . ' |
|
3290 | + FROM ' . prefixTable('nested_tree').' |
|
3293 | 3291 | WHERE personal_folder=%i', |
3294 | 3292 | 0 |
3295 | 3293 | ); |
@@ -3306,8 +3304,8 @@ discard block |
||
3306 | 3304 | $rows_tmp = DB::query( |
3307 | 3305 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
3308 | 3306 | f.id_category AS category_id |
3309 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
3310 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
3307 | + FROM ' . prefixTable('categories_folders').' AS f |
|
3308 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
3311 | 3309 | WHERE id_folder=%i', |
3312 | 3310 | $folder |
3313 | 3311 | ); |
@@ -3333,7 +3331,7 @@ discard block |
||
3333 | 3331 | $valTemp = ''; |
3334 | 3332 | $data = DB::queryFirstRow( |
3335 | 3333 | 'SELECT valeur |
3336 | - FROM ' . prefixTable('misc') . ' |
|
3334 | + FROM ' . prefixTable('misc').' |
|
3337 | 3335 | WHERE type = %s AND intitule=%i', |
3338 | 3336 | 'complex', |
3339 | 3337 | $folder |
@@ -3350,14 +3348,14 @@ discard block |
||
3350 | 3348 | $valTemp = ''; |
3351 | 3349 | $rows_tmp = DB::query( |
3352 | 3350 | 'SELECT t.title |
3353 | - FROM ' . prefixTable('roles_values') . ' as v |
|
3354 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
3351 | + FROM ' . prefixTable('roles_values').' as v |
|
3352 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
3355 | 3353 | WHERE v.folder_id = %i |
3356 | 3354 | GROUP BY title', |
3357 | 3355 | $folder |
3358 | 3356 | ); |
3359 | 3357 | foreach ($rows_tmp as $record) { |
3360 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
3358 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
3361 | 3359 | } |
3362 | 3360 | $arr_data['visibilityRoles'] = $valTemp; |
3363 | 3361 | |
@@ -3390,7 +3388,7 @@ discard block |
||
3390 | 3388 | // loop on users and check if user has this role |
3391 | 3389 | $rows = DB::query( |
3392 | 3390 | 'SELECT id, fonction_id |
3393 | - FROM ' . prefixTable('users') . ' |
|
3391 | + FROM ' . prefixTable('users').' |
|
3394 | 3392 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
3395 | 3393 | $session->get('user-id') |
3396 | 3394 | ); |
@@ -3422,7 +3420,7 @@ discard block |
||
3422 | 3420 | |
3423 | 3421 | $val = DB::queryFirstRow( |
3424 | 3422 | 'SELECT * |
3425 | - FROM ' . prefixTable('users') . ' |
|
3423 | + FROM ' . prefixTable('users').' |
|
3426 | 3424 | WHERE id = %i', |
3427 | 3425 | $userId |
3428 | 3426 | ); |
@@ -3438,12 +3436,12 @@ discard block |
||
3438 | 3436 | function upgradeRequired(): bool |
3439 | 3437 | { |
3440 | 3438 | // Get settings.php |
3441 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
3439 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
3442 | 3440 | |
3443 | 3441 | // Get timestamp in DB |
3444 | 3442 | $val = DB::queryFirstRow( |
3445 | 3443 | 'SELECT valeur |
3446 | - FROM ' . prefixTable('misc') . ' |
|
3444 | + FROM ' . prefixTable('misc').' |
|
3447 | 3445 | WHERE type = %s AND intitule = %s', |
3448 | 3446 | 'admin', |
3449 | 3447 | 'upgrade_timestamp' |
@@ -3494,7 +3492,7 @@ discard block |
||
3494 | 3492 | // prepapre background tasks for item keys generation |
3495 | 3493 | $userTP = DB::queryFirstRow( |
3496 | 3494 | 'SELECT pw, public_key, private_key |
3497 | - FROM ' . prefixTable('users') . ' |
|
3495 | + FROM ' . prefixTable('users').' |
|
3498 | 3496 | WHERE id = %i', |
3499 | 3497 | TP_USER_ID |
3500 | 3498 | ); |
@@ -3555,7 +3553,7 @@ discard block |
||
3555 | 3553 | } |
3556 | 3554 | |
3557 | 3555 | // Generate new keys |
3558 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
3556 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
3559 | 3557 | $userKeys = [ |
3560 | 3558 | 'public_key' => $recovery_public_key, |
3561 | 3559 | 'private_key_clear' => $recovery_private_key, |
@@ -3606,8 +3604,8 @@ discard block |
||
3606 | 3604 | 'process_type' => 'create_user_keys', |
3607 | 3605 | 'arguments' => json_encode([ |
3608 | 3606 | 'new_user_id' => (int) $userId, |
3609 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
3610 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
3607 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
3608 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
3611 | 3609 | 'owner_id' => (int) TP_USER_ID, |
3612 | 3610 | 'creator_pwd' => $userTP['pw'], |
3613 | 3611 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3678,19 +3676,19 @@ discard block |
||
3678 | 3676 | |
3679 | 3677 | // Prepare the subtask queries |
3680 | 3678 | $queries = [ |
3681 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
3679 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
3682 | 3680 | |
3683 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
3681 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
3684 | 3682 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
3685 | 3683 | |
3686 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
3684 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
3687 | 3685 | ' WHERE encryption_type = "teampass_aes"', |
3688 | 3686 | |
3689 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
3687 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
3690 | 3688 | |
3691 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
3692 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
3693 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
3689 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
3690 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
3691 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
3694 | 3692 | ]; |
3695 | 3693 | |
3696 | 3694 | // Perform loop on $queries to create sub-tasks |
@@ -3880,7 +3878,7 @@ discard block |
||
3880 | 3878 | */ |
3881 | 3879 | function createTaskForItem( |
3882 | 3880 | string $processType, |
3883 | - string|array $taskName, |
|
3881 | + string | array $taskName, |
|
3884 | 3882 | int $itemId, |
3885 | 3883 | int $userId, |
3886 | 3884 | string $objectKey, |
@@ -3904,7 +3902,7 @@ discard block |
||
3904 | 3902 | 'object_key' => $objectKey, |
3905 | 3903 | 'author' => (int) $userId, |
3906 | 3904 | ]), |
3907 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3905 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3908 | 3906 | ) |
3909 | 3907 | ); |
3910 | 3908 | $processId = DB::insertId(); |
@@ -3914,7 +3912,7 @@ discard block |
||
3914 | 3912 | if (is_array($taskName) === false) { |
3915 | 3913 | $taskName = [$taskName]; |
3916 | 3914 | } |
3917 | - foreach($taskName as $task) { |
|
3915 | + foreach ($taskName as $task) { |
|
3918 | 3916 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
3919 | 3917 | switch ($task) { |
3920 | 3918 | case 'item_password': |
@@ -4011,7 +4009,7 @@ discard block |
||
4011 | 4009 | * @param integer $user_id |
4012 | 4010 | * @return void |
4013 | 4011 | */ |
4014 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
4012 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
4015 | 4013 | { |
4016 | 4014 | if ($allUsers === true) { |
4017 | 4015 | // Load class DB |
@@ -4021,7 +4019,7 @@ discard block |
||
4021 | 4019 | |
4022 | 4020 | $users = DB::query( |
4023 | 4021 | 'SELECT id |
4024 | - FROM ' . prefixTable('users') . ' |
|
4022 | + FROM ' . prefixTable('users').' |
|
4025 | 4023 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
4026 | 4024 | ORDER BY login ASC' |
4027 | 4025 | ); |
@@ -4039,7 +4037,7 @@ discard block |
||
4039 | 4037 | * @param integer $user_id |
4040 | 4038 | * @return void |
4041 | 4039 | */ |
4042 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
4040 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
4043 | 4041 | { |
4044 | 4042 | if ($user_id === 0) { |
4045 | 4043 | return; |
@@ -4050,8 +4048,8 @@ discard block |
||
4050 | 4048 | |
4051 | 4049 | $personalItems = DB::queryFirstColumn( |
4052 | 4050 | 'SELECT id |
4053 | - FROM ' . prefixTable('items') . ' AS i |
|
4054 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
4051 | + FROM ' . prefixTable('items').' AS i |
|
4052 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
4055 | 4053 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
4056 | 4054 | $user_id |
4057 | 4055 | ); |
@@ -4100,7 +4098,7 @@ discard block |
||
4100 | 4098 | // Check if user exists |
4101 | 4099 | $userInfo = DB::queryFirstRow( |
4102 | 4100 | 'SELECT login |
4103 | - FROM ' . prefixTable('users') . ' |
|
4101 | + FROM ' . prefixTable('users').' |
|
4104 | 4102 | WHERE id = %i', |
4105 | 4103 | $userId |
4106 | 4104 | ); |
@@ -4109,7 +4107,7 @@ discard block |
||
4109 | 4107 | $now = (int) time(); |
4110 | 4108 | // Prepare file content |
4111 | 4109 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
4112 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
4110 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
4113 | 4111 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
4114 | 4112 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
4115 | 4113 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4132,7 +4130,7 @@ discard block |
||
4132 | 4130 | return prepareExchangedData( |
4133 | 4131 | array( |
4134 | 4132 | 'error' => false, |
4135 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
4133 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
4136 | 4134 | 'timestamp' => $now, |
4137 | 4135 | 'content' => base64_encode($export_value), |
4138 | 4136 | 'login' => $userInfo['login'], |
@@ -4158,8 +4156,8 @@ discard block |
||
4158 | 4156 | */ |
4159 | 4157 | function loadClasses(string $className = ''): void |
4160 | 4158 | { |
4161 | - require_once __DIR__. '/../includes/config/include.php'; |
|
4162 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
4159 | + require_once __DIR__.'/../includes/config/include.php'; |
|
4160 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
4163 | 4161 | require_once __DIR__.'/../vendor/autoload.php'; |
4164 | 4162 | |
4165 | 4163 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4372,7 +4370,7 @@ discard block |
||
4372 | 4370 | |
4373 | 4371 | // Get current user hash |
4374 | 4372 | $userHash = DB::queryFirstRow( |
4375 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
4373 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
4376 | 4374 | $session->get('user-id') |
4377 | 4375 | )['pw']; |
4378 | 4376 | |
@@ -4420,11 +4418,11 @@ discard block |
||
4420 | 4418 | } |
4421 | 4419 | |
4422 | 4420 | // Alternative: serialize ou json selon le contexte |
4423 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
4421 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
4424 | 4422 | } |
4425 | 4423 | |
4426 | 4424 | if (is_resource($value)) { |
4427 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
4425 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
4428 | 4426 | } |
4429 | 4427 | |
4430 | 4428 | // Cas par défaut |
@@ -4444,7 +4442,7 @@ discard block |
||
4444 | 4442 | // Refuse access if user does not exist and/or is admin |
4445 | 4443 | $user = DB::queryFirstRow( |
4446 | 4444 | 'SELECT admin |
4447 | - FROM ' . prefixTable('users') . ' |
|
4445 | + FROM ' . prefixTable('users').' |
|
4448 | 4446 | WHERE id = %i', |
4449 | 4447 | $userId |
4450 | 4448 | ); |
@@ -4455,8 +4453,8 @@ discard block |
||
4455 | 4453 | // Get file info |
4456 | 4454 | $file = DB::queryFirstRow( |
4457 | 4455 | 'SELECT f.id_item, i.id_tree |
4458 | - FROM ' . prefixTable('files') . ' as f |
|
4459 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
4456 | + FROM ' . prefixTable('files').' as f |
|
4457 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
4460 | 4458 | WHERE f.id = %i', |
4461 | 4459 | $fileId |
4462 | 4460 | ); |
@@ -4465,7 +4463,7 @@ discard block |
||
4465 | 4463 | } |
4466 | 4464 | |
4467 | 4465 | // Check if user has access to the item |
4468 | - include_once __DIR__. '/items.queries.php'; |
|
4466 | + include_once __DIR__.'/items.queries.php'; |
|
4469 | 4467 | $itemAccess = getCurrentAccessRights( |
4470 | 4468 | (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT), |
4471 | 4469 | (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT), |
@@ -4498,7 +4496,7 @@ discard block |
||
4498 | 4496 | // Refuse access if user does not exist and/or is not admin |
4499 | 4497 | $user = DB::queryFirstRow( |
4500 | 4498 | 'SELECT admin |
4501 | - FROM ' . prefixTable('users') . ' |
|
4499 | + FROM ' . prefixTable('users').' |
|
4502 | 4500 | WHERE id = %i', |
4503 | 4501 | $userId |
4504 | 4502 | ); |
@@ -4509,7 +4507,7 @@ discard block |
||
4509 | 4507 | // Ensure that user has performed the backup |
4510 | 4508 | DB::queryFirstRow( |
4511 | 4509 | 'SELECT f.id |
4512 | - FROM ' . prefixTable('log_system') . ' as f |
|
4510 | + FROM ' . prefixTable('log_system').' as f |
|
4513 | 4511 | WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s', |
4514 | 4512 | 'admin_action', |
4515 | 4513 | 'dataBase backup', |
@@ -4536,7 +4534,7 @@ discard block |
||
4536 | 4534 | // Refuse access if user does not exist and/or is admin |
4537 | 4535 | $user = DB::queryFirstRow( |
4538 | 4536 | 'SELECT admin |
4539 | - FROM ' . prefixTable('users') . ' |
|
4537 | + FROM ' . prefixTable('users').' |
|
4540 | 4538 | WHERE id = %i', |
4541 | 4539 | $userId |
4542 | 4540 | ); |
@@ -4547,7 +4545,7 @@ discard block |
||
4547 | 4545 | // Get item info |
4548 | 4546 | $item = DB::queryFirstRow( |
4549 | 4547 | 'SELECT i.perso, i.id_tree |
4550 | - FROM ' . prefixTable('items') . ' as i |
|
4548 | + FROM ' . prefixTable('items').' as i |
|
4551 | 4549 | WHERE i.id = %i', |
4552 | 4550 | $itemId |
4553 | 4551 | ); |
@@ -4558,7 +4556,7 @@ discard block |
||
4558 | 4556 | // Get item owner |
4559 | 4557 | $itemOwner = DB::queryFirstRow( |
4560 | 4558 | 'SELECT li.id_user |
4561 | - FROM ' . prefixTable('log_items') . ' as li |
|
4559 | + FROM ' . prefixTable('log_items').' as li |
|
4562 | 4560 | WHERE li.id_item = %i AND li.action = %s', |
4563 | 4561 | $itemId, |
4564 | 4562 | 'at_creation' |
@@ -50,24 +50,24 @@ discard block |
||
50 | 50 | private function generateUserKeys($arguments) { |
51 | 51 | // Get all subtasks related to this task |
52 | 52 | $subtasks = DB::query( |
53 | - 'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC', |
|
53 | + 'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC', |
|
54 | 54 | $this->taskId |
55 | 55 | ); |
56 | 56 | |
57 | 57 | if (empty($subtasks)) { |
58 | - if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}"); |
|
58 | + if (LOG_TASKS === true) $this->logger->log("No subtask was found for task {$this->taskId}"); |
|
59 | 59 | return; |
60 | 60 | } |
61 | 61 | |
62 | 62 | // Process each subtask |
63 | 63 | foreach ($subtasks as $subtask) { |
64 | - if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}"); |
|
64 | + if (LOG_TASKS === true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}"); |
|
65 | 65 | $this->processGenerateUserKeysSubtask($subtask, $arguments); |
66 | 66 | } |
67 | 67 | |
68 | 68 | // Are all subtasks completed? |
69 | 69 | $remainingSubtasks = DB::queryFirstField( |
70 | - 'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0', |
|
70 | + 'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0', |
|
71 | 71 | $this->taskId |
72 | 72 | ); |
73 | 73 | if ($remainingSubtasks == 0) { |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $subtask['increment_id'] |
99 | 99 | ); |
100 | 100 | |
101 | - if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO'); |
|
101 | + if (LOG_TASKS === true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO'); |
|
102 | 102 | switch ($taskData['step'] ?? '') { |
103 | 103 | case 'step0': |
104 | 104 | $this->generateNewUserStep0($arguments); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | $subtask['increment_id'] |
153 | 153 | ); |
154 | 154 | |
155 | - $this->logger->log("Subtask {$subtask['increment_id']} failure: " . $e->getMessage(), 'ERROR'); |
|
155 | + $this->logger->log("Subtask {$subtask['increment_id']} failure: ".$e->getMessage(), 'ERROR'); |
|
156 | 156 | } |
157 | 157 | } |
158 | 158 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | // Loop on items |
194 | 194 | $rows = DB::query( |
195 | 195 | 'SELECT id, pw, perso |
196 | - FROM ' . prefixTable('items') . ' |
|
196 | + FROM ' . prefixTable('items').' |
|
197 | 197 | WHERE perso = %i |
198 | 198 | ORDER BY id ASC |
199 | 199 | LIMIT %i, %i', |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | // Get itemKey from current user |
207 | 207 | $currentUserKey = DB::queryFirstRow( |
208 | 208 | 'SELECT share_key, increment_id |
209 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
209 | + FROM ' . prefixTable('sharekeys_items').' |
|
210 | 210 | WHERE object_id = %i AND user_id = %i', |
211 | 211 | $record['id'], |
212 | 212 | (int) $record['perso'] === 0 ? $arguments['owner_id'] : $arguments['new_user_id'] |
@@ -285,16 +285,16 @@ discard block |
||
285 | 285 | // Loop on logs |
286 | 286 | $rows = DB::query( |
287 | 287 | 'SELECT increment_id |
288 | - FROM ' . prefixTable('log_items') . ' |
|
288 | + FROM ' . prefixTable('log_items').' |
|
289 | 289 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
290 | 290 | ORDER BY increment_id ASC |
291 | - LIMIT ' . $taskData['index'] . ', ' . $taskData['nb'] |
|
291 | + LIMIT ' . $taskData['index'].', '.$taskData['nb'] |
|
292 | 292 | ); |
293 | 293 | foreach ($rows as $record) { |
294 | 294 | // Get itemKey from current user |
295 | 295 | $currentUserKey = DB::queryFirstRow( |
296 | 296 | 'SELECT share_key |
297 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
297 | + FROM ' . prefixTable('sharekeys_logs').' |
|
298 | 298 | WHERE object_id = %i AND user_id = %i', |
299 | 299 | $record['increment_id'], |
300 | 300 | $arguments['owner_id'] |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_id']) { |
327 | 327 | $currentUserKey = DB::queryFirstRow( |
328 | 328 | 'SELECT increment_id |
329 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
329 | + FROM ' . prefixTable('sharekeys_items').' |
|
330 | 330 | WHERE object_id = %i AND user_id = %i', |
331 | 331 | $record['id'], |
332 | 332 | $arguments['new_user_id'] |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | // Loop on fields |
375 | 375 | $rows = DB::query( |
376 | 376 | 'SELECT id |
377 | - FROM ' . prefixTable('categories_items') . ' |
|
377 | + FROM ' . prefixTable('categories_items').' |
|
378 | 378 | WHERE encryption_type = "teampass_aes" |
379 | 379 | ORDER BY id ASC |
380 | 380 | LIMIT %i, %i', |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | // Get itemKey from current user |
386 | 386 | $currentUserKey = DB::queryFirstRow( |
387 | 387 | 'SELECT share_key |
388 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
388 | + FROM ' . prefixTable('sharekeys_fields').' |
|
389 | 389 | WHERE object_id = %i AND user_id = %i', |
390 | 390 | $record['id'], |
391 | 391 | $arguments['owner_id'] |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_id']) { |
414 | 414 | $currentUserKey = DB::queryFirstRow( |
415 | 415 | 'SELECT increment_id |
416 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
416 | + FROM ' . prefixTable('sharekeys_items').' |
|
417 | 417 | WHERE object_id = %i AND user_id = %i', |
418 | 418 | $record['id'], |
419 | 419 | $arguments['new_user_id'] |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | // Loop on suggestions |
463 | 463 | $rows = DB::query( |
464 | 464 | 'SELECT id |
465 | - FROM ' . prefixTable('suggestion') . ' |
|
465 | + FROM ' . prefixTable('suggestion').' |
|
466 | 466 | ORDER BY id ASC |
467 | 467 | LIMIT %i, %i', |
468 | 468 | $taskData['index'], |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | // Get itemKey from current user |
473 | 473 | $currentUserKey = DB::queryFirstRow( |
474 | 474 | 'SELECT share_key |
475 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
475 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
476 | 476 | WHERE object_id = %i AND user_id = %i', |
477 | 477 | $record['id'], |
478 | 478 | $arguments['owner_id'] |
@@ -504,7 +504,7 @@ discard block |
||
504 | 504 | if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_id']) { |
505 | 505 | $currentUserKey = DB::queryFirstRow( |
506 | 506 | 'SELECT increment_id |
507 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
507 | + FROM ' . prefixTable('sharekeys_items').' |
|
508 | 508 | WHERE object_id = %i AND user_id = %i', |
509 | 509 | $record['id'], |
510 | 510 | $arguments['new_user_id'] |
@@ -552,9 +552,9 @@ discard block |
||
552 | 552 | // Loop on files |
553 | 553 | $rows = DB::query( |
554 | 554 | 'SELECT f.id AS id, i.perso AS perso |
555 | - FROM ' . prefixTable('files') . ' AS f |
|
556 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
557 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '" |
|
555 | + FROM ' . prefixTable('files').' AS f |
|
556 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
557 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'" |
|
558 | 558 | LIMIT %i, %i', |
559 | 559 | $taskData['index'], |
560 | 560 | $taskData['nb'] |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | // Get itemKey from current user |
564 | 564 | $currentUserKey = DB::queryFirstRow( |
565 | 565 | 'SELECT share_key, increment_id |
566 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
566 | + FROM ' . prefixTable('sharekeys_files').' |
|
567 | 567 | WHERE object_id = %i AND user_id = %i', |
568 | 568 | $record['id'], |
569 | 569 | (int) $record['perso'] === 0 ? $arguments['owner_id'] : $arguments['new_user_id'] |
@@ -591,7 +591,7 @@ discard block |
||
591 | 591 | |
592 | 592 | $currentUserKey = DB::queryFirstRow( |
593 | 593 | 'SELECT increment_id |
594 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
594 | + FROM ' . prefixTable('sharekeys_files').' |
|
595 | 595 | WHERE object_id = %i AND user_id = %i', |
596 | 596 | $record['id'], |
597 | 597 | $arguments['new_user_id'] |
@@ -671,7 +671,7 @@ discard block |
||
671 | 671 | // get user info |
672 | 672 | $userInfo = DB::queryFirstRow( |
673 | 673 | 'SELECT u.email, u.login, u.auth_type, u.special, u.lastname, u.name |
674 | - FROM ' . prefixTable('users') . ' AS u |
|
674 | + FROM ' . prefixTable('users').' AS u |
|
675 | 675 | WHERE u.id = %i', |
676 | 676 | $arguments['new_user_id'] |
677 | 677 | ); |
@@ -686,10 +686,10 @@ discard block |
||
686 | 686 | filter_var($userInfo['email'], FILTER_SANITIZE_EMAIL), |
687 | 687 | // @scrutinizer ignore-type |
688 | 688 | empty($arguments['email_body']) === false ? $arguments['email_body'] : $lang->get('email_body_user_config_1'), |
689 | - 'TEAMPASS - ' . $lang->get('login_credentials'), |
|
689 | + 'TEAMPASS - '.$lang->get('login_credentials'), |
|
690 | 690 | (array) filter_var_array( |
691 | 691 | [ |
692 | - '#code#' => cryption($arguments['new_user_code'], '','decrypt', $this->settings)['string'], |
|
692 | + '#code#' => cryption($arguments['new_user_code'], '', 'decrypt', $this->settings)['string'], |
|
693 | 693 | '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '', |
694 | 694 | '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '', |
695 | 695 | ], |
@@ -703,8 +703,8 @@ discard block |
||
703 | 703 | // Does user has personal items? |
704 | 704 | $personalItemsCount = DB::queryFirstField( |
705 | 705 | 'SELECT COUNT(*) |
706 | - FROM ' . prefixTable('items') . ' |
|
707 | - WHERE perso = 1 AND id IN (SELECT object_id FROM ' . prefixTable('sharekeys_items') . ' WHERE user_id = %i)', |
|
706 | + FROM ' . prefixTable('items').' |
|
707 | + WHERE perso = 1 AND id IN (SELECT object_id FROM ' . prefixTable('sharekeys_items').' WHERE user_id = %i)', |
|
708 | 708 | $arguments['new_user_id'] |
709 | 709 | ); |
710 | 710 | |
@@ -735,24 +735,24 @@ discard block |
||
735 | 735 | private function getOwnerInfos(int $owner_id, string $owner_pwd, int $only_personal_items = 0, string $owner_private_key = ''): array { |
736 | 736 | $userInfo = DB::queryFirstRow( |
737 | 737 | 'SELECT pw, public_key, private_key, login, name |
738 | - FROM ' . prefixTable('users') . ' |
|
738 | + FROM ' . prefixTable('users').' |
|
739 | 739 | WHERE id = %i', |
740 | 740 | $owner_id |
741 | 741 | ); |
742 | 742 | |
743 | 743 | // decrypt owner password |
744 | - $pwd = cryption($owner_pwd, '','decrypt', $this->settings)['string']; |
|
744 | + $pwd = cryption($owner_pwd, '', 'decrypt', $this->settings)['string']; |
|
745 | 745 | |
746 | 746 | // decrypt private key and send back |
747 | 747 | if ((int) $only_personal_items === 1 && empty($owner_private_key) === false) { |
748 | 748 | // Explicitely case where we only want personal items and where user has provided his private key |
749 | 749 | return [ |
750 | - 'private_key' => cryption($owner_private_key, '','decrypt')['string'], |
|
750 | + 'private_key' => cryption($owner_private_key, '', 'decrypt')['string'], |
|
751 | 751 | 'public_key' => $userInfo['public_key'], |
752 | 752 | 'login' => $userInfo['login'], |
753 | 753 | 'name' => $userInfo['name'], |
754 | 754 | ]; |
755 | - }else { |
|
755 | + } else { |
|
756 | 756 | // Normal case |
757 | 757 | return [ |
758 | 758 | 'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']), |
@@ -55,13 +55,17 @@ discard block |
||
55 | 55 | ); |
56 | 56 | |
57 | 57 | if (empty($subtasks)) { |
58 | - if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}"); |
|
58 | + if (LOG_TASKS=== true) { |
|
59 | + $this->logger->log("No subtask was found for task {$this->taskId}"); |
|
60 | + } |
|
59 | 61 | return; |
60 | 62 | } |
61 | 63 | |
62 | 64 | // Process each subtask |
63 | 65 | foreach ($subtasks as $subtask) { |
64 | - if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}"); |
|
66 | + if (LOG_TASKS=== true) { |
|
67 | + $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}"); |
|
68 | + } |
|
65 | 69 | $this->processGenerateUserKeysSubtask($subtask, $arguments); |
66 | 70 | } |
67 | 71 | |
@@ -98,7 +102,9 @@ discard block |
||
98 | 102 | $subtask['increment_id'] |
99 | 103 | ); |
100 | 104 | |
101 | - if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO'); |
|
105 | + if (LOG_TASKS=== true) { |
|
106 | + $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO'); |
|
107 | + } |
|
102 | 108 | switch ($taskData['step'] ?? '') { |
103 | 109 | case 'step0': |
104 | 110 | $this->generateNewUserStep0($arguments); |
@@ -752,7 +758,7 @@ discard block |
||
752 | 758 | 'login' => $userInfo['login'], |
753 | 759 | 'name' => $userInfo['name'], |
754 | 760 | ]; |
755 | - }else { |
|
761 | + } else { |
|
756 | 762 | // Normal case |
757 | 763 | return [ |
758 | 764 | 'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']), |