@@ -64,7 +64,7 @@ |
||
| 64 | 64 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('uploads') === false) { |
| 65 | 65 | // Not allowed page |
| 66 | 66 | $_SESSION['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 | ?> |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
| 63 | 63 | // Not allowed page |
| 64 | 64 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 65 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 65 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 66 | 66 | exit; |
| 67 | 67 | } |
| 68 | 68 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | // error |
| 147 | 147 | toastr.remove(); |
| 148 | 148 | toastr.error( |
| 149 | - '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 149 | + '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error, |
|
| 150 | 150 | '', { |
| 151 | 151 | closeButton: true, |
| 152 | 152 | positionClass: 'toastr-top-right' |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | // error |
| 221 | 221 | toastr.remove(); |
| 222 | 222 | toastr.error( |
| 223 | - '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 223 | + '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error, |
|
| 224 | 224 | '', { |
| 225 | 225 | closeButton: true, |
| 226 | 226 | positionClass: 'toastr-top-right' |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.deletion') === false) { |
| 71 | 71 | // Not allowed page |
| 72 | 72 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 73 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 73 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 74 | 74 | exit; |
| 75 | 75 | } |
| 76 | 76 | ?> |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === false) { |
| 64 | 64 | // Not allowed page |
| 65 | 65 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 66 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 66 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 67 | 67 | exit; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.deletion') === false) { |
| 64 | 64 | // Not allowed page |
| 65 | 65 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 66 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 66 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 67 | 67 | exit; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 64 | 64 | // Not allowed page |
| 65 | 65 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 66 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 66 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 67 | 67 | exit; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -99,25 +99,25 @@ discard block |
||
| 99 | 99 | // prepare list of timezones |
| 100 | 100 | $zones = timezone_list(); |
| 101 | 101 | // prepare list of languages |
| 102 | -$languages = DB::query('SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC'); |
|
| 102 | +$languages = DB::query('SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC'); |
|
| 103 | 103 | // Do some stats |
| 104 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_creation" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 104 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_creation" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 105 | 105 | $userItemsNumber = DB::count(); |
| 106 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_modification" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 106 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_modification" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 107 | 107 | $userModificationNumber = DB::count(); |
| 108 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_shown" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 108 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_shown" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 109 | 109 | $userSeenItemsNumber = DB::count(); |
| 110 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_password_shown" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 110 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_password_shown" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 111 | 111 | $userSeenPasswordsNumber = DB::count(); |
| 112 | 112 | $userInfo = DB::queryFirstRow( |
| 113 | 113 | 'SELECT avatar, last_pw_change |
| 114 | - FROM ' . prefixTable('users') . ' |
|
| 115 | - WHERE id = "' . $_SESSION['user_id'] . '"' |
|
| 114 | + FROM ' . prefixTable('users').' |
|
| 115 | + WHERE id = "' . $_SESSION['user_id'].'"' |
|
| 116 | 116 | ); |
| 117 | 117 | if (empty($userInfo['avatar']) === true) { |
| 118 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 118 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 119 | 119 | } else { |
| 120 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar']; |
|
| 120 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar']; |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | // Get Groups name |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | foreach ($_SESSION['user_roles'] as $role) { |
| 126 | 126 | $tmp = DB::queryFirstRow( |
| 127 | 127 | 'SELECT title |
| 128 | - FROM ' . prefixTable('roles_title') . ' |
|
| 129 | - WHERE id = "' . $role . '"' |
|
| 128 | + FROM ' . prefixTable('roles_title').' |
|
| 129 | + WHERE id = "' . $role.'"' |
|
| 130 | 130 | ); |
| 131 | 131 | if ($tmp !== null) { |
| 132 | 132 | array_push($userParOfGroups, $tmp['title']); |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | <h3 id="profile-username" class="text-center"> |
| 171 | 171 | <?php |
| 172 | 172 | if (isset($_SESSION['name']) === true && empty($_SESSION['name']) === false) { |
| 173 | - echo $_SESSION['name'] . ' ' . $_SESSION['lastname']; |
|
| 173 | + echo $_SESSION['name'].' '.$_SESSION['lastname']; |
|
| 174 | 174 | } else { |
| 175 | 175 | echo $_SESSION['login']; |
| 176 | 176 | } |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | } else { |
| 239 | 239 | echo date('d/m/Y', (int) $_SESSION['last_connection']); |
| 240 | 240 | } |
| 241 | - echo ' ' . langHdl('at') . ' '; |
|
| 241 | + echo ' '.langHdl('at').' '; |
|
| 242 | 242 | if (isset($SETTINGS['time_format']) === true) { |
| 243 | 243 | echo date($SETTINGS['time_format'], (int) $_SESSION['last_connection']); |
| 244 | 244 | } else { |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | </a> |
| 249 | 249 | </li> |
| 250 | 250 | <?php |
| 251 | - if (isset($_SESSION['last_pw_change']) && ! empty($_SESSION['last_pw_change'])) { |
|
| 251 | + if (isset($_SESSION['last_pw_change']) && !empty($_SESSION['last_pw_change'])) { |
|
| 252 | 252 | // Handle last password change string |
| 253 | 253 | if (isset($_SESSION['last_pw_change']) === true) { |
| 254 | 254 | if (isset($SETTINGS['date_format']) === true) { |
@@ -268,12 +268,12 @@ discard block |
||
| 268 | 268 | ) { |
| 269 | 269 | $numDaysBeforePwExpiration = ''; |
| 270 | 270 | } else { |
| 271 | - $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $_SESSION['numDaysBeforePwExpiration'] . ' ' . $LANG['days'] . '.'; |
|
| 271 | + $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$_SESSION['numDaysBeforePwExpiration'].' '.$LANG['days'].'.'; |
|
| 272 | 272 | } |
| 273 | 273 | echo ' |
| 274 | 274 | <li class="list-group-item"> |
| 275 | - <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change') . '</b> |
|
| 276 | - <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a> |
|
| 275 | + <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change').'</b> |
|
| 276 | + <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a> |
|
| 277 | 277 | </li>'; |
| 278 | 278 | } |
| 279 | 279 | ?> |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 294 | 294 | echo ' |
| 295 | 295 | <li class="list-group-item"> |
| 296 | - <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key') . '</b> |
|
| 296 | + <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key').'</b> |
|
| 297 | 297 | <a class="float-right" id="profile-user-api-token">', |
| 298 | 298 | isset($_SESSION['user']['api-key']) === true ? $_SESSION['user']['api-key'] : '', |
| 299 | 299 | '</a> |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | ) { |
| 306 | 306 | echo ' |
| 307 | 307 | <li class="list-group-item"> |
| 308 | - <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id') . '</b> |
|
| 308 | + <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id').'</b> |
|
| 309 | 309 | <a class="float-right">', |
| 310 | 310 | $_SESSION['user_agsescardid'] ?? '', |
| 311 | 311 | '</a> |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | <ul class=""> |
| 330 | 330 | <?php |
| 331 | 331 | foreach ($_SESSION['user']['unsuccessfull_login_attempts_list'] as $entry) { |
| 332 | - echo '<li class="">' . $entry . '</li>'; |
|
| 332 | + echo '<li class="">'.$entry.'</li>'; |
|
| 333 | 333 | } ?> |
| 334 | 334 | </ul> |
| 335 | 335 | </div> |
@@ -342,12 +342,12 @@ discard block |
||
| 342 | 342 | <?php |
| 343 | 343 | $rows = DB::query( |
| 344 | 344 | 'SELECT label AS labelAction, date, null |
| 345 | - FROM ' . prefixTable('log_system') . ' |
|
| 345 | + FROM ' . prefixTable('log_system').' |
|
| 346 | 346 | WHERE qui = %i |
| 347 | 347 | UNION |
| 348 | 348 | SELECT l.action, l.date, i.label AS itemLabel |
| 349 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 350 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 349 | + FROM ' . prefixTable('log_items').' AS l |
|
| 350 | + INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 351 | 351 | WHERE l.id_user = %i AND l.action IN ("at_access") |
| 352 | 352 | ORDER BY date DESC |
| 353 | 353 | LIMIT 0, 40', |
@@ -361,9 +361,9 @@ discard block |
||
| 361 | 361 | $text = langHdl($record['labelAction']); |
| 362 | 362 | } |
| 363 | 363 | if (empty($record['NULL']) === false) { |
| 364 | - $text .= ' ' . langHdl('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>'; |
|
| 364 | + $text .= ' '.langHdl('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>'; |
|
| 365 | 365 | } |
| 366 | - echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>'; |
|
| 366 | + echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>'; |
|
| 367 | 367 | } |
| 368 | 368 | ?> |
| 369 | 369 | </ul> |
@@ -401,11 +401,10 @@ discard block |
||
| 401 | 401 | <?php |
| 402 | 402 | foreach ($zones as $key => $zone) { |
| 403 | 403 | echo ' |
| 404 | - <option value="' . $key . '"', |
|
| 404 | + <option value="' . $key.'"', |
|
| 405 | 405 | isset($_SESSION['user_timezone']) === true && $_SESSION['user_timezone'] === $key ? |
| 406 | - ' selected' : |
|
| 407 | - (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''), |
|
| 408 | - '>' . $zone . '</option>'; |
|
| 406 | + ' selected' : (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''), |
|
| 407 | + '>'.$zone.'</option>'; |
|
| 409 | 408 | } |
| 410 | 409 | ?> |
| 411 | 410 | </select> |
@@ -417,10 +416,10 @@ discard block |
||
| 417 | 416 | <select class="form-control" id="profile-user-language"> |
| 418 | 417 | <?php |
| 419 | 418 | foreach ($languages as $language) { |
| 420 | - echo '<option value="' . $language['name'] . '"', |
|
| 419 | + echo '<option value="'.$language['name'].'"', |
|
| 421 | 420 | strtolower($_SESSION['user']['user_language']) === strtolower($language['name']) ? |
| 422 | 421 | ' selected="selected"' : '', |
| 423 | - '>' . $language['label'] . '</option>'; |
|
| 422 | + '>'.$language['label'].'</option>'; |
|
| 424 | 423 | } |
| 425 | 424 | ?> |
| 426 | 425 | </select> |
@@ -432,11 +431,11 @@ discard block |
||
| 432 | 431 | <div class="col-sm-10"> |
| 433 | 432 | <select class="form-control" id="profile-user-treeloadstrategy"> |
| 434 | 433 | |
| 435 | - <option value="sequential" <?php echo isset($_SESSION['user']['user_treeloadstrategy']) === true && $_SESSION['user']['user_treeloadstrategy'] === 'sequential' ? ' selected' : '';?>> |
|
| 434 | + <option value="sequential" <?php echo isset($_SESSION['user']['user_treeloadstrategy']) === true && $_SESSION['user']['user_treeloadstrategy'] === 'sequential' ? ' selected' : ''; ?>> |
|
| 436 | 435 | <?php echo langHdl('sequential'); ?> |
| 437 | 436 | </option> |
| 438 | 437 | |
| 439 | - <option value="full" <?php echo isset($_SESSION['user']['user_treeloadstrategy']) === true && $_SESSION['user']['user_treeloadstrategy'] === 'full' ? ' selected' : '';?>> |
|
| 438 | + <option value="full" <?php echo isset($_SESSION['user']['user_treeloadstrategy']) === true && $_SESSION['user']['user_treeloadstrategy'] === 'full' ? ' selected' : ''; ?>> |
|
| 440 | 439 | <?php echo langHdl('full'); ?> |
| 441 | 440 | </option> |
| 442 | 441 | </select> |
@@ -471,7 +470,7 @@ discard block |
||
| 471 | 470 | <button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo langHdl('upload_new_avatar'); ?></button> |
| 472 | 471 | <?php |
| 473 | 472 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 474 | - echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . langHdl('generate_api_token') . '</button>'; |
|
| 473 | + echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.langHdl('generate_api_token').'</button>'; |
|
| 475 | 474 | } |
| 476 | 475 | ?> |
| 477 | 476 | <div id="profile-avatar-file-container" class="hidden"></div> |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === false) { |
| 71 | 71 | // Not allowed page |
| 72 | 72 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 73 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 73 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 74 | 74 | exit; |
| 75 | 75 | } |
| 76 | 76 | ?> |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | // Isolate first item |
| 697 | 697 | if (itemsList.length > 0) { |
| 698 | 698 | $('#import-feedback-progress-text') |
| 699 | - .html('<i class="fas fa-cog fa-spin ml-4 mr-2"></i><?php echo langHdl('operation_progress');?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i>'+itemsList[0].Title + '</i>'); |
|
| 699 | + .html('<i class="fas fa-cog fa-spin ml-4 mr-2"></i><?php echo langHdl('operation_progress'); ?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i>'+itemsList[0].Title + '</i>'); |
|
| 700 | 700 | |
| 701 | 701 | data = { |
| 702 | 702 | 'edit-all': $('#import-keepass-edit-all-checkbox').prop('checked') === true ? 1 : 0, |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === false) { |
| 64 | 64 | // Not allowed page |
| 65 | 65 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 66 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 66 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 67 | 67 | exit; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('folders') === false) { |
| 70 | 70 | // Not allowed page |
| 71 | 71 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 73 | 73 | exit; |
| 74 | 74 | } |
| 75 | 75 | ?> |
@@ -699,14 +699,14 @@ discard block |
||
| 699 | 699 | '<label><?php echo langHdl('icon'); ?></label>' + |
| 700 | 700 | '<input type="text" class="form-control form-folder-control purify" id="folder-edit-icon" data-field="icon" value="'+folderIcon+'">' + |
| 701 | 701 | '<small class="form-text text-muted">' + |
| 702 | - '<?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>' + |
|
| 702 | + '<?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>' + |
|
| 703 | 703 | '</small>' + |
| 704 | 704 | '</div>' + |
| 705 | 705 | '<div class="form-group ml-2">' + |
| 706 | 706 | '<label><?php echo langHdl('icon_on_selection'); ?></label>' + |
| 707 | 707 | '<input type="text" class="form-control form-folder-control purify" id="folder-edit-icon-selected" data-field="iconSelected" value="'+folderIconSelection+'">' + |
| 708 | 708 | '<small class="form-text text-muted">' + |
| 709 | - '<?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>' + |
|
| 709 | + '<?php echo langHdl('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>' + |
|
| 710 | 710 | '</small>' + |
| 711 | 711 | '</div>' + |
| 712 | 712 | '<div class="form-group ml-2" id="folder-rights-tuned">' + |