@@ -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 | |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | // Check for existing lock |
| 248 | 248 | $unlock_at = DB::queryFirstField( |
| 249 | 249 | 'SELECT MAX(unlock_at) |
| 250 | - FROM ' . prefixTable('auth_failures') . ' |
|
| 250 | + FROM ' . prefixTable('auth_failures').' |
|
| 251 | 251 | WHERE unlock_at > %s AND source = %s AND value = %s', |
| 252 | 252 | date('Y-m-d H:i:s', time()), |
| 253 | 253 | 'login', |
@@ -256,33 +256,31 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | // Get some infos about user |
| 258 | 258 | $userDisplayInfos = |
| 259 | - (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 | + (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>' : '') |
|
| 260 | 260 | . |
| 261 | 261 | ((int) $record['last_connexion'] > 0 ? '<i class=\"far fa-clock infotip text-info ml-2\" title=\"'.$lang->get('index_last_seen').": ". |
| 262 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '') |
|
| 262 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '') |
|
| 263 | 263 | . |
| 264 | 264 | ((int) $record['user_ip'] > 0 ? '<i class=\"fas fa-street-view infotip text-info ml-1\" title=\"'.$lang->get('ip').": ".($record['user_ip']).'\"></i>' : '') |
| 265 | 265 | . |
| 266 | 266 | ($record['auth_type'] === 'ldap' ? '<i class=\"far fa-address-book infotip text-warning ml-1\" title=\"'.$lang->get('managed_through_ad').'\"></i>' : '') |
| 267 | 267 | . |
| 268 | 268 | ((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)) ? |
| 269 | - ((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 | + ((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>') : '' |
|
| 271 | 270 | ) |
| 272 | 271 | . |
| 273 | 272 | (($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>' : ''); |
| 274 | 273 | if ($request->query->filter('display_warnings', '', FILTER_VALIDATE_BOOLEAN) === true) { |
| 275 | 274 | $userDisplayInfos .= '<br>'. |
| 276 | 275 | ((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) ? |
| 277 | - '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' : |
|
| 278 | - '' |
|
| 276 | + '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' : '' |
|
| 279 | 277 | ). |
| 280 | 278 | ((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>' : ''); |
| 281 | 279 | } |
| 282 | 280 | |
| 283 | 281 | $sOutput .= '["<span data-id=\"'.$record['id'].'\" data-fullname=\"'. |
| 284 | - (empty($record['name']) === false ? htmlentities($record['name'], ENT_QUOTES|ENT_SUBSTITUTE|ENT_DISALLOWED) : '').' '. |
|
| 285 | - (empty($record['lastname']) === false ? htmlentities($record['lastname'], ENT_QUOTES|ENT_SUBSTITUTE|ENT_DISALLOWED) : ''). |
|
| 282 | + (empty($record['name']) === false ? htmlentities($record['name'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_DISALLOWED) : '').' '. |
|
| 283 | + (empty($record['lastname']) === false ? htmlentities($record['lastname'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_DISALLOWED) : ''). |
|
| 286 | 284 | '\" 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>", '; |
| 287 | 285 | //col2 |
| 288 | 286 | $sOutput .= '"'. |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | DB::debugmode(false); |
| 76 | 76 | $process_to_perform = DB::queryfirstrow( |
| 77 | 77 | 'SELECT * |
| 78 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 78 | + FROM ' . prefixTable('background_tasks').' |
|
| 79 | 79 | WHERE is_in_progress = %i AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys") |
| 80 | 80 | ORDER BY increment_id ASC', |
| 81 | 81 | 1 |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | // search for next process to handle |
| 94 | 94 | $process_to_perform = DB::queryfirstrow( |
| 95 | 95 | 'SELECT * |
| 96 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 96 | + FROM ' . prefixTable('background_tasks').' |
|
| 97 | 97 | WHERE is_in_progress = %i AND (finished_at = "" OR finished_at IS NULL) AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys") |
| 98 | 98 | ORDER BY increment_id ASC', |
| 99 | 99 | 0 |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $process_to_perform['increment_id'] |
| 112 | 112 | ); |
| 113 | 113 | |
| 114 | - provideLog('[PROCESS][#'. $process_to_perform['increment_id'].'][START]', $SETTINGS); |
|
| 114 | + provideLog('[PROCESS][#'.$process_to_perform['increment_id'].'][START]', $SETTINGS); |
|
| 115 | 115 | handleTask( |
| 116 | 116 | $process_to_perform['increment_id'], |
| 117 | 117 | json_decode($process_to_perform['arguments'], true), |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | // Search if there are remaining tasks |
| 142 | 142 | $process_to_perform = DB::queryFirstField( |
| 143 | 143 | 'SELECT 1 |
| 144 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 144 | + FROM ' . prefixTable('background_tasks').' |
|
| 145 | 145 | WHERE is_in_progress = %i AND process_type IN ( |
| 146 | 146 | "item_copy", |
| 147 | 147 | "new_item", |
@@ -180,10 +180,10 @@ discard block |
||
| 180 | 180 | */ |
| 181 | 181 | function handleTask(int $processId, array $ProcessArguments, array $SETTINGS, int $itemId = null): bool |
| 182 | 182 | { |
| 183 | - provideLog('[PROCESS][#'. $processId.'][START]', $SETTINGS); |
|
| 183 | + provideLog('[PROCESS][#'.$processId.'][START]', $SETTINGS); |
|
| 184 | 184 | $task_to_perform = DB::queryfirstrow( |
| 185 | 185 | 'SELECT * |
| 186 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 186 | + FROM ' . prefixTable('background_subtasks').' |
|
| 187 | 187 | WHERE task_id = %i AND finished_at IS NULL |
| 188 | 188 | ORDER BY increment_id ASC', |
| 189 | 189 | $processId |
@@ -197,13 +197,13 @@ discard block |
||
| 197 | 197 | // if sub_task_in_progress === 1 then exit |
| 198 | 198 | if ((int) $task_to_perform['sub_task_in_progress'] !== 0) { |
| 199 | 199 | // Task is currently being in progress by another server process |
| 200 | - provideLog('[TASK][#'. $task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS); |
|
| 200 | + provideLog('[TASK][#'.$task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS); |
|
| 201 | 201 | return false; |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | // handle next task |
| 205 | 205 | $args = json_decode($task_to_perform['task'], true); |
| 206 | - provideLog('[TASK][#'. $task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS); |
|
| 206 | + provideLog('[TASK][#'.$task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS); |
|
| 207 | 207 | |
| 208 | 208 | // flag as in progress |
| 209 | 209 | DB::update( |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | DB::update( |
| 246 | 246 | prefixTable('background_subtasks'), |
| 247 | 247 | array( |
| 248 | - 'sub_task_in_progress' => 0, // flag sub task is no more in prgoress |
|
| 248 | + 'sub_task_in_progress' => 0, // flag sub task is no more in prgoress |
|
| 249 | 249 | 'task' => json_encode(["status" => "Done"]), |
| 250 | 250 | 'is_in_progress' => -1, |
| 251 | 251 | 'finished_at' => time(), |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | // are all tasks done? |
| 261 | 261 | DB::query( |
| 262 | 262 | 'SELECT * |
| 263 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 263 | + FROM ' . prefixTable('background_subtasks').' |
|
| 264 | 264 | WHERE task_id = %i AND finished_at IS NULL', |
| 265 | 265 | $processId |
| 266 | 266 | ); |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | // Loop on all files for this item |
| 333 | 333 | // and encrypt them for each user |
| 334 | 334 | if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
| 335 | - foreach($args['files_keys'] as $file) { |
|
| 335 | + foreach ($args['files_keys'] as $file) { |
|
| 336 | 336 | storeUsersShareKey( |
| 337 | 337 | prefixTable('sharekeys_items'), |
| 338 | 338 | 0, |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | // Loop on all encrypted fields for this item |
| 349 | 349 | // and encrypt them for each user |
| 350 | 350 | if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
| 351 | - foreach($args['fields_keys'] as $field) { |
|
| 351 | + foreach ($args['fields_keys'] as $field) { |
|
| 352 | 352 | storeUsersShareKey( |
| 353 | 353 | prefixTable('sharekeys_fields'), |
| 354 | 354 | 0, |
@@ -400,6 +400,6 @@ discard block |
||
| 400 | 400 | DB::query( |
| 401 | 401 | 'DELETE FROM '.prefixTable('items_edition').' |
| 402 | 402 | WHERE timestamp < %i', |
| 403 | - ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition']*60) : time() - EDITION_LOCK_PERIOD |
|
| 403 | + ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition'] * 60) : time() - EDITION_LOCK_PERIOD |
|
| 404 | 404 | ); |
| 405 | 405 | } |
@@ -83,7 +83,9 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | if (DB::count() > 0) { |
| 85 | 85 | // handle tasks inside this process |
| 86 | - if (WIP === true) error_log("Process in progress: ".$process_to_perform['increment_id']); |
|
| 86 | + if (WIP === true) { |
|
| 87 | + error_log("Process in progress: ".$process_to_perform['increment_id']); |
|
| 88 | + } |
|
| 87 | 89 | handleTask( |
| 88 | 90 | $process_to_perform['increment_id'], |
| 89 | 91 | json_decode($process_to_perform['arguments'], true), |
@@ -100,7 +102,9 @@ discard block |
||
| 100 | 102 | ); |
| 101 | 103 | |
| 102 | 104 | if (DB::count() > 0) { |
| 103 | - if (WIP === true) error_log("New process ta start: ".$process_to_perform['increment_id']); |
|
| 105 | + if (WIP === true) { |
|
| 106 | + error_log("New process ta start: ".$process_to_perform['increment_id']); |
|
| 107 | + } |
|
| 104 | 108 | // update DB - started_at |
| 105 | 109 | DB::update( |
| 106 | 110 | prefixTable('background_tasks'), |
@@ -153,8 +157,9 @@ discard block |
||
| 153 | 157 | ); |
| 154 | 158 | |
| 155 | 159 | // No more tasks, exit |
| 156 | - if ($process_to_perform !== 1) |
|
| 157 | - break; |
|
| 160 | + if ($process_to_perform !== 1) { |
|
| 161 | + break; |
|
| 162 | + } |
|
| 158 | 163 | |
| 159 | 164 | // Run next task |
| 160 | 165 | $process = new Symfony\Component\Process\Process([ |
@@ -331,7 +336,9 @@ discard block |
||
| 331 | 336 | if ($args['step'] === 'create_users_files_key') { |
| 332 | 337 | // Loop on all files for this item |
| 333 | 338 | // and encrypt them for each user |
| 334 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 339 | + if (WIP === true) { |
|
| 340 | + provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 341 | + } |
|
| 335 | 342 | foreach($args['files_keys'] as $file) { |
| 336 | 343 | storeUsersShareKey( |
| 337 | 344 | prefixTable('sharekeys_items'), |
@@ -347,7 +354,9 @@ discard block |
||
| 347 | 354 | } elseif ($args['step'] === 'create_users_fields_key') { |
| 348 | 355 | // Loop on all encrypted fields for this item |
| 349 | 356 | // and encrypt them for each user |
| 350 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 357 | + if (WIP === true) { |
|
| 358 | + provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 359 | + } |
|
| 351 | 360 | foreach($args['fields_keys'] as $field) { |
| 352 | 361 | storeUsersShareKey( |
| 353 | 362 | prefixTable('sharekeys_fields'), |
@@ -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 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | // Output |
| 170 | 170 | $sOutput = '{'; |
| 171 | - $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 171 | + $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 172 | 172 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 173 | 173 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 174 | 174 | $sOutput .= '"aaData": '; |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | |
| 242 | 242 | // Output |
| 243 | 243 | $sOutput = '{'; |
| 244 | - $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 244 | + $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 245 | 245 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 246 | 246 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 247 | 247 | $sOutput .= '"aaData": '; |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | |
| 315 | 315 | // Output |
| 316 | 316 | $sOutput = '{'; |
| 317 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 317 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 318 | 318 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 319 | 319 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 320 | 320 | $sOutput .= '"aaData": '; |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | |
| 388 | 388 | // Output |
| 389 | 389 | $sOutput = '{'; |
| 390 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 390 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 391 | 391 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 392 | 392 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 393 | 393 | $sOutput .= '"aaData": [ '; |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | |
| 491 | 491 | // Output |
| 492 | 492 | $sOutput = '{'; |
| 493 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 493 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 494 | 494 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 495 | 495 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 496 | 496 | $sOutput .= '"aaData": [ '; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | $iTotal = 0; |
| 573 | 573 | } |
| 574 | 574 | $sOutput = '{'; |
| 575 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 575 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 576 | 576 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 577 | 577 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 578 | 578 | $sOutput .= '"aaData": '; |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | |
| 649 | 649 | // Output |
| 650 | 650 | $sOutput = '{'; |
| 651 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 651 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 652 | 652 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 653 | 653 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 654 | 654 | $sOutput .= '"aaData": '; |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | |
| 718 | 718 | // Output |
| 719 | 719 | $sOutput = '{'; |
| 720 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 720 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 721 | 721 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 722 | 722 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 723 | 723 | $sOutput .= '"aaData": '; |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | |
| 792 | 792 | // Output |
| 793 | 793 | $sOutput = '{'; |
| 794 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 794 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 795 | 795 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 796 | 796 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 797 | 797 | $sOutput .= '"aaData": '; |
@@ -868,7 +868,7 @@ discard block |
||
| 868 | 868 | FROM '.prefixTable('background_tasks').' AS p |
| 869 | 869 | LEFT JOIN '.prefixTable('users').' AS u ON %l |
| 870 | 870 | WHERE %l ORDER BY %l %l LIMIT %i, %i'; |
| 871 | - $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength]; |
|
| 871 | + $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength]; |
|
| 872 | 872 | |
| 873 | 873 | // Get the records |
| 874 | 874 | $rows = DB::query($sql, ...$params); |
@@ -876,7 +876,7 @@ discard block |
||
| 876 | 876 | |
| 877 | 877 | // Output |
| 878 | 878 | $sOutput = '{'; |
| 879 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 879 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 880 | 880 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 881 | 881 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 882 | 882 | $sOutput .= '"aaData": '; |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | //col1 |
| 892 | 892 | $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", '; |
| 893 | 893 | //col2 |
| 894 | - $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 894 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 895 | 895 | //col3 |
| 896 | 896 | //$sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", '; |
| 897 | 897 | $sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", '; |
@@ -901,7 +901,7 @@ discard block |
||
| 901 | 901 | // col5 |
| 902 | 902 | if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) { |
| 903 | 903 | $data_user = DB::queryfirstrow( |
| 904 | - 'SELECT name, lastname FROM ' . prefixTable('users') . ' |
|
| 904 | + 'SELECT name, lastname FROM '.prefixTable('users').' |
|
| 905 | 905 | WHERE id = %i', |
| 906 | 906 | json_decode($record['arguments'], true)['new_user_id'] |
| 907 | 907 | ); |
@@ -957,7 +957,7 @@ discard block |
||
| 957 | 957 | FROM '.prefixTable('background_tasks').' AS p |
| 958 | 958 | LEFT JOIN '.prefixTable('users').' AS u ON %l |
| 959 | 959 | WHERE %l ORDER BY %l %l LIMIT %i, %i'; |
| 960 | - $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength]; |
|
| 960 | + $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength]; |
|
| 961 | 961 | |
| 962 | 962 | // Get the records |
| 963 | 963 | $rows = DB::query($sql, ...$params); |
@@ -965,7 +965,7 @@ discard block |
||
| 965 | 965 | |
| 966 | 966 | // Output |
| 967 | 967 | $sOutput = '{'; |
| 968 | - $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', '; |
|
| 968 | + $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', '; |
|
| 969 | 969 | $sOutput .= '"iTotalRecords": '.$iTotal.', '; |
| 970 | 970 | $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', '; |
| 971 | 971 | $sOutput .= '"aaData": '; |
@@ -981,13 +981,12 @@ discard block |
||
| 981 | 981 | //col1 |
| 982 | 982 | $sOutput .= '"", '; |
| 983 | 983 | //col2 |
| 984 | - $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 984 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", '; |
|
| 985 | 985 | //col3 |
| 986 | 986 | $sOutput .= is_null($record['started_at']) === false ? |
| 987 | - ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') : |
|
| 988 | - ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", '); |
|
| 987 | + ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", '); |
|
| 989 | 988 | //col4 |
| 990 | - $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", '; |
|
| 989 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", '; |
|
| 991 | 990 | // col7 |
| 992 | 991 | $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",'; |
| 993 | 992 | //col5 |
@@ -1006,7 +1005,7 @@ discard block |
||
| 1006 | 1005 | $newUserId = array_key_exists('new_user_id', $arguments) ? $arguments['new_user_id'] : null; |
| 1007 | 1006 | if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) { |
| 1008 | 1007 | $data_user = DB::queryfirstrow( |
| 1009 | - 'SELECT name, lastname, login FROM ' . prefixTable('users') . ' |
|
| 1008 | + 'SELECT name, lastname, login FROM '.prefixTable('users').' |
|
| 1010 | 1009 | WHERE id = %i', |
| 1011 | 1010 | $newUserId |
| 1012 | 1011 | ); |
@@ -1022,7 +1021,7 @@ discard block |
||
| 1022 | 1021 | } elseif ($record['process_type'] === 'user_build_cache_tree') { |
| 1023 | 1022 | $user = json_decode($record['arguments'], true)['user_id']; |
| 1024 | 1023 | $data_user = DB::queryfirstrow( |
| 1025 | - 'SELECT name, lastname, login FROM ' . prefixTable('users') . ' |
|
| 1024 | + 'SELECT name, lastname, login FROM '.prefixTable('users').' |
|
| 1026 | 1025 | WHERE id = %i', |
| 1027 | 1026 | $user |
| 1028 | 1027 | ); |
@@ -1056,7 +1055,7 @@ discard block |
||
| 1056 | 1055 | { |
| 1057 | 1056 | $subtasks = DB::query( |
| 1058 | 1057 | 'SELECT * |
| 1059 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 1058 | + FROM ' . prefixTable('background_subtasks').' |
|
| 1060 | 1059 | WHERE task_id = %i', |
| 1061 | 1060 | $id |
| 1062 | 1061 | ); |
@@ -1072,5 +1071,5 @@ discard block |
||
| 1072 | 1071 | $i++; |
| 1073 | 1072 | } |
| 1074 | 1073 | |
| 1075 | - return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%'; |
|
| 1074 | + return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%'; |
|
| 1076 | 1075 | } |
| 1077 | 1076 | \ No newline at end of file |