@@ -134,7 +134,9 @@ |
||
| 134 | 134 | handleAttachmentError('File exceeds the maximum allowed size', 120, 413); |
| 135 | 135 | die(); |
| 136 | 136 | } |
| 137 | - if (WIP === true) error_log('POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 137 | + if (WIP === true) { |
|
| 138 | + error_log('POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 139 | + } |
|
| 138 | 140 | |
| 139 | 141 | // delete expired tokens |
| 140 | 142 | DB::delete(prefixTable('tokens'), 'end_timestamp < %i', time()); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | ) { |
| 75 | 75 | // Not allowed page |
| 76 | 76 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 77 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 77 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 78 | 78 | exit; |
| 79 | 79 | } |
| 80 | 80 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $post_isNewItem = $request->request->filter('isNewItem', null, FILTER_SANITIZE_NUMBER_INT); |
| 108 | 108 | $post_randomId = $request->request->filter('randomId', null, FILTER_SANITIZE_NUMBER_INT); |
| 109 | 109 | $post_isPersonal = $request->request->filter('isPersonal', null, FILTER_SANITIZE_NUMBER_INT); |
| 110 | -$post_fileSize= $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT); |
|
| 110 | +$post_fileSize = $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT); |
|
| 111 | 111 | $chunk = $request->request->filter('chunk', 0, FILTER_SANITIZE_NUMBER_INT); |
| 112 | 112 | $chunks = $request->request->filter('chunks', 0, FILTER_SANITIZE_NUMBER_INT); |
| 113 | 113 | $fileName = $request->request->filter('name', '', FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
@@ -122,10 +122,10 @@ discard block |
||
| 122 | 122 | $unit = strtoupper(substr(trim($POST_MAX_SIZE), -1)); // Assurez-vous de bien gérer les espaces éventuels |
| 123 | 123 | $units = ['G' => 1073741824, 'M' => 1048576, 'K' => 1024]; |
| 124 | 124 | $multiplier = $units[$unit] ?? 1; // Vérifie si l'unité est dans le tableau, sinon 1 |
| 125 | - $maxSize = (int)$POST_MAX_SIZE * $multiplier; |
|
| 125 | + $maxSize = (int) $POST_MAX_SIZE * $multiplier; |
|
| 126 | 126 | |
| 127 | 127 | // CHeck if the POST is too big |
| 128 | - if (!empty($_SERVER['CONTENT_LENGTH']) && (int)$_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) { |
|
| 128 | + if (!empty($_SERVER['CONTENT_LENGTH']) && (int) $_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) { |
|
| 129 | 129 | handleAttachmentError('POST exceeded maximum allowed size.', 111, 413); |
| 130 | 130 | } |
| 131 | 131 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | handleAttachmentError('File exceeds the maximum allowed size', 120, 413); |
| 135 | 135 | die(); |
| 136 | 136 | } |
| 137 | - if (WIP === true) error_log('POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 137 | + if (WIP === true) error_log('POST_MAX_SIZE: '.$POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 138 | 138 | |
| 139 | 139 | // delete expired tokens |
| 140 | 140 | DB::delete(prefixTable('tokens'), 'end_timestamp < %i', time()); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | // check if token is expired |
| 186 | 186 | $data = DB::queryFirstRow( |
| 187 | 187 | 'SELECT end_timestamp |
| 188 | - FROM ' . prefixTable('tokens') . ' |
|
| 188 | + FROM ' . prefixTable('tokens').' |
|
| 189 | 189 | WHERE user_id = %i AND token = %s', |
| 190 | 190 | $session->get('user-id'), |
| 191 | 191 | $post_user_token |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | |
| 219 | 219 | // HTTP headers for no cache etc |
| 220 | 220 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
| 221 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
| 221 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
| 222 | 222 | header('Cache-Control: no-store, no-cache, must-revalidate'); |
| 223 | 223 | header('Cache-Control: post-check=0, pre-check=0', false); |
| 224 | 224 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | // Validate file name (for our purposes we'll just remove invalid characters) |
| 257 | 257 | $file_name = preg_replace('[^A-Za-z0-9]', '', strtolower(basename($_FILES['file']['name']))); |
| 258 | 258 | if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) { |
| 259 | - handleAttachmentError('Invalid file name: ' . $file_name . '.', 114); |
|
| 259 | + handleAttachmentError('Invalid file name: '.$file_name.'.', 114); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | // Validate file extension |
@@ -269,8 +269,8 @@ discard block |
||
| 269 | 269 | $ext, |
| 270 | 270 | explode( |
| 271 | 271 | ',', |
| 272 | - $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] . |
|
| 273 | - ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext'] |
|
| 272 | + $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext']. |
|
| 273 | + ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext'] |
|
| 274 | 274 | ) |
| 275 | 275 | ) === false |
| 276 | 276 | ) { |
@@ -283,24 +283,24 @@ discard block |
||
| 283 | 283 | |
| 284 | 284 | // Clean the fileName for security reasons |
| 285 | 285 | $fileInfo = pathinfo($fileName); |
| 286 | -$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension']; |
|
| 286 | +$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension']; |
|
| 287 | 287 | $fileFullSize = 0; |
| 288 | 288 | |
| 289 | 289 | // Make sure the fileName is unique but only if chunking is disabled |
| 290 | -if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) { |
|
| 290 | +if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) { |
|
| 291 | 291 | $ext = strrpos($fileName, '.'); |
| 292 | 292 | $fileNameA = substr($fileName, 0, $ext); |
| 293 | 293 | $fileNameB = substr($fileName, $ext); |
| 294 | 294 | |
| 295 | 295 | $count = 1; |
| 296 | - while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) { |
|
| 296 | + while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) { |
|
| 297 | 297 | ++$count; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | - $fileName = $fileNameA . '_' . $count . $fileNameB; |
|
| 300 | + $fileName = $fileNameA.'_'.$count.$fileNameB; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | -$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; |
|
| 303 | +$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName; |
|
| 304 | 304 | |
| 305 | 305 | // Create target dir |
| 306 | 306 | if (file_exists($targetDir) === false) { |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | // Remove old temp files |
| 315 | 315 | if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) { |
| 316 | 316 | while (($file = readdir($dir)) !== false) { |
| 317 | - $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file; |
|
| 317 | + $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file; |
|
| 318 | 318 | |
| 319 | 319 | // Remove temp file if it is older than the max age and is not the current file |
| 320 | 320 | if ( |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | prefixTable('files'), |
| 417 | 417 | array( |
| 418 | 418 | 'id_item' => $post_itemId, |
| 419 | - 'name' => 'b64:' . $fileName, // add "b64:" prefix to indicate that the file name is base64 encoded |
|
| 419 | + 'name' => 'b64:'.$fileName, // add "b64:" prefix to indicate that the file name is base64 encoded |
|
| 420 | 420 | 'size' => $post_fileSize, |
| 421 | 421 | 'extension' => $fileInfo['extension'], |
| 422 | 422 | 'type' => $_FILES['file']['type'], |
@@ -433,8 +433,8 @@ discard block |
||
| 433 | 433 | // This is a public object |
| 434 | 434 | $users = DB::query( |
| 435 | 435 | 'SELECT id, public_key |
| 436 | - FROM ' . prefixTable('users') . ' |
|
| 437 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '") |
|
| 436 | + FROM ' . prefixTable('users').' |
|
| 437 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'") |
|
| 438 | 438 | AND public_key != ""' |
| 439 | 439 | ); |
| 440 | 440 | foreach ($users as $user) { |
@@ -468,14 +468,14 @@ discard block |
||
| 468 | 468 | 'date' => time(), |
| 469 | 469 | 'id_user' => $session->get('user-id'), |
| 470 | 470 | 'action' => 'at_modification', |
| 471 | - 'raison' => 'at_add_file : ' . $fileName . ':' . $newID, |
|
| 471 | + 'raison' => 'at_add_file : '.$fileName.':'.$newID, |
|
| 472 | 472 | ) |
| 473 | 473 | ); |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | // Return JSON-RPC response |
| 478 | -die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}'); |
|
| 478 | +die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}'); |
|
| 479 | 479 | |
| 480 | 480 | /** |
| 481 | 481 | * Handle errors and kill script. |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | ) { |
| 77 | 77 | // Not allowed page |
| 78 | 78 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 79 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 79 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 80 | 80 | exit; |
| 81 | 81 | } |
| 82 | 82 | |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | ); |
| 462 | 462 | |
| 463 | 463 | // add new role to user |
| 464 | - $tmp = $data_tmp['fonction_id'] . (substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';' . $role_id); |
|
| 464 | + $tmp = $data_tmp['fonction_id'].(substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';'.$role_id); |
|
| 465 | 465 | $session->set('user-roles', str_replace(';;', ';', $tmp)); |
| 466 | 466 | |
| 467 | 467 | // store in DB |
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS); |
| 650 | 650 | break; |
| 651 | 651 | default: |
| 652 | - throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']); |
|
| 652 | + throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']); |
|
| 653 | 653 | } |
| 654 | 654 | } catch (Exception $e) { |
| 655 | 655 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | } else { |
| 670 | 670 | // Handle successful retrieval of groups |
| 671 | 671 | // exists in Teampass |
| 672 | - foreach($groupsData['userGroups'] as $key => $group) { |
|
| 672 | + foreach ($groupsData['userGroups'] as $key => $group) { |
|
| 673 | 673 | $role_detail = DB::queryFirstRow( |
| 674 | 674 | 'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title |
| 675 | 675 | FROM '.prefixTable('ldap_groups_roles').' AS a |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | |
| 695 | 695 | // Get all groups in Teampass |
| 696 | 696 | $teampassRoles = array(); |
| 697 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 697 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 698 | 698 | foreach ($rows as $record) { |
| 699 | 699 | array_push( |
| 700 | 700 | $teampassRoles, |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | ) { |
| 65 | 65 | // Not allowed page |
| 66 | 66 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 67 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 67 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 68 | 68 | exit; |
| 69 | 69 | } |
| 70 | 70 | |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | ); |
| 126 | 126 | |
| 127 | 127 | $lastFolderChange = DB::queryFirstRow( |
| 128 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 128 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 129 | 129 | WHERE type = %s AND intitule = %s', |
| 130 | 130 | 'timestamp', |
| 131 | 131 | 'last_folder_change' |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $nbItemsInSubfolders = (int) $node->nb_items_in_subfolders; |
| 347 | 347 | $nbItemsInFolder = (int) $node->nb_items_in_folder; |
| 348 | 348 | $nbSubfolders = (int) $node->nb_subfolders; |
| 349 | - break; // Get out as soon as we find a valid node. |
|
| 349 | + break; // Get out as soon as we find a valid node. |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | if ($displayThisNode === true) { |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | foreach ($currentNode->children as $child) { |
| 459 | 459 | recursiveTree( |
| 460 | 460 | (int) $child, |
| 461 | - $tree->getNode($child),// get node info for this child |
|
| 461 | + $tree->getNode($child), // get node info for this child |
|
| 462 | 462 | /** @scrutinizer ignore-type */ $tree, |
| 463 | 463 | $listFoldersLimitedKeys, |
| 464 | 464 | $listRestrictedFoldersForItemsKeys, |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | $lang = new Language($session->get('user-language') ?? 'english'); |
| 506 | 506 | |
| 507 | 507 | // prepare json return for current node |
| 508 | - $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id; |
|
| 508 | + $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id; |
|
| 509 | 509 | |
| 510 | 510 | // handle displaying |
| 511 | 511 | if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) { |
@@ -522,17 +522,17 @@ discard block |
||
| 522 | 522 | array_push( |
| 523 | 523 | $ret_json, |
| 524 | 524 | array( |
| 525 | - 'id' => 'li_' . $nodeId, |
|
| 525 | + 'id' => 'li_'.$nodeId, |
|
| 526 | 526 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 527 | 527 | 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'" data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'], |
| 528 | 528 | 'li_attr' => array( |
| 529 | 529 | 'class' => 'jstreeopen', |
| 530 | - 'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'], |
|
| 530 | + 'title' => 'ID ['.$nodeId.'] '.$nodeData['title'], |
|
| 531 | 531 | ), |
| 532 | 532 | 'a_attr' => array( |
| 533 | - 'id' => 'fld_' . $nodeId, |
|
| 533 | + 'id' => 'fld_'.$nodeId, |
|
| 534 | 534 | 'class' => $nodeData['folderClass'], |
| 535 | - 'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)', |
|
| 535 | + 'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)', |
|
| 536 | 536 | 'data-title' => htmlspecialchars($currentNode->title), |
| 537 | 537 | ), |
| 538 | 538 | 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0, |
@@ -548,12 +548,12 @@ discard block |
||
| 548 | 548 | array_push( |
| 549 | 549 | $ret_json, |
| 550 | 550 | array( |
| 551 | - 'id' => 'li_' . $nodeId, |
|
| 551 | + 'id' => 'li_'.$nodeId, |
|
| 552 | 552 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 553 | 553 | 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'" data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'], |
| 554 | 554 | 'li_attr' => array( |
| 555 | 555 | 'class' => '', |
| 556 | - 'title' => 'ID [' . $nodeId . '] ' . $lang->get('no_access'), |
|
| 556 | + 'title' => 'ID ['.$nodeId.'] '.$lang->get('no_access'), |
|
| 557 | 557 | ), |
| 558 | 558 | ) |
| 559 | 559 | ); |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | if (in_array($nodeId, $session_read_only_folders) === true) { |
| 614 | 614 | return [ |
| 615 | 615 | 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'. |
| 616 | - ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>' : ''), |
|
| 616 | + ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''), |
|
| 617 | 617 | 'title' => $lang->get('read_only_account'), |
| 618 | 618 | 'restricted' => 1, |
| 619 | 619 | 'folderClass' => 'folder_not_droppable', |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | ) { |
| 629 | 629 | return [ |
| 630 | 630 | 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'. |
| 631 | - ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>' : ''), |
|
| 631 | + ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''), |
|
| 632 | 632 | 'title' => $lang->get('read_only_account'), |
| 633 | 633 | 'restricted' => 0, |
| 634 | 634 | 'folderClass' => 'folder', |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | return [ |
| 642 | - 'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>' : ''), |
|
| 642 | + 'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''), |
|
| 643 | 643 | 'title' => '', |
| 644 | 644 | 'restricted' => 0, |
| 645 | 645 | 'folderClass' => 'folder', |
@@ -650,8 +650,8 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) { |
| 652 | 652 | return [ |
| 653 | - 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') . |
|
| 654 | - ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''), |
|
| 653 | + 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''). |
|
| 654 | + ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''), |
|
| 655 | 655 | 'title' => '', |
| 656 | 656 | 'restricted' => 1, |
| 657 | 657 | 'folderClass' => 'folder', |
@@ -662,8 +662,8 @@ discard block |
||
| 662 | 662 | |
| 663 | 663 | } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) { |
| 664 | 664 | return [ |
| 665 | - 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' . |
|
| 666 | - '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>', |
|
| 665 | + 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''. |
|
| 666 | + '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>', |
|
| 667 | 667 | 'title' => '', |
| 668 | 668 | 'restricted' => 1, |
| 669 | 669 | 'folderClass' => 'folder', |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | // Does this user has a tree cache |
| 774 | 774 | $userCacheTree = DB::queryFirstRow( |
| 775 | 775 | 'SELECT data |
| 776 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 776 | + FROM ' . prefixTable('cache_tree').' |
|
| 777 | 777 | WHERE user_id = %i', |
| 778 | 778 | $userId |
| 779 | 779 | ); |
@@ -72,37 +72,37 @@ |
||
| 72 | 72 | { |
| 73 | 73 | // Delete all item keys for which no user exist |
| 74 | 74 | DB::query( |
| 75 | - 'DELETE k.* FROM ' . prefixTable('sharekeys_items') . ' k |
|
| 76 | - LEFT JOIN ' . prefixTable('users') . ' u ON k.user_id = u.id |
|
| 75 | + 'DELETE k.* FROM '.prefixTable('sharekeys_items').' k |
|
| 76 | + LEFT JOIN ' . prefixTable('users').' u ON k.user_id = u.id |
|
| 77 | 77 | WHERE u.id IS NULL OR u.deleted_at IS NOT NULL' |
| 78 | 78 | ); |
| 79 | 79 | |
| 80 | 80 | // Delete all files keys for which no item exist |
| 81 | 81 | DB::query( |
| 82 | - 'DELETE k.* FROM ' . prefixTable('sharekeys_files') . ' k |
|
| 83 | - LEFT JOIN ' . prefixTable('items') . ' i ON k.object_id = i.id |
|
| 82 | + 'DELETE k.* FROM '.prefixTable('sharekeys_files').' k |
|
| 83 | + LEFT JOIN ' . prefixTable('items').' i ON k.object_id = i.id |
|
| 84 | 84 | WHERE i.id IS NULL' |
| 85 | 85 | ); |
| 86 | 86 | |
| 87 | 87 | // Delete all fields keys for which no item exist |
| 88 | 88 | DB::query( |
| 89 | - 'DELETE k.* FROM ' . prefixTable('sharekeys_fields') . ' k |
|
| 90 | - LEFT JOIN ' . prefixTable('categories_items') . ' c ON k.object_id = c.id |
|
| 91 | - LEFT JOIN ' . prefixTable('items') . ' i ON c.item_id = i.id |
|
| 89 | + 'DELETE k.* FROM '.prefixTable('sharekeys_fields').' k |
|
| 90 | + LEFT JOIN ' . prefixTable('categories_items').' c ON k.object_id = c.id |
|
| 91 | + LEFT JOIN ' . prefixTable('items').' i ON c.item_id = i.id |
|
| 92 | 92 | WHERE c.id IS NULL OR i.id IS NULL' |
| 93 | 93 | ); |
| 94 | 94 | |
| 95 | 95 | // Delete all item logs for which no user exist |
| 96 | 96 | DB::query( |
| 97 | - 'DELETE l.* FROM ' . prefixTable('log_items') . ' l |
|
| 98 | - LEFT JOIN ' . prefixTable('items') . ' i ON l.id_item = i.id |
|
| 97 | + 'DELETE l.* FROM '.prefixTable('log_items').' l |
|
| 98 | + LEFT JOIN ' . prefixTable('items').' i ON l.id_item = i.id |
|
| 99 | 99 | WHERE i.id IS NULL' |
| 100 | 100 | ); |
| 101 | 101 | |
| 102 | 102 | // Delete all system logs for which no user exist |
| 103 | 103 | DB::query( |
| 104 | - 'DELETE l.* FROM ' . prefixTable('log_system') . ' l |
|
| 105 | - LEFT JOIN ' . prefixTable('users') . ' u ON l.qui = u.id |
|
| 104 | + 'DELETE l.* FROM '.prefixTable('log_system').' l |
|
| 105 | + LEFT JOIN ' . prefixTable('users').' u ON l.qui = u.id |
|
| 106 | 106 | WHERE u.id IS NULL OR u.deleted_at IS NOT NULL' |
| 107 | 107 | ); |
| 108 | 108 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | { |
| 74 | 74 | global $SETTINGS; |
| 75 | 75 | // Load expected files |
| 76 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
| 76 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
| 77 | 77 | $SETTINGS = $SETTINGS ?? []; |
| 78 | 78 | |
| 79 | 79 | // $SETTINGS is set then read folder |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | //delete file FILES |
| 84 | 84 | while (false !== ($f = readdir($dir))) { |
| 85 | 85 | if ($f !== '.' && $f !== '..' && $f !== '.htaccess') { |
| 86 | - $filePath = $SETTINGS['path_to_files_folder'] . '/' . $f; |
|
| 86 | + $filePath = $SETTINGS['path_to_files_folder'].'/'.$f; |
|
| 87 | 87 | if (file_exists($filePath) && ((time() - filectime($filePath)) > 604800)) { |
| 88 | 88 | fileDelete($filePath, $SETTINGS); |
| 89 | 89 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | while (false !== ($f = readdir($dir))) { |
| 105 | 105 | if ($f !== '.' && $f !== '..') { |
| 106 | 106 | if (strpos($f, '_delete.') > 0) { |
| 107 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS); |
|
| 107 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) { |
| 73 | 73 | // Not allowed page |
| 74 | 74 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 75 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 75 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 76 | 76 | exit; |
| 77 | 77 | } |
| 78 | 78 | ?> |
@@ -325,8 +325,8 @@ discard block |
||
| 325 | 325 | if (store.get('teampassApplication').formUserAction === "add_new_user") { |
| 326 | 326 | var data = { |
| 327 | 327 | 'receipt': $('#form-email').val(), |
| 328 | - 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>', |
|
| 329 | - 'body': '<?php echo $lang->get('email_body_new_user');?>', |
|
| 328 | + 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>', |
|
| 329 | + 'body': '<?php echo $lang->get('email_body_new_user'); ?>', |
|
| 330 | 330 | 'pre_replace' : { |
| 331 | 331 | '#code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code, |
| 332 | 332 | '#login#' : store.get('teampassUser').admin_new_user_login, |
@@ -336,8 +336,8 @@ discard block |
||
| 336 | 336 | } else { |
| 337 | 337 | var data = { |
| 338 | 338 | 'receipt': $('#form-email').val(), |
| 339 | - 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>', |
|
| 340 | - 'body': '<?php echo $lang->get('email_body_temporary_encryption_code');?>', |
|
| 339 | + 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>', |
|
| 340 | + 'body': '<?php echo $lang->get('email_body_temporary_encryption_code'); ?>', |
|
| 341 | 341 | 'pre_replace' : { |
| 342 | 342 | '#enc_code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code, |
| 343 | 343 | } |
@@ -532,14 +532,14 @@ discard block |
||
| 532 | 532 | } |
| 533 | 533 | // Inform user |
| 534 | 534 | $("#warningModalBody").html('<b><?php echo $lang->get('encryption_keys'); ?> - ' + |
| 535 | - stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' + |
|
| 535 | + stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' + |
|
| 536 | 536 | '... <?php echo $lang->get('please_wait'); ?><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>'); |
| 537 | 537 | |
| 538 | 538 | // If expected, show the OPT to the admin |
| 539 | 539 | if (constVisibleOTP === true) { |
| 540 | 540 | toastr.info( |
| 541 | - '<?php echo $lang->get('show_encryption_code_to_admin');?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>' |
|
| 542 | - + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close');?></button>', |
|
| 541 | + '<?php echo $lang->get('show_encryption_code_to_admin'); ?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>' |
|
| 542 | + + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close'); ?></button>', |
|
| 543 | 543 | '<?php echo $lang->get('information'); ?>', |
| 544 | 544 | { |
| 545 | 545 | extendedTimeOut: 0, |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | var data = { |
| 559 | 559 | action: step, |
| 560 | 560 | start: start, |
| 561 | - length: <?php echo NUMBER_ITEMS_IN_BATCH;?>, |
|
| 561 | + length: <?php echo NUMBER_ITEMS_IN_BATCH; ?>, |
|
| 562 | 562 | user_id: userId, |
| 563 | 563 | } |
| 564 | 564 | if (debugJavascript === true) { |
@@ -1395,7 +1395,7 @@ discard block |
||
| 1395 | 1395 | } else { |
| 1396 | 1396 | // Show icon or not |
| 1397 | 1397 | if ($('#user-disabled').prop('checked') === true) { |
| 1398 | - $('#user-login-'+userID).before('<i class="fa-solid fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked');?>" id="user-disable-'+userID+'"></i>'); |
|
| 1398 | + $('#user-login-'+userID).before('<i class="fa-solid fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>'); |
|
| 1399 | 1399 | } else { |
| 1400 | 1400 | $('#user-disable-'+userID).remove(); |
| 1401 | 1401 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | ) { |
| 78 | 78 | // Not allowed page |
| 79 | 79 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 80 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 80 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 81 | 81 | exit; |
| 82 | 82 | } |
| 83 | 83 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | if (isset($order['column']) && preg_match('#^(asc|desc)$#i', $order['dir'])) { |
| 129 | 129 | $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT); |
| 130 | 130 | $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 131 | - $sOrder .= $aColumns[$columnIndex] . ' ' . $dir . ', '; |
|
| 131 | + $sOrder .= $aColumns[$columnIndex].' '.$dir.', '; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | $sOrder = substr_replace($sOrder, '', -2); |
@@ -152,15 +152,15 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | if ($letter !== '' && $letter !== 'None') { |
| 154 | 154 | $sWhere .= ' AND ('; |
| 155 | - $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR "; |
|
| 156 | - $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR "; |
|
| 157 | - $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' "; |
|
| 155 | + $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR "; |
|
| 156 | + $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR "; |
|
| 157 | + $sWhere .= $aColumns[3]." LIKE '".$letter."%' "; |
|
| 158 | 158 | $sWhere .= ')'; |
| 159 | 159 | } elseif ($searchValue !== '') { |
| 160 | 160 | $sWhere .= ' AND ('; |
| 161 | - $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR "; |
|
| 162 | - $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR "; |
|
| 163 | - $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' "; |
|
| 161 | + $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR "; |
|
| 162 | + $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR "; |
|
| 163 | + $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' "; |
|
| 164 | 164 | $sWhere .= ')'; |
| 165 | 165 | } |
| 166 | 166 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | // Check for existing lock |
| 247 | 247 | $unlock_at = DB::queryFirstField( |
| 248 | 248 | 'SELECT MAX(unlock_at) |
| 249 | - FROM ' . prefixTable('auth_failures') . ' |
|
| 249 | + FROM ' . prefixTable('auth_failures').' |
|
| 250 | 250 | WHERE unlock_at > %s AND source = %s AND value = %s', |
| 251 | 251 | date('Y-m-d H:i:s', time()), |
| 252 | 252 | 'login', |
@@ -255,33 +255,31 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | // Get some infos about user |
| 257 | 257 | $userDisplayInfos = |
| 258 | - (isset($userDate['date']) ? '<i class=\"fas fa-calendar-day infotip text-info ml-2\" title=\"'.$lang->get('creation_date').': '.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $userDate['date']).'\"></i>' : '') |
|
| 258 | + (isset($userDate['date']) ? '<i class=\"fas fa-calendar-day infotip text-info ml-2\" title=\"'.$lang->get('creation_date').': '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $userDate['date']).'\"></i>' : '') |
|
| 259 | 259 | . |
| 260 | 260 | ((int) $record['last_connexion'] > 0 ? '<i class=\"far fa-clock infotip text-info ml-2\" title=\"'.$lang->get('index_last_seen').": ". |
| 261 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '') |
|
| 261 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '') |
|
| 262 | 262 | . |
| 263 | 263 | ((int) $record['user_ip'] > 0 ? '<i class=\"fas fa-street-view infotip text-info ml-1\" title=\"'.$lang->get('ip').": ".($record['user_ip']).'\"></i>' : '') |
| 264 | 264 | . |
| 265 | 265 | (($record['auth_type'] === 'ldap' || $record['auth_type'] === 'oauth2') ? '<i class=\"far fa-address-book infotip text-warning ml-1\" title=\"'.$lang->get('managed_through_ad').'\"></i>' : '') |
| 266 | 266 | . |
| 267 | 267 | ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['admin'] !== 1 && ((int) $SETTINGS['duo'] === 1 || (int) $SETTINGS['google_authentication'] === 1)) ? |
| 268 | - ((int) $record['mfa_enabled'] === 1 ? '' : '<i class=\"fa-solid fa-fingerprint infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('mfa_disabled_for_user').'\"></i>') : |
|
| 269 | - '' |
|
| 268 | + ((int) $record['mfa_enabled'] === 1 ? '' : '<i class=\"fa-solid fa-fingerprint infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('mfa_disabled_for_user').'\"></i>') : '' |
|
| 270 | 269 | ) |
| 271 | 270 | . |
| 272 | 271 | (($unlock_at) ? '<i class=\"fas fa-solid text-red fa-lock infotip text-info ml-1\" title=\"'.$lang->get('bruteforce_unlock_at').$unlock_at.'\"></i>' : ''); |
| 273 | 272 | if ($request->query->filter('display_warnings', '', FILTER_VALIDATE_BOOLEAN) === true) { |
| 274 | 273 | $userDisplayInfos .= '<br>'. |
| 275 | 274 | ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['admin'] !== 1 && is_null($record['keys_recovery_time']) === true) ? |
| 276 | - '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' : |
|
| 277 | - '' |
|
| 275 | + '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' : '' |
|
| 278 | 276 | ). |
| 279 | 277 | ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['pw_passwordlib'] === 1) ? '<i class=\"fa-solid fa-person-walking-luggage infotip ml-1\" style=\"color:Tomato\" title=\"Old password encryption. Shall login to initialize.\"></i>' : ''); |
| 280 | 278 | } |
| 281 | 279 | |
| 282 | 280 | $sOutput .= '["<span data-id=\"'.$record['id'].'\" data-fullname=\"'. |
| 283 | - (empty($record['name']) === false ? htmlentities($record['name'], ENT_QUOTES|ENT_SUBSTITUTE|ENT_DISALLOWED) : '').' '. |
|
| 284 | - (empty($record['lastname']) === false ? htmlentities($record['lastname'], ENT_QUOTES|ENT_SUBSTITUTE|ENT_DISALLOWED) : ''). |
|
| 281 | + (empty($record['name']) === false ? htmlentities($record['name'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_DISALLOWED) : '').' '. |
|
| 282 | + (empty($record['lastname']) === false ? htmlentities($record['lastname'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_DISALLOWED) : ''). |
|
| 285 | 283 | '\" data-auth-type=\"'.$record['auth_type'].'\" data-special=\"'.$record['special'].'\" data-mfa-enabled=\"'.$record['mfa_enabled'].'\" data-otp-provided=\"'.(isset($record['otp_provided']) === true ? $record['otp_provided'] : '').'\"></span>", '; |
| 286 | 284 | //col2 |
| 287 | 285 | $sOutput .= '"'. |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('oauth') === false) { |
| 72 | 72 | // Not allowed page |
| 73 | 73 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 74 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 74 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 75 | 75 | exit; |
| 76 | 76 | } |
| 77 | 77 | ?> |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | if (data[i].selected_role === 1) { |
| 227 | 227 | selected_role = data[i].id; |
| 228 | 228 | } |
| 229 | - html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of') . ' '; ?>' + data[i].title + '</option>'; |
|
| 229 | + html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of').' '; ?>' + data[i].title + '</option>'; |
|
| 230 | 230 | html_roles += '<option value="' + data[i].id + '">' + data[i].title + '</option>'; |
| 231 | 231 | } |
| 232 | 232 | $('#oauth_new_user_is_administrated_by') |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | }).fail(function(error) { |
| 256 | 256 | toastr.remove(); |
| 257 | 257 | toastr.error( |
| 258 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + error, |
|
| 258 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + error, |
|
| 259 | 259 | '', { |
| 260 | 260 | closeButton: true, |
| 261 | 261 | positionClass: 'toast-bottom-right' |
@@ -1836,7 +1836,7 @@ |
||
| 1836 | 1836 | '', |
| 1837 | 1837 | 'encrypt' |
| 1838 | 1838 | ); |
| 1839 | - } |
|
| 1839 | + } |
|
| 1840 | 1840 | |
| 1841 | 1841 | // Check if status or secret or phone number has changed |
| 1842 | 1842 | if (DB::count() > 0 |
@@ -1228,7 +1228,9 @@ discard block |
||
| 1228 | 1228 | ); |
| 1229 | 1229 | |
| 1230 | 1230 | // Create a task to create sharekeys for users |
| 1231 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1231 | + if (WIP=== true) { |
|
| 1232 | + error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1233 | + } |
|
| 1232 | 1234 | $tasksToBePerformed = ['item_password']; |
| 1233 | 1235 | $encryptionTaskIsRequested = true; |
| 1234 | 1236 | } else { |
@@ -1553,7 +1555,9 @@ discard block |
||
| 1553 | 1555 | |
| 1554 | 1556 | // create a task for all fields updated |
| 1555 | 1557 | if ($encryptionTaskIsRequested === true && (int) $dataItem['perso'] !== 1) { |
| 1556 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1558 | + if (WIP === true) { |
|
| 1559 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1560 | + } |
|
| 1557 | 1561 | createTaskForItem( |
| 1558 | 1562 | 'item_update_create_keys', |
| 1559 | 1563 | array_unique($tasksToBePerformed), |
@@ -2103,7 +2107,9 @@ discard block |
||
| 2103 | 2107 | $inputData['itemId'] |
| 2104 | 2108 | ); |
| 2105 | 2109 | foreach ($rows as $record) { |
| 2106 | - if ($record['raison'] === NULL) continue; |
|
| 2110 | + if ($record['raison'] === NULL) { |
|
| 2111 | + continue; |
|
| 2112 | + } |
|
| 2107 | 2113 | $reason = explode(':', $record['raison']); |
| 2108 | 2114 | if (count($reason) > 0) { |
| 2109 | 2115 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4819,8 +4825,9 @@ discard block |
||
| 4819 | 4825 | $ids = $tree->getDescendants($folder['id'], true, false, true); |
| 4820 | 4826 | |
| 4821 | 4827 | // This folder is owned by user |
| 4822 | - if (in_array($inputData['folderId'], $ids)) |
|
| 4823 | - $accessLevel = 30; |
|
| 4828 | + if (in_array($inputData['folderId'], $ids)) { |
|
| 4829 | + $accessLevel = 30; |
|
| 4830 | + } |
|
| 4824 | 4831 | } |
| 4825 | 4832 | } |
| 4826 | 4833 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | ) { |
| 80 | 80 | // Not allowed page |
| 81 | 81 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 82 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 82 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 83 | 83 | exit; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | date_default_timezone_set('UTC'); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
| 107 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
| 108 | 108 | header('Content-type: text/html; charset=utf-8'); |
| 109 | 109 | header('Cache-Control: no-cache, must-revalidate'); |
| 110 | 110 | |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | // About special settings |
| 366 | 366 | $dataFolderSettings = DB::queryFirstRow( |
| 367 | 367 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 368 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 368 | + FROM ' . prefixTable('nested_tree').' |
|
| 369 | 369 | WHERE id = %i', |
| 370 | 370 | $inputData['folderId'] |
| 371 | 371 | ); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | // Get folder complexity |
| 383 | 383 | $folderComplexity = DB::queryFirstRow( |
| 384 | 384 | 'SELECT valeur |
| 385 | - FROM ' . prefixTable('misc') . ' |
|
| 385 | + FROM ' . prefixTable('misc').' |
|
| 386 | 386 | WHERE type = %s AND intitule = %i', |
| 387 | 387 | 'complex', |
| 388 | 388 | $inputData['folderId'] |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | $itemExists = 0; |
| 408 | 408 | $newID = ''; |
| 409 | 409 | $data = DB::queryFirstRow( |
| 410 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 410 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 411 | 411 | WHERE label = %s AND inactif = %i', |
| 412 | 412 | $inputData['label'], |
| 413 | 413 | 0 |
@@ -488,8 +488,8 @@ discard block |
||
| 488 | 488 | (int) $post_folder_is_personal, |
| 489 | 489 | (int) $newID, |
| 490 | 490 | $cryptedStuff['objectKey'], |
| 491 | - true, // only for the item creator |
|
| 492 | - false, // no delete all |
|
| 491 | + true, // only for the item creator |
|
| 492 | + false, // no delete all |
|
| 493 | 493 | ); |
| 494 | 494 | |
| 495 | 495 | // update fields |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | // should we encrypt the data |
| 503 | 503 | $dataTmp = DB::queryFirstRow( |
| 504 | 504 | 'SELECT encrypted_data |
| 505 | - FROM ' . prefixTable('categories') . ' |
|
| 505 | + FROM ' . prefixTable('categories').' |
|
| 506 | 506 | WHERE id = %i', |
| 507 | 507 | $field['id'] |
| 508 | 508 | ); |
@@ -531,8 +531,8 @@ discard block |
||
| 531 | 531 | (int) $post_folder_is_personal, |
| 532 | 532 | (int) $newObjectId, |
| 533 | 533 | $cryptedStuff['objectKey'], |
| 534 | - true, // only for the item creator |
|
| 535 | - false, // no delete all |
|
| 534 | + true, // only for the item creator |
|
| 535 | + false, // no delete all |
|
| 536 | 536 | ); |
| 537 | 537 | |
| 538 | 538 | array_push( |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | ) { |
| 569 | 569 | DB::queryFirstRow( |
| 570 | 570 | 'SELECT * |
| 571 | - FROM ' . prefixTable('templates') . ' |
|
| 571 | + FROM ' . prefixTable('templates').' |
|
| 572 | 572 | WHERE item_id = %i', |
| 573 | 573 | $newID |
| 574 | 574 | ); |
@@ -637,11 +637,11 @@ discard block |
||
| 637 | 637 | ) { |
| 638 | 638 | foreach ($post_restricted_to as $userRest) { |
| 639 | 639 | if (empty($userRest) === false) { |
| 640 | - $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 640 | + $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 641 | 641 | if (empty($listOfRestricted)) { |
| 642 | 642 | $listOfRestricted = $dataTmp['login']; |
| 643 | 643 | } else { |
| 644 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 644 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 645 | 645 | } |
| 646 | 646 | } |
| 647 | 647 | } |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | if (empty($userRest) === false) { |
| 658 | 658 | $dataTmp = DB::queryFirstRow( |
| 659 | 659 | 'SELECT login |
| 660 | - FROM ' . prefixTable('users') . ' |
|
| 660 | + FROM ' . prefixTable('users').' |
|
| 661 | 661 | WHERE id= %i', |
| 662 | 662 | $userRest |
| 663 | 663 | ); |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | if (empty($oldRestrictionList) === true) { |
| 666 | 666 | $oldRestrictionList = $dataTmp['login']; |
| 667 | 667 | } else { |
| 668 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 668 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | } |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | if (empty($post_uploaded_file_id) === false) { |
| 729 | 729 | $rows = DB::query( |
| 730 | 730 | 'SELECT id |
| 731 | - FROM ' . prefixTable('files') . ' |
|
| 731 | + FROM ' . prefixTable('files').' |
|
| 732 | 732 | WHERE id_item = %s', |
| 733 | 733 | $post_uploaded_file_id |
| 734 | 734 | ); |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | $lang->get('email_subject_item_updated'), |
| 785 | 785 | str_replace( |
| 786 | 786 | array('#label', '#link'), |
| 787 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']), |
|
| 787 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']), |
|
| 788 | 788 | $lang->get('new_item_email_body') |
| 789 | 789 | ), |
| 790 | 790 | $emailAddress, |
@@ -888,11 +888,11 @@ discard block |
||
| 888 | 888 | // Prepare variables |
| 889 | 889 | $itemInfos = array(); |
| 890 | 890 | $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 891 | - $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 891 | + $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : ''; |
|
| 892 | 892 | $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : ''; |
| 893 | 893 | $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : ''; |
| 894 | - $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 895 | - $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 894 | + $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : ''; |
|
| 895 | + $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : ''; |
|
| 896 | 896 | $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT); |
| 897 | 897 | $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 898 | 898 | $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT); |
@@ -923,8 +923,7 @@ discard block |
||
| 923 | 923 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
| 924 | 924 | $dataReceived['to_be_deleted_after_date'], |
| 925 | 925 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
| 926 | - ) : |
|
| 927 | - ''; |
|
| 926 | + ) : ''; |
|
| 928 | 927 | $post_fields = (filter_var_array( |
| 929 | 928 | $dataReceived['fields'], |
| 930 | 929 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -984,7 +983,7 @@ discard block |
||
| 984 | 983 | // About special settings |
| 985 | 984 | $dataFolderSettings = DB::queryFirstRow( |
| 986 | 985 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
| 987 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 986 | + FROM ' . prefixTable('nested_tree').' |
|
| 988 | 987 | WHERE id = %i', |
| 989 | 988 | $inputData['folderId'] |
| 990 | 989 | ); |
@@ -1000,7 +999,7 @@ discard block |
||
| 1000 | 999 | // Get folder complexity |
| 1001 | 1000 | $folderComplexity = DB::queryFirstRow( |
| 1002 | 1001 | 'SELECT valeur |
| 1003 | - FROM ' . prefixTable('misc') . ' |
|
| 1002 | + FROM ' . prefixTable('misc').' |
|
| 1004 | 1003 | WHERE type = %s AND intitule = %i', |
| 1005 | 1004 | 'complex', |
| 1006 | 1005 | $inputData['folderId'] |
@@ -1045,8 +1044,8 @@ discard block |
||
| 1045 | 1044 | // Get all informations for this item |
| 1046 | 1045 | $dataItem = DB::queryFirstRow( |
| 1047 | 1046 | 'SELECT * |
| 1048 | - FROM ' . prefixTable('items') . ' as i |
|
| 1049 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1047 | + FROM ' . prefixTable('items').' as i |
|
| 1048 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1050 | 1049 | WHERE i.id=%i AND l.action = %s', |
| 1051 | 1050 | $inputData['itemId'], |
| 1052 | 1051 | 'at_creation' |
@@ -1088,7 +1087,7 @@ discard block |
||
| 1088 | 1087 | // Does the user has the sharekey for this item? |
| 1089 | 1088 | DB::query( |
| 1090 | 1089 | 'SELECT * |
| 1091 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1090 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1092 | 1091 | WHERE object_id = %i AND user_id = %s', |
| 1093 | 1092 | $inputData['itemId'], |
| 1094 | 1093 | $session->get('user-id') |
@@ -1149,9 +1148,9 @@ discard block |
||
| 1149 | 1148 | 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, |
| 1150 | 1149 | i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification, |
| 1151 | 1150 | u.login as user_login, u.email as user_email |
| 1152 | - FROM ' . prefixTable('items') . ' as i |
|
| 1153 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1154 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1151 | + FROM ' . prefixTable('items').' as i |
|
| 1152 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1153 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1155 | 1154 | WHERE i.id=%i', |
| 1156 | 1155 | $inputData['itemId'] |
| 1157 | 1156 | ); |
@@ -1159,7 +1158,7 @@ discard block |
||
| 1159 | 1158 | // Should we log a password change? |
| 1160 | 1159 | $userKey = DB::queryFirstRow( |
| 1161 | 1160 | 'SELECT share_key |
| 1162 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1161 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1163 | 1162 | WHERE user_id = %i AND object_id = %i', |
| 1164 | 1163 | $session->get('user-id'), |
| 1165 | 1164 | $inputData['itemId'] |
@@ -1223,12 +1222,12 @@ discard block |
||
| 1223 | 1222 | (int) $post_folder_is_personal, |
| 1224 | 1223 | (int) $inputData['itemId'], |
| 1225 | 1224 | $encrypted_password_key, |
| 1226 | - true, // only for the item creator |
|
| 1227 | - true, // delete all |
|
| 1225 | + true, // only for the item creator |
|
| 1226 | + true, // delete all |
|
| 1228 | 1227 | ); |
| 1229 | 1228 | |
| 1230 | 1229 | // Create a task to create sharekeys for users |
| 1231 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1230 | + if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw); |
|
| 1232 | 1231 | $tasksToBePerformed = ['item_password']; |
| 1233 | 1232 | $encryptionTaskIsRequested = true; |
| 1234 | 1233 | } else { |
@@ -1239,7 +1238,7 @@ discard block |
||
| 1239 | 1238 | // Get list of tags |
| 1240 | 1239 | $itemTags = DB::queryFirstColumn( |
| 1241 | 1240 | 'SELECT tag |
| 1242 | - FROM ' . prefixTable('tags') . ' |
|
| 1241 | + FROM ' . prefixTable('tags').' |
|
| 1243 | 1242 | WHERE item_id = %i', |
| 1244 | 1243 | $inputData['itemId'] |
| 1245 | 1244 | ); |
@@ -1285,7 +1284,7 @@ discard block |
||
| 1285 | 1284 | $session->get('user-id'), |
| 1286 | 1285 | 'at_modification', |
| 1287 | 1286 | $session->get('user-login'), |
| 1288 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1287 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1289 | 1288 | ); |
| 1290 | 1289 | } |
| 1291 | 1290 | |
@@ -1330,8 +1329,8 @@ discard block |
||
| 1330 | 1329 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1331 | 1330 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1332 | 1331 | c.masked AS masked, i.id AS field_item_id |
| 1333 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1334 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1332 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1333 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1335 | 1334 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1336 | 1335 | $field['id'], |
| 1337 | 1336 | $inputData['itemId'] |
@@ -1347,7 +1346,7 @@ discard block |
||
| 1347 | 1346 | // Perform new query |
| 1348 | 1347 | $dataTmpCat = DB::queryFirstRow( |
| 1349 | 1348 | 'SELECT id, title, encrypted_data, masked |
| 1350 | - FROM ' . prefixTable('categories') . ' |
|
| 1349 | + FROM ' . prefixTable('categories').' |
|
| 1351 | 1350 | WHERE id = %i', |
| 1352 | 1351 | $field['id'] |
| 1353 | 1352 | ); |
@@ -1377,8 +1376,8 @@ discard block |
||
| 1377 | 1376 | (int) $post_folder_is_personal, |
| 1378 | 1377 | (int) $newId, |
| 1379 | 1378 | $cryptedStuff['objectKey'], |
| 1380 | - true, // only for the item creator |
|
| 1381 | - true, // delete all |
|
| 1379 | + true, // only for the item creator |
|
| 1380 | + true, // delete all |
|
| 1382 | 1381 | ); |
| 1383 | 1382 | |
| 1384 | 1383 | // update value |
@@ -1428,7 +1427,7 @@ discard block |
||
| 1428 | 1427 | $session->get('user-id'), |
| 1429 | 1428 | 'at_modification', |
| 1430 | 1429 | $session->get('user-login'), |
| 1431 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1430 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1432 | 1431 | ); |
| 1433 | 1432 | } else { |
| 1434 | 1433 | // Case where the field already exists |
@@ -1437,7 +1436,7 @@ discard block |
||
| 1437 | 1436 | // Get user sharekey for this field |
| 1438 | 1437 | $userKey = DB::queryFirstRow( |
| 1439 | 1438 | 'SELECT share_key |
| 1440 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1439 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1441 | 1440 | WHERE user_id = %i AND object_id = %i', |
| 1442 | 1441 | $session->get('user-id'), |
| 1443 | 1442 | $dataTmpCat['field_item_id'] |
@@ -1476,8 +1475,8 @@ discard block |
||
| 1476 | 1475 | (int) $post_folder_is_personal, |
| 1477 | 1476 | (int) $dataTmpCat['field_item_id'], |
| 1478 | 1477 | $cryptedStuff['objectKey'], |
| 1479 | - true, // only for the item creator |
|
| 1480 | - true, // delete all |
|
| 1478 | + true, // only for the item creator |
|
| 1479 | + true, // delete all |
|
| 1481 | 1480 | ); |
| 1482 | 1481 | |
| 1483 | 1482 | if ($encryptedFieldIsChanged === false) { |
@@ -1519,7 +1518,7 @@ discard block |
||
| 1519 | 1518 | $session->get('user-id'), |
| 1520 | 1519 | 'at_modification', |
| 1521 | 1520 | $session->get('user-login'), |
| 1522 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1521 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1523 | 1522 | ); |
| 1524 | 1523 | } |
| 1525 | 1524 | } |
@@ -1573,7 +1572,7 @@ discard block |
||
| 1573 | 1572 | ) { |
| 1574 | 1573 | DB::queryFirstRow( |
| 1575 | 1574 | 'SELECT * |
| 1576 | - FROM ' . prefixTable('templates') . ' |
|
| 1575 | + FROM ' . prefixTable('templates').' |
|
| 1577 | 1576 | WHERE item_id = %i', |
| 1578 | 1577 | $inputData['itemId'] |
| 1579 | 1578 | ); |
@@ -1616,7 +1615,7 @@ discard block |
||
| 1616 | 1615 | // check if elem exists in Table. If not add it or update it. |
| 1617 | 1616 | DB::query( |
| 1618 | 1617 | 'SELECT * |
| 1619 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1618 | + FROM ' . prefixTable('automatic_del').' |
|
| 1620 | 1619 | WHERE item_id = %i', |
| 1621 | 1620 | $inputData['itemId'] |
| 1622 | 1621 | ); |
@@ -1643,7 +1642,7 @@ discard block |
||
| 1643 | 1642 | // Store updates performed |
| 1644 | 1643 | array_push( |
| 1645 | 1644 | $arrayOfChanges, |
| 1646 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled') |
|
| 1645 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled') |
|
| 1647 | 1646 | ); |
| 1648 | 1647 | |
| 1649 | 1648 | // update LOG |
@@ -1686,7 +1685,7 @@ discard block |
||
| 1686 | 1685 | // Store updates performed |
| 1687 | 1686 | array_push( |
| 1688 | 1687 | $arrayOfChanges, |
| 1689 | - $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled') |
|
| 1688 | + $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled') |
|
| 1690 | 1689 | ); |
| 1691 | 1690 | |
| 1692 | 1691 | // update LOG |
@@ -1714,7 +1713,7 @@ discard block |
||
| 1714 | 1713 | if (empty($userId) === false) { |
| 1715 | 1714 | $dataTmp = DB::queryFirstRow( |
| 1716 | 1715 | 'SELECT id, name, lastname |
| 1717 | - FROM ' . prefixTable('users') . ' |
|
| 1716 | + FROM ' . prefixTable('users').' |
|
| 1718 | 1717 | WHERE id= %i', |
| 1719 | 1718 | $userId |
| 1720 | 1719 | ); |
@@ -1722,7 +1721,7 @@ discard block |
||
| 1722 | 1721 | // Add to array |
| 1723 | 1722 | array_push( |
| 1724 | 1723 | $arrayOfUsersRestriction, |
| 1725 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1724 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1726 | 1725 | ); |
| 1727 | 1726 | array_push( |
| 1728 | 1727 | $arrayOfUsersIdRestriction, |
@@ -1753,8 +1752,8 @@ discard block |
||
| 1753 | 1752 | // get values before deleting them |
| 1754 | 1753 | $rows = DB::query( |
| 1755 | 1754 | 'SELECT t.title, t.id AS id |
| 1756 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1757 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1755 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1756 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1758 | 1757 | WHERE r.item_id = %i |
| 1759 | 1758 | ORDER BY t.title ASC', |
| 1760 | 1759 | $inputData['itemId'] |
@@ -1788,7 +1787,7 @@ discard block |
||
| 1788 | 1787 | ); |
| 1789 | 1788 | $dataTmp = DB::queryFirstRow( |
| 1790 | 1789 | 'SELECT title |
| 1791 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1790 | + FROM ' . prefixTable('roles_title').' |
|
| 1792 | 1791 | WHERE id = %i', |
| 1793 | 1792 | $role |
| 1794 | 1793 | ); |
@@ -1816,7 +1815,7 @@ discard block |
||
| 1816 | 1815 | // Get current status |
| 1817 | 1816 | $otpStatus = DB::queryFirstRow( |
| 1818 | 1817 | 'SELECT enabled as otp_is_enabled, phone_number, secret |
| 1819 | - FROM ' . prefixTable('items_otp') . ' |
|
| 1818 | + FROM ' . prefixTable('items_otp').' |
|
| 1820 | 1819 | WHERE item_id = %i', |
| 1821 | 1820 | $inputData['itemId'] |
| 1822 | 1821 | ); |
@@ -1830,7 +1829,7 @@ discard block |
||
| 1830 | 1829 | 'decrypt' |
| 1831 | 1830 | )['string']; |
| 1832 | 1831 | } else { |
| 1833 | - $currentsecret=''; |
|
| 1832 | + $currentsecret = ''; |
|
| 1834 | 1833 | } |
| 1835 | 1834 | |
| 1836 | 1835 | // If OTP secret provided then encrypt it |
@@ -1880,7 +1879,7 @@ discard block |
||
| 1880 | 1879 | $session->get('user-id'), |
| 1881 | 1880 | 'at_modification', |
| 1882 | 1881 | $session->get('user-login'), |
| 1883 | - 'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1882 | + 'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled') |
|
| 1884 | 1883 | ); |
| 1885 | 1884 | } |
| 1886 | 1885 | if ($otpStatus['phone_number'] !== $post_otp_phone_number) { |
@@ -1891,7 +1890,7 @@ discard block |
||
| 1891 | 1890 | $session->get('user-id'), |
| 1892 | 1891 | 'at_modification', |
| 1893 | 1892 | $session->get('user-login'), |
| 1894 | - 'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number |
|
| 1893 | + 'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number |
|
| 1895 | 1894 | ); |
| 1896 | 1895 | } |
| 1897 | 1896 | if ($currentsecret !== $post_otp_secret) { |
@@ -1940,8 +1939,8 @@ discard block |
||
| 1940 | 1939 | $session->get('user-id'), |
| 1941 | 1940 | 'at_modification', |
| 1942 | 1941 | $session->get('user-login'), |
| 1943 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1944 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1942 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1943 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1945 | 1944 | ); |
| 1946 | 1945 | } |
| 1947 | 1946 | |
@@ -1961,7 +1960,7 @@ discard block |
||
| 1961 | 1960 | $session->get('user-id'), |
| 1962 | 1961 | 'at_modification', |
| 1963 | 1962 | $session->get('user-login'), |
| 1964 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
| 1963 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
| 1965 | 1964 | ); |
| 1966 | 1965 | } |
| 1967 | 1966 | // LOGIN |
@@ -1980,7 +1979,7 @@ discard block |
||
| 1980 | 1979 | $session->get('user-id'), |
| 1981 | 1980 | 'at_modification', |
| 1982 | 1981 | $session->get('user-login'), |
| 1983 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1982 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1984 | 1983 | ); |
| 1985 | 1984 | } |
| 1986 | 1985 | |
@@ -1999,7 +1998,7 @@ discard block |
||
| 1999 | 1998 | $session->get('user-id'), |
| 2000 | 1999 | 'at_modification', |
| 2001 | 2000 | $session->get('user-login'), |
| 2002 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 2001 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 2003 | 2002 | ); |
| 2004 | 2003 | } |
| 2005 | 2004 | // URL |
@@ -2018,7 +2017,7 @@ discard block |
||
| 2018 | 2017 | $session->get('user-id'), |
| 2019 | 2018 | 'at_modification', |
| 2020 | 2019 | $session->get('user-login'), |
| 2021 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 2020 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 2022 | 2021 | ); |
| 2023 | 2022 | } |
| 2024 | 2023 | // DESCRIPTION |
@@ -2044,7 +2043,7 @@ discard block |
||
| 2044 | 2043 | // FOLDER |
| 2045 | 2044 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
| 2046 | 2045 | // Get name of folders |
| 2047 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2046 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
| 2048 | 2047 | |
| 2049 | 2048 | // Store updates performed |
| 2050 | 2049 | array_push( |
@@ -2060,7 +2059,7 @@ discard block |
||
| 2060 | 2059 | $session->get('user-id'), |
| 2061 | 2060 | 'at_modification', |
| 2062 | 2061 | $session->get('user-login'), |
| 2063 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 2062 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 2064 | 2063 | ); |
| 2065 | 2064 | } |
| 2066 | 2065 | // ANYONE_CAN_MODIFY |
@@ -2068,7 +2067,7 @@ discard block |
||
| 2068 | 2067 | // Store updates performed |
| 2069 | 2068 | array_push( |
| 2070 | 2069 | $arrayOfChanges, |
| 2071 | - $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2070 | + $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled')) |
|
| 2072 | 2071 | ); |
| 2073 | 2072 | |
| 2074 | 2073 | // Log |
@@ -2079,15 +2078,15 @@ discard block |
||
| 2079 | 2078 | $session->get('user-id'), |
| 2080 | 2079 | 'at_modification', |
| 2081 | 2080 | $session->get('user-login'), |
| 2082 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2081 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 2083 | 2082 | ); |
| 2084 | 2083 | } |
| 2085 | 2084 | |
| 2086 | 2085 | // Reload new values |
| 2087 | 2086 | $dataItem = DB::queryFirstRow( |
| 2088 | 2087 | 'SELECT * |
| 2089 | - FROM ' . prefixTable('items') . ' as i |
|
| 2090 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2088 | + FROM ' . prefixTable('items').' as i |
|
| 2089 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2091 | 2090 | WHERE i.id = %i AND l.action = %s', |
| 2092 | 2091 | $inputData['itemId'], |
| 2093 | 2092 | 'at_creation' |
@@ -2096,8 +2095,8 @@ discard block |
||
| 2096 | 2095 | $history = ''; |
| 2097 | 2096 | $rows = DB::query( |
| 2098 | 2097 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 2099 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 2100 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 2098 | + FROM ' . prefixTable('log_items').' as l |
|
| 2099 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 2101 | 2100 | WHERE l.action <> %s AND id_item=%s', |
| 2102 | 2101 | 'at_shown', |
| 2103 | 2102 | $inputData['itemId'] |
@@ -2106,14 +2105,14 @@ discard block |
||
| 2106 | 2105 | if ($record['raison'] === NULL) continue; |
| 2107 | 2106 | $reason = explode(':', $record['raison']); |
| 2108 | 2107 | if (count($reason) > 0) { |
| 2109 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
| 2110 | - . $record['login'] . ' - ' . $lang->get($record['action']) . ' - ' |
|
| 2111 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1] |
|
| 2108 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
| 2109 | + . $record['login'].' - '.$lang->get($record['action']).' - ' |
|
| 2110 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1] |
|
| 2112 | 2111 | : $lang->get(trim($reason[0]))) : ''); |
| 2113 | 2112 | if (empty($history)) { |
| 2114 | 2113 | $history = $sentence; |
| 2115 | 2114 | } else { |
| 2116 | - $history .= '<br />' . $sentence; |
|
| 2115 | + $history .= '<br />'.$sentence; |
|
| 2117 | 2116 | } |
| 2118 | 2117 | } |
| 2119 | 2118 | } |
@@ -2251,7 +2250,7 @@ discard block |
||
| 2251 | 2250 | ) { |
| 2252 | 2251 | // load the original record into an array |
| 2253 | 2252 | $originalRecord = DB::queryFirstRow( |
| 2254 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 2253 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 2255 | 2254 | WHERE id = %i', |
| 2256 | 2255 | $inputData['itemId'] |
| 2257 | 2256 | ); |
@@ -2270,7 +2269,7 @@ discard block |
||
| 2270 | 2269 | |
| 2271 | 2270 | // Load the destination folder record into an array |
| 2272 | 2271 | $dataDestination = DB::queryFirstRow( |
| 2273 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 2272 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 2274 | 2273 | WHERE id = %i', |
| 2275 | 2274 | $post_dest_id |
| 2276 | 2275 | ); |
@@ -2278,7 +2277,7 @@ discard block |
||
| 2278 | 2277 | // Get the ITEM object key for the user |
| 2279 | 2278 | $userKey = DB::queryFirstRow( |
| 2280 | 2279 | 'SELECT share_key |
| 2281 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2280 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2282 | 2281 | WHERE user_id = %i AND object_id = %i', |
| 2283 | 2282 | $session->get('user-id'), |
| 2284 | 2283 | $inputData['itemId'] |
@@ -2355,8 +2354,8 @@ discard block |
||
| 2355 | 2354 | // Manage Custom Fields |
| 2356 | 2355 | $rows = DB::query( |
| 2357 | 2356 | 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data |
| 2358 | - FROM ' . prefixTable('categories_items') . ' AS ci |
|
| 2359 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id) |
|
| 2357 | + FROM ' . prefixTable('categories_items').' AS ci |
|
| 2358 | + INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id) |
|
| 2360 | 2359 | WHERE ci.item_id = %i', |
| 2361 | 2360 | $inputData['itemId'] |
| 2362 | 2361 | ); |
@@ -2368,7 +2367,7 @@ discard block |
||
| 2368 | 2367 | // Get user key |
| 2369 | 2368 | $userKey = DB::queryFirstRow( |
| 2370 | 2369 | 'SELECT share_key |
| 2371 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2370 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2372 | 2371 | WHERE user_id = %i AND object_id = %i', |
| 2373 | 2372 | $session->get('user-id'), |
| 2374 | 2373 | $field['id'] |
@@ -2435,15 +2434,15 @@ discard block |
||
| 2435 | 2434 | $rows = DB::query( |
| 2436 | 2435 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2437 | 2436 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2438 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2439 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2437 | + FROM ' . prefixTable('files').' AS f |
|
| 2438 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2440 | 2439 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2441 | 2440 | $session->get('user-id'), |
| 2442 | 2441 | $inputData['itemId'] |
| 2443 | 2442 | ); |
| 2444 | 2443 | foreach ($rows as $record) { |
| 2445 | 2444 | // Check if file still exists |
| 2446 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2445 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2447 | 2446 | // Step1 - decrypt the file |
| 2448 | 2447 | // deepcode ignore PT: path is sanitized inside decryptFile() |
| 2449 | 2448 | $fileContent = decryptFile( |
@@ -2454,8 +2453,8 @@ discard block |
||
| 2454 | 2453 | |
| 2455 | 2454 | // Step2 - create file |
| 2456 | 2455 | // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database |
| 2457 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2458 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2456 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2457 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2459 | 2458 | if ($outstream === false) { |
| 2460 | 2459 | echo prepareExchangedData( |
| 2461 | 2460 | array( |
@@ -2528,7 +2527,7 @@ discard block |
||
| 2528 | 2527 | |
| 2529 | 2528 | // ------------------------- |
| 2530 | 2529 | // Add specific restrictions |
| 2531 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2530 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2532 | 2531 | foreach ($rows as $record) { |
| 2533 | 2532 | DB::insert( |
| 2534 | 2533 | prefixTable('restriction_to_roles'), |
@@ -2540,7 +2539,7 @@ discard block |
||
| 2540 | 2539 | } |
| 2541 | 2540 | |
| 2542 | 2541 | // Add Tags |
| 2543 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
| 2542 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
| 2544 | 2543 | foreach ($rows as $record) { |
| 2545 | 2544 | DB::insert( |
| 2546 | 2545 | prefixTable('tags'), |
@@ -2642,7 +2641,7 @@ discard block |
||
| 2642 | 2641 | // then we can show it |
| 2643 | 2642 | $item_deleted = DB::queryFirstRow( |
| 2644 | 2643 | 'SELECT * |
| 2645 | - FROM ' . prefixTable('log_items') . ' |
|
| 2644 | + FROM ' . prefixTable('log_items').' |
|
| 2646 | 2645 | WHERE id_item = %i AND action = %s |
| 2647 | 2646 | ORDER BY date DESC |
| 2648 | 2647 | LIMIT 0, 1', |
@@ -2653,7 +2652,7 @@ discard block |
||
| 2653 | 2652 | |
| 2654 | 2653 | $item_restored = DB::queryFirstRow( |
| 2655 | 2654 | 'SELECT * |
| 2656 | - FROM ' . prefixTable('log_items') . ' |
|
| 2655 | + FROM ' . prefixTable('log_items').' |
|
| 2657 | 2656 | WHERE id_item = %i AND action = %s |
| 2658 | 2657 | ORDER BY date DESC |
| 2659 | 2658 | LIMIT 0, 1', |
@@ -2677,8 +2676,8 @@ discard block |
||
| 2677 | 2676 | // Get all informations for this item |
| 2678 | 2677 | $dataItem = DB::queryFirstRow( |
| 2679 | 2678 | 'SELECT * |
| 2680 | - FROM ' . prefixTable('items') . ' as i |
|
| 2681 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2679 | + FROM ' . prefixTable('items').' as i |
|
| 2680 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2682 | 2681 | WHERE i.id = %i AND l.action = %s', |
| 2683 | 2682 | $inputData['id'], |
| 2684 | 2683 | 'at_creation' |
@@ -2687,7 +2686,7 @@ discard block |
||
| 2687 | 2686 | // Notification |
| 2688 | 2687 | DB::queryFirstRow( |
| 2689 | 2688 | 'SELECT * |
| 2690 | - FROM ' . prefixTable('notification') . ' |
|
| 2689 | + FROM ' . prefixTable('notification').' |
|
| 2691 | 2690 | WHERE item_id = %i AND user_id = %i', |
| 2692 | 2691 | $inputData['id'], |
| 2693 | 2692 | $session->get('user-id') |
@@ -2706,7 +2705,7 @@ discard block |
||
| 2706 | 2705 | |
| 2707 | 2706 | // manage case of API user |
| 2708 | 2707 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2709 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2708 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2710 | 2709 | $arrData['id_user'] = API_USER_ID; |
| 2711 | 2710 | $arrData['author_email'] = ''; |
| 2712 | 2711 | $arrData['notification_status'] = false; |
@@ -2716,7 +2715,7 @@ discard block |
||
| 2716 | 2715 | $tags = array(); |
| 2717 | 2716 | $rows = DB::query( |
| 2718 | 2717 | 'SELECT tag |
| 2719 | - FROM ' . prefixTable('tags') . ' |
|
| 2718 | + FROM ' . prefixTable('tags').' |
|
| 2720 | 2719 | WHERE item_id = %i', |
| 2721 | 2720 | $inputData['id'] |
| 2722 | 2721 | ); |
@@ -2740,7 +2739,7 @@ discard block |
||
| 2740 | 2739 | // Check if user has a role that is accepted |
| 2741 | 2740 | $rows_tmp = DB::query( |
| 2742 | 2741 | 'SELECT role_id |
| 2743 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2742 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2744 | 2743 | WHERE item_id=%i', |
| 2745 | 2744 | $inputData['id'] |
| 2746 | 2745 | ); |
@@ -2754,7 +2753,7 @@ discard block |
||
| 2754 | 2753 | // Get the object key for the user |
| 2755 | 2754 | $userKeys = DB::query( |
| 2756 | 2755 | 'SELECT share_key |
| 2757 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2756 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2758 | 2757 | WHERE user_id = %i AND object_id = %i', |
| 2759 | 2758 | $session->get('user-id'), |
| 2760 | 2759 | $inputData['id'] |
@@ -2867,8 +2866,8 @@ discard block |
||
| 2867 | 2866 | // Add restriction if item is restricted to roles |
| 2868 | 2867 | $rows = DB::query( |
| 2869 | 2868 | 'SELECT t.title, t.id |
| 2870 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2871 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2869 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2870 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2872 | 2871 | WHERE r.item_id = %i |
| 2873 | 2872 | ORDER BY t.title ASC', |
| 2874 | 2873 | $inputData['id'] |
@@ -2884,8 +2883,8 @@ discard block |
||
| 2884 | 2883 | $tmp = array(); |
| 2885 | 2884 | $rows = DB::query( |
| 2886 | 2885 | 'SELECT k.label, k.id |
| 2887 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2888 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2886 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2887 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2889 | 2888 | WHERE i.item_id = %i |
| 2890 | 2889 | ORDER BY k.label ASC', |
| 2891 | 2890 | $inputData['id'] |
@@ -2968,7 +2967,7 @@ discard block |
||
| 2968 | 2967 | $arrCatList = array(); |
| 2969 | 2968 | $rows_tmp = DB::query( |
| 2970 | 2969 | 'SELECT id_category |
| 2971 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2970 | + FROM ' . prefixTable('categories_folders').' |
|
| 2972 | 2971 | WHERE id_folder=%i', |
| 2973 | 2972 | $inputData['folderId'] |
| 2974 | 2973 | ); |
@@ -2983,8 +2982,8 @@ discard block |
||
| 2983 | 2982 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2984 | 2983 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
| 2985 | 2984 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2986 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2987 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2985 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2986 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2988 | 2987 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2989 | 2988 | $inputData['id'], |
| 2990 | 2989 | $arrCatList |
@@ -2995,7 +2994,7 @@ discard block |
||
| 2995 | 2994 | //db::debugmode(true); |
| 2996 | 2995 | $userKey = DB::queryFirstRow( |
| 2997 | 2996 | 'SELECT share_key |
| 2998 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2997 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2999 | 2998 | WHERE user_id = %i AND object_id = %i', |
| 3000 | 2999 | $session->get('user-id'), |
| 3001 | 3000 | $row['id'] |
@@ -3013,7 +3012,7 @@ discard block |
||
| 3013 | 3012 | } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) { |
| 3014 | 3013 | // Data is not encrypted in DB |
| 3015 | 3014 | $fieldText = [ |
| 3016 | - 'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 3015 | + 'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : |
|
| 3017 | 3016 | 'encrypted' => false, |
| 3018 | 3017 | 'error' => false, |
| 3019 | 3018 | ]; |
@@ -3058,7 +3057,7 @@ discard block |
||
| 3058 | 3057 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 3059 | 3058 | $rows_tmp = DB::queryFirstRow( |
| 3060 | 3059 | 'SELECT category_id |
| 3061 | - FROM ' . prefixTable('templates') . ' |
|
| 3060 | + FROM ' . prefixTable('templates').' |
|
| 3062 | 3061 | WHERE item_id = %i', |
| 3063 | 3062 | $inputData['id'] |
| 3064 | 3063 | ); |
@@ -3075,7 +3074,7 @@ discard block |
||
| 3075 | 3074 | // Evaluate if item is ready for all users |
| 3076 | 3075 | $rows_tmp = DB::queryFirstRow( |
| 3077 | 3076 | 'SELECT finished_at |
| 3078 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3077 | + FROM ' . prefixTable('background_tasks').' |
|
| 3079 | 3078 | WHERE item_id = %i', |
| 3080 | 3079 | $inputData['id'] |
| 3081 | 3080 | ); |
@@ -3092,7 +3091,7 @@ discard block |
||
| 3092 | 3091 | // Is the Item to be deleted? |
| 3093 | 3092 | $dataDelete = DB::queryFirstRow( |
| 3094 | 3093 | 'SELECT * |
| 3095 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 3094 | + FROM ' . prefixTable('automatic_del').' |
|
| 3096 | 3095 | WHERE item_id = %i', |
| 3097 | 3096 | $inputData['id'] |
| 3098 | 3097 | ); |
@@ -3173,14 +3172,14 @@ discard block |
||
| 3173 | 3172 | if (empty($userRest) === false) { |
| 3174 | 3173 | $dataTmp = DB::queryFirstRow( |
| 3175 | 3174 | 'SELECT login |
| 3176 | - FROM ' . prefixTable('users') . ' |
|
| 3175 | + FROM ' . prefixTable('users').' |
|
| 3177 | 3176 | WHERE id= %i', |
| 3178 | 3177 | $userRest |
| 3179 | 3178 | ); |
| 3180 | 3179 | if (empty($listOfRestricted)) { |
| 3181 | 3180 | $listOfRestricted = $dataTmp['login']; |
| 3182 | 3181 | } else { |
| 3183 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 3182 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 3184 | 3183 | } |
| 3185 | 3184 | } |
| 3186 | 3185 | } |
@@ -3254,9 +3253,9 @@ discard block |
||
| 3254 | 3253 | // Load item data |
| 3255 | 3254 | $dataItem = DB::queryFirstRow( |
| 3256 | 3255 | '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 |
| 3257 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3258 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3259 | - LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id) |
|
| 3256 | + FROM ' . prefixTable('items').' AS i |
|
| 3257 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3258 | + LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id) |
|
| 3260 | 3259 | WHERE i.id = %i', |
| 3261 | 3260 | $inputData['id'] |
| 3262 | 3261 | ); |
@@ -3278,7 +3277,7 @@ discard block |
||
| 3278 | 3277 | // Check if user has a role that is accepted |
| 3279 | 3278 | $rows_tmp = DB::query( |
| 3280 | 3279 | 'SELECT role_id |
| 3281 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3280 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3282 | 3281 | WHERE item_id=%i', |
| 3283 | 3282 | $inputData['id'] |
| 3284 | 3283 | ); |
@@ -3310,12 +3309,12 @@ discard block |
||
| 3310 | 3309 | // launch query |
| 3311 | 3310 | $rows = DB::query( |
| 3312 | 3311 | 'SELECT id, name, file, extension, size |
| 3313 | - FROM ' . prefixTable('files') . ' |
|
| 3312 | + FROM ' . prefixTable('files').' |
|
| 3314 | 3313 | WHERE id_item = %i AND confirmed = 1', |
| 3315 | 3314 | $inputData['id'] |
| 3316 | 3315 | ); |
| 3317 | 3316 | foreach ($rows as $record) { |
| 3318 | - $filename = basename($record['name'], '.' . $record['extension']); |
|
| 3317 | + $filename = basename($record['name'], '.'.$record['extension']); |
|
| 3319 | 3318 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 3320 | 3319 | |
| 3321 | 3320 | array_push( |
@@ -3328,7 +3327,7 @@ discard block |
||
| 3328 | 3327 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
| 3329 | 3328 | 'id' => $record['id'], |
| 3330 | 3329 | 'key' => $session->get('user-key_tmp'), |
| 3331 | - 'internalFilename' => basename($record['name'], '.' . $record['extension']), |
|
| 3330 | + 'internalFilename' => basename($record['name'], '.'.$record['extension']), |
|
| 3332 | 3331 | ) |
| 3333 | 3332 | ); |
| 3334 | 3333 | } |
@@ -3366,7 +3365,7 @@ discard block |
||
| 3366 | 3365 | array( |
| 3367 | 3366 | 'latest_items' => implode(';', $session->get('user-latest_items')), |
| 3368 | 3367 | ), |
| 3369 | - 'id=' . $session->get('user-id') |
|
| 3368 | + 'id='.$session->get('user-id') |
|
| 3370 | 3369 | ); |
| 3371 | 3370 | } |
| 3372 | 3371 | |
@@ -3375,8 +3374,8 @@ discard block |
||
| 3375 | 3374 | $listOptionsForRoles = array(); |
| 3376 | 3375 | $rows = DB::query( |
| 3377 | 3376 | 'SELECT r.role_id AS role_id, t.title AS title |
| 3378 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 3379 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 3377 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 3378 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 3380 | 3379 | WHERE r.folder_id = %i', |
| 3381 | 3380 | $dataItem['id_tree'] |
| 3382 | 3381 | ); |
@@ -3390,9 +3389,9 @@ discard block |
||
| 3390 | 3389 | ); |
| 3391 | 3390 | $rows2 = DB::query( |
| 3392 | 3391 | 'SELECT id, login, fonction_id, email, name, lastname |
| 3393 | - FROM ' . prefixTable('users') . ' |
|
| 3392 | + FROM ' . prefixTable('users').' |
|
| 3394 | 3393 | WHERE fonction_id LIKE %s', |
| 3395 | - '%' . $record['role_id'] . '%' |
|
| 3394 | + '%'.$record['role_id'].'%' |
|
| 3396 | 3395 | ); |
| 3397 | 3396 | foreach ($rows2 as $record2) { |
| 3398 | 3397 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3405,7 +3404,7 @@ discard block |
||
| 3405 | 3404 | array( |
| 3406 | 3405 | 'id' => (int) $record2['id'], |
| 3407 | 3406 | 'login' => $record2['login'], |
| 3408 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 3407 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 3409 | 3408 | 'email' => $record2['email'], |
| 3410 | 3409 | ) |
| 3411 | 3410 | ); |
@@ -3424,16 +3423,16 @@ discard block |
||
| 3424 | 3423 | $path = ''; |
| 3425 | 3424 | foreach ($arbo as $elem) { |
| 3426 | 3425 | if (empty($path) === true) { |
| 3427 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 3426 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 3428 | 3427 | } else { |
| 3429 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3428 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 3430 | 3429 | } |
| 3431 | 3430 | } |
| 3432 | 3431 | // Build text to show user |
| 3433 | 3432 | if (empty($path) === true) { |
| 3434 | 3433 | $path = addslashes($dataItem['label']); |
| 3435 | 3434 | } else { |
| 3436 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 3435 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 3437 | 3436 | } |
| 3438 | 3437 | |
| 3439 | 3438 | // Add Admins to notification list if expected |
@@ -3456,7 +3455,7 @@ discard block |
||
| 3456 | 3455 | array( |
| 3457 | 3456 | addslashes($session->get('user-login')), |
| 3458 | 3457 | $path, |
| 3459 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 3458 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 3460 | 3459 | ), |
| 3461 | 3460 | $lang->get('email_on_open_notification_mail') |
| 3462 | 3461 | ), |
@@ -3466,7 +3465,7 @@ discard block |
||
| 3466 | 3465 | } |
| 3467 | 3466 | |
| 3468 | 3467 | // has this item a change proposal |
| 3469 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
| 3468 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
| 3470 | 3469 | $returnArray['has_change_proposal'] = DB::count(); |
| 3471 | 3470 | |
| 3472 | 3471 | // Setting |
@@ -3477,7 +3476,7 @@ discard block |
||
| 3477 | 3476 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
| 3478 | 3477 | DB::query( |
| 3479 | 3478 | 'SELECT * |
| 3480 | - FROM ' . prefixTable('otv') . ' |
|
| 3479 | + FROM ' . prefixTable('otv').' |
|
| 3481 | 3480 | WHERE item_id = %i |
| 3482 | 3481 | AND time_limit > %i', |
| 3483 | 3482 | $inputData['id'], |
@@ -3576,7 +3575,7 @@ discard block |
||
| 3576 | 3575 | // Load item data |
| 3577 | 3576 | $data = DB::queryFirstRow( |
| 3578 | 3577 | 'SELECT id_tree, id, label |
| 3579 | - FROM ' . prefixTable('items') . ' |
|
| 3578 | + FROM ' . prefixTable('items').' |
|
| 3580 | 3579 | WHERE id = %i OR item_key = %s', |
| 3581 | 3580 | $inputData['itemId'], |
| 3582 | 3581 | $inputData['itemKey'] |
@@ -3667,7 +3666,7 @@ discard block |
||
| 3667 | 3666 | // Load item data |
| 3668 | 3667 | $dataItem = DB::queryFirstRow( |
| 3669 | 3668 | 'SELECT secret, enabled |
| 3670 | - FROM ' . prefixTable('items_otp') . ' |
|
| 3669 | + FROM ' . prefixTable('items_otp').' |
|
| 3671 | 3670 | WHERE item_id = %i', |
| 3672 | 3671 | $inputData['id'] |
| 3673 | 3672 | ); |
@@ -3749,13 +3748,13 @@ discard block |
||
| 3749 | 3748 | |
| 3750 | 3749 | // Check if user is allowed to access this folder |
| 3751 | 3750 | if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) { |
| 3752 | - echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]'; |
|
| 3751 | + echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]'; |
|
| 3753 | 3752 | break; |
| 3754 | 3753 | } |
| 3755 | 3754 | |
| 3756 | 3755 | // Check if title doesn't contains html codes |
| 3757 | 3756 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3758 | - echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]'; |
|
| 3757 | + echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]'; |
|
| 3759 | 3758 | break; |
| 3760 | 3759 | } |
| 3761 | 3760 | // check that title is not numeric |
@@ -3766,9 +3765,9 @@ discard block |
||
| 3766 | 3765 | |
| 3767 | 3766 | // Check if duplicate folders name are allowed |
| 3768 | 3767 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3769 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3768 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3770 | 3769 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3771 | - echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]'; |
|
| 3770 | + echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]'; |
|
| 3772 | 3771 | break; |
| 3773 | 3772 | } |
| 3774 | 3773 | } |
@@ -3776,7 +3775,7 @@ discard block |
||
| 3776 | 3775 | // query on folder |
| 3777 | 3776 | $data = DB::queryFirstRow( |
| 3778 | 3777 | 'SELECT parent_id, personal_folder |
| 3779 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3778 | + FROM ' . prefixTable('nested_tree').' |
|
| 3780 | 3779 | WHERE id = %i', |
| 3781 | 3780 | $inputData['folderId'] |
| 3782 | 3781 | ); |
@@ -3786,20 +3785,20 @@ discard block |
||
| 3786 | 3785 | if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') { |
| 3787 | 3786 | $data = DB::queryFirstRow( |
| 3788 | 3787 | 'SELECT valeur |
| 3789 | - FROM ' . prefixTable('misc') . ' |
|
| 3788 | + FROM ' . prefixTable('misc').' |
|
| 3790 | 3789 | WHERE intitule = %i AND type = %s', |
| 3791 | 3790 | $data['parent_id'], |
| 3792 | 3791 | 'complex' |
| 3793 | 3792 | ); |
| 3794 | 3793 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3795 | - echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3794 | + echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3796 | 3795 | break; |
| 3797 | 3796 | } |
| 3798 | 3797 | } |
| 3799 | 3798 | |
| 3800 | 3799 | // update Folders table |
| 3801 | 3800 | $tmp = DB::queryFirstRow( |
| 3802 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3801 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3803 | 3802 | $dataReceived['folder'] |
| 3804 | 3803 | ); |
| 3805 | 3804 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) { |
@@ -3913,7 +3912,7 @@ discard block |
||
| 3913 | 3912 | $uniqueLoadData['path'] = $arr_arbo; |
| 3914 | 3913 | |
| 3915 | 3914 | // store last folder accessed in cookie |
| 3916 | - $arr_cookie_options = array ( |
|
| 3915 | + $arr_cookie_options = array( |
|
| 3917 | 3916 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
| 3918 | 3917 | 'path' => '/', |
| 3919 | 3918 | 'secure' => true, |
@@ -3928,7 +3927,7 @@ discard block |
||
| 3928 | 3927 | foreach ($session->get('user-roles_array') as $role) { |
| 3929 | 3928 | $roleQ = DB::queryFirstRow( |
| 3930 | 3929 | 'SELECT allow_pw_change |
| 3931 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3930 | + FROM ' . prefixTable('roles_title').' |
|
| 3932 | 3931 | WHERE id = %i', |
| 3933 | 3932 | $role |
| 3934 | 3933 | ); |
@@ -3959,11 +3958,11 @@ discard block |
||
| 3959 | 3958 | |
| 3960 | 3959 | foreach ($session->get('user-roles_array') as $role) { |
| 3961 | 3960 | $access = DB::queryFirstRow( |
| 3962 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3961 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3963 | 3962 | $role, |
| 3964 | 3963 | $inputData['id'] |
| 3965 | 3964 | ); |
| 3966 | - if (DB::count()>0) { |
|
| 3965 | + if (DB::count() > 0) { |
|
| 3967 | 3966 | if ($access['type'] === 'R') { |
| 3968 | 3967 | array_push($arrTmp, 10); |
| 3969 | 3968 | } elseif ($access['type'] === 'W') { |
@@ -4028,7 +4027,7 @@ discard block |
||
| 4028 | 4027 | } else { |
| 4029 | 4028 | DB::query( |
| 4030 | 4029 | 'SELECT * |
| 4031 | - FROM ' . prefixTable('items') . ' |
|
| 4030 | + FROM ' . prefixTable('items').' |
|
| 4032 | 4031 | WHERE inactif = %i', |
| 4033 | 4032 | 0 |
| 4034 | 4033 | ); |
@@ -4038,7 +4037,7 @@ discard block |
||
| 4038 | 4037 | |
| 4039 | 4038 | // Get folder complexity |
| 4040 | 4039 | $folderComplexity = DB::queryFirstRow( |
| 4041 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 4040 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 4042 | 4041 | 'complex', |
| 4043 | 4042 | $inputData['id'] |
| 4044 | 4043 | ); |
@@ -4050,7 +4049,7 @@ discard block |
||
| 4050 | 4049 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 4051 | 4050 | $folderRow = DB::query( |
| 4052 | 4051 | 'SELECT id_category |
| 4053 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 4052 | + FROM ' . prefixTable('categories_folders').' |
|
| 4054 | 4053 | WHERE id_folder = %i', |
| 4055 | 4054 | $inputData['id'] |
| 4056 | 4055 | ); |
@@ -4106,8 +4105,8 @@ discard block |
||
| 4106 | 4105 | $where->add('i.inactif=%i', 0); |
| 4107 | 4106 | $where->add('i.deleted_at IS NULL'); |
| 4108 | 4107 | |
| 4109 | - $query_limit = ' LIMIT ' . |
|
| 4110 | - $start . ',' . |
|
| 4108 | + $query_limit = ' LIMIT '. |
|
| 4109 | + $start.','. |
|
| 4111 | 4110 | $post_nb_items_to_display_once; |
| 4112 | 4111 | |
| 4113 | 4112 | $rows = DB::query( |
@@ -4115,8 +4114,8 @@ discard block |
||
| 4115 | 4114 | i.label, i.description, i.pw, i.login, |
| 4116 | 4115 | i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon, |
| 4117 | 4116 | n.renewal_period, i.url AS link, i.email |
| 4118 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4119 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4117 | + FROM ' . prefixTable('items').' AS i |
|
| 4118 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4120 | 4119 | WHERE %l |
| 4121 | 4120 | ORDER BY i.label ASC' . $query_limit, |
| 4122 | 4121 | $where |
@@ -4130,8 +4129,8 @@ discard block |
||
| 4130 | 4129 | i.label, i.description, i.pw, i.login, |
| 4131 | 4130 | i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon, |
| 4132 | 4131 | n.renewal_period, i.url AS link, i.email |
| 4133 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4134 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 4132 | + FROM ' . prefixTable('items').' AS i |
|
| 4133 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 4135 | 4134 | WHERE %l |
| 4136 | 4135 | ORDER BY i.label ASC', |
| 4137 | 4136 | $where |
@@ -4161,7 +4160,7 @@ discard block |
||
| 4161 | 4160 | $item_is_restricted_to_role = false; |
| 4162 | 4161 | DB::queryFirstRow( |
| 4163 | 4162 | 'SELECT role_id |
| 4164 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4163 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4165 | 4164 | WHERE item_id = %i', |
| 4166 | 4165 | $record['id'] |
| 4167 | 4166 | ); |
@@ -4173,7 +4172,7 @@ discard block |
||
| 4173 | 4172 | $user_is_included_in_role = false; |
| 4174 | 4173 | DB::query( |
| 4175 | 4174 | 'SELECT role_id |
| 4176 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 4175 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 4177 | 4176 | WHERE item_id = %i AND role_id IN %ls', |
| 4178 | 4177 | $record['id'], |
| 4179 | 4178 | $session->get('user-roles_array') |
@@ -4383,8 +4382,8 @@ discard block |
||
| 4383 | 4382 | if ((int) $start === 0) { |
| 4384 | 4383 | DB::query( |
| 4385 | 4384 | 'SELECT i.id |
| 4386 | - FROM ' . prefixTable('items') . ' as i |
|
| 4387 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 4385 | + FROM ' . prefixTable('items').' as i |
|
| 4386 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 4388 | 4387 | WHERE %l', |
| 4389 | 4388 | $where |
| 4390 | 4389 | ); |
@@ -4444,8 +4443,8 @@ discard block |
||
| 4444 | 4443 | $dataItem = DB::queryFirstRow( |
| 4445 | 4444 | 'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id, |
| 4446 | 4445 | i.label AS label, i.id_tree AS id_tree |
| 4447 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4448 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4446 | + FROM ' . prefixTable('items').' AS i |
|
| 4447 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4449 | 4448 | WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)', |
| 4450 | 4449 | $session->get('user-id'), |
| 4451 | 4450 | $inputData['itemKey'] ?? '', |
@@ -4557,7 +4556,7 @@ discard block |
||
| 4557 | 4556 | // do query on this folder |
| 4558 | 4557 | $data_this_folder = DB::queryFirstRow( |
| 4559 | 4558 | 'SELECT id, personal_folder, title |
| 4560 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4559 | + FROM ' . prefixTable('nested_tree').' |
|
| 4561 | 4560 | WHERE id = %s', |
| 4562 | 4561 | $inputData['folderId'] |
| 4563 | 4562 | ); |
@@ -4597,8 +4596,8 @@ discard block |
||
| 4597 | 4596 | $visibilite = ''; |
| 4598 | 4597 | $data = DB::queryFirstRow( |
| 4599 | 4598 | 'SELECT m.valeur, n.personal_folder |
| 4600 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4601 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4599 | + FROM ' . prefixTable('misc').' AS m |
|
| 4600 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4602 | 4601 | WHERE type=%s AND intitule = %s', |
| 4603 | 4602 | 'complex', |
| 4604 | 4603 | $inputData['folderId'] |
@@ -4611,8 +4610,8 @@ discard block |
||
| 4611 | 4610 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4612 | 4611 | $rows = DB::query( |
| 4613 | 4612 | 'SELECT t.title |
| 4614 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4615 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4613 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4614 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4616 | 4615 | WHERE v.folder_id = %i |
| 4617 | 4616 | GROUP BY title', |
| 4618 | 4617 | $inputData['folderId'] |
@@ -4621,7 +4620,7 @@ discard block |
||
| 4621 | 4620 | if (empty($visibilite)) { |
| 4622 | 4621 | $visibilite = $record['title']; |
| 4623 | 4622 | } else { |
| 4624 | - $visibilite .= ' - ' . $record['title']; |
|
| 4623 | + $visibilite .= ' - '.$record['title']; |
|
| 4625 | 4624 | } |
| 4626 | 4625 | } |
| 4627 | 4626 | } else { |
@@ -4631,14 +4630,14 @@ discard block |
||
| 4631 | 4630 | // do new query to know if current folder is pf |
| 4632 | 4631 | $data_pf = DB::queryFirstRow( |
| 4633 | 4632 | 'SELECT personal_folder |
| 4634 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4633 | + FROM ' . prefixTable('nested_tree').' |
|
| 4635 | 4634 | WHERE id = %s', |
| 4636 | 4635 | $inputData['folderId'] |
| 4637 | 4636 | ); |
| 4638 | 4637 | |
| 4639 | 4638 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4640 | 4639 | |
| 4641 | - $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')'; |
|
| 4640 | + $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')'; |
|
| 4642 | 4641 | } |
| 4643 | 4642 | |
| 4644 | 4643 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4648,8 +4647,8 @@ discard block |
||
| 4648 | 4647 | $listOptionsForRoles = array(); |
| 4649 | 4648 | $rows = DB::query( |
| 4650 | 4649 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4651 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4652 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4650 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4651 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4653 | 4652 | WHERE r.folder_id = %i', |
| 4654 | 4653 | $inputData['folderId'] |
| 4655 | 4654 | ); |
@@ -4663,7 +4662,7 @@ discard block |
||
| 4663 | 4662 | ); |
| 4664 | 4663 | $rows2 = DB::query( |
| 4665 | 4664 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4666 | - FROM ' . prefixTable('users') . ' |
|
| 4665 | + FROM ' . prefixTable('users').' |
|
| 4667 | 4666 | WHERE admin = 0 AND fonction_id is not null' |
| 4668 | 4667 | ); |
| 4669 | 4668 | foreach ($rows2 as $record2) { |
@@ -4677,7 +4676,7 @@ discard block |
||
| 4677 | 4676 | array( |
| 4678 | 4677 | 'id' => $record2['id'], |
| 4679 | 4678 | 'login' => $record2['login'], |
| 4680 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4679 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4681 | 4680 | 'email' => $record2['email'], |
| 4682 | 4681 | ) |
| 4683 | 4682 | ); |
@@ -4694,12 +4693,12 @@ discard block |
||
| 4694 | 4693 | foreach ($session->get('user-roles_array') as $role) { |
| 4695 | 4694 | $access = DB::queryFirstRow( |
| 4696 | 4695 | 'SELECT type |
| 4697 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4696 | + FROM ' . prefixTable('roles_values').' |
|
| 4698 | 4697 | WHERE role_id = %i AND folder_id = %i', |
| 4699 | 4698 | $role, |
| 4700 | 4699 | $inputData['folderId'] |
| 4701 | 4700 | ); |
| 4702 | - if (DB::count()>0) { |
|
| 4701 | + if (DB::count() > 0) { |
|
| 4703 | 4702 | if ($access['type'] === 'R') { |
| 4704 | 4703 | array_push($arrTmp, 10); |
| 4705 | 4704 | } elseif ($access['type'] === 'W') { |
@@ -4727,7 +4726,7 @@ discard block |
||
| 4727 | 4726 | // Check if personal folder is owned by user |
| 4728 | 4727 | $folder = DB::queryFirstRow( |
| 4729 | 4728 | 'SELECT id |
| 4730 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4729 | + FROM ' . prefixTable('nested_tree').' |
|
| 4731 | 4730 | WHERE title = %s', |
| 4732 | 4731 | $session->get('user-id'), |
| 4733 | 4732 | ); |
@@ -4832,7 +4831,7 @@ discard block |
||
| 4832 | 4831 | // Get some info before deleting |
| 4833 | 4832 | $data = DB::queryFirstRow( |
| 4834 | 4833 | 'SELECT name, id_item, file |
| 4835 | - FROM ' . prefixTable('files') . ' |
|
| 4834 | + FROM ' . prefixTable('files').' |
|
| 4836 | 4835 | WHERE id = %i', |
| 4837 | 4836 | $fileId |
| 4838 | 4837 | ); |
@@ -4840,7 +4839,7 @@ discard block |
||
| 4840 | 4839 | // Load item data |
| 4841 | 4840 | $data_item = DB::queryFirstRow( |
| 4842 | 4841 | 'SELECT id_tree |
| 4843 | - FROM ' . prefixTable('items') . ' |
|
| 4842 | + FROM ' . prefixTable('items').' |
|
| 4844 | 4843 | WHERE id = %i', |
| 4845 | 4844 | $data['id_item'] |
| 4846 | 4845 | ); |
@@ -4870,7 +4869,7 @@ discard block |
||
| 4870 | 4869 | $session->get('user-id'), |
| 4871 | 4870 | 'at_modification', |
| 4872 | 4871 | $session->get('user-login'), |
| 4873 | - 'at_del_file : ' . $data['name'] |
|
| 4872 | + 'at_del_file : '.$data['name'] |
|
| 4874 | 4873 | ); |
| 4875 | 4874 | |
| 4876 | 4875 | // DElete sharekeys |
@@ -4881,7 +4880,7 @@ discard block |
||
| 4881 | 4880 | ); |
| 4882 | 4881 | |
| 4883 | 4882 | // Delete file from server |
| 4884 | - $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']); |
|
| 4883 | + $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']); |
|
| 4885 | 4884 | $fileToDelete = realpath($fileToDelete); |
| 4886 | 4885 | if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) { |
| 4887 | 4886 | fileDelete($fileToDelete, $SETTINGS); |
@@ -4935,7 +4934,7 @@ discard block |
||
| 4935 | 4934 | // Update SESSION with this new favourite |
| 4936 | 4935 | $data = DB::queryFirstRow( |
| 4937 | 4936 | 'SELECT label,id_tree |
| 4938 | - FROM ' . prefixTable('items') . ' |
|
| 4937 | + FROM ' . prefixTable('items').' |
|
| 4939 | 4938 | WHERE id = %i', |
| 4940 | 4939 | $inputData['itemId'] |
| 4941 | 4940 | ); |
@@ -4944,7 +4943,7 @@ discard block |
||
| 4944 | 4943 | [ |
| 4945 | 4944 | $inputData['itemId'] => [ |
| 4946 | 4945 | 'label' => $data['label'], |
| 4947 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
| 4946 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
| 4948 | 4947 | ], |
| 4949 | 4948 | ], |
| 4950 | 4949 | 'add' |
@@ -5013,8 +5012,8 @@ discard block |
||
| 5013 | 5012 | // get data about item |
| 5014 | 5013 | $dataSource = DB::queryFirstRow( |
| 5015 | 5014 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5016 | - FROM ' . prefixTable('items') . ' as i |
|
| 5017 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5015 | + FROM ' . prefixTable('items').' as i |
|
| 5016 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5018 | 5017 | WHERE i.id=%i', |
| 5019 | 5018 | $inputData['itemId'] |
| 5020 | 5019 | ); |
@@ -5058,7 +5057,7 @@ discard block |
||
| 5058 | 5057 | // get data about new folder |
| 5059 | 5058 | $dataDestination = DB::queryFirstRow( |
| 5060 | 5059 | 'SELECT personal_folder, title |
| 5061 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 5060 | + FROM ' . prefixTable('nested_tree').' |
|
| 5062 | 5061 | WHERE id = %i', |
| 5063 | 5062 | $inputData['folderId'] |
| 5064 | 5063 | ); |
@@ -5104,14 +5103,14 @@ discard block |
||
| 5104 | 5103 | prefixTable('sharekeys_items'), |
| 5105 | 5104 | 'object_id = %i AND user_id NOT IN %ls', |
| 5106 | 5105 | $inputData['itemId'], |
| 5107 | - [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 5106 | + [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 5108 | 5107 | ); |
| 5109 | 5108 | |
| 5110 | 5109 | // Remove all item sharekeys fields |
| 5111 | 5110 | // Get fields for this Item |
| 5112 | 5111 | $rows = DB::query( |
| 5113 | 5112 | 'SELECT id |
| 5114 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5113 | + FROM ' . prefixTable('categories_items').' |
|
| 5115 | 5114 | WHERE item_id = %i', |
| 5116 | 5115 | $inputData['itemId'] |
| 5117 | 5116 | ); |
@@ -5128,7 +5127,7 @@ discard block |
||
| 5128 | 5127 | // Get FILES for this Item |
| 5129 | 5128 | $rows = DB::query( |
| 5130 | 5129 | 'SELECT id |
| 5131 | - FROM ' . prefixTable('files') . ' |
|
| 5130 | + FROM ' . prefixTable('files').' |
|
| 5132 | 5131 | WHERE id_item = %i', |
| 5133 | 5132 | $inputData['itemId'] |
| 5134 | 5133 | ); |
@@ -5175,7 +5174,7 @@ discard block |
||
| 5175 | 5174 | // Get the ITEM object key for the user |
| 5176 | 5175 | $userKey = DB::queryFirstRow( |
| 5177 | 5176 | 'SELECT share_key |
| 5178 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5177 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5179 | 5178 | WHERE user_id = %i AND object_id = %i', |
| 5180 | 5179 | $session->get('user-id'), |
| 5181 | 5180 | $inputData['itemId'] |
@@ -5186,7 +5185,7 @@ discard block |
||
| 5186 | 5185 | // This is a public object |
| 5187 | 5186 | $users = DB::query( |
| 5188 | 5187 | 'SELECT id, public_key |
| 5189 | - FROM ' . prefixTable('users') . ' |
|
| 5188 | + FROM ' . prefixTable('users').' |
|
| 5190 | 5189 | WHERE id NOT IN %li |
| 5191 | 5190 | AND public_key != ""', |
| 5192 | 5191 | $tpUsersIDs |
@@ -5209,14 +5208,14 @@ discard block |
||
| 5209 | 5208 | // Get fields for this Item |
| 5210 | 5209 | $rows = DB::query( |
| 5211 | 5210 | 'SELECT id |
| 5212 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5211 | + FROM ' . prefixTable('categories_items').' |
|
| 5213 | 5212 | WHERE item_id = %i', |
| 5214 | 5213 | $inputData['itemId'] |
| 5215 | 5214 | ); |
| 5216 | 5215 | foreach ($rows as $field) { |
| 5217 | 5216 | $userKey = DB::queryFirstRow( |
| 5218 | 5217 | 'SELECT share_key |
| 5219 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5218 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5220 | 5219 | WHERE user_id = %i AND object_id = %i', |
| 5221 | 5220 | $session->get('user-id'), |
| 5222 | 5221 | $field['id'] |
@@ -5227,7 +5226,7 @@ discard block |
||
| 5227 | 5226 | // This is a public object |
| 5228 | 5227 | $users = DB::query( |
| 5229 | 5228 | 'SELECT id, public_key |
| 5230 | - FROM ' . prefixTable('users') . ' |
|
| 5229 | + FROM ' . prefixTable('users').' |
|
| 5231 | 5230 | WHERE id NOT IN %li |
| 5232 | 5231 | AND public_key != ""', |
| 5233 | 5232 | $tpUsersIDs |
@@ -5250,14 +5249,14 @@ discard block |
||
| 5250 | 5249 | // Get FILES for this Item |
| 5251 | 5250 | $rows = DB::query( |
| 5252 | 5251 | 'SELECT id |
| 5253 | - FROM ' . prefixTable('files') . ' |
|
| 5252 | + FROM ' . prefixTable('files').' |
|
| 5254 | 5253 | WHERE id_item = %i', |
| 5255 | 5254 | $inputData['itemId'] |
| 5256 | 5255 | ); |
| 5257 | 5256 | foreach ($rows as $attachment) { |
| 5258 | 5257 | $userKey = DB::queryFirstRow( |
| 5259 | 5258 | 'SELECT share_key |
| 5260 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5259 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5261 | 5260 | WHERE user_id = %i AND object_id = %i', |
| 5262 | 5261 | $session->get('user-id'), |
| 5263 | 5262 | $attachment['id'] |
@@ -5268,7 +5267,7 @@ discard block |
||
| 5268 | 5267 | // This is a public object |
| 5269 | 5268 | $users = DB::query( |
| 5270 | 5269 | 'SELECT id, public_key |
| 5271 | - FROM ' . prefixTable('users') . ' |
|
| 5270 | + FROM ' . prefixTable('users').' |
|
| 5272 | 5271 | WHERE id NOT IN %li |
| 5273 | 5272 | AND public_key != ""', |
| 5274 | 5273 | $tpUsersIDs |
@@ -5309,7 +5308,7 @@ discard block |
||
| 5309 | 5308 | $session->get('user-id'), |
| 5310 | 5309 | 'at_modification', |
| 5311 | 5310 | $session->get('user-login'), |
| 5312 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5311 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5313 | 5312 | ); |
| 5314 | 5313 | |
| 5315 | 5314 | // Update cache table |
@@ -5368,8 +5367,8 @@ discard block |
||
| 5368 | 5367 | // get data about item |
| 5369 | 5368 | $dataSource = DB::queryFirstRow( |
| 5370 | 5369 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 5371 | - FROM ' . prefixTable('items') . ' as i |
|
| 5372 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 5370 | + FROM ' . prefixTable('items').' as i |
|
| 5371 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 5373 | 5372 | WHERE i.id=%i', |
| 5374 | 5373 | $item_id |
| 5375 | 5374 | ); |
@@ -5391,7 +5390,7 @@ discard block |
||
| 5391 | 5390 | |
| 5392 | 5391 | // get data about new folder |
| 5393 | 5392 | $dataDestination = DB::queryFirstRow( |
| 5394 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 5393 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 5395 | 5394 | $inputData['folderId'] |
| 5396 | 5395 | ); |
| 5397 | 5396 | |
@@ -5425,14 +5424,14 @@ discard block |
||
| 5425 | 5424 | prefixTable('sharekeys_items'), |
| 5426 | 5425 | 'object_id = %i AND user_id NOT IN %ls', |
| 5427 | 5426 | $item_id, |
| 5428 | - [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 5427 | + [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 5429 | 5428 | ); |
| 5430 | 5429 | |
| 5431 | 5430 | // Remove all item sharekeys fields |
| 5432 | 5431 | // Get fields for this Item |
| 5433 | 5432 | $rows = DB::query( |
| 5434 | 5433 | 'SELECT id |
| 5435 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5434 | + FROM ' . prefixTable('categories_items').' |
|
| 5436 | 5435 | WHERE item_id = %i', |
| 5437 | 5436 | $item_id |
| 5438 | 5437 | ); |
@@ -5449,7 +5448,7 @@ discard block |
||
| 5449 | 5448 | // Get FILES for this Item |
| 5450 | 5449 | $rows = DB::query( |
| 5451 | 5450 | 'SELECT id |
| 5452 | - FROM ' . prefixTable('files') . ' |
|
| 5451 | + FROM ' . prefixTable('files').' |
|
| 5453 | 5452 | WHERE id_item = %i', |
| 5454 | 5453 | $item_id |
| 5455 | 5454 | ); |
@@ -5504,7 +5503,7 @@ discard block |
||
| 5504 | 5503 | // Get the ITEM object key for the user |
| 5505 | 5504 | $userKey = DB::queryFirstRow( |
| 5506 | 5505 | 'SELECT share_key |
| 5507 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 5506 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 5508 | 5507 | WHERE user_id = %i AND object_id = %i', |
| 5509 | 5508 | $session->get('user-id'), |
| 5510 | 5509 | $item_id |
@@ -5515,7 +5514,7 @@ discard block |
||
| 5515 | 5514 | // This is a public object |
| 5516 | 5515 | $users = DB::query( |
| 5517 | 5516 | 'SELECT id, public_key |
| 5518 | - FROM ' . prefixTable('users') . ' |
|
| 5517 | + FROM ' . prefixTable('users').' |
|
| 5519 | 5518 | WHERE id NOT IN %li |
| 5520 | 5519 | AND public_key != ""', |
| 5521 | 5520 | $tpUsersIDs |
@@ -5538,14 +5537,14 @@ discard block |
||
| 5538 | 5537 | // Get fields for this Item |
| 5539 | 5538 | $rows = DB::query( |
| 5540 | 5539 | 'SELECT id |
| 5541 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5540 | + FROM ' . prefixTable('categories_items').' |
|
| 5542 | 5541 | WHERE item_id = %i', |
| 5543 | 5542 | $item_id |
| 5544 | 5543 | ); |
| 5545 | 5544 | foreach ($rows as $field) { |
| 5546 | 5545 | $userKey = DB::queryFirstRow( |
| 5547 | 5546 | 'SELECT share_key |
| 5548 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5547 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5549 | 5548 | WHERE user_id = %i AND object_id = %i', |
| 5550 | 5549 | $session->get('user-id'), |
| 5551 | 5550 | $field['id'] |
@@ -5556,7 +5555,7 @@ discard block |
||
| 5556 | 5555 | // This is a public object |
| 5557 | 5556 | $users = DB::query( |
| 5558 | 5557 | 'SELECT id, public_key |
| 5559 | - FROM ' . prefixTable('users') . ' |
|
| 5558 | + FROM ' . prefixTable('users').' |
|
| 5560 | 5559 | WHERE id NOT IN %li |
| 5561 | 5560 | AND public_key != ""', |
| 5562 | 5561 | $tpUsersIDs |
@@ -5580,14 +5579,14 @@ discard block |
||
| 5580 | 5579 | // Get FILES for this Item |
| 5581 | 5580 | $rows = DB::query( |
| 5582 | 5581 | 'SELECT id |
| 5583 | - FROM ' . prefixTable('files') . ' |
|
| 5582 | + FROM ' . prefixTable('files').' |
|
| 5584 | 5583 | WHERE id_item = %i', |
| 5585 | 5584 | $item_id |
| 5586 | 5585 | ); |
| 5587 | 5586 | foreach ($rows as $attachment) { |
| 5588 | 5587 | $userKey = DB::queryFirstRow( |
| 5589 | 5588 | 'SELECT share_key |
| 5590 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5589 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5591 | 5590 | WHERE user_id = %i AND object_id = %i', |
| 5592 | 5591 | $session->get('user-id'), |
| 5593 | 5592 | $attachment['id'] |
@@ -5598,7 +5597,7 @@ discard block |
||
| 5598 | 5597 | // This is a public object |
| 5599 | 5598 | $users = DB::query( |
| 5600 | 5599 | 'SELECT id, public_key |
| 5601 | - FROM ' . prefixTable('users') . ' |
|
| 5600 | + FROM ' . prefixTable('users').' |
|
| 5602 | 5601 | WHERE id NOT IN %li |
| 5603 | 5602 | AND public_key != ""', |
| 5604 | 5603 | $tpUsersIDs |
@@ -5638,13 +5637,13 @@ discard block |
||
| 5638 | 5637 | $session->get('user-id'), |
| 5639 | 5638 | 'at_modification', |
| 5640 | 5639 | $session->get('user-login'), |
| 5641 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5640 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5642 | 5641 | ); |
| 5643 | 5642 | } |
| 5644 | 5643 | } |
| 5645 | 5644 | |
| 5646 | 5645 | // reload cache table |
| 5647 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5646 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5648 | 5647 | updateCacheTable('reload', null); |
| 5649 | 5648 | |
| 5650 | 5649 | echo (string) prepareExchangedData( |
@@ -5708,7 +5707,7 @@ discard block |
||
| 5708 | 5707 | // get info |
| 5709 | 5708 | $dataSource = DB::queryFirstRow( |
| 5710 | 5709 | 'SELECT label, id_tree |
| 5711 | - FROM ' . prefixTable('items') . ' |
|
| 5710 | + FROM ' . prefixTable('items').' |
|
| 5712 | 5711 | WHERE id=%i', |
| 5713 | 5712 | $item_id |
| 5714 | 5713 | ); |
@@ -5809,14 +5808,14 @@ discard block |
||
| 5809 | 5808 | // Variables |
| 5810 | 5809 | $dataAuthor = DB::queryFirstRow( |
| 5811 | 5810 | 'SELECT email,login |
| 5812 | - FROM ' . prefixTable('users') . ' |
|
| 5811 | + FROM ' . prefixTable('users').' |
|
| 5813 | 5812 | WHERE id = %i', |
| 5814 | 5813 | $post_content[1] |
| 5815 | 5814 | ); |
| 5816 | 5815 | |
| 5817 | 5816 | $dataItem = DB::queryFirstRow( |
| 5818 | 5817 | 'SELECT label, id_tree |
| 5819 | - FROM ' . prefixTable('items') . ' |
|
| 5818 | + FROM ' . prefixTable('items').' |
|
| 5820 | 5819 | WHERE id = %i', |
| 5821 | 5820 | $post_content[0] |
| 5822 | 5821 | ); |
@@ -5833,7 +5832,7 @@ discard block |
||
| 5833 | 5832 | $lang->get('email_request_access_subject'), |
| 5834 | 5833 | str_replace( |
| 5835 | 5834 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5836 | - array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5835 | + array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path), |
|
| 5837 | 5836 | $lang->get('email_request_access_mail') |
| 5838 | 5837 | ), |
| 5839 | 5838 | $dataAuthor['email'], |
@@ -5842,7 +5841,7 @@ discard block |
||
| 5842 | 5841 | } elseif ($inputData['cat'] === 'share_this_item') { |
| 5843 | 5842 | $dataItem = DB::queryFirstRow( |
| 5844 | 5843 | 'SELECT label,id_tree |
| 5845 | - FROM ' . prefixTable('items') . ' |
|
| 5844 | + FROM ' . prefixTable('items').' |
|
| 5846 | 5845 | WHERE id= %i', |
| 5847 | 5846 | $inputData['id'] |
| 5848 | 5847 | ); |
@@ -5865,7 +5864,7 @@ discard block |
||
| 5865 | 5864 | ), |
| 5866 | 5865 | array( |
| 5867 | 5866 | empty($SETTINGS['email_server_url']) === false ? |
| 5868 | - $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'], |
|
| 5867 | + $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'], |
|
| 5869 | 5868 | addslashes($session->get('user-login')), |
| 5870 | 5869 | addslashes($path), |
| 5871 | 5870 | ), |
@@ -5914,8 +5913,8 @@ discard block |
||
| 5914 | 5913 | // Get all informations for this item |
| 5915 | 5914 | $dataItem = DB::queryFirstRow( |
| 5916 | 5915 | 'SELECT * |
| 5917 | - FROM ' . prefixTable('items') . ' as i |
|
| 5918 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5916 | + FROM ' . prefixTable('items').' as i |
|
| 5917 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5919 | 5918 | WHERE i.id=%i AND l.action = %s', |
| 5920 | 5919 | $item_id, |
| 5921 | 5920 | 'at_creation' |
@@ -5944,18 +5943,18 @@ discard block |
||
| 5944 | 5943 | $session->get('user-login'), |
| 5945 | 5944 | htmlspecialchars_decode($label, ENT_QUOTES), |
| 5946 | 5945 | null, |
| 5947 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
| 5946 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
| 5948 | 5947 | ); |
| 5949 | 5948 | // Prepare new line |
| 5950 | 5949 | $data = DB::queryFirstRow( |
| 5951 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5950 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5952 | 5951 | $item_id |
| 5953 | 5952 | ); |
| 5954 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison']; |
|
| 5953 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison']; |
|
| 5955 | 5954 | // send back |
| 5956 | 5955 | $data = array( |
| 5957 | 5956 | 'error' => '', |
| 5958 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5957 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5959 | 5958 | ); |
| 5960 | 5959 | echo (string) prepareExchangedData( |
| 5961 | 5960 | $data, |
@@ -6030,8 +6029,8 @@ discard block |
||
| 6030 | 6029 | // Should we log a password change? |
| 6031 | 6030 | $itemQ = DB::queryFirstRow( |
| 6032 | 6031 | 'SELECT s.share_key, i.pw |
| 6033 | - FROM ' . prefixTable('items') . ' AS i |
|
| 6034 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 6032 | + FROM ' . prefixTable('items').' AS i |
|
| 6033 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 6035 | 6034 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6036 | 6035 | $session->get('user-id'), |
| 6037 | 6036 | $dataReceived['id'] |
@@ -6086,7 +6085,7 @@ discard block |
||
| 6086 | 6085 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 6087 | 6086 | $SETTINGS['otv_expiration_period'] = 7; |
| 6088 | 6087 | } |
| 6089 | - $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session); |
|
| 6088 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6090 | 6089 | |
| 6091 | 6090 | echo json_encode( |
| 6092 | 6091 | array( |
@@ -6117,7 +6116,7 @@ discard block |
||
| 6117 | 6116 | // get parameters from original link |
| 6118 | 6117 | $url = $dataReceived['original_link']; |
| 6119 | 6118 | $parts = parse_url($url); |
| 6120 | - if(isset($parts['query'])){ |
|
| 6119 | + if (isset($parts['query'])) { |
|
| 6121 | 6120 | parse_str($parts['query'], $orignal_link_parameters); |
| 6122 | 6121 | } else { |
| 6123 | 6122 | $orignal_link_parameters = array(); |
@@ -6148,13 +6147,13 @@ discard block |
||
| 6148 | 6147 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
| 6149 | 6148 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
| 6150 | 6149 | if (str_contains($domain_host, 'www.') === true) { |
| 6151 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
| 6150 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
| 6152 | 6151 | } else { |
| 6153 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
| 6152 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
| 6154 | 6153 | } |
| 6155 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session); |
|
| 6154 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session); |
|
| 6156 | 6155 | } else { |
| 6157 | - $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session); |
|
| 6156 | + $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session); |
|
| 6158 | 6157 | } |
| 6159 | 6158 | |
| 6160 | 6159 | echo (string) prepareExchangedData( |
@@ -6189,8 +6188,8 @@ discard block |
||
| 6189 | 6188 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 6190 | 6189 | f.extension AS extension, f.type AS type, |
| 6191 | 6190 | s.share_key AS share_key |
| 6192 | - FROM ' . prefixTable('files') . ' AS f |
|
| 6193 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 6191 | + FROM ' . prefixTable('files').' AS f |
|
| 6192 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 6194 | 6193 | WHERE s.user_id = %i AND s.object_id = %i', |
| 6195 | 6194 | $session->get('user-id'), |
| 6196 | 6195 | $inputData['id'] |
@@ -6211,7 +6210,7 @@ discard block |
||
| 6211 | 6210 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 6212 | 6211 | |
| 6213 | 6212 | // prepare image info |
| 6214 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 6213 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 6215 | 6214 | $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; |
| 6216 | 6215 | |
| 6217 | 6216 | // Get image content |
@@ -6238,7 +6237,7 @@ discard block |
||
| 6238 | 6237 | echo (string) prepareExchangedData( |
| 6239 | 6238 | array( |
| 6240 | 6239 | 'error' => false, |
| 6241 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 6240 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 6242 | 6241 | 'file_type' => $file_info['type'], |
| 6243 | 6242 | 'file_content' => $fileContent, |
| 6244 | 6243 | ), |
@@ -6350,7 +6349,7 @@ discard block |
||
| 6350 | 6349 | $arbo = $tree->getPath($folder->id, false); |
| 6351 | 6350 | $path = ''; |
| 6352 | 6351 | foreach ($arbo as $elem) { |
| 6353 | - $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6352 | + $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 6354 | 6353 | } |
| 6355 | 6354 | |
| 6356 | 6355 | // Build array |
@@ -6417,7 +6416,7 @@ discard block |
||
| 6417 | 6416 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
| 6418 | 6417 | $rows = DB::query( |
| 6419 | 6418 | 'SELECT id, categories |
| 6420 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6419 | + FROM ' . prefixTable('nested_tree').' |
|
| 6421 | 6420 | WHERE id IN (%l)', |
| 6422 | 6421 | implode(',', $foldersArray) |
| 6423 | 6422 | ); |
@@ -6435,7 +6434,7 @@ discard block |
||
| 6435 | 6434 | if (count($ids) > 0) { |
| 6436 | 6435 | $subfolders = DB::queryFirstColumn( |
| 6437 | 6436 | 'SELECT title |
| 6438 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 6437 | + FROM ' . prefixTable('nested_tree').' |
|
| 6439 | 6438 | WHERE id IN %li', |
| 6440 | 6439 | $ids |
| 6441 | 6440 | ); |
@@ -6471,7 +6470,7 @@ discard block |
||
| 6471 | 6470 | // get item info |
| 6472 | 6471 | $dataItem = DB::queryFirstRow( |
| 6473 | 6472 | 'SELECT * |
| 6474 | - FROM ' . prefixTable('items') . ' |
|
| 6473 | + FROM ' . prefixTable('items').' |
|
| 6475 | 6474 | WHERE id=%i', |
| 6476 | 6475 | $inputData['itemId'] |
| 6477 | 6476 | ); |
@@ -6483,8 +6482,8 @@ discard block |
||
| 6483 | 6482 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
| 6484 | 6483 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
| 6485 | 6484 | l.old_value as old_value |
| 6486 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6487 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6485 | + FROM ' . prefixTable('log_items').' as l |
|
| 6486 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6488 | 6487 | WHERE id_item=%i AND l.action NOT IN (%l) |
| 6489 | 6488 | ORDER BY date DESC', |
| 6490 | 6489 | $inputData['itemId'], |
@@ -6499,18 +6498,18 @@ discard block |
||
| 6499 | 6498 | |
| 6500 | 6499 | // imported via API |
| 6501 | 6500 | if (empty($record['login']) === true) { |
| 6502 | - $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6501 | + $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']'; |
|
| 6503 | 6502 | } |
| 6504 | 6503 | |
| 6505 | 6504 | // Prepare avatar |
| 6506 | 6505 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6507 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6508 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6506 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6507 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6509 | 6508 | } else { |
| 6510 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6509 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6511 | 6510 | } |
| 6512 | 6511 | } else { |
| 6513 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6512 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6514 | 6513 | } |
| 6515 | 6514 | |
| 6516 | 6515 | // Prepare action |
@@ -6530,7 +6529,7 @@ discard block |
||
| 6530 | 6529 | $previous_passwords, |
| 6531 | 6530 | [ |
| 6532 | 6531 | 'password' => htmlentities($previous_pwd['string']), |
| 6533 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6532 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6534 | 6533 | ] |
| 6535 | 6534 | ); |
| 6536 | 6535 | } |
@@ -6543,19 +6542,19 @@ discard block |
||
| 6543 | 6542 | $action = $lang->get($reason[0]); |
| 6544 | 6543 | if ($reason[0] === 'at_moved') { |
| 6545 | 6544 | $tmp = explode(' -> ', $reason[1]); |
| 6546 | - $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6545 | + $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6547 | 6546 | } elseif ($reason[0] === 'at_field') { |
| 6548 | 6547 | $tmp = explode(' => ', $reason[1]); |
| 6549 | 6548 | if (count($tmp) > 1) { |
| 6550 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') . |
|
| 6551 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6549 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value'). |
|
| 6550 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6552 | 6551 | } else { |
| 6553 | 6552 | $detail = trim($reason[1]); |
| 6554 | 6553 | } |
| 6555 | 6554 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6556 | 6555 | $tmp = explode(' => ', $reason[1]); |
| 6557 | 6556 | $detail = empty(trim($tmp[0])) === true ? |
| 6558 | - $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6557 | + $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6559 | 6558 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6560 | 6559 | $detail = $lang->get($reason[1]); |
| 6561 | 6560 | } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') { |
@@ -6564,7 +6563,7 @@ discard block |
||
| 6564 | 6563 | $tmp = explode(':', $reason[1]); |
| 6565 | 6564 | $tmp = explode('.', $tmp[0]); |
| 6566 | 6565 | $detail = isBase64($tmp[0]) === true ? |
| 6567 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6566 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6568 | 6567 | } elseif ($reason[0] === 'at_import') { |
| 6569 | 6568 | $detail = ''; |
| 6570 | 6569 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6583,8 +6582,8 @@ discard block |
||
| 6583 | 6582 | array( |
| 6584 | 6583 | 'avatar' => $avatar, |
| 6585 | 6584 | 'login' => $record['login'], |
| 6586 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6587 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6585 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6586 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6588 | 6587 | 'action' => $action, |
| 6589 | 6588 | 'detail' => $detail, |
| 6590 | 6589 | ) |
@@ -6672,11 +6671,11 @@ discard block |
||
| 6672 | 6671 | |
| 6673 | 6672 | // get some info to add to the notification email |
| 6674 | 6673 | $resp_user = DB::queryFirstRow( |
| 6675 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6674 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6676 | 6675 | $session->get('user-id') |
| 6677 | 6676 | ); |
| 6678 | 6677 | $resp_folder = DB::queryFirstRow( |
| 6679 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6678 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6680 | 6679 | $folder |
| 6681 | 6680 | ); |
| 6682 | 6681 | |
@@ -6685,7 +6684,7 @@ discard block |
||
| 6685 | 6684 | $emailService = new EmailService(); |
| 6686 | 6685 | $rows = DB::query( |
| 6687 | 6686 | 'SELECT email |
| 6688 | - FROM ' . prefixTable('users') . ' |
|
| 6687 | + FROM ' . prefixTable('users').' |
|
| 6689 | 6688 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6690 | 6689 | 1 |
| 6691 | 6690 | ); |
@@ -6731,7 +6730,7 @@ discard block |
||
| 6731 | 6730 | // Send email |
| 6732 | 6731 | $dataItem = DB::queryFirstRow( |
| 6733 | 6732 | 'SELECT label, id_tree |
| 6734 | - FROM ' . prefixTable('items') . ' |
|
| 6733 | + FROM ' . prefixTable('items').' |
|
| 6735 | 6734 | WHERE id = %i', |
| 6736 | 6735 | $inputData['itemId'] |
| 6737 | 6736 | ); |
@@ -6785,7 +6784,7 @@ discard block |
||
| 6785 | 6784 | |
| 6786 | 6785 | DB::query( |
| 6787 | 6786 | 'SELECT * |
| 6788 | - FROM ' . prefixTable('notification') . ' |
|
| 6787 | + FROM ' . prefixTable('notification').' |
|
| 6789 | 6788 | WHERE item_id = %i AND user_id = %i', |
| 6790 | 6789 | $inputData['itemId'], |
| 6791 | 6790 | $session->get('user-id') |
@@ -6857,7 +6856,7 @@ discard block |
||
| 6857 | 6856 | // And related logs |
| 6858 | 6857 | $rows = DB::query( |
| 6859 | 6858 | 'SELECT id, file AS filename |
| 6860 | - FROM ' . prefixTable('files') . ' |
|
| 6859 | + FROM ' . prefixTable('files').' |
|
| 6861 | 6860 | WHERE id_item = %i AND confirmed = %i', |
| 6862 | 6861 | $inputData['itemId'], |
| 6863 | 6862 | 0 |
@@ -6871,12 +6870,12 @@ discard block |
||
| 6871 | 6870 | ); |
| 6872 | 6871 | |
| 6873 | 6872 | // Delete file on server |
| 6874 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6873 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6875 | 6874 | |
| 6876 | 6875 | // Delete related logs |
| 6877 | 6876 | $logFile = DB::query( |
| 6878 | 6877 | 'SELECT increment_id, raison |
| 6879 | - FROM ' . prefixTable('log_items') . ' |
|
| 6878 | + FROM ' . prefixTable('log_items').' |
|
| 6880 | 6879 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6881 | 6880 | $inputData['itemId'], |
| 6882 | 6881 | $session->get('user-id'), |
@@ -6935,7 +6934,7 @@ discard block |
||
| 6935 | 6934 | // Confirm attachments |
| 6936 | 6935 | $rows = DB::query( |
| 6937 | 6936 | 'SELECT id, file AS filename |
| 6938 | - FROM ' . prefixTable('files') . ' |
|
| 6937 | + FROM ' . prefixTable('files').' |
|
| 6939 | 6938 | WHERE id_item = %i AND confirmed = %i', |
| 6940 | 6939 | $inputData['itemId'], |
| 6941 | 6940 | 0 |
@@ -7051,7 +7050,7 @@ discard block |
||
| 7051 | 7050 | $successfulDeletions = array(); |
| 7052 | 7051 | $failedDeletions = array(); |
| 7053 | 7052 | |
| 7054 | - foreach( $selectedItemIds as $itemId) { |
|
| 7053 | + foreach ($selectedItemIds as $itemId) { |
|
| 7055 | 7054 | // Check that user can access this item |
| 7056 | 7055 | $granted = accessToItemIsGranted((int) $itemId, $SETTINGS); |
| 7057 | 7056 | if ($granted !== true) { |
@@ -7062,7 +7061,7 @@ discard block |
||
| 7062 | 7061 | // Load item data |
| 7063 | 7062 | $data = DB::queryFirstRow( |
| 7064 | 7063 | 'SELECT id_tree, id, label |
| 7065 | - FROM ' . prefixTable('items') . ' |
|
| 7064 | + FROM ' . prefixTable('items').' |
|
| 7066 | 7065 | WHERE id = %i', |
| 7067 | 7066 | $itemId |
| 7068 | 7067 | ); |
@@ -7145,15 +7144,15 @@ discard block |
||
| 7145 | 7144 | case 'autocomplete_tags': |
| 7146 | 7145 | // Get a list off all existing TAGS |
| 7147 | 7146 | $listOfTags = ''; |
| 7148 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7147 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
| 7149 | 7148 | foreach ($rows as $record) { |
| 7150 | 7149 | if (empty($listOfTags)) { |
| 7151 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 7150 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 7152 | 7151 | } else { |
| 7153 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 7152 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 7154 | 7153 | } |
| 7155 | 7154 | } |
| 7156 | - echo '[' . $listOfTags . ']'; |
|
| 7155 | + echo '['.$listOfTags.']'; |
|
| 7157 | 7156 | break; |
| 7158 | 7157 | } |
| 7159 | 7158 | } |
@@ -7169,7 +7168,7 @@ discard block |
||
| 7169 | 7168 | { |
| 7170 | 7169 | $data = DB::queryFirstRow( |
| 7171 | 7170 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 7172 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 7171 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 7173 | 7172 | $groupe |
| 7174 | 7173 | ); |
| 7175 | 7174 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -7289,7 +7288,7 @@ discard block |
||
| 7289 | 7288 | // Get item date |
| 7290 | 7289 | $itemRestrictedUsersList = DB::queryFirstRow( |
| 7291 | 7290 | 'SELECT restricted_to |
| 7292 | - FROM ' . prefixTable('items') . ' |
|
| 7291 | + FROM ' . prefixTable('items').' |
|
| 7293 | 7292 | WHERE id = %i', |
| 7294 | 7293 | $itemId |
| 7295 | 7294 | ); |
@@ -7322,7 +7321,7 @@ discard block |
||
| 7322 | 7321 | $now = time(); |
| 7323 | 7322 | $editionLocks = DB::query( |
| 7324 | 7323 | 'SELECT timestamp, user_id, increment_id |
| 7325 | - FROM ' . prefixTable('items_edition') . ' |
|
| 7324 | + FROM ' . prefixTable('items_edition').' |
|
| 7326 | 7325 | WHERE item_id = %i |
| 7327 | 7326 | ORDER BY increment_id DESC', |
| 7328 | 7327 | $itemId |
@@ -7368,7 +7367,7 @@ discard block |
||
| 7368 | 7367 | |
| 7369 | 7368 | // Delete related background tasks if any |
| 7370 | 7369 | $task = DB::queryFirstRow( |
| 7371 | - 'SELECT increment_id FROM ' . prefixTable('background_tasks') . ' |
|
| 7370 | + 'SELECT increment_id FROM '.prefixTable('background_tasks').' |
|
| 7372 | 7371 | WHERE item_id = %i AND finished_at = ""', |
| 7373 | 7372 | $itemId |
| 7374 | 7373 | ); |
@@ -7381,7 +7380,7 @@ discard block |
||
| 7381 | 7380 | // Check if encryption process is still running |
| 7382 | 7381 | DB::queryFirstRow( |
| 7383 | 7382 | 'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id |
| 7384 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 7383 | + FROM ' . prefixTable('background_tasks').' |
|
| 7385 | 7384 | WHERE item_id = %i AND finished_at = "" |
| 7386 | 7385 | ORDER BY increment_id DESC', |
| 7387 | 7386 | $itemId |
@@ -7402,7 +7401,7 @@ discard block |
||
| 7402 | 7401 | } |
| 7403 | 7402 | |
| 7404 | 7403 | return [ |
| 7405 | - 'status' => true, // Encryption in progress |
|
| 7404 | + 'status' => true, // Encryption in progress |
|
| 7406 | 7405 | 'delay' => $delay - $elapsed, // Time remaining before the lock expires |
| 7407 | 7406 | ]; |
| 7408 | 7407 | } |
@@ -7447,7 +7446,7 @@ discard block |
||
| 7447 | 7446 | { |
| 7448 | 7447 | // Check if there's an ongoing background encryption process for the item |
| 7449 | 7448 | $ongoingProcess = DB::queryFirstRow( |
| 7450 | - 'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7449 | + 'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', |
|
| 7451 | 7450 | $itemId |
| 7452 | 7451 | ); |
| 7453 | 7452 | |
@@ -7465,7 +7464,7 @@ discard block |
||
| 7465 | 7464 | function getUserVisibleFolders(int $userId): array |
| 7466 | 7465 | { |
| 7467 | 7466 | // Query to retrieve visible folders for the user |
| 7468 | - $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId); |
|
| 7467 | + $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId); |
|
| 7469 | 7468 | |
| 7470 | 7469 | // Decode JSON data into an array; return an empty array if the data is invalid |
| 7471 | 7470 | return json_decode($data['visible_folders'], true) ?? []; |
@@ -7489,7 +7488,7 @@ discard block |
||
| 7489 | 7488 | |
| 7490 | 7489 | // Query the access rights for the given roles and folder |
| 7491 | 7490 | $accessTypes = DB::queryFirstColumn( |
| 7492 | - 'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7491 | + 'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', |
|
| 7493 | 7492 | $roles, |
| 7494 | 7493 | $treeId |
| 7495 | 7494 | ); |