@@ -1045,7 +1045,9 @@ discard block |
||
1045 | 1045 | $session->get('user-id') |
1046 | 1046 | ); |
1047 | 1047 | if (DB::count() === 0) { |
1048 | - if (LOG_TO_SERVER === true) error_log('TEAMPASS | user '.$session->get('user-id').' has no sharekey for item '.$inputData['itemId']); |
|
1048 | + if (LOG_TO_SERVER === true) { |
|
1049 | + error_log('TEAMPASS | user '.$session->get('user-id').' has no sharekey for item '.$inputData['itemId']); |
|
1050 | + } |
|
1049 | 1051 | echo (string) prepareExchangedData( |
1050 | 1052 | array( |
1051 | 1053 | 'error' => true, |
@@ -1164,7 +1166,9 @@ discard block |
||
1164 | 1166 | ); |
1165 | 1167 | |
1166 | 1168 | // Create a task to create sharekeys for users |
1167 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
1169 | + if (WIP=== true) { |
|
1170 | + error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
1171 | + } |
|
1168 | 1172 | $tasksToBePerformed = ['item_password']; |
1169 | 1173 | /*createTaskForItem( |
1170 | 1174 | 'item_update_create_keys', |
@@ -1489,7 +1493,9 @@ discard block |
||
1489 | 1493 | |
1490 | 1494 | // create a task for all fields updated |
1491 | 1495 | if ($encryptionTaskIsRequested === true) { |
1492 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
1496 | + if (WIP === true) { |
|
1497 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
1498 | + } |
|
1493 | 1499 | createTaskForItem( |
1494 | 1500 | 'item_update_create_keys', |
1495 | 1501 | $tasksToBePerformed, |
@@ -1996,7 +2002,9 @@ discard block |
||
1996 | 2002 | $inputData['itemId'] |
1997 | 2003 | ); |
1998 | 2004 | foreach ($rows as $record) { |
1999 | - if ($record['raison'] === NULL) continue; |
|
2005 | + if ($record['raison'] === NULL) { |
|
2006 | + continue; |
|
2007 | + } |
|
2000 | 2008 | $reason = explode(':', $record['raison']); |
2001 | 2009 | if (count($reason) > 0) { |
2002 | 2010 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4586,7 +4594,9 @@ discard block |
||
4586 | 4594 | $inputData['itemId'] |
4587 | 4595 | ); |
4588 | 4596 | |
4589 | - if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
|
4597 | + if (WIP === true) { |
|
4598 | + error_log('Existing edition locks: '.DB::count()); |
|
4599 | + } |
|
4590 | 4600 | |
4591 | 4601 | // Check if item has no edition lock |
4592 | 4602 | if ((int) DB::count() > 0 ) { |
@@ -4599,7 +4609,9 @@ discard block |
||
4599 | 4609 | } else { |
4600 | 4610 | $delay = EDITION_LOCK_PERIOD; // One day delay |
4601 | 4611 | } |
4602 | - if (WIP === true) error_log('delay: ' . $delay); |
|
4612 | + if (WIP === true) { |
|
4613 | + error_log('delay: ' . $delay); |
|
4614 | + } |
|
4603 | 4615 | |
4604 | 4616 | // We remove old edition locks if delay is expired meaning more than 1 day long |
4605 | 4617 | if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
@@ -4607,7 +4619,9 @@ discard block |
||
4607 | 4619 | // In this case, delete edition lock and possible ongoing processes |
4608 | 4620 | // and continue editing this time |
4609 | 4621 | // We coonsidere if the most recent item is still locked then all other locks can be removed |
4610 | - if (WIP === true) error_log('Delay is expired, removing old locks'); |
|
4622 | + if (WIP === true) { |
|
4623 | + error_log('Delay is expired, removing old locks'); |
|
4624 | + } |
|
4611 | 4625 | foreach ($dataItemEditionLocks as $itemEditionLock) { |
4612 | 4626 | // delete lock |
4613 | 4627 | DB::delete( |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | ) { |
80 | 80 | // Not allowed page |
81 | 81 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
82 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
82 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
83 | 83 | exit; |
84 | 84 | } |
85 | 85 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | date_default_timezone_set('UTC'); |
105 | 105 | } |
106 | 106 | |
107 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
107 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
108 | 108 | header('Content-type: text/html; charset=utf-8'); |
109 | 109 | header('Cache-Control: no-cache, must-revalidate'); |
110 | 110 | |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | // About special settings |
355 | 355 | $dataFolderSettings = DB::queryFirstRow( |
356 | 356 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
357 | - FROM ' . prefixTable('nested_tree') . ' |
|
357 | + FROM ' . prefixTable('nested_tree').' |
|
358 | 358 | WHERE id = %i', |
359 | 359 | $inputData['folderId'] |
360 | 360 | ); |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | // Get folder complexity |
372 | 372 | $folderComplexity = DB::queryfirstrow( |
373 | 373 | 'SELECT valeur |
374 | - FROM ' . prefixTable('misc') . ' |
|
374 | + FROM ' . prefixTable('misc').' |
|
375 | 375 | WHERE type = %s AND intitule = %i', |
376 | 376 | 'complex', |
377 | 377 | $inputData['folderId'] |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | $itemExists = 0; |
397 | 397 | $newID = ''; |
398 | 398 | $data = DB::queryfirstrow( |
399 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
399 | + 'SELECT * FROM '.prefixTable('items').' |
|
400 | 400 | WHERE label = %s AND inactif = %i', |
401 | 401 | $inputData['label'], |
402 | 402 | 0 |
@@ -480,8 +480,8 @@ discard block |
||
480 | 480 | (int) $inputData['folderId'], |
481 | 481 | (int) $newID, |
482 | 482 | $cryptedStuff['objectKey'], |
483 | - true, // only for the item creator |
|
484 | - false, // no delete all |
|
483 | + true, // only for the item creator |
|
484 | + false, // no delete all |
|
485 | 485 | ); |
486 | 486 | |
487 | 487 | // update fields |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | // should we encrypt the data |
495 | 495 | $dataTmp = DB::queryFirstRow( |
496 | 496 | 'SELECT encrypted_data |
497 | - FROM ' . prefixTable('categories') . ' |
|
497 | + FROM ' . prefixTable('categories').' |
|
498 | 498 | WHERE id = %i', |
499 | 499 | $field['id'] |
500 | 500 | ); |
@@ -524,8 +524,8 @@ discard block |
||
524 | 524 | (int) $inputData['folderId'], |
525 | 525 | (int) $newObjectId, |
526 | 526 | $cryptedStuff['objectKey'], |
527 | - true, // only for the item creator |
|
528 | - false, // no delete all |
|
527 | + true, // only for the item creator |
|
528 | + false, // no delete all |
|
529 | 529 | ); |
530 | 530 | |
531 | 531 | array_push( |
@@ -562,7 +562,7 @@ discard block |
||
562 | 562 | ) { |
563 | 563 | DB::queryFirstRow( |
564 | 564 | 'SELECT * |
565 | - FROM ' . prefixTable('templates') . ' |
|
565 | + FROM ' . prefixTable('templates').' |
|
566 | 566 | WHERE item_id = %i', |
567 | 567 | $newID |
568 | 568 | ); |
@@ -631,11 +631,11 @@ discard block |
||
631 | 631 | ) { |
632 | 632 | foreach ($post_restricted_to as $userRest) { |
633 | 633 | if (empty($userRest) === false) { |
634 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
634 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
635 | 635 | if (empty($listOfRestricted)) { |
636 | 636 | $listOfRestricted = $dataTmp['login']; |
637 | 637 | } else { |
638 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
638 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
639 | 639 | } |
640 | 640 | } |
641 | 641 | } |
@@ -649,11 +649,11 @@ discard block |
||
649 | 649 | if (empty($data['restricted_to']) === false) { |
650 | 650 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
651 | 651 | if (empty($userRest) === false) { |
652 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
652 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
653 | 653 | if (empty($oldRestrictionList) === true) { |
654 | 654 | $oldRestrictionList = $dataTmp['login']; |
655 | 655 | } else { |
656 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
656 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
657 | 657 | } |
658 | 658 | } |
659 | 659 | } |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | if (empty($post_uploaded_file_id) === false) { |
717 | 717 | $rows = DB::query( |
718 | 718 | 'SELECT id |
719 | - FROM ' . prefixTable('files') . ' |
|
719 | + FROM ' . prefixTable('files').' |
|
720 | 720 | WHERE id_item = %s', |
721 | 721 | $post_uploaded_file_id |
722 | 722 | ); |
@@ -772,7 +772,7 @@ discard block |
||
772 | 772 | $lang->get('email_subject_item_updated'), |
773 | 773 | str_replace( |
774 | 774 | array('#label', '#link'), |
775 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
775 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
776 | 776 | $lang->get('new_item_email_body') |
777 | 777 | ), |
778 | 778 | $emailAddress, |
@@ -876,11 +876,11 @@ discard block |
||
876 | 876 | // Prepare variables |
877 | 877 | $itemInfos = array(); |
878 | 878 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
879 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
879 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
880 | 880 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
881 | 881 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
882 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars_decode($dataReceived['tags']) : ''; |
|
883 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
882 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars_decode($dataReceived['tags']) : ''; |
|
883 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
884 | 884 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
885 | 885 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
886 | 886 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -911,8 +911,7 @@ discard block |
||
911 | 911 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
912 | 912 | $dataReceived['to_be_deleted_after_date'], |
913 | 913 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
914 | - ) : |
|
915 | - ''; |
|
914 | + ) : ''; |
|
916 | 915 | $post_fields = (filter_var_array( |
917 | 916 | $dataReceived['fields'], |
918 | 917 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -972,7 +971,7 @@ discard block |
||
972 | 971 | // About special settings |
973 | 972 | $dataFolderSettings = DB::queryFirstRow( |
974 | 973 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
975 | - FROM ' . prefixTable('nested_tree') . ' |
|
974 | + FROM ' . prefixTable('nested_tree').' |
|
976 | 975 | WHERE id = %i', |
977 | 976 | $inputData['folderId'] |
978 | 977 | ); |
@@ -988,7 +987,7 @@ discard block |
||
988 | 987 | // Get folder complexity |
989 | 988 | $folderComplexity = DB::queryfirstrow( |
990 | 989 | 'SELECT valeur |
991 | - FROM ' . prefixTable('misc') . ' |
|
990 | + FROM ' . prefixTable('misc').' |
|
992 | 991 | WHERE type = %s AND intitule = %i', |
993 | 992 | 'complex', |
994 | 993 | $inputData['folderId'] |
@@ -1033,8 +1032,8 @@ discard block |
||
1033 | 1032 | // Get all informations for this item |
1034 | 1033 | $dataItem = DB::queryfirstrow( |
1035 | 1034 | 'SELECT * |
1036 | - FROM ' . prefixTable('items') . ' as i |
|
1037 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
1035 | + FROM ' . prefixTable('items').' as i |
|
1036 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
1038 | 1037 | WHERE i.id=%i AND l.action = %s', |
1039 | 1038 | $inputData['itemId'], |
1040 | 1039 | 'at_creation' |
@@ -1083,7 +1082,7 @@ discard block |
||
1083 | 1082 | //db::debugmode(true); |
1084 | 1083 | DB::query( |
1085 | 1084 | 'SELECT * |
1086 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1085 | + FROM ' . prefixTable('sharekeys_items').' |
|
1087 | 1086 | WHERE object_id = %i AND user_id = %s', |
1088 | 1087 | $inputData['itemId'], |
1089 | 1088 | $session->get('user-id') |
@@ -1133,9 +1132,9 @@ discard block |
||
1133 | 1132 | 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, |
1134 | 1133 | i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification, |
1135 | 1134 | u.login as user_login, u.email as user_email |
1136 | - FROM ' . prefixTable('items') . ' as i |
|
1137 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
1138 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
1135 | + FROM ' . prefixTable('items').' as i |
|
1136 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
1137 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
1139 | 1138 | WHERE i.id=%i', |
1140 | 1139 | $inputData['itemId'] |
1141 | 1140 | ); |
@@ -1143,7 +1142,7 @@ discard block |
||
1143 | 1142 | // Should we log a password change? |
1144 | 1143 | $userKey = DB::queryFirstRow( |
1145 | 1144 | 'SELECT share_key |
1146 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1145 | + FROM ' . prefixTable('sharekeys_items').' |
|
1147 | 1146 | WHERE user_id = %i AND object_id = %i', |
1148 | 1147 | $session->get('user-id'), |
1149 | 1148 | $inputData['itemId'] |
@@ -1203,12 +1202,12 @@ discard block |
||
1203 | 1202 | (int) $inputData['folderId'], |
1204 | 1203 | (int) $inputData['itemId'], |
1205 | 1204 | $encrypted_password_key, |
1206 | - true, // only for the item creator |
|
1207 | - true, // delete all |
|
1205 | + true, // only for the item creator |
|
1206 | + true, // delete all |
|
1208 | 1207 | ); |
1209 | 1208 | |
1210 | 1209 | // Create a task to create sharekeys for users |
1211 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
1210 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
1212 | 1211 | $tasksToBePerformed = ['item_password']; |
1213 | 1212 | /*createTaskForItem( |
1214 | 1213 | 'item_update_create_keys', |
@@ -1227,7 +1226,7 @@ discard block |
||
1227 | 1226 | // Get list of tags |
1228 | 1227 | $itemTags = DB::queryFirstColumn( |
1229 | 1228 | 'SELECT tag |
1230 | - FROM ' . prefixTable('tags') . ' |
|
1229 | + FROM ' . prefixTable('tags').' |
|
1231 | 1230 | WHERE item_id = %i', |
1232 | 1231 | $inputData['itemId'] |
1233 | 1232 | ); |
@@ -1273,7 +1272,7 @@ discard block |
||
1273 | 1272 | $session->get('user-id'), |
1274 | 1273 | 'at_modification', |
1275 | 1274 | $session->get('user-login'), |
1276 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
1275 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
1277 | 1276 | ); |
1278 | 1277 | } |
1279 | 1278 | |
@@ -1313,8 +1312,8 @@ discard block |
||
1313 | 1312 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
1314 | 1313 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
1315 | 1314 | c.masked AS masked, i.id AS field_item_id |
1316 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
1317 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
1315 | + FROM ' . prefixTable('categories_items').' AS i |
|
1316 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
1318 | 1317 | WHERE i.field_id = %i AND i.item_id = %i', |
1319 | 1318 | $field['id'], |
1320 | 1319 | $inputData['itemId'] |
@@ -1330,7 +1329,7 @@ discard block |
||
1330 | 1329 | // Perform new query |
1331 | 1330 | $dataTmpCat = DB::queryFirstRow( |
1332 | 1331 | 'SELECT id, title, encrypted_data, masked |
1333 | - FROM ' . prefixTable('categories') . ' |
|
1332 | + FROM ' . prefixTable('categories').' |
|
1334 | 1333 | WHERE id = %i', |
1335 | 1334 | $field['id'] |
1336 | 1335 | ); |
@@ -1361,8 +1360,8 @@ discard block |
||
1361 | 1360 | (int) $inputData['folderId'], |
1362 | 1361 | (int) $newId, |
1363 | 1362 | $cryptedStuff['objectKey'], |
1364 | - true, // only for the item creator |
|
1365 | - true, // delete all |
|
1363 | + true, // only for the item creator |
|
1364 | + true, // delete all |
|
1366 | 1365 | ); |
1367 | 1366 | |
1368 | 1367 | // update value |
@@ -1410,7 +1409,7 @@ discard block |
||
1410 | 1409 | $session->get('user-id'), |
1411 | 1410 | 'at_modification', |
1412 | 1411 | $session->get('user-login'), |
1413 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
1412 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
1414 | 1413 | ); |
1415 | 1414 | } else { |
1416 | 1415 | // Case where the field already exists |
@@ -1419,7 +1418,7 @@ discard block |
||
1419 | 1418 | // Get user sharekey for this field |
1420 | 1419 | $userKey = DB::queryFirstRow( |
1421 | 1420 | 'SELECT share_key |
1422 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
1421 | + FROM ' . prefixTable('sharekeys_fields').' |
|
1423 | 1422 | WHERE user_id = %i AND object_id = %i', |
1424 | 1423 | $session->get('user-id'), |
1425 | 1424 | $dataTmpCat['field_item_id'] |
@@ -1459,8 +1458,8 @@ discard block |
||
1459 | 1458 | (int) $inputData['folderId'], |
1460 | 1459 | (int) $dataTmpCat['field_item_id'], |
1461 | 1460 | $cryptedStuff['objectKey'], |
1462 | - true, // only for the item creator |
|
1463 | - true, // delete all |
|
1461 | + true, // only for the item creator |
|
1462 | + true, // delete all |
|
1464 | 1463 | ); |
1465 | 1464 | |
1466 | 1465 | array_push( |
@@ -1500,7 +1499,7 @@ discard block |
||
1500 | 1499 | $session->get('user-id'), |
1501 | 1500 | 'at_modification', |
1502 | 1501 | $session->get('user-login'), |
1503 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
1502 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
1504 | 1503 | ); |
1505 | 1504 | } |
1506 | 1505 | } |
@@ -1555,7 +1554,7 @@ discard block |
||
1555 | 1554 | ) { |
1556 | 1555 | DB::queryFirstRow( |
1557 | 1556 | 'SELECT * |
1558 | - FROM ' . prefixTable('templates') . ' |
|
1557 | + FROM ' . prefixTable('templates').' |
|
1559 | 1558 | WHERE item_id = %i', |
1560 | 1559 | $inputData['itemId'] |
1561 | 1560 | ); |
@@ -1598,7 +1597,7 @@ discard block |
||
1598 | 1597 | // check if elem exists in Table. If not add it or update it. |
1599 | 1598 | DB::query( |
1600 | 1599 | 'SELECT * |
1601 | - FROM ' . prefixTable('automatic_del') . ' |
|
1600 | + FROM ' . prefixTable('automatic_del').' |
|
1602 | 1601 | WHERE item_id = %i', |
1603 | 1602 | $inputData['itemId'] |
1604 | 1603 | ); |
@@ -1625,7 +1624,7 @@ discard block |
||
1625 | 1624 | // Store updates performed |
1626 | 1625 | array_push( |
1627 | 1626 | $arrayOfChanges, |
1628 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
1627 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
1629 | 1628 | ); |
1630 | 1629 | |
1631 | 1630 | // update LOG |
@@ -1668,7 +1667,7 @@ discard block |
||
1668 | 1667 | // Store updates performed |
1669 | 1668 | array_push( |
1670 | 1669 | $arrayOfChanges, |
1671 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
1670 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
1672 | 1671 | ); |
1673 | 1672 | |
1674 | 1673 | // update LOG |
@@ -1701,7 +1700,7 @@ discard block |
||
1701 | 1700 | if (empty($userId) === false) { |
1702 | 1701 | $dataTmp = DB::queryfirstrow( |
1703 | 1702 | 'SELECT id, name, lastname |
1704 | - FROM ' . prefixTable('users') . ' |
|
1703 | + FROM ' . prefixTable('users').' |
|
1705 | 1704 | WHERE id= %i', |
1706 | 1705 | $userId |
1707 | 1706 | ); |
@@ -1709,7 +1708,7 @@ discard block |
||
1709 | 1708 | // Add to array |
1710 | 1709 | array_push( |
1711 | 1710 | $arrayOfUsersRestriction, |
1712 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
1711 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
1713 | 1712 | ); |
1714 | 1713 | array_push( |
1715 | 1714 | $arrayOfUsersIdRestriction, |
@@ -1740,8 +1739,8 @@ discard block |
||
1740 | 1739 | // get values before deleting them |
1741 | 1740 | $rows = DB::query( |
1742 | 1741 | 'SELECT t.title, t.id AS id |
1743 | - FROM ' . prefixTable('roles_title') . ' as t |
|
1744 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
1742 | + FROM ' . prefixTable('roles_title').' as t |
|
1743 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
1745 | 1744 | WHERE r.item_id = %i |
1746 | 1745 | ORDER BY t.title ASC', |
1747 | 1746 | $inputData['itemId'] |
@@ -1775,7 +1774,7 @@ discard block |
||
1775 | 1774 | ); |
1776 | 1775 | $dataTmp = DB::queryfirstrow( |
1777 | 1776 | 'SELECT title |
1778 | - FROM ' . prefixTable('roles_title') . ' |
|
1777 | + FROM ' . prefixTable('roles_title').' |
|
1779 | 1778 | WHERE id = %i', |
1780 | 1779 | $role |
1781 | 1780 | ); |
@@ -1803,7 +1802,7 @@ discard block |
||
1803 | 1802 | // Get current status |
1804 | 1803 | $otpStatus = DB::queryFirstRow( |
1805 | 1804 | 'SELECT enabled as otp_is_enabled |
1806 | - FROM ' . prefixTable('items_otp') . ' |
|
1805 | + FROM ' . prefixTable('items_otp').' |
|
1807 | 1806 | WHERE item_id = %i', |
1808 | 1807 | $inputData['itemId'] |
1809 | 1808 | ); |
@@ -1834,7 +1833,7 @@ discard block |
||
1834 | 1833 | $session->get('user-id'), |
1835 | 1834 | 'at_modification', |
1836 | 1835 | $session->get('user-login'), |
1837 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
1836 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
1838 | 1837 | ); |
1839 | 1838 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
1840 | 1839 | // Create the entry in items_otp table |
@@ -1878,8 +1877,8 @@ discard block |
||
1878 | 1877 | $session->get('user-id'), |
1879 | 1878 | 'at_modification', |
1880 | 1879 | $session->get('user-login'), |
1881 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
1882 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1880 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
1881 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1883 | 1882 | ); |
1884 | 1883 | } |
1885 | 1884 | |
@@ -1899,7 +1898,7 @@ discard block |
||
1899 | 1898 | $session->get('user-id'), |
1900 | 1899 | 'at_modification', |
1901 | 1900 | $session->get('user-login'), |
1902 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
1901 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
1903 | 1902 | ); |
1904 | 1903 | } |
1905 | 1904 | // LOGIN |
@@ -1918,7 +1917,7 @@ discard block |
||
1918 | 1917 | $session->get('user-id'), |
1919 | 1918 | 'at_modification', |
1920 | 1919 | $session->get('user-login'), |
1921 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
1920 | + 'at_login : '.$data['login'].' => '.$post_login |
|
1922 | 1921 | ); |
1923 | 1922 | } |
1924 | 1923 | |
@@ -1937,7 +1936,7 @@ discard block |
||
1937 | 1936 | $session->get('user-id'), |
1938 | 1937 | 'at_modification', |
1939 | 1938 | $session->get('user-login'), |
1940 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
1939 | + 'at_email : '.$data['email'].' => '.$post_email |
|
1941 | 1940 | ); |
1942 | 1941 | } |
1943 | 1942 | // URL |
@@ -1956,7 +1955,7 @@ discard block |
||
1956 | 1955 | $session->get('user-id'), |
1957 | 1956 | 'at_modification', |
1958 | 1957 | $session->get('user-login'), |
1959 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
1958 | + 'at_url : '.$data['url'].' => '.$post_url |
|
1960 | 1959 | ); |
1961 | 1960 | } |
1962 | 1961 | // DESCRIPTION |
@@ -1982,7 +1981,7 @@ discard block |
||
1982 | 1981 | // FOLDER |
1983 | 1982 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
1984 | 1983 | // Get name of folders |
1985 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
1984 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
1986 | 1985 | |
1987 | 1986 | // Store updates performed |
1988 | 1987 | array_push( |
@@ -1998,7 +1997,7 @@ discard block |
||
1998 | 1997 | $session->get('user-id'), |
1999 | 1998 | 'at_modification', |
2000 | 1999 | $session->get('user-login'), |
2001 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
2000 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
2002 | 2001 | ); |
2003 | 2002 | } |
2004 | 2003 | // ANYONE_CAN_MODIFY |
@@ -2006,7 +2005,7 @@ discard block |
||
2006 | 2005 | // Store updates performed |
2007 | 2006 | array_push( |
2008 | 2007 | $arrayOfChanges, |
2009 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
2008 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
2010 | 2009 | ); |
2011 | 2010 | |
2012 | 2011 | // Log |
@@ -2017,15 +2016,15 @@ discard block |
||
2017 | 2016 | $session->get('user-id'), |
2018 | 2017 | 'at_modification', |
2019 | 2018 | $session->get('user-login'), |
2020 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
2019 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
2021 | 2020 | ); |
2022 | 2021 | } |
2023 | 2022 | |
2024 | 2023 | // Reload new values |
2025 | 2024 | $dataItem = DB::queryfirstrow( |
2026 | 2025 | 'SELECT * |
2027 | - FROM ' . prefixTable('items') . ' as i |
|
2028 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2026 | + FROM ' . prefixTable('items').' as i |
|
2027 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2029 | 2028 | WHERE i.id = %i AND l.action = %s', |
2030 | 2029 | $inputData['itemId'], |
2031 | 2030 | 'at_creation' |
@@ -2034,8 +2033,8 @@ discard block |
||
2034 | 2033 | $history = ''; |
2035 | 2034 | $rows = DB::query( |
2036 | 2035 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
2037 | - FROM ' . prefixTable('log_items') . ' as l |
|
2038 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
2036 | + FROM ' . prefixTable('log_items').' as l |
|
2037 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
2039 | 2038 | WHERE l.action <> %s AND id_item=%s', |
2040 | 2039 | 'at_shown', |
2041 | 2040 | $inputData['itemId'] |
@@ -2044,14 +2043,14 @@ discard block |
||
2044 | 2043 | if ($record['raison'] === NULL) continue; |
2045 | 2044 | $reason = explode(':', $record['raison']); |
2046 | 2045 | if (count($reason) > 0) { |
2047 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
2048 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
2049 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
2046 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
2047 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
2048 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
2050 | 2049 | : $lang->get(trim($reason[0]))) : ''); |
2051 | 2050 | if (empty($history)) { |
2052 | 2051 | $history = $sentence; |
2053 | 2052 | } else { |
2054 | - $history .= '<br />' . $sentence; |
|
2053 | + $history .= '<br />'.$sentence; |
|
2055 | 2054 | } |
2056 | 2055 | } |
2057 | 2056 | } |
@@ -2187,7 +2186,7 @@ discard block |
||
2187 | 2186 | ) { |
2188 | 2187 | // load the original record into an array |
2189 | 2188 | $originalRecord = DB::queryfirstrow( |
2190 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
2189 | + 'SELECT * FROM '.prefixTable('items').' |
|
2191 | 2190 | WHERE id = %i', |
2192 | 2191 | $inputData['itemId'] |
2193 | 2192 | ); |
@@ -2206,7 +2205,7 @@ discard block |
||
2206 | 2205 | |
2207 | 2206 | // Load the destination folder record into an array |
2208 | 2207 | $dataDestination = DB::queryfirstrow( |
2209 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
2208 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
2210 | 2209 | WHERE id = %i', |
2211 | 2210 | $post_dest_id |
2212 | 2211 | ); |
@@ -2214,7 +2213,7 @@ discard block |
||
2214 | 2213 | // Get the ITEM object key for the user |
2215 | 2214 | $userKey = DB::queryFirstRow( |
2216 | 2215 | 'SELECT share_key |
2217 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2216 | + FROM ' . prefixTable('sharekeys_items').' |
|
2218 | 2217 | WHERE user_id = %i AND object_id = %i', |
2219 | 2218 | $session->get('user-id'), |
2220 | 2219 | $inputData['itemId'] |
@@ -2291,8 +2290,8 @@ discard block |
||
2291 | 2290 | // Manage Custom Fields |
2292 | 2291 | $rows = DB::query( |
2293 | 2292 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
2294 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
2295 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
2293 | + FROM ' . prefixTable('categories_items').' AS ci |
|
2294 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
2296 | 2295 | WHERE ci.item_id = %i', |
2297 | 2296 | $inputData['itemId'] |
2298 | 2297 | ); |
@@ -2304,7 +2303,7 @@ discard block |
||
2304 | 2303 | // Get user key |
2305 | 2304 | $userKey = DB::queryFirstRow( |
2306 | 2305 | 'SELECT share_key |
2307 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2306 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2308 | 2307 | WHERE user_id = %i AND object_id = %i', |
2309 | 2308 | $session->get('user-id'), |
2310 | 2309 | $field['id'] |
@@ -2372,15 +2371,15 @@ discard block |
||
2372 | 2371 | $rows = DB::query( |
2373 | 2372 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
2374 | 2373 | f.size AS size, f.type AS type, s.share_key AS share_key |
2375 | - FROM ' . prefixTable('files') . ' AS f |
|
2376 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
2374 | + FROM ' . prefixTable('files').' AS f |
|
2375 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
2377 | 2376 | WHERE s.user_id = %i AND f.id_item = %i', |
2378 | 2377 | $session->get('user-id'), |
2379 | 2378 | $inputData['itemId'] |
2380 | 2379 | ); |
2381 | 2380 | foreach ($rows as $record) { |
2382 | 2381 | // Check if file still exists |
2383 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
2382 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
2384 | 2383 | // Step1 - decrypt the file |
2385 | 2384 | // deepcode ignore PT: path is sanitized inside decryptFile() |
2386 | 2385 | $fileContent = decryptFile( |
@@ -2391,8 +2390,8 @@ discard block |
||
2391 | 2390 | |
2392 | 2391 | // Step2 - create file |
2393 | 2392 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
2394 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
2395 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
2393 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
2394 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
2396 | 2395 | if ($outstream === false) { |
2397 | 2396 | echo prepareExchangedData( |
2398 | 2397 | array( |
@@ -2467,7 +2466,7 @@ discard block |
||
2467 | 2466 | |
2468 | 2467 | // ------------------------- |
2469 | 2468 | // Add specific restrictions |
2470 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2469 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
2471 | 2470 | foreach ($rows as $record) { |
2472 | 2471 | DB::insert( |
2473 | 2472 | prefixTable('restriction_to_roles'), |
@@ -2479,7 +2478,7 @@ discard block |
||
2479 | 2478 | } |
2480 | 2479 | |
2481 | 2480 | // Add Tags |
2482 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2481 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
2483 | 2482 | foreach ($rows as $record) { |
2484 | 2483 | DB::insert( |
2485 | 2484 | prefixTable('tags'), |
@@ -2580,7 +2579,7 @@ discard block |
||
2580 | 2579 | // then we can show it |
2581 | 2580 | $item_deleted = DB::queryFirstRow( |
2582 | 2581 | 'SELECT * |
2583 | - FROM ' . prefixTable('log_items') . ' |
|
2582 | + FROM ' . prefixTable('log_items').' |
|
2584 | 2583 | WHERE id_item = %i AND action = %s |
2585 | 2584 | ORDER BY date DESC |
2586 | 2585 | LIMIT 0, 1', |
@@ -2591,7 +2590,7 @@ discard block |
||
2591 | 2590 | |
2592 | 2591 | $item_restored = DB::queryFirstRow( |
2593 | 2592 | 'SELECT * |
2594 | - FROM ' . prefixTable('log_items') . ' |
|
2593 | + FROM ' . prefixTable('log_items').' |
|
2595 | 2594 | WHERE id_item = %i AND action = %s |
2596 | 2595 | ORDER BY date DESC |
2597 | 2596 | LIMIT 0, 1', |
@@ -2615,8 +2614,8 @@ discard block |
||
2615 | 2614 | // Get all informations for this item |
2616 | 2615 | $dataItem = DB::queryfirstrow( |
2617 | 2616 | 'SELECT * |
2618 | - FROM ' . prefixTable('items') . ' as i |
|
2619 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2617 | + FROM ' . prefixTable('items').' as i |
|
2618 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2620 | 2619 | WHERE i.id = %i AND l.action = %s', |
2621 | 2620 | $inputData['id'], |
2622 | 2621 | 'at_creation' |
@@ -2625,7 +2624,7 @@ discard block |
||
2625 | 2624 | // Notification |
2626 | 2625 | DB::queryfirstrow( |
2627 | 2626 | 'SELECT * |
2628 | - FROM ' . prefixTable('notification') . ' |
|
2627 | + FROM ' . prefixTable('notification').' |
|
2629 | 2628 | WHERE item_id = %i AND user_id = %i', |
2630 | 2629 | $inputData['id'], |
2631 | 2630 | $session->get('user-id') |
@@ -2668,7 +2667,7 @@ discard block |
||
2668 | 2667 | |
2669 | 2668 | // manage case of API user |
2670 | 2669 | if ($dataItem['id_user'] === API_USER_ID) { |
2671 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
2670 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
2672 | 2671 | $arrData['id_user'] = API_USER_ID; |
2673 | 2672 | $arrData['author_email'] = ''; |
2674 | 2673 | $arrData['notification_status'] = false; |
@@ -2678,7 +2677,7 @@ discard block |
||
2678 | 2677 | $tags = array(); |
2679 | 2678 | $rows = DB::query( |
2680 | 2679 | 'SELECT tag |
2681 | - FROM ' . prefixTable('tags') . ' |
|
2680 | + FROM ' . prefixTable('tags').' |
|
2682 | 2681 | WHERE item_id = %i', |
2683 | 2682 | $inputData['id'] |
2684 | 2683 | ); |
@@ -2703,7 +2702,7 @@ discard block |
||
2703 | 2702 | // Check if user has a role that is accepted |
2704 | 2703 | $rows_tmp = DB::query( |
2705 | 2704 | 'SELECT role_id |
2706 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
2705 | + FROM ' . prefixTable('restriction_to_roles').' |
|
2707 | 2706 | WHERE item_id=%i', |
2708 | 2707 | $inputData['id'] |
2709 | 2708 | ); |
@@ -2717,7 +2716,7 @@ discard block |
||
2717 | 2716 | // Get the object key for the user |
2718 | 2717 | $userKey = DB::queryFirstRow( |
2719 | 2718 | 'SELECT share_key |
2720 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2719 | + FROM ' . prefixTable('sharekeys_items').' |
|
2721 | 2720 | WHERE user_id = %i AND object_id = %i', |
2722 | 2721 | $session->get('user-id'), |
2723 | 2722 | $inputData['id'] |
@@ -2827,8 +2826,8 @@ discard block |
||
2827 | 2826 | // Add restriction if item is restricted to roles |
2828 | 2827 | $rows = DB::query( |
2829 | 2828 | 'SELECT t.title, t.id |
2830 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
2831 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
2829 | + FROM ' . prefixTable('roles_title').' AS t |
|
2830 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
2832 | 2831 | WHERE r.item_id = %i |
2833 | 2832 | ORDER BY t.title ASC', |
2834 | 2833 | $inputData['id'] |
@@ -2844,8 +2843,8 @@ discard block |
||
2844 | 2843 | $tmp = array(); |
2845 | 2844 | $rows = DB::query( |
2846 | 2845 | 'SELECT k.label, k.id |
2847 | - FROM ' . prefixTable('kb_items') . ' as i |
|
2848 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
2846 | + FROM ' . prefixTable('kb_items').' as i |
|
2847 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
2849 | 2848 | WHERE i.item_id = %i |
2850 | 2849 | ORDER BY k.label ASC', |
2851 | 2850 | $inputData['id'] |
@@ -2928,7 +2927,7 @@ discard block |
||
2928 | 2927 | $arrCatList = array(); |
2929 | 2928 | $rows_tmp = DB::query( |
2930 | 2929 | 'SELECT id_category |
2931 | - FROM ' . prefixTable('categories_folders') . ' |
|
2930 | + FROM ' . prefixTable('categories_folders').' |
|
2932 | 2931 | WHERE id_folder=%i', |
2933 | 2932 | $inputData['folderId'] |
2934 | 2933 | ); |
@@ -2943,8 +2942,8 @@ discard block |
||
2943 | 2942 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
2944 | 2943 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
2945 | 2944 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
2946 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
2947 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
2945 | + FROM ' . prefixTable('categories_items').' AS i |
|
2946 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
2948 | 2947 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
2949 | 2948 | $inputData['id'], |
2950 | 2949 | $arrCatList |
@@ -2955,7 +2954,7 @@ discard block |
||
2955 | 2954 | //db::debugmode(true); |
2956 | 2955 | $userKey = DB::queryFirstRow( |
2957 | 2956 | 'SELECT share_key |
2958 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2957 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2959 | 2958 | WHERE user_id = %i AND object_id = %i', |
2960 | 2959 | $session->get('user-id'), |
2961 | 2960 | $row['id'] |
@@ -2973,7 +2972,7 @@ discard block |
||
2973 | 2972 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
2974 | 2973 | // Data is not encrypted in DB |
2975 | 2974 | $fieldText = [ |
2976 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
2975 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
2977 | 2976 | 'encrypted' => false, |
2978 | 2977 | 'error' => false, |
2979 | 2978 | ]; |
@@ -3018,7 +3017,7 @@ discard block |
||
3018 | 3017 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
3019 | 3018 | $rows_tmp = DB::queryfirstrow( |
3020 | 3019 | 'SELECT category_id |
3021 | - FROM ' . prefixTable('templates') . ' |
|
3020 | + FROM ' . prefixTable('templates').' |
|
3022 | 3021 | WHERE item_id = %i', |
3023 | 3022 | $inputData['id'] |
3024 | 3023 | ); |
@@ -3035,7 +3034,7 @@ discard block |
||
3035 | 3034 | // Evaluate if item is ready for all users |
3036 | 3035 | $rows_tmp = DB::queryfirstrow( |
3037 | 3036 | 'SELECT finished_at |
3038 | - FROM ' . prefixTable('background_tasks') . ' |
|
3037 | + FROM ' . prefixTable('background_tasks').' |
|
3039 | 3038 | WHERE item_id = %i', |
3040 | 3039 | $inputData['id'] |
3041 | 3040 | ); |
@@ -3052,7 +3051,7 @@ discard block |
||
3052 | 3051 | // Is the Item to be deleted? |
3053 | 3052 | $dataDelete = DB::queryfirstrow( |
3054 | 3053 | 'SELECT * |
3055 | - FROM ' . prefixTable('automatic_del') . ' |
|
3054 | + FROM ' . prefixTable('automatic_del').' |
|
3056 | 3055 | WHERE item_id = %i', |
3057 | 3056 | $inputData['id'] |
3058 | 3057 | ); |
@@ -3131,11 +3130,11 @@ discard block |
||
3131 | 3130 | if (empty($dataItem['restricted_to']) === false) { |
3132 | 3131 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
3133 | 3132 | if (empty($userRest) === false) { |
3134 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
3133 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
3135 | 3134 | if (empty($listOfRestricted)) { |
3136 | 3135 | $listOfRestricted = $dataTmp['login']; |
3137 | 3136 | } else { |
3138 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
3137 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
3139 | 3138 | } |
3140 | 3139 | } |
3141 | 3140 | } |
@@ -3209,9 +3208,9 @@ discard block |
||
3209 | 3208 | // Load item data |
3210 | 3209 | $dataItem = DB::queryFirstRow( |
3211 | 3210 | 'SELECT i.*, n.title AS folder_title, o.enabled AS otp_for_item_enabled, o.phone_number AS otp_phone_number, o.secret AS otp_secret |
3212 | - FROM ' . prefixTable('items') . ' AS i |
|
3213 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
3214 | - INNER JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
3211 | + FROM ' . prefixTable('items').' AS i |
|
3212 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
3213 | + INNER JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
3215 | 3214 | WHERE i.id = %i', |
3216 | 3215 | $inputData['id'] |
3217 | 3216 | ); |
@@ -3233,7 +3232,7 @@ discard block |
||
3233 | 3232 | // Check if user has a role that is accepted |
3234 | 3233 | $rows_tmp = DB::query( |
3235 | 3234 | 'SELECT role_id |
3236 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3235 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3237 | 3236 | WHERE item_id=%i', |
3238 | 3237 | $inputData['id'] |
3239 | 3238 | ); |
@@ -3265,12 +3264,12 @@ discard block |
||
3265 | 3264 | // launch query |
3266 | 3265 | $rows = DB::query( |
3267 | 3266 | 'SELECT id, name, file, extension, size |
3268 | - FROM ' . prefixTable('files') . ' |
|
3267 | + FROM ' . prefixTable('files').' |
|
3269 | 3268 | WHERE id_item = %i AND confirmed = 1', |
3270 | 3269 | $inputData['id'] |
3271 | 3270 | ); |
3272 | 3271 | foreach ($rows as $record) { |
3273 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
3272 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
3274 | 3273 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
3275 | 3274 | |
3276 | 3275 | array_push( |
@@ -3283,7 +3282,7 @@ discard block |
||
3283 | 3282 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
3284 | 3283 | 'id' => $record['id'], |
3285 | 3284 | 'key' => $session->get('user-key_tmp'), |
3286 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
3285 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
3287 | 3286 | ) |
3288 | 3287 | ); |
3289 | 3288 | } |
@@ -3321,7 +3320,7 @@ discard block |
||
3321 | 3320 | array( |
3322 | 3321 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
3323 | 3322 | ), |
3324 | - 'id=' . $session->get('user-id') |
|
3323 | + 'id='.$session->get('user-id') |
|
3325 | 3324 | ); |
3326 | 3325 | } |
3327 | 3326 | |
@@ -3330,8 +3329,8 @@ discard block |
||
3330 | 3329 | $listOptionsForRoles = array(); |
3331 | 3330 | $rows = DB::query( |
3332 | 3331 | 'SELECT r.role_id AS role_id, t.title AS title |
3333 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
3334 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
3332 | + FROM ' . prefixTable('roles_values').' AS r |
|
3333 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
3335 | 3334 | WHERE r.folder_id = %i', |
3336 | 3335 | $dataItem['id_tree'] |
3337 | 3336 | ); |
@@ -3345,9 +3344,9 @@ discard block |
||
3345 | 3344 | ); |
3346 | 3345 | $rows2 = DB::query( |
3347 | 3346 | 'SELECT id, login, fonction_id, email, name, lastname |
3348 | - FROM ' . prefixTable('users') . ' |
|
3347 | + FROM ' . prefixTable('users').' |
|
3349 | 3348 | WHERE fonction_id LIKE %s', |
3350 | - '%' . $record['role_id'] . '%' |
|
3349 | + '%'.$record['role_id'].'%' |
|
3351 | 3350 | ); |
3352 | 3351 | foreach ($rows2 as $record2) { |
3353 | 3352 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3360,7 +3359,7 @@ discard block |
||
3360 | 3359 | array( |
3361 | 3360 | 'id' => (int) $record2['id'], |
3362 | 3361 | 'login' => $record2['login'], |
3363 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
3362 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
3364 | 3363 | 'email' => $record2['email'], |
3365 | 3364 | ) |
3366 | 3365 | ); |
@@ -3379,16 +3378,16 @@ discard block |
||
3379 | 3378 | $path = ''; |
3380 | 3379 | foreach ($arbo as $elem) { |
3381 | 3380 | if (empty($path) === true) { |
3382 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
3381 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
3383 | 3382 | } else { |
3384 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3383 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3385 | 3384 | } |
3386 | 3385 | } |
3387 | 3386 | // Build text to show user |
3388 | 3387 | if (empty($path) === true) { |
3389 | 3388 | $path = addslashes($dataItem['label']); |
3390 | 3389 | } else { |
3391 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
3390 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
3392 | 3391 | } |
3393 | 3392 | |
3394 | 3393 | // Add Admins to notification list if expected |
@@ -3411,7 +3410,7 @@ discard block |
||
3411 | 3410 | array( |
3412 | 3411 | addslashes($session->get('user-login')), |
3413 | 3412 | $path, |
3414 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
3413 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
3415 | 3414 | ), |
3416 | 3415 | $lang->get('email_on_open_notification_mail') |
3417 | 3416 | ), |
@@ -3421,7 +3420,7 @@ discard block |
||
3421 | 3420 | } |
3422 | 3421 | |
3423 | 3422 | // has this item a change proposal |
3424 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
3423 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
3425 | 3424 | $returnArray['has_change_proposal'] = DB::count(); |
3426 | 3425 | |
3427 | 3426 | // Setting |
@@ -3432,7 +3431,7 @@ discard block |
||
3432 | 3431 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
3433 | 3432 | DB::query( |
3434 | 3433 | 'SELECT * |
3435 | - FROM ' . prefixTable('otv') . ' |
|
3434 | + FROM ' . prefixTable('otv').' |
|
3436 | 3435 | WHERE item_id = %i |
3437 | 3436 | AND time_limit > %i', |
3438 | 3437 | $inputData['id'], |
@@ -3532,7 +3531,7 @@ discard block |
||
3532 | 3531 | // Load item data |
3533 | 3532 | $data = DB::queryFirstRow( |
3534 | 3533 | 'SELECT id_tree, id, label |
3535 | - FROM ' . prefixTable('items') . ' |
|
3534 | + FROM ' . prefixTable('items').' |
|
3536 | 3535 | WHERE id = %i OR item_key = %s', |
3537 | 3536 | $inputData['itemId'], |
3538 | 3537 | $inputData['itemKey'] |
@@ -3623,7 +3622,7 @@ discard block |
||
3623 | 3622 | // Load item data |
3624 | 3623 | $dataItem = DB::queryFirstRow( |
3625 | 3624 | 'SELECT secret, enabled |
3626 | - FROM ' . prefixTable('items_otp') . ' |
|
3625 | + FROM ' . prefixTable('items_otp').' |
|
3627 | 3626 | WHERE item_id = %i', |
3628 | 3627 | $inputData['id'] |
3629 | 3628 | ); |
@@ -3705,13 +3704,13 @@ discard block |
||
3705 | 3704 | |
3706 | 3705 | // Check if user is allowed to access this folder |
3707 | 3706 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
3708 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
3707 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
3709 | 3708 | break; |
3710 | 3709 | } |
3711 | 3710 | |
3712 | 3711 | // Check if title doesn't contains html codes |
3713 | 3712 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
3714 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
3713 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
3715 | 3714 | break; |
3716 | 3715 | } |
3717 | 3716 | // check that title is not numeric |
@@ -3722,9 +3721,9 @@ discard block |
||
3722 | 3721 | |
3723 | 3722 | // Check if duplicate folders name are allowed |
3724 | 3723 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
3725 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
3724 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
3726 | 3725 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
3727 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
3726 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
3728 | 3727 | break; |
3729 | 3728 | } |
3730 | 3729 | } |
@@ -3732,7 +3731,7 @@ discard block |
||
3732 | 3731 | // query on folder |
3733 | 3732 | $data = DB::queryfirstrow( |
3734 | 3733 | 'SELECT parent_id, personal_folder |
3735 | - FROM ' . prefixTable('nested_tree') . ' |
|
3734 | + FROM ' . prefixTable('nested_tree').' |
|
3736 | 3735 | WHERE id = %i', |
3737 | 3736 | $inputData['folderId'] |
3738 | 3737 | ); |
@@ -3742,20 +3741,20 @@ discard block |
||
3742 | 3741 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
3743 | 3742 | $data = DB::queryfirstrow( |
3744 | 3743 | 'SELECT valeur |
3745 | - FROM ' . prefixTable('misc') . ' |
|
3744 | + FROM ' . prefixTable('misc').' |
|
3746 | 3745 | WHERE intitule = %i AND type = %s', |
3747 | 3746 | $data['parent_id'], |
3748 | 3747 | 'complex' |
3749 | 3748 | ); |
3750 | 3749 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
3751 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
3750 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
3752 | 3751 | break; |
3753 | 3752 | } |
3754 | 3753 | } |
3755 | 3754 | |
3756 | 3755 | // update Folders table |
3757 | 3756 | $tmp = DB::queryFirstRow( |
3758 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
3757 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
3759 | 3758 | $dataReceived['folder'] |
3760 | 3759 | ); |
3761 | 3760 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3824,42 +3823,42 @@ discard block |
||
3824 | 3823 | in_array($post_target_folder_id, $session->get('user-accessible_folders')) === false) && ($post_target_folder_id === '0' && |
3825 | 3824 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
3826 | 3825 | ) { |
3827 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
3826 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
3828 | 3827 | echo $returnValues; |
3829 | 3828 | break; |
3830 | 3829 | } |
3831 | 3830 | |
3832 | 3831 | $tmp_source = DB::queryFirstRow( |
3833 | 3832 | 'SELECT title, parent_id, personal_folder |
3834 | - FROM ' . prefixTable('nested_tree') . ' |
|
3833 | + FROM ' . prefixTable('nested_tree').' |
|
3835 | 3834 | WHERE id = %i', |
3836 | 3835 | $post_source_folder_id |
3837 | 3836 | ); |
3838 | 3837 | |
3839 | 3838 | $tmp_target = DB::queryFirstRow( |
3840 | 3839 | 'SELECT title, parent_id, personal_folder |
3841 | - FROM ' . prefixTable('nested_tree') . ' |
|
3840 | + FROM ' . prefixTable('nested_tree').' |
|
3842 | 3841 | WHERE id = %i', |
3843 | 3842 | $post_target_folder_id |
3844 | 3843 | ); |
3845 | 3844 | |
3846 | 3845 | // check if target is not a child of source |
3847 | 3846 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
3848 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
3847 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
3849 | 3848 | echo $returnValues; |
3850 | 3849 | break; |
3851 | 3850 | } |
3852 | 3851 | |
3853 | 3852 | // check if source or target folder is PF. If Yes, then cancel operation |
3854 | 3853 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
3855 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
3854 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
3856 | 3855 | echo $returnValues; |
3857 | 3856 | break; |
3858 | 3857 | } |
3859 | 3858 | |
3860 | 3859 | // check if source or target folder is PF. If Yes, then cancel operation |
3861 | 3860 | if ($tmp_source['title'] === $session->get('user-id') || $tmp_target['title'] === $session->get('user-id')) { |
3862 | - $returnValues = '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
3861 | + $returnValues = '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
3863 | 3862 | echo $returnValues; |
3864 | 3863 | break; |
3865 | 3864 | } |
@@ -3980,7 +3979,7 @@ discard block |
||
3980 | 3979 | $uniqueLoadData['path'] = $arr_arbo; |
3981 | 3980 | |
3982 | 3981 | // store last folder accessed in cookie |
3983 | - $arr_cookie_options = array ( |
|
3982 | + $arr_cookie_options = array( |
|
3984 | 3983 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
3985 | 3984 | 'path' => '/', |
3986 | 3985 | 'secure' => true, |
@@ -3995,7 +3994,7 @@ discard block |
||
3995 | 3994 | foreach ($session->get('user-roles_array') as $role) { |
3996 | 3995 | $roleQ = DB::queryfirstrow( |
3997 | 3996 | 'SELECT allow_pw_change |
3998 | - FROM ' . prefixTable('roles_title') . ' |
|
3997 | + FROM ' . prefixTable('roles_title').' |
|
3999 | 3998 | WHERE id = %i', |
4000 | 3999 | $role |
4001 | 4000 | ); |
@@ -4026,11 +4025,11 @@ discard block |
||
4026 | 4025 | |
4027 | 4026 | foreach ($session->get('user-roles_array') as $role) { |
4028 | 4027 | $access = DB::queryFirstRow( |
4029 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
4028 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
4030 | 4029 | $role, |
4031 | 4030 | $inputData['id'] |
4032 | 4031 | ); |
4033 | - if (DB::count()>0) { |
|
4032 | + if (DB::count() > 0) { |
|
4034 | 4033 | if ($access['type'] === 'R') { |
4035 | 4034 | array_push($arrTmp, 10); |
4036 | 4035 | } elseif ($access['type'] === 'W') { |
@@ -4088,7 +4087,7 @@ discard block |
||
4088 | 4087 | } else { |
4089 | 4088 | DB::query( |
4090 | 4089 | 'SELECT * |
4091 | - FROM ' . prefixTable('items') . ' |
|
4090 | + FROM ' . prefixTable('items').' |
|
4092 | 4091 | WHERE inactif = %i', |
4093 | 4092 | 0 |
4094 | 4093 | ); |
@@ -4098,7 +4097,7 @@ discard block |
||
4098 | 4097 | |
4099 | 4098 | // Get folder complexity |
4100 | 4099 | $folderComplexity = DB::queryFirstRow( |
4101 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
4100 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
4102 | 4101 | 'complex', |
4103 | 4102 | $inputData['id'] |
4104 | 4103 | ); |
@@ -4110,7 +4109,7 @@ discard block |
||
4110 | 4109 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
4111 | 4110 | $folderRow = DB::query( |
4112 | 4111 | 'SELECT id_category |
4113 | - FROM ' . prefixTable('categories_folders') . ' |
|
4112 | + FROM ' . prefixTable('categories_folders').' |
|
4114 | 4113 | WHERE id_folder = %i', |
4115 | 4114 | $inputData['id'] |
4116 | 4115 | ); |
@@ -4225,13 +4224,13 @@ discard block |
||
4225 | 4224 | // List all ITEMS |
4226 | 4225 | if ($folderIsPf === false) { |
4227 | 4226 | $where->add('i.inactif=%i', 0); |
4228 | - $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
4227 | + $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
4229 | 4228 | if (empty($limited_to_items) === false) { |
4230 | 4229 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
4231 | 4230 | } |
4232 | 4231 | |
4233 | - $query_limit = ' LIMIT ' . |
|
4234 | - $start . ',' . |
|
4232 | + $query_limit = ' LIMIT '. |
|
4233 | + $start.','. |
|
4235 | 4234 | $post_nb_items_to_display_once; |
4236 | 4235 | //db::debugmode(true); |
4237 | 4236 | $rows = DB::query( |
@@ -4243,9 +4242,9 @@ discard block |
||
4243 | 4242 | l.id_user AS log_user, |
4244 | 4243 | i.url AS link, |
4245 | 4244 | i.email AS email |
4246 | - FROM ' . prefixTable('items') . ' AS i |
|
4247 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
4248 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
4245 | + FROM ' . prefixTable('items').' AS i |
|
4246 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
4247 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
4249 | 4248 | WHERE %l |
4250 | 4249 | GROUP BY i.id, l.date, l.id_user, l.action |
4251 | 4250 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4265,9 +4264,9 @@ discard block |
||
4265 | 4264 | l.id_user AS log_user, |
4266 | 4265 | i.url AS link, |
4267 | 4266 | i.email AS email |
4268 | - FROM ' . prefixTable('items') . ' AS i |
|
4269 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
4270 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
4267 | + FROM ' . prefixTable('items').' AS i |
|
4268 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
4269 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
4271 | 4270 | WHERE %l |
4272 | 4271 | GROUP BY i.id, l.date, l.id_user, l.action |
4273 | 4272 | ORDER BY i.label ASC, l.date DESC', |
@@ -4298,7 +4297,7 @@ discard block |
||
4298 | 4297 | $item_is_restricted_to_role = false; |
4299 | 4298 | DB::queryfirstrow( |
4300 | 4299 | 'SELECT role_id |
4301 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
4300 | + FROM ' . prefixTable('restriction_to_roles').' |
|
4302 | 4301 | WHERE item_id = %i', |
4303 | 4302 | $record['id'] |
4304 | 4303 | ); |
@@ -4310,7 +4309,7 @@ discard block |
||
4310 | 4309 | $user_is_included_in_role = false; |
4311 | 4310 | DB::query( |
4312 | 4311 | 'SELECT role_id |
4313 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
4312 | + FROM ' . prefixTable('restriction_to_roles').' |
|
4314 | 4313 | WHERE item_id = %i AND role_id IN %ls', |
4315 | 4314 | $record['id'], |
4316 | 4315 | $session->get('user-roles_array') |
@@ -4517,9 +4516,9 @@ discard block |
||
4517 | 4516 | if ((int) $start === 0) { |
4518 | 4517 | DB::query( |
4519 | 4518 | 'SELECT i.id |
4520 | - FROM ' . prefixTable('items') . ' as i |
|
4521 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
4522 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
4519 | + FROM ' . prefixTable('items').' as i |
|
4520 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
4521 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
4523 | 4522 | WHERE %l |
4524 | 4523 | ORDER BY i.label ASC, l.date DESC', |
4525 | 4524 | $where |
@@ -4583,8 +4582,8 @@ discard block |
||
4583 | 4582 | // Run query |
4584 | 4583 | $dataItem = DB::queryfirstrow( |
4585 | 4584 | 'SELECT i.pw AS pw, s.share_key AS share_key |
4586 | - FROM ' . prefixTable('items') . ' AS i |
|
4587 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
4585 | + FROM ' . prefixTable('items').' AS i |
|
4586 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
4588 | 4587 | WHERE user_id = %i AND i.item_key = %s', |
4589 | 4588 | $session->get('user-id'), |
4590 | 4589 | $inputData['itemKey'] |
@@ -4635,7 +4634,7 @@ discard block |
||
4635 | 4634 | // get if existing edition lock |
4636 | 4635 | $dataItemEditionLocks = DB::query( |
4637 | 4636 | 'SELECT timestamp, user_id |
4638 | - FROM ' . prefixTable('items_edition') . ' |
|
4637 | + FROM ' . prefixTable('items_edition').' |
|
4639 | 4638 | WHERE item_id = %i |
4640 | 4639 | ORDER BY increment_id DESC', |
4641 | 4640 | $inputData['itemId'] |
@@ -4644,7 +4643,7 @@ discard block |
||
4644 | 4643 | if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
4645 | 4644 | |
4646 | 4645 | // Check if item has no edition lock |
4647 | - if ((int) DB::count() > 0 ) { |
|
4646 | + if ((int) DB::count() > 0) { |
|
4648 | 4647 | // get last edition lock |
4649 | 4648 | $dataLastItemEditionLock = $dataItemEditionLocks[0]; |
4650 | 4649 | |
@@ -4654,10 +4653,10 @@ discard block |
||
4654 | 4653 | } else { |
4655 | 4654 | $delay = EDITION_LOCK_PERIOD; // One day delay |
4656 | 4655 | } |
4657 | - if (WIP === true) error_log('delay: ' . $delay); |
|
4656 | + if (WIP === true) error_log('delay: '.$delay); |
|
4658 | 4657 | |
4659 | 4658 | // We remove old edition locks if delay is expired meaning more than 1 day long |
4660 | - if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
|
4659 | + if (round(abs(time() - $dataTmp['timestamp']), 0) > $delay) { |
|
4661 | 4660 | // Case where time is expired |
4662 | 4661 | // In this case, delete edition lock and possible ongoing processes |
4663 | 4662 | // and continue editing this time |
@@ -4674,7 +4673,7 @@ discard block |
||
4674 | 4673 | // Get process Id |
4675 | 4674 | $processDetail = DB::queryFirstRow( |
4676 | 4675 | 'SELECT increment_id |
4677 | - FROM ' . prefixTable('background_tasks') . ' |
|
4676 | + FROM ' . prefixTable('background_tasks').' |
|
4678 | 4677 | WHERE item_id = %i AND finished_at = ""', |
4679 | 4678 | $inputData['itemId'] |
4680 | 4679 | ); |
@@ -4692,7 +4691,7 @@ discard block |
||
4692 | 4691 | // get if existing process ongoing for this item |
4693 | 4692 | $dataItemProcessOngoing = DB::queryFirstRow( |
4694 | 4693 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
4695 | - FROM ' . prefixTable('background_tasks') . ' |
|
4694 | + FROM ' . prefixTable('background_tasks').' |
|
4696 | 4695 | WHERE item_id = %i AND finished_at = "" |
4697 | 4696 | ORDER BY increment_id DESC', |
4698 | 4697 | $inputData['itemId'] |
@@ -4719,7 +4718,7 @@ discard block |
||
4719 | 4718 | ); |
4720 | 4719 | break; |
4721 | 4720 | } |
4722 | - } elseif (round(abs(time() - $dataTmp['timestamp']),0) <= $delay) { |
|
4721 | + } elseif (round(abs(time() - $dataTmp['timestamp']), 0) <= $delay) { |
|
4723 | 4722 | // Case where edition lock is already taken by another user |
4724 | 4723 | // Then no edition is possible |
4725 | 4724 | $returnValues = array( |
@@ -4748,7 +4747,7 @@ discard block |
||
4748 | 4747 | // do query on this folder |
4749 | 4748 | $data_this_folder = DB::queryFirstRow( |
4750 | 4749 | 'SELECT id, personal_folder, title |
4751 | - FROM ' . prefixTable('nested_tree') . ' |
|
4750 | + FROM ' . prefixTable('nested_tree').' |
|
4752 | 4751 | WHERE id = %s', |
4753 | 4752 | $inputData['folderId'] |
4754 | 4753 | ); |
@@ -4788,8 +4787,8 @@ discard block |
||
4788 | 4787 | $visibilite = ''; |
4789 | 4788 | $data = DB::queryFirstRow( |
4790 | 4789 | 'SELECT m.valeur, n.personal_folder |
4791 | - FROM ' . prefixTable('misc') . ' AS m |
|
4792 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
4790 | + FROM ' . prefixTable('misc').' AS m |
|
4791 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
4793 | 4792 | WHERE type=%s AND intitule = %s', |
4794 | 4793 | 'complex', |
4795 | 4794 | $inputData['folderId'] |
@@ -4802,8 +4801,8 @@ discard block |
||
4802 | 4801 | // Prepare Item actual visibility (what Users/Roles can see it) |
4803 | 4802 | $rows = DB::query( |
4804 | 4803 | 'SELECT t.title |
4805 | - FROM ' . prefixTable('roles_values') . ' as v |
|
4806 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
4804 | + FROM ' . prefixTable('roles_values').' as v |
|
4805 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
4807 | 4806 | WHERE v.folder_id = %i |
4808 | 4807 | GROUP BY title', |
4809 | 4808 | $inputData['folderId'] |
@@ -4812,7 +4811,7 @@ discard block |
||
4812 | 4811 | if (empty($visibilite)) { |
4813 | 4812 | $visibilite = $record['title']; |
4814 | 4813 | } else { |
4815 | - $visibilite .= ' - ' . $record['title']; |
|
4814 | + $visibilite .= ' - '.$record['title']; |
|
4816 | 4815 | } |
4817 | 4816 | } |
4818 | 4817 | } else { |
@@ -4822,14 +4821,14 @@ discard block |
||
4822 | 4821 | // do new query to know if current folder is pf |
4823 | 4822 | $data_pf = DB::queryFirstRow( |
4824 | 4823 | 'SELECT personal_folder |
4825 | - FROM ' . prefixTable('nested_tree') . ' |
|
4824 | + FROM ' . prefixTable('nested_tree').' |
|
4826 | 4825 | WHERE id = %s', |
4827 | 4826 | $inputData['folderId'] |
4828 | 4827 | ); |
4829 | 4828 | |
4830 | 4829 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
4831 | 4830 | |
4832 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
4831 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
4833 | 4832 | } |
4834 | 4833 | |
4835 | 4834 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4839,8 +4838,8 @@ discard block |
||
4839 | 4838 | $listOptionsForRoles = array(); |
4840 | 4839 | $rows = DB::query( |
4841 | 4840 | 'SELECT r.role_id AS role_id, t.title AS title |
4842 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
4843 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
4841 | + FROM ' . prefixTable('roles_values').' AS r |
|
4842 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
4844 | 4843 | WHERE r.folder_id = %i', |
4845 | 4844 | $inputData['folderId'] |
4846 | 4845 | ); |
@@ -4854,7 +4853,7 @@ discard block |
||
4854 | 4853 | ); |
4855 | 4854 | $rows2 = DB::query( |
4856 | 4855 | 'SELECT id, login, fonction_id, email, name, lastname |
4857 | - FROM ' . prefixTable('users') . ' |
|
4856 | + FROM ' . prefixTable('users').' |
|
4858 | 4857 | WHERE admin = 0 AND fonction_id is not null' |
4859 | 4858 | ); |
4860 | 4859 | foreach ($rows2 as $record2) { |
@@ -4868,7 +4867,7 @@ discard block |
||
4868 | 4867 | array( |
4869 | 4868 | 'id' => $record2['id'], |
4870 | 4869 | 'login' => $record2['login'], |
4871 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
4870 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
4872 | 4871 | 'email' => $record2['email'], |
4873 | 4872 | ) |
4874 | 4873 | ); |
@@ -4885,13 +4884,13 @@ discard block |
||
4885 | 4884 | //db::debugmode(true); |
4886 | 4885 | $access = DB::queryFirstRow( |
4887 | 4886 | 'SELECT type |
4888 | - FROM ' . prefixTable('roles_values') . ' |
|
4887 | + FROM ' . prefixTable('roles_values').' |
|
4889 | 4888 | WHERE role_id = %i AND folder_id = %i', |
4890 | 4889 | $role, |
4891 | 4890 | $inputData['folderId'] |
4892 | 4891 | ); |
4893 | 4892 | //db::debugmode(false); |
4894 | - if (DB::count()>0) { |
|
4893 | + if (DB::count() > 0) { |
|
4895 | 4894 | if ($access['type'] === 'R') { |
4896 | 4895 | array_push($arrTmp, 10); |
4897 | 4896 | } elseif ($access['type'] === 'W') { |
@@ -4996,7 +4995,7 @@ discard block |
||
4996 | 4995 | // Get some info before deleting |
4997 | 4996 | $data = DB::queryFirstRow( |
4998 | 4997 | 'SELECT name, id_item, file |
4999 | - FROM ' . prefixTable('files') . ' |
|
4998 | + FROM ' . prefixTable('files').' |
|
5000 | 4999 | WHERE id = %i', |
5001 | 5000 | $fileId |
5002 | 5001 | ); |
@@ -5004,7 +5003,7 @@ discard block |
||
5004 | 5003 | // Load item data |
5005 | 5004 | $data_item = DB::queryFirstRow( |
5006 | 5005 | 'SELECT id_tree |
5007 | - FROM ' . prefixTable('items') . ' |
|
5006 | + FROM ' . prefixTable('items').' |
|
5008 | 5007 | WHERE id = %i', |
5009 | 5008 | $data['id_item'] |
5010 | 5009 | ); |
@@ -5034,7 +5033,7 @@ discard block |
||
5034 | 5033 | $session->get('user-id'), |
5035 | 5034 | 'at_modification', |
5036 | 5035 | $session->get('user-login'), |
5037 | - 'at_del_file : ' . $data['name'] |
|
5036 | + 'at_del_file : '.$data['name'] |
|
5038 | 5037 | ); |
5039 | 5038 | |
5040 | 5039 | // DElete sharekeys |
@@ -5045,7 +5044,7 @@ discard block |
||
5045 | 5044 | ); |
5046 | 5045 | |
5047 | 5046 | // Delete file from server |
5048 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
5047 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
5049 | 5048 | $fileToDelete = realpath($fileToDelete); |
5050 | 5049 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
5051 | 5050 | fileDelete($fileToDelete, $SETTINGS); |
@@ -5099,7 +5098,7 @@ discard block |
||
5099 | 5098 | // Update SESSION with this new favourite |
5100 | 5099 | $data = DB::queryfirstrow( |
5101 | 5100 | 'SELECT label,id_tree |
5102 | - FROM ' . prefixTable('items') . ' |
|
5101 | + FROM ' . prefixTable('items').' |
|
5103 | 5102 | WHERE id = %i', |
5104 | 5103 | $inputData['itemId'] |
5105 | 5104 | ); |
@@ -5108,7 +5107,7 @@ discard block |
||
5108 | 5107 | [ |
5109 | 5108 | $inputData['itemId'] => [ |
5110 | 5109 | 'label' => $data['label'], |
5111 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
5110 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
5112 | 5111 | ], |
5113 | 5112 | ], |
5114 | 5113 | 'add' |
@@ -5177,8 +5176,8 @@ discard block |
||
5177 | 5176 | // get data about item |
5178 | 5177 | $dataSource = DB::queryfirstrow( |
5179 | 5178 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
5180 | - FROM ' . prefixTable('items') . ' as i |
|
5181 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
5179 | + FROM ' . prefixTable('items').' as i |
|
5180 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
5182 | 5181 | WHERE i.id=%i', |
5183 | 5182 | $inputData['itemId'] |
5184 | 5183 | ); |
@@ -5222,7 +5221,7 @@ discard block |
||
5222 | 5221 | // get data about new folder |
5223 | 5222 | $dataDestination = DB::queryfirstrow( |
5224 | 5223 | 'SELECT personal_folder, title |
5225 | - FROM ' . prefixTable('nested_tree') . ' |
|
5224 | + FROM ' . prefixTable('nested_tree').' |
|
5226 | 5225 | WHERE id = %i', |
5227 | 5226 | $inputData['folderId'] |
5228 | 5227 | ); |
@@ -5275,7 +5274,7 @@ discard block |
||
5275 | 5274 | // Get fields for this Item |
5276 | 5275 | $rows = DB::query( |
5277 | 5276 | 'SELECT id |
5278 | - FROM ' . prefixTable('categories_items') . ' |
|
5277 | + FROM ' . prefixTable('categories_items').' |
|
5279 | 5278 | WHERE item_id = %i', |
5280 | 5279 | $inputData['itemId'] |
5281 | 5280 | ); |
@@ -5292,7 +5291,7 @@ discard block |
||
5292 | 5291 | // Get FILES for this Item |
5293 | 5292 | $rows = DB::query( |
5294 | 5293 | 'SELECT id |
5295 | - FROM ' . prefixTable('files') . ' |
|
5294 | + FROM ' . prefixTable('files').' |
|
5296 | 5295 | WHERE id_item = %i', |
5297 | 5296 | $inputData['itemId'] |
5298 | 5297 | ); |
@@ -5339,7 +5338,7 @@ discard block |
||
5339 | 5338 | // Get the ITEM object key for the user |
5340 | 5339 | $userKey = DB::queryFirstRow( |
5341 | 5340 | 'SELECT share_key |
5342 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
5341 | + FROM ' . prefixTable('sharekeys_items').' |
|
5343 | 5342 | WHERE user_id = %i AND object_id = %i', |
5344 | 5343 | $session->get('user-id'), |
5345 | 5344 | $inputData['itemId'] |
@@ -5350,8 +5349,8 @@ discard block |
||
5350 | 5349 | // This is a public object |
5351 | 5350 | $users = DB::query( |
5352 | 5351 | 'SELECT id, public_key |
5353 | - FROM ' . prefixTable('users') . ' |
|
5354 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
5352 | + FROM ' . prefixTable('users').' |
|
5353 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
5355 | 5354 | AND public_key != ""' |
5356 | 5355 | ); |
5357 | 5356 | foreach ($users as $user) { |
@@ -5371,14 +5370,14 @@ discard block |
||
5371 | 5370 | // Get fields for this Item |
5372 | 5371 | $rows = DB::query( |
5373 | 5372 | 'SELECT id |
5374 | - FROM ' . prefixTable('categories_items') . ' |
|
5373 | + FROM ' . prefixTable('categories_items').' |
|
5375 | 5374 | WHERE item_id = %i', |
5376 | 5375 | $inputData['itemId'] |
5377 | 5376 | ); |
5378 | 5377 | foreach ($rows as $field) { |
5379 | 5378 | $userKey = DB::queryFirstRow( |
5380 | 5379 | 'SELECT share_key |
5381 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5380 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5382 | 5381 | WHERE user_id = %i AND object_id = %i', |
5383 | 5382 | $session->get('user-id'), |
5384 | 5383 | $field['id'] |
@@ -5389,8 +5388,8 @@ discard block |
||
5389 | 5388 | // This is a public object |
5390 | 5389 | $users = DB::query( |
5391 | 5390 | 'SELECT id, public_key |
5392 | - FROM ' . prefixTable('users') . ' |
|
5393 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
5391 | + FROM ' . prefixTable('users').' |
|
5392 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
5394 | 5393 | AND public_key != ""' |
5395 | 5394 | ); |
5396 | 5395 | foreach ($users as $user) { |
@@ -5411,14 +5410,14 @@ discard block |
||
5411 | 5410 | // Get FILES for this Item |
5412 | 5411 | $rows = DB::query( |
5413 | 5412 | 'SELECT id |
5414 | - FROM ' . prefixTable('files') . ' |
|
5413 | + FROM ' . prefixTable('files').' |
|
5415 | 5414 | WHERE id_item = %i', |
5416 | 5415 | $inputData['itemId'] |
5417 | 5416 | ); |
5418 | 5417 | foreach ($rows as $attachment) { |
5419 | 5418 | $userKey = DB::queryFirstRow( |
5420 | 5419 | 'SELECT share_key |
5421 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5420 | + FROM ' . prefixTable('sharekeys_files').' |
|
5422 | 5421 | WHERE user_id = %i AND object_id = %i', |
5423 | 5422 | $session->get('user-id'), |
5424 | 5423 | $attachment['id'] |
@@ -5429,8 +5428,8 @@ discard block |
||
5429 | 5428 | // This is a public object |
5430 | 5429 | $users = DB::query( |
5431 | 5430 | 'SELECT id, public_key |
5432 | - FROM ' . prefixTable('users') . ' |
|
5433 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
5431 | + FROM ' . prefixTable('users').' |
|
5432 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
5434 | 5433 | AND public_key != ""' |
5435 | 5434 | ); |
5436 | 5435 | foreach ($users as $user) { |
@@ -5468,7 +5467,7 @@ discard block |
||
5468 | 5467 | $session->get('user-id'), |
5469 | 5468 | 'at_modification', |
5470 | 5469 | $session->get('user-login'), |
5471 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5470 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5472 | 5471 | ); |
5473 | 5472 | |
5474 | 5473 | // Update cache table |
@@ -5527,8 +5526,8 @@ discard block |
||
5527 | 5526 | // get data about item |
5528 | 5527 | $dataSource = DB::queryfirstrow( |
5529 | 5528 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
5530 | - FROM ' . prefixTable('items') . ' as i |
|
5531 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
5529 | + FROM ' . prefixTable('items').' as i |
|
5530 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
5532 | 5531 | WHERE i.id=%i', |
5533 | 5532 | $item_id |
5534 | 5533 | ); |
@@ -5550,7 +5549,7 @@ discard block |
||
5550 | 5549 | |
5551 | 5550 | // get data about new folder |
5552 | 5551 | $dataDestination = DB::queryfirstrow( |
5553 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
5552 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
5554 | 5553 | $inputData['folderId'] |
5555 | 5554 | ); |
5556 | 5555 | |
@@ -5592,7 +5591,7 @@ discard block |
||
5592 | 5591 | // Get fields for this Item |
5593 | 5592 | $rows = DB::query( |
5594 | 5593 | 'SELECT id |
5595 | - FROM ' . prefixTable('categories_items') . ' |
|
5594 | + FROM ' . prefixTable('categories_items').' |
|
5596 | 5595 | WHERE item_id = %i', |
5597 | 5596 | $item_id |
5598 | 5597 | ); |
@@ -5609,7 +5608,7 @@ discard block |
||
5609 | 5608 | // Get FILES for this Item |
5610 | 5609 | $rows = DB::query( |
5611 | 5610 | 'SELECT id |
5612 | - FROM ' . prefixTable('files') . ' |
|
5611 | + FROM ' . prefixTable('files').' |
|
5613 | 5612 | WHERE id_item = %i', |
5614 | 5613 | $item_id |
5615 | 5614 | ); |
@@ -5664,7 +5663,7 @@ discard block |
||
5664 | 5663 | // Get the ITEM object key for the user |
5665 | 5664 | $userKey = DB::queryFirstRow( |
5666 | 5665 | 'SELECT share_key |
5667 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
5666 | + FROM ' . prefixTable('sharekeys_items').' |
|
5668 | 5667 | WHERE user_id = %i AND object_id = %i', |
5669 | 5668 | $session->get('user-id'), |
5670 | 5669 | $item_id |
@@ -5675,8 +5674,8 @@ discard block |
||
5675 | 5674 | // This is a public object |
5676 | 5675 | $users = DB::query( |
5677 | 5676 | 'SELECT id, public_key |
5678 | - FROM ' . prefixTable('users') . ' |
|
5679 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
5677 | + FROM ' . prefixTable('users').' |
|
5678 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
5680 | 5679 | AND public_key != ""' |
5681 | 5680 | ); |
5682 | 5681 | foreach ($users as $user) { |
@@ -5696,14 +5695,14 @@ discard block |
||
5696 | 5695 | // Get fields for this Item |
5697 | 5696 | $rows = DB::query( |
5698 | 5697 | 'SELECT id |
5699 | - FROM ' . prefixTable('categories_items') . ' |
|
5698 | + FROM ' . prefixTable('categories_items').' |
|
5700 | 5699 | WHERE item_id = %i', |
5701 | 5700 | $item_id |
5702 | 5701 | ); |
5703 | 5702 | foreach ($rows as $field) { |
5704 | 5703 | $userKey = DB::queryFirstRow( |
5705 | 5704 | 'SELECT share_key |
5706 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5705 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5707 | 5706 | WHERE user_id = %i AND object_id = %i', |
5708 | 5707 | $session->get('user-id'), |
5709 | 5708 | $field['id'] |
@@ -5714,8 +5713,8 @@ discard block |
||
5714 | 5713 | // This is a public object |
5715 | 5714 | $users = DB::query( |
5716 | 5715 | 'SELECT id, public_key |
5717 | - FROM ' . prefixTable('users') . ' |
|
5718 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
5716 | + FROM ' . prefixTable('users').' |
|
5717 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
5719 | 5718 | AND public_key != ""' |
5720 | 5719 | ); |
5721 | 5720 | foreach ($users as $user) { |
@@ -5736,14 +5735,14 @@ discard block |
||
5736 | 5735 | // Get FILES for this Item |
5737 | 5736 | $rows = DB::query( |
5738 | 5737 | 'SELECT id |
5739 | - FROM ' . prefixTable('files') . ' |
|
5738 | + FROM ' . prefixTable('files').' |
|
5740 | 5739 | WHERE id_item = %i', |
5741 | 5740 | $item_id |
5742 | 5741 | ); |
5743 | 5742 | foreach ($rows as $attachment) { |
5744 | 5743 | $userKey = DB::queryFirstRow( |
5745 | 5744 | 'SELECT share_key |
5746 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5745 | + FROM ' . prefixTable('sharekeys_files').' |
|
5747 | 5746 | WHERE user_id = %i AND object_id = %i', |
5748 | 5747 | $session->get('user-id'), |
5749 | 5748 | $attachment['id'] |
@@ -5754,8 +5753,8 @@ discard block |
||
5754 | 5753 | // This is a public object |
5755 | 5754 | $users = DB::query( |
5756 | 5755 | 'SELECT id, public_key |
5757 | - FROM ' . prefixTable('users') . ' |
|
5758 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
5756 | + FROM ' . prefixTable('users').' |
|
5757 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
5759 | 5758 | AND public_key != ""' |
5760 | 5759 | ); |
5761 | 5760 | foreach ($users as $user) { |
@@ -5792,13 +5791,13 @@ discard block |
||
5792 | 5791 | $session->get('user-id'), |
5793 | 5792 | 'at_modification', |
5794 | 5793 | $session->get('user-login'), |
5795 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5794 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5796 | 5795 | ); |
5797 | 5796 | } |
5798 | 5797 | } |
5799 | 5798 | |
5800 | 5799 | // reload cache table |
5801 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
5800 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
5802 | 5801 | updateCacheTable('reload', null); |
5803 | 5802 | |
5804 | 5803 | echo (string) prepareExchangedData( |
@@ -5862,7 +5861,7 @@ discard block |
||
5862 | 5861 | // get info |
5863 | 5862 | $dataSource = DB::queryfirstrow( |
5864 | 5863 | 'SELECT label, id_tree |
5865 | - FROM ' . prefixTable('items') . ' |
|
5864 | + FROM ' . prefixTable('items').' |
|
5866 | 5865 | WHERE id=%i', |
5867 | 5866 | $item_id |
5868 | 5867 | ); |
@@ -5961,8 +5960,8 @@ discard block |
||
5961 | 5960 | } |
5962 | 5961 | if ($inputData['cat'] === 'request_access_to_author') { |
5963 | 5962 | // Variables |
5964 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
5965 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
5963 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
5964 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
5966 | 5965 | |
5967 | 5966 | // Get path |
5968 | 5967 | $path = geItemReadablePath( |
@@ -5976,7 +5975,7 @@ discard block |
||
5976 | 5975 | $lang->get('email_request_access_subject'), |
5977 | 5976 | str_replace( |
5978 | 5977 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
5979 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
5978 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
5980 | 5979 | $lang->get('email_request_access_mail') |
5981 | 5980 | ), |
5982 | 5981 | $dataAuthor['email'], |
@@ -5985,7 +5984,7 @@ discard block |
||
5985 | 5984 | } elseif ($inputData['cat'] === 'share_this_item') { |
5986 | 5985 | $dataItem = DB::queryfirstrow( |
5987 | 5986 | 'SELECT label,id_tree |
5988 | - FROM ' . prefixTable('items') . ' |
|
5987 | + FROM ' . prefixTable('items').' |
|
5989 | 5988 | WHERE id= %i', |
5990 | 5989 | $inputData['id'] |
5991 | 5990 | ); |
@@ -6008,7 +6007,7 @@ discard block |
||
6008 | 6007 | ), |
6009 | 6008 | array( |
6010 | 6009 | empty($SETTINGS['email_server_url']) === false ? |
6011 | - $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'], |
|
6010 | + $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'], |
|
6012 | 6011 | addslashes($session->get('user-login')), |
6013 | 6012 | addslashes($path), |
6014 | 6013 | ), |
@@ -6108,8 +6107,8 @@ discard block |
||
6108 | 6107 | // Get all informations for this item |
6109 | 6108 | $dataItem = DB::queryfirstrow( |
6110 | 6109 | 'SELECT * |
6111 | - FROM ' . prefixTable('items') . ' as i |
|
6112 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
6110 | + FROM ' . prefixTable('items').' as i |
|
6111 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
6113 | 6112 | WHERE i.id=%i AND l.action = %s', |
6114 | 6113 | $item_id, |
6115 | 6114 | 'at_creation' |
@@ -6138,18 +6137,18 @@ discard block |
||
6138 | 6137 | $session->get('user-login'), |
6139 | 6138 | htmlspecialchars_decode($label, ENT_QUOTES), |
6140 | 6139 | null, |
6141 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
6140 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
6142 | 6141 | ); |
6143 | 6142 | // Prepare new line |
6144 | 6143 | $data = DB::queryfirstrow( |
6145 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
6144 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
6146 | 6145 | $item_id |
6147 | 6146 | ); |
6148 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
6147 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
6149 | 6148 | // send back |
6150 | 6149 | $data = array( |
6151 | 6150 | 'error' => '', |
6152 | - 'new_line' => '<br>' . addslashes($historic), |
|
6151 | + 'new_line' => '<br>'.addslashes($historic), |
|
6153 | 6152 | ); |
6154 | 6153 | echo (string) prepareExchangedData( |
6155 | 6154 | $data, |
@@ -6221,7 +6220,7 @@ discard block |
||
6221 | 6220 | ); |
6222 | 6221 | |
6223 | 6222 | // delete all existing old otv codes |
6224 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time()); |
|
6223 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time()); |
|
6225 | 6224 | foreach ($rows as $record) { |
6226 | 6225 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
6227 | 6226 | } |
@@ -6243,8 +6242,8 @@ discard block |
||
6243 | 6242 | // Should we log a password change? |
6244 | 6243 | $itemQ = DB::queryFirstRow( |
6245 | 6244 | 'SELECT s.share_key, i.pw |
6246 | - FROM ' . prefixTable('items') . ' AS i |
|
6247 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
6245 | + FROM ' . prefixTable('items').' AS i |
|
6246 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
6248 | 6247 | WHERE s.user_id = %i AND s.object_id = %i', |
6249 | 6248 | $session->get('user-id'), |
6250 | 6249 | $dataReceived['id'] |
@@ -6299,7 +6298,7 @@ discard block |
||
6299 | 6298 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
6300 | 6299 | $SETTINGS['otv_expiration_period'] = 7; |
6301 | 6300 | } |
6302 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
6301 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
6303 | 6302 | |
6304 | 6303 | echo json_encode( |
6305 | 6304 | array( |
@@ -6330,7 +6329,7 @@ discard block |
||
6330 | 6329 | // get parameters from original link |
6331 | 6330 | $url = $dataReceived['original_link']; |
6332 | 6331 | $parts = parse_url($url); |
6333 | - if(isset($parts['query'])){ |
|
6332 | + if (isset($parts['query'])) { |
|
6334 | 6333 | parse_str($parts['query'], $orignal_link_parameters); |
6335 | 6334 | } else { |
6336 | 6335 | $orignal_link_parameters = array(); |
@@ -6361,13 +6360,13 @@ discard block |
||
6361 | 6360 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
6362 | 6361 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
6363 | 6362 | if (str_contains($domain_host, 'www.') === true) { |
6364 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
6363 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
6365 | 6364 | } else { |
6366 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
6365 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
6367 | 6366 | } |
6368 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
6367 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
6369 | 6368 | } else { |
6370 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
6369 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
6371 | 6370 | } |
6372 | 6371 | |
6373 | 6372 | echo (string) prepareExchangedData( |
@@ -6402,8 +6401,8 @@ discard block |
||
6402 | 6401 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
6403 | 6402 | f.extension AS extension, f.type AS type, |
6404 | 6403 | s.share_key AS share_key |
6405 | - FROM ' . prefixTable('files') . ' AS f |
|
6406 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
6404 | + FROM ' . prefixTable('files').' AS f |
|
6405 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
6407 | 6406 | WHERE s.user_id = %i AND s.object_id = %i', |
6408 | 6407 | $session->get('user-id'), |
6409 | 6408 | $inputData['id'] |
@@ -6424,7 +6423,7 @@ discard block |
||
6424 | 6423 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
6425 | 6424 | |
6426 | 6425 | // prepare image info |
6427 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
6426 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
6428 | 6427 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
6429 | 6428 | |
6430 | 6429 | // Get image content |
@@ -6439,7 +6438,7 @@ discard block |
||
6439 | 6438 | echo (string) prepareExchangedData( |
6440 | 6439 | array( |
6441 | 6440 | 'error' => false, |
6442 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
6441 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
6443 | 6442 | 'file_type' => $file_info['type'], |
6444 | 6443 | 'file_content' => $fileContent, |
6445 | 6444 | ), |
@@ -6492,16 +6491,16 @@ discard block |
||
6492 | 6491 | $idFolder = $dataReceived['idFolder']; |
6493 | 6492 | |
6494 | 6493 | // don't check if Personal Folder |
6495 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
6494 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
6496 | 6495 | if ($data['title'] === $session->get('user-id')) { |
6497 | 6496 | // send data |
6498 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
6497 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
6499 | 6498 | } else { |
6500 | 6499 | if ($inputData['option'] === 'same_folder') { |
6501 | 6500 | // case unique folder |
6502 | 6501 | DB::query( |
6503 | 6502 | 'SELECT label |
6504 | - FROM ' . prefixTable('items') . ' |
|
6503 | + FROM ' . prefixTable('items').' |
|
6505 | 6504 | WHERE id_tree = %i AND label = %s', |
6506 | 6505 | $idFolder, |
6507 | 6506 | $label |
@@ -6513,7 +6512,7 @@ discard block |
||
6513 | 6512 | $arrayPf = array(); |
6514 | 6513 | if (empty($row['id']) === false) { |
6515 | 6514 | $rows = DB::query( |
6516 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
6515 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
6517 | 6516 | '1' |
6518 | 6517 | ); |
6519 | 6518 | foreach ($rows as $record) { |
@@ -6528,12 +6527,12 @@ discard block |
||
6528 | 6527 | $where->add('id_tree = %i', $idFolder); |
6529 | 6528 | $where->add('label = %s', $label); |
6530 | 6529 | if (empty($arrayPf) === false) { |
6531 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
6530 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
6532 | 6531 | } |
6533 | 6532 | |
6534 | 6533 | DB::query( |
6535 | 6534 | 'SELECT label |
6536 | - FROM ' . prefixTable('items') . ' |
|
6535 | + FROM ' . prefixTable('items').' |
|
6537 | 6536 | WHERE %l', |
6538 | 6537 | $where |
6539 | 6538 | ); |
@@ -6545,7 +6544,7 @@ discard block |
||
6545 | 6544 | } |
6546 | 6545 | |
6547 | 6546 | // send data |
6548 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
6547 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
6549 | 6548 | } |
6550 | 6549 | break; |
6551 | 6550 | |
@@ -6655,7 +6654,7 @@ discard block |
||
6655 | 6654 | $arbo = $tree->getPath($folder->id, false); |
6656 | 6655 | $path = ''; |
6657 | 6656 | foreach ($arbo as $elem) { |
6658 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6657 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6659 | 6658 | } |
6660 | 6659 | |
6661 | 6660 | // Build array |
@@ -6724,7 +6723,7 @@ discard block |
||
6724 | 6723 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
6725 | 6724 | $rows = DB::query( |
6726 | 6725 | 'SELECT id, categories |
6727 | - FROM ' . prefixTable('nested_tree') . ' |
|
6726 | + FROM ' . prefixTable('nested_tree').' |
|
6728 | 6727 | WHERE id IN (%l)', |
6729 | 6728 | implode(',', $foldersArray) |
6730 | 6729 | ); |
@@ -6766,7 +6765,7 @@ discard block |
||
6766 | 6765 | // get item info |
6767 | 6766 | $dataItem = DB::queryFirstRow( |
6768 | 6767 | 'SELECT * |
6769 | - FROM ' . prefixTable('items') . ' |
|
6768 | + FROM ' . prefixTable('items').' |
|
6770 | 6769 | WHERE id=%i', |
6771 | 6770 | $inputData['itemId'] |
6772 | 6771 | ); |
@@ -6778,8 +6777,8 @@ discard block |
||
6778 | 6777 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
6779 | 6778 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
6780 | 6779 | l.old_value as old_value |
6781 | - FROM ' . prefixTable('log_items') . ' as l |
|
6782 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
6780 | + FROM ' . prefixTable('log_items').' as l |
|
6781 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
6783 | 6782 | WHERE id_item=%i AND l.action NOT IN (%l) |
6784 | 6783 | ORDER BY date DESC', |
6785 | 6784 | $inputData['itemId'], |
@@ -6794,18 +6793,18 @@ discard block |
||
6794 | 6793 | |
6795 | 6794 | // imported via API |
6796 | 6795 | if (empty($record['login']) === true) { |
6797 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
6796 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
6798 | 6797 | } |
6799 | 6798 | |
6800 | 6799 | // Prepare avatar |
6801 | 6800 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
6802 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
6803 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
6801 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
6802 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
6804 | 6803 | } else { |
6805 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6804 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6806 | 6805 | } |
6807 | 6806 | } else { |
6808 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6807 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6809 | 6808 | } |
6810 | 6809 | |
6811 | 6810 | // Prepare action |
@@ -6825,7 +6824,7 @@ discard block |
||
6825 | 6824 | $previous_passwords, |
6826 | 6825 | [ |
6827 | 6826 | 'password' => htmlentities($previous_pwd['string']), |
6828 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6827 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6829 | 6828 | ] |
6830 | 6829 | ); |
6831 | 6830 | } |
@@ -6838,19 +6837,19 @@ discard block |
||
6838 | 6837 | $action = $lang->get($reason[0]); |
6839 | 6838 | if ($reason[0] === 'at_moved') { |
6840 | 6839 | $tmp = explode(' -> ', $reason[1]); |
6841 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
6840 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
6842 | 6841 | } elseif ($reason[0] === 'at_field') { |
6843 | 6842 | $tmp = explode(' => ', $reason[1]); |
6844 | 6843 | if (count($tmp) > 1) { |
6845 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
6846 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
6844 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
6845 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
6847 | 6846 | } else { |
6848 | 6847 | $detail = trim($reason[1]); |
6849 | 6848 | } |
6850 | 6849 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
6851 | 6850 | $tmp = explode(' => ', $reason[1]); |
6852 | 6851 | $detail = empty(trim($tmp[0])) === true ? |
6853 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
6852 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
6854 | 6853 | } elseif ($reason[0] === 'at_automatic_del') { |
6855 | 6854 | $detail = $lang->get($reason[1]); |
6856 | 6855 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6859,7 +6858,7 @@ discard block |
||
6859 | 6858 | $tmp = explode(':', $reason[1]); |
6860 | 6859 | $tmp = explode('.', $tmp[0]); |
6861 | 6860 | $detail = isBase64($tmp[0]) === true ? |
6862 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
6861 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
6863 | 6862 | } elseif ($reason[0] === 'at_import') { |
6864 | 6863 | $detail = ''; |
6865 | 6864 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6878,8 +6877,8 @@ discard block |
||
6878 | 6877 | array( |
6879 | 6878 | 'avatar' => $avatar, |
6880 | 6879 | 'login' => $record['login'], |
6881 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
6882 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6880 | + 'name' => $record['name'].' '.$record['lastname'], |
|
6881 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6883 | 6882 | 'action' => $action, |
6884 | 6883 | 'detail' => $detail, |
6885 | 6884 | ) |
@@ -6968,11 +6967,11 @@ discard block |
||
6968 | 6967 | |
6969 | 6968 | // get some info to add to the notification email |
6970 | 6969 | $resp_user = DB::queryfirstrow( |
6971 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
6970 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
6972 | 6971 | $session->get('user-id') |
6973 | 6972 | ); |
6974 | 6973 | $resp_folder = DB::queryfirstrow( |
6975 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
6974 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
6976 | 6975 | $folder |
6977 | 6976 | ); |
6978 | 6977 | |
@@ -6981,7 +6980,7 @@ discard block |
||
6981 | 6980 | $emailService = new EmailService(); |
6982 | 6981 | $rows = DB::query( |
6983 | 6982 | 'SELECT email |
6984 | - FROM ' . prefixTable('users') . ' |
|
6983 | + FROM ' . prefixTable('users').' |
|
6985 | 6984 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
6986 | 6985 | 1 |
6987 | 6986 | ); |
@@ -7012,14 +7011,14 @@ discard block |
||
7012 | 7011 | // Get list of users |
7013 | 7012 | $usersList = array(); |
7014 | 7013 | $usersString = ''; |
7015 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
7014 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
7016 | 7015 | foreach ($rows as $record) { |
7017 | 7016 | $usersList[$record['login']] = array( |
7018 | 7017 | 'id' => $record['id'], |
7019 | 7018 | 'login' => $record['login'], |
7020 | 7019 | 'email' => $record['email'], |
7021 | 7020 | ); |
7022 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
7021 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
7023 | 7022 | } |
7024 | 7023 | |
7025 | 7024 | $data = array( |
@@ -7059,7 +7058,7 @@ discard block |
||
7059 | 7058 | // Send email |
7060 | 7059 | $dataItem = DB::queryfirstrow( |
7061 | 7060 | 'SELECT label, id_tree |
7062 | - FROM ' . prefixTable('items') . ' |
|
7061 | + FROM ' . prefixTable('items').' |
|
7063 | 7062 | WHERE id = %i', |
7064 | 7063 | $inputData['itemId'] |
7065 | 7064 | ); |
@@ -7113,7 +7112,7 @@ discard block |
||
7113 | 7112 | |
7114 | 7113 | DB::query( |
7115 | 7114 | 'SELECT * |
7116 | - FROM ' . prefixTable('notification') . ' |
|
7115 | + FROM ' . prefixTable('notification').' |
|
7117 | 7116 | WHERE item_id = %i AND user_id = %i', |
7118 | 7117 | $inputData['itemId'], |
7119 | 7118 | $session->get('user-id') |
@@ -7185,7 +7184,7 @@ discard block |
||
7185 | 7184 | // And related logs |
7186 | 7185 | $rows = DB::query( |
7187 | 7186 | 'SELECT id, file AS filename |
7188 | - FROM ' . prefixTable('files') . ' |
|
7187 | + FROM ' . prefixTable('files').' |
|
7189 | 7188 | WHERE id_item = %i AND confirmed = %i', |
7190 | 7189 | $inputData['itemId'], |
7191 | 7190 | 0 |
@@ -7199,12 +7198,12 @@ discard block |
||
7199 | 7198 | ); |
7200 | 7199 | |
7201 | 7200 | // Delete file on server |
7202 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
7201 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
7203 | 7202 | |
7204 | 7203 | // Delete related logs |
7205 | 7204 | $logFile = DB::query( |
7206 | 7205 | 'SELECT increment_id, raison |
7207 | - FROM ' . prefixTable('log_items') . ' |
|
7206 | + FROM ' . prefixTable('log_items').' |
|
7208 | 7207 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
7209 | 7208 | $inputData['itemId'], |
7210 | 7209 | $session->get('user-id'), |
@@ -7263,7 +7262,7 @@ discard block |
||
7263 | 7262 | // Confirm attachments |
7264 | 7263 | $rows = DB::query( |
7265 | 7264 | 'SELECT id, file AS filename |
7266 | - FROM ' . prefixTable('files') . ' |
|
7265 | + FROM ' . prefixTable('files').' |
|
7267 | 7266 | WHERE id_item = %i AND confirmed = %i', |
7268 | 7267 | $inputData['itemId'], |
7269 | 7268 | 0 |
@@ -7349,15 +7348,15 @@ discard block |
||
7349 | 7348 | case 'autocomplete_tags': |
7350 | 7349 | // Get a list off all existing TAGS |
7351 | 7350 | $listOfTags = ''; |
7352 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
7351 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
7353 | 7352 | foreach ($rows as $record) { |
7354 | 7353 | if (empty($listOfTags)) { |
7355 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
7354 | + $listOfTags = '"'.$record['tag'].'"'; |
|
7356 | 7355 | } else { |
7357 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
7356 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
7358 | 7357 | } |
7359 | 7358 | } |
7360 | - echo '[' . $listOfTags . ']'; |
|
7359 | + echo '['.$listOfTags.']'; |
|
7361 | 7360 | break; |
7362 | 7361 | } |
7363 | 7362 | } |
@@ -7373,7 +7372,7 @@ discard block |
||
7373 | 7372 | { |
7374 | 7373 | $data = DB::queryFirstRow( |
7375 | 7374 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
7376 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
7375 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
7377 | 7376 | $groupe |
7378 | 7377 | ); |
7379 | 7378 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7472,7 +7471,7 @@ discard block |
||
7472 | 7471 | global $SETTINGS; |
7473 | 7472 | |
7474 | 7473 | // Retrieve the current lock information for the item |
7475 | - $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $itemId); |
|
7474 | + $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $itemId); |
|
7476 | 7475 | |
7477 | 7476 | // Check if the item is locked by another user |
7478 | 7477 | if ($itemLockInfo && $itemLockInfo['user_id'] !== $userId) { |
@@ -7491,7 +7490,7 @@ discard block |
||
7491 | 7490 | |
7492 | 7491 | // Check if there's an ongoing background encryption process for the item |
7493 | 7492 | $ongoingProcess = DB::queryFirstRow( |
7494 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
7493 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
7495 | 7494 | $itemId |
7496 | 7495 | ); |
7497 | 7496 | |
@@ -7509,7 +7508,7 @@ discard block |
||
7509 | 7508 | function getUserVisibleFolders(int $userId): array |
7510 | 7509 | { |
7511 | 7510 | // Query to retrieve visible folders for the user |
7512 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
7511 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
7513 | 7512 | |
7514 | 7513 | // Decode JSON data into an array; return an empty array if the data is invalid |
7515 | 7514 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7533,7 +7532,7 @@ discard block |
||
7533 | 7532 | |
7534 | 7533 | // Query the access rights for the given roles and folder |
7535 | 7534 | $accessTypes = DB::queryFirstColumn( |
7536 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
7535 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
7537 | 7536 | $roles, |
7538 | 7537 | $treeId |
7539 | 7538 | ); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
73 | 73 | // Not allowed page |
74 | 74 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
75 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
75 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
76 | 76 | exit; |
77 | 77 | } |
78 | 78 | |
@@ -133,21 +133,21 @@ discard block |
||
133 | 133 | break; |
134 | 134 | } |
135 | 135 | |
136 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
136 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
137 | 137 | $return = ''; |
138 | 138 | |
139 | 139 | //Get all tables |
140 | 140 | $tables = array(); |
141 | 141 | $result = DB::query('SHOW TABLES'); |
142 | 142 | foreach ($result as $row) { |
143 | - $tables[] = $row['Tables_in_' . $database]; |
|
143 | + $tables[] = $row['Tables_in_'.$database]; |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | //cycle through |
147 | 147 | foreach ($tables as $table) { |
148 | 148 | if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) { |
149 | 149 | // Do query |
150 | - $result = DB::queryRaw('SELECT * FROM ' . $table); |
|
150 | + $result = DB::queryRaw('SELECT * FROM '.$table); |
|
151 | 151 | DB::queryRaw( |
152 | 152 | 'SELECT * |
153 | 153 | FROM INFORMATION_SCHEMA.COLUMNS |
@@ -159,19 +159,19 @@ discard block |
||
159 | 159 | $numFields = DB::count(); |
160 | 160 | |
161 | 161 | // prepare a drop table |
162 | - $return .= 'DROP TABLE ' . $table . ';'; |
|
163 | - $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table); |
|
164 | - $return .= "\n\n" . $row2['Create Table'] . ";\n\n"; |
|
162 | + $return .= 'DROP TABLE '.$table.';'; |
|
163 | + $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table); |
|
164 | + $return .= "\n\n".$row2['Create Table'].";\n\n"; |
|
165 | 165 | |
166 | 166 | //prepare all fields and datas |
167 | 167 | for ($i = 0; $i < $numFields; ++$i) { |
168 | 168 | while ($row = $result->fetch_row()) { |
169 | - $return .= 'INSERT INTO ' . $table . ' VALUES('; |
|
169 | + $return .= 'INSERT INTO '.$table.' VALUES('; |
|
170 | 170 | for ($j = 0; $j < $numFields; ++$j) { |
171 | 171 | $row[$j] = addslashes($row[$j]); |
172 | 172 | $row[$j] = preg_replace("/\n/", '\\n', $row[$j]); |
173 | 173 | if (isset($row[$j])) { |
174 | - $return .= '"' . $row[$j] . '"'; |
|
174 | + $return .= '"'.$row[$j].'"'; |
|
175 | 175 | } else { |
176 | 176 | $return .= 'NULL'; |
177 | 177 | } |
@@ -191,8 +191,8 @@ discard block |
||
191 | 191 | $token = GenerateCryptKey(20, false, true, true, false, true); |
192 | 192 | |
193 | 193 | //save file |
194 | - $filename = time() . '-' . $token . '.sql'; |
|
195 | - $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+'); |
|
194 | + $filename = time().'-'.$token.'.sql'; |
|
195 | + $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+'); |
|
196 | 196 | if ($handle !== false) { |
197 | 197 | //write file |
198 | 198 | fwrite($handle, $return); |
@@ -204,17 +204,17 @@ discard block |
||
204 | 204 | // Encrypt the file |
205 | 205 | prepareFileWithDefuse( |
206 | 206 | 'encrypt', |
207 | - $SETTINGS['path_to_files_folder'] . '/' . $filename, |
|
208 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
207 | + $SETTINGS['path_to_files_folder'].'/'.$filename, |
|
208 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
209 | 209 | $SETTINGS, |
210 | 210 | $post_option |
211 | 211 | ); |
212 | 212 | |
213 | 213 | // Do clean |
214 | - unlink($SETTINGS['path_to_files_folder'] . '/' . $filename); |
|
214 | + unlink($SETTINGS['path_to_files_folder'].'/'.$filename); |
|
215 | 215 | rename( |
216 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
217 | - $SETTINGS['path_to_files_folder'] . '/' . $filename |
|
216 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
217 | + $SETTINGS['path_to_files_folder'].'/'.$filename |
|
218 | 218 | ); |
219 | 219 | } |
220 | 220 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | //update LOG |
225 | 225 | logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $session->get('user-id'), $session->get('user-login')); |
226 | 226 | |
227 | - echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . $session->get('user-key_tmp') . '&pathIsFiles=1"}]'; |
|
227 | + echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.$session->get('user-key_tmp').'&pathIsFiles=1"}]'; |
|
228 | 228 | } |
229 | 229 | break; |
230 | 230 | |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | ); |
254 | 254 | break; |
255 | 255 | } |
256 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
256 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
257 | 257 | |
258 | 258 | $dataPost = explode('&', $post_option); |
259 | 259 | $file = htmlspecialchars($dataPost[0]); |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | // Get filename from database |
263 | 263 | $data = DB::queryFirstRow( |
264 | 264 | 'SELECT valeur |
265 | - FROM ' . prefixTable('misc') . ' |
|
265 | + FROM ' . prefixTable('misc').' |
|
266 | 266 | WHERE increment_id = %i', |
267 | 267 | $file |
268 | 268 | ); |
@@ -281,8 +281,8 @@ discard block |
||
281 | 281 | // Decrypt the file |
282 | 282 | $ret = prepareFileWithDefuse( |
283 | 283 | 'decrypt', |
284 | - $SETTINGS['path_to_files_folder'] . '/' . $file, |
|
285 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file, |
|
284 | + $SETTINGS['path_to_files_folder'].'/'.$file, |
|
285 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file, |
|
286 | 286 | $SETTINGS, |
287 | 287 | $key |
288 | 288 | ); |
@@ -294,10 +294,10 @@ discard block |
||
294 | 294 | } |
295 | 295 | |
296 | 296 | // Do clean |
297 | - fileDelete($SETTINGS['path_to_files_folder'] . '/' . $file, $SETTINGS); |
|
298 | - $file = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file; |
|
297 | + fileDelete($SETTINGS['path_to_files_folder'].'/'.$file, $SETTINGS); |
|
298 | + $file = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file; |
|
299 | 299 | } else { |
300 | - $file = $SETTINGS['path_to_files_folder'] . '/' . $file; |
|
300 | + $file = $SETTINGS['path_to_files_folder'].'/'.$file; |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | //read sql file |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | fclose($handle); |
315 | 315 | |
316 | 316 | //delete file |
317 | - unlink($SETTINGS['path_to_files_folder'] . '/' . $file); |
|
317 | + unlink($SETTINGS['path_to_files_folder'].'/'.$file); |
|
318 | 318 | |
319 | 319 | //Show done |
320 | 320 | echo '[{"result":"db_restore" , "message":""}]'; |
@@ -352,8 +352,8 @@ discard block |
||
352 | 352 | foreach ($table as $i => $tablename) { |
353 | 353 | if (substr_count($tablename, DB_PREFIX) > 0) { |
354 | 354 | // launch optimization quieries |
355 | - DB::query('ANALYZE TABLE `' . $tablename . '`'); |
|
356 | - DB::query('OPTIMIZE TABLE `' . $tablename . '`'); |
|
355 | + DB::query('ANALYZE TABLE `'.$tablename.'`'); |
|
356 | + DB::query('OPTIMIZE TABLE `'.$tablename.'`'); |
|
357 | 357 | } |
358 | 358 | } |
359 | 359 | } |
@@ -361,12 +361,12 @@ discard block |
||
361 | 361 | //Clean up LOG_ITEMS table |
362 | 362 | $rows = DB::query( |
363 | 363 | 'SELECT id |
364 | - FROM ' . prefixTable('items') . ' |
|
364 | + FROM ' . prefixTable('items').' |
|
365 | 365 | ORDER BY id ASC' |
366 | 366 | ); |
367 | 367 | foreach ($rows as $item) { |
368 | 368 | DB::query( |
369 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s', |
|
369 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s', |
|
370 | 370 | $item['id'], |
371 | 371 | 'at_creation' |
372 | 372 | ); |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | if ($counter === 0) { |
375 | 375 | //Create new at_creation entry |
376 | 376 | $rowTmp = DB::queryFirstRow( |
377 | - 'SELECT date, id_user FROM ' . prefixTable('log_items') . ' WHERE id_item=%i ORDER BY date ASC', |
|
377 | + 'SELECT date, id_user FROM '.prefixTable('log_items').' WHERE id_item=%i ORDER BY date ASC', |
|
378 | 378 | $item['id'] |
379 | 379 | ); |
380 | 380 | DB::insert( |
@@ -404,8 +404,8 @@ discard block |
||
404 | 404 | echo prepareExchangedData( |
405 | 405 | array( |
406 | 406 | 'error' => false, |
407 | - 'message' => $lang->get('last_execution') . ' ' . |
|
408 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
407 | + 'message' => $lang->get('last_execution').' '. |
|
408 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
409 | 409 | '<i class="fas fa-check text-success ml-2"></i>', |
410 | 410 | ), |
411 | 411 | 'encode' |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | break; |
442 | 442 | } |
443 | 443 | |
444 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
444 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
445 | 445 | updateCacheTable('reload', NULL); |
446 | 446 | |
447 | 447 | // Log |
@@ -457,8 +457,8 @@ discard block |
||
457 | 457 | echo prepareExchangedData( |
458 | 458 | [ |
459 | 459 | 'error' => false, |
460 | - 'message' => $lang->get('last_execution') . ' ' . |
|
461 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
460 | + 'message' => $lang->get('last_execution').' '. |
|
461 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
462 | 462 | '<i class="fas fa-check text-success mr-2"></i>', |
463 | 463 | ], |
464 | 464 | 'encode' |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | $session->set('user-reencrypt_old_salt', file_get_contents(SECUREPATH.'/'.SECUREFILE)); |
501 | 501 | |
502 | 502 | // generate new saltkey |
503 | - $old_sk_filename = SECUREPATH.'/'.SECUREFILE . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time(); |
|
503 | + $old_sk_filename = SECUREPATH.'/'.SECUREFILE.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time(); |
|
504 | 504 | copy( |
505 | 505 | SECUREPATH.'/'.SECUREFILE, |
506 | 506 | $old_sk_filename |
@@ -529,13 +529,13 @@ discard block |
||
529 | 529 | logEvents($SETTINGS, 'system', 'change_salt_key', (string) $session->get('user-id'), $session->get('user-login')); |
530 | 530 | |
531 | 531 | // get number of items to change |
532 | - DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', 0); |
|
532 | + DB::query('SELECT id FROM '.prefixTable('items').' WHERE perso = %i', 0); |
|
533 | 533 | $nb_of_items = DB::count(); |
534 | 534 | |
535 | 535 | // create backup table |
536 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
536 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
537 | 537 | DB::query( |
538 | - 'CREATE TABLE `' . prefixTable('sk_reencrypt_backup') . '` ( |
|
538 | + 'CREATE TABLE `'.prefixTable('sk_reencrypt_backup').'` ( |
|
539 | 539 | `id` int(12) NOT null AUTO_INCREMENT, |
540 | 540 | `current_table` varchar(100) NOT NULL, |
541 | 541 | `current_field` varchar(500) NOT NULL, |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | ); |
564 | 564 | |
565 | 565 | // delete previous backup files |
566 | - $files = glob($SETTINGS['path_to_upload_folder'] . '/*'); // get all file names |
|
566 | + $files = glob($SETTINGS['path_to_upload_folder'].'/*'); // get all file names |
|
567 | 567 | foreach ($files as $file) { // iterate files |
568 | 568 | if (is_file($file)) { |
569 | 569 | $file_parts = pathinfo($file); |
@@ -645,7 +645,7 @@ discard block |
||
645 | 645 | echo prepareExchangedData( |
646 | 646 | array( |
647 | 647 | 'error' => true, |
648 | - 'message' => 'Input `' . $objects[0] . '` is not allowed', |
|
648 | + 'message' => 'Input `'.$objects[0].'` is not allowed', |
|
649 | 649 | 'nbOfItems' => '', |
650 | 650 | 'nextAction' => '', |
651 | 651 | ), |
@@ -658,9 +658,9 @@ discard block |
||
658 | 658 | //change all encrypted data in Items (passwords) |
659 | 659 | $rows = DB::query( |
660 | 660 | 'SELECT id, pw, pw_iv |
661 | - FROM ' . prefixTable('items') . ' |
|
661 | + FROM ' . prefixTable('items').' |
|
662 | 662 | WHERE perso = %s |
663 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
663 | + LIMIT ' . $post_start.', '.$post_length, |
|
664 | 664 | '0' |
665 | 665 | ); |
666 | 666 | foreach ($rows as $record) { |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | 'current_field' => 'pw', |
673 | 673 | 'value_id' => $record['id'], |
674 | 674 | 'value' => $record['pw'], |
675 | - 'current_sql' => 'UPDATE ' . prefixTable('items') . " SET pw = '" . $record['pw'] . "' WHERE id = '" . $record['id'] . "';", |
|
675 | + 'current_sql' => 'UPDATE '.prefixTable('items')." SET pw = '".$record['pw']."' WHERE id = '".$record['id']."';", |
|
676 | 676 | 'value2' => 'none', |
677 | 677 | 'result' => 'none', |
678 | 678 | ) |
@@ -721,9 +721,9 @@ discard block |
||
721 | 721 | //change all encrypted data in Logs (passwords) |
722 | 722 | $rows = DB::query( |
723 | 723 | 'SELECT raison, increment_id |
724 | - FROM ' . prefixTable('log_items') . " |
|
724 | + FROM ' . prefixTable('log_items')." |
|
725 | 725 | WHERE action = %s AND raison LIKE 'at_pw :%' |
726 | - LIMIT " . $post_start . ', ' . $post_length, |
|
726 | + LIMIT " . $post_start.', '.$post_length, |
|
727 | 727 | 'at_modification' |
728 | 728 | ); |
729 | 729 | foreach ($rows as $record) { |
@@ -735,7 +735,7 @@ discard block |
||
735 | 735 | 'current_field' => 'raison', |
736 | 736 | 'value_id' => $record['increment_id'], |
737 | 737 | 'value' => $record['raison'], |
738 | - 'current_sql' => 'UPDATE ' . prefixTable('log_items') . " SET raison = '" . $record['raison'] . "' WHERE increment_id = '" . $record['increment_id'] . "';", |
|
738 | + 'current_sql' => 'UPDATE '.prefixTable('log_items')." SET raison = '".$record['raison']."' WHERE increment_id = '".$record['increment_id']."';", |
|
739 | 739 | 'value2' => 'none', |
740 | 740 | 'result' => 'none', |
741 | 741 | ) |
@@ -763,7 +763,7 @@ discard block |
||
763 | 763 | DB::update( |
764 | 764 | prefixTable('log_items'), |
765 | 765 | array( |
766 | - 'raison' => 'at_pw :' . $encrypt['string'], |
|
766 | + 'raison' => 'at_pw :'.$encrypt['string'], |
|
767 | 767 | 'encryption_type' => 'defuse', |
768 | 768 | ), |
769 | 769 | 'increment_id = %i', |
@@ -788,8 +788,8 @@ discard block |
||
788 | 788 | //change all encrypted data in CATEGORIES (passwords) |
789 | 789 | $rows = DB::query( |
790 | 790 | 'SELECT id, data |
791 | - FROM ' . prefixTable('categories_items') . ' |
|
792 | - LIMIT ' . $post_start . ', ' . $post_length |
|
791 | + FROM ' . prefixTable('categories_items').' |
|
792 | + LIMIT ' . $post_start.', '.$post_length |
|
793 | 793 | ); |
794 | 794 | foreach ($rows as $record) { |
795 | 795 | // backup data |
@@ -800,7 +800,7 @@ discard block |
||
800 | 800 | 'current_field' => 'data', |
801 | 801 | 'value_id' => $record['id'], |
802 | 802 | 'value' => $record['data'], |
803 | - 'current_sql' => 'UPDATE ' . prefixTable('categories_items') . " SET data = '" . $record['data'] . "' WHERE id = '" . $record['id'] . "';", |
|
803 | + 'current_sql' => 'UPDATE '.prefixTable('categories_items')." SET data = '".$record['data']."' WHERE id = '".$record['id']."';", |
|
804 | 804 | 'value2' => 'none', |
805 | 805 | 'result' => 'none', |
806 | 806 | ) |
@@ -848,9 +848,9 @@ discard block |
||
848 | 848 | // Change all encrypted data in FILES (passwords) |
849 | 849 | $rows = DB::query( |
850 | 850 | 'SELECT id, file, status |
851 | - FROM ' . prefixTable('files') . " |
|
851 | + FROM ' . prefixTable('files')." |
|
852 | 852 | WHERE status = 'encrypted' |
853 | - LIMIT " . $post_start . ', ' . $post_length |
|
853 | + LIMIT " . $post_start.', '.$post_length |
|
854 | 854 | ); |
855 | 855 | foreach ($rows as $record) { |
856 | 856 | // backup data |
@@ -868,20 +868,20 @@ discard block |
||
868 | 868 | ); |
869 | 869 | $newID = DB::insertId(); |
870 | 870 | |
871 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) { |
|
871 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) { |
|
872 | 872 | // make a copy of file |
873 | 873 | if (!copy( |
874 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
875 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '.copy' |
|
874 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
875 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'.copy' |
|
876 | 876 | )) { |
877 | 877 | $error = 'Copy not possible'; |
878 | 878 | exit; |
879 | 879 | } else { |
880 | 880 | // prepare a bck of file (that will not be deleted) |
881 | - $backup_filename = $record['file'] . '.bck-change-sk.' . time(); |
|
881 | + $backup_filename = $record['file'].'.bck-change-sk.'.time(); |
|
882 | 882 | copy( |
883 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
884 | - $SETTINGS['path_to_upload_folder'] . '/' . $backup_filename |
|
883 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
884 | + $SETTINGS['path_to_upload_folder'].'/'.$backup_filename |
|
885 | 885 | ); |
886 | 886 | } |
887 | 887 | |
@@ -889,24 +889,24 @@ discard block |
||
889 | 889 | // STEP1 - Do decryption |
890 | 890 | prepareFileWithDefuse( |
891 | 891 | 'decrypt', |
892 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
893 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted', |
|
892 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
893 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted', |
|
894 | 894 | $SETTINGS |
895 | 895 | ); |
896 | 896 | |
897 | 897 | // Do cleanup of files |
898 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file']); |
|
898 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file']); |
|
899 | 899 | |
900 | 900 | // STEP2 - Do encryption |
901 | 901 | prepareFileWithDefuse( |
902 | 902 | 'encryp', |
903 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted', |
|
904 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
903 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted', |
|
904 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
905 | 905 | $SETTINGS |
906 | 906 | ); |
907 | 907 | |
908 | 908 | // Do cleanup of files |
909 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted'); |
|
909 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted'); |
|
910 | 910 | |
911 | 911 | // Update backup table |
912 | 912 | DB::update( |
@@ -932,13 +932,13 @@ discard block |
||
932 | 932 | // do some things for new object |
933 | 933 | if (isset($objects[0])) { |
934 | 934 | if ($objects[0] === 'logs') { |
935 | - DB::query('SELECT increment_id FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
935 | + DB::query('SELECT increment_id FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
936 | 936 | } elseif ($objects[0] === 'files') { |
937 | - DB::query('SELECT id FROM ' . prefixTable('files')); |
|
937 | + DB::query('SELECT id FROM '.prefixTable('files')); |
|
938 | 938 | } elseif ($objects[0] === 'categories') { |
939 | - DB::query('SELECT id FROM ' . prefixTable('categories_items')); |
|
939 | + DB::query('SELECT id FROM '.prefixTable('categories_items')); |
|
940 | 940 | } elseif ($objects[0] === 'custfields') { |
941 | - DB::query('SELECT raison FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
941 | + DB::query('SELECT raison FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
942 | 942 | } |
943 | 943 | $nb_of_items = DB::count(); |
944 | 944 | } else { |
@@ -1058,12 +1058,12 @@ discard block |
||
1058 | 1058 | ); |
1059 | 1059 | } elseif ($record['current_table'] === 'files') { |
1060 | 1060 | // restore backup file |
1061 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value'])) { |
|
1062 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value']); |
|
1063 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) { |
|
1061 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value'])) { |
|
1062 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value']); |
|
1063 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) { |
|
1064 | 1064 | rename( |
1065 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['value2'], |
|
1066 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['value'] |
|
1065 | + $SETTINGS['path_to_upload_folder'].'/'.$record['value2'], |
|
1066 | + $SETTINGS['path_to_upload_folder'].'/'.$record['value'] |
|
1067 | 1067 | ); |
1068 | 1068 | } |
1069 | 1069 | } |
@@ -1082,7 +1082,7 @@ discard block |
||
1082 | 1082 | } |
1083 | 1083 | |
1084 | 1084 | // drop table |
1085 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
1085 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
1086 | 1086 | |
1087 | 1087 | // Send back |
1088 | 1088 | echo prepareExchangedData( |
@@ -1125,17 +1125,17 @@ discard block |
||
1125 | 1125 | // delete files |
1126 | 1126 | $rows = DB::query( |
1127 | 1127 | 'SELECT value, value2 |
1128 | - FROM ' . prefixTable('sk_reencrypt_backup') . " |
|
1128 | + FROM ' . prefixTable('sk_reencrypt_backup')." |
|
1129 | 1129 | WHERE current_table = 'files'" |
1130 | 1130 | ); |
1131 | 1131 | foreach ($rows as $record) { |
1132 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) { |
|
1133 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value2']); |
|
1132 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) { |
|
1133 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value2']); |
|
1134 | 1134 | } |
1135 | 1135 | } |
1136 | 1136 | |
1137 | 1137 | // drop table |
1138 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
1138 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
1139 | 1139 | |
1140 | 1140 | echo '[{"status":"done"}]'; |
1141 | 1141 | break; |
@@ -1166,7 +1166,7 @@ discard block |
||
1166 | 1166 | 'encode' |
1167 | 1167 | ); |
1168 | 1168 | } else { |
1169 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
1169 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
1170 | 1170 | |
1171 | 1171 | //send email |
1172 | 1172 | $emailSettings = new EmailSettings($SETTINGS); |
@@ -1204,13 +1204,13 @@ discard block |
||
1204 | 1204 | break; |
1205 | 1205 | } |
1206 | 1206 | |
1207 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
1207 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
1208 | 1208 | $emailSettings = new EmailSettings($SETTINGS); |
1209 | 1209 | $emailService = new EmailService(); |
1210 | 1210 | |
1211 | 1211 | $rows = DB::query( |
1212 | 1212 | 'SELECT * |
1213 | - FROM ' . prefixTable('emails') . ' |
|
1213 | + FROM ' . prefixTable('emails').' |
|
1214 | 1214 | WHERE status = %s OR status = %s', |
1215 | 1215 | 'not_sent', |
1216 | 1216 | '' |
@@ -1296,13 +1296,13 @@ discard block |
||
1296 | 1296 | break; |
1297 | 1297 | } |
1298 | 1298 | |
1299 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
1299 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
1300 | 1300 | |
1301 | 1301 | // Instatiate email settings and service |
1302 | 1302 | $emailSettings = new EmailSettings($SETTINGS); |
1303 | 1303 | $emailService = new EmailService(); |
1304 | 1304 | |
1305 | - $rows = DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', ''); |
|
1305 | + $rows = DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', ''); |
|
1306 | 1306 | foreach ($rows as $record) { |
1307 | 1307 | //send email |
1308 | 1308 | $email = $emailService->sendMail( |
@@ -1371,7 +1371,7 @@ discard block |
||
1371 | 1371 | break; |
1372 | 1372 | } |
1373 | 1373 | |
1374 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
1374 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
1375 | 1375 | |
1376 | 1376 | // init |
1377 | 1377 | $filesList = array(); |
@@ -1384,7 +1384,7 @@ discard block |
||
1384 | 1384 | FROM ' . prefixTable('files') |
1385 | 1385 | ); |
1386 | 1386 | foreach ($rows as $record) { |
1387 | - if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) { |
|
1387 | + if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) { |
|
1388 | 1388 | $addFile = false; |
1389 | 1389 | if (($post_option === 'attachments-decrypt' && $record['status'] === 'encrypted') |
1390 | 1390 | || ($post_option === 'attachments-encrypt' && $record['status'] === 'clear') |
@@ -1449,8 +1449,8 @@ discard block |
||
1449 | 1449 | $post_list = filter_var_array($post_list, FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
1450 | 1450 | $post_counter = filter_var($post_counter, FILTER_SANITIZE_NUMBER_INT); |
1451 | 1451 | |
1452 | - include $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
1453 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
1452 | + include $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
1453 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
1454 | 1454 | |
1455 | 1455 | $cpt = 0; |
1456 | 1456 | $continu = true; |
@@ -1463,35 +1463,35 @@ discard block |
||
1463 | 1463 | // Get file name |
1464 | 1464 | $file_info = DB::queryfirstrow( |
1465 | 1465 | 'SELECT file |
1466 | - FROM ' . prefixTable('files') . ' |
|
1466 | + FROM ' . prefixTable('files').' |
|
1467 | 1467 | WHERE id = %i', |
1468 | 1468 | $file |
1469 | 1469 | ); |
1470 | 1470 | |
1471 | 1471 | // skip file is Coherancey not respected |
1472 | - if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'])) { |
|
1472 | + if (is_file($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'])) { |
|
1473 | 1473 | // Case where we want to decrypt |
1474 | 1474 | if ($post_option === 'decrypt') { |
1475 | 1475 | prepareFileWithDefuse( |
1476 | 1476 | 'decrypt', |
1477 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], |
|
1478 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
1477 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], |
|
1478 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
1479 | 1479 | $SETTINGS |
1480 | 1480 | ); |
1481 | 1481 | // Case where we want to encrypt |
1482 | 1482 | } elseif ($post_option === 'encrypt') { |
1483 | 1483 | prepareFileWithDefuse( |
1484 | 1484 | 'encrypt', |
1485 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], |
|
1486 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
1485 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], |
|
1486 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
1487 | 1487 | $SETTINGS |
1488 | 1488 | ); |
1489 | 1489 | } |
1490 | 1490 | // Do file cleanup |
1491 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], $SETTINGS); |
|
1491 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], $SETTINGS); |
|
1492 | 1492 | rename( |
1493 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
1494 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'] |
|
1493 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
1494 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'] |
|
1495 | 1495 | ); |
1496 | 1496 | |
1497 | 1497 | // store in DB |
@@ -1526,8 +1526,8 @@ discard block |
||
1526 | 1526 | $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted' |
1527 | 1527 | ); |
1528 | 1528 | |
1529 | - $message = $lang->get('last_execution') . ' ' . |
|
1530 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
1529 | + $message = $lang->get('last_execution').' '. |
|
1530 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
1531 | 1531 | '<i class="fas fa-check text-success ml-2 mr-3"></i>'; |
1532 | 1532 | } |
1533 | 1533 | |
@@ -1621,7 +1621,7 @@ discard block |
||
1621 | 1621 | $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
1622 | 1622 | |
1623 | 1623 | DB::query( |
1624 | - 'DELETE FROM ' . prefixTable('api') . ' WHERE increment_id = %i', |
|
1624 | + 'DELETE FROM '.prefixTable('api').' WHERE increment_id = %i', |
|
1625 | 1625 | $post_id |
1626 | 1626 | ); |
1627 | 1627 | } |
@@ -1716,7 +1716,7 @@ discard block |
||
1716 | 1716 | // Delete existing key |
1717 | 1717 | } elseif (null !== $post_action && $post_action === 'delete') { |
1718 | 1718 | $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
1719 | - DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE increment_id=%i', $post_id); |
|
1719 | + DB::query('DELETE FROM '.prefixTable('api').' WHERE increment_id=%i', $post_id); |
|
1720 | 1720 | } |
1721 | 1721 | |
1722 | 1722 | echo prepareExchangedData( |
@@ -1731,7 +1731,7 @@ discard block |
||
1731 | 1731 | |
1732 | 1732 | case 'save_api_status': |
1733 | 1733 | // Do query |
1734 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'api'); |
|
1734 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'api'); |
|
1735 | 1735 | $counter = DB::count(); |
1736 | 1736 | if ($counter === 0) { |
1737 | 1737 | DB::insert( |
@@ -1760,7 +1760,7 @@ discard block |
||
1760 | 1760 | |
1761 | 1761 | case 'run_duo_config_check': |
1762 | 1762 | //Libraries call |
1763 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
1763 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
1764 | 1764 | // Check KEY |
1765 | 1765 | if ($post_key !== $session->get('key')) { |
1766 | 1766 | echo prepareExchangedData( |
@@ -1871,7 +1871,7 @@ discard block |
||
1871 | 1871 | } else { |
1872 | 1872 | $tmp = 1; |
1873 | 1873 | } |
1874 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication'); |
|
1874 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication'); |
|
1875 | 1875 | $counter = DB::count(); |
1876 | 1876 | if ($counter === 0) { |
1877 | 1877 | DB::insert( |
@@ -1899,7 +1899,7 @@ discard block |
||
1899 | 1899 | |
1900 | 1900 | // ga_website_name |
1901 | 1901 | if (is_null($dataReceived['ga_website_name']) === false) { |
1902 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name'); |
|
1902 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name'); |
|
1903 | 1903 | $counter = DB::count(); |
1904 | 1904 | if ($counter === 0) { |
1905 | 1905 | DB::insert( |
@@ -1932,7 +1932,7 @@ discard block |
||
1932 | 1932 | } |
1933 | 1933 | |
1934 | 1934 | // send data |
1935 | - echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]'; |
|
1935 | + echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]'; |
|
1936 | 1936 | break; |
1937 | 1937 | |
1938 | 1938 | case 'save_agses_options': |
@@ -1955,7 +1955,7 @@ discard block |
||
1955 | 1955 | |
1956 | 1956 | // agses_hosted_url |
1957 | 1957 | if (!is_null($dataReceived['agses_hosted_url'])) { |
1958 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url'); |
|
1958 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url'); |
|
1959 | 1959 | $counter = DB::count(); |
1960 | 1960 | if ($counter === 0) { |
1961 | 1961 | DB::insert( |
@@ -1986,7 +1986,7 @@ discard block |
||
1986 | 1986 | |
1987 | 1987 | // agses_hosted_id |
1988 | 1988 | if (!is_null($dataReceived['agses_hosted_id'])) { |
1989 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id'); |
|
1989 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id'); |
|
1990 | 1990 | $counter = DB::count(); |
1991 | 1991 | if ($counter === 0) { |
1992 | 1992 | DB::insert( |
@@ -2017,7 +2017,7 @@ discard block |
||
2017 | 2017 | |
2018 | 2018 | // agses_hosted_apikey |
2019 | 2019 | if (!is_null($dataReceived['agses_hosted_apikey'])) { |
2020 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey'); |
|
2020 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey'); |
|
2021 | 2021 | $counter = DB::count(); |
2022 | 2022 | if ($counter === 0) { |
2023 | 2023 | DB::insert( |
@@ -2047,7 +2047,7 @@ discard block |
||
2047 | 2047 | } |
2048 | 2048 | |
2049 | 2049 | // send data |
2050 | - echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]'; |
|
2050 | + echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]'; |
|
2051 | 2051 | break; |
2052 | 2052 | |
2053 | 2053 | case 'save_option_change': |
@@ -2087,7 +2087,7 @@ discard block |
||
2087 | 2087 | |
2088 | 2088 | // Check if setting is already in DB. If NO then insert, if YES then update. |
2089 | 2089 | $data = DB::query( |
2090 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
2090 | + 'SELECT * FROM '.prefixTable('misc').' |
|
2091 | 2091 | WHERE type = %s AND intitule = %s', |
2092 | 2092 | 'admin', |
2093 | 2093 | $post_field |
@@ -2110,7 +2110,7 @@ discard block |
||
2110 | 2110 | array( |
2111 | 2111 | 'valeur' => time(), |
2112 | 2112 | 'type' => 'admin', |
2113 | - 'intitule' => $post_field . '_time', |
|
2113 | + 'intitule' => $post_field.'_time', |
|
2114 | 2114 | 'updated_at' => time(), |
2115 | 2115 | ) |
2116 | 2116 | ); |
@@ -2130,10 +2130,10 @@ discard block |
||
2130 | 2130 | if ($post_field === 'send_stats') { |
2131 | 2131 | // Check if previous time exists, if not them insert this value in DB |
2132 | 2132 | DB::query( |
2133 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
2133 | + 'SELECT * FROM '.prefixTable('misc').' |
|
2134 | 2134 | WHERE type = %s AND intitule = %s', |
2135 | 2135 | 'admin', |
2136 | - $post_field . '_time' |
|
2136 | + $post_field.'_time' |
|
2137 | 2137 | ); |
2138 | 2138 | $counter = DB::count(); |
2139 | 2139 | if ($counter === 0) { |
@@ -2142,7 +2142,7 @@ discard block |
||
2142 | 2142 | array( |
2143 | 2143 | 'valeur' => 0, |
2144 | 2144 | 'type' => 'admin', |
2145 | - 'intitule' => $post_field . '_time', |
|
2145 | + 'intitule' => $post_field.'_time', |
|
2146 | 2146 | 'created_at' => time(), |
2147 | 2147 | ) |
2148 | 2148 | ); |
@@ -2164,13 +2164,13 @@ discard block |
||
2164 | 2164 | // special Cases |
2165 | 2165 | if ($post_field === 'cpassman_url') { |
2166 | 2166 | // update also jsUrl for CSFP protection |
2167 | - $jsUrl = $post_value . '/includes/libraries/csrfp/js/csrfprotector.js'; |
|
2167 | + $jsUrl = $post_value.'/includes/libraries/csrfp/js/csrfprotector.js'; |
|
2168 | 2168 | $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php'; |
2169 | 2169 | $data = file_get_contents($csrfp_file); |
2170 | 2170 | $posJsUrl = strpos($data, '"jsUrl" => "'); |
2171 | 2171 | $posEndLine = strpos($data, '",', $posJsUrl); |
2172 | 2172 | $line = substr($data, $posJsUrl, ($posEndLine - $posJsUrl + 2)); |
2173 | - $newdata = str_replace($line, '"jsUrl" => "' . filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . '",', $data); |
|
2173 | + $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS).'",', $data); |
|
2174 | 2174 | file_put_contents($csrfp_file, $newdata); |
2175 | 2175 | } elseif ($post_field === 'restricted_to_input' && (int) $post_value === 0) { |
2176 | 2176 | DB::update( |
@@ -2205,7 +2205,7 @@ discard block |
||
2205 | 2205 | echo prepareExchangedData( |
2206 | 2206 | array( |
2207 | 2207 | 'error' => false, |
2208 | - 'misc' => $counter . ' ; ' . $SETTINGS[$post_field], |
|
2208 | + 'misc' => $counter.' ; '.$SETTINGS[$post_field], |
|
2209 | 2209 | 'message' => empty($post_translate) === false ? $lang->get($post_translate) : '', |
2210 | 2210 | ), |
2211 | 2211 | 'encode' |
@@ -2248,7 +2248,7 @@ discard block |
||
2248 | 2248 | |
2249 | 2249 | // send statistics |
2250 | 2250 | if (null !== $post_status) { |
2251 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_stats'); |
|
2251 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_stats'); |
|
2252 | 2252 | $counter = DB::count(); |
2253 | 2253 | if ($counter === 0) { |
2254 | 2254 | DB::insert( |
@@ -2282,7 +2282,7 @@ discard block |
||
2282 | 2282 | |
2283 | 2283 | // send statistics items |
2284 | 2284 | if (null !== $post_list) { |
2285 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items'); |
|
2285 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items'); |
|
2286 | 2286 | $counter = DB::count(); |
2287 | 2287 | if ($counter === 0) { |
2288 | 2288 | DB::insert( |
@@ -2331,7 +2331,7 @@ discard block |
||
2331 | 2331 | break; |
2332 | 2332 | } |
2333 | 2333 | |
2334 | - if (DB::query("SHOW TABLES LIKE '" . prefixTable('sk_reencrypt_backup') . "'")) { |
|
2334 | + if (DB::query("SHOW TABLES LIKE '".prefixTable('sk_reencrypt_backup')."'")) { |
|
2335 | 2335 | if (DB::count() === 1) { |
2336 | 2336 | echo 1; |
2337 | 2337 | } else { |
@@ -2369,7 +2369,7 @@ discard block |
||
2369 | 2369 | |
2370 | 2370 | $rows = DB::query( |
2371 | 2371 | 'SELECT id, title |
2372 | - FROM ' . prefixTable('roles_title') . ' |
|
2372 | + FROM ' . prefixTable('roles_title').' |
|
2373 | 2373 | ORDER BY title ASC' |
2374 | 2374 | ); |
2375 | 2375 | foreach ($rows as $record) { |
@@ -2485,7 +2485,7 @@ discard block |
||
2485 | 2485 | function tablesIntegrityCheck(): array |
2486 | 2486 | { |
2487 | 2487 | // Get integrity tables file |
2488 | - $integrityTablesFile = TEAMPASS_ROOT_PATH . '/includes/tables_integrity.json'; |
|
2488 | + $integrityTablesFile = TEAMPASS_ROOT_PATH.'/includes/tables_integrity.json'; |
|
2489 | 2489 | if (file_exists($integrityTablesFile) === false) { |
2490 | 2490 | return [ |
2491 | 2491 | 'error' => true, |
@@ -2503,7 +2503,7 @@ discard block |
||
2503 | 2503 | // Get all tables |
2504 | 2504 | $tables = []; |
2505 | 2505 | foreach (DB::queryFirstColumn("SHOW TABLES") as $table) { |
2506 | - $tables[] = str_replace(DB_PREFIX, "", $table);; |
|
2506 | + $tables[] = str_replace(DB_PREFIX, "", $table); ; |
|
2507 | 2507 | } |
2508 | 2508 | // Prepare the integrity check |
2509 | 2509 | $tablesInError = []; |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | ) { |
82 | 82 | // Not allowed page |
83 | 83 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
84 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
84 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
85 | 85 | exit; |
86 | 86 | } |
87 | 87 | |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | * @param string $post_key |
306 | 306 | * @return string |
307 | 307 | */ |
308 | -function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string |
|
308 | +function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string |
|
309 | 309 | { |
310 | 310 | $session = SessionManager::getSession(); |
311 | 311 | |
@@ -598,7 +598,7 @@ discard block |
||
598 | 598 | * @param array $SETTINGS |
599 | 599 | * @return string |
600 | 600 | */ |
601 | -function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
601 | +function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
602 | 602 | { |
603 | 603 | $session = SessionManager::getSession(); |
604 | 604 | switch ($post_type) { |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | ) |
702 | 702 | ); |
703 | 703 | |
704 | - return '[{"token" : "' . $token . '"}]'; |
|
704 | + return '[{"token" : "'.$token.'"}]'; |
|
705 | 705 | |
706 | 706 | /* |
707 | 707 | * Default case |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | } |
718 | 718 | |
719 | 719 | |
720 | -function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
720 | +function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
721 | 721 | { |
722 | 722 | switch ($post_type) { |
723 | 723 | /* |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | array( |
787 | 787 | 'error' => false, |
788 | 788 | 'timestamp' => $session->get('user-session_duration'), |
789 | - 'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
789 | + 'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
790 | 790 | 'max_session_duration' => $maximum_session_expiration_time, |
791 | 791 | ), |
792 | 792 | 'encode' |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | // get number of items |
839 | 839 | DB::queryFirstRow( |
840 | 840 | 'SELECT increment_id |
841 | - FROM ' . prefixTable('sharekeys_items') . |
|
841 | + FROM ' . prefixTable('sharekeys_items'). |
|
842 | 842 | ' WHERE user_id = %i', |
843 | 843 | $userId |
844 | 844 | ); |
@@ -893,7 +893,7 @@ discard block |
||
893 | 893 | // check if expected security level is reached |
894 | 894 | $dataUser = DB::queryfirstrow( |
895 | 895 | 'SELECT * |
896 | - FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
896 | + FROM ' . prefixTable('users').' WHERE id = %i', |
|
897 | 897 | $post_user_id |
898 | 898 | ); |
899 | 899 | |
@@ -914,8 +914,8 @@ discard block |
||
914 | 914 | if (empty($dataUser['fonction_id']) === false) { |
915 | 915 | $data = DB::queryFirstRow( |
916 | 916 | 'SELECT complexity |
917 | - FROM ' . prefixTable('roles_title') . ' |
|
918 | - WHERE id IN (' . $dataUser['fonction_id'] . ') |
|
917 | + FROM ' . prefixTable('roles_title').' |
|
918 | + WHERE id IN (' . $dataUser['fonction_id'].') |
|
919 | 919 | ORDER BY complexity DESC' |
920 | 920 | ); |
921 | 921 | } else { |
@@ -928,8 +928,8 @@ discard block |
||
928 | 928 | return prepareExchangedData( |
929 | 929 | array( |
930 | 930 | 'error' => true, |
931 | - 'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' . |
|
932 | - $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>', |
|
931 | + 'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'. |
|
932 | + $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>', |
|
933 | 933 | ), |
934 | 934 | 'encode' |
935 | 935 | ); |
@@ -1033,14 +1033,14 @@ discard block |
||
1033 | 1033 | // Get data about user |
1034 | 1034 | $dataUser = DB::queryfirstrow( |
1035 | 1035 | 'SELECT id, email, pw |
1036 | - FROM ' . prefixTable('users') . ' |
|
1036 | + FROM ' . prefixTable('users').' |
|
1037 | 1037 | WHERE login = %s', |
1038 | 1038 | $post_login |
1039 | 1039 | ); |
1040 | 1040 | } else { |
1041 | 1041 | $dataUser = DB::queryfirstrow( |
1042 | 1042 | 'SELECT id, login, email, pw |
1043 | - FROM ' . prefixTable('users') . ' |
|
1043 | + FROM ' . prefixTable('users').' |
|
1044 | 1044 | WHERE id = %i', |
1045 | 1045 | $post_id |
1046 | 1046 | ); |
@@ -1094,7 +1094,7 @@ discard block |
||
1094 | 1094 | // Check if token already used |
1095 | 1095 | $dataToken = DB::queryfirstrow( |
1096 | 1096 | 'SELECT end_timestamp, reason |
1097 | - FROM ' . prefixTable('tokens') . ' |
|
1097 | + FROM ' . prefixTable('tokens').' |
|
1098 | 1098 | WHERE token = %s AND user_id = %i', |
1099 | 1099 | $post_token, |
1100 | 1100 | $dataUser['id'] |
@@ -1105,11 +1105,11 @@ discard block |
||
1105 | 1105 | return prepareExchangedData( |
1106 | 1106 | array( |
1107 | 1107 | 'error' => true, |
1108 | - 'message' => 'TOKEN already used',//$lang->get('no_email_set'), |
|
1108 | + 'message' => 'TOKEN already used', //$lang->get('no_email_set'), |
|
1109 | 1109 | ), |
1110 | 1110 | 'encode' |
1111 | 1111 | ); |
1112 | - } elseif(DB::count() === 0) { |
|
1112 | + } elseif (DB::count() === 0) { |
|
1113 | 1113 | // Store token for this action |
1114 | 1114 | DB::insert( |
1115 | 1115 | prefixTable('tokens'), |
@@ -1171,7 +1171,7 @@ discard block |
||
1171 | 1171 | 'email' => $dataUser['email'], |
1172 | 1172 | 'email_result' => str_replace( |
1173 | 1173 | '#email#', |
1174 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
1174 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
1175 | 1175 | addslashes($lang->get('admin_email_result_ok')) |
1176 | 1176 | ), |
1177 | 1177 | ), |
@@ -1187,7 +1187,7 @@ discard block |
||
1187 | 1187 | 'email' => $dataUser['email'], |
1188 | 1188 | 'email_result' => str_replace( |
1189 | 1189 | '#email#', |
1190 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
1190 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
1191 | 1191 | addslashes($lang->get('admin_email_result_ok')) |
1192 | 1192 | ), |
1193 | 1193 | ), |
@@ -1204,7 +1204,7 @@ discard block |
||
1204 | 1204 | |
1205 | 1205 | if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) { |
1206 | 1206 | $row = DB::queryFirstRow( |
1207 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', |
|
1207 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', |
|
1208 | 1208 | 'cron', |
1209 | 1209 | 'sending_emails' |
1210 | 1210 | ); |
@@ -1212,7 +1212,7 @@ discard block |
||
1212 | 1212 | if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) { |
1213 | 1213 | $rows = DB::query( |
1214 | 1214 | 'SELECT * |
1215 | - FROM ' . prefixTable('emails') . |
|
1215 | + FROM ' . prefixTable('emails'). |
|
1216 | 1216 | ' WHERE status != %s', |
1217 | 1217 | 'sent' |
1218 | 1218 | ); |
@@ -1264,8 +1264,8 @@ discard block |
||
1264 | 1264 | $arr_html = array(); |
1265 | 1265 | $rows = DB::query( |
1266 | 1266 | '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 |
1267 | - FROM ' . prefixTable('log_items') . ' AS l |
|
1268 | - RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
1267 | + FROM ' . prefixTable('log_items').' AS l |
|
1268 | + RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
1269 | 1269 | WHERE l.action = %s AND l.id_user = %i |
1270 | 1270 | ORDER BY l.date DESC |
1271 | 1271 | LIMIT 0, 100', |
@@ -1297,7 +1297,7 @@ discard block |
||
1297 | 1297 | if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true |
1298 | 1298 | && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1) |
1299 | 1299 | ) { |
1300 | - DB::query('SELECT * FROM ' . prefixTable('suggestion')); |
|
1300 | + DB::query('SELECT * FROM '.prefixTable('suggestion')); |
|
1301 | 1301 | $nb_suggestions_waiting = DB::count(); |
1302 | 1302 | } |
1303 | 1303 | |
@@ -1332,13 +1332,13 @@ discard block |
||
1332 | 1332 | if ($data === 'stat_languages') { |
1333 | 1333 | $tmp = ''; |
1334 | 1334 | foreach ($stats_data[$data] as $key => $value) { |
1335 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
1335 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
1336 | 1336 | } |
1337 | 1337 | $statsToSend[$data] = $tmp; |
1338 | 1338 | } elseif ($data === 'stat_country') { |
1339 | 1339 | $tmp = ''; |
1340 | 1340 | foreach ($stats_data[$data] as $key => $value) { |
1341 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
1341 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
1342 | 1342 | } |
1343 | 1343 | $statsToSend[$data] = $tmp; |
1344 | 1344 | } else { |
@@ -1432,7 +1432,7 @@ discard block |
||
1432 | 1432 | $url_found = $value; |
1433 | 1433 | if (empty($url_found) === false) { |
1434 | 1434 | $tmp = parse_url($url_found); |
1435 | - $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
1435 | + $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
1436 | 1436 | $value = $anonym_url; |
1437 | 1437 | } else { |
1438 | 1438 | $value = ''; |
@@ -1462,7 +1462,7 @@ discard block |
||
1462 | 1462 | $teampass_errors = ''; |
1463 | 1463 | $rows = DB::query( |
1464 | 1464 | 'SELECT label, date AS error_date |
1465 | - FROM ' . prefixTable('log_system') . " |
|
1465 | + FROM ' . prefixTable('log_system')." |
|
1466 | 1466 | WHERE `type` LIKE 'error' |
1467 | 1467 | ORDER BY `date` DESC |
1468 | 1468 | LIMIT 0, 10" |
@@ -1470,9 +1470,9 @@ discard block |
||
1470 | 1470 | if (DB::count() > 0) { |
1471 | 1471 | foreach ($rows as $record) { |
1472 | 1472 | if (empty($teampass_errors) === true) { |
1473 | - $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
1473 | + $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
1474 | 1474 | } else { |
1475 | - $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
1475 | + $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
1476 | 1476 | } |
1477 | 1477 | } |
1478 | 1478 | } |
@@ -1481,7 +1481,7 @@ discard block |
||
1481 | 1481 | |
1482 | 1482 | // Now prepare text |
1483 | 1483 | $txt = '### Page on which it happened |
1484 | -' . $data['current_page'] . ' |
|
1484 | +' . $data['current_page'].' |
|
1485 | 1485 | |
1486 | 1486 | ### Steps to reproduce |
1487 | 1487 | 1. |
@@ -1496,39 +1496,39 @@ discard block |
||
1496 | 1496 | Tell us what happens instead |
1497 | 1497 | |
1498 | 1498 | ### Server configuration |
1499 | -**Operating system**: ' . php_uname() . ' |
|
1499 | +**Operating system**: ' . php_uname().' |
|
1500 | 1500 | |
1501 | -**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . ' |
|
1501 | +**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].' |
|
1502 | 1502 | |
1503 | -**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . ' |
|
1503 | +**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).' |
|
1504 | 1504 | |
1505 | -**PHP version:** ' . PHP_VERSION . ' |
|
1505 | +**PHP version:** ' . PHP_VERSION.' |
|
1506 | 1506 | |
1507 | -**Teampass version:** ' . TP_VERSION . ' |
|
1507 | +**Teampass version:** ' . TP_VERSION.' |
|
1508 | 1508 | |
1509 | 1509 | **Teampass configuration file:** |
1510 | 1510 | ``` |
1511 | -' . $list_of_options . ' |
|
1511 | +' . $list_of_options.' |
|
1512 | 1512 | ``` |
1513 | 1513 | |
1514 | 1514 | **Updated from an older Teampass or fresh install:** |
1515 | 1515 | |
1516 | 1516 | ### Client configuration |
1517 | 1517 | |
1518 | -**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . ' |
|
1518 | +**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].' |
|
1519 | 1519 | |
1520 | -**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits |
|
1520 | +**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits |
|
1521 | 1521 | |
1522 | 1522 | ### Logs |
1523 | 1523 | |
1524 | 1524 | #### Web server error log |
1525 | 1525 | ``` |
1526 | -' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ') |
|
1526 | +' . $err['message'].' - '.$err['file'].' ('.$err['line'].') |
|
1527 | 1527 | ``` |
1528 | 1528 | |
1529 | 1529 | #### Teampass 10 last system errors |
1530 | 1530 | ``` |
1531 | -' . $teampass_errors . ' |
|
1531 | +' . $teampass_errors.' |
|
1532 | 1532 | ``` |
1533 | 1533 | |
1534 | 1534 | #### Log from the web-browser developer console (CTRL + SHIFT + i) |
@@ -1568,7 +1568,7 @@ discard block |
||
1568 | 1568 | // Check if user exists |
1569 | 1569 | $userInfo = DB::queryFirstRow( |
1570 | 1570 | 'SELECT public_key, private_key, pw, auth_type |
1571 | - FROM ' . prefixTable('users') . ' |
|
1571 | + FROM ' . prefixTable('users').' |
|
1572 | 1572 | WHERE id = %i', |
1573 | 1573 | $post_user_id |
1574 | 1574 | ); |
@@ -1577,9 +1577,9 @@ discard block |
||
1577 | 1577 | // Get one item |
1578 | 1578 | $currentUserKey = DB::queryFirstRow( |
1579 | 1579 | 'SELECT object_id, share_key, increment_id |
1580 | - FROM ' . prefixTable('sharekeys_items') . ' AS si |
|
1581 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id) |
|
1582 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON (i.id_tree = nt.id) |
|
1580 | + FROM ' . prefixTable('sharekeys_items').' AS si |
|
1581 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id) |
|
1582 | + INNER JOIN ' . prefixTable('nested_tree').' AS nt ON (i.id_tree = nt.id) |
|
1583 | 1583 | WHERE user_id = %i AND nt.personal_folder = %i', |
1584 | 1584 | $post_user_id, |
1585 | 1585 | 0 |
@@ -1677,7 +1677,7 @@ discard block |
||
1677 | 1677 | // Get user info |
1678 | 1678 | $userData = DB::queryFirstRow( |
1679 | 1679 | 'SELECT private_key |
1680 | - FROM ' . prefixTable('users') . ' |
|
1680 | + FROM ' . prefixTable('users').' |
|
1681 | 1681 | WHERE id = %i', |
1682 | 1682 | $post_user_id |
1683 | 1683 | ); |
@@ -1756,7 +1756,7 @@ discard block |
||
1756 | 1756 | // Get user info |
1757 | 1757 | $userData = DB::queryFirstRow( |
1758 | 1758 | 'SELECT email, auth_type, login |
1759 | - FROM ' . prefixTable('users') . ' |
|
1759 | + FROM ' . prefixTable('users').' |
|
1760 | 1760 | WHERE id = %i', |
1761 | 1761 | $post_user_id |
1762 | 1762 | ); |
@@ -1854,7 +1854,7 @@ discard block |
||
1854 | 1854 | // Get user info |
1855 | 1855 | $userData = DB::queryFirstRow( |
1856 | 1856 | 'SELECT email, auth_type, login |
1857 | - FROM ' . prefixTable('users') . ' |
|
1857 | + FROM ' . prefixTable('users').' |
|
1858 | 1858 | WHERE id = %i', |
1859 | 1859 | $post_user_id |
1860 | 1860 | ); |
@@ -1920,7 +1920,7 @@ discard block |
||
1920 | 1920 | // Check if user exists |
1921 | 1921 | DB::queryFirstRow( |
1922 | 1922 | 'SELECT * |
1923 | - FROM ' . prefixTable('users') . ' |
|
1923 | + FROM ' . prefixTable('users').' |
|
1924 | 1924 | WHERE id = %i', |
1925 | 1925 | $post_user_id |
1926 | 1926 | ); |
@@ -1990,7 +1990,7 @@ discard block |
||
1990 | 1990 | // Check if user exists |
1991 | 1991 | $userInfo = DB::queryFirstRow( |
1992 | 1992 | 'SELECT public_key |
1993 | - FROM ' . prefixTable('users') . ' |
|
1993 | + FROM ' . prefixTable('users').' |
|
1994 | 1994 | WHERE id = %i', |
1995 | 1995 | $post_user_id |
1996 | 1996 | ); |
@@ -2138,15 +2138,15 @@ discard block |
||
2138 | 2138 | // Loop on items |
2139 | 2139 | $rows = DB::query( |
2140 | 2140 | 'SELECT id, pw |
2141 | - FROM ' . prefixTable('items') . ' |
|
2141 | + FROM ' . prefixTable('items').' |
|
2142 | 2142 | WHERE perso = 0 |
2143 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2143 | + LIMIT ' . $post_start.', '.$post_length |
|
2144 | 2144 | ); |
2145 | 2145 | foreach ($rows as $record) { |
2146 | 2146 | // Get itemKey from current user |
2147 | 2147 | $currentUserKey = DB::queryFirstRow( |
2148 | 2148 | 'SELECT share_key, increment_id |
2149 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2149 | + FROM ' . prefixTable('sharekeys_items').' |
|
2150 | 2150 | WHERE object_id = %i AND user_id = %i', |
2151 | 2151 | $record['id'], |
2152 | 2152 | $session->get('user-id') |
@@ -2178,7 +2178,7 @@ discard block |
||
2178 | 2178 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2179 | 2179 | $currentUserKey = DB::queryFirstRow( |
2180 | 2180 | 'SELECT increment_id |
2181 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2181 | + FROM ' . prefixTable('sharekeys_items').' |
|
2182 | 2182 | WHERE object_id = %i AND user_id = %i', |
2183 | 2183 | $record['id'], |
2184 | 2184 | $post_user_id |
@@ -2211,7 +2211,7 @@ discard block |
||
2211 | 2211 | // SHould we change step? |
2212 | 2212 | DB::query( |
2213 | 2213 | 'SELECT * |
2214 | - FROM ' . prefixTable('items') . ' |
|
2214 | + FROM ' . prefixTable('items').' |
|
2215 | 2215 | WHERE perso = 0' |
2216 | 2216 | ); |
2217 | 2217 | |
@@ -2236,15 +2236,15 @@ discard block |
||
2236 | 2236 | // Loop on logs |
2237 | 2237 | $rows = DB::query( |
2238 | 2238 | 'SELECT increment_id |
2239 | - FROM ' . prefixTable('log_items') . ' |
|
2239 | + FROM ' . prefixTable('log_items').' |
|
2240 | 2240 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
2241 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2241 | + LIMIT ' . $post_start.', '.$post_length |
|
2242 | 2242 | ); |
2243 | 2243 | foreach ($rows as $record) { |
2244 | 2244 | // Get itemKey from current user |
2245 | 2245 | $currentUserKey = DB::queryFirstRow( |
2246 | 2246 | 'SELECT share_key |
2247 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
2247 | + FROM ' . prefixTable('sharekeys_logs').' |
|
2248 | 2248 | WHERE object_id = %i AND user_id = %i', |
2249 | 2249 | $record['increment_id'], |
2250 | 2250 | $session->get('user-id') |
@@ -2276,7 +2276,7 @@ discard block |
||
2276 | 2276 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2277 | 2277 | $currentUserKey = DB::queryFirstRow( |
2278 | 2278 | 'SELECT increment_id |
2279 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2279 | + FROM ' . prefixTable('sharekeys_items').' |
|
2280 | 2280 | WHERE object_id = %i AND user_id = %i', |
2281 | 2281 | $record['id'], |
2282 | 2282 | $post_user_id |
@@ -2298,7 +2298,7 @@ discard block |
||
2298 | 2298 | // SHould we change step? |
2299 | 2299 | DB::query( |
2300 | 2300 | 'SELECT increment_id |
2301 | - FROM ' . prefixTable('log_items') . ' |
|
2301 | + FROM ' . prefixTable('log_items').' |
|
2302 | 2302 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
2303 | 2303 | ); |
2304 | 2304 | |
@@ -2323,15 +2323,15 @@ discard block |
||
2323 | 2323 | // Loop on fields |
2324 | 2324 | $rows = DB::query( |
2325 | 2325 | 'SELECT id |
2326 | - FROM ' . prefixTable('categories_items') . ' |
|
2326 | + FROM ' . prefixTable('categories_items').' |
|
2327 | 2327 | WHERE encryption_type = "teampass_aes" |
2328 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2328 | + LIMIT ' . $post_start.', '.$post_length |
|
2329 | 2329 | ); |
2330 | 2330 | foreach ($rows as $record) { |
2331 | 2331 | // Get itemKey from current user |
2332 | 2332 | $currentUserKey = DB::queryFirstRow( |
2333 | 2333 | 'SELECT share_key |
2334 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2334 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2335 | 2335 | WHERE object_id = %i AND user_id = %i', |
2336 | 2336 | $record['id'], |
2337 | 2337 | $session->get('user-id') |
@@ -2363,7 +2363,7 @@ discard block |
||
2363 | 2363 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2364 | 2364 | $currentUserKey = DB::queryFirstRow( |
2365 | 2365 | 'SELECT increment_id |
2366 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2366 | + FROM ' . prefixTable('sharekeys_items').' |
|
2367 | 2367 | WHERE object_id = %i AND user_id = %i', |
2368 | 2368 | $record['id'], |
2369 | 2369 | $post_user_id |
@@ -2385,7 +2385,7 @@ discard block |
||
2385 | 2385 | // SHould we change step? |
2386 | 2386 | DB::query( |
2387 | 2387 | 'SELECT * |
2388 | - FROM ' . prefixTable('categories_items') . ' |
|
2388 | + FROM ' . prefixTable('categories_items').' |
|
2389 | 2389 | WHERE encryption_type = "teampass_aes"' |
2390 | 2390 | ); |
2391 | 2391 | |
@@ -2410,14 +2410,14 @@ discard block |
||
2410 | 2410 | // Loop on suggestions |
2411 | 2411 | $rows = DB::query( |
2412 | 2412 | 'SELECT id |
2413 | - FROM ' . prefixTable('suggestion') . ' |
|
2414 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2413 | + FROM ' . prefixTable('suggestion').' |
|
2414 | + LIMIT ' . $post_start.', '.$post_length |
|
2415 | 2415 | ); |
2416 | 2416 | foreach ($rows as $record) { |
2417 | 2417 | // Get itemKey from current user |
2418 | 2418 | $currentUserKey = DB::queryFirstRow( |
2419 | 2419 | 'SELECT share_key |
2420 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
2420 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
2421 | 2421 | WHERE object_id = %i AND user_id = %i', |
2422 | 2422 | $record['id'], |
2423 | 2423 | $session->get('user-id') |
@@ -2449,7 +2449,7 @@ discard block |
||
2449 | 2449 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2450 | 2450 | $currentUserKey = DB::queryFirstRow( |
2451 | 2451 | 'SELECT increment_id |
2452 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2452 | + FROM ' . prefixTable('sharekeys_items').' |
|
2453 | 2453 | WHERE object_id = %i AND user_id = %i', |
2454 | 2454 | $record['id'], |
2455 | 2455 | $post_user_id |
@@ -2495,15 +2495,15 @@ discard block |
||
2495 | 2495 | // Loop on files |
2496 | 2496 | $rows = DB::query( |
2497 | 2497 | 'SELECT id |
2498 | - FROM ' . prefixTable('files') . ' |
|
2499 | - WHERE status = "' . TP_ENCRYPTION_NAME . '" |
|
2500 | - LIMIT ' . $post_start . ', ' . $post_length |
|
2498 | + FROM ' . prefixTable('files').' |
|
2499 | + WHERE status = "' . TP_ENCRYPTION_NAME.'" |
|
2500 | + LIMIT ' . $post_start.', '.$post_length |
|
2501 | 2501 | ); //aes_encryption |
2502 | 2502 | foreach ($rows as $record) { |
2503 | 2503 | // Get itemKey from current user |
2504 | 2504 | $currentUserKey = DB::queryFirstRow( |
2505 | 2505 | 'SELECT share_key |
2506 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
2506 | + FROM ' . prefixTable('sharekeys_files').' |
|
2507 | 2507 | WHERE object_id = %i AND user_id = %i', |
2508 | 2508 | $record['id'], |
2509 | 2509 | $session->get('user-id') |
@@ -2535,7 +2535,7 @@ discard block |
||
2535 | 2535 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2536 | 2536 | $currentUserKey = DB::queryFirstRow( |
2537 | 2537 | 'SELECT increment_id |
2538 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2538 | + FROM ' . prefixTable('sharekeys_items').' |
|
2539 | 2539 | WHERE object_id = %i AND user_id = %i', |
2540 | 2540 | $record['id'], |
2541 | 2541 | $post_user_id |
@@ -2557,8 +2557,8 @@ discard block |
||
2557 | 2557 | // SHould we change step? |
2558 | 2558 | DB::query( |
2559 | 2559 | 'SELECT * |
2560 | - FROM ' . prefixTable('files') . ' |
|
2561 | - WHERE status = "' . TP_ENCRYPTION_NAME . '"' |
|
2560 | + FROM ' . prefixTable('files').' |
|
2561 | + WHERE status = "' . TP_ENCRYPTION_NAME.'"' |
|
2562 | 2562 | ); |
2563 | 2563 | |
2564 | 2564 | $next_start = (int) $post_start + (int) $post_length; |
@@ -2591,9 +2591,9 @@ discard block |
||
2591 | 2591 | if (count($session->get('user-personal_folders')) > 0) { |
2592 | 2592 | $rows = DB::query( |
2593 | 2593 | 'SELECT id, pw |
2594 | - FROM ' . prefixTable('items') . ' |
|
2594 | + FROM ' . prefixTable('items').' |
|
2595 | 2595 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s |
2596 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
2596 | + LIMIT ' . $post_start.', '.$post_length, |
|
2597 | 2597 | $session->get('user-personal_folders'), |
2598 | 2598 | "defuse" |
2599 | 2599 | ); |
@@ -2601,7 +2601,7 @@ discard block |
||
2601 | 2601 | // Get itemKey from current user |
2602 | 2602 | $currentUserKey = DB::queryFirstRow( |
2603 | 2603 | 'SELECT share_key, increment_id |
2604 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2604 | + FROM ' . prefixTable('sharekeys_items').' |
|
2605 | 2605 | WHERE object_id = %i AND user_id = %i', |
2606 | 2606 | $record['id'], |
2607 | 2607 | $session->get('user-id') |
@@ -2628,7 +2628,7 @@ discard block |
||
2628 | 2628 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
2629 | 2629 | $currentUserKey = DB::queryFirstRow( |
2630 | 2630 | 'SELECT increment_id |
2631 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2631 | + FROM ' . prefixTable('sharekeys_items').' |
|
2632 | 2632 | WHERE object_id = %i AND user_id = %i', |
2633 | 2633 | $record['id'], |
2634 | 2634 | $post_user_id |
@@ -2651,7 +2651,7 @@ discard block |
||
2651 | 2651 | // SHould we change step? |
2652 | 2652 | DB::query( |
2653 | 2653 | 'SELECT * |
2654 | - FROM ' . prefixTable('items') . ' |
|
2654 | + FROM ' . prefixTable('items').' |
|
2655 | 2655 | WHERE perso = 0' |
2656 | 2656 | ); |
2657 | 2657 | |
@@ -2679,7 +2679,7 @@ discard block |
||
2679 | 2679 | // Check if user exists |
2680 | 2680 | $userInfo = DB::queryFirstRow( |
2681 | 2681 | 'SELECT public_key, encrypted_psk |
2682 | - FROM ' . prefixTable('users') . ' |
|
2682 | + FROM ' . prefixTable('users').' |
|
2683 | 2683 | WHERE id = %i', |
2684 | 2684 | $post_user_id |
2685 | 2685 | ); |
@@ -2705,7 +2705,7 @@ discard block |
||
2705 | 2705 | if ($post_counterItemsToTreat === -1) { |
2706 | 2706 | DB::query( |
2707 | 2707 | 'SELECT id |
2708 | - FROM ' . prefixTable('items') . ' |
|
2708 | + FROM ' . prefixTable('items').' |
|
2709 | 2709 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
2710 | 2710 | $session->get('user-personal_folders'), |
2711 | 2711 | 'teampass_aes' |
@@ -2718,7 +2718,7 @@ discard block |
||
2718 | 2718 | // Loop on persoanl items |
2719 | 2719 | $rows = DB::query( |
2720 | 2720 | 'SELECT id, pw |
2721 | - FROM ' . prefixTable('items') . ' |
|
2721 | + FROM ' . prefixTable('items').' |
|
2722 | 2722 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s |
2723 | 2723 | LIMIT ' . $post_length, |
2724 | 2724 | $session->get('user-personal_folders'), |
@@ -2762,7 +2762,7 @@ discard block |
||
2762 | 2762 | // Loop on files |
2763 | 2763 | $rows = DB::query( |
2764 | 2764 | 'SELECT id, file |
2765 | - FROM ' . prefixTable('files') . ' |
|
2765 | + FROM ' . prefixTable('files').' |
|
2766 | 2766 | WHERE status != %s |
2767 | 2767 | AND id_item = %i', |
2768 | 2768 | TP_ENCRYPTION_NAME, |
@@ -2773,14 +2773,14 @@ discard block |
||
2773 | 2773 | // Now decrypt the file |
2774 | 2774 | prepareFileWithDefuse( |
2775 | 2775 | 'decrypt', |
2776 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'], |
|
2777 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete', |
|
2776 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'], |
|
2777 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete', |
|
2778 | 2778 | $SETTINGS, |
2779 | 2779 | $post_user_psk |
2780 | 2780 | ); |
2781 | 2781 | |
2782 | 2782 | // Encrypt the file |
2783 | - $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']); |
|
2783 | + $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']); |
|
2784 | 2784 | |
2785 | 2785 | DB::update( |
2786 | 2786 | prefixTable('files'), |
@@ -2803,7 +2803,7 @@ discard block |
||
2803 | 2803 | ); |
2804 | 2804 | |
2805 | 2805 | // Unlink original file |
2806 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']); |
|
2806 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']); |
|
2807 | 2807 | } |
2808 | 2808 | } |
2809 | 2809 | |
@@ -2811,7 +2811,7 @@ discard block |
||
2811 | 2811 | $next_start = (int) $post_start + (int) $post_length; |
2812 | 2812 | DB::query( |
2813 | 2813 | 'SELECT id |
2814 | - FROM ' . prefixTable('items') . ' |
|
2814 | + FROM ' . prefixTable('items').' |
|
2815 | 2815 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
2816 | 2816 | $session->get('user-personal_folders'), |
2817 | 2817 | 'teampass_aes' |
@@ -2882,7 +2882,7 @@ discard block |
||
2882 | 2882 | // Get user info |
2883 | 2883 | $userData = DB::queryFirstRow( |
2884 | 2884 | 'SELECT '.$post_fields.' |
2885 | - FROM ' . prefixTable('users') . ' |
|
2885 | + FROM ' . prefixTable('users').' |
|
2886 | 2886 | WHERE id = %i', |
2887 | 2887 | $post_user_id |
2888 | 2888 | ); |
@@ -2929,7 +2929,7 @@ discard block |
||
2929 | 2929 | // Get user info |
2930 | 2930 | $userData = DB::queryFirstRow( |
2931 | 2931 | 'SELECT auth_type, login, private_key |
2932 | - FROM ' . prefixTable('users') . ' |
|
2932 | + FROM ' . prefixTable('users').' |
|
2933 | 2933 | WHERE id = %i', |
2934 | 2934 | $post_user_id |
2935 | 2935 | ); |
@@ -2978,7 +2978,7 @@ discard block |
||
2978 | 2978 | return prepareExchangedData( |
2979 | 2979 | array( |
2980 | 2980 | 'error' => false, |
2981 | - 'message' => $lang->get('done'),'', |
|
2981 | + 'message' => $lang->get('done'), '', |
|
2982 | 2982 | ), |
2983 | 2983 | 'encode' |
2984 | 2984 | ); |
@@ -3028,7 +3028,7 @@ discard block |
||
3028 | 3028 | // Get user info |
3029 | 3029 | $userData = DB::queryFirstRow( |
3030 | 3030 | 'SELECT auth_type, login, private_key, special |
3031 | - FROM ' . prefixTable('users') . ' |
|
3031 | + FROM ' . prefixTable('users').' |
|
3032 | 3032 | WHERE id = %i', |
3033 | 3033 | $post_user_id |
3034 | 3034 | ); |
@@ -3062,7 +3062,7 @@ discard block |
||
3062 | 3062 | return prepareExchangedData( |
3063 | 3063 | array( |
3064 | 3064 | 'error' => false, |
3065 | - 'message' => $lang->get('done'),'', |
|
3065 | + 'message' => $lang->get('done'), '', |
|
3066 | 3066 | ), |
3067 | 3067 | 'encode' |
3068 | 3068 | ); |
@@ -3085,7 +3085,7 @@ discard block |
||
3085 | 3085 | // Get one itemKey from current user |
3086 | 3086 | $currentUserKey = DB::queryFirstRow( |
3087 | 3087 | 'SELECT share_key, increment_id |
3088 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
3088 | + FROM ' . prefixTable('sharekeys_items').' |
|
3089 | 3089 | WHERE user_id = %i |
3090 | 3090 | LIMIT 1', |
3091 | 3091 | $post_user_id |
@@ -3174,7 +3174,7 @@ discard block |
||
3174 | 3174 | $session->get('user-id') |
3175 | 3175 | ); |
3176 | 3176 | // Return data |
3177 | - return '[{"new_value":"' . $session->get('user-session_duration') . '"}]'; |
|
3177 | + return '[{"new_value":"'.$session->get('user-session_duration').'"}]'; |
|
3178 | 3178 | } |
3179 | 3179 | |
3180 | 3180 | return '[{"new_value":"expired"}]'; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | function purgeTemporaryFiles(): void |
72 | 72 | { |
73 | 73 | // Load expected files |
74 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
74 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
75 | 75 | |
76 | 76 | if (isset($SETTINGS) === true) { |
77 | 77 | //read folder |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | //delete file FILES |
82 | 82 | while (false !== ($f = readdir($dir))) { |
83 | 83 | if ($f !== '.' && $f !== '..' && $f !== '.htaccess') { |
84 | - if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) { |
|
85 | - fileDelete($dir . '/' . $f, $SETTINGS); |
|
84 | + if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) { |
|
85 | + fileDelete($dir.'/'.$f, $SETTINGS); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | while (false !== ($f = readdir($dir))) { |
102 | 102 | if ($f !== '.' && $f !== '..') { |
103 | 103 | if (strpos($f, '_delete.') > 0) { |
104 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS); |
|
104 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS); |
|
105 | 105 | } |
106 | 106 | } |
107 | 107 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | function reloadCacheTable(): void |
72 | 72 | { |
73 | 73 | // Load expected files |
74 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
74 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
75 | 75 | |
76 | 76 | updateCacheTable('reload', NULL); |
77 | 77 | } |
78 | 78 | \ No newline at end of file |