@@ -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($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($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') |
@@ -1135,9 +1134,9 @@ discard block |
||
| 1135 | 1134 | '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, |
| 1136 | 1135 | 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, |
| 1137 | 1136 | u.login as user_login, u.email as user_email |
| 1138 | - FROM ' . prefixTable('items') . ' as i |
|
| 1139 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1140 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1137 | + FROM ' . prefixTable('items').' as i |
|
| 1138 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1139 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1141 | 1140 | WHERE i.id=%i', |
| 1142 | 1141 | $inputData['itemId'] |
| 1143 | 1142 | ); |
@@ -1145,7 +1144,7 @@ discard block |
||
| 1145 | 1144 | // Should we log a password change? |
| 1146 | 1145 | $userKey = DB::queryFirstRow( |
| 1147 | 1146 | 'SELECT share_key |
| 1148 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1147 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1149 | 1148 | WHERE user_id = %i AND object_id = %i', |
| 1150 | 1149 | $session->get('user-id'), |
| 1151 | 1150 | $inputData['itemId'] |
@@ -1205,12 +1204,12 @@ discard block |
||
| 1205 | 1204 | (int) $inputData['folderId'], |
| 1206 | 1205 | (int) $inputData['itemId'], |
| 1207 | 1206 | $encrypted_password_key, |
| 1208 | - true, // only for the item creator |
|
| 1209 | - true, // delete all |
|
| 1207 | + true, // only for the item creator |
|
| 1208 | + true, // delete all |
|
| 1210 | 1209 | ); |
| 1211 | 1210 | |
| 1212 | 1211 | // Create a task to create sharekeys for users |
| 1213 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1212 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1214 | 1213 | $tasksToBePerformed = ['item_password']; |
| 1215 | 1214 | $encryptionTaskIsRequested = true; |
| 1216 | 1215 | } else { |
@@ -1221,7 +1220,7 @@ discard block |
||
| 1221 | 1220 | // Get list of tags |
| 1222 | 1221 | $itemTags = DB::queryFirstColumn( |
| 1223 | 1222 | 'SELECT tag |
| 1224 | - FROM ' . prefixTable('tags') . ' |
|
| 1223 | + FROM ' . prefixTable('tags').' |
|
| 1225 | 1224 | WHERE item_id = %i', |
| 1226 | 1225 | $inputData['itemId'] |
| 1227 | 1226 | ); |
@@ -1267,7 +1266,7 @@ discard block |
||
| 1267 | 1266 | $session->get('user-id'), |
| 1268 | 1267 | 'at_modification', |
| 1269 | 1268 | $session->get('user-login'), |
| 1270 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1269 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1271 | 1270 | ); |
| 1272 | 1271 | } |
| 1273 | 1272 | |
@@ -1307,8 +1306,8 @@ discard block |
||
| 1307 | 1306 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1308 | 1307 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1309 | 1308 | c.masked AS masked, i.id AS field_item_id |
| 1310 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1311 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1309 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1310 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1312 | 1311 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1313 | 1312 | $field['id'], |
| 1314 | 1313 | $inputData['itemId'] |
@@ -1324,7 +1323,7 @@ discard block |
||
| 1324 | 1323 | // Perform new query |
| 1325 | 1324 | $dataTmpCat = DB::queryFirstRow( |
| 1326 | 1325 | 'SELECT id, title, encrypted_data, masked |
| 1327 | - FROM ' . prefixTable('categories') . ' |
|
| 1326 | + FROM ' . prefixTable('categories').' |
|
| 1328 | 1327 | WHERE id = %i', |
| 1329 | 1328 | $field['id'] |
| 1330 | 1329 | ); |
@@ -1355,8 +1354,8 @@ discard block |
||
| 1355 | 1354 | (int) $inputData['folderId'], |
| 1356 | 1355 | (int) $newId, |
| 1357 | 1356 | $cryptedStuff['objectKey'], |
| 1358 | - true, // only for the item creator |
|
| 1359 | - true, // delete all |
|
| 1357 | + true, // only for the item creator |
|
| 1358 | + true, // delete all |
|
| 1360 | 1359 | ); |
| 1361 | 1360 | |
| 1362 | 1361 | // update value |
@@ -1404,7 +1403,7 @@ discard block |
||
| 1404 | 1403 | $session->get('user-id'), |
| 1405 | 1404 | 'at_modification', |
| 1406 | 1405 | $session->get('user-login'), |
| 1407 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1406 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1408 | 1407 | ); |
| 1409 | 1408 | } else { |
| 1410 | 1409 | // Case where the field already exists |
@@ -1413,7 +1412,7 @@ discard block |
||
| 1413 | 1412 | // Get user sharekey for this field |
| 1414 | 1413 | $userKey = DB::queryFirstRow( |
| 1415 | 1414 | 'SELECT share_key |
| 1416 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1415 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1417 | 1416 | WHERE user_id = %i AND object_id = %i', |
| 1418 | 1417 | $session->get('user-id'), |
| 1419 | 1418 | $dataTmpCat['field_item_id'] |
@@ -1453,8 +1452,8 @@ discard block |
||
| 1453 | 1452 | (int) $inputData['folderId'], |
| 1454 | 1453 | (int) $dataTmpCat['field_item_id'], |
| 1455 | 1454 | $cryptedStuff['objectKey'], |
| 1456 | - true, // only for the item creator |
|
| 1457 | - true, // delete all |
|
| 1455 | + true, // only for the item creator |
|
| 1456 | + true, // delete all |
|
| 1458 | 1457 | ); |
| 1459 | 1458 | |
| 1460 | 1459 | array_push( |
@@ -1494,7 +1493,7 @@ discard block |
||
| 1494 | 1493 | $session->get('user-id'), |
| 1495 | 1494 | 'at_modification', |
| 1496 | 1495 | $session->get('user-login'), |
| 1497 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1496 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1498 | 1497 | ); |
| 1499 | 1498 | } |
| 1500 | 1499 | } |
@@ -1549,7 +1548,7 @@ discard block |
||
| 1549 | 1548 | ) { |
| 1550 | 1549 | DB::queryFirstRow( |
| 1551 | 1550 | 'SELECT * |
| 1552 | - FROM ' . prefixTable('templates') . ' |
|
| 1551 | + FROM ' . prefixTable('templates').' |
|
| 1553 | 1552 | WHERE item_id = %i', |
| 1554 | 1553 | $inputData['itemId'] |
| 1555 | 1554 | ); |
@@ -1592,7 +1591,7 @@ discard block |
||
| 1592 | 1591 | // check if elem exists in Table. If not add it or update it. |
| 1593 | 1592 | DB::query( |
| 1594 | 1593 | 'SELECT * |
| 1595 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1594 | + FROM ' . prefixTable('automatic_del').' |
|
| 1596 | 1595 | WHERE item_id = %i', |
| 1597 | 1596 | $inputData['itemId'] |
| 1598 | 1597 | ); |
@@ -1619,7 +1618,7 @@ discard block |
||
| 1619 | 1618 | // Store updates performed |
| 1620 | 1619 | array_push( |
| 1621 | 1620 | $arrayOfChanges, |
| 1622 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1621 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1623 | 1622 | ); |
| 1624 | 1623 | |
| 1625 | 1624 | // update LOG |
@@ -1662,7 +1661,7 @@ discard block |
||
| 1662 | 1661 | // Store updates performed |
| 1663 | 1662 | array_push( |
| 1664 | 1663 | $arrayOfChanges, |
| 1665 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1664 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1666 | 1665 | ); |
| 1667 | 1666 | |
| 1668 | 1667 | // update LOG |
@@ -1695,7 +1694,7 @@ discard block |
||
| 1695 | 1694 | if (empty($userId) === false) { |
| 1696 | 1695 | $dataTmp = DB::queryfirstrow( |
| 1697 | 1696 | 'SELECT id, name, lastname |
| 1698 | - FROM ' . prefixTable('users') . ' |
|
| 1697 | + FROM ' . prefixTable('users').' |
|
| 1699 | 1698 | WHERE id= %i', |
| 1700 | 1699 | $userId |
| 1701 | 1700 | ); |
@@ -1703,7 +1702,7 @@ discard block |
||
| 1703 | 1702 | // Add to array |
| 1704 | 1703 | array_push( |
| 1705 | 1704 | $arrayOfUsersRestriction, |
| 1706 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1705 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1707 | 1706 | ); |
| 1708 | 1707 | array_push( |
| 1709 | 1708 | $arrayOfUsersIdRestriction, |
@@ -1734,8 +1733,8 @@ discard block |
||
| 1734 | 1733 | // get values before deleting them |
| 1735 | 1734 | $rows = DB::query( |
| 1736 | 1735 | 'SELECT t.title, t.id AS id |
| 1737 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1738 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1736 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1737 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1739 | 1738 | WHERE r.item_id = %i |
| 1740 | 1739 | ORDER BY t.title ASC', |
| 1741 | 1740 | $inputData['itemId'] |
@@ -1769,7 +1768,7 @@ discard block |
||
| 1769 | 1768 | ); |
| 1770 | 1769 | $dataTmp = DB::queryfirstrow( |
| 1771 | 1770 | 'SELECT title |
| 1772 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1771 | + FROM ' . prefixTable('roles_title').' |
|
| 1773 | 1772 | WHERE id = %i', |
| 1774 | 1773 | $role |
| 1775 | 1774 | ); |
@@ -1797,7 +1796,7 @@ discard block |
||
| 1797 | 1796 | // Get current status |
| 1798 | 1797 | $otpStatus = DB::queryFirstRow( |
| 1799 | 1798 | 'SELECT enabled as otp_is_enabled |
| 1800 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1799 | + FROM ' . prefixTable('items_otp').' |
|
| 1801 | 1800 | WHERE item_id = %i', |
| 1802 | 1801 | $inputData['itemId'] |
| 1803 | 1802 | ); |
@@ -1828,7 +1827,7 @@ discard block |
||
| 1828 | 1827 | $session->get('user-id'), |
| 1829 | 1828 | 'at_modification', |
| 1830 | 1829 | $session->get('user-login'), |
| 1831 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1830 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1832 | 1831 | ); |
| 1833 | 1832 | } elseif (DB::count() === 0 && empty($post_otp_secret) === false) { |
| 1834 | 1833 | // Create the entry in items_otp table |
@@ -1872,8 +1871,8 @@ discard block |
||
| 1872 | 1871 | $session->get('user-id'), |
| 1873 | 1872 | 'at_modification', |
| 1874 | 1873 | $session->get('user-login'), |
| 1875 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1876 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1874 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1875 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1877 | 1876 | ); |
| 1878 | 1877 | } |
| 1879 | 1878 | |
@@ -1893,7 +1892,7 @@ discard block |
||
| 1893 | 1892 | $session->get('user-id'), |
| 1894 | 1893 | 'at_modification', |
| 1895 | 1894 | $session->get('user-login'), |
| 1896 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1895 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1897 | 1896 | ); |
| 1898 | 1897 | } |
| 1899 | 1898 | // LOGIN |
@@ -1912,7 +1911,7 @@ discard block |
||
| 1912 | 1911 | $session->get('user-id'), |
| 1913 | 1912 | 'at_modification', |
| 1914 | 1913 | $session->get('user-login'), |
| 1915 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1914 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1916 | 1915 | ); |
| 1917 | 1916 | } |
| 1918 | 1917 | |
@@ -1931,7 +1930,7 @@ discard block |
||
| 1931 | 1930 | $session->get('user-id'), |
| 1932 | 1931 | 'at_modification', |
| 1933 | 1932 | $session->get('user-login'), |
| 1934 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1933 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1935 | 1934 | ); |
| 1936 | 1935 | } |
| 1937 | 1936 | // URL |
@@ -1950,7 +1949,7 @@ discard block |
||
| 1950 | 1949 | $session->get('user-id'), |
| 1951 | 1950 | 'at_modification', |
| 1952 | 1951 | $session->get('user-login'), |
| 1953 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1952 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1954 | 1953 | ); |
| 1955 | 1954 | } |
| 1956 | 1955 | // DESCRIPTION |
@@ -1976,7 +1975,7 @@ discard block |
||
| 1976 | 1975 | // FOLDER |
| 1977 | 1976 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 1978 | 1977 | // Get name of folders |
| 1979 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1978 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 1980 | 1979 | |
| 1981 | 1980 | // Store updates performed |
| 1982 | 1981 | array_push( |
@@ -1992,7 +1991,7 @@ discard block |
||
| 1992 | 1991 | $session->get('user-id'), |
| 1993 | 1992 | 'at_modification', |
| 1994 | 1993 | $session->get('user-login'), |
| 1995 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1994 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1996 | 1995 | ); |
| 1997 | 1996 | } |
| 1998 | 1997 | // ANYONE_CAN_MODIFY |
@@ -2000,7 +1999,7 @@ discard block |
||
| 2000 | 1999 | // Store updates performed |
| 2001 | 2000 | array_push( |
| 2002 | 2001 | $arrayOfChanges, |
| 2003 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2002 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2004 | 2003 | ); |
| 2005 | 2004 | |
| 2006 | 2005 | // Log |
@@ -2011,15 +2010,15 @@ discard block |
||
| 2011 | 2010 | $session->get('user-id'), |
| 2012 | 2011 | 'at_modification', |
| 2013 | 2012 | $session->get('user-login'), |
| 2014 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2013 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2015 | 2014 | ); |
| 2016 | 2015 | } |
| 2017 | 2016 | |
| 2018 | 2017 | // Reload new values |
| 2019 | 2018 | $dataItem = DB::queryfirstrow( |
| 2020 | 2019 | 'SELECT * |
| 2021 | - FROM ' . prefixTable('items') . ' as i |
|
| 2022 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2020 | + FROM ' . prefixTable('items').' as i |
|
| 2021 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2023 | 2022 | WHERE i.id = %i AND l.action = %s', |
| 2024 | 2023 | $inputData['itemId'], |
| 2025 | 2024 | 'at_creation' |
@@ -2028,8 +2027,8 @@ discard block |
||
| 2028 | 2027 | $history = ''; |
| 2029 | 2028 | $rows = DB::query( |
| 2030 | 2029 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2031 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2032 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2030 | + FROM ' . prefixTable('log_items').' as l |
|
| 2031 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2033 | 2032 | WHERE l.action <> %s AND id_item=%s', |
| 2034 | 2033 | 'at_shown', |
| 2035 | 2034 | $inputData['itemId'] |
@@ -2038,14 +2037,14 @@ discard block |
||
| 2038 | 2037 | if ($record['raison'] === NULL) continue; |
| 2039 | 2038 | $reason = explode(':', $record['raison']); |
| 2040 | 2039 | if (count($reason) > 0) { |
| 2041 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2042 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2043 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2040 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2041 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2042 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2044 | 2043 | : $lang->get(trim($reason[0]))) : ''); |
| 2045 | 2044 | if (empty($history)) { |
| 2046 | 2045 | $history = $sentence; |
| 2047 | 2046 | } else { |
| 2048 | - $history .= '<br />' . $sentence; |
|
| 2047 | + $history .= '<br />'.$sentence; |
|
| 2049 | 2048 | } |
| 2050 | 2049 | } |
| 2051 | 2050 | } |
@@ -2183,7 +2182,7 @@ discard block |
||
| 2183 | 2182 | ) { |
| 2184 | 2183 | // load the original record into an array |
| 2185 | 2184 | $originalRecord = DB::queryfirstrow( |
| 2186 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2185 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2187 | 2186 | WHERE id = %i', |
| 2188 | 2187 | $inputData['itemId'] |
| 2189 | 2188 | ); |
@@ -2202,7 +2201,7 @@ discard block |
||
| 2202 | 2201 | |
| 2203 | 2202 | // Load the destination folder record into an array |
| 2204 | 2203 | $dataDestination = DB::queryfirstrow( |
| 2205 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2204 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2206 | 2205 | WHERE id = %i', |
| 2207 | 2206 | $post_dest_id |
| 2208 | 2207 | ); |
@@ -2210,7 +2209,7 @@ discard block |
||
| 2210 | 2209 | // Get the ITEM object key for the user |
| 2211 | 2210 | $userKey = DB::queryFirstRow( |
| 2212 | 2211 | 'SELECT share_key |
| 2213 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2212 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2214 | 2213 | WHERE user_id = %i AND object_id = %i', |
| 2215 | 2214 | $session->get('user-id'), |
| 2216 | 2215 | $inputData['itemId'] |
@@ -2288,8 +2287,8 @@ discard block |
||
| 2288 | 2287 | // Manage Custom Fields |
| 2289 | 2288 | $rows = DB::query( |
| 2290 | 2289 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2291 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2292 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2290 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2291 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2293 | 2292 | WHERE ci.item_id = %i', |
| 2294 | 2293 | $inputData['itemId'] |
| 2295 | 2294 | ); |
@@ -2301,7 +2300,7 @@ discard block |
||
| 2301 | 2300 | // Get user key |
| 2302 | 2301 | $userKey = DB::queryFirstRow( |
| 2303 | 2302 | 'SELECT share_key |
| 2304 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2303 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2305 | 2304 | WHERE user_id = %i AND object_id = %i', |
| 2306 | 2305 | $session->get('user-id'), |
| 2307 | 2306 | $field['id'] |
@@ -2369,15 +2368,15 @@ discard block |
||
| 2369 | 2368 | $rows = DB::query( |
| 2370 | 2369 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2371 | 2370 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2372 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2373 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2371 | + FROM ' . prefixTable('files').' AS f |
|
| 2372 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2374 | 2373 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2375 | 2374 | $session->get('user-id'), |
| 2376 | 2375 | $inputData['itemId'] |
| 2377 | 2376 | ); |
| 2378 | 2377 | foreach ($rows as $record) { |
| 2379 | 2378 | // Check if file still exists |
| 2380 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2379 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2381 | 2380 | // Step1 - decrypt the file |
| 2382 | 2381 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2383 | 2382 | $fileContent = decryptFile( |
@@ -2388,8 +2387,8 @@ discard block |
||
| 2388 | 2387 | |
| 2389 | 2388 | // Step2 - create file |
| 2390 | 2389 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2391 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2392 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2390 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2391 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2393 | 2392 | if ($outstream === false) { |
| 2394 | 2393 | echo prepareExchangedData( |
| 2395 | 2394 | array( |
@@ -2463,7 +2462,7 @@ discard block |
||
| 2463 | 2462 | |
| 2464 | 2463 | // ------------------------- |
| 2465 | 2464 | // Add specific restrictions |
| 2466 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2465 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2467 | 2466 | foreach ($rows as $record) { |
| 2468 | 2467 | DB::insert( |
| 2469 | 2468 | prefixTable('restriction_to_roles'), |
@@ -2475,7 +2474,7 @@ discard block |
||
| 2475 | 2474 | } |
| 2476 | 2475 | |
| 2477 | 2476 | // Add Tags |
| 2478 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2477 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2479 | 2478 | foreach ($rows as $record) { |
| 2480 | 2479 | DB::insert( |
| 2481 | 2480 | prefixTable('tags'), |
@@ -2576,7 +2575,7 @@ discard block |
||
| 2576 | 2575 | // then we can show it |
| 2577 | 2576 | $item_deleted = DB::queryFirstRow( |
| 2578 | 2577 | 'SELECT * |
| 2579 | - FROM ' . prefixTable('log_items') . ' |
|
| 2578 | + FROM ' . prefixTable('log_items').' |
|
| 2580 | 2579 | WHERE id_item = %i AND action = %s |
| 2581 | 2580 | ORDER BY date DESC |
| 2582 | 2581 | LIMIT 0, 1', |
@@ -2587,7 +2586,7 @@ discard block |
||
| 2587 | 2586 | |
| 2588 | 2587 | $item_restored = DB::queryFirstRow( |
| 2589 | 2588 | 'SELECT * |
| 2590 | - FROM ' . prefixTable('log_items') . ' |
|
| 2589 | + FROM ' . prefixTable('log_items').' |
|
| 2591 | 2590 | WHERE id_item = %i AND action = %s |
| 2592 | 2591 | ORDER BY date DESC |
| 2593 | 2592 | LIMIT 0, 1', |
@@ -2611,8 +2610,8 @@ discard block |
||
| 2611 | 2610 | // Get all informations for this item |
| 2612 | 2611 | $dataItem = DB::queryfirstrow( |
| 2613 | 2612 | 'SELECT * |
| 2614 | - FROM ' . prefixTable('items') . ' as i |
|
| 2615 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2613 | + FROM ' . prefixTable('items').' as i |
|
| 2614 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2616 | 2615 | WHERE i.id = %i AND l.action = %s', |
| 2617 | 2616 | $inputData['id'], |
| 2618 | 2617 | 'at_creation' |
@@ -2621,7 +2620,7 @@ discard block |
||
| 2621 | 2620 | // Notification |
| 2622 | 2621 | DB::queryfirstrow( |
| 2623 | 2622 | 'SELECT * |
| 2624 | - FROM ' . prefixTable('notification') . ' |
|
| 2623 | + FROM ' . prefixTable('notification').' |
|
| 2625 | 2624 | WHERE item_id = %i AND user_id = %i', |
| 2626 | 2625 | $inputData['id'], |
| 2627 | 2626 | $session->get('user-id') |
@@ -2640,7 +2639,7 @@ discard block |
||
| 2640 | 2639 | |
| 2641 | 2640 | // manage case of API user |
| 2642 | 2641 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2643 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2642 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2644 | 2643 | $arrData['id_user'] = API_USER_ID; |
| 2645 | 2644 | $arrData['author_email'] = ''; |
| 2646 | 2645 | $arrData['notification_status'] = false; |
@@ -2650,7 +2649,7 @@ discard block |
||
| 2650 | 2649 | $tags = array(); |
| 2651 | 2650 | $rows = DB::query( |
| 2652 | 2651 | 'SELECT tag |
| 2653 | - FROM ' . prefixTable('tags') . ' |
|
| 2652 | + FROM ' . prefixTable('tags').' |
|
| 2654 | 2653 | WHERE item_id = %i', |
| 2655 | 2654 | $inputData['id'] |
| 2656 | 2655 | ); |
@@ -2675,7 +2674,7 @@ discard block |
||
| 2675 | 2674 | // Check if user has a role that is accepted |
| 2676 | 2675 | $rows_tmp = DB::query( |
| 2677 | 2676 | 'SELECT role_id |
| 2678 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2677 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2679 | 2678 | WHERE item_id=%i', |
| 2680 | 2679 | $inputData['id'] |
| 2681 | 2680 | ); |
@@ -2689,7 +2688,7 @@ discard block |
||
| 2689 | 2688 | // Get the object key for the user |
| 2690 | 2689 | $userKey = DB::queryFirstRow( |
| 2691 | 2690 | 'SELECT share_key |
| 2692 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2691 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2693 | 2692 | WHERE user_id = %i AND object_id = %i', |
| 2694 | 2693 | $session->get('user-id'), |
| 2695 | 2694 | $inputData['id'] |
@@ -2786,8 +2785,8 @@ discard block |
||
| 2786 | 2785 | // Add restriction if item is restricted to roles |
| 2787 | 2786 | $rows = DB::query( |
| 2788 | 2787 | 'SELECT t.title, t.id |
| 2789 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2790 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2788 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2789 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2791 | 2790 | WHERE r.item_id = %i |
| 2792 | 2791 | ORDER BY t.title ASC', |
| 2793 | 2792 | $inputData['id'] |
@@ -2803,8 +2802,8 @@ discard block |
||
| 2803 | 2802 | $tmp = array(); |
| 2804 | 2803 | $rows = DB::query( |
| 2805 | 2804 | 'SELECT k.label, k.id |
| 2806 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2807 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2805 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2806 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2808 | 2807 | WHERE i.item_id = %i |
| 2809 | 2808 | ORDER BY k.label ASC', |
| 2810 | 2809 | $inputData['id'] |
@@ -2887,7 +2886,7 @@ discard block |
||
| 2887 | 2886 | $arrCatList = array(); |
| 2888 | 2887 | $rows_tmp = DB::query( |
| 2889 | 2888 | 'SELECT id_category |
| 2890 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2889 | + FROM ' . prefixTable('categories_folders').' |
|
| 2891 | 2890 | WHERE id_folder=%i', |
| 2892 | 2891 | $inputData['folderId'] |
| 2893 | 2892 | ); |
@@ -2902,8 +2901,8 @@ discard block |
||
| 2902 | 2901 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2903 | 2902 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2904 | 2903 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2905 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2906 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2904 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2905 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2907 | 2906 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2908 | 2907 | $inputData['id'], |
| 2909 | 2908 | $arrCatList |
@@ -2914,7 +2913,7 @@ discard block |
||
| 2914 | 2913 | //db::debugmode(true); |
| 2915 | 2914 | $userKey = DB::queryFirstRow( |
| 2916 | 2915 | 'SELECT share_key |
| 2917 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2916 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2918 | 2917 | WHERE user_id = %i AND object_id = %i', |
| 2919 | 2918 | $session->get('user-id'), |
| 2920 | 2919 | $row['id'] |
@@ -2932,7 +2931,7 @@ discard block |
||
| 2932 | 2931 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 2933 | 2932 | // Data is not encrypted in DB |
| 2934 | 2933 | $fieldText = [ |
| 2935 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2934 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 2936 | 2935 | 'encrypted' => false, |
| 2937 | 2936 | 'error' => false, |
| 2938 | 2937 | ]; |
@@ -2977,7 +2976,7 @@ discard block |
||
| 2977 | 2976 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2978 | 2977 | $rows_tmp = DB::queryfirstrow( |
| 2979 | 2978 | 'SELECT category_id |
| 2980 | - FROM ' . prefixTable('templates') . ' |
|
| 2979 | + FROM ' . prefixTable('templates').' |
|
| 2981 | 2980 | WHERE item_id = %i', |
| 2982 | 2981 | $inputData['id'] |
| 2983 | 2982 | ); |
@@ -2994,7 +2993,7 @@ discard block |
||
| 2994 | 2993 | // Evaluate if item is ready for all users |
| 2995 | 2994 | $rows_tmp = DB::queryfirstrow( |
| 2996 | 2995 | 'SELECT finished_at |
| 2997 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 2996 | + FROM ' . prefixTable('background_tasks').' |
|
| 2998 | 2997 | WHERE item_id = %i', |
| 2999 | 2998 | $inputData['id'] |
| 3000 | 2999 | ); |
@@ -3011,7 +3010,7 @@ discard block |
||
| 3011 | 3010 | // Is the Item to be deleted? |
| 3012 | 3011 | $dataDelete = DB::queryfirstrow( |
| 3013 | 3012 | 'SELECT * |
| 3014 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3013 | + FROM ' . prefixTable('automatic_del').' |
|
| 3015 | 3014 | WHERE item_id = %i', |
| 3016 | 3015 | $inputData['id'] |
| 3017 | 3016 | ); |
@@ -3090,11 +3089,11 @@ discard block |
||
| 3090 | 3089 | if (empty($dataItem['restricted_to']) === false) { |
| 3091 | 3090 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 3092 | 3091 | if (empty($userRest) === false) { |
| 3093 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 3092 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 3094 | 3093 | if (empty($listOfRestricted)) { |
| 3095 | 3094 | $listOfRestricted = $dataTmp['login']; |
| 3096 | 3095 | } else { |
| 3097 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3096 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3098 | 3097 | } |
| 3099 | 3098 | } |
| 3100 | 3099 | } |
@@ -3168,9 +3167,9 @@ discard block |
||
| 3168 | 3167 | // Load item data |
| 3169 | 3168 | $dataItem = DB::queryFirstRow( |
| 3170 | 3169 | '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 |
| 3171 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3172 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3173 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3170 | + FROM ' . prefixTable('items').' AS i |
|
| 3171 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3172 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3174 | 3173 | WHERE i.id = %i', |
| 3175 | 3174 | $inputData['id'] |
| 3176 | 3175 | ); |
@@ -3192,7 +3191,7 @@ discard block |
||
| 3192 | 3191 | // Check if user has a role that is accepted |
| 3193 | 3192 | $rows_tmp = DB::query( |
| 3194 | 3193 | 'SELECT role_id |
| 3195 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3194 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3196 | 3195 | WHERE item_id=%i', |
| 3197 | 3196 | $inputData['id'] |
| 3198 | 3197 | ); |
@@ -3224,12 +3223,12 @@ discard block |
||
| 3224 | 3223 | // launch query |
| 3225 | 3224 | $rows = DB::query( |
| 3226 | 3225 | 'SELECT id, name, file, extension, size |
| 3227 | - FROM ' . prefixTable('files') . ' |
|
| 3226 | + FROM ' . prefixTable('files').' |
|
| 3228 | 3227 | WHERE id_item = %i AND confirmed = 1', |
| 3229 | 3228 | $inputData['id'] |
| 3230 | 3229 | ); |
| 3231 | 3230 | foreach ($rows as $record) { |
| 3232 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3231 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3233 | 3232 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3234 | 3233 | |
| 3235 | 3234 | array_push( |
@@ -3242,7 +3241,7 @@ discard block |
||
| 3242 | 3241 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3243 | 3242 | 'id' => $record['id'], |
| 3244 | 3243 | 'key' => $session->get('user-key_tmp'), |
| 3245 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3244 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3246 | 3245 | ) |
| 3247 | 3246 | ); |
| 3248 | 3247 | } |
@@ -3280,7 +3279,7 @@ discard block |
||
| 3280 | 3279 | array( |
| 3281 | 3280 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3282 | 3281 | ), |
| 3283 | - 'id=' . $session->get('user-id') |
|
| 3282 | + 'id='.$session->get('user-id') |
|
| 3284 | 3283 | ); |
| 3285 | 3284 | } |
| 3286 | 3285 | |
@@ -3289,8 +3288,8 @@ discard block |
||
| 3289 | 3288 | $listOptionsForRoles = array(); |
| 3290 | 3289 | $rows = DB::query( |
| 3291 | 3290 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3292 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3293 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3291 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3292 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3294 | 3293 | WHERE r.folder_id = %i', |
| 3295 | 3294 | $dataItem['id_tree'] |
| 3296 | 3295 | ); |
@@ -3304,9 +3303,9 @@ discard block |
||
| 3304 | 3303 | ); |
| 3305 | 3304 | $rows2 = DB::query( |
| 3306 | 3305 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3307 | - FROM ' . prefixTable('users') . ' |
|
| 3306 | + FROM ' . prefixTable('users').' |
|
| 3308 | 3307 | WHERE fonction_id LIKE %s', |
| 3309 | - '%' . $record['role_id'] . '%' |
|
| 3308 | + '%'.$record['role_id'].'%' |
|
| 3310 | 3309 | ); |
| 3311 | 3310 | foreach ($rows2 as $record2) { |
| 3312 | 3311 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3319,7 +3318,7 @@ discard block |
||
| 3319 | 3318 | array( |
| 3320 | 3319 | 'id' => (int) $record2['id'], |
| 3321 | 3320 | 'login' => $record2['login'], |
| 3322 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3321 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3323 | 3322 | 'email' => $record2['email'], |
| 3324 | 3323 | ) |
| 3325 | 3324 | ); |
@@ -3338,16 +3337,16 @@ discard block |
||
| 3338 | 3337 | $path = ''; |
| 3339 | 3338 | foreach ($arbo as $elem) { |
| 3340 | 3339 | if (empty($path) === true) { |
| 3341 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3340 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3342 | 3341 | } else { |
| 3343 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3342 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3344 | 3343 | } |
| 3345 | 3344 | } |
| 3346 | 3345 | // Build text to show user |
| 3347 | 3346 | if (empty($path) === true) { |
| 3348 | 3347 | $path = addslashes($dataItem['label']); |
| 3349 | 3348 | } else { |
| 3350 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3349 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3351 | 3350 | } |
| 3352 | 3351 | |
| 3353 | 3352 | // Add Admins to notification list if expected |
@@ -3370,7 +3369,7 @@ discard block |
||
| 3370 | 3369 | array( |
| 3371 | 3370 | addslashes($session->get('user-login')), |
| 3372 | 3371 | $path, |
| 3373 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3372 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3374 | 3373 | ), |
| 3375 | 3374 | $lang->get('email_on_open_notification_mail') |
| 3376 | 3375 | ), |
@@ -3380,7 +3379,7 @@ discard block |
||
| 3380 | 3379 | } |
| 3381 | 3380 | |
| 3382 | 3381 | // has this item a change proposal |
| 3383 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3382 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3384 | 3383 | $returnArray['has_change_proposal'] = DB::count(); |
| 3385 | 3384 | |
| 3386 | 3385 | // Setting |
@@ -3391,7 +3390,7 @@ discard block |
||
| 3391 | 3390 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3392 | 3391 | DB::query( |
| 3393 | 3392 | 'SELECT * |
| 3394 | - FROM ' . prefixTable('otv') . ' |
|
| 3393 | + FROM ' . prefixTable('otv').' |
|
| 3395 | 3394 | WHERE item_id = %i |
| 3396 | 3395 | AND time_limit > %i', |
| 3397 | 3396 | $inputData['id'], |
@@ -3491,7 +3490,7 @@ discard block |
||
| 3491 | 3490 | // Load item data |
| 3492 | 3491 | $data = DB::queryFirstRow( |
| 3493 | 3492 | 'SELECT id_tree, id, label |
| 3494 | - FROM ' . prefixTable('items') . ' |
|
| 3493 | + FROM ' . prefixTable('items').' |
|
| 3495 | 3494 | WHERE id = %i OR item_key = %s', |
| 3496 | 3495 | $inputData['itemId'], |
| 3497 | 3496 | $inputData['itemKey'] |
@@ -3582,7 +3581,7 @@ discard block |
||
| 3582 | 3581 | // Load item data |
| 3583 | 3582 | $dataItem = DB::queryFirstRow( |
| 3584 | 3583 | 'SELECT secret, enabled |
| 3585 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3584 | + FROM ' . prefixTable('items_otp').' |
|
| 3586 | 3585 | WHERE item_id = %i', |
| 3587 | 3586 | $inputData['id'] |
| 3588 | 3587 | ); |
@@ -3664,13 +3663,13 @@ discard block |
||
| 3664 | 3663 | |
| 3665 | 3664 | // Check if user is allowed to access this folder |
| 3666 | 3665 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3667 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3666 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3668 | 3667 | break; |
| 3669 | 3668 | } |
| 3670 | 3669 | |
| 3671 | 3670 | // Check if title doesn't contains html codes |
| 3672 | 3671 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3673 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3672 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3674 | 3673 | break; |
| 3675 | 3674 | } |
| 3676 | 3675 | // check that title is not numeric |
@@ -3681,9 +3680,9 @@ discard block |
||
| 3681 | 3680 | |
| 3682 | 3681 | // Check if duplicate folders name are allowed |
| 3683 | 3682 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3684 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3683 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3685 | 3684 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3686 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3685 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3687 | 3686 | break; |
| 3688 | 3687 | } |
| 3689 | 3688 | } |
@@ -3691,7 +3690,7 @@ discard block |
||
| 3691 | 3690 | // query on folder |
| 3692 | 3691 | $data = DB::queryfirstrow( |
| 3693 | 3692 | 'SELECT parent_id, personal_folder |
| 3694 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3693 | + FROM ' . prefixTable('nested_tree').' |
|
| 3695 | 3694 | WHERE id = %i', |
| 3696 | 3695 | $inputData['folderId'] |
| 3697 | 3696 | ); |
@@ -3701,20 +3700,20 @@ discard block |
||
| 3701 | 3700 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3702 | 3701 | $data = DB::queryfirstrow( |
| 3703 | 3702 | 'SELECT valeur |
| 3704 | - FROM ' . prefixTable('misc') . ' |
|
| 3703 | + FROM ' . prefixTable('misc').' |
|
| 3705 | 3704 | WHERE intitule = %i AND type = %s', |
| 3706 | 3705 | $data['parent_id'], |
| 3707 | 3706 | 'complex' |
| 3708 | 3707 | ); |
| 3709 | 3708 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3710 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3709 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3711 | 3710 | break; |
| 3712 | 3711 | } |
| 3713 | 3712 | } |
| 3714 | 3713 | |
| 3715 | 3714 | // update Folders table |
| 3716 | 3715 | $tmp = DB::queryFirstRow( |
| 3717 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3716 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3718 | 3717 | $dataReceived['folder'] |
| 3719 | 3718 | ); |
| 3720 | 3719 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3828,7 +3827,7 @@ discard block |
||
| 3828 | 3827 | $uniqueLoadData['path'] = $arr_arbo; |
| 3829 | 3828 | |
| 3830 | 3829 | // store last folder accessed in cookie |
| 3831 | - $arr_cookie_options = array ( |
|
| 3830 | + $arr_cookie_options = array( |
|
| 3832 | 3831 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3833 | 3832 | 'path' => '/', |
| 3834 | 3833 | 'secure' => true, |
@@ -3843,7 +3842,7 @@ discard block |
||
| 3843 | 3842 | foreach ($session->get('user-roles_array') as $role) { |
| 3844 | 3843 | $roleQ = DB::queryfirstrow( |
| 3845 | 3844 | 'SELECT allow_pw_change |
| 3846 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3845 | + FROM ' . prefixTable('roles_title').' |
|
| 3847 | 3846 | WHERE id = %i', |
| 3848 | 3847 | $role |
| 3849 | 3848 | ); |
@@ -3874,11 +3873,11 @@ discard block |
||
| 3874 | 3873 | |
| 3875 | 3874 | foreach ($session->get('user-roles_array') as $role) { |
| 3876 | 3875 | $access = DB::queryFirstRow( |
| 3877 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3876 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3878 | 3877 | $role, |
| 3879 | 3878 | $inputData['id'] |
| 3880 | 3879 | ); |
| 3881 | - if (DB::count()>0) { |
|
| 3880 | + if (DB::count() > 0) { |
|
| 3882 | 3881 | if ($access['type'] === 'R') { |
| 3883 | 3882 | array_push($arrTmp, 10); |
| 3884 | 3883 | } elseif ($access['type'] === 'W') { |
@@ -3943,7 +3942,7 @@ discard block |
||
| 3943 | 3942 | } else { |
| 3944 | 3943 | DB::query( |
| 3945 | 3944 | 'SELECT * |
| 3946 | - FROM ' . prefixTable('items') . ' |
|
| 3945 | + FROM ' . prefixTable('items').' |
|
| 3947 | 3946 | WHERE inactif = %i', |
| 3948 | 3947 | 0 |
| 3949 | 3948 | ); |
@@ -3953,7 +3952,7 @@ discard block |
||
| 3953 | 3952 | |
| 3954 | 3953 | // Get folder complexity |
| 3955 | 3954 | $folderComplexity = DB::queryFirstRow( |
| 3956 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3955 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3957 | 3956 | 'complex', |
| 3958 | 3957 | $inputData['id'] |
| 3959 | 3958 | ); |
@@ -3965,7 +3964,7 @@ discard block |
||
| 3965 | 3964 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 3966 | 3965 | $folderRow = DB::query( |
| 3967 | 3966 | 'SELECT id_category |
| 3968 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3967 | + FROM ' . prefixTable('categories_folders').' |
|
| 3969 | 3968 | WHERE id_folder = %i', |
| 3970 | 3969 | $inputData['id'] |
| 3971 | 3970 | ); |
@@ -4080,9 +4079,9 @@ discard block |
||
| 4080 | 4079 | // List all ITEMS |
| 4081 | 4080 | if ($folderIsPf === false) { |
| 4082 | 4081 | $where->add('i.inactif=%i', 0); |
| 4083 | - $sql_e='(SELECT date FROM ' . prefixTable('log_items') |
|
| 4082 | + $sql_e = '(SELECT date FROM '.prefixTable('log_items') |
|
| 4084 | 4083 | . " WHERE action = 'at_creation' AND id_item=i.id " |
| 4085 | - . 'union all SELECT date FROM '. prefixTable('log_items') |
|
| 4084 | + . 'union all SELECT date FROM '.prefixTable('log_items') |
|
| 4086 | 4085 | . " WHERE action = 'at_modification' AND raison = 'at_pw' |
| 4087 | 4086 | AND id_item=i.id ORDER BY date DESC LIMIT 1)"; |
| 4088 | 4087 | $where->add('l.date=%l', $sql_e); |
@@ -4090,8 +4089,8 @@ discard block |
||
| 4090 | 4089 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 4091 | 4090 | } |
| 4092 | 4091 | |
| 4093 | - $query_limit = ' LIMIT ' . |
|
| 4094 | - $start . ',' . |
|
| 4092 | + $query_limit = ' LIMIT '. |
|
| 4093 | + $start.','. |
|
| 4095 | 4094 | $post_nb_items_to_display_once; |
| 4096 | 4095 | //db::debugmode(true); |
| 4097 | 4096 | $rows = DB::query( |
@@ -4103,9 +4102,9 @@ discard block |
||
| 4103 | 4102 | l.id_user AS log_user, |
| 4104 | 4103 | i.url AS link, |
| 4105 | 4104 | i.email AS email |
| 4106 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4107 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4108 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4105 | + FROM ' . prefixTable('items').' AS i |
|
| 4106 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4107 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4109 | 4108 | WHERE %l |
| 4110 | 4109 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4111 | 4110 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -4125,9 +4124,9 @@ discard block |
||
| 4125 | 4124 | l.id_user AS log_user, |
| 4126 | 4125 | i.url AS link, |
| 4127 | 4126 | i.email AS email |
| 4128 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4129 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4130 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 4127 | + FROM ' . prefixTable('items').' AS i |
|
| 4128 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4129 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 4131 | 4130 | WHERE %l |
| 4132 | 4131 | GROUP BY i.id, l.date, l.id_user, l.action |
| 4133 | 4132 | ORDER BY i.label ASC, l.date DESC', |
@@ -4158,7 +4157,7 @@ discard block |
||
| 4158 | 4157 | $item_is_restricted_to_role = false; |
| 4159 | 4158 | DB::queryfirstrow( |
| 4160 | 4159 | 'SELECT role_id |
| 4161 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4160 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4162 | 4161 | WHERE item_id = %i', |
| 4163 | 4162 | $record['id'] |
| 4164 | 4163 | ); |
@@ -4170,7 +4169,7 @@ discard block |
||
| 4170 | 4169 | $user_is_included_in_role = false; |
| 4171 | 4170 | DB::query( |
| 4172 | 4171 | 'SELECT role_id |
| 4173 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4172 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4174 | 4173 | WHERE item_id = %i AND role_id IN %ls', |
| 4175 | 4174 | $record['id'], |
| 4176 | 4175 | $session->get('user-roles_array') |
@@ -4377,9 +4376,9 @@ discard block |
||
| 4377 | 4376 | if ((int) $start === 0) { |
| 4378 | 4377 | DB::query( |
| 4379 | 4378 | 'SELECT i.id |
| 4380 | - FROM ' . prefixTable('items') . ' as i |
|
| 4381 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4382 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 4379 | + FROM ' . prefixTable('items').' as i |
|
| 4380 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4381 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 4383 | 4382 | WHERE %l |
| 4384 | 4383 | ORDER BY i.label ASC, l.date DESC', |
| 4385 | 4384 | $where |
@@ -4443,8 +4442,8 @@ discard block |
||
| 4443 | 4442 | // Run query |
| 4444 | 4443 | $dataItem = DB::queryfirstrow( |
| 4445 | 4444 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4446 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4447 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4445 | + FROM ' . prefixTable('items').' AS i |
|
| 4446 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4448 | 4447 | WHERE user_id = %i AND i.item_key = %s', |
| 4449 | 4448 | $session->get('user-id'), |
| 4450 | 4449 | $inputData['itemKey'] |
@@ -4495,7 +4494,7 @@ discard block |
||
| 4495 | 4494 | // get if existing edition lock |
| 4496 | 4495 | $dataItemEditionLocks = DB::query( |
| 4497 | 4496 | 'SELECT timestamp, user_id |
| 4498 | - FROM ' . prefixTable('items_edition') . ' |
|
| 4497 | + FROM ' . prefixTable('items_edition').' |
|
| 4499 | 4498 | WHERE item_id = %i |
| 4500 | 4499 | ORDER BY increment_id DESC', |
| 4501 | 4500 | $inputData['itemId'] |
@@ -4504,7 +4503,7 @@ discard block |
||
| 4504 | 4503 | if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
| 4505 | 4504 | |
| 4506 | 4505 | // Check if item has no edition lock |
| 4507 | - if ((int) DB::count() > 0 ) { |
|
| 4506 | + if ((int) DB::count() > 0) { |
|
| 4508 | 4507 | // get last edition lock |
| 4509 | 4508 | $dataLastItemEditionLock = $dataItemEditionLocks[0]; |
| 4510 | 4509 | |
@@ -4514,10 +4513,10 @@ discard block |
||
| 4514 | 4513 | } else { |
| 4515 | 4514 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4516 | 4515 | } |
| 4517 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4516 | + if (WIP === true) error_log('delay: '.$delay); |
|
| 4518 | 4517 | |
| 4519 | 4518 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4520 | - if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
|
| 4519 | + if (round(abs(time() - $dataTmp['timestamp']), 0) > $delay) { |
|
| 4521 | 4520 | // Case where time is expired |
| 4522 | 4521 | // In this case, delete edition lock and possible ongoing processes |
| 4523 | 4522 | // and continue editing this time |
@@ -4534,7 +4533,7 @@ discard block |
||
| 4534 | 4533 | // Get process Id |
| 4535 | 4534 | $processDetail = DB::queryFirstRow( |
| 4536 | 4535 | 'SELECT increment_id |
| 4537 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4536 | + FROM ' . prefixTable('background_tasks').' |
|
| 4538 | 4537 | WHERE item_id = %i AND finished_at = ""', |
| 4539 | 4538 | $inputData['itemId'] |
| 4540 | 4539 | ); |
@@ -4552,7 +4551,7 @@ discard block |
||
| 4552 | 4551 | // get if existing process ongoing for this item |
| 4553 | 4552 | $dataItemProcessOngoing = DB::queryFirstRow( |
| 4554 | 4553 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 4555 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 4554 | + FROM ' . prefixTable('background_tasks').' |
|
| 4556 | 4555 | WHERE item_id = %i AND finished_at = "" |
| 4557 | 4556 | ORDER BY increment_id DESC', |
| 4558 | 4557 | $inputData['itemId'] |
@@ -4579,7 +4578,7 @@ discard block |
||
| 4579 | 4578 | ); |
| 4580 | 4579 | break; |
| 4581 | 4580 | } |
| 4582 | - } elseif (round(abs(time() - $dataTmp['timestamp']),0) <= $delay) { |
|
| 4581 | + } elseif (round(abs(time() - $dataTmp['timestamp']), 0) <= $delay) { |
|
| 4583 | 4582 | // Case where edition lock is already taken by another user |
| 4584 | 4583 | // Then no edition is possible |
| 4585 | 4584 | $returnValues = array( |
@@ -4608,7 +4607,7 @@ discard block |
||
| 4608 | 4607 | // do query on this folder |
| 4609 | 4608 | $data_this_folder = DB::queryFirstRow( |
| 4610 | 4609 | 'SELECT id, personal_folder, title |
| 4611 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4610 | + FROM ' . prefixTable('nested_tree').' |
|
| 4612 | 4611 | WHERE id = %s', |
| 4613 | 4612 | $inputData['folderId'] |
| 4614 | 4613 | ); |
@@ -4648,8 +4647,8 @@ discard block |
||
| 4648 | 4647 | $visibilite = ''; |
| 4649 | 4648 | $data = DB::queryFirstRow( |
| 4650 | 4649 | 'SELECT m.valeur, n.personal_folder |
| 4651 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4652 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4650 | + FROM ' . prefixTable('misc').' AS m |
|
| 4651 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4653 | 4652 | WHERE type=%s AND intitule = %s', |
| 4654 | 4653 | 'complex', |
| 4655 | 4654 | $inputData['folderId'] |
@@ -4662,8 +4661,8 @@ discard block |
||
| 4662 | 4661 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4663 | 4662 | $rows = DB::query( |
| 4664 | 4663 | 'SELECT t.title |
| 4665 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4666 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4664 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4665 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4667 | 4666 | WHERE v.folder_id = %i |
| 4668 | 4667 | GROUP BY title', |
| 4669 | 4668 | $inputData['folderId'] |
@@ -4672,7 +4671,7 @@ discard block |
||
| 4672 | 4671 | if (empty($visibilite)) { |
| 4673 | 4672 | $visibilite = $record['title']; |
| 4674 | 4673 | } else { |
| 4675 | - $visibilite .= ' - ' . $record['title']; |
|
| 4674 | + $visibilite .= ' - '.$record['title']; |
|
| 4676 | 4675 | } |
| 4677 | 4676 | } |
| 4678 | 4677 | } else { |
@@ -4682,14 +4681,14 @@ discard block |
||
| 4682 | 4681 | // do new query to know if current folder is pf |
| 4683 | 4682 | $data_pf = DB::queryFirstRow( |
| 4684 | 4683 | 'SELECT personal_folder |
| 4685 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4684 | + FROM ' . prefixTable('nested_tree').' |
|
| 4686 | 4685 | WHERE id = %s', |
| 4687 | 4686 | $inputData['folderId'] |
| 4688 | 4687 | ); |
| 4689 | 4688 | |
| 4690 | 4689 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4691 | 4690 | |
| 4692 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4691 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4693 | 4692 | } |
| 4694 | 4693 | |
| 4695 | 4694 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4699,8 +4698,8 @@ discard block |
||
| 4699 | 4698 | $listOptionsForRoles = array(); |
| 4700 | 4699 | $rows = DB::query( |
| 4701 | 4700 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4702 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4703 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4701 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4702 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4704 | 4703 | WHERE r.folder_id = %i', |
| 4705 | 4704 | $inputData['folderId'] |
| 4706 | 4705 | ); |
@@ -4714,7 +4713,7 @@ discard block |
||
| 4714 | 4713 | ); |
| 4715 | 4714 | $rows2 = DB::query( |
| 4716 | 4715 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4717 | - FROM ' . prefixTable('users') . ' |
|
| 4716 | + FROM ' . prefixTable('users').' |
|
| 4718 | 4717 | WHERE admin = 0 AND fonction_id is not null' |
| 4719 | 4718 | ); |
| 4720 | 4719 | foreach ($rows2 as $record2) { |
@@ -4728,7 +4727,7 @@ discard block |
||
| 4728 | 4727 | array( |
| 4729 | 4728 | 'id' => $record2['id'], |
| 4730 | 4729 | 'login' => $record2['login'], |
| 4731 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4730 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4732 | 4731 | 'email' => $record2['email'], |
| 4733 | 4732 | ) |
| 4734 | 4733 | ); |
@@ -4745,13 +4744,13 @@ discard block |
||
| 4745 | 4744 | //db::debugmode(true); |
| 4746 | 4745 | $access = DB::queryFirstRow( |
| 4747 | 4746 | 'SELECT type |
| 4748 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4747 | + FROM ' . prefixTable('roles_values').' |
|
| 4749 | 4748 | WHERE role_id = %i AND folder_id = %i', |
| 4750 | 4749 | $role, |
| 4751 | 4750 | $inputData['folderId'] |
| 4752 | 4751 | ); |
| 4753 | 4752 | //db::debugmode(false); |
| 4754 | - if (DB::count()>0) { |
|
| 4753 | + if (DB::count() > 0) { |
|
| 4755 | 4754 | if ($access['type'] === 'R') { |
| 4756 | 4755 | array_push($arrTmp, 10); |
| 4757 | 4756 | } elseif ($access['type'] === 'W') { |
@@ -4779,7 +4778,7 @@ discard block |
||
| 4779 | 4778 | // Check if personal folder is owned by user |
| 4780 | 4779 | $folder_title = DB::queryFirstRow( |
| 4781 | 4780 | 'SELECT title |
| 4782 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4781 | + FROM ' . prefixTable('nested_tree').' |
|
| 4783 | 4782 | WHERE id = %s AND title = %s', |
| 4784 | 4783 | $inputData['folderId'], |
| 4785 | 4784 | $session->get('user-id'), |
@@ -4878,7 +4877,7 @@ discard block |
||
| 4878 | 4877 | // Get some info before deleting |
| 4879 | 4878 | $data = DB::queryFirstRow( |
| 4880 | 4879 | 'SELECT name, id_item, file |
| 4881 | - FROM ' . prefixTable('files') . ' |
|
| 4880 | + FROM ' . prefixTable('files').' |
|
| 4882 | 4881 | WHERE id = %i', |
| 4883 | 4882 | $fileId |
| 4884 | 4883 | ); |
@@ -4886,7 +4885,7 @@ discard block |
||
| 4886 | 4885 | // Load item data |
| 4887 | 4886 | $data_item = DB::queryFirstRow( |
| 4888 | 4887 | 'SELECT id_tree |
| 4889 | - FROM ' . prefixTable('items') . ' |
|
| 4888 | + FROM ' . prefixTable('items').' |
|
| 4890 | 4889 | WHERE id = %i', |
| 4891 | 4890 | $data['id_item'] |
| 4892 | 4891 | ); |
@@ -4916,7 +4915,7 @@ discard block |
||
| 4916 | 4915 | $session->get('user-id'), |
| 4917 | 4916 | 'at_modification', |
| 4918 | 4917 | $session->get('user-login'), |
| 4919 | - 'at_del_file : ' . $data['name'] |
|
| 4918 | + 'at_del_file : '.$data['name'] |
|
| 4920 | 4919 | ); |
| 4921 | 4920 | |
| 4922 | 4921 | // DElete sharekeys |
@@ -4927,7 +4926,7 @@ discard block |
||
| 4927 | 4926 | ); |
| 4928 | 4927 | |
| 4929 | 4928 | // Delete file from server |
| 4930 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 4929 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 4931 | 4930 | $fileToDelete = realpath($fileToDelete); |
| 4932 | 4931 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 4933 | 4932 | fileDelete($fileToDelete, $SETTINGS); |
@@ -4981,7 +4980,7 @@ discard block |
||
| 4981 | 4980 | // Update SESSION with this new favourite |
| 4982 | 4981 | $data = DB::queryfirstrow( |
| 4983 | 4982 | 'SELECT label,id_tree |
| 4984 | - FROM ' . prefixTable('items') . ' |
|
| 4983 | + FROM ' . prefixTable('items').' |
|
| 4985 | 4984 | WHERE id = %i', |
| 4986 | 4985 | $inputData['itemId'] |
| 4987 | 4986 | ); |
@@ -4990,7 +4989,7 @@ discard block |
||
| 4990 | 4989 | [ |
| 4991 | 4990 | $inputData['itemId'] => [ |
| 4992 | 4991 | 'label' => $data['label'], |
| 4993 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 4992 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 4994 | 4993 | ], |
| 4995 | 4994 | ], |
| 4996 | 4995 | 'add' |
@@ -5059,8 +5058,8 @@ discard block |
||
| 5059 | 5058 | // get data about item |
| 5060 | 5059 | $dataSource = DB::queryfirstrow( |
| 5061 | 5060 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5062 | - FROM ' . prefixTable('items') . ' as i |
|
| 5063 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5061 | + FROM ' . prefixTable('items').' as i |
|
| 5062 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5064 | 5063 | WHERE i.id=%i', |
| 5065 | 5064 | $inputData['itemId'] |
| 5066 | 5065 | ); |
@@ -5104,7 +5103,7 @@ discard block |
||
| 5104 | 5103 | // get data about new folder |
| 5105 | 5104 | $dataDestination = DB::queryfirstrow( |
| 5106 | 5105 | 'SELECT personal_folder, title |
| 5107 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5106 | + FROM ' . prefixTable('nested_tree').' |
|
| 5108 | 5107 | WHERE id = %i', |
| 5109 | 5108 | $inputData['folderId'] |
| 5110 | 5109 | ); |
@@ -5157,7 +5156,7 @@ discard block |
||
| 5157 | 5156 | // Get fields for this Item |
| 5158 | 5157 | $rows = DB::query( |
| 5159 | 5158 | 'SELECT id |
| 5160 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5159 | + FROM ' . prefixTable('categories_items').' |
|
| 5161 | 5160 | WHERE item_id = %i', |
| 5162 | 5161 | $inputData['itemId'] |
| 5163 | 5162 | ); |
@@ -5174,7 +5173,7 @@ discard block |
||
| 5174 | 5173 | // Get FILES for this Item |
| 5175 | 5174 | $rows = DB::query( |
| 5176 | 5175 | 'SELECT id |
| 5177 | - FROM ' . prefixTable('files') . ' |
|
| 5176 | + FROM ' . prefixTable('files').' |
|
| 5178 | 5177 | WHERE id_item = %i', |
| 5179 | 5178 | $inputData['itemId'] |
| 5180 | 5179 | ); |
@@ -5221,7 +5220,7 @@ discard block |
||
| 5221 | 5220 | // Get the ITEM object key for the user |
| 5222 | 5221 | $userKey = DB::queryFirstRow( |
| 5223 | 5222 | 'SELECT share_key |
| 5224 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5223 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5225 | 5224 | WHERE user_id = %i AND object_id = %i', |
| 5226 | 5225 | $session->get('user-id'), |
| 5227 | 5226 | $inputData['itemId'] |
@@ -5232,8 +5231,8 @@ discard block |
||
| 5232 | 5231 | // This is a public object |
| 5233 | 5232 | $users = DB::query( |
| 5234 | 5233 | 'SELECT id, public_key |
| 5235 | - FROM ' . prefixTable('users') . ' |
|
| 5236 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5234 | + FROM ' . prefixTable('users').' |
|
| 5235 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5237 | 5236 | AND public_key != ""' |
| 5238 | 5237 | ); |
| 5239 | 5238 | foreach ($users as $user) { |
@@ -5253,14 +5252,14 @@ discard block |
||
| 5253 | 5252 | // Get fields for this Item |
| 5254 | 5253 | $rows = DB::query( |
| 5255 | 5254 | 'SELECT id |
| 5256 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5255 | + FROM ' . prefixTable('categories_items').' |
|
| 5257 | 5256 | WHERE item_id = %i', |
| 5258 | 5257 | $inputData['itemId'] |
| 5259 | 5258 | ); |
| 5260 | 5259 | foreach ($rows as $field) { |
| 5261 | 5260 | $userKey = DB::queryFirstRow( |
| 5262 | 5261 | 'SELECT share_key |
| 5263 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5262 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5264 | 5263 | WHERE user_id = %i AND object_id = %i', |
| 5265 | 5264 | $session->get('user-id'), |
| 5266 | 5265 | $field['id'] |
@@ -5271,8 +5270,8 @@ discard block |
||
| 5271 | 5270 | // This is a public object |
| 5272 | 5271 | $users = DB::query( |
| 5273 | 5272 | 'SELECT id, public_key |
| 5274 | - FROM ' . prefixTable('users') . ' |
|
| 5275 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5273 | + FROM ' . prefixTable('users').' |
|
| 5274 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5276 | 5275 | AND public_key != ""' |
| 5277 | 5276 | ); |
| 5278 | 5277 | foreach ($users as $user) { |
@@ -5293,14 +5292,14 @@ discard block |
||
| 5293 | 5292 | // Get FILES for this Item |
| 5294 | 5293 | $rows = DB::query( |
| 5295 | 5294 | 'SELECT id |
| 5296 | - FROM ' . prefixTable('files') . ' |
|
| 5295 | + FROM ' . prefixTable('files').' |
|
| 5297 | 5296 | WHERE id_item = %i', |
| 5298 | 5297 | $inputData['itemId'] |
| 5299 | 5298 | ); |
| 5300 | 5299 | foreach ($rows as $attachment) { |
| 5301 | 5300 | $userKey = DB::queryFirstRow( |
| 5302 | 5301 | 'SELECT share_key |
| 5303 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5302 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5304 | 5303 | WHERE user_id = %i AND object_id = %i', |
| 5305 | 5304 | $session->get('user-id'), |
| 5306 | 5305 | $attachment['id'] |
@@ -5311,8 +5310,8 @@ discard block |
||
| 5311 | 5310 | // This is a public object |
| 5312 | 5311 | $users = DB::query( |
| 5313 | 5312 | 'SELECT id, public_key |
| 5314 | - FROM ' . prefixTable('users') . ' |
|
| 5315 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5313 | + FROM ' . prefixTable('users').' |
|
| 5314 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5316 | 5315 | AND public_key != ""' |
| 5317 | 5316 | ); |
| 5318 | 5317 | foreach ($users as $user) { |
@@ -5350,7 +5349,7 @@ discard block |
||
| 5350 | 5349 | $session->get('user-id'), |
| 5351 | 5350 | 'at_modification', |
| 5352 | 5351 | $session->get('user-login'), |
| 5353 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5352 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5354 | 5353 | ); |
| 5355 | 5354 | |
| 5356 | 5355 | // Update cache table |
@@ -5409,8 +5408,8 @@ discard block |
||
| 5409 | 5408 | // get data about item |
| 5410 | 5409 | $dataSource = DB::queryfirstrow( |
| 5411 | 5410 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5412 | - FROM ' . prefixTable('items') . ' as i |
|
| 5413 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5411 | + FROM ' . prefixTable('items').' as i |
|
| 5412 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5414 | 5413 | WHERE i.id=%i', |
| 5415 | 5414 | $item_id |
| 5416 | 5415 | ); |
@@ -5432,7 +5431,7 @@ discard block |
||
| 5432 | 5431 | |
| 5433 | 5432 | // get data about new folder |
| 5434 | 5433 | $dataDestination = DB::queryfirstrow( |
| 5435 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5434 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5436 | 5435 | $inputData['folderId'] |
| 5437 | 5436 | ); |
| 5438 | 5437 | |
@@ -5474,7 +5473,7 @@ discard block |
||
| 5474 | 5473 | // Get fields for this Item |
| 5475 | 5474 | $rows = DB::query( |
| 5476 | 5475 | 'SELECT id |
| 5477 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5476 | + FROM ' . prefixTable('categories_items').' |
|
| 5478 | 5477 | WHERE item_id = %i', |
| 5479 | 5478 | $item_id |
| 5480 | 5479 | ); |
@@ -5491,7 +5490,7 @@ discard block |
||
| 5491 | 5490 | // Get FILES for this Item |
| 5492 | 5491 | $rows = DB::query( |
| 5493 | 5492 | 'SELECT id |
| 5494 | - FROM ' . prefixTable('files') . ' |
|
| 5493 | + FROM ' . prefixTable('files').' |
|
| 5495 | 5494 | WHERE id_item = %i', |
| 5496 | 5495 | $item_id |
| 5497 | 5496 | ); |
@@ -5546,7 +5545,7 @@ discard block |
||
| 5546 | 5545 | // Get the ITEM object key for the user |
| 5547 | 5546 | $userKey = DB::queryFirstRow( |
| 5548 | 5547 | 'SELECT share_key |
| 5549 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5548 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5550 | 5549 | WHERE user_id = %i AND object_id = %i', |
| 5551 | 5550 | $session->get('user-id'), |
| 5552 | 5551 | $item_id |
@@ -5557,8 +5556,8 @@ discard block |
||
| 5557 | 5556 | // This is a public object |
| 5558 | 5557 | $users = DB::query( |
| 5559 | 5558 | 'SELECT id, public_key |
| 5560 | - FROM ' . prefixTable('users') . ' |
|
| 5561 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5559 | + FROM ' . prefixTable('users').' |
|
| 5560 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5562 | 5561 | AND public_key != ""' |
| 5563 | 5562 | ); |
| 5564 | 5563 | foreach ($users as $user) { |
@@ -5578,14 +5577,14 @@ discard block |
||
| 5578 | 5577 | // Get fields for this Item |
| 5579 | 5578 | $rows = DB::query( |
| 5580 | 5579 | 'SELECT id |
| 5581 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5580 | + FROM ' . prefixTable('categories_items').' |
|
| 5582 | 5581 | WHERE item_id = %i', |
| 5583 | 5582 | $item_id |
| 5584 | 5583 | ); |
| 5585 | 5584 | foreach ($rows as $field) { |
| 5586 | 5585 | $userKey = DB::queryFirstRow( |
| 5587 | 5586 | 'SELECT share_key |
| 5588 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5587 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5589 | 5588 | WHERE user_id = %i AND object_id = %i', |
| 5590 | 5589 | $session->get('user-id'), |
| 5591 | 5590 | $field['id'] |
@@ -5596,8 +5595,8 @@ discard block |
||
| 5596 | 5595 | // This is a public object |
| 5597 | 5596 | $users = DB::query( |
| 5598 | 5597 | 'SELECT id, public_key |
| 5599 | - FROM ' . prefixTable('users') . ' |
|
| 5600 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5598 | + FROM ' . prefixTable('users').' |
|
| 5599 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5601 | 5600 | AND public_key != ""' |
| 5602 | 5601 | ); |
| 5603 | 5602 | foreach ($users as $user) { |
@@ -5618,14 +5617,14 @@ discard block |
||
| 5618 | 5617 | // Get FILES for this Item |
| 5619 | 5618 | $rows = DB::query( |
| 5620 | 5619 | 'SELECT id |
| 5621 | - FROM ' . prefixTable('files') . ' |
|
| 5620 | + FROM ' . prefixTable('files').' |
|
| 5622 | 5621 | WHERE id_item = %i', |
| 5623 | 5622 | $item_id |
| 5624 | 5623 | ); |
| 5625 | 5624 | foreach ($rows as $attachment) { |
| 5626 | 5625 | $userKey = DB::queryFirstRow( |
| 5627 | 5626 | 'SELECT share_key |
| 5628 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5627 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5629 | 5628 | WHERE user_id = %i AND object_id = %i', |
| 5630 | 5629 | $session->get('user-id'), |
| 5631 | 5630 | $attachment['id'] |
@@ -5636,8 +5635,8 @@ discard block |
||
| 5636 | 5635 | // This is a public object |
| 5637 | 5636 | $users = DB::query( |
| 5638 | 5637 | 'SELECT id, public_key |
| 5639 | - FROM ' . prefixTable('users') . ' |
|
| 5640 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $session->get('user-id') . '") |
|
| 5638 | + FROM ' . prefixTable('users').' |
|
| 5639 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$session->get('user-id').'") |
|
| 5641 | 5640 | AND public_key != ""' |
| 5642 | 5641 | ); |
| 5643 | 5642 | foreach ($users as $user) { |
@@ -5674,13 +5673,13 @@ discard block |
||
| 5674 | 5673 | $session->get('user-id'), |
| 5675 | 5674 | 'at_modification', |
| 5676 | 5675 | $session->get('user-login'), |
| 5677 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5676 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5678 | 5677 | ); |
| 5679 | 5678 | } |
| 5680 | 5679 | } |
| 5681 | 5680 | |
| 5682 | 5681 | // reload cache table |
| 5683 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5682 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5684 | 5683 | updateCacheTable('reload', null); |
| 5685 | 5684 | |
| 5686 | 5685 | echo (string) prepareExchangedData( |
@@ -5744,7 +5743,7 @@ discard block |
||
| 5744 | 5743 | // get info |
| 5745 | 5744 | $dataSource = DB::queryfirstrow( |
| 5746 | 5745 | 'SELECT label, id_tree |
| 5747 | - FROM ' . prefixTable('items') . ' |
|
| 5746 | + FROM ' . prefixTable('items').' |
|
| 5748 | 5747 | WHERE id=%i', |
| 5749 | 5748 | $item_id |
| 5750 | 5749 | ); |
@@ -5843,8 +5842,8 @@ discard block |
||
| 5843 | 5842 | } |
| 5844 | 5843 | if ($inputData['cat'] === 'request_access_to_author') { |
| 5845 | 5844 | // Variables |
| 5846 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
| 5847 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
| 5845 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
| 5846 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
| 5848 | 5847 | |
| 5849 | 5848 | // Get path |
| 5850 | 5849 | $path = geItemReadablePath( |
@@ -5858,7 +5857,7 @@ discard block |
||
| 5858 | 5857 | $lang->get('email_request_access_subject'), |
| 5859 | 5858 | str_replace( |
| 5860 | 5859 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5861 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5860 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5862 | 5861 | $lang->get('email_request_access_mail') |
| 5863 | 5862 | ), |
| 5864 | 5863 | $dataAuthor['email'], |
@@ -5867,7 +5866,7 @@ discard block |
||
| 5867 | 5866 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5868 | 5867 | $dataItem = DB::queryfirstrow( |
| 5869 | 5868 | 'SELECT label,id_tree |
| 5870 | - FROM ' . prefixTable('items') . ' |
|
| 5869 | + FROM ' . prefixTable('items').' |
|
| 5871 | 5870 | WHERE id= %i', |
| 5872 | 5871 | $inputData['id'] |
| 5873 | 5872 | ); |
@@ -5890,7 +5889,7 @@ discard block |
||
| 5890 | 5889 | ), |
| 5891 | 5890 | array( |
| 5892 | 5891 | empty($SETTINGS['email_server_url']) === false ? |
| 5893 | - $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'], |
|
| 5892 | + $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'], |
|
| 5894 | 5893 | addslashes($session->get('user-login')), |
| 5895 | 5894 | addslashes($path), |
| 5896 | 5895 | ), |
@@ -5990,8 +5989,8 @@ discard block |
||
| 5990 | 5989 | // Get all informations for this item |
| 5991 | 5990 | $dataItem = DB::queryfirstrow( |
| 5992 | 5991 | 'SELECT * |
| 5993 | - FROM ' . prefixTable('items') . ' as i |
|
| 5994 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5992 | + FROM ' . prefixTable('items').' as i |
|
| 5993 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5995 | 5994 | WHERE i.id=%i AND l.action = %s', |
| 5996 | 5995 | $item_id, |
| 5997 | 5996 | 'at_creation' |
@@ -6020,18 +6019,18 @@ discard block |
||
| 6020 | 6019 | $session->get('user-login'), |
| 6021 | 6020 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 6022 | 6021 | null, |
| 6023 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 6022 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 6024 | 6023 | ); |
| 6025 | 6024 | // Prepare new line |
| 6026 | 6025 | $data = DB::queryfirstrow( |
| 6027 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 6026 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 6028 | 6027 | $item_id |
| 6029 | 6028 | ); |
| 6030 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 6029 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 6031 | 6030 | // send back |
| 6032 | 6031 | $data = array( |
| 6033 | 6032 | 'error' => '', |
| 6034 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 6033 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 6035 | 6034 | ); |
| 6036 | 6035 | echo (string) prepareExchangedData( |
| 6037 | 6036 | $data, |
@@ -6103,7 +6102,7 @@ discard block |
||
| 6103 | 6102 | ); |
| 6104 | 6103 | |
| 6105 | 6104 | // delete all existing old otv codes |
| 6106 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time()); |
|
| 6105 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time()); |
|
| 6107 | 6106 | foreach ($rows as $record) { |
| 6108 | 6107 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 6109 | 6108 | } |
@@ -6125,8 +6124,8 @@ discard block |
||
| 6125 | 6124 | // Should we log a password change? |
| 6126 | 6125 | $itemQ = DB::queryFirstRow( |
| 6127 | 6126 | 'SELECT s.share_key, i.pw |
| 6128 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6129 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6127 | + FROM ' . prefixTable('items').' AS i |
|
| 6128 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6130 | 6129 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6131 | 6130 | $session->get('user-id'), |
| 6132 | 6131 | $dataReceived['id'] |
@@ -6181,7 +6180,7 @@ discard block |
||
| 6181 | 6180 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6182 | 6181 | $SETTINGS['otv_expiration_period'] = 7; |
| 6183 | 6182 | } |
| 6184 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6183 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6185 | 6184 | |
| 6186 | 6185 | echo json_encode( |
| 6187 | 6186 | array( |
@@ -6212,7 +6211,7 @@ discard block |
||
| 6212 | 6211 | // get parameters from original link |
| 6213 | 6212 | $url = $dataReceived['original_link']; |
| 6214 | 6213 | $parts = parse_url($url); |
| 6215 | - if(isset($parts['query'])){ |
|
| 6214 | + if (isset($parts['query'])) { |
|
| 6216 | 6215 | parse_str($parts['query'], $orignal_link_parameters); |
| 6217 | 6216 | } else { |
| 6218 | 6217 | $orignal_link_parameters = array(); |
@@ -6243,13 +6242,13 @@ discard block |
||
| 6243 | 6242 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6244 | 6243 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6245 | 6244 | if (str_contains($domain_host, 'www.') === true) { |
| 6246 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6245 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6247 | 6246 | } else { |
| 6248 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6247 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6249 | 6248 | } |
| 6250 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6249 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6251 | 6250 | } else { |
| 6252 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6251 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6253 | 6252 | } |
| 6254 | 6253 | |
| 6255 | 6254 | echo (string) prepareExchangedData( |
@@ -6284,8 +6283,8 @@ discard block |
||
| 6284 | 6283 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6285 | 6284 | f.extension AS extension, f.type AS type, |
| 6286 | 6285 | s.share_key AS share_key |
| 6287 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6288 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6286 | + FROM ' . prefixTable('files').' AS f |
|
| 6287 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6289 | 6288 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6290 | 6289 | $session->get('user-id'), |
| 6291 | 6290 | $inputData['id'] |
@@ -6306,7 +6305,7 @@ discard block |
||
| 6306 | 6305 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6307 | 6306 | |
| 6308 | 6307 | // prepare image info |
| 6309 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6308 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6310 | 6309 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6311 | 6310 | |
| 6312 | 6311 | // Get image content |
@@ -6333,7 +6332,7 @@ discard block |
||
| 6333 | 6332 | echo (string) prepareExchangedData( |
| 6334 | 6333 | array( |
| 6335 | 6334 | 'error' => false, |
| 6336 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6335 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6337 | 6336 | 'file_type' => $file_info['type'], |
| 6338 | 6337 | 'file_content' => $fileContent, |
| 6339 | 6338 | ), |
@@ -6447,7 +6446,7 @@ discard block |
||
| 6447 | 6446 | $arbo = $tree->getPath($folder->id, false); |
| 6448 | 6447 | $path = ''; |
| 6449 | 6448 | foreach ($arbo as $elem) { |
| 6450 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6449 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6451 | 6450 | } |
| 6452 | 6451 | |
| 6453 | 6452 | // Build array |
@@ -6516,7 +6515,7 @@ discard block |
||
| 6516 | 6515 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6517 | 6516 | $rows = DB::query( |
| 6518 | 6517 | 'SELECT id, categories |
| 6519 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6518 | + FROM ' . prefixTable('nested_tree').' |
|
| 6520 | 6519 | WHERE id IN (%l)', |
| 6521 | 6520 | implode(',', $foldersArray) |
| 6522 | 6521 | ); |
@@ -6558,7 +6557,7 @@ discard block |
||
| 6558 | 6557 | // get item info |
| 6559 | 6558 | $dataItem = DB::queryFirstRow( |
| 6560 | 6559 | 'SELECT * |
| 6561 | - FROM ' . prefixTable('items') . ' |
|
| 6560 | + FROM ' . prefixTable('items').' |
|
| 6562 | 6561 | WHERE id=%i', |
| 6563 | 6562 | $inputData['itemId'] |
| 6564 | 6563 | ); |
@@ -6570,8 +6569,8 @@ discard block |
||
| 6570 | 6569 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6571 | 6570 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6572 | 6571 | l.old_value as old_value |
| 6573 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6574 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6572 | + FROM ' . prefixTable('log_items').' as l |
|
| 6573 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6575 | 6574 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6576 | 6575 | ORDER BY date DESC', |
| 6577 | 6576 | $inputData['itemId'], |
@@ -6586,18 +6585,18 @@ discard block |
||
| 6586 | 6585 | |
| 6587 | 6586 | // imported via API |
| 6588 | 6587 | if (empty($record['login']) === true) { |
| 6589 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6588 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6590 | 6589 | } |
| 6591 | 6590 | |
| 6592 | 6591 | // Prepare avatar |
| 6593 | 6592 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6594 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6595 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6593 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6594 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6596 | 6595 | } else { |
| 6597 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6596 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6598 | 6597 | } |
| 6599 | 6598 | } else { |
| 6600 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6599 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6601 | 6600 | } |
| 6602 | 6601 | |
| 6603 | 6602 | // Prepare action |
@@ -6617,7 +6616,7 @@ discard block |
||
| 6617 | 6616 | $previous_passwords, |
| 6618 | 6617 | [ |
| 6619 | 6618 | 'password' => htmlentities($previous_pwd['string']), |
| 6620 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6619 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6621 | 6620 | ] |
| 6622 | 6621 | ); |
| 6623 | 6622 | } |
@@ -6630,19 +6629,19 @@ discard block |
||
| 6630 | 6629 | $action = $lang->get($reason[0]); |
| 6631 | 6630 | if ($reason[0] === 'at_moved') { |
| 6632 | 6631 | $tmp = explode(' -> ', $reason[1]); |
| 6633 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6632 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6634 | 6633 | } elseif ($reason[0] === 'at_field') { |
| 6635 | 6634 | $tmp = explode(' => ', $reason[1]); |
| 6636 | 6635 | if (count($tmp) > 1) { |
| 6637 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6638 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6636 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6637 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6639 | 6638 | } else { |
| 6640 | 6639 | $detail = trim($reason[1]); |
| 6641 | 6640 | } |
| 6642 | 6641 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6643 | 6642 | $tmp = explode(' => ', $reason[1]); |
| 6644 | 6643 | $detail = empty(trim($tmp[0])) === true ? |
| 6645 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6644 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6646 | 6645 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6647 | 6646 | $detail = $lang->get($reason[1]); |
| 6648 | 6647 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') { |
@@ -6651,7 +6650,7 @@ discard block |
||
| 6651 | 6650 | $tmp = explode(':', $reason[1]); |
| 6652 | 6651 | $tmp = explode('.', $tmp[0]); |
| 6653 | 6652 | $detail = isBase64($tmp[0]) === true ? |
| 6654 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6653 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6655 | 6654 | } elseif ($reason[0] === 'at_import') { |
| 6656 | 6655 | $detail = ''; |
| 6657 | 6656 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6670,8 +6669,8 @@ discard block |
||
| 6670 | 6669 | array( |
| 6671 | 6670 | 'avatar' => $avatar, |
| 6672 | 6671 | 'login' => $record['login'], |
| 6673 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6674 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6672 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6673 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6675 | 6674 | 'action' => $action, |
| 6676 | 6675 | 'detail' => $detail, |
| 6677 | 6676 | ) |
@@ -6760,11 +6759,11 @@ discard block |
||
| 6760 | 6759 | |
| 6761 | 6760 | // get some info to add to the notification email |
| 6762 | 6761 | $resp_user = DB::queryfirstrow( |
| 6763 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6762 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6764 | 6763 | $session->get('user-id') |
| 6765 | 6764 | ); |
| 6766 | 6765 | $resp_folder = DB::queryfirstrow( |
| 6767 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6766 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6768 | 6767 | $folder |
| 6769 | 6768 | ); |
| 6770 | 6769 | |
@@ -6773,7 +6772,7 @@ discard block |
||
| 6773 | 6772 | $emailService = new EmailService(); |
| 6774 | 6773 | $rows = DB::query( |
| 6775 | 6774 | 'SELECT email |
| 6776 | - FROM ' . prefixTable('users') . ' |
|
| 6775 | + FROM ' . prefixTable('users').' |
|
| 6777 | 6776 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6778 | 6777 | 1 |
| 6779 | 6778 | ); |
@@ -6819,7 +6818,7 @@ discard block |
||
| 6819 | 6818 | // Send email |
| 6820 | 6819 | $dataItem = DB::queryfirstrow( |
| 6821 | 6820 | 'SELECT label, id_tree |
| 6822 | - FROM ' . prefixTable('items') . ' |
|
| 6821 | + FROM ' . prefixTable('items').' |
|
| 6823 | 6822 | WHERE id = %i', |
| 6824 | 6823 | $inputData['itemId'] |
| 6825 | 6824 | ); |
@@ -6873,7 +6872,7 @@ discard block |
||
| 6873 | 6872 | |
| 6874 | 6873 | DB::query( |
| 6875 | 6874 | 'SELECT * |
| 6876 | - FROM ' . prefixTable('notification') . ' |
|
| 6875 | + FROM ' . prefixTable('notification').' |
|
| 6877 | 6876 | WHERE item_id = %i AND user_id = %i', |
| 6878 | 6877 | $inputData['itemId'], |
| 6879 | 6878 | $session->get('user-id') |
@@ -6945,7 +6944,7 @@ discard block |
||
| 6945 | 6944 | // And related logs |
| 6946 | 6945 | $rows = DB::query( |
| 6947 | 6946 | 'SELECT id, file AS filename |
| 6948 | - FROM ' . prefixTable('files') . ' |
|
| 6947 | + FROM ' . prefixTable('files').' |
|
| 6949 | 6948 | WHERE id_item = %i AND confirmed = %i', |
| 6950 | 6949 | $inputData['itemId'], |
| 6951 | 6950 | 0 |
@@ -6959,12 +6958,12 @@ discard block |
||
| 6959 | 6958 | ); |
| 6960 | 6959 | |
| 6961 | 6960 | // Delete file on server |
| 6962 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6961 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6963 | 6962 | |
| 6964 | 6963 | // Delete related logs |
| 6965 | 6964 | $logFile = DB::query( |
| 6966 | 6965 | 'SELECT increment_id, raison |
| 6967 | - FROM ' . prefixTable('log_items') . ' |
|
| 6966 | + FROM ' . prefixTable('log_items').' |
|
| 6968 | 6967 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6969 | 6968 | $inputData['itemId'], |
| 6970 | 6969 | $session->get('user-id'), |
@@ -7023,7 +7022,7 @@ discard block |
||
| 7023 | 7022 | // Confirm attachments |
| 7024 | 7023 | $rows = DB::query( |
| 7025 | 7024 | 'SELECT id, file AS filename |
| 7026 | - FROM ' . prefixTable('files') . ' |
|
| 7025 | + FROM ' . prefixTable('files').' |
|
| 7027 | 7026 | WHERE id_item = %i AND confirmed = %i', |
| 7028 | 7027 | $inputData['itemId'], |
| 7029 | 7028 | 0 |
@@ -7109,15 +7108,15 @@ discard block |
||
| 7109 | 7108 | case 'autocomplete_tags': |
| 7110 | 7109 | // Get a list off all existing TAGS |
| 7111 | 7110 | $listOfTags = ''; |
| 7112 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7111 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7113 | 7112 | foreach ($rows as $record) { |
| 7114 | 7113 | if (empty($listOfTags)) { |
| 7115 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7114 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7116 | 7115 | } else { |
| 7117 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7116 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7118 | 7117 | } |
| 7119 | 7118 | } |
| 7120 | - echo '[' . $listOfTags . ']'; |
|
| 7119 | + echo '['.$listOfTags.']'; |
|
| 7121 | 7120 | break; |
| 7122 | 7121 | } |
| 7123 | 7122 | } |
@@ -7133,7 +7132,7 @@ discard block |
||
| 7133 | 7132 | { |
| 7134 | 7133 | $data = DB::queryFirstRow( |
| 7135 | 7134 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7136 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7135 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7137 | 7136 | $groupe |
| 7138 | 7137 | ); |
| 7139 | 7138 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7237,7 +7236,7 @@ discard block |
||
| 7237 | 7236 | global $SETTINGS; |
| 7238 | 7237 | |
| 7239 | 7238 | // Retrieve the current lock information for the item |
| 7240 | - $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $itemId); |
|
| 7239 | + $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $itemId); |
|
| 7241 | 7240 | |
| 7242 | 7241 | // Check if the item is locked by another user |
| 7243 | 7242 | if ($itemLockInfo && $itemLockInfo['user_id'] !== $userId) { |
@@ -7256,7 +7255,7 @@ discard block |
||
| 7256 | 7255 | |
| 7257 | 7256 | // Check if there's an ongoing background encryption process for the item |
| 7258 | 7257 | $ongoingProcess = DB::queryFirstRow( |
| 7259 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7258 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7260 | 7259 | $itemId |
| 7261 | 7260 | ); |
| 7262 | 7261 | |
@@ -7274,7 +7273,7 @@ discard block |
||
| 7274 | 7273 | function getUserVisibleFolders(int $userId): array |
| 7275 | 7274 | { |
| 7276 | 7275 | // Query to retrieve visible folders for the user |
| 7277 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7276 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7278 | 7277 | |
| 7279 | 7278 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7280 | 7279 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7298,7 +7297,7 @@ discard block |
||
| 7298 | 7297 | |
| 7299 | 7298 | // Query the access rights for the given roles and folder |
| 7300 | 7299 | $accessTypes = DB::queryFirstColumn( |
| 7301 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7300 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7302 | 7301 | $roles, |
| 7303 | 7302 | $treeId |
| 7304 | 7303 | ); |
@@ -830,7 +830,7 @@ |
||
| 830 | 830 | 'encode' |
| 831 | 831 | ); |
| 832 | 832 | |
| 833 | - /* |
|
| 833 | + /* |
|
| 834 | 834 | * Generate BUG report |
| 835 | 835 | */ |
| 836 | 836 | case 'generate_bug_report'://action_system |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 74 | 74 | // Not allowed page |
| 75 | 75 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 76 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 76 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 77 | 77 | exit; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | // Get info about user to modify |
| 146 | 146 | $targetUserInfos = DB::queryfirstrow( |
| 147 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 147 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 148 | 148 | WHERE id = %i', |
| 149 | 149 | (int) $dataReceived['user_id'] |
| 150 | 150 | ); |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // Check if user already exists |
| 265 | 265 | $data = DB::query( |
| 266 | 266 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 267 | - FROM ' . prefixTable('users') . ' |
|
| 267 | + FROM ' . prefixTable('users').' |
|
| 268 | 268 | WHERE login = %s |
| 269 | 269 | AND deleted_at IS NULL', |
| 270 | 270 | $login |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | |
| 484 | 484 | // Get info about user to delete |
| 485 | 485 | $data_user = DB::queryfirstrow( |
| 486 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 486 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 487 | 487 | WHERE id = %i', |
| 488 | 488 | $post_id |
| 489 | 489 | ); |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | ); |
| 518 | 518 | // delete personal folder and subfolders |
| 519 | 519 | $data = DB::queryfirstrow( |
| 520 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 520 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 521 | 521 | WHERE title = %s AND personal_folder = %i', |
| 522 | 522 | $post_id, |
| 523 | 523 | '1' |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 531 | 531 | // delete items & logs |
| 532 | 532 | $items = DB::query( |
| 533 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 533 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 534 | 534 | WHERE id_tree=%i AND perso = %i', |
| 535 | 535 | $folder->id, |
| 536 | 536 | '1' |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | // Delete any process related to user |
| 555 | 555 | $processes = DB::query( |
| 556 | 556 | 'SELECT increment_id |
| 557 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 557 | + FROM ' . prefixTable('background_tasks').' |
|
| 558 | 558 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 559 | 559 | $post_id |
| 560 | 560 | ); |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | $return = array(); |
| 608 | 608 | // Check if folder exists |
| 609 | 609 | $data = DB::query( |
| 610 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 610 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 611 | 611 | WHERE title = %s AND parent_id = %i', |
| 612 | 612 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
| 613 | 613 | '0' |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | } |
| 621 | 621 | // Check if role exists |
| 622 | 622 | $data = DB::query( |
| 623 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 623 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 624 | 624 | WHERE title = %s', |
| 625 | 625 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 626 | 626 | ); |
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | // Get info about user to delete |
| 650 | 650 | $data_user = DB::queryfirstrow( |
| 651 | 651 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 652 | - FROM ' . prefixTable('users') . ' |
|
| 652 | + FROM ' . prefixTable('users').' |
|
| 653 | 653 | WHERE id = %i', |
| 654 | 654 | $post_user_id |
| 655 | 655 | ); |
@@ -705,7 +705,7 @@ discard block |
||
| 705 | 705 | // Get info about user |
| 706 | 706 | $rowUser = DB::queryfirstrow( |
| 707 | 707 | 'SELECT * |
| 708 | - FROM ' . prefixTable('users') . ' |
|
| 708 | + FROM ' . prefixTable('users').' |
|
| 709 | 709 | WHERE id = %i', |
| 710 | 710 | $post_id |
| 711 | 711 | ); |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | $selected = ''; |
| 731 | 731 | $users_functions = array_filter(array_unique(explode(';', empty($rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']) === true ? '' : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']))); |
| 732 | 732 | |
| 733 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 733 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 734 | 734 | foreach ($rows as $record) { |
| 735 | 735 | if ( |
| 736 | 736 | (int) $session->get('user-admin') === 1 |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | $rolesList = array(); |
| 766 | 766 | $managedBy = array(); |
| 767 | 767 | $selected = ''; |
| 768 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 768 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 769 | 769 | foreach ($rows as $reccord) { |
| 770 | 770 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 771 | 771 | } |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | array_push( |
| 797 | 797 | $managedBy, |
| 798 | 798 | array( |
| 799 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
| 799 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
| 800 | 800 | 'id' => $fonction['id'], |
| 801 | 801 | 'selected' => $selected, |
| 802 | 802 | ) |
@@ -878,9 +878,9 @@ discard block |
||
| 878 | 878 | |
| 879 | 879 | // get USER STATUS |
| 880 | 880 | if ($rowUser['disabled'] == 1) { |
| 881 | - $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . $lang->get('user_info_unlock_question') . '</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . $lang->get('user_info_delete_question') . '</label>'; |
|
| 881 | + $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.$lang->get('user_info_unlock_question').'</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.$lang->get('user_info_delete_question').'</label>'; |
|
| 882 | 882 | } else { |
| 883 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
| 883 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | $arrData['error'] = false; |
@@ -967,7 +967,7 @@ discard block |
||
| 967 | 967 | |
| 968 | 968 | // Get info about user to modify |
| 969 | 969 | $data_user = DB::queryfirstrow( |
| 970 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 970 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 971 | 971 | WHERE id = %i', |
| 972 | 972 | $post_id |
| 973 | 973 | ); |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | // count number of admins |
| 979 | 979 | $users = DB::query( |
| 980 | 980 | 'SELECT id |
| 981 | - FROM ' . prefixTable('users') . ' |
|
| 981 | + FROM ' . prefixTable('users').' |
|
| 982 | 982 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
| 983 | 983 | $post_id |
| 984 | 984 | ); |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | // Exclude roles from AD - PR #3635 |
| 1002 | 1002 | $adRoles = DB::query( |
| 1003 | 1003 | 'SELECT roles_from_ad_groups |
| 1004 | - FROM ' . prefixTable('users') . ' |
|
| 1004 | + FROM ' . prefixTable('users').' |
|
| 1005 | 1005 | WHERE id = %i', |
| 1006 | 1006 | $post_id |
| 1007 | 1007 | )[0]['roles_from_ad_groups']; |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | ); |
| 1106 | 1106 | // delete personal folder and subfolders |
| 1107 | 1107 | $data = DB::queryfirstrow( |
| 1108 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1108 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1109 | 1109 | WHERE title = %s AND personal_folder = %i', |
| 1110 | 1110 | $post_id, |
| 1111 | 1111 | '1' |
@@ -1118,7 +1118,7 @@ discard block |
||
| 1118 | 1118 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1119 | 1119 | // delete items & logs |
| 1120 | 1120 | $items = DB::query( |
| 1121 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1121 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1122 | 1122 | WHERE id_tree=%i AND perso = %i', |
| 1123 | 1123 | $folder->id, |
| 1124 | 1124 | '1' |
@@ -1139,7 +1139,7 @@ discard block |
||
| 1139 | 1139 | } else { |
| 1140 | 1140 | // Get old data about user |
| 1141 | 1141 | $oldData = DB::queryfirstrow( |
| 1142 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1142 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1143 | 1143 | WHERE id = %i', |
| 1144 | 1144 | $post_id |
| 1145 | 1145 | ); |
@@ -1176,7 +1176,7 @@ discard block |
||
| 1176 | 1176 | |
| 1177 | 1177 | // update LOG |
| 1178 | 1178 | if ($oldData['email'] !== $post_email) { |
| 1179 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1179 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1180 | 1180 | } |
| 1181 | 1181 | } |
| 1182 | 1182 | echo prepareExchangedData( |
@@ -1224,7 +1224,7 @@ discard block |
||
| 1224 | 1224 | } |
| 1225 | 1225 | |
| 1226 | 1226 | DB::queryfirstrow( |
| 1227 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1227 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1228 | 1228 | WHERE login = %s |
| 1229 | 1229 | AND deleted_at IS NULL', |
| 1230 | 1230 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1276,7 +1276,7 @@ discard block |
||
| 1276 | 1276 | // get User info |
| 1277 | 1277 | $rowUser = DB::queryFirstRow( |
| 1278 | 1278 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
| 1279 | - FROM ' . prefixTable('users') . ' |
|
| 1279 | + FROM ' . prefixTable('users').' |
|
| 1280 | 1280 | WHERE id = %i', |
| 1281 | 1281 | $post_id |
| 1282 | 1282 | ); |
@@ -1286,7 +1286,7 @@ discard block |
||
| 1286 | 1286 | $html = ''; |
| 1287 | 1287 | |
| 1288 | 1288 | if (isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) { |
| 1289 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
| 1289 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
| 1290 | 1290 | } |
| 1291 | 1291 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
| 1292 | 1292 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1297,7 +1297,7 @@ discard block |
||
| 1297 | 1297 | // refine folders based upon roles |
| 1298 | 1298 | $rows = DB::query( |
| 1299 | 1299 | 'SELECT folder_id, type |
| 1300 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1300 | + FROM ' . prefixTable('roles_values').' |
|
| 1301 | 1301 | WHERE role_id IN %ls |
| 1302 | 1302 | ORDER BY folder_id ASC', |
| 1303 | 1303 | $arrData['functions'] |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | } |
| 1321 | 1321 | |
| 1322 | 1322 | // add allowed folders |
| 1323 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1323 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1324 | 1324 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1325 | 1325 | } |
| 1326 | 1326 | |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | // get folder name |
| 1332 | 1332 | $row = DB::queryFirstRow( |
| 1333 | 1333 | 'SELECT title, nlevel, id |
| 1334 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1334 | + FROM ' . prefixTable('nested_tree').' |
|
| 1335 | 1335 | WHERE id = %i', |
| 1336 | 1336 | $fld['id'] |
| 1337 | 1337 | ); |
@@ -1344,38 +1344,38 @@ discard block |
||
| 1344 | 1344 | |
| 1345 | 1345 | // manage right icon |
| 1346 | 1346 | if ($fld['type'] == 'W') { |
| 1347 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1348 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1349 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1347 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1348 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1349 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1350 | 1350 | } elseif ($fld['type'] == 'ND') { |
| 1351 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1352 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1353 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1351 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1352 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1353 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1354 | 1354 | } elseif ($fld['type'] == 'NE') { |
| 1355 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1356 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1357 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1355 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1356 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1357 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1358 | 1358 | } elseif ($fld['type'] == 'NDNE') { |
| 1359 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1360 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1361 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1359 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1360 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1361 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1362 | 1362 | } elseif ($fld['type'] == '') { |
| 1363 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
| 1363 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
| 1364 | 1364 | } else { |
| 1365 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
| 1365 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
| 1366 | 1366 | } |
| 1367 | 1367 | |
| 1368 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1369 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1370 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
| 1371 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1368 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1369 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1370 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
| 1371 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1372 | 1372 | break; |
| 1373 | 1373 | } |
| 1374 | 1374 | } |
| 1375 | 1375 | } |
| 1376 | 1376 | |
| 1377 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1378 | - $html . '</tbody></table>'; |
|
| 1377 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1378 | + $html.'</tbody></table>'; |
|
| 1379 | 1379 | } else { |
| 1380 | 1380 | $html_full = ''; |
| 1381 | 1381 | } |
@@ -1421,7 +1421,7 @@ discard block |
||
| 1421 | 1421 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
| 1422 | 1422 | $rows = DB::query( |
| 1423 | 1423 | 'SELECT * |
| 1424 | - FROM ' . prefixTable('users') . ' |
|
| 1424 | + FROM ' . prefixTable('users').' |
|
| 1425 | 1425 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1426 | 1426 | '0', |
| 1427 | 1427 | array_filter($session->get('user-roles_array')) |
@@ -1429,7 +1429,7 @@ discard block |
||
| 1429 | 1429 | } else { |
| 1430 | 1430 | $rows = DB::query( |
| 1431 | 1431 | 'SELECT * |
| 1432 | - FROM ' . prefixTable('users') . ' |
|
| 1432 | + FROM ' . prefixTable('users').' |
|
| 1433 | 1433 | WHERE admin = %i', |
| 1434 | 1434 | '0' |
| 1435 | 1435 | ); |
@@ -1441,7 +1441,7 @@ discard block |
||
| 1441 | 1441 | $groupIds = []; |
| 1442 | 1442 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1443 | 1443 | $tmp = DB::queryfirstrow( |
| 1444 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1444 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1445 | 1445 | WHERE id = %i', |
| 1446 | 1446 | $group |
| 1447 | 1447 | ); |
@@ -1453,7 +1453,7 @@ discard block |
||
| 1453 | 1453 | |
| 1454 | 1454 | // Get managed_by |
| 1455 | 1455 | $managedBy = DB::queryfirstrow( |
| 1456 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1456 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1457 | 1457 | WHERE id = %i', |
| 1458 | 1458 | $record['isAdministratedByRole'] |
| 1459 | 1459 | ); |
@@ -1463,7 +1463,7 @@ discard block |
||
| 1463 | 1463 | $foldersAllowedIds = []; |
| 1464 | 1464 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1465 | 1465 | $tmp = DB::queryfirstrow( |
| 1466 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1466 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1467 | 1467 | WHERE id = %i', |
| 1468 | 1468 | $role |
| 1469 | 1469 | ); |
@@ -1476,7 +1476,7 @@ discard block |
||
| 1476 | 1476 | $foldersForbiddenIds = []; |
| 1477 | 1477 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1478 | 1478 | $tmp = DB::queryfirstrow( |
| 1479 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1479 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1480 | 1480 | WHERE id = %i', |
| 1481 | 1481 | $role |
| 1482 | 1482 | ); |
@@ -1494,7 +1494,7 @@ discard block |
||
| 1494 | 1494 | 'login' => $record['login'], |
| 1495 | 1495 | 'groups' => implode(', ', $groups), |
| 1496 | 1496 | 'groupIds' => $groupIds, |
| 1497 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1497 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1498 | 1498 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1499 | 1499 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1500 | 1500 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -1595,7 +1595,7 @@ discard block |
||
| 1595 | 1595 | |
| 1596 | 1596 | // Get info about user |
| 1597 | 1597 | $data_user = DB::queryfirstrow( |
| 1598 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1598 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1599 | 1599 | WHERE id = %i', |
| 1600 | 1600 | $inputData['source_id'] |
| 1601 | 1601 | ); |
@@ -1797,14 +1797,14 @@ discard block |
||
| 1797 | 1797 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 1798 | 1798 | $data_user = DB::queryfirstrow( |
| 1799 | 1799 | 'SELECT fonction_id, public_key |
| 1800 | - FROM ' . prefixTable('users') . ' |
|
| 1800 | + FROM ' . prefixTable('users').' |
|
| 1801 | 1801 | WHERE id = %i', |
| 1802 | 1802 | $post_user_id |
| 1803 | 1803 | ); |
| 1804 | 1804 | |
| 1805 | 1805 | if ($data_user) { |
| 1806 | 1806 | // Ensure array is unique |
| 1807 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 1807 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 1808 | 1808 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 1809 | 1809 | } else { |
| 1810 | 1810 | // User not found |
@@ -1820,14 +1820,14 @@ discard block |
||
| 1820 | 1820 | } |
| 1821 | 1821 | |
| 1822 | 1822 | // Manage specific case of api key |
| 1823 | - if($post_field === 'user_api_key') { |
|
| 1823 | + if ($post_field === 'user_api_key') { |
|
| 1824 | 1824 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 1825 | 1825 | $session->set('user-api_key', $post_new_value); |
| 1826 | 1826 | |
| 1827 | 1827 | // test if user has an api key |
| 1828 | 1828 | $data_user = DB::queryfirstrow( |
| 1829 | 1829 | 'SELECT value |
| 1830 | - FROM ' . prefixTable('api') . ' |
|
| 1830 | + FROM ' . prefixTable('api').' |
|
| 1831 | 1831 | WHERE user_id = %i', |
| 1832 | 1832 | $post_user_id |
| 1833 | 1833 | ); |
@@ -1947,7 +1947,7 @@ discard block |
||
| 1947 | 1947 | } catch (\LdapRecord\Auth\BindException $e) { |
| 1948 | 1948 | $error = $e->getDetailedError(); |
| 1949 | 1949 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 1950 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 1950 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 1951 | 1951 | } |
| 1952 | 1952 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 1953 | 1953 | echo prepareExchangedData( |
@@ -1977,7 +1977,7 @@ discard block |
||
| 1977 | 1977 | } catch (\LdapRecord\Auth\BindException $e) { |
| 1978 | 1978 | $error = $e->getDetailedError(); |
| 1979 | 1979 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 1980 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 1980 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 1981 | 1981 | } |
| 1982 | 1982 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 1983 | 1983 | echo prepareExchangedData( |
@@ -1994,7 +1994,7 @@ discard block |
||
| 1994 | 1994 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 1995 | 1995 | // Build the list of all groups in AD |
| 1996 | 1996 | if (isset($adUser['memberof']) === true) { |
| 1997 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 1997 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 1998 | 1998 | if (empty($adUserGroup) === false && $j !== "count") { |
| 1999 | 1999 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2000 | 2000 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2010,7 +2010,7 @@ discard block |
||
| 2010 | 2010 | // Get his ID |
| 2011 | 2011 | $userInfo = DB::queryfirstrow( |
| 2012 | 2012 | 'SELECT id, login, fonction_id, auth_type |
| 2013 | - FROM ' . prefixTable('users') . ' |
|
| 2013 | + FROM ' . prefixTable('users').' |
|
| 2014 | 2014 | WHERE login = %s', |
| 2015 | 2015 | $userLogin |
| 2016 | 2016 | ); |
@@ -2046,7 +2046,7 @@ discard block |
||
| 2046 | 2046 | |
| 2047 | 2047 | // Get all groups in Teampass |
| 2048 | 2048 | $teampassRoles = array(); |
| 2049 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2049 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2050 | 2050 | foreach ($rows as $record) { |
| 2051 | 2051 | array_push( |
| 2052 | 2052 | $teampassRoles, |
@@ -2110,7 +2110,7 @@ discard block |
||
| 2110 | 2110 | // Check if user already exists |
| 2111 | 2111 | $data = DB::query( |
| 2112 | 2112 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2113 | - FROM ' . prefixTable('users') . ' |
|
| 2113 | + FROM ' . prefixTable('users').' |
|
| 2114 | 2114 | WHERE login = %s', |
| 2115 | 2115 | $post_login |
| 2116 | 2116 | ); |
@@ -2287,7 +2287,7 @@ discard block |
||
| 2287 | 2287 | // Check if user already exists |
| 2288 | 2288 | DB::query( |
| 2289 | 2289 | 'SELECT id |
| 2290 | - FROM ' . prefixTable('users') . ' |
|
| 2290 | + FROM ' . prefixTable('users').' |
|
| 2291 | 2291 | WHERE id = %i', |
| 2292 | 2292 | $post_id |
| 2293 | 2293 | ); |
@@ -2373,7 +2373,7 @@ discard block |
||
| 2373 | 2373 | // Check if user already exists |
| 2374 | 2374 | DB::query( |
| 2375 | 2375 | 'SELECT id |
| 2376 | - FROM ' . prefixTable('users') . ' |
|
| 2376 | + FROM ' . prefixTable('users').' |
|
| 2377 | 2377 | WHERE id = %i', |
| 2378 | 2378 | $post_id |
| 2379 | 2379 | ); |
@@ -2440,7 +2440,7 @@ discard block |
||
| 2440 | 2440 | // Search TP_USER in db |
| 2441 | 2441 | $userTP = DB::queryFirstRow( |
| 2442 | 2442 | 'SELECT pw |
| 2443 | - FROM ' . prefixTable('users') . ' |
|
| 2443 | + FROM ' . prefixTable('users').' |
|
| 2444 | 2444 | WHERE id = %i', |
| 2445 | 2445 | TP_USER_ID |
| 2446 | 2446 | ); |
@@ -2462,8 +2462,8 @@ discard block |
||
| 2462 | 2462 | 'process_type' => 'create_user_keys', |
| 2463 | 2463 | 'arguments' => json_encode([ |
| 2464 | 2464 | 'new_user_id' => (int) $post_user_id, |
| 2465 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 2466 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 2465 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 2466 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 2467 | 2467 | 'owner_id' => (int) TP_USER_ID, |
| 2468 | 2468 | 'creator_pwd' => $userTP['pw'], |
| 2469 | 2469 | 'email_body' => $lang->get('email_body_user_config_5'), |
@@ -2638,8 +2638,8 @@ discard block |
||
| 2638 | 2638 | // get user info |
| 2639 | 2639 | $processesProgress = DB::query( |
| 2640 | 2640 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 2641 | - FROM ' . prefixTable('users') . ' AS u |
|
| 2642 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2641 | + FROM ' . prefixTable('users').' AS u |
|
| 2642 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2643 | 2643 | WHERE u.id = %i', |
| 2644 | 2644 | $user_id |
| 2645 | 2645 | ); |
@@ -2647,9 +2647,9 @@ discard block |
||
| 2647 | 2647 | //print_r($processesProgress); |
| 2648 | 2648 | $finished_steps = 0; |
| 2649 | 2649 | $nb_steps = count($processesProgress); |
| 2650 | - foreach($processesProgress as $process) { |
|
| 2650 | + foreach ($processesProgress as $process) { |
|
| 2651 | 2651 | if ((int) $process['is_in_progress'] === -1) { |
| 2652 | - $finished_steps ++; |
|
| 2652 | + $finished_steps++; |
|
| 2653 | 2653 | } |
| 2654 | 2654 | } |
| 2655 | 2655 | |
@@ -2658,7 +2658,7 @@ discard block |
||
| 2658 | 2658 | 'error' => false, |
| 2659 | 2659 | 'message' => '', |
| 2660 | 2660 | 'user_id' => $user_id, |
| 2661 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 2661 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 2662 | 2662 | 'debug' => $finished_steps.",".$nb_steps, |
| 2663 | 2663 | ), |
| 2664 | 2664 | 'encode' |
@@ -2722,7 +2722,7 @@ discard block |
||
| 2722 | 2722 | |
| 2723 | 2723 | // Get info about user |
| 2724 | 2724 | $data_user = DB::queryfirstrow( |
| 2725 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2725 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2726 | 2726 | WHERE id = %i', |
| 2727 | 2727 | $value[1] |
| 2728 | 2728 | ); |
@@ -2756,7 +2756,7 @@ discard block |
||
| 2756 | 2756 | logEvents( |
| 2757 | 2757 | $SETTINGS, |
| 2758 | 2758 | 'user_mngt', |
| 2759 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 2759 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 2760 | 2760 | (string) $session->get('user-id'), |
| 2761 | 2761 | $session->get('user-login'), |
| 2762 | 2762 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -2790,7 +2790,7 @@ discard block |
||
| 2790 | 2790 | |
| 2791 | 2791 | // Get info about user |
| 2792 | 2792 | $data_user = DB::queryfirstrow( |
| 2793 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2793 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2794 | 2794 | WHERE id = %i', |
| 2795 | 2795 | $value[1] |
| 2796 | 2796 | ); |