@@ -60,7 +60,7 @@ |
||
| 60 | 60 | // Update table by deleting ID |
| 61 | 61 | if ($session->has('user-id') && null !== $session->get('user-id')) { |
| 62 | 62 | DB::update( |
| 63 | - DB_PREFIX . 'users', |
|
| 63 | + DB_PREFIX.'users', |
|
| 64 | 64 | [ |
| 65 | 65 | 'key_tempo' => '', |
| 66 | 66 | ], |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | ) { |
| 74 | 74 | // Not allowed page |
| 75 | 75 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 76 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 76 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 77 | 77 | exit; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | // Is a date sent? |
| 99 | 99 | $dateCriteria = $request->query->get('dateCriteria'); |
| 100 | 100 | if ($dateCriteria !== null && !empty($dateCriteria)) { |
| 101 | - $sWhere .= ' AND a.del_value < ' . round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0); |
|
| 101 | + $sWhere .= ' AND a.del_value < '.round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0); |
|
| 102 | 102 | } |
| 103 | 103 | //echo $sWhere; |
| 104 | 104 | /* BUILD QUERY */ |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $start = $request->query->getInt('start', 0); |
| 108 | 108 | $length = $request->query->getInt('length', -1); |
| 109 | 109 | if ($length !== -1) { |
| 110 | - $sLimit = ' LIMIT ' . $start . ', ' . $length; |
|
| 110 | + $sLimit = ' LIMIT '.$start.', '.$length; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | //Ordering |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $columnIndex = filter_var($order[0]['column'], FILTER_SANITIZE_NUMBER_INT); |
| 121 | 121 | |
| 122 | 122 | if (array_key_exists($columnIndex, $aColumns)) { |
| 123 | - $sOrder .= $aColumns[$columnIndex] . ' ' . $order[0]['dir']; |
|
| 123 | + $sOrder .= $aColumns[$columnIndex].' '.$order[0]['dir']; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | // Supprimez la virgule finale si elle existe |
@@ -144,9 +144,9 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | if ($letter !== '' && $letter !== 'None') { |
| 146 | 146 | $sWhere .= ' AND '; |
| 147 | - $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR "; |
|
| 148 | - $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR "; |
|
| 149 | - $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' "; |
|
| 147 | + $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR "; |
|
| 148 | + $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR "; |
|
| 149 | + $sWhere .= $aColumns[3]." LIKE '".$letter."%' "; |
|
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | |
@@ -157,26 +157,26 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | if ($searchValue !== '') { |
| 159 | 159 | $sWhere = ' AND '; |
| 160 | - $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR "; |
|
| 161 | - $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR "; |
|
| 162 | - $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' "; |
|
| 160 | + $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR "; |
|
| 161 | + $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR "; |
|
| 162 | + $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' "; |
|
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | $rows = DB::query( |
| 168 | 168 | 'SELECT a.item_id, i.label, a.del_value, i.id_tree |
| 169 | - FROM ' . prefixTable('automatic_del') . ' AS a |
|
| 170 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' . |
|
| 169 | + FROM ' . prefixTable('automatic_del').' AS a |
|
| 170 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'. |
|
| 171 | 171 | $sWhere. |
| 172 | 172 | (string) $sOrder |
| 173 | 173 | ); |
| 174 | 174 | $iTotal = DB::count(); |
| 175 | 175 | $rows = DB::query( |
| 176 | 176 | 'SELECT a.item_id, i.label, a.del_value, i.id_tree |
| 177 | - FROM ' . prefixTable('automatic_del') . ' AS a |
|
| 178 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' . |
|
| 179 | - $sWhere . |
|
| 177 | + FROM ' . prefixTable('automatic_del').' AS a |
|
| 178 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'. |
|
| 179 | + $sWhere. |
|
| 180 | 180 | $sLimit |
| 181 | 181 | ); |
| 182 | 182 | $iFilteredTotal = DB::count(); |
@@ -194,18 +194,18 @@ discard block |
||
| 194 | 194 | // start the line |
| 195 | 195 | $sOutput .= '['; |
| 196 | 196 | // Column 1 |
| 197 | - $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"' . $record['item_id'] . '\" data-item-tree-id=\"' . $record['id_tree'] . '\"></i>", '; |
|
| 197 | + $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"'.$record['item_id'].'\" data-item-tree-id=\"'.$record['id_tree'].'\"></i>", '; |
|
| 198 | 198 | // Column 2 |
| 199 | - $sOutput .= '"' . $record['label'] . '", '; |
|
| 199 | + $sOutput .= '"'.$record['label'].'", '; |
|
| 200 | 200 | // Column 3 |
| 201 | - $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", '; |
|
| 201 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", '; |
|
| 202 | 202 | // Column 4 |
| 203 | 203 | $path = []; |
| 204 | 204 | $treeDesc = $tree->getPath($record['id_tree'], true); |
| 205 | 205 | foreach ($treeDesc as $t) { |
| 206 | 206 | array_push($path, $t->title); |
| 207 | 207 | } |
| 208 | - $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],'; |
|
| 208 | + $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],'; |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | if ($iTotal > 0) { |
@@ -218,4 +218,4 @@ discard block |
||
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | // finalize output |
| 221 | -echo '{"recordsTotal": ' . (int) $iTotal . ', "recordsFiltered": ' . (int) $iFilteredTotal . ', "data": ' . htmlspecialchars($sOutput); |
|
| 221 | +echo '{"recordsTotal": '.(int) $iTotal.', "recordsFiltered": '.(int) $iFilteredTotal.', "data": '.htmlspecialchars($sOutput); |
|
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === false) { |
| 69 | 69 | // Not allowed page |
| 70 | 70 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 72 | 72 | exit; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | </div> |
| 179 | 179 | <div class="alert alert-info ml-2 mt-3 mr-2 hidden" id="onthefly-restore-progress"> |
| 180 | 180 | <h5><i class="icon fa fa-info mr-2"></i><?php echo $lang->get('in_progress'); ?></h5> |
| 181 | - <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress');?> <b><span id="onthefly-restore-progress-text">0</span>%</b> |
|
| 181 | + <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress'); ?> <b><span id="onthefly-restore-progress-text">0</span>%</b> |
|
| 182 | 182 | </div> |
| 183 | 183 | <div class="row mt-3 hidden" id="onthefly-restore-finished"></div> |
| 184 | 184 | <div class="row mt-3"> |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | filter_input(INPUT_GET, 'code', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 87 | 87 | ); |
| 88 | 88 | |
| 89 | - if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
| 89 | + if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
| 90 | 90 | // otv is too old |
| 91 | 91 | if ($data['time_limit'] < time() || ($data['views'] + 1) > $data['max_views']) { |
| 92 | 92 | $html = '<div class="text-center text-danger"> |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | <tr><th>URL:</th><td>'.$url.'</td></tr> |
| 191 | 191 | </table></div> |
| 192 | 192 | <p class="mt-3 text-info"><i class="fas fa-info mr-2"></i>Copy carefully the data you need.<br>This page is visible until <b>'. |
| 193 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views']+1)).' more time(s)</b>.</div> |
|
| 193 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views'] + 1)).' more time(s)</b>.</div> |
|
| 194 | 194 | </div>'; |
| 195 | 195 | // log |
| 196 | 196 | logItems( |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) { |
| 67 | 67 | // Not allowed page |
| 68 | 68 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 69 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 69 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 70 | 70 | exit; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -89,24 +89,24 @@ discard block |
||
| 89 | 89 | // If administrator then all roles are shown |
| 90 | 90 | // else only the Roles the users is associated to. |
| 91 | 91 | if ((int) $session->get('user-admin') === 1) { |
| 92 | - $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>'; |
|
| 92 | + $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>'; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | $rows = DB::query( |
| 96 | 96 | 'SELECT id, title, creator_id |
| 97 | - FROM ' . prefixTable('roles_title') . ' |
|
| 97 | + FROM ' . prefixTable('roles_title').' |
|
| 98 | 98 | ORDER BY title ASC' |
| 99 | 99 | ); |
| 100 | 100 | foreach ($rows as $record) { |
| 101 | 101 | if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) { |
| 102 | - $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>'; |
|
| 102 | + $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>'; |
|
| 103 | 103 | } |
| 104 | 104 | if ( |
| 105 | 105 | (int) $session->get('user-admin') === 1 |
| 106 | 106 | || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) |
| 107 | 107 | && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id')) |
| 108 | 108 | ) { |
| 109 | - $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>'; |
|
| 109 | + $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>'; |
|
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | for ($y = 1; $y < $t->nlevel; ++$y) { |
| 122 | 122 | $ident .= ' '; |
| 123 | 123 | } |
| 124 | - $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>'; |
|
| 124 | + $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>'; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | </button><?php |
| 159 | 159 | echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ? |
| 160 | 160 | '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync"> |
| 161 | - <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . ' |
|
| 161 | + <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').' |
|
| 162 | 162 | </button>' : ''; |
| 163 | 163 | ?> |
| 164 | 164 | </h3> |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | <!-- /.card-header --> |
| 168 | 168 | <div class="card-body form" id="users-list"> |
| 169 | - <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons');?></span></label> |
|
| 169 | + <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons'); ?></span></label> |
|
| 170 | 170 | <table id="table-users" class="table table-striped nowrap table-responsive-sm"> |
| 171 | 171 | <thead> |
| 172 | 172 | <tr> |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | <?php |
| 232 | 232 | foreach (TP_PW_COMPLEXITY as $entry) { |
| 233 | 233 | echo ' |
| 234 | - <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>'; |
|
| 234 | + <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>'; |
|
| 235 | 235 | } |
| 236 | 236 | ?> |
| 237 | 237 | </select> |
@@ -74,7 +74,9 @@ discard block |
||
| 74 | 74 | if ($args['step'] === 'create_users_files_key') { |
| 75 | 75 | // Loop on all files for this item |
| 76 | 76 | // and encrypt them for each user |
| 77 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 77 | + if (WIP === true) { |
|
| 78 | + provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 79 | + } |
|
| 78 | 80 | foreach($args['files_keys'] as $file) { |
| 79 | 81 | storeUsersShareKey( |
| 80 | 82 | prefixTable('sharekeys_items'), |
@@ -91,7 +93,9 @@ discard block |
||
| 91 | 93 | } elseif ($args['step'] === 'create_users_fields_key') { |
| 92 | 94 | // Loop on all encrypted fields for this item |
| 93 | 95 | // and encrypt them for each user |
| 94 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 96 | + if (WIP === true) { |
|
| 97 | + provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 98 | + } |
|
| 95 | 99 | foreach($args['fields_keys'] as $field) { |
| 96 | 100 | storeUsersShareKey( |
| 97 | 101 | prefixTable('sharekeys_fields'), |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | $subtask = DB::queryfirstrow( |
| 58 | 58 | 'SELECT * |
| 59 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 59 | + FROM ' . prefixTable('background_subtasks').' |
|
| 60 | 60 | WHERE process_id = %i AND finished_at IS NULL |
| 61 | 61 | ORDER BY increment_id ASC', |
| 62 | 62 | (int) $request->request->get('subTask') |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | list($taskArguments) = DB::queryFirstField( |
| 66 | 66 | 'SELECT arguments |
| 67 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 67 | + FROM ' . prefixTable('background_tasks').' |
|
| 68 | 68 | WHERE increment_id = %i', |
| 69 | 69 | $subtask['process_id'] |
| 70 | 70 | ); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | // Loop on all files for this item |
| 76 | 76 | // and encrypt them for each user |
| 77 | 77 | if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
| 78 | - foreach($args['files_keys'] as $file) { |
|
| 78 | + foreach ($args['files_keys'] as $file) { |
|
| 79 | 79 | storeUsersShareKey( |
| 80 | 80 | prefixTable('sharekeys_items'), |
| 81 | 81 | 0, |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | // Loop on all encrypted fields for this item |
| 93 | 93 | // and encrypt them for each user |
| 94 | 94 | if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
| 95 | - foreach($args['fields_keys'] as $field) { |
|
| 95 | + foreach ($args['fields_keys'] as $field) { |
|
| 96 | 96 | storeUsersShareKey( |
| 97 | 97 | prefixTable('sharekeys_fields'), |
| 98 | 98 | 0, |
@@ -149,7 +149,9 @@ |
||
| 149 | 149 | } |
| 150 | 150 | $filePath = realpath($filePath); |
| 151 | 151 | |
| 152 | - if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - "); |
|
| 152 | + if (WIP === true) { |
|
| 153 | + error_log('downloadFile.php: filePath: ' . $filePath." - "); |
|
| 154 | + } |
|
| 153 | 155 | |
| 154 | 156 | if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) { |
| 155 | 157 | header('Content-Description: File Transfer'); |
@@ -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 | |
@@ -118,19 +118,19 @@ discard block |
||
| 118 | 118 | $get_filename = str_replace('"', '\"', $get_filename); |
| 119 | 119 | |
| 120 | 120 | // Use Content-Disposition header with double quotes around filename |
| 121 | -header('Content-Disposition: attachment; filename="' . rawurldecode($get_filename) . '"'); |
|
| 121 | +header('Content-Disposition: attachment; filename="'.rawurldecode($get_filename).'"'); |
|
| 122 | 122 | header('Content-Type: application/octet-stream'); |
| 123 | 123 | header('Cache-Control: must-revalidate, no-cache, no-store'); |
| 124 | 124 | header('Expires: 0'); |
| 125 | 125 | if (null !== $request->query->get('pathIsFiles') && (int) $get_pathIsFiles === 1) { |
| 126 | - readfile($SETTINGS['path_to_files_folder'] . '/' . basename($get_filename)); |
|
| 126 | + readfile($SETTINGS['path_to_files_folder'].'/'.basename($get_filename)); |
|
| 127 | 127 | } else { |
| 128 | 128 | // get file key |
| 129 | 129 | $file_info = DB::queryfirstrow( |
| 130 | 130 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 131 | 131 | s.share_key AS share_key |
| 132 | - FROM ' . prefixTable('files') . ' AS f |
|
| 133 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 132 | + FROM ' . prefixTable('files').' AS f |
|
| 133 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 134 | 134 | WHERE s.user_id = %i AND s.object_id = %i', |
| 135 | 135 | $session->get('user-id'), |
| 136 | 136 | $get_fileid |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | // if not encrypted |
| 150 | 150 | $file_info = DB::queryfirstrow( |
| 151 | 151 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension |
| 152 | - FROM ' . prefixTable('files') . ' AS f |
|
| 152 | + FROM ' . prefixTable('files').' AS f |
|
| 153 | 153 | WHERE f.id = %i', |
| 154 | 154 | $get_fileid |
| 155 | 155 | ); |
@@ -159,25 +159,25 @@ discard block |
||
| 159 | 159 | // Set the filename of the download |
| 160 | 160 | $filename = basename($file_info['name'], '.'.$file_info['extension']); |
| 161 | 161 | $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; |
| 162 | - $filename = $filename . '.' . $file_info['extension']; |
|
| 162 | + $filename = $filename.'.'.$file_info['extension']; |
|
| 163 | 163 | // Get the full path to the file to be downloaded |
| 164 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' .TP_FILE_PREFIX . $file_info['file'])) { |
|
| 165 | - $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . $file_info['file']; |
|
| 164 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file'])) { |
|
| 165 | + $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file']; |
|
| 166 | 166 | } else { |
| 167 | - $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file_info['file']); |
|
| 167 | + $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file_info['file']); |
|
| 168 | 168 | } |
| 169 | 169 | $filePath = realpath($filePath); |
| 170 | 170 | |
| 171 | - if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - "); |
|
| 171 | + if (WIP === true) error_log('downloadFile.php: filePath: '.$filePath." - "); |
|
| 172 | 172 | |
| 173 | 173 | if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) { |
| 174 | 174 | header('Content-Description: File Transfer'); |
| 175 | 175 | header('Content-Type: application/octet-stream'); |
| 176 | - header('Content-Disposition: attachment; filename="' . basename($filename) . '"'); |
|
| 176 | + header('Content-Disposition: attachment; filename="'.basename($filename).'"'); |
|
| 177 | 177 | header('Expires: 0'); |
| 178 | 178 | header('Cache-Control: must-revalidate'); |
| 179 | 179 | header('Pragma: public'); |
| 180 | - header('Content-Length: ' . filesize($filePath)); |
|
| 180 | + header('Content-Length: '.filesize($filePath)); |
|
| 181 | 181 | flush(); // Clear system output buffer |
| 182 | 182 | if (empty($fileContent) === true) { |
| 183 | 183 | // deepcode ignore PT: File and path are secured directly inside the function decryptFile() |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | ) { |
| 79 | 79 | // Not allowed page |
| 80 | 80 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 81 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 81 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 82 | 82 | exit; |
| 83 | 83 | } |
| 84 | 84 | |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | // get exec from processes table |
| 164 | 164 | $rows = DB::query( |
| 165 | 165 | 'SELECT max(finished_at), process_type |
| 166 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 166 | + FROM ' . prefixTable('background_tasks').' |
|
| 167 | 167 | GROUP BY process_type' |
| 168 | 168 | ); |
| 169 | 169 | foreach ($rows as $row) { |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | // get exec from background_tasks_log table |
| 180 | 180 | $rows = DB::query( |
| 181 | 181 | 'SELECT MAX(finished_at) AS max_finished_at, job AS process_type |
| 182 | - FROM ' . prefixTable('background_tasks_logs') . ' |
|
| 182 | + FROM ' . prefixTable('background_tasks_logs').' |
|
| 183 | 183 | WHERE finished_at >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 7 DAY)) |
| 184 | 184 | GROUP BY process_type' |
| 185 | 185 | ); |
@@ -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 | |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | $arrFolders = array(); |
| 131 | 131 | $rows = DB::query( |
| 132 | 132 | 'SELECT valeur, intitule |
| 133 | - FROM ' . prefixTable('misc') . ' |
|
| 133 | + FROM ' . prefixTable('misc').' |
|
| 134 | 134 | WHERE type = %s', |
| 135 | 135 | 'folder_deleted' |
| 136 | 136 | ); |
@@ -152,10 +152,10 @@ discard block |
||
| 152 | 152 | 'SELECT u.login as login, u.name as name, u.lastname as lastname, |
| 153 | 153 | i.id as id, i.label as label, |
| 154 | 154 | i.id_tree as id_tree, l.date as date, n.title as folder_title |
| 155 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 156 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 157 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 158 | - LEFT JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id) |
|
| 155 | + FROM ' . prefixTable('log_items').' as l |
|
| 156 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 157 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 158 | + LEFT JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id) |
|
| 159 | 159 | WHERE i.inactif = %i |
| 160 | 160 | AND l.action = %s', |
| 161 | 161 | 1, |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | 'label' => $record['label'], |
| 178 | 178 | 'date' => date($SETTINGS['date_format'], (int) $record['date']), |
| 179 | 179 | 'login' => $record['login'], |
| 180 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 180 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 181 | 181 | 'folder_label' => $record['folder_title'], |
| 182 | 182 | 'folder_deleted' => $thisFolder, |
| 183 | 183 | ) |
@@ -235,10 +235,10 @@ discard block |
||
| 235 | 235 | foreach ($post_folders as $folderId) { |
| 236 | 236 | $data = DB::queryfirstrow( |
| 237 | 237 | 'SELECT valeur |
| 238 | - FROM ' . prefixTable('misc') . " |
|
| 238 | + FROM ' . prefixTable('misc')." |
|
| 239 | 239 | WHERE type = 'folder_deleted' |
| 240 | 240 | AND intitule = %s", |
| 241 | - 'f' . $folderId |
|
| 241 | + 'f'.$folderId |
|
| 242 | 242 | ); |
| 243 | 243 | if ((int) $data['valeur'] !== 0) { |
| 244 | 244 | $folderData = explode(', ', $data['valeur']); |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | prefixTable('misc'), |
| 266 | 266 | 'type = %s AND intitule = %s', |
| 267 | 267 | 'folder_deleted', |
| 268 | - 'f' . $folderId |
|
| 268 | + 'f'.$folderId |
|
| 269 | 269 | ); |
| 270 | 270 | |
| 271 | 271 | // Restore all items in this folder |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | // Get list of all items in thos folder |
| 282 | 282 | $items = DB::query( |
| 283 | 283 | 'SELECT id |
| 284 | - FROM ' . prefixTable('items') . ' |
|
| 284 | + FROM ' . prefixTable('items').' |
|
| 285 | 285 | WHERE id_tree = %i', |
| 286 | 286 | $folderId |
| 287 | 287 | ); |
@@ -370,10 +370,10 @@ discard block |
||
| 370 | 370 | foreach ($post_folders as $folderId) { |
| 371 | 371 | $data = DB::queryfirstrow( |
| 372 | 372 | 'SELECT valeur |
| 373 | - FROM ' . prefixTable('misc') . " |
|
| 373 | + FROM ' . prefixTable('misc')." |
|
| 374 | 374 | WHERE type = 'folder_deleted' |
| 375 | 375 | AND intitule = %s", |
| 376 | - 'f' . $folderId |
|
| 376 | + 'f'.$folderId |
|
| 377 | 377 | ); |
| 378 | 378 | if ((int) $data['valeur'] !== 0) { |
| 379 | 379 | $exploded = explode(',', $data['valeur']); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | prefixTable('misc'), |
| 385 | 385 | 'type = %s AND intitule = %s', |
| 386 | 386 | 'folder_deleted', |
| 387 | - 'f' . $folderData[0] |
|
| 387 | + 'f'.$folderData[0] |
|
| 388 | 388 | ); |
| 389 | 389 | |
| 390 | 390 | // Delete all items in this folder |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | // Get list of all items in thos folder |
| 399 | 399 | $items = DB::query( |
| 400 | 400 | 'SELECT id |
| 401 | - FROM ' . prefixTable('items') . ' |
|
| 401 | + FROM ' . prefixTable('items').' |
|
| 402 | 402 | WHERE id_tree = %i', |
| 403 | 403 | $folderData[0] |
| 404 | 404 | ); |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | // Delete all fields |
| 416 | 416 | $fields = DB::query( |
| 417 | 417 | 'SELECT id |
| 418 | - FROM ' . prefixTable('categories_items') . ' |
|
| 418 | + FROM ' . prefixTable('categories_items').' |
|
| 419 | 419 | WHERE item_id = %i', |
| 420 | 420 | $folderData[0] |
| 421 | 421 | ); |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | // Delete all files |
| 436 | 436 | $files = DB::query( |
| 437 | 437 | 'SELECT id |
| 438 | - FROM ' . prefixTable('files') . ' |
|
| 438 | + FROM ' . prefixTable('files').' |
|
| 439 | 439 | WHERE id_item = %i', |
| 440 | 440 | $folderData[0] |
| 441 | 441 | ); |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | // Delete sharekey fields |
| 493 | 493 | $itemFields = DB::query( |
| 494 | 494 | 'SELECT id |
| 495 | - FROM ' . prefixTable('categories_items') . ' |
|
| 495 | + FROM ' . prefixTable('categories_items').' |
|
| 496 | 496 | WHERE item_id = %i', |
| 497 | 497 | $itemId |
| 498 | 498 | ); |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | // Delete sharekey files |
| 508 | 508 | $itemFiles = DB::query( |
| 509 | 509 | 'SELECT id |
| 510 | - FROM ' . prefixTable('files') . ' |
|
| 510 | + FROM ' . prefixTable('files').' |
|
| 511 | 511 | WHERE id_item = %i', |
| 512 | 512 | $itemId |
| 513 | 513 | ); |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | ) { |
| 585 | 585 | if ($post_log_type === 'items') { |
| 586 | 586 | DB::query( |
| 587 | - 'SELECT * FROM ' . prefixTable('log_items') . ' |
|
| 587 | + 'SELECT * FROM '.prefixTable('log_items').' |
|
| 588 | 588 | WHERE (date BETWEEN %i AND %i)' |
| 589 | 589 | . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"') |
| 590 | 590 | . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user), |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | } elseif ($post_log_type === 'connections') { |
| 605 | 605 | //db::debugmode(true); |
| 606 | 606 | DB::query( |
| 607 | - 'SELECT * FROM ' . prefixTable('log_system') . ' |
|
| 607 | + 'SELECT * FROM '.prefixTable('log_system').' |
|
| 608 | 608 | WHERE type=%s ' |
| 609 | 609 | . 'AND (date BETWEEN %i AND %i)' |
| 610 | 610 | . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action) |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | ); |
| 628 | 628 | } elseif ($post_log_type === 'errors') { |
| 629 | 629 | DB::query( |
| 630 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 630 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 631 | 631 | 'AND (date BETWEEN %i AND %i)', |
| 632 | 632 | 'error', |
| 633 | 633 | $post_date_from, |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | ); |
| 645 | 645 | } elseif ($post_log_type === 'copy') { |
| 646 | 646 | DB::query( |
| 647 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' . |
|
| 647 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '. |
|
| 648 | 648 | 'AND (date BETWEEN %i AND %i)', |
| 649 | 649 | 'at_copy', |
| 650 | 650 | $post_date_from, |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | ); |
| 662 | 662 | } elseif ($post_log_type === 'admin') { |
| 663 | 663 | DB::query( |
| 664 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 664 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 665 | 665 | 'AND (date BETWEEN %i AND %i)', |
| 666 | 666 | 'admin_action', |
| 667 | 667 | $post_date_from, |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | ); |
| 679 | 679 | } elseif ($post_log_type === 'failed') { |
| 680 | 680 | DB::query( |
| 681 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 681 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 682 | 682 | 'AND (date BETWEEN %i AND %i)', |
| 683 | 683 | 'failed_auth', |
| 684 | 684 | $post_date_from, |
@@ -749,19 +749,19 @@ discard block |
||
| 749 | 749 | // Get info about task |
| 750 | 750 | $taskInfo = DB::queryfirstrow( |
| 751 | 751 | 'SELECT p.process_type as process_type |
| 752 | - FROM ' . prefixTable('background_tasks') . ' as p |
|
| 752 | + FROM ' . prefixTable('background_tasks').' as p |
|
| 753 | 753 | WHERE p.increment_id = %i', |
| 754 | 754 | $post_id |
| 755 | 755 | ); |
| 756 | 756 | if ($taskInfo !== null) { |
| 757 | 757 | // delete task |
| 758 | 758 | DB::query( |
| 759 | - 'DELETE FROM ' . prefixTable('background_subtasks') . ' |
|
| 759 | + 'DELETE FROM '.prefixTable('background_subtasks').' |
|
| 760 | 760 | WHERE task_id = %i', |
| 761 | 761 | $post_id |
| 762 | 762 | ); |
| 763 | 763 | DB::query( |
| 764 | - 'DELETE FROM ' . prefixTable('background_tasks') . ' |
|
| 764 | + 'DELETE FROM '.prefixTable('background_tasks').' |
|
| 765 | 765 | WHERE increment_id = %i', |
| 766 | 766 | $post_id |
| 767 | 767 | ); |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | ->setDayOfMonth('*') |
| 829 | 829 | ->setMonths('*') |
| 830 | 830 | ->setDayOfWeek('*') |
| 831 | - ->setTaskCommandLine($phpBinaryPath . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php') |
|
| 831 | + ->setTaskCommandLine($phpBinaryPath.' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php') |
|
| 832 | 832 | ->setComments('Teampass scheduler'); |
| 833 | 833 | |
| 834 | 834 | $crontabRepository->addJob($crontabJob); |